[ooo-build-commit] .: 2 commits - patches/dev300
Thorsten Behrens
thorsten at kemper.freedesktop.org
Mon Aug 16 07:10:21 PDT 2010
patches/dev300/apply | 5
patches/dev300/optional-outplace-ole.diff | 151 +---
patches/dev300/slideshow-configurable-paintoverlay.diff | 584 ----------------
3 files changed, 66 insertions(+), 674 deletions(-)
New commits:
commit 0e399671c22606678de286e6feea194fca8c1ac6
Author: Thorsten Behrens <thb at openoffice.org>
Date: Mon Aug 16 16:05:07 2010 +0200
Removed upstreamed slideshow paintoverlay
* patches/dev300/apply: removed below
* patches/dev300/slideshow-configurable-paintoverlay.diff: rm-ed
diff --git a/patches/dev300/apply b/patches/dev300/apply
index e9e1ab0..ee708ee 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2908,9 +2908,6 @@ win32-dxsdk-200908.diff, tml
sfx2-privateprotectedpublic.diff
# UI + core to make OLE editing optionally outplace
optional-outplace-ole.diff, i#98970, thorsten
-# UI + core to have in-slideshow user drawing configurable (color &
-# stroke width)
-# FIXME dev300-m77 slideshow-configurable-paintoverlay.diff, i#97972, fredus #disabled
# let ctrl-<keycode> stuff pass dlg keyboard handling, to permit
# global application-wide shortcuts also in open dialogs
vcl-permit-global-shortcuts.diff, i#105676, thorsten
diff --git a/patches/dev300/slideshow-configurable-paintoverlay.diff b/patches/dev300/slideshow-configurable-paintoverlay.diff
deleted file mode 100644
index 2d558bb..0000000
--- a/patches/dev300/slideshow-configurable-paintoverlay.diff
+++ /dev/null
@@ -1,584 +0,0 @@
-From ab55250fadc03d14ae7b2f185e07b0009a9e7b28 Mon Sep 17 00:00:00 2001
-From: Jan Holesovsky <kendy at suse.cz>
-Date: Fri, 14 May 2010 17:05:31 +0200
-Subject: [PATCH 675/878] slideshow-configurable-paintoverlay.diff
-
----
- sd/source/ui/slideshow/slideshow.hrc | 13 ++-
- sd/source/ui/slideshow/slideshow.src | 50 +++++++
- sd/source/ui/slideshow/slideshowimpl.cxx | 143 +++++++++++++++++++-
- sd/source/ui/slideshow/slideshowimpl.hxx | 4 +
- slideshow/source/engine/eventmultiplexer.cxx | 8 +
- slideshow/source/engine/slide/slideimpl.cxx | 9 +-
- slideshow/source/engine/slide/userpaintoverlay.cxx | 23 +++-
- slideshow/source/engine/slideshowimpl.cxx | 32 +++++
- slideshow/source/inc/eventmultiplexer.hxx | 11 ++
- slideshow/source/inc/slide.hxx | 1 +
- slideshow/source/inc/userpainteventhandler.hxx | 1 +
- 11 files changed, 287 insertions(+), 8 deletions(-)
-
-diff --git a/sd/source/ui/slideshow/slideshow.hrc b/sd/source/ui/slideshow/slideshow.hrc
-index c126ddf..b5a853f 100644
---- a/sd/source/ui/slideshow/slideshow.hrc
-+++ b/sd/source/ui/slideshow/slideshow.hrc
-@@ -35,8 +35,15 @@
- #define CM_SCREEN_BLACK 5
- #define CM_SCREEN_WHITE 6
- #define CM_ENDSHOW 7
--#define CM_FIRST_SLIDE 8
--#define CM_LAST_SLIDE 9
--#define CM_SLIDES 10
-+#define CM_COLOR_PEN 8
-+#define CM_FIRST_SLIDE 9
-+#define CM_LAST_SLIDE 10
-+#define CM_WIDTH_PEN 11
-+#define CM_WIDTH_PEN_VERY_THIN 12
-+#define CM_WIDTH_PEN_THIN 13
-+#define CM_WIDTH_PEN_NORMAL 14
-+#define CM_WIDTH_PEN_THICK 15
-+#define CM_WIDTH_PEN_VERY_THICK 16
-+#define CM_SLIDES 17
-
- #endif
-diff --git a/sd/source/ui/slideshow/slideshow.src b/sd/source/ui/slideshow/slideshow.src
-index 0c2ff96..720280d 100644
---- a/sd/source/ui/slideshow/slideshow.src
-+++ b/sd/source/ui/slideshow/slideshow.src
-@@ -97,6 +97,56 @@ Menu RID_SLIDESHOW_CONTEXTMENU
- {
- Separator = TRUE;
- };
-+ MenuItem
-+ {
-+ Identifier = CM_WIDTH_PEN;
-+ Text [ en-US ] = "~Pen Width" ;
-+
-+ SubMenu = Menu
-+ {
-+ ItemList =
-+ {
-+ MenuItem
-+ {
-+ Identifier = CM_WIDTH_PEN_VERY_THIN;
-+ Text [ en-US ] = "~Very thin";
-+ };
-+ MenuItem
-+ {
-+ Identifier = CM_WIDTH_PEN_THIN;
-+ Text [ en-US ] = "~Thin";
-+ };
-+ MenuItem
-+ {
-+ Identifier = CM_WIDTH_PEN_NORMAL;
-+ Text [ en-US ] = "~Normal";
-+ };
-+ MenuItem
-+ {
-+ Identifier = CM_WIDTH_PEN_THICK;
-+ Text [ en-US ] = "~Thick";
-+ };
-+ MenuItem
-+ {
-+ Identifier = CM_WIDTH_PEN_VERY_THICK;
-+ Text [ en-US ] = "~Very Thick";
-+ };
-+ };
-+ };
-+ };
-+ MenuItem
-+ {
-+ Separator = TRUE;
-+ };
-+ MenuItem
-+ {
-+ Identifier = CM_COLOR_PEN ;
-+ Text [ en-US ] = "~Change Color" ;
-+ };
-+ MenuItem
-+ {
-+ Separator = TRUE;
-+ };
- MenuItem
- {
- Identifier = CM_ENDSHOW ;
-diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
-index 08fe26a..da307c1 100644
---- a/sd/source/ui/slideshow/slideshowimpl.cxx
-+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
-@@ -83,6 +83,7 @@
- #include "canvas/elapsedtime.hxx"
- #include "canvas/prioritybooster.hxx"
- #include "avmedia/mediawindow.hxx"
-+#include "svtools/colrdlg.hxx"
-
- #include <boost/noncopyable.hpp>
- #include <boost/bind.hpp>
-@@ -551,7 +552,8 @@ SlideshowImpl::SlideshowImpl( const Reference< XPresentation2 >& xPresentation,
- , mbInputFreeze(false)
- , mbActive(sal_False)
- , maPresSettings( pDoc->getPresentationSettings() )
--, mnUserPaintColor( 0x0000FF00L )
-+, mnUserPaintColor( 0x00000000L )
-+, mdUserPaintStrokeWidth ( 4.0 )
- , mnEntryCounter(0)
- , mnLastSlideNumber(-1)
- , msOnClick( RTL_CONSTASCII_USTRINGPARAM("OnClick") )
-@@ -2149,6 +2151,8 @@ IMPL_LINK( SlideshowImpl, ContextMenuHdl, void*, EMPTYARG )
-
- PopupMenu* pMenu = new PopupMenu( SdResId( RID_SLIDESHOW_CONTEXTMENU ) );
-
-+ pMenu->EnableItem( CM_COLOR_PEN, (maPresSettings.mbMouseAsPen));
-+
- const ShowWindowMode eMode = mpShowWindow->GetShowWindowMode();
- pMenu->EnableItem( CM_NEXT_SLIDE, ( mpSlideController->getNextSlideIndex() != -1 ) );
- pMenu->EnableItem( CM_PREV_SLIDE, ( mpSlideController->getPreviousSlideIndex() != -1 ) || (eMode == SHOWWINDOWMODE_END) || (eMode == SHOWWINDOWMODE_PAUSE) || (eMode == SHOWWINDOWMODE_BLANK) );
-@@ -2216,6 +2220,55 @@ IMPL_LINK( SlideshowImpl, ContextMenuHdl, void*, EMPTYARG )
- }
- }
-
-+
-+ PopupMenu* pWidthMenu = pMenu->GetPopupMenu( CM_WIDTH_PEN);
-+
-+ // populate color width list
-+ if( pWidthMenu )
-+ {
-+ if(! maPresSettings.mbMouseAsPen)
-+ {
-+ pMenu->EnableItem( CM_WIDTH_PEN, FALSE );
-+ }
-+ else
-+ {
-+ sal_Int32 nIterator;
-+ double nWidth;
-+
-+
-+
-+ nWidth = 4.0;
-+ for( nIterator = 1; nIterator < 6; nIterator++)
-+ {
-+ switch(nIterator)
-+ {
-+ case 1:
-+ nWidth = 4.0;
-+ break;
-+ case 2:
-+ nWidth = 100.0;
-+ break;
-+ case 3:
-+ nWidth = 150.0;
-+ break;
-+ case 4:
-+ nWidth = 200.0;
-+ break;
-+ case 5:
-+ nWidth = 400.0;
-+ break;
-+ default:
-+ break;
-+ }
-+
-+ pWidthMenu->EnableItem( (USHORT)(CM_WIDTH_PEN + nIterator), TRUE);
-+ if( nWidth == mdUserPaintStrokeWidth)
-+ pWidthMenu->CheckItem( (USHORT)(CM_WIDTH_PEN + nIterator) );
-+
-+ }
-+ }
-+ }
-+
- pMenu->SetSelectHdl( LINK( this, SlideshowImpl, ContextMenuSelectHdl ) );
- pMenu->Execute( mpShowWindow, maPopupMousePos );
- delete pMenu;
-@@ -2278,6 +2331,59 @@ IMPL_LINK( SlideshowImpl, ContextMenuSelectHdl, Menu *, pMenu )
- }
- }
- break;
-+
-+ case CM_COLOR_PEN:
-+ if( maPresSettings.mbMouseAsPen ){
-+
-+ //Open a color picker based on SvColorDialog
-+ ::Color aColor( mnUserPaintColor );
-+ SvColorDialog aColorDlg( mpShowWindow);
-+ aColorDlg.SetColor( aColor );
-+
-+ if (aColorDlg.Execute() )
-+ {
-+ aColor = aColorDlg.GetColor();
-+ mnUserPaintColor = aColor.GetColor();
-+ setPenColor(mnUserPaintColor);
-+ }
-+ mbWasPaused = false;
-+ }
-+ break;
-+
-+ case CM_WIDTH_PEN_VERY_THIN:
-+ if( maPresSettings.mbMouseAsPen ){
-+ setPenWidth(4.0);
-+ mbWasPaused = false;
-+ }
-+ break;
-+
-+ case CM_WIDTH_PEN_THIN:
-+ if( maPresSettings.mbMouseAsPen ){
-+ setPenWidth(100.0);
-+ mbWasPaused = false;
-+ }
-+ break;
-+
-+ case CM_WIDTH_PEN_NORMAL:
-+ if( maPresSettings.mbMouseAsPen ){
-+ setPenWidth(150.0);
-+ mbWasPaused = false;
-+ }
-+ break;
-+
-+ case CM_WIDTH_PEN_THICK:
-+ if( maPresSettings.mbMouseAsPen ){
-+ setPenWidth(200.0);
-+ mbWasPaused = false;
-+ }
-+ break;
-+
-+ case CM_WIDTH_PEN_VERY_THICK:
-+ if( maPresSettings.mbMouseAsPen ){
-+ setPenWidth(400.0);
-+ mbWasPaused = false;
-+ }
-+ break;
-
- case CM_ENDSHOW:
- // in case the user cancels the presentation, switch to current slide
-@@ -2894,6 +3000,17 @@ void SAL_CALL SlideshowImpl::setUsePen( sal_Bool bMouseAsPen ) throw (RuntimeExc
- aPenProp.Value = aValue;
-
- mxShow->setProperty( aPenProp );
-+
-+ //for StrokeWidth :
-+ Any aValueWidth;
-+ if( maPresSettings.mbMouseAsPen )
-+ aValueWidth <<= mdUserPaintStrokeWidth;
-+
-+ beans::PropertyValue aPenPropWidth;
-+ aPenPropWidth.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "UserPaintStrokeWidth" ));
-+ aPenPropWidth.Value = aValueWidth;
-+
-+ mxShow->setProperty( aPenPropWidth );
- }
- catch( Exception& e )
- {
-@@ -2907,6 +3024,27 @@ void SAL_CALL SlideshowImpl::setUsePen( sal_Bool bMouseAsPen ) throw (RuntimeExc
- }
- }
-
-+
-+// --------------------------------------------------------------------
-+
-+double SAL_CALL SlideshowImpl::getPenWidth() throw (RuntimeException)
-+{
-+ ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
-+ return mdUserPaintStrokeWidth;
-+}
-+
-+
-+// --------------------------------------------------------------------
-+
-+void SAL_CALL SlideshowImpl::setPenWidth( double dStrokeWidth ) throw (RuntimeException)
-+{
-+ ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
-+ mdUserPaintStrokeWidth = dStrokeWidth;
-+ if( maPresSettings.mbMouseAsPen )
-+ setUsePen( sal_True ); // update color and width
-+}
-+
-+
- // --------------------------------------------------------------------
-
- sal_Int32 SAL_CALL SlideshowImpl::getPenColor() throw (RuntimeException)
-@@ -2915,6 +3053,7 @@ sal_Int32 SAL_CALL SlideshowImpl::getPenColor() throw (RuntimeException)
- return mnUserPaintColor;
- }
-
-+
- // --------------------------------------------------------------------
-
- void SAL_CALL SlideshowImpl::setPenColor( sal_Int32 nColor ) throw (RuntimeException)
-@@ -2922,7 +3061,7 @@ void SAL_CALL SlideshowImpl::setPenColor( sal_Int32 nColor ) throw (RuntimeExcep
- ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
- mnUserPaintColor = nColor;
- if( maPresSettings.mbMouseAsPen )
-- setUsePen( sal_True ); // update color
-+ setUsePen( sal_True ); // update color and width
- }
-
- // --------------------------------------------------------------------
-diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx
-index bc18807..0459460 100644
---- a/sd/source/ui/slideshow/slideshowimpl.hxx
-+++ b/sd/source/ui/slideshow/slideshowimpl.hxx
-@@ -197,6 +197,8 @@ public:
- virtual void SAL_CALL setMouseVisible( ::sal_Bool _mousevisible ) throw (css::uno::RuntimeException);
- virtual ::sal_Bool SAL_CALL getUsePen() throw (css::uno::RuntimeException);
- virtual void SAL_CALL setUsePen( ::sal_Bool _usepen ) throw (css::uno::RuntimeException);
-+ virtual double SAL_CALL getPenWidth() throw (css::uno::RuntimeException);
-+ virtual void SAL_CALL setPenWidth( double dStrokeWidth ) throw (css::uno::RuntimeException);
- virtual ::sal_Int32 SAL_CALL getPenColor() throw (css::uno::RuntimeException);
- virtual void SAL_CALL setPenColor( ::sal_Int32 _pencolor ) throw (css::uno::RuntimeException);
- virtual ::sal_Bool SAL_CALL isRunning( ) throw (css::uno::RuntimeException);
-@@ -380,6 +382,8 @@ private:
- PresentationSettings maPresSettings;
- sal_Int32 mnUserPaintColor;
-
-+ double mdUserPaintStrokeWidth;
-+
- /// used in updateHdl to prevent recursive calls
- sal_Int32 mnEntryCounter;
-
-diff --git a/slideshow/source/engine/eventmultiplexer.cxx b/slideshow/source/engine/eventmultiplexer.cxx
-index 59b84c5..4f2251c 100644
---- a/slideshow/source/engine/eventmultiplexer.cxx
-+++ b/slideshow/source/engine/eventmultiplexer.cxx
-@@ -1070,6 +1070,14 @@ bool EventMultiplexer::notifyUserPaintColor( RGBColor const& rUserColor )
- boost::cref(rUserColor)));
- }
-
-+bool EventMultiplexer::notifyUserPaintStrokeWidth( double rUserStrokeWidth )
-+{
-+ return mpImpl->maUserPaintEventHandlers.applyAll(
-+ boost::bind(&UserPaintEventHandler::widthChanged,
-+ _1,
-+ rUserStrokeWidth));
-+}
-+
- bool EventMultiplexer::notifyUserPaintDisabled()
- {
- return mpImpl->maUserPaintEventHandlers.applyAll(
-diff --git a/slideshow/source/engine/slide/slideimpl.cxx b/slideshow/source/engine/slide/slideimpl.cxx
-index 16dbb1b..f8ca942 100644
---- a/slideshow/source/engine/slide/slideimpl.cxx
-+++ b/slideshow/source/engine/slide/slideimpl.cxx
-@@ -110,6 +110,7 @@ public:
- const ShapeEventListenerMap& rShapeListenerMap,
- const ShapeCursorMap& rShapeCursorMap,
- RGBColor const& rUserPaintColor,
-+ double dUserPaintStrokeWidth,
- bool bUserPaintEnabled,
- bool bIntrinsicAnimationsAllowed,
- bool bDisableAnimationZOrder );
-@@ -243,6 +244,7 @@ private:
- SlideAnimations maAnimations;
-
- RGBColor maUserPaintColor;
-+ double mdUserPaintStrokeWidth;
- UserPaintOverlaySharedPtr mpPaintOverlay;
-
- /// Bitmaps with slide content at various states
-@@ -344,6 +346,7 @@ SlideImpl::SlideImpl( const uno::Reference< drawing::XDrawPage >& xDrawPage,
- const ShapeEventListenerMap& rShapeListenerMap,
- const ShapeCursorMap& rShapeCursorMap,
- RGBColor const& aUserPaintColor,
-+ double dUserPaintStrokeWidth,
- bool bUserPaintEnabled,
- bool bIntrinsicAnimationsAllowed,
- bool bDisableAnimationZOrder ) :
-@@ -373,6 +376,7 @@ SlideImpl::SlideImpl( const uno::Reference< drawing::XDrawPage >& xDrawPage,
- maAnimations( maContext,
- getSlideSizeImpl() ),
- maUserPaintColor(aUserPaintColor),
-+ mdUserPaintStrokeWidth(dUserPaintStrokeWidth),
- mpPaintOverlay(),
- maSlideBitmaps(),
- meAnimationState( CONSTRUCTING_STATE ),
-@@ -860,7 +864,7 @@ void SlideImpl::enablePaintOverlay()
- {
- if( mbUserPaintOverlayEnabled )
- mpPaintOverlay = UserPaintOverlay::create( maUserPaintColor,
-- 2.0,
-+ mdUserPaintStrokeWidth,
- maContext );
- }
-
-@@ -1185,6 +1189,7 @@ SlideSharedPtr createSlide( const uno::Reference< drawing::XDrawPage >& xDrawP
- const ShapeEventListenerMap& rShapeListenerMap,
- const ShapeCursorMap& rShapeCursorMap,
- RGBColor const& rUserPaintColor,
-+ double dUserPaintStrokeWidth,
- bool bUserPaintEnabled,
- bool bIntrinsicAnimationsAllowed,
- bool bDisableAnimationZOrder )
-@@ -1195,7 +1200,7 @@ SlideSharedPtr createSlide( const uno::Reference< drawing::XDrawPage >& xDrawP
- rCursorManager, rViewContainer,
- xComponentContext, rShapeListenerMap,
- rShapeCursorMap, rUserPaintColor,
-- bUserPaintEnabled,
-+ dUserPaintStrokeWidth, bUserPaintEnabled,
- bIntrinsicAnimationsAllowed,
- bDisableAnimationZOrder ));
-
-diff --git a/slideshow/source/engine/slide/userpaintoverlay.cxx b/slideshow/source/engine/slide/userpaintoverlay.cxx
-index be13cbf..5a0bea4 100644
---- a/slideshow/source/engine/slide/userpaintoverlay.cxx
-+++ b/slideshow/source/engine/slide/userpaintoverlay.cxx
-@@ -60,7 +60,8 @@ namespace slideshow
- namespace internal
- {
- class PaintOverlayHandler : public MouseEventHandler,
-- public ViewEventHandler
-+ public ViewEventHandler,
-+ public UserPaintEventHandler
- {
- public:
- PaintOverlayHandler( const RGBColor& rStrokeColor,
-@@ -205,6 +206,7 @@ namespace slideshow
- if( pPolyPoly )
- {
- pPolyPoly->setRGBALineColor( maStrokeColor.getIntegerColor() );
-+ pPolyPoly->setStrokeWidth(mnStrokeWidth);
- pPolyPoly->draw();
- }
- }
-@@ -223,6 +225,24 @@ namespace slideshow
- return false; // did not handle the event
- }
-
-+
-+ bool colorChanged( RGBColor const& rUserColor ){
-+ this->maStrokeColor = rUserColor;
-+ return true;
-+ }
-+
-+ bool widthChanged( double nUserStrokeWidth ){
-+ this->mnStrokeWidth = nUserStrokeWidth;
-+ return true;
-+ }
-+
-+ bool disable(){
-+ //this->maStrokeColor = *(new RGBColor(255,255,255));
-+ //this->mnStrokeWidth = 4.0;
-+ return true;
-+ }
-+
-+
- private:
- ActivitiesQueue& mrActivitiesQueue;
- ScreenUpdater& mrScreenUpdater;
-@@ -259,6 +279,7 @@ namespace slideshow
- mrMultiplexer.addClickHandler( mpHandler, 3.0 );
- mrMultiplexer.addMouseMoveHandler( mpHandler, 3.0 );
- mrMultiplexer.addViewHandler( mpHandler );
-+ mrMultiplexer.addUserPaintHandler(mpHandler);
- }
-
- UserPaintOverlay::~UserPaintOverlay()
-diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx
-index e7f2340..60d91a4 100644
---- a/slideshow/source/engine/slideshowimpl.cxx
-+++ b/slideshow/source/engine/slideshowimpl.cxx
-@@ -360,6 +360,8 @@ private:
-
- boost::optional<RGBColor> maUserPaintColor;
-
-+ boost::optional<double> maUserPaintStrokeWidth;
-+
- boost::shared_ptr<canvas::tools::ElapsedTime> mpPresTimer;
- ScreenUpdater maScreenUpdater;
- EventQueue maEventQueue;
-@@ -474,6 +476,7 @@ SlideShowImpl::SlideShowImpl(
- maShapeEventListeners(),
- maShapeCursors(),
- maUserPaintColor(),
-+ maUserPaintStrokeWidth(4.0),
- mpPresTimer( new canvas::tools::ElapsedTime ),
- maScreenUpdater(maViewContainer),
- maEventQueue( mpPresTimer ),
-@@ -806,6 +809,7 @@ SlideSharedPtr SlideShowImpl::makeSlide(
- maShapeEventListeners,
- maShapeCursors,
- maUserPaintColor ? *maUserPaintColor : RGBColor(),
-+ *maUserPaintStrokeWidth,
- !!maUserPaintColor,
- mbImageAnimationsAllowed,
- mbDisableAnimationZOrder) );
-@@ -1349,6 +1353,34 @@ sal_Bool SlideShowImpl::setProperty( beans::PropertyValue const& rProperty )
-
- return true;
- }
-+
-+ // new Property for pen's width
-+ if (rProperty.Name.equalsAsciiL(
-+ RTL_CONSTASCII_STRINGPARAM("UserPaintStrokeWidth") ))
-+ {
-+ double nWidth(4.0);
-+ if (rProperty.Value >>= nWidth)
-+ {
-+ OSL_ENSURE( mbMouseVisible,
-+ "setProperty(): User paint overrides invisible mouse" );
-+
-+ // enable user paint stroke width
-+ maUserPaintStrokeWidth.reset( nWidth );
-+ maEventMultiplexer.notifyUserPaintStrokeWidth( *maUserPaintStrokeWidth );
-+ }
-+ else
-+ {
-+ // disable user paint stroke width
-+ maUserPaintStrokeWidth.reset();
-+ maEventMultiplexer.notifyUserPaintDisabled();
-+ }
-+
-+ if( mnCurrentCursor == awt::SystemPointer::ARROW )
-+ resetCursor();
-+
-+ return true;
-+ }
-+
-
- if (rProperty.Name.equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM("AdvanceOnClick") ))
-diff --git a/slideshow/source/inc/eventmultiplexer.hxx b/slideshow/source/inc/eventmultiplexer.hxx
-index d4c9a6d..a06d1b1 100644
---- a/slideshow/source/inc/eventmultiplexer.hxx
-+++ b/slideshow/source/inc/eventmultiplexer.hxx
-@@ -483,6 +483,17 @@ public:
- */
- bool notifyUserPaintColor( RGBColor const& rUserColor );
-
-+ /** Notify a new user paint width
-+
-+ Sending this notification also implies that user paint is
-+ enabled. .
-+
-+ @return true, if this event was processed by
-+ anybody. If false is returned, no handler processed
-+ this event (and probably, nothing will happen at all)
-+ */
-+ bool notifyUserPaintStrokeWidth( double rUserStrokeWidth );
-+
- /** Notify that user paint is disabled
-
- User paint denotes the feature to draw colored lines on top of
-diff --git a/slideshow/source/inc/slide.hxx b/slideshow/source/inc/slide.hxx
-index 32990a0..1e14df0 100644
---- a/slideshow/source/inc/slide.hxx
-+++ b/slideshow/source/inc/slide.hxx
-@@ -195,6 +195,7 @@ namespace slideshow
- const ShapeEventListenerMap& rShapeListenerMap,
- const ShapeCursorMap& rShapeCursorMap,
- RGBColor const& aUserPaintColor,
-+ double dUserPaintStrokeWidth,
- bool bUserPaintEnabled,
- bool bIntrinsicAnimationsAllowed,
- bool bDisableAnimationZOrder );
-diff --git a/slideshow/source/inc/userpainteventhandler.hxx b/slideshow/source/inc/userpainteventhandler.hxx
-index 077337e..082aab5 100644
---- a/slideshow/source/inc/userpainteventhandler.hxx
-+++ b/slideshow/source/inc/userpainteventhandler.hxx
-@@ -50,6 +50,7 @@ namespace slideshow
- virtual ~UserPaintEventHandler() {}
-
- virtual bool colorChanged( RGBColor const& rUserColor ) = 0;
-+ virtual bool widthChanged( double nUserStrokeWidth ) = 0;
- virtual bool disable() = 0;
- };
-
---
-1.7.0.1
-
commit 978ffca56a15e4ba8bc8b8f695d3ea3e67236359
Author: Thorsten Behrens <thb at openoffice.org>
Date: Mon Aug 16 16:01:25 2010 +0200
Ported optional-outplace OLE patch to OOO330
* patches/dev300/apply: enabled below
* patches/dev300/optional-outplace-ole.diff: ported to OOO330
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 0779753..e9e1ab0 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2907,7 +2907,7 @@ win32-dxsdk-200908.diff, tml
# fix problem with calling private and protected members in layout code
sfx2-privateprotectedpublic.diff
# UI + core to make OLE editing optionally outplace
-# FIXME dev300-m77 optional-outplace-ole.diff, i#98970, thorsten
+optional-outplace-ole.diff, i#98970, thorsten
# UI + core to have in-slideshow user drawing configurable (color &
# stroke width)
# FIXME dev300-m77 slideshow-configurable-paintoverlay.diff, i#97972, fredus #disabled
diff --git a/patches/dev300/optional-outplace-ole.diff b/patches/dev300/optional-outplace-ole.diff
index 5b2aac1..034b9e1 100644
--- a/patches/dev300/optional-outplace-ole.diff
+++ b/patches/dev300/optional-outplace-ole.diff
@@ -1,39 +1,40 @@
-From ba9e0bbcb1b81baaad654ea516d8a1f98d840192 Mon Sep 17 00:00:00 2001
-From: Jan Holesovsky <kendy at suse.cz>
-Date: Fri, 14 May 2010 17:05:29 +0200
-Subject: [PATCH 594/768] optional-outplace-ole.diff
+Optional outplace OLE editing
+
+From: Thorsten Behrens <thb at openoffice.org>
+
---
- embeddedobj/source/general/docholder.cxx | 4 +-
- sc/inc/sc.hrc | 3 +
+
+ embeddedobj/source/general/docholder.cxx | 4
+ sc/inc/sc.hrc | 3
sc/sdi/scalc.sdi | 50 +
- sc/sdi/tabvwsh.sdi | 2 +
- sc/source/ui/drawfunc/fudraw.cxx | 10 +-
+ sc/sdi/tabvwsh.sdi | 2
+ sc/source/ui/drawfunc/fudraw.cxx | 10
sc/source/ui/drawfunc/objdraw.src | 29 +
sc/source/ui/view/tabvwsh3.cxx | 32 +
- sc/source/ui/view/tabvwsh4.cxx | 2 +
- sd/inc/app.hrc | 8 +-
- sd/sdi/_drvwsh.sdi | 10 +
+ sc/source/ui/view/tabvwsh4.cxx | 2
+ sd/inc/app.hrc | 8
+ sd/sdi/_drvwsh.sdi | 10
sd/sdi/sdraw.sdi | 50 +
- sd/source/ui/app/menuids_tmpl.src | 12 +-
- sd/source/ui/app/popup2_tmpl.src | 1 +
- sd/source/ui/func/fudraw.cxx | 4 +-
- sd/source/ui/func/fuinsert.cxx | 5 +-
- sd/source/ui/func/fupoor.cxx | 9 +-
- sd/source/ui/view/drviews2.cxx | 22 +
- sd/source/ui/view/drviews5.cxx | 2 +-
- sd/source/ui/view/frmview.cxx | 4 +-
+ sd/source/ui/app/menuids_tmpl.src | 12
+ sd/source/ui/app/popup2_tmpl.src | 1
+ sd/source/ui/func/fudraw.cxx | 4
+ sd/source/ui/func/fuinsert.cxx | 5
+ sd/source/ui/func/fupoor.cxx | 9
+ sd/source/ui/view/drviews2.cxx | 22
+ sd/source/ui/view/drviews5.cxx | 2
+ sd/source/ui/view/frmview.cxx | 4
sfx2/source/view/topfrm.cxx | 1646 ++++++++++++++++++++++++++++++
- sw/inc/cmdid.h | 2 +
- sw/sdi/_frmsh.sdi | 14 +
+ sw/inc/cmdid.h | 2
+ sw/sdi/_frmsh.sdi | 14
sw/sdi/swriter.sdi | 50 +
- sw/sdi/swslots.src | 8 +
- sw/source/ui/app/mn.src | 12 +
- sw/source/ui/docvw/edtwin.cxx | 14 +-
- sw/source/ui/shells/frmsh.cxx | 12 +-
- 27 files changed, 1999 insertions(+), 18 deletions(-)
+ sw/source/ui/app/mn.src | 12
+ sw/source/ui/docvw/edtwin.cxx | 14
+ sw/source/ui/shells/frmsh.cxx | 12
+ 26 files changed, 1991 insertions(+), 18 deletions(-)
create mode 100644 sfx2/source/view/topfrm.cxx
+
diff --git embeddedobj/source/general/docholder.cxx embeddedobj/source/general/docholder.cxx
index bb4010a..46bf6e5 100644
--- embeddedobj/source/general/docholder.cxx
@@ -50,10 +51,10 @@ index bb4010a..46bf6e5 100644
uno::Reference< lang::XServiceInfo> xServiceInfo(xDoc,uno::UNO_QUERY);
if ( xServiceInfo.is()
diff --git sc/inc/sc.hrc sc/inc/sc.hrc
-index af23307..3f6eab6 100644
+index 5a5a3bc..b4aadf1 100644
--- sc/inc/sc.hrc
+++ sc/inc/sc.hrc
-@@ -673,6 +673,9 @@
+@@ -671,6 +671,9 @@
#define FID_DOC_MANAGER (SC_FUNCTION_START + 1)
#define FID_CURSOR_ENTER (SC_FUNCTION_START + 2)
#define SID_MAIL (SC_FUNCTION_START + 3)
@@ -64,10 +65,10 @@ index af23307..3f6eab6 100644
#define EDIT_MENU_START (FILE_MENU_END)
diff --git sc/sdi/scalc.sdi sc/sdi/scalc.sdi
-index 810b9f8..75251bb 100644
+index aef90d0..28f9bf6 100644
--- sc/sdi/scalc.sdi
+++ sc/sdi/scalc.sdi
-@@ -4827,6 +4827,56 @@ SfxObjectItem Offset SID_RANGE_OFFSET
+@@ -4852,6 +4852,56 @@ SfxObjectItem Offset SID_RANGE_OFFSET
]
//--------------------------------------------------------------------------
@@ -125,10 +126,10 @@ index 810b9f8..75251bb 100644
[
diff --git sc/sdi/tabvwsh.sdi sc/sdi/tabvwsh.sdi
-index 59d4737..56911c7 100644
+index 08cfebf..b060b32 100644
--- sc/sdi/tabvwsh.sdi
+++ sc/sdi/tabvwsh.sdi
-@@ -193,6 +193,8 @@ interface TableEditView
+@@ -194,6 +194,8 @@ interface TableEditView
SID_PRINTPREVIEW [ ExecMethod = Execute; StateMethod = GetState; ]
@@ -138,7 +139,7 @@ index 59d4737..56911c7 100644
// Suchen/Eersetzen:
FID_SEARCH_NOW [ ExecMethod = ExecSearch; StateMethod = NoState; ]
diff --git sc/source/ui/drawfunc/fudraw.cxx sc/source/ui/drawfunc/fudraw.cxx
-index 4cbd08d..39969cf 100644
+index ee901e2..035d435 100644
--- sc/source/ui/drawfunc/fudraw.cxx
+++ sc/source/ui/drawfunc/fudraw.cxx
@@ -41,6 +41,7 @@
@@ -173,10 +174,10 @@ index 4cbd08d..39969cf 100644
// consumed
bReturn = TRUE;
diff --git sc/source/ui/drawfunc/objdraw.src sc/source/ui/drawfunc/objdraw.src
-index d0d7ba8..088a7b4 100644
+index 9fb1b96..8b7bdd7 100644
--- sc/source/ui/drawfunc/objdraw.src
+++ sc/source/ui/drawfunc/objdraw.src
-@@ -1456,6 +1456,21 @@ Menu RID_POPUP_OLE
+@@ -1452,6 +1452,21 @@ Menu RID_POPUP_OLE
//-#i68101#----------------------
MenuItem { Separator = TRUE ; };
@@ -198,7 +199,7 @@ index d0d7ba8..088a7b4 100644
MN_TITLE_DESCRIPTION_OBJECT
MN_RENAME_OBJECT
//-#i68101#----------------------
-@@ -1484,6 +1499,20 @@ Menu RID_POPUP_CHART
+@@ -1480,6 +1495,20 @@ Menu RID_POPUP_CHART
MenuItem { ITEM_FORMAT_ATTR_TRANSFORM };
MN_ORIGINALSIZE
@@ -220,7 +221,7 @@ index d0d7ba8..088a7b4 100644
MenuItem { Separator = TRUE ; };
MN_TITLE_DESCRIPTION_OBJECT
diff --git sc/source/ui/view/tabvwsh3.cxx sc/source/ui/view/tabvwsh3.cxx
-index 88eecb9..76d553c 100644
+index 88eecb9..b4bbb0a 100644
--- sc/source/ui/view/tabvwsh3.cxx
+++ sc/source/ui/view/tabvwsh3.cxx
@@ -34,6 +34,9 @@
@@ -284,7 +285,7 @@ index 88eecb9..76d553c 100644
DBG_ERROR("Unbekannter Slot bei ScTabViewShell::Execute");
break;
diff --git sc/source/ui/view/tabvwsh4.cxx sc/source/ui/view/tabvwsh4.cxx
-index 095a6f3..fb18436 100644
+index 43dd17a..74a1a17 100644
--- sc/source/ui/view/tabvwsh4.cxx
+++ sc/source/ui/view/tabvwsh4.cxx
@@ -607,6 +607,7 @@ void ScTabViewShell::DoReadUserDataSequence( const uno::Sequence < beans::Proper
@@ -304,7 +305,7 @@ index 095a6f3..fb18436 100644
//------------------------------------------------------------------
diff --git sd/inc/app.hrc sd/inc/app.hrc
-index f6e78c4..3912278 100644
+index 84adc70..38a1e71 100755
--- sd/inc/app.hrc
+++ sd/inc/app.hrc
@@ -457,11 +457,13 @@
@@ -325,10 +326,10 @@ index f6e78c4..3912278 100644
#endif
diff --git sd/sdi/_drvwsh.sdi sd/sdi/_drvwsh.sdi
-index 9db010a..2135e00 100644
+index e3462b4..38b3f25 100755
--- sd/sdi/_drvwsh.sdi
+++ sd/sdi/_drvwsh.sdi
-@@ -82,6 +82,16 @@ interface DrawView
+@@ -70,6 +70,16 @@ interface DrawView
ExecMethod = FuTemporary ;
StateMethod = GetMenuState ;
]
@@ -346,7 +347,7 @@ index 9db010a..2135e00 100644
[
ExecMethod = FuTemporary ;
diff --git sd/sdi/sdraw.sdi sd/sdi/sdraw.sdi
-index c9487d6..6b4d641 100644
+index 4cf3c7f..6873537 100755
--- sd/sdi/sdraw.sdi
+++ sd/sdi/sdraw.sdi
@@ -4864,6 +4864,56 @@ SfxVoidItem OriginalSize SID_ORIGINAL_SIZE
@@ -445,7 +446,7 @@ index 6809571..afe140d 100644
MN_POSITION
MN_OBJECT_ALIGN
diff --git sd/source/ui/func/fudraw.cxx sd/source/ui/func/fudraw.cxx
-index 70e4e47..75b0dec 100644
+index 4a93eff..93fff7d 100755
--- sd/source/ui/func/fudraw.cxx
+++ sd/source/ui/func/fudraw.cxx
@@ -49,6 +49,7 @@
@@ -456,7 +457,7 @@ index 70e4e47..75b0dec 100644
#include "anminfo.hxx"
#include "anmdef.hxx"
-@@ -855,7 +856,8 @@ void FuDraw::DoubleClick(const MouseEvent& rMEvt)
+@@ -847,7 +848,8 @@ void FuDraw::DoubleClick(const MouseEvent& rMEvt)
* aktivate OLE-object
**********************************************************/
//HMHmpView->HideMarkHdl();
@@ -467,7 +468,7 @@ index 70e4e47..75b0dec 100644
}
else if (nInv == SdrInventor && nSdrObjKind == OBJ_GRAF && pObj->IsEmptyPresObj() )
diff --git sd/source/ui/func/fuinsert.cxx sd/source/ui/func/fuinsert.cxx
-index 3ff6a58..16dcf10 100644
+index 06bef6c..e2f3795 100755
--- sd/source/ui/func/fuinsert.cxx
+++ sd/source/ui/func/fuinsert.cxx
@@ -39,6 +39,7 @@
@@ -478,16 +479,16 @@ index 3ff6a58..16dcf10 100644
#include <tools/urlobj.hxx>
#include <svl/urihelper.hxx>
-@@ -383,7 +384,7 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq )
- aSz.Width = aTmp.Width();
- aSz.Height = aTmp.Height();
- xObj->setVisualAreaSize( nAspect, aSz );
+@@ -406,7 +407,7 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq )
+ aVisualSize.Width = aTmp.Width();
+ aVisualSize.Height = aTmp.Height();
+ xObj->setVisualAreaSize( nAspect, aVisualSize );
- mpViewShell->ActivateObject(pOleObj, SVVERB_SHOW);
+ mpViewShell->ActivateObject(pOleObj, embed::EmbedVerbs::MS_OLEVERB_SHOW);
if (nSlotId == SID_INSERT_DIAGRAM)
{
-@@ -658,7 +659,7 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq )
+@@ -681,7 +682,7 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq )
xObj->setVisualAreaSize( nAspect, aSz );
}
@@ -497,7 +498,7 @@ index 3ff6a58..16dcf10 100644
Size aVisSizePixel = mpWindow->GetOutputSizePixel();
diff --git sd/source/ui/func/fupoor.cxx sd/source/ui/func/fupoor.cxx
-index f90b171..0b6bca2 100644
+index 7bfafc3..951661b 100755
--- sd/source/ui/func/fupoor.cxx
+++ sd/source/ui/func/fupoor.cxx
@@ -46,6 +46,7 @@
@@ -508,7 +509,7 @@ index f90b171..0b6bca2 100644
#ifndef SD_FRAMW_VIEW_HXX
#include "FrameView.hxx"
-@@ -336,8 +337,12 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt)
+@@ -327,8 +328,12 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt)
if( pObj && pObj->ISA( SdrOle2Obj ) && !mpDocSh->IsUIActive() )
{
@@ -524,7 +525,7 @@ index f90b171..0b6bca2 100644
else if( pObj && pObj->IsEmptyPresObj() && pObj->ISA( SdrGrafObj ) )
{
diff --git sd/source/ui/view/drviews2.cxx sd/source/ui/view/drviews2.cxx
-index d7fa12e..fb00949 100644
+index 4c8cbd3..559c581 100755
--- sd/source/ui/view/drviews2.cxx
+++ sd/source/ui/view/drviews2.cxx
@@ -55,6 +55,7 @@
@@ -543,7 +544,7 @@ index d7fa12e..fb00949 100644
#include <strings.hrc>
-@@ -1004,6 +1006,26 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
+@@ -956,6 +958,26 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
}
break;
@@ -571,7 +572,7 @@ index d7fa12e..fb00949 100644
{
// switch Anweisung wegen CLOOKS aufgeteilt. Alle case-Anweisungen die
diff --git sd/source/ui/view/drviews5.cxx sd/source/ui/view/drviews5.cxx
-index 3204172..2542b63 100644
+index 39eba4f..bc9af61 100644
--- sd/source/ui/view/drviews5.cxx
+++ sd/source/ui/view/drviews5.cxx
@@ -620,7 +620,7 @@ void DrawViewShell::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence
@@ -607,7 +608,7 @@ index f2c32ac..7f641b3 100644
aVisArea.nBottom = nHeight + aVisArea.nTop - 1;
diff --git sfx2/source/view/topfrm.cxx sfx2/source/view/topfrm.cxx
new file mode 100644
-index 0000000..53c9bc7
+index 0000000..4f19337
--- /dev/null
+++ sfx2/source/view/topfrm.cxx
@@ -0,0 +1,1646 @@
@@ -2258,10 +2259,10 @@ index 0000000..53c9bc7
+ pMenuBar->ShowCloser(bLastTask);
+}
diff --git sw/inc/cmdid.h sw/inc/cmdid.h
-index cf5bcd5..6dbc773 100644
+index cb3a5bc..5c59f70 100644
--- sw/inc/cmdid.h
+++ sw/inc/cmdid.h
-@@ -1259,6 +1259,8 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare (//) mehr
+@@ -1258,6 +1258,8 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare (//) mehr
#define FN_UNO_DESCRIPTION (FN_FRAME + 20)
// <--
@@ -2296,7 +2297,7 @@ index 82d6aff..e20e6b3 100644
[
ExecMethod = ExecFrameStyle ;
diff --git sw/sdi/swriter.sdi sw/sdi/swriter.sdi
-index aede246..a1a4f49 100644
+index aae7ec7..633cda7 100755
--- sw/sdi/swriter.sdi
+++ sw/sdi/swriter.sdi
@@ -2087,6 +2087,56 @@ SfxVoidItem FrameDialog FN_FORMAT_FRAME_DLG
@@ -2356,30 +2357,11 @@ index aede246..a1a4f49 100644
SfxBoolItem GoDown FN_LINE_DOWN
(SfxInt16Item Count FN_PARAM_MOVE_COUNT,SfxBoolItem Select FN_PARAM_MOVE_SELECTION)
[
-diff --git sw/sdi/swslots.src sw/sdi/swslots.src
-index b67716c..710601f 100644
---- sw/sdi/swslots.src
-+++ sw/sdi/swslots.src
-@@ -287,6 +287,14 @@ SfxSlotInfo FN_FORMAT_FRAME_DLG
- {
- Slotname [ en-US ] = "Frame Properties";
- };
-+SfxSlotInfo FN_INPLACE_OLE
-+{
-+ Slotname [ en-US ] = "Open OLE object inplace";
-+};
-+SfxSlotInfo FN_OUTPLACE_OLE
-+{
-+ Slotname [ en-US ] = "Open OLE object outplace";
-+};
- SfxSlotInfo FN_FORMAT_GRAFIC_DLG
- {
- Slotname [ en-US ] = "Edit Graphics";
diff --git sw/source/ui/app/mn.src sw/source/ui/app/mn.src
-index a035170..cf3a291 100644
+index aeb8fca..45bd96d 100644
--- sw/source/ui/app/mn.src
+++ sw/source/ui/app/mn.src
-@@ -1001,6 +1001,18 @@ Menu MN_OLE_POPUPMENU
+@@ -1008,6 +1008,18 @@ Menu MN_OLE_POPUPMENU
HelpID = FN_FORMAT_FRAME_DLG ;
Text [ en-US ] = "Object..." ;
};
@@ -2399,7 +2381,7 @@ index a035170..cf3a291 100644
};
};
diff --git sw/source/ui/docvw/edtwin.cxx sw/source/ui/docvw/edtwin.cxx
-index a755fc1..72ece66 100644
+index 7e182ba..6a546f8 100644
--- sw/source/ui/docvw/edtwin.cxx
+++ sw/source/ui/docvw/edtwin.cxx
@@ -37,6 +37,7 @@
@@ -2410,7 +2392,7 @@ index a755fc1..72ece66 100644
#include <com/sun/star/i18n/UnicodeScript.hpp>
-@@ -1771,6 +1772,14 @@ KEYINPUT_CHECKTABLE_INSDEL:
+@@ -1770,6 +1771,14 @@ KEYINPUT_CHECKTABLE_INSDEL:
}
break;
@@ -2425,7 +2407,7 @@ index a755fc1..72ece66 100644
case KEY_RETURN | KEY_MOD2: // ALT-Return
if( !rSh.HasReadonlySel() && !rSh.IsSttPara() && rSh.GetCurNumRule() )
eKeyState = KS_NoNum;
-@@ -2174,7 +2183,10 @@ KEYINPUT_CHECKTABLE_INSDEL:
+@@ -2173,7 +2182,10 @@ KEYINPUT_CHECKTABLE_INSDEL:
}
break;
case KS_LaunchOLEObject:
@@ -2467,6 +2449,3 @@ index b2dfee2..f3b83ce 100644
case FN_FRAME_MIRROR_ON_EVEN_PAGES:
{
SwFmtHoriOrient aHori(aMgr.GetHoriOrient());
---
-1.7.0.1
-
More information about the ooo-build-commit
mailing list