[ooo-build-commit] Branch 'ooo/master' - 2 commits - sd/inc sd/source
Jan Holesovsky
kendy at kemper.freedesktop.org
Thu Jul 2 17:42:55 PDT 2009
sd/inc/sd_primitivetypes2d.hxx | 1
sd/source/ui/animations/motionpathtag.cxx | 24
sd/source/ui/func/fuconstr.cxx | 2
sd/source/ui/func/fudraw.cxx | 16
sd/source/ui/func/fudspord.cxx | 4
sd/source/ui/func/fusel.cxx | 16
sd/source/ui/func/futext.cxx | 4
sd/source/ui/slideshow/SlideShowRestarter.cxx | 3
sd/source/ui/slidesorter/controller/SlideSorterController.cxx | 4
sd/source/ui/slidesorter/controller/SlsClipboard.cxx | 10
sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx | 52 -
sd/source/ui/slidesorter/controller/SlsSlotManager.cxx | 2
sd/source/ui/slidesorter/inc/view/SlsPageObjectViewObjectContact.hxx | 87 ---
sd/source/ui/slidesorter/inc/view/SlsViewOverlay.hxx | 39 -
sd/source/ui/slidesorter/model/SlsPageEnumerationProvider.cxx | 4
sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx | 217 ++++----
sd/source/ui/slidesorter/view/SlsViewOverlay.cxx | 263 +++-------
sd/source/ui/table/tableobjectbar.cxx | 2
sd/source/ui/toolpanel/LayoutMenu.cxx | 2
sd/source/ui/unoidl/DrawController.cxx | 3
sd/source/ui/view/GraphicObjectBar.cxx | 6
sd/source/ui/view/MediaObjectBar.cxx | 2
sd/source/ui/view/ViewShellBase.cxx | 27 -
sd/source/ui/view/ViewTabBar.cxx | 2
sd/source/ui/view/drbezob.cxx | 4
sd/source/ui/view/drtxtob.cxx | 10
sd/source/ui/view/drvwshrg.cxx | 4
sd/source/ui/view/frmview.cxx | 2
sd/source/ui/view/outlnvsh.cxx | 4
sd/source/ui/view/sdview.cxx | 2
sd/source/ui/view/sdview2.cxx | 29 -
sd/source/ui/view/sdview3.cxx | 15
sd/source/ui/view/sdview4.cxx | 4
33 files changed, 312 insertions(+), 554 deletions(-)
New commits:
commit be18314c8b7f68f5ed698a49d5c74fd74c5595b5
Author: Release Engineers <releng at openoffice.org>
Date: Thu Jul 2 14:28:15 2009 +0000
CWS-TOOLING: integrate CWS aw065
2009-06-17 13:48:12 +0200 aw r273068 : #99385# corrected small error in SCs selection visualisation
2009-06-16 15:45:28 +0200 wg r273021 : i102838
2009-06-16 12:46:07 +0200 wg r273016 : i102833
2009-06-11 17:40:29 +0200 aw r272895 : #i98870# added implementation for getPageCount helper
2009-06-11 16:39:54 +0200 aw r272885 : #i102663#, #i102667#, #i98870# incluide file typo corrected
2009-06-11 16:24:07 +0200 aw r272881 : #i102663#, #i102667#, #i98870# changes to SdrText, it's usage in SdrTextPrimitive2D and to OverlayObject base implementation. Also support for PageCountField added
2009-06-11 16:23:52 +0200 aw r272880 : #i102663#, #i102667#, #i98870# changes to SdrText, it's usage in SdrTextPrimitive2D and to OverlayObject base implementation. Also support for PageCountField added
2009-06-09 13:50:29 +0200 aw r272769 : #i98917# added support for the OverlayHatchRectanglePrimitive to follow rotation with it's hatch; simplified OverlayHatchRect
2009-06-09 13:04:06 +0200 aw r272766 : #i98870# re-added PageNumber identification in SdrTextPrimitive2D::get2DDecomposition
2009-06-08 18:56:05 +0200 aw r272744 : #i99385# added some last corrections to OverlayObjects in SD (had to do some merges on resync, needed to optically check and correct)
2009-06-08 11:17:57 +0200 aw r272725 : cws aw065: corrections after resync
2009-06-08 11:02:25 +0200 aw r272723 : cws aw065: corrections after resync
2009-06-08 10:36:22 +0200 aw r272722 : cws aw065: corrections after resync
2009-06-05 18:57:06 +0200 aw r272712 : CWS-TOOLING: rebase CWS aw065 to trunk at 272291 (milestone: DEV300:m49)
2009-06-05 14:56:34 +0200 aw r272690 : #i89784# stripped old stuff no longer needed due to text-to-polygon conversion using primitives
2009-06-05 14:50:07 +0200 aw r272688 : #102091# removed on-model-lock suppression for SdrObject::ActionChanged()
2009-06-05 14:47:29 +0200 aw r272687 : #102091# corrected local value buffering in ScenePrimitive2D::get2DDecomposition
2009-06-03 17:53:32 +0200 aw r272599 : #i89784# version before stripping
2009-06-03 17:52:18 +0200 aw r272598 : #i89784# version before stripping
2009-05-28 17:15:47 +0200 aw r272420 : #i101872# old stuff removed/stripped
2009-05-28 17:15:32 +0200 aw r272419 : #i101872# old stuff removed/stripped
2009-05-28 17:15:15 +0200 aw r272418 : #i101872# old stuff removed/stripped
2009-05-28 17:14:45 +0200 aw r272417 : #i101872# old stuff removed/stripped
2009-05-28 12:13:56 +0200 aw r272396 : #i101872# stable hybrid state
2009-05-28 12:13:46 +0200 aw r272395 : #i101872# stable hybrid state
2009-05-28 12:13:35 +0200 aw r272394 : #i101872# stable hybrid state
2009-05-28 12:13:20 +0200 aw r272393 : #i101872# stable hybrid state
2009-05-28 12:13:05 +0200 aw r272392 : #i101872# stable hybrid state
2009-05-28 12:12:51 +0200 aw r272391 : #i101872# stable hybrid state
2009-05-15 16:56:02 +0200 aw r271952 : #i101872# HitTest unifications
2009-05-15 16:55:22 +0200 aw r271951 : #i101872# HitTest unifications
2009-05-15 16:55:12 +0200 aw r271950 : #i101872# HitTest unifications
2009-05-15 16:55:01 +0200 aw r271949 : #i101872# HitTest unifications
2009-05-15 16:54:51 +0200 aw r271948 : #i101872# HitTest unifications
2009-05-15 16:54:35 +0200 aw r271947 : #i101872# HitTest unifications
2009-05-15 16:54:22 +0200 aw r271946 : #i101872# HitTest unifications
2009-05-12 19:08:38 +0200 aw r271834 : #i101684# corrected AutoShape's preparation of text transformation due to different definitions in TextBounds
2009-05-12 15:44:49 +0200 aw r271827 : #i89784# expanded TextLayouterDevice::getTextOutlines() to support DXArray and X-Font scaling
2009-05-11 19:40:40 +0200 aw r271790 : #i99385# extended HitTest primitive usage, removed IsHdlHit implementations; prepared further HitTest simplifications
2009-05-11 19:40:25 +0200 aw r271789 : #i99385# extended HitTest primitive usage, removed IsHdlHit implementations; prepared further HitTest simplifications
2009-05-11 19:40:12 +0200 aw r271788 : #i99385# extended HitTest primitive usage, removed IsHdlHit implementations; prepared further HitTest simplifications
2009-05-11 13:01:53 +0200 aw r271765 : #i99385# corrections and optimizations
2009-05-08 14:48:40 +0200 aw r271718 : #i1016180# added optimizations in model operations when model is locked
2009-05-08 14:11:45 +0200 aw r271716 : #i101679# added flush() calls to OverlayManager when interaction step is prepared
2009-05-07 17:44:03 +0200 aw r271689 : #i99385# last corrections/changes
2009-05-07 17:43:47 +0200 aw r271688 : #i99385# last corrections/changes
2009-05-07 13:20:09 +0200 aw r271654 : #i99385# added changes from WFH
2009-05-07 13:19:38 +0200 aw r271653 : #i99385# added changes from WFH
2009-05-07 13:19:11 +0200 aw r271652 : #i99385# added changes from WFH
2009-05-07 11:33:17 +0200 aw r271643 : #i99385# corrections after resync
2009-05-07 11:17:31 +0200 aw r271642 : #i99385# corrections after resync
2009-05-06 18:46:53 +0200 aw r271609 : CWS-TOOLING: rebase CWS aw065 to trunk at 271427 (milestone: DEV300:m47)
2009-05-05 18:24:03 +0200 aw r271548 : #i101443# force new text decomposition when TextBackgroundColor has changed
2009-05-05 17:44:42 +0200 aw r271542 : #i99385# 3rd round, simplifications and corrections done
2009-05-05 17:44:32 +0200 aw r271541 : #i99385# 3rd round, simplifications and corrections done
2009-05-05 17:44:20 +0200 aw r271540 : #i99385# 3rd round, simplifications and corrections done
2009-05-05 17:44:09 +0200 aw r271539 : #i99385# 3rd round, simplifications and corrections done
2009-05-05 15:48:38 +0200 aw r271527 : #i99385# 2nd round, usages checked and corrected
2009-05-05 15:48:15 +0200 aw r271526 : #i99385# 2nd round, usages checked and corrected
2009-05-05 15:48:03 +0200 aw r271525 : #i99385# 2nd round, usages checked and corrected
2009-05-05 15:47:51 +0200 aw r271524 : #i99385# 2nd round, usages checked and corrected
2009-04-27 18:33:10 +0200 aw r271300 : #i99385# state commit after all implementations are done
2009-04-27 15:36:53 +0200 aw r271283 : #i99385# state commit after all implementations are done
2009-04-27 15:27:49 +0200 aw r271280 : #i99385# state commit after all implementations are done
2009-04-27 15:27:33 +0200 aw r271279 : #i99385# state commit after all implementations are done
2009-04-27 15:27:00 +0200 aw r271278 : #i99385# state commit after all implementations are done
2009-04-27 15:26:15 +0200 aw r271277 : #i99385# state commit after all implementations are done
2009-04-27 15:25:40 +0200 aw r271275 : #i99385# state commit after all implementations are done
2009-04-27 15:25:19 +0200 aw r271274 : #i99385# state commit after all implementations are done
2009-04-27 15:24:00 +0200 aw r271272 : #i99385# state commit after all implementations are done
2009-03-19 17:12:00 +0100 aw r269757 : #i100360# corrected bitmap's PefSize calculation for bitmap filled objects when Bitmap is Pixel-based on it's mapping
2009-02-19 17:09:47 +0100 aw r268298 : #i98917# corrected attributes
2009-02-19 17:09:30 +0100 aw r268297 : #i98917# corrected attributes
2009-02-19 17:08:22 +0100 aw r268296 : #i98917# corrected attributes
2009-02-19 11:56:25 +0100 aw r268268 : #i98870# added extra code to react on PageNumber change
2009-02-18 16:57:24 +0100 aw r268243 : #i98917# in OverlayHatchRect::getGeometry the rotation was not applied to the TopLeft of the centered rectangle, but to the already extended one, thus the visualisation was rotating around the wrong edge
diff --git a/sd/inc/sd_primitivetypes2d.hxx b/sd/inc/sd_primitivetypes2d.hxx
index e8b68b0..1329c34 100644
--- a/sd/inc/sd_primitivetypes2d.hxx
+++ b/sd/inc/sd_primitivetypes2d.hxx
@@ -43,6 +43,7 @@
#define PRIMITIVE2D_ID_SDPAGEOBJECTPAGEBITMAPPRIMITIVE (PRIMITIVE2D_ID_RANGE_SD| 2)
#define PRIMITIVE2D_ID_SDPAGEOBJECTBORDERPRIMITIVE (PRIMITIVE2D_ID_RANGE_SD| 3)
#define PRIMITIVE2D_ID_SDPAGEOBJECTFADENAMENUMBERPRIMITIVE (PRIMITIVE2D_ID_RANGE_SD| 4)
+#define PRIMITIVE2D_ID_SDMOUSEOVEREFFECTPRIMITIVE (PRIMITIVE2D_ID_RANGE_SD| 5)
//////////////////////////////////////////////////////////////////////////////
diff --git a/sd/source/ui/animations/motionpathtag.cxx b/sd/source/ui/animations/motionpathtag.cxx
index 34942f4..5f5ca8f 100644
--- a/sd/source/ui/animations/motionpathtag.cxx
+++ b/sd/source/ui/animations/motionpathtag.cxx
@@ -41,7 +41,6 @@
#include <sfx2/dispatch.hxx>
#include <svx/sdr/overlay/overlaymanager.hxx>
-#include <svx/sdr/overlay/overlaysdrobject.hxx>
#include <svx/sdr/overlay/overlaypolypolygon.hxx>
#include <svx/svdpagv.hxx>
#include <svx/sdrpagewindow.hxx>
@@ -68,6 +67,9 @@
#include "app.hrc"
#include "Window.hxx"
+#include <svx/sdr/contact/viewcontact.hxx>
+#include <svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx>
+
using ::rtl::OUString;
using ::sdr::PolyPolygonEditor;
using namespace ::com::sun::star::uno;
@@ -310,26 +312,18 @@ void SdPathHdl::CreateB2dIAObject()
{
for(sal_uInt32 b(0L); b < pPageView->PageWindowCount(); b++)
{
- // const SdrPageViewWinRec& rPageViewWinRec = rPageViewWinList[b];
const SdrPageWindow& rPageWindow = *pPageView->GetPageWindow(b);
if(rPageWindow.GetPaintWindow().OutputToWindow())
{
- if(rPageWindow.GetOverlayManager())
+ if(rPageWindow.GetOverlayManager() && mpPathObj)
{
- const SdrPathObj& rPath = *mpPathObj;
-
- ::sdr::overlay::OverlayObject* pNewOverlayObject = new
- ::sdr::overlay::OverlaySdrObject(basegfx::B2DPoint(), rPath);
- //::sdr::overlay::OverlayPolyPolygonStriped( maPolyPolygon );
- DBG_ASSERT(pNewOverlayObject, "Got NO new IAO!");
+ const sdr::contact::ViewContact& rVC = mpPathObj->GetViewContact();
+ const drawinglayer::primitive2d::Primitive2DSequence aSequence = rVC.getViewIndependentPrimitive2DSequence();
+ sdr::overlay::OverlayObject* pNew = new sdr::overlay::OverlayPrimitive2DSequenceObject(aSequence);
- // OVERLAYMANAGER
- if(pNewOverlayObject)
- {
- rPageWindow.GetOverlayManager()->add(*pNewOverlayObject);
- maOverlayGroup.append(*pNewOverlayObject);
- }
+ rPageWindow.GetOverlayManager()->add(*pNew);
+ maOverlayGroup.append(*pNew);
}
}
}
diff --git a/sd/source/ui/func/fuconstr.cxx b/sd/source/ui/func/fuconstr.cxx
index 338cbec..6072ec8 100644
--- a/sd/source/ui/func/fuconstr.cxx
+++ b/sd/source/ui/func/fuconstr.cxx
@@ -220,7 +220,7 @@ BOOL FuConstruct::MouseButtonUp(const MouseEvent& rMEvt)
SdrPageView* pPV;
USHORT nHitLog = USHORT ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() );
- if (!mpView->PickObj(aPnt, pObj, pPV))
+ if (!mpView->PickObj(aPnt, mpView->getHitTolLog(), pObj, pPV))
{
mpView->MarkObj(aPnt, nHitLog);
}
diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx
index 89197b3..a313fd8 100644
--- a/sd/source/ui/func/fudraw.cxx
+++ b/sd/source/ui/func/fudraw.cxx
@@ -78,8 +78,8 @@
#include "fusel.hxx"
#include <svtools/aeitem.hxx>
#include <vcl/msgbox.hxx>
-
#include "slideshow.hxx"
+#include <svx/sdrhittesthelper.hxx>
using namespace ::com::sun::star;
@@ -690,7 +690,7 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt)
if (eHit == SDRHIT_NONE)
{
// found nothing -> look after at the masterpage
- mpView->PickObj(aPnt, pObj, pPV, SDRSEARCH_ALSOONMASTER);
+ mpView->PickObj(aPnt, mpView->getHitTolLog(), pObj, pPV, SDRSEARCH_ALSOONMASTER);
}
else if (eHit == SDRHIT_UNMARKEDOBJECT)
{
@@ -719,7 +719,7 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt)
if (bDefPointer && (pObj->ISA(SdrObjGroup) || pObj->ISA(E3dPolyScene)))
{
// In die Gruppe hineinschauen
- if (mpView->PickObj(aPnt, pObj, pPV, SDRSEARCH_ALSOONMASTER | SDRSEARCH_DEEP))
+ if (mpView->PickObj(aPnt, mpView->getHitTolLog(), pObj, pPV, SDRSEARCH_ALSOONMASTER | SDRSEARCH_DEEP))
bDefPointer = !SetPointer(pObj, aPnt);
}
}
@@ -767,10 +767,10 @@ BOOL FuDraw::SetPointer(SdrObject* pObj, const Point& rPos)
aHitPosB.Y() -= n2HitLog;
if ( !pObj->IsClosedObj() ||
- ( pObj->IsHit(aHitPosR, nHitLog, pVisiLayer) &&
- pObj->IsHit(aHitPosL, nHitLog, pVisiLayer) &&
- pObj->IsHit(aHitPosT, nHitLog, pVisiLayer) &&
- pObj->IsHit(aHitPosB, nHitLog, pVisiLayer) ) )
+ ( SdrObjectPrimitiveHit(*pObj, aHitPosR, nHitLog, *mpView->GetSdrPageView(), pVisiLayer, false) &&
+ SdrObjectPrimitiveHit(*pObj, aHitPosL, nHitLog, *mpView->GetSdrPageView(), pVisiLayer, false) &&
+ SdrObjectPrimitiveHit(*pObj, aHitPosT, nHitLog, *mpView->GetSdrPageView(), pVisiLayer, false) &&
+ SdrObjectPrimitiveHit(*pObj, aHitPosB, nHitLog, *mpView->GetSdrPageView(), pVisiLayer, false)))
{
/**********************************************************
* hit inside the object (without margin) or open object
@@ -922,7 +922,7 @@ BOOL FuDraw::RequestHelp(const HelpEvent& rHEvt)
Point aPos(mpWindow->PixelToLogic(mpWindow->ScreenToOutputPixel(aPosPixel)));
- if (mpView->PickObj(aPos, pObj, pPV, SDRSEARCH_ALSOONMASTER | SDRSEARCH_DEEP))
+ if (mpView->PickObj(aPos, mpView->getHitTolLog(), pObj, pPV, SDRSEARCH_ALSOONMASTER | SDRSEARCH_DEEP))
bReturn = SetHelpText(pObj, aPosPixel, aVEvt);
}
}
diff --git a/sd/source/ui/func/fudspord.cxx b/sd/source/ui/func/fudspord.cxx
index bbf0cae..0f9b61a 100644
--- a/sd/source/ui/func/fudspord.cxx
+++ b/sd/source/ui/func/fudspord.cxx
@@ -116,7 +116,7 @@ BOOL FuDisplayOrder::MouseMove(const MouseEvent& rMEvt)
SdrPageView* pPV;
Point aPnt( mpWindow->PixelToLogic( rMEvt.GetPosPixel() ) );
- if ( mpView->PickObj(aPnt, pPickObj, pPV) )
+ if ( mpView->PickObj(aPnt, mpView->getHitTolLog(), pPickObj, pPV) )
{
if (mpRefObj != pPickObj)
{
@@ -153,7 +153,7 @@ BOOL FuDisplayOrder::MouseButtonUp(const MouseEvent& rMEvt)
SdrPageView* pPV = NULL;
Point aPnt( mpWindow->PixelToLogic( rMEvt.GetPosPixel() ) );
- if ( mpView->PickObj(aPnt, mpRefObj, pPV) )
+ if ( mpView->PickObj(aPnt, mpView->getHitTolLog(), mpRefObj, pPV) )
{
if (nSlotId == SID_BEFORE_OBJ)
{
diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx
index 2de7832..08beb46 100644
--- a/sd/source/ui/func/fusel.cxx
+++ b/sd/source/ui/func/fusel.cxx
@@ -91,6 +91,8 @@
#include <svx/svdundo.hxx>
#include <avmedia/mediawindow.hxx>
+#include <svx/sdrhittesthelper.hxx>
+
using namespace ::com::sun::star;
namespace sd {
@@ -264,7 +266,7 @@ BOOL FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
}
else
{
- if (!rMEvt.IsMod2() && mpView->PickObj(aMDPos, pObj, pPV, SDRSEARCH_PICKMACRO))
+ if (!rMEvt.IsMod2() && mpView->PickObj(aMDPos, mpView->getHitTolLog(), pObj, pPV, SDRSEARCH_PICKMACRO))
{
mpView->BegMacroObj(aMDPos, nHitLog, pObj, pPV, mpWindow);
bReturn = TRUE;
@@ -320,7 +322,7 @@ BOOL FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
&& mpViewShell->ISA(DrawViewShell)
)
{
- if(mpView->PickObj(aMDPos, pObj, pPV, SDRSEARCH_ALSOONMASTER))
+ if(mpView->PickObj(aMDPos, mpView->getHitTolLog(), pObj, pPV, SDRSEARCH_ALSOONMASTER))
{
// Animate object when not just selecting.
if ( ! bSelectionOnly)
@@ -331,7 +333,7 @@ BOOL FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
if(rMEvt.GetClicks() == 1)
{
// In die Gruppe hineinschauen
- if (mpView->PickObj(aMDPos, pObj, pPV, SDRSEARCH_ALSOONMASTER | SDRSEARCH_DEEP))
+ if (mpView->PickObj(aMDPos, mpView->getHitTolLog(), pObj, pPV, SDRSEARCH_ALSOONMASTER | SDRSEARCH_DEEP))
bReturn = AnimateObj(pObj, aMDPos);
}
else if( !bReadOnly && rMEvt.GetClicks() == 2)
@@ -1212,10 +1214,10 @@ BOOL FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos)
if ( !bClosed ||
!bFilled ||
- (pObj->IsHit( aHitPosR, nHitLog, pVisiLayer ) &&
- pObj->IsHit( aHitPosL, nHitLog, pVisiLayer ) &&
- pObj->IsHit( aHitPosT, nHitLog, pVisiLayer ) &&
- pObj->IsHit( aHitPosB, nHitLog, pVisiLayer ) ) )
+ (SdrObjectPrimitiveHit(*pObj, aHitPosR, nHitLog, *mpView->GetSdrPageView(), pVisiLayer, false) &&
+ SdrObjectPrimitiveHit(*pObj, aHitPosL, nHitLog, *mpView->GetSdrPageView(), pVisiLayer, false) &&
+ SdrObjectPrimitiveHit(*pObj, aHitPosT, nHitLog, *mpView->GetSdrPageView(), pVisiLayer, false) &&
+ SdrObjectPrimitiveHit(*pObj, aHitPosB, nHitLog, *mpView->GetSdrPageView(), pVisiLayer, false) ) )
{
if ( mpDoc->GetIMapInfo( pObj ) )
{
diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx
index cacb120..4a6032e 100644
--- a/sd/source/ui/func/futext.cxx
+++ b/sd/source/ui/func/futext.cxx
@@ -325,7 +325,7 @@ BOOL FuText::MouseButtonDown(const MouseEvent& rMEvt)
{
BOOL bMacro = FALSE;
- if (bMacro && mpView->PickObj(aMDPos,pObj,pPV,SDRSEARCH_PICKMACRO))
+ if (bMacro && mpView->PickObj(aMDPos,mpView->getHitTolLog(),pObj,pPV,SDRSEARCH_PICKMACRO))
{
// Makro
USHORT nHitLog = USHORT ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() );
@@ -1037,7 +1037,7 @@ void FuText::Activate()
mpView->SetQuickTextEditMode(mpViewShell->GetFrameView()->IsQuickEdit());
// #i89661# it's no longer necessary to make it so big here, it's fine tuned
- // for text objects in SdrMarkView::ImpCheckObjHit
+ // for text objects in SdrMarkView::CheckSingleSdrObjectHit
mpView->SetHitTolerancePixel( 2 * HITPIX );
OutlinerView* pOLV = mpView->GetTextEditOutlinerView();
diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
index 3598414..15ebffe 100644
--- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
+++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
@@ -431,7 +431,7 @@ bool SlideSorterController::Command (
// would take place.
mrView.GetOverlay().GetInsertionIndicatorOverlay().SetPosition(
pWindow->PixelToLogic(rEvent.GetMousePosPixel()));
- mrView.GetOverlay().GetInsertionIndicatorOverlay().Show();
+ mrView.GetOverlay().GetInsertionIndicatorOverlay().setVisible(true);
}
pWindow->ReleaseMouse();
@@ -477,7 +477,7 @@ bool SlideSorterController::Command (
// finds the right place to insert a new slide.
GetSelectionManager()->SetInsertionPosition(
mrView.GetOverlay().GetInsertionIndicatorOverlay().GetInsertionPageIndex());
- mrView.GetOverlay().GetInsertionIndicatorOverlay().Hide();
+ mrView.GetOverlay().GetInsertionIndicatorOverlay().setVisible(false);
}
bEventHasBeenHandled = true;
}
diff --git a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
index 5ac9be3..eb0b136 100644
--- a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
@@ -235,7 +235,7 @@ sal_Int32 Clipboard::GetInsertionPosition (::Window* pWindow)
view::InsertionIndicatorOverlay& rInsertionIndicatorOverlay (
mrSlideSorter.GetView().GetOverlay().GetInsertionIndicatorOverlay());
- if (rInsertionIndicatorOverlay.IsShowing())
+ if (rInsertionIndicatorOverlay.isVisible())
{
nInsertPosition = rInsertionIndicatorOverlay.GetInsertionPageIndex();
}
@@ -441,8 +441,8 @@ void Clipboard::StartDrag (
void Clipboard::DragFinished (sal_Int8 nDropAction)
{
// Hide the substitution display and insertion indicator.
- mrSlideSorter.GetView().GetOverlay().GetSubstitutionOverlay().Hide();
- mrSlideSorter.GetView().GetOverlay().GetInsertionIndicatorOverlay().Hide();
+ mrSlideSorter.GetView().GetOverlay().GetSubstitutionOverlay().setVisible(false);
+ mrSlideSorter.GetView().GetOverlay().GetInsertionIndicatorOverlay().setVisible(false);
SdTransferable* pDragTransferable = SD_MOD()->pTransferDrag;
@@ -522,7 +522,7 @@ sal_Int8 Clipboard::AcceptDrop (
Point aPosition = pTargetWindow->PixelToLogic (rEvent.maPosPixel);
view::ViewOverlay& rOverlay (mrSlideSorter.GetView().GetOverlay());
rOverlay.GetInsertionIndicatorOverlay().SetPosition (aPosition);
- rOverlay.GetInsertionIndicatorOverlay().Show();
+ rOverlay.GetInsertionIndicatorOverlay().setVisible(true);
rOverlay.GetSubstitutionOverlay().SetPosition (aPosition);
// Scroll the window when the mouse reaches the window border.
@@ -581,7 +581,7 @@ sal_Int8 Clipboard::ExecuteDrop (
USHORT nIndex = DetermineInsertPosition (*pDragTransferable);
OSL_TRACE ("Clipboard::AcceptDrop() called for index %d",
nIndex);
- rOverlay.GetInsertionIndicatorOverlay().Hide();
+ rOverlay.GetInsertionIndicatorOverlay().setVisible(false);
if (bContinue)
{
diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
index 5329724..c674a4d 100644
--- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
@@ -243,9 +243,9 @@ BOOL SelectionFunction::MouseMove (const MouseEvent& rEvent)
rOverlay.GetMouseOverIndicatorOverlay().SetSlideUnderMouse(
rEvent.IsLeaveWindow() ? model::SharedPageDescriptor() : pHitDescriptor);
if (pHitDescriptor.get() != NULL)
- rOverlay.GetMouseOverIndicatorOverlay().Show();
+ rOverlay.GetMouseOverIndicatorOverlay().setVisible(true);
else
- rOverlay.GetMouseOverIndicatorOverlay().Hide();
+ rOverlay.GetMouseOverIndicatorOverlay().setVisible(false);
// Allow one mouse move before the drag timer is disabled.
if (aDragTimer.IsActive())
@@ -258,7 +258,7 @@ BOOL SelectionFunction::MouseMove (const MouseEvent& rEvent)
Rectangle aRectangle (Point(0,0),mpWindow->GetOutputSizePixel());
if ( ! aRectangle.IsInside(aMousePosition)
- && rOverlay.GetSubstitutionOverlay().IsShowing())
+ && rOverlay.GetSubstitutionOverlay().isVisible())
{
// Mouse left the window with pressed left button. Make it a drag.
StartDrag();
@@ -598,11 +598,11 @@ void SelectionFunction::ProcessRectangleSelection (bool bToggleSelection)
return;
view::ViewOverlay& rOverlay (mrSlideSorter.GetView().GetOverlay());
- if (rOverlay.GetSelectionRectangleOverlay().IsShowing())
+ if (rOverlay.GetSelectionRectangleOverlay().isVisible())
{
PageSelector& rSelector (mrController.GetPageSelector());
- rOverlay.GetSelectionRectangleOverlay().Hide();
+ rOverlay.GetSelectionRectangleOverlay().setVisible(false);
// Select all pages whose page object lies completly inside the drag
// rectangle.
@@ -717,7 +717,7 @@ void SelectionFunction::ClearOverlays (void)
{
view::ViewOverlay& rOverlay (mrSlideSorter.GetView().GetOverlay());
- rOverlay.GetSubstitutionOverlay().Hide();
+ rOverlay.GetSubstitutionOverlay().setVisible(false);
rOverlay.GetSubstitutionOverlay().Clear();
mpInsertionIndicatorHandler->End();
@@ -795,9 +795,9 @@ sal_uInt32 SelectionFunction::EncodeMouseEvent (
// Detect whether we are dragging pages or dragging a selection rectangle.
view::ViewOverlay& rOverlay (mrSlideSorter.GetView().GetOverlay());
- if (rOverlay.GetSubstitutionOverlay().IsShowing())
+ if (rOverlay.GetSubstitutionOverlay().isVisible())
nEventCode |= SUBSTITUTION_VISIBLE;
- if (rOverlay.GetSelectionRectangleOverlay().IsShowing())
+ if (rOverlay.GetSelectionRectangleOverlay().isVisible())
nEventCode |= RECTANGLE_VISIBLE;
return nEventCode;
@@ -853,9 +853,9 @@ sal_uInt32 SelectionFunction::EncodeKeyEvent (
// Detect whether we are dragging pages or dragging a selection rectangle.
view::ViewOverlay& rOverlay (mrSlideSorter.GetView().GetOverlay());
- if (rOverlay.GetSubstitutionOverlay().IsShowing())
+ if (rOverlay.GetSubstitutionOverlay().isVisible())
nEventCode |= SUBSTITUTION_VISIBLE;
- if (rOverlay.GetSelectionRectangleOverlay().IsShowing())
+ if (rOverlay.GetSelectionRectangleOverlay().isVisible())
nEventCode |= RECTANGLE_VISIBLE;
return nEventCode;
@@ -1070,20 +1070,20 @@ void SelectionFunction::EventPostprocessing (const EventDescriptor& rDescriptor)
// case that the context menu is visible.
DBG_ASSERT(
mrController.IsContextMenuOpen()
- || !rOverlay.GetInsertionIndicatorOverlay().IsShowing(),
+ || !rOverlay.GetInsertionIndicatorOverlay().isVisible(),
"slidesorter::SelectionFunction: insertion indicator still visible");
DBG_ASSERT(
- !rOverlay.GetSubstitutionOverlay().IsShowing(),
+ !rOverlay.GetSubstitutionOverlay().isVisible(),
"slidesorter::SelectionFunction: substitution still visible");
DBG_ASSERT(
- !rOverlay.GetSelectionRectangleOverlay().IsShowing(),
+ !rOverlay.GetSelectionRectangleOverlay().isVisible(),
"slidesorter::SelectionFunction: selection rectangle still visible");
// Now turn them off.
if ( ! mrController.IsContextMenuOpen())
- rOverlay.GetInsertionIndicatorOverlay().Hide();
- rOverlay.GetSubstitutionOverlay().Hide();
- rOverlay.GetSelectionRectangleOverlay().Hide();
+ rOverlay.GetInsertionIndicatorOverlay().setVisible(false);
+ rOverlay.GetSubstitutionOverlay().setVisible(false);
+ rOverlay.GetSelectionRectangleOverlay().setVisible(false);
}
}
@@ -1193,7 +1193,7 @@ SelectionFunction::SubstitutionHandler::~SubstitutionHandler (void)
if (mrSlideSorter.IsValid())
{
view::ViewOverlay& rOverlay (mrSlideSorter.GetView().GetOverlay());
- rOverlay.GetSubstitutionOverlay().Hide();
+ rOverlay.GetSubstitutionOverlay().setVisible(false);
rOverlay.GetSubstitutionOverlay().Clear();
}
}
@@ -1212,14 +1212,14 @@ void SelectionFunction::SubstitutionHandler::Start (const Point& rMouseModelPosi
view::ViewOverlay& rOverlay (mrSlideSorter.GetView().GetOverlay());
- if ( ! rOverlay.GetSubstitutionOverlay().IsShowing())
+ if ( ! rOverlay.GetSubstitutionOverlay().isVisible())
{
// Show a new substitution for the selected page objects.
model::PageEnumeration aSelectedPages(
model::PageEnumerationProvider::CreateSelectedPagesEnumeration(
mrSlideSorter.GetModel()));
rOverlay.GetSubstitutionOverlay().Create(aSelectedPages, rMouseModelPosition);
- rOverlay.GetSubstitutionOverlay().Show();
+ rOverlay.GetSubstitutionOverlay().setVisible(true);
mbHasBeenMoved = false;
}
else
@@ -1240,7 +1240,7 @@ void SelectionFunction::SubstitutionHandler::UpdatePosition (const Point& rMouse
rOverlay.GetSubstitutionOverlay().SetPosition(rMouseModelPosition);
rOverlay.GetInsertionIndicatorOverlay().SetPosition(rMouseModelPosition);
- rOverlay.GetInsertionIndicatorOverlay().Show();
+ rOverlay.GetInsertionIndicatorOverlay().setVisible(true);
mbHasBeenMoved = true;
}
@@ -1279,9 +1279,9 @@ void SelectionFunction::SubstitutionHandler::Process (void)
void SelectionFunction::SubstitutionHandler::End (void)
{
view::ViewOverlay& rOverlay (mrSlideSorter.GetView().GetOverlay());
- rOverlay.GetSubstitutionOverlay().Hide();
+ rOverlay.GetSubstitutionOverlay().setVisible(false);
rOverlay.GetSubstitutionOverlay().Clear();
- rOverlay.GetInsertionIndicatorOverlay().Hide();
+ rOverlay.GetInsertionIndicatorOverlay().setVisible(false);
}
@@ -1304,9 +1304,9 @@ bool SelectionFunction::SubstitutionHandler::IsSubstitutionInsertionNonTrivial (
view::ViewOverlay& rOverlay (mrSlideSorter.GetView().GetOverlay());
// Make sure that the substitution and the insertion indicator are visible.
- if ( ! rOverlay.GetSubstitutionOverlay().IsShowing())
+ if ( ! rOverlay.GetSubstitutionOverlay().isVisible())
break;
- if ( ! rOverlay.GetInsertionIndicatorOverlay().IsShowing())
+ if ( ! rOverlay.GetInsertionIndicatorOverlay().isVisible())
break;
// Iterate over all selected pages and check whether there are
@@ -1381,7 +1381,7 @@ void SelectionFunction::InsertionIndicatorHandler::Start (const Point& rMouseMod
view::ViewOverlay& rOverlay (mrSlideSorter.GetView().GetOverlay());
rOverlay.GetInsertionIndicatorOverlay().SetPosition(rMouseModelPosition);
- rOverlay.GetInsertionIndicatorOverlay().Show();
+ rOverlay.GetInsertionIndicatorOverlay().setVisible(true);
}
@@ -1401,7 +1401,7 @@ void SelectionFunction::InsertionIndicatorHandler::UpdatePosition (const Point&
void SelectionFunction::InsertionIndicatorHandler::End (void)
{
- mrSlideSorter.GetView().GetOverlay().GetInsertionIndicatorOverlay().Hide();
+ mrSlideSorter.GetView().GetOverlay().GetInsertionIndicatorOverlay().setVisible(false);
}
} } } // end of namespace ::sd::slidesorter::controller
diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
index 0a396f9..dff6e00 100644
--- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
@@ -1076,7 +1076,7 @@ void SlotManager::InsertSlide (SfxRequest& rRequest)
// No selection. Is there an insertion indicator?
else if (mrSlideSorter.GetView().GetOverlay()
- .GetInsertionIndicatorOverlay().IsShowing())
+ .GetInsertionIndicatorOverlay().isVisible())
{
// Select the page before the insertion indicator.
nInsertionIndex = mrSlideSorter.GetView().GetOverlay()
diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewObjectContact.hxx b/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewObjectContact.hxx
index 6988f68..e426794 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewObjectContact.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewObjectContact.hxx
@@ -105,13 +105,6 @@ public:
*/
model::SharedPageDescriptor GetPageDescriptor (void) const;
- /** Return the device independent part of the page border. This border
- is returned in pixel coordinates. Note that the device dependent
- parts--for the page number and the page title--have to be added.
- This is done by CalculatePageModelBorder().
- */
- static SvBorder GetPagePixelBorder (void);
-
/** Return the border widths in the screen coordinate system of the
border arround the page object. The border contains frames for
selection, focus, the page name and number, and the indicator for
@@ -144,7 +137,7 @@ public:
When bVisible is <FALSE/> then paint the area of the mouse over
effect in the background color, i.e. erase it.
*/
- void PaintMouseOverEffect (OutputDevice& rDevice, bool bVisible) const;
+ drawinglayer::primitive2d::Primitive2DSequence createMouseOverEffectPrimitive2DSequence();
enum BoundingBoxType {
// This is the outer bounding box that includes the preview, page
@@ -189,33 +182,6 @@ public:
// access to the current page content primitive vector which may be used for visualisation
const drawinglayer::primitive2d::Primitive2DSequence& getCurrentPageContents() const { return mxCurrentPageContents; }
- /** This convenience method paints a dotted or dashed rectangle. The
- length of dots or dashes is indepent of zoom factor or map mode.
- */
- enum DashType { Dotted, Dashed };
- static void PaintDottedRectangle (
- OutputDevice& rDevice,
- const Rectangle& rRectangle,
- const DashType eDashType = Dotted);
-
-
- enum ColorSpec { CS_SELECTION, CS_BACKGROUND, CS_WINDOW, CS_TEXT };
- /** Return a color for one of the screen elements in ColorSpec. For
- Background the background color is updated when
- mbIsBackgroundColorUpdatePending is <TRUE/>.
- @param rDevice
- Base colors are taken from the device.
- @param eSpec
- The type of color to return.
- @param nOpacity
- This parameter controls the blending between the background and
- the actual color.
- */
- Color GetColor (
- const OutputDevice& rDevice,
- const ColorSpec eSpec,
- const double nOpacity = 1.0) const;
-
virtual void ActionChanged (void);
private:
@@ -239,11 +205,6 @@ private:
*/
bool mbInDestructor;
- /** Set this flag to <TRUE/> to update the background color on the next
- call to GetBackgroundColor().
- */
- mutable bool mbIsBackgroundColorUpdatePending;
-
/// The primitive sequence of the page contents, completely scaled
/// and prepared for painiting
drawinglayer::primitive2d::Primitive2DSequence mxCurrentPageContents;
@@ -252,12 +213,6 @@ private:
::boost::shared_ptr<controller::Properties> mpProperties;
- /** Do not use this member directly. Use GetColor(Background) instead.
- That method determines the background color when
- mbIsBackgroundColorUpdatePending is <TRUE/>.
- */
- mutable Color maBackgroundColor;
-
BitmapEx GetPreview (
const sdr::contact::DisplayInfo& rDisplayInfo,
const Rectangle& rNewSizePixel);
@@ -266,46 +221,6 @@ private:
is painted).
*/
Rectangle GetPageNumberArea (OutputDevice& rDevice) const;
-
- void PaintBackground (OutputDevice& rDevice) const;
-
- /** Paint the preview bitmap.
- */
- void PaintPreview (OutputDevice& rDevice);
-
- /** Paint a border arround the page preview.
- */
- void PaintBorder (OutputDevice& rDevice) const;
-
- /** Paint the focus indicator for the specified page.
- */
- void PaintFocusIndicator (
- OutputDevice& rDevice,
- bool bEraseBackground) const;
-
- /** Paint the selection indicator when the page is currently selected.
- Otherwise the call is ignored.
- */
- void PaintSelectionIndicator (OutputDevice& rDevice) const;
-
- /** Paint the fade effect indicator which indicates whether a fade
- effect is currently associated with a page.
- @param rDescriptor
- The descriptor of the page for which to paint the fade effect
- indicator.
- */
- void PaintFadeEffectIndicator (OutputDevice& rDevice) const;
-
- /** Paint the name of the page to the bottom right of the page object.
- */
- void PaintPageName (OutputDevice& rDevice) const;
-
- /** Paint the number of the page to the upper left of the page object.
- */
- void PaintPageNumber (
- ::sdr::contact::DisplayInfo& rDisplayInfo);
-
- Color GetBackgroundColor (const OutputDevice& rDevice) const;
};
} } } // end of namespace ::sd::slidesorter::view
diff --git a/sd/source/ui/slidesorter/inc/view/SlsViewOverlay.hxx b/sd/source/ui/slidesorter/inc/view/SlsViewOverlay.hxx
index 6019363..d8cf4a9 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsViewOverlay.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsViewOverlay.hxx
@@ -74,28 +74,17 @@ class ViewOverlay;
support for the display.
*/
class OverlayBase
- : private ::boost::noncopyable,
- public sdr::overlay::OverlayObject
+ : public sdr::overlay::OverlayObject
{
public:
OverlayBase (ViewOverlay& rViewOverlay);
virtual ~OverlayBase (void);
- virtual void Paint (void);
-
- virtual void Show (void);
- virtual void Hide (void);
- void Toggle (void);
- bool IsShowing (void);
- ViewOverlay& GetViewOverlay (void);
-
protected:
::osl::Mutex maMutex;
ViewOverlay& mrViewOverlay;
- virtual void transform (const basegfx::B2DHomMatrix& rMatrix);
-
/** Make sure that the overlay object is registered at the
OverlayManager. This registration is done on demand.
*/
@@ -134,15 +123,16 @@ public:
void SetPosition (const Point& rPosition);
Point GetPosition (void) const;
+ // react on stripe definition change
+ virtual void stripeDefinitionHasChanged();
+
protected:
- virtual void drawGeometry (OutputDevice& rOutputDevice);
- virtual void createBaseRange (OutputDevice& rOutputDevice);
+ // geometry creation for OverlayObject
+ virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence();
private:
Point maPosition;
- Point maTranslation;
- Rectangle maBoundingBox;
- ::std::vector<Rectangle> maShapes;
+ basegfx::B2DPolyPolygon maShapes;
};
@@ -163,9 +153,12 @@ public:
Rectangle GetSelectionRectangle (void);
+ // react on stripe definition change
+ virtual void stripeDefinitionHasChanged();
+
protected:
- virtual void drawGeometry (OutputDevice& rOutputDevice);
- virtual void createBaseRange (OutputDevice& rOutputDevice);
+ // geometry creation for OverlayObject
+ virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence();
private:
Point maAnchor;
@@ -193,8 +186,8 @@ public:
sal_Int32 GetInsertionPageIndex (void) const;
protected:
- virtual void drawGeometry (OutputDevice& rOutputDevice);
- virtual void createBaseRange (OutputDevice& rOutputDevice);
+ // geometry creation for OverlayObject
+ virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence();
private:
sal_Int32 mnInsertionIndex;
@@ -223,8 +216,8 @@ public:
void SetSlideUnderMouse (const model::SharedPageDescriptor& rpDescriptor);
protected:
- virtual void drawGeometry (OutputDevice& rOutputDevice);
- virtual void createBaseRange (OutputDevice& rOutputDevice);
+ // geometry creation for OverlayObject
+ virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence();
private:
/** The page under the mouse is stored as weak shared pointer so that
diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx
index 457defd..80bcca1 100644
--- a/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx
+++ b/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx
@@ -90,11 +90,9 @@ PageObjectViewObjectContact::PageObjectViewObjectContact (
const ::boost::shared_ptr<controller::Properties>& rpProperties)
: ViewObjectContactOfPageObj(rObjectContact, rViewContact),
mbInDestructor(false),
- mbIsBackgroundColorUpdatePending(true),
mxCurrentPageContents(),
mpCache(rpCache),
- mpProperties(rpProperties),
- maBackgroundColor()
+ mpProperties(rpProperties)
{
SharedPageDescriptor pDescriptor (GetPageDescriptor());
OSL_ASSERT(pDescriptor.get()!=NULL);
@@ -1139,71 +1137,128 @@ void PageObjectViewObjectContact::ActionChanged (void)
GetPage());
}
- mbIsBackgroundColorUpdatePending = true;
-
// call parent
ViewObjectContactOfPageObj::ActionChanged();
}
+//////////////////////////////////////////////////////////////////////////////
+// helper MouseOverEffectPrimitive
+//
+// Used to allow view-dependent primitive definition. For that purpose, the
+// initially created primitive (here: in createMouseOverEffectPrimitive2DSequence())
+// always has to be view-independent, but the decomposition is made view-dependent.
+// Very simple primitive which just remembers the discrete data and applies
+// it at decomposition time.
+class MouseOverEffectPrimitive : public drawinglayer::primitive2d::BasePrimitive2D
+{
+private:
+ basegfx::B2DRange maLogicRange;
+ sal_uInt32 mnDiscreteOffset;
+ sal_uInt32 mnDiscreteWidth;
+ basegfx::BColor maRGBColor;
+protected:
+ virtual drawinglayer::primitive2d::Primitive2DSequence createLocalDecomposition(
+ const drawinglayer::geometry::ViewInformation2D& rViewInformation) const;
-void PageObjectViewObjectContact::PaintMouseOverEffect (
- OutputDevice& rDevice,
- bool bVisible) const
+public:
+ MouseOverEffectPrimitive(
+ const basegfx::B2DRange& rLogicRange,
+ sal_uInt32 nDiscreteOffset,
+ sal_uInt32 nDiscreteWidth,
+ const basegfx::BColor& rRGBColor)
+ : drawinglayer::primitive2d::BasePrimitive2D(),
+ maLogicRange(rLogicRange),
+ mnDiscreteOffset(nDiscreteOffset),
+ mnDiscreteWidth(nDiscreteWidth),
+ maRGBColor(rRGBColor)
+ {}
+
+ // data access
+ const basegfx::B2DRange& getLogicRange() const { return maLogicRange; }
+ sal_uInt32 getDiscreteOffset() const { return mnDiscreteOffset; }
+ sal_uInt32 getDiscreteWidth() const { return mnDiscreteWidth; }
+ const basegfx::BColor& getRGBColor() const { return maRGBColor; }
+
+ virtual bool operator==( const drawinglayer::primitive2d::BasePrimitive2D& rPrimitive ) const;
+
+ DeclPrimitrive2DIDBlock()
+};
+
+drawinglayer::primitive2d::Primitive2DSequence MouseOverEffectPrimitive::createLocalDecomposition(
+ const drawinglayer::geometry::ViewInformation2D& rViewInformation) const
+{
+ // get logic sizes in object coordinate system
+ const double fDiscreteWidth((rViewInformation.getInverseObjectToViewTransformation() * basegfx::B2DVector(1.0, 0.0)).getLength());
+ const double fOffset(fDiscreteWidth * getDiscreteOffset());
+ const double fWidth(fDiscreteWidth * getDiscreteWidth());
+
+ // create range (one pixel less to get a good fitting)
+ basegfx::B2DRange aRange(
+ getLogicRange().getMinimum(),
+ getLogicRange().getMaximum() - basegfx::B2DTuple(fDiscreteWidth, fDiscreteWidth));
+
+ // grow range
+ aRange.grow(fOffset - (fWidth * 0.5));
+
+ // create fat line with parameters. The formerly hand-painted edge
+ // roundings will now be done using rounded edges of this fat line
+ const basegfx::B2DPolygon aPolygon(basegfx::tools::createPolygonFromRect(aRange));
+ const drawinglayer::attribute::LineAttribute aLineAttribute(getRGBColor(), fWidth);
+ const drawinglayer::primitive2d::Primitive2DReference xReference(
+ new drawinglayer::primitive2d::PolygonStrokePrimitive2D(
+ aPolygon,
+ aLineAttribute));
+
+ return drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1);
+}
+
+bool MouseOverEffectPrimitive::operator==( const drawinglayer::primitive2d::BasePrimitive2D& rPrimitive ) const
+{
+ if(drawinglayer::primitive2d::BasePrimitive2D::operator==(rPrimitive))
+ {
+ const MouseOverEffectPrimitive& rCompare = static_cast< const MouseOverEffectPrimitive& >(rPrimitive);
+
+ return (getLogicRange() == rCompare.getLogicRange()
+ && getDiscreteOffset() == rCompare.getDiscreteOffset()
+ && getDiscreteWidth() == rCompare.getDiscreteWidth()
+ && getRGBColor() == rCompare.getRGBColor());
+ }
+
+ return false;
+}
+
+ImplPrimitrive2DIDBlock(MouseOverEffectPrimitive, PRIMITIVE2D_ID_SDMOUSEOVEREFFECTPRIMITIVE)
+
+//////////////////////////////////////////////////////////////////////////////
+
+drawinglayer::primitive2d::Primitive2DSequence PageObjectViewObjectContact::createMouseOverEffectPrimitive2DSequence()
{
- // When the selection frame is painted the mouse over frame is not
- // visible and does not have to be painted.
- if (GetPageDescriptor()->IsSelected())
- if (mpProperties.get()!=NULL && mpProperties->IsShowSelection())
- return;
-
- ULONG nPreviousDrawMode = rDevice.GetDrawMode();
- rDevice.SetDrawMode (DRAWMODE_DEFAULT);
- Rectangle aInner (GetBoundingBox(rDevice,PreviewBoundingBox,PixelCoordinateSystem));
- rDevice.EnableMapMode (FALSE);
-
- Color aSelectionColor (GetColor(rDevice, CS_SELECTION));
- Color aBackgroundColor (GetColor(rDevice, CS_BACKGROUND));
- Color aFrameColor (bVisible ? aSelectionColor : aBackgroundColor);
- Color aCornerColor (aBackgroundColor);
-
- rDevice.SetFillColor ();
- rDevice.SetLineColor (aFrameColor);
-
- // Paint the frame.
- for (int nOffset=mnMouseOverEffectOffset;
- nOffset<mnMouseOverEffectOffset+mnMouseOverEffectThickness;
- nOffset++)
+ drawinglayer::primitive2d::Primitive2DSequence aRetval;
+
+ if(GetPageDescriptor()->IsSelected() && mpProperties.get() && mpProperties->IsShowSelection())
{
- Rectangle aFrame (aInner);
- aFrame.Left() -= nOffset;
- aFrame.Top() -= nOffset;
- aFrame.Right() += nOffset;
- aFrame.Bottom() += nOffset;
- rDevice.DrawRect (rDevice.PixelToLogic(aFrame));
+ // When the selection frame is visualized the mouse over frame is not
+ // visible and does not have to be created.
+ }
+ else
+ {
+ const PageObjectViewContact& rPaObVOC(static_cast<PageObjectViewContact&>(GetViewContact()));
+ const Rectangle aBoundingBox(rPaObVOC.GetPageObject().GetLastBoundRect());
+ const basegfx::B2DRange aLogicRange(aBoundingBox.Left(), aBoundingBox.Top(), aBoundingBox.Right(), aBoundingBox.Bottom());
+ const basegfx::BColor aSelectionColor(mpProperties->GetSelectionColor().getBColor());
+ const drawinglayer::primitive2d::Primitive2DReference aReference(
+ new MouseOverEffectPrimitive(
+ aLogicRange,
+ mnMouseOverEffectOffset,
+ mnMouseOverEffectThickness,
+ aSelectionColor));
+
+ aRetval = drawinglayer::primitive2d::Primitive2DSequence(&aReference, 1);
}
- // Paint the four corner pixels in backround color for a rounded effect.
- int nFrameWidth (mnMouseOverEffectOffset
- + mnMouseOverEffectThickness - 1);
- Rectangle aOuter (aInner);
- aOuter.Left() -= nFrameWidth;
- aOuter.Top() -= nFrameWidth;
- aOuter.Right() += nFrameWidth;
- aOuter.Bottom() += nFrameWidth;
- Point aCorner (aOuter.TopLeft());
-
- rDevice.DrawPixel (aCorner, aCornerColor);
- aCorner = aOuter.TopRight();
- rDevice.DrawPixel (aCorner, aCornerColor);
- aCorner = aOuter.BottomLeft();
- rDevice.DrawPixel (aCorner, aCornerColor);
- aCorner = aOuter.BottomRight();
- rDevice.DrawPixel (aCorner, aCornerColor);
-
- rDevice.EnableMapMode (TRUE);
- rDevice.SetDrawMode(nPreviousDrawMode);
+ return aRetval;
}
@@ -1297,52 +1352,4 @@ model::SharedPageDescriptor
-
-
-Color PageObjectViewObjectContact::GetColor (
- const OutputDevice& rDevice,
- const ColorSpec eSpec,
- const double nOpacity) const
-{
- (void)rDevice;
- if (mbIsBackgroundColorUpdatePending)
- {
- mbIsBackgroundColorUpdatePending = false;
- maBackgroundColor = mpProperties->GetBackgroundColor();
- }
-
- Color aColor;
-
- switch (eSpec)
- {
- case CS_SELECTION:
- aColor = mpProperties->GetSelectionColor();
- break;
-
- case CS_BACKGROUND:
- if (mpProperties.get()!=NULL
- && mpProperties->IsHighlightCurrentSlide()
- && GetPageDescriptor()->IsCurrentPage())
- {
- aColor = mpProperties->GetHighlightColor();
- }
- else
- aColor = maBackgroundColor;
- break;
-
- case CS_WINDOW:
- aColor = maBackgroundColor;
- break;
-
- case CS_TEXT:
- default:
- aColor = mpProperties->GetTextColor();
- break;
- }
- aColor.Merge(maBackgroundColor, BYTE(255*(nOpacity) + 0.5));
- return aColor;
-}
-
-
-
} } } // end of namespace ::sd::slidesorter::view
diff --git a/sd/source/ui/slidesorter/view/SlsViewOverlay.cxx b/sd/source/ui/slidesorter/view/SlsViewOverlay.cxx
index 09b0717..d41b594 100644
--- a/sd/source/ui/slidesorter/view/SlsViewOverlay.cxx
+++ b/sd/source/ui/slidesorter/view/SlsViewOverlay.cxx
@@ -60,6 +60,9 @@
#include <svx/sdrpagewindow.hxx>
#include <vcl/svapp.hxx>
+#include <drawinglayer/primitive2d/polygonprimitive2d.hxx>
+#include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx>
+
using namespace ::sdr::overlay;
namespace {
@@ -170,64 +173,6 @@ OverlayBase::~OverlayBase (void)
-void OverlayBase::Paint (void)
-{
-}
-
-
-
-
-bool OverlayBase::IsShowing (void)
-{
- return isVisible();
-}
-
-
-
-
-void OverlayBase::Toggle (void)
-{
- if (IsShowing())
- Hide();
- else
- Show();
-}
-
-
-
-
-void OverlayBase::Show (void)
-{
- setVisible(true);
-}
-
-
-
-
-void OverlayBase::Hide (void)
-{
- setVisible(false);
-}
-
-
-
-
-ViewOverlay& OverlayBase::GetViewOverlay (void)
-{
- return mrViewOverlay;
-}
-
-
-
-
-void OverlayBase::transform (const basegfx::B2DHomMatrix& rMatrix)
-{
- (void)rMatrix;
-}
-
-
-
-
void OverlayBase::EnsureRegistration (void)
{
if (getOverlayManager() == NULL)
@@ -246,7 +191,6 @@ void OverlayBase::EnsureRegistration (void)
SubstitutionOverlay::SubstitutionOverlay (ViewOverlay& rViewOverlay)
: OverlayBase(rViewOverlay),
maPosition(0,0),
- maBoundingBox(),
maShapes()
{
}
@@ -268,17 +212,20 @@ void SubstitutionOverlay::Create (
EnsureRegistration();
maPosition = rPosition;
- maTranslation = Point(0,0);
maShapes.clear();
while (rSelection.HasMoreElements())
{
const Rectangle aBox (rSelection.GetNextElement()->GetPageObject()->GetCurrentBoundRect());
- maShapes.push_back(aBox);
- maBoundingBox.Union(aBox);
+ basegfx::B2DRectangle aB2DBox(
+ aBox.Left(),
+ aBox.Top(),
+ aBox.Right(),
+ aBox.Bottom());
+ maShapes.append(basegfx::tools::createPolygonFromRect(aB2DBox), 4);
}
- setVisible(maShapes.size() > 0);
+ setVisible(maShapes.count() > 0);
// The selection indicator may have been visible already so call
// objectChange() to enforce an update.
objectChange();
@@ -290,7 +237,6 @@ void SubstitutionOverlay::Create (
void SubstitutionOverlay::Clear (void)
{
maShapes.clear();
- maBoundingBox.SetEmpty();
setVisible(false);
}
@@ -299,9 +245,10 @@ void SubstitutionOverlay::Clear (void)
void SubstitutionOverlay::Move (const Point& rOffset)
{
- maTranslation += rOffset;
- maBoundingBox.Move(rOffset.X(), rOffset.Y());
-
+ basegfx::B2DHomMatrix aTranslation;
+ aTranslation.translate(rOffset.X(), rOffset.Y());
+
+ maShapes.transform(aTranslation);
maPosition += rOffset;
objectChange();
@@ -312,70 +259,52 @@ void SubstitutionOverlay::Move (const Point& rOffset)
void SubstitutionOverlay::SetPosition (const Point& rPosition)
{
- Move(rPosition - maPosition);
+ Move(rPosition - GetPosition());
}
-void SubstitutionOverlay::drawGeometry (OutputDevice& rOutputDevice)
+Point SubstitutionOverlay::GetPosition (void) const
{
- if (getOverlayManager() != NULL)
- {
- const sal_uInt32 nSavedStripeLength (getOverlayManager()->getStripeLengthPixel());
-
- for (::std::vector<Rectangle>::const_iterator
- iBox (maShapes.begin()),
- iEnd (maShapes.end());
- iBox!=iEnd;
- ++iBox)
- {
- // Reduce width and height by one pixel to make the box the same
- // size as the frame of the page object.
- Rectangle aScreenBox (rOutputDevice.LogicToPixel(*iBox));
- aScreenBox.Right() -= 1;
- aScreenBox.Bottom() -= 1;
-
- // Add accumulated translation.
- Rectangle aBox (rOutputDevice.PixelToLogic(aScreenBox));
- aBox.Move(maTranslation.X(), maTranslation.Y());
-
- ImpDrawPolygonStriped(rOutputDevice,
- basegfx::tools::createPolygonFromRect(
- basegfx::B2DRange(
- basegfx::B2IRange(aBox.Left(), aBox.Top(), aBox.Right(),aBox.Bottom()))));
- }
-
- getOverlayManager()->setStripeLengthPixel(nSavedStripeLength);
- }
+ return maPosition;
}
-void SubstitutionOverlay::createBaseRange (OutputDevice& rOutputDevice)
+drawinglayer::primitive2d::Primitive2DSequence SubstitutionOverlay::createOverlayObjectPrimitive2DSequence()
{
- (void)rOutputDevice;
-
- maBaseRange = basegfx::B2DRange(
- basegfx::B2IRange(
- maBoundingBox.Left(),
- maBoundingBox.Top(),
- maBoundingBox.Right(),
- maBoundingBox.Bottom()));
-}
+ drawinglayer::primitive2d::Primitive2DSequence aRetval;
+ const sal_uInt32 nCount(maShapes.count());
+ if(nCount && getOverlayManager())
+ {
+ aRetval.realloc(nCount);
+ const basegfx::BColor aRGBColorA(getOverlayManager()->getStripeColorA().getBColor());
+ const basegfx::BColor aRGBColorB(getOverlayManager()->getStripeColorB().getBColor());
+ for(sal_uInt32 a(0); a < nCount; a++)
+ {
+ aRetval[a] = drawinglayer::primitive2d::Primitive2DReference(
+ new drawinglayer::primitive2d::PolygonMarkerPrimitive2D(
+ maShapes.getB2DPolygon(a),
+ aRGBColorA,
+ aRGBColorB,
+ gnSubstitutionStripeLength));
+ }
+ }
+ return aRetval;
+}
-Point SubstitutionOverlay::GetPosition (void) const
+void SubstitutionOverlay::stripeDefinitionHasChanged()
{
- return maPosition;
+ // react on OverlayManager's stripe definition change
+ objectChange();
}
-
-
//===== SelectionRectangleOverlay ===========================================
SelectionRectangleOverlay::SelectionRectangleOverlay (ViewOverlay& rViewOverlay)
@@ -418,28 +347,33 @@ void SelectionRectangleOverlay::Update (const Point& rSecondCorner)
-void SelectionRectangleOverlay::drawGeometry (OutputDevice& rOutputDevice)
+drawinglayer::primitive2d::Primitive2DSequence SelectionRectangleOverlay::createOverlayObjectPrimitive2DSequence()
{
- ImpDrawRangeStriped(
- rOutputDevice,
- basegfx::B2DRange(
- maAnchor.X(),
- maAnchor.Y(),
- maSecondCorner.X(),
- maSecondCorner.Y()));
-}
-
+ drawinglayer::primitive2d::Primitive2DSequence aRetval;
+ const basegfx::B2DRange aRange(maAnchor.X(), maAnchor.Y(), maSecondCorner.X(), maSecondCorner.Y());
+ const basegfx::B2DPolygon aPolygon(basegfx::tools::createPolygonFromRect(aRange));
+ if(aPolygon.count())
+ {
+ const basegfx::BColor aRGBColorA(getOverlayManager()->getStripeColorA().getBColor());
+ const basegfx::BColor aRGBColorB(getOverlayManager()->getStripeColorB().getBColor());
+ const drawinglayer::primitive2d::Primitive2DReference xReference(
+ new drawinglayer::primitive2d::PolygonMarkerPrimitive2D(
+ aPolygon,
+ aRGBColorA,
+ aRGBColorB,
+ gnSubstitutionStripeLength));
+
+ aRetval = drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1);
+ }
+ return aRetval;
+}
-void SelectionRectangleOverlay::createBaseRange (OutputDevice& rOutputDevice)
+void SelectionRectangleOverlay::stripeDefinitionHasChanged()
{
- (void)rOutputDevice;
- maBaseRange = basegfx::B2DRange(
- maAnchor.X(),
- maAnchor.Y(),
- maSecondCorner.X(),
- maSecondCorner.Y());
+ // react on OverlayManager's stripe definition change
+ objectChange();
}
@@ -540,40 +474,23 @@ sal_Int32 InsertionIndicatorOverlay::GetInsertionPageIndex (void) const
-void InsertionIndicatorOverlay::drawGeometry (OutputDevice& rOutputDevice)
+drawinglayer::primitive2d::Primitive2DSequence InsertionIndicatorOverlay::createOverlayObjectPrimitive2DSequence()
{
- const Color aFillColor (rOutputDevice.GetFillColor());
- const Color aLineColor (rOutputDevice.GetLineColor());
-
- if (isVisible())
- {
- const Color aColor (rOutputDevice.GetSettings().GetStyleSettings().GetFontColor());
- rOutputDevice.SetLineColor(aColor);
- rOutputDevice.SetFillColor(aColor);
-
- // Reduce width of indicator by one pixel to be of the same width as
- // the page objects.
- Rectangle aBox (rOutputDevice.LogicToPixel(maBoundingBox));
- aBox.Right() -= 1;
- rOutputDevice.DrawRect(rOutputDevice.PixelToLogic(aBox));
- }
-
- rOutputDevice.SetFillColor(aFillColor);
- rOutputDevice.SetLineColor(aLineColor);
-}
-
+ drawinglayer::primitive2d::Primitive2DSequence aRetval(2);
+ const basegfx::B2DRange aRange(maBoundingBox.Left(), maBoundingBox.Top(), maBoundingBox.Right(), maBoundingBox.Bottom());
+ const basegfx::B2DPolygon aPolygon(basegfx::tools::createPolygonFromRect(aRange));
+ const basegfx::BColor aRGBColor(Application::GetDefaultDevice()->GetSettings().GetStyleSettings().GetFontColor().getBColor());
+ aRetval[0] = drawinglayer::primitive2d::Primitive2DReference(
+ new drawinglayer::primitive2d::PolyPolygonColorPrimitive2D(
+ basegfx::B2DPolyPolygon(aPolygon),
+ aRGBColor));
+ aRetval[1] = drawinglayer::primitive2d::Primitive2DReference(
+ new drawinglayer::primitive2d::PolygonHairlinePrimitive2D(
+ aPolygon,
+ aRGBColor));
-
-void InsertionIndicatorOverlay::createBaseRange (OutputDevice& rOutputDevice)
-{
- (void)rOutputDevice;
- const sal_Int32 nBorder (10);
- maBaseRange = basegfx::B2DRange(
- maBoundingBox.Left()-nBorder,
- maBoundingBox.Top()-nBorder,
- maBoundingBox.Right()-nBorder,
- maBoundingBox.Bottom()-nBorder);
+ return aRetval;
}
@@ -634,34 +551,16 @@ void MouseOverIndicatorOverlay::SetSlideUnderMouse (
-void MouseOverIndicatorOverlay::drawGeometry (OutputDevice& rOutputDevice)
+drawinglayer::primitive2d::Primitive2DSequence MouseOverIndicatorOverlay::createOverlayObjectPrimitive2DSequence()
{
- const Color aFillColor (rOutputDevice.GetFillColor());
- const Color aLineColor (rOutputDevice.GetLineColor());
-
view::PageObjectViewObjectContact* pContact = GetViewObjectContact();
- if (pContact != NULL)
- pContact->PaintMouseOverEffect(rOutputDevice, true);
-
- rOutputDevice.SetFillColor(aFillColor);
- rOutputDevice.SetLineColor(aLineColor);
-}
-
-
-
-void MouseOverIndicatorOverlay::createBaseRange (OutputDevice& rOutputDevice)
-{
- (void)rOutputDevice;
- view::PageObjectViewObjectContact* pContact = GetViewObjectContact();
- if (pContact != NULL)
+ if(pContact)
{
- Rectangle aBox (pContact->GetBoundingBox(
- rOutputDevice,
- view::PageObjectViewObjectContact::MouseOverIndicatorBoundingBox,
- view::PageObjectViewObjectContact::ModelCoordinateSystem));
- maBaseRange = basegfx::B2DRange(aBox.Left(),aBox.Top(),aBox.Right(),aBox.Bottom());
+ return pContact->createMouseOverEffectPrimitive2DSequence();
}
+
+ return drawinglayer::primitive2d::Primitive2DSequence();
}
diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx
index fa5724b..365c11d 100644
--- a/sd/source/ui/view/sdview.cxx
+++ b/sd/source/ui/view/sdview.cxx
@@ -793,7 +793,7 @@ sal_Bool View::SdrBeginTextEdit(
Color aBackground;
if( pObj->GetObjInventor() == SdrInventor && pObj->GetObjIdentifier() == OBJ_TABLE )
{
- aBackground = ImpGetTextEditBackgroundColor();
+ aBackground = GetTextEditBackgroundColor(*this);
}
else
{
diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx
index e4221b1..83af8ad 100644
--- a/sd/source/ui/view/sdview2.cxx
+++ b/sd/source/ui/view/sdview2.cxx
@@ -584,19 +584,8 @@ sal_Int8 View::AcceptDrop( const AcceptDropEvent& rEvt, DropTargetHelper& rTarge
{
static_cast< SdrHdlColor* >( pIAOHandle )->SetSize( SDR_HANDLE_COLOR_SIZE_NORMAL );
}
-
- //OLMconst B2dIAOGroup& rIAOGroup = pIAOHandle->GetIAOGroup();
- //OLMif( rIAOGroup.IsHit( rEvt.maPosPixel ) )
- //OLM{
- //OLM nRet = nDropAction;
- //OLM static_cast< SdrHdlColor* >( pIAOHandle )->SetSize( SDR_HANDLE_COLOR_SIZE_SELECTED );
- //OLM}
- //OLMelse
- //OLM static_cast< SdrHdlColor* >( pIAOHandle )->SetSize( SDR_HANDLE_COLOR_SIZE_NORMAL );
}
}
-
- //OLMRefreshAllIAOManagers();
}
// check object insert
@@ -606,7 +595,7 @@ sal_Int8 View::AcceptDrop( const AcceptDropEvent& rEvt, DropTargetHelper& rTarge
SdrPageView* pPageView = NULL;
::sd::Window* pWindow = mpViewSh->GetActiveWindow();
Point aPos( pWindow->PixelToLogic( rEvt.maPosPixel ) );
- const BOOL bHasPickObj = PickObj( aPos, pPickObj, pPageView );
+ const BOOL bHasPickObj = PickObj( aPos, getHitTolLog(), pPickObj, pPageView );
BOOL bIsPresTarget = FALSE;
if( bHasPickObj && pPickObj && ( pPickObj->IsEmptyPresObj() || pPickObj->GetUserCall() ) )
@@ -756,20 +745,6 @@ sal_Int8 View::ExecuteDrop( const ExecuteDropEvent& rEvt, DropTargetHelper& rTar
nRet = nDropAction;
}
}
-
- //OLMconst B2dIAOGroup& rIAOGroup = pIAOHandle->GetIAOGroup();
- //OLMif( rIAOGroup.IsHit( rEvt.maPosPixel ) )
- //OLM{
- //OLM SotStorageStreamRef xStm;
- //OLM if( aDataHelper.GetSotStorageStream( SOT_FORMATSTR_ID_XFA, xStm ) && xStm.Is() )
- //OLM {
- //OLM XFillExchangeData aFillData( XFillAttrSetItem( &pDoc->GetPool() ) );
- //OLM *xStm >> aFillData;
- //OLM const Color aColor( ( (XFillColorItem&) aFillData.GetXFillAttrSetItem()->GetItemSet().Get( XATTR_FILLCOLOR ) ).GetValue() );
- //OLM static_cast< SdrHdlColor* >( pIAOHandle )->SetColor( aColor, TRUE );
- //OLM nRet = nDropAction;
- //OLM }
- //OLM}
}
}
}
@@ -805,7 +780,7 @@ sal_Int8 View::ExecuteDrop( const ExecuteDropEvent& rEvt, DropTargetHelper& rTar
SdrObject* pPickObj = NULL;
SdrPageView* pPageView = NULL;
- if( PickObj( aPos, pPickObj, pPageView ) )
+ if( PickObj( aPos, getHitTolLog(), pPickObj, pPageView ) )
{
// insert as clip action => jump
rtl::OUString aBookmark( aINetBookmark.GetURL() );
diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx
index 6087b89..84dbf3d 100644
--- a/sd/source/ui/view/sdview3.cxx
+++ b/sd/source/ui/view/sdview3.cxx
@@ -94,6 +94,7 @@
#include <comphelper/processfactory.hxx>
#include <tools/stream.hxx>
#include <vcl/cvtgrf.hxx>
+#include <svx/sdrhittesthelper.hxx>
// --------------
// - Namespaces -
@@ -327,7 +328,7 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper,
if( bDrag )
{
SdrPageView* pPV = NULL;
- PickObj( rPos, pPickObj, pPV );
+ PickObj( rPos, getHitTolLog(), pPickObj, pPV );
}
if( nPage != SDRPAGE_NOTFOUND )
@@ -721,7 +722,7 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper,
SdrObject* pObj = pModel->GetSdPage( 0, PK_STANDARD )->GetObj( 0 );
SdrObject* pPickObj2 = NULL;
SdrPageView* pPV = NULL;
- PickObj( rPos, pPickObj2, pPV );
+ PickObj( rPos, getHitTolLog(), pPickObj2, pPV );
if( ( mnAction & DND_ACTION_MOVE ) && pPickObj2 && pObj )
{
@@ -1311,11 +1312,11 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper,
aHitPosT.Y() += n2HitLog;
aHitPosB.Y() -= n2HitLog;
- if( bClosed &&
- pPickObj->IsHit( aHitPosR, nHitLog, pVisiLayer ) &&
- pPickObj->IsHit( aHitPosL, nHitLog, pVisiLayer ) &&
- pPickObj->IsHit( aHitPosT, nHitLog, pVisiLayer ) &&
- pPickObj->IsHit( aHitPosB, nHitLog, pVisiLayer ) )
+ if( bClosed &&
+ SdrObjectPrimitiveHit(*pPickObj, aHitPosR, nHitLog, *GetSdrPageView(), pVisiLayer, false) &&
+ SdrObjectPrimitiveHit(*pPickObj, aHitPosL, nHitLog, *GetSdrPageView(), pVisiLayer, false) &&
+ SdrObjectPrimitiveHit(*pPickObj, aHitPosT, nHitLog, *GetSdrPageView(), pVisiLayer, false) &&
+ SdrObjectPrimitiveHit(*pPickObj, aHitPosB, nHitLog, *GetSdrPageView(), pVisiLayer, false) )
{
// area fill
if(eFill == XFILL_SOLID )
diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx
index 1a573e6..bcc7b64 100644
--- a/sd/source/ui/view/sdview4.cxx
+++ b/sd/source/ui/view/sdview4.cxx
@@ -115,7 +115,7 @@ SdrGrafObj* View::InsertGraphic( const Graphic& rGraphic, sal_Int8& rAction,
if( !pPickObj && pPV )
{
SdrPageView* pPageView = pPV;
- PickObj(rPos, pPickObj, pPageView);
+ PickObj(rPos, getHitTolLog(), pPickObj, pPageView);
}
if( mnAction == DND_ACTION_LINK && pPickObj && pPV )
@@ -312,7 +312,7 @@ SdrMediaObj* View::InsertMediaURL( const rtl::OUString& rMediaURL, sal_Int8& rAc
if( !pPickObj && pPV )
{
SdrPageView* pPageView = pPV;
- PickObj(rPos, pPickObj, pPageView);
+ PickObj(rPos, getHitTolLog(), pPickObj, pPageView);
}
if( mnAction == DND_ACTION_LINK && pPickObj && pPV && pPickObj->ISA( SdrMediaObj ) )
commit 3d0314b4f61ed62745a3d796b28343cb88a5e77c
Author: Release Engineers <releng at openoffice.org>
Date: Thu Jul 2 09:05:03 2009 +0000
CWS-TOOLING: integrate CWS odfmetadata2
2009-06-22 11:48:36 +0200 mst r273206 : - connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx:
+ add "include ustrbuf.hxx" to work around warning caused by
solaris <sys/kstat.h> declaring a global "long l ;"
2009-06-19 14:25:25 +0200 mst r273159 : - scp2/source/ooo/file_library_ooo.scp:
+ fix MinGW build
2009-06-08 12:52:33 +0200 mst r272727 : - redland/raptor-1.4.18.patch.mingw, redland/raptor/makefile.mk:
+ disable parsers that do not build on MinGW (thanks for patch by tono)
2009-05-15 17:31:07 +0200 mst r271957 : fix typos
2009-05-15 17:28:57 +0200 mst r271956 : #i101965#
- offapi/com/sun/star/text/TextPortion:
+ add missing properties:
SoftPageBreak, DocumentIndexMark, ReferenceMark, Footnote, TextField
+ fix read-only status of properties: Bookmark, IsStart, IsCollapsed
- offapi/type_reference/{typelibrary_history.txt,types.rdb}:
+ update reference types.rdb
2009-05-07 14:41:38 +0200 mst r271669 : - sw/inc/{fmtftn.hxx,unocoll.hxx,doc.hxx,editsh.hxx,ftninfo.hxx},
sw/source/core/layout/{flowfrm.cxx,ftnfrm.cxx},
sw/source/core/doc/docftn.cxx, sw/source/core/edit/edattr.cxx,
sw/source/core/txtnode/atrftn.cxx, sw/source/core/unocore/unocoll.cxx,
sw/source/ui/fldui/fldref.cxx:
+ fix warning ... the hard way
+ also fix signature of SwDoc::SetCurFtn
2009-05-05 19:52:55 +0200 mst r271556 : - sw/inc/undobj.hxx:
+ make some members const
2009-05-05 19:34:40 +0200 mst r271555 : - sw/inc/rolbck.hxx, sw/source/core/undo/rolbck.cxx:
+ make some members const
2009-05-05 19:13:14 +0200 mst r271553 : - sw/inc/{undobj.hxx,rolbck.hxx},
sw/source/core/undo/{unbkmk.cxx,rolbck.cxx}:
+ fix rebase merge error
+ rename SwHstryBookmark to SwHistoryBookmark
+ clean up SwUndoBookmark
2009-05-05 19:05:53 +0200 mst r271552 : - sw/source/core/unocore/unoportenum.cxx:
+ fix annoying assertion
2009-05-05 15:34:48 +0200 mst r271522 : CWS-TOOLING: rebase CWS odfmetadata2 to trunk at 271427 (milestone: DEV300:m47)
2009-05-04 12:37:01 +0200 mst r271444 : trivial
2009-04-22 13:30:37 +0200 mst r271102 : - sfx2/inc/sfx2/dinfdlg.hxx:
+ trivial change
2009-04-21 16:46:58 +0200 mst r271043 : - sw/inc/hintids.hxx:
+ introduce some predicates for the various hints, and use them
2009-04-21 16:19:03 +0200 mst r271041 : - sw/inc/undobj.hxx,
sw/source/core/doc/{docfly.cxx,docfmt.cxx,docftn.cxx,doctxm.cxx},
sw/source/core/undo/{unattr.cxx,unins.cxx}:
+ clean up unattr.cxx:
remove/fix casts, prefix members, use auto_ptr, etc.
2009-04-21 15:34:23 +0200 mst r271039 : - sw/inc/{rolbck.hxx,undobj.hxx},
sw/source/core/doc/docfmt.cxx,
sw/source/core/txtnode/{thints.cxx,txtedt.cxx},
sw/source/core/undo/{rolbck.cxx,undel.cxx,undobj.cxx,unins.cxx,unmove.cxx,
unovwr.cxx,unsect.cxx,unspnd.cxx,untbl.cxx,untblk.cxx,unattr.cxx}:
+ clean up SwHistory, SwRegHistory and SwHistoryHint etc.:
remove/fix casts, prefix members, remove wrong const annotations,
use auto_ptr, remove unused members, etc.
2009-04-20 19:17:36 +0200 mst r271013 : - sw/inc/ndhints.hxx,
sw/source/core/text/{itrtxt.cxx,txtftn.cxx,itratr.cxx,porfly.cxx,
txtfrm.cxx,txtdrop.cxx,frmform.cxx},
sw/source/core/txtnode/{ndtxt.cxx,ndhints.cxx,thints.cxx,txtedt.cxx},
sw/source/core/edit/acorrect.cxx,
sw/source/core/doc/{docedt.cxx,docfmt.cxx},
sw/source/filter/html/swhtml.cxx:
+ clean up SwHintsArray and its subclasses: remove/fix casts, prefix members
2009-04-20 18:42:07 +0200 mst r271007 : - sw/source/core/text/txtio.cxx, sw/source/core/edit/edattr.cxx,
sw/source/core/undo/rolbck.cxx:
+ remove JP_NEWCORE dead code
2009-04-20 18:38:09 +0200 mst r271006 : - sw/source/core/unocore/unochart.cxx:
+ silence unxlngi warning (debug=t)
2009-04-20 16:36:13 +0200 mst r270991 : - sfx2/inc/sfx2/dinfdlg.hxx, sfx2/source/dialog/dinfdlg.cxx,
sfx2/source/doc/objserv.cxx, sw/source/ui/fldui/flddinf.hxx:
+ trivial cleanups
2009-04-20 15:28:52 +0200 mst r270990 : - sfx2/inc/sfx2/dinfdlg.hxx, sfx2/source/dialog/dinfdlg.cxx,
sfx2/source/doc/objserv.cxx:
+ fix bug: replaying a macro with a DocumentInfoItem removes all
user-defined properties
2009-03-10 15:08:20 +0100 mst r269273 : - sfx2/source/doc/Metadatable.cxx:
+ add missing SolarMutex guards
2009-03-10 14:46:29 +0100 mst r269272 : - unoxml/source/rdf/librdf_repository.cxx:
+ never free rdf_world because that would call libxm2 xmlCleanupParser
(and, to add insult to injury, other libxml2 functions later...)
2009-03-06 19:02:44 +0100 mst r269041 : argh! undo...
2009-03-06 19:00:58 +0100 mst r269040 : fix #i99931#
- sw/source/ui/uno/unomod.cxx:
+ SwXViewSettings::_getSingleValue returns uninitialized memory
for the ZoomType property if the value is PAGE_WIDTH_EXACT
2009-03-06 18:59:28 +0100 mst r269039 : - sw/inc/ndtxt.hxx, sw/source/core/txtnode/ndtxt.cxx,
sw/source/core/unocore/unoportenum.cxx:
+ fix some more wntmsci12 warnings...
2009-03-06 18:56:46 +0100 mst r269038 : - sd/source/ui/slidesorter/model/SlsPageEnumerationProvider.cxx:
+ work around spurious warning on unxsoli4 debug=t
2009-03-05 14:02:01 +0100 mst r268902 : - sw/inc/txatbase.hxx:
+ back to c-style casts, they also compile on wntmsci12...
2009-03-05 10:23:25 +0100 mst r268882 : - comphelper/inc/comphelper/processfactory.hxx,
comphelper/source/processfactory/processfactory.cxx:
+ revert change of return type of comphelper_getProcessComponentContext
to Reference: does not build on wntmsci12
2009-03-04 19:08:09 +0100 mst r268861 : - sw/source/core/txtnode/{atrtox.cxx,ndtxt.cxx}:
+ fix initialization
2009-03-04 14:37:30 +0100 mst r268831 : - solenv/inc/target.mk:
+ fix CLASSPATH so complex tests run (fix by sb)
2009-03-04 14:36:30 +0100 mst r268830 : - sw/inc/unoobj.hxx,
sw/source/core/unocore/{unoparagraph.cxx,unoobj.cxx,unoobj2.cxx}:
+ SwXParaFrameEnumeration constructor now takes SwPaM, not SwUnoCrsr
+ move SwParaSelection into unoparagraph.cxx, as it is only used there
+ bugfix: replace SwUnoCrsrs on stack with SwCursors
2009-03-04 14:34:46 +0100 mst r268829 : - sw/inc/pam.hxx, sw/source/core/crsr/pam.cxx,
sw/source/core/edit/eddel.cxx, sw/source/core/doc/docredln.cxx,
sw/source/core/undo/{untbl.cxx,undel.cxx}, sw/source/filter/rtf/swparrtf.cxx:
+ clean up SwPaM: prefix members
+ new constructor SwPosition(SwCntntNode&, xub_StrLen)
+ fix several broken SwPosition and SwPaM constructors
+ SwPam::DeleteMark now actually resets the unused position to default
2009-03-02 12:07:09 +0100 mst r268646 : - sw/inc/fmtcol.hxx:
+ fix annoying warning (gcc 4)
2009-03-02 12:06:27 +0100 mst r268645 : - odk/util/check.pl, odk/examples/DevelopersGuide/Text/TextDocuments.java:
+ rename module from FieldMaster to fieldmaster
2009-02-27 19:49:56 +0100 mst r268614 : - sfx2/inc/sfx2/Metadatable.hxx, sfx2/prj/d.lst,
sfx2/source/doc/{Metadatable.cxx,makefile.mk},
sw/inc/{SwMetadatable.hxx,unoobj.hxx,undobj.hxx,ndtxt.hxx},
sw/source/core/doc/{SwMetadatable.cxx,makefile.mk,docnew.cxx},
sw/source/core/undo/{untbl.cxx,unins.cxx},
sw/source/core/unocore/unoparagraph.cxx, sw/source/ui/app/docsh.cxx:
+ move Metadatable implementation from sw to sfx2
2009-02-27 17:58:55 +0100 mst r268608 : - sw/inc/{SwMetadatable.hxx,undobj.hxx}, sw/source/core/doc/SwMetadatable.cxx,
sw/source/core/undo/{untbl.cxx,unins.cxx,undel.cxx}:
+ CreateUndo now returns an opaque MetadatableUndo object
2009-02-27 13:15:44 +0100 mst r268587 : - sw/inc/ndtxt.hxx, sw/source/core/doc/docfmt.cxx,
sw/source/core/text/{itratr.cxx,porlay.cxx},
sw/source/core/txtnode/{txtedt.cxx,ndtxt.cxx,thints.cxx}:
+ clean up SwTxtNode: fix casts, prefix members
+ factor out inline function SwTxtNode::TryDeleteSwpHints()
2009-02-27 13:14:30 +0100 mst r268586 : - svx/inc/svx/emphitem.hxx:
+ fix borken header guard
2009-02-27 13:13:56 +0100 mst r268585 : - sfx2/source/bastyp/progress.cxx:
+ fix use of compiler specific macro
2009-02-27 11:00:32 +0100 mst r268564 : - sw/inc/{txatbase.hxx,txtatr.hxx,txtinet.hxx,txtfld.hxx,txtftn.hxx,
txtflcnt.hxx,txttxmrk.hxx,txtrfmrk.hxx},
sw/source/core/txtnode/{atrtox.cxx,atrref.cxx,atrflyin.cxx,atrftn.cxx,
txtatr2.cxx,txatbase.cxx,atrfld.cxx,txtedt.cxx},
sw/source/core/text/atrstck.cxx, sw/source/core/access/acchyperlink.cxx,
sw/source/core/doc/visiturl.cxx, sw/source/ui/wrtsh/wrtsh2.cxx:
+ clean up SwTxtAttr and its subclasses: remove/fix casts, prefix members
+ SwTxtINetFmt: remove unused member bColor
- sw/source/core/text/txtfld.cxx:
+ move SwTxtFld methods to atrfld.cxx
2009-02-27 10:58:44 +0100 mst r268563 : - sfx2/inc/sfx2/sfxbasemodel.hxx:
+ don't privately inherit BaseMutex, ScModelObj wants to access it
2009-02-27 10:58:02 +0100 mst r268562 : - xmloff/source/core/{RDFaExportHelper.cxx,RDFaImportHelper.cxx}:
+ arrrgh!!! someone thought it would be a good idea to have 2 different
versions of boost in external! and they're NOT compatible!!!
insert an ugly fragile hack that maybe works with both...
2009-02-26 17:42:26 +0100 mst r268544 : - comphelper/inc/comphelper/storagehelper.hxx.
sfx2/source/doc/DocumentMetadataAccess.cxx:
+ someone made IsValidZipEntryFileName a static method and didn't tell me
2009-02-26 15:52:56 +0100 mst r268529 : redland: split up patches
2009-02-26 13:17:56 +0100 mst r268509 : migration of cws odfmetadata2 from CVS (resync to m42): module sw
#i95863#
- sw/inc/segdefs{,_}.hxx:
+ remove obsolete files
- sw/source/ui/inc/itemdef.hxx:
+ remove itemdef.hxx
- sw/source/ui/app/[apphdl.cxx,docsh.cxx}, sw/source/ui/misc/glshell.cxx,
sw/source/ui/shells/*.cxx, sw/source/ui/uiview/*.cxx, sw/source/ui/web/*.cxx:
+ use sfx2/msg.hxx instead of itemdef.hxx
- sw/source/core/edit/eddel.cxx:
+ @ JP: SwEditShell::Replace:
you're right, deleting the text to be replaced first, and then inserting
a space, and then replacing that space is unnecessary.
whew, i'm so happy that we finally answered that question after 11 years.
- sw/inc/edimp.hxx:
+ remove FOREACHCURSOR_START, FOREACHCURSOR_END
- sw/inc/{swcrsr.hxx,unocrsr.hxx,viscrs.hxx},
sw/source/core/crsr/{crsrsh.cxx,swcrsr.cxx,trvlreg.cxx,trvltbl.cxx,
unocrsr.cxx,viscrs.cxx},
sw/source/core/doc/{docbm.cxx,doccorr.cxx},
sw/source/core/docnode/{ndtbl.cxx,ndtbl1.cxx},
sw/source/core/edit/editsh.cxx,
sw/source/core/frmedt/{fefly1.cxx,fetab.cxx,tblsel.cxx},
sw/source/core/layout/trvlfrm.cxx,
sw/source/core/unocore/{unochart.cxx,unoobj2.cxx,unoparagraph.cxx,
unoportenum.cxx,unotbl.cxx},
sw/source/core/view/vprint.cxx:
+ remove the hideous virtual operator SwFooCursor*
+ make SwCursor::IsReadOnlyAvailable() virtual
+ make SwUnoCrsr::Clone() virtual
+ refactor SwCursor methods IsSelOver(), LeftRight(), UpDown(), GotoTable():
replace dynamic_cast<...>(this) with new virtual methods
2009-02-26 13:14:58 +0100 mst r268508 : migration of cws odfmetadata2 from CVS (resync to m42): module sw
- sw/source/filter/xml/swxml.cxx:
+ XMLReader::Read: load RDF metadata of the ODF document
- sw/source/filter/xml/wrtxml.cxx:
+ SwXMLWriter::_Write: write RDF metadata of the ODF document if ODF >= 1.2
#i90620#: import xml:id in text tables (does not actually work yet)
- sw/source/filter/xml/xmltbli{.hxx,.cxx}:
+ SwXMLTableCellAttrTokens,aTableCellAttrTokenMap: add XML_TOK_TABLE_XMLID
+ SwXMLTableCellContext_Impl::SwXMLTableCellContext_Impl: attribute xml:id
+ SwXMLTableCellContext_Impl::CreateChildContext: attribute xml:id
+ SwXMLTableColContext_Impl::SwXMLTableColContext_Impl: attribute xml:id
+ SwXMLTableContext::SwXMLTableContext: attribute xml:id
fix #i98530#
- sw/inc/unoport.hxx, sw/source/core/unocore/unoport.cxx:
+ SwXTextPortion: make constructor params const&
- sw/source/core/unocore/unoportenum.cxx:
+ refactor to remove some code duplication
+ fix bug: paragraph w/out hints: bookmark before frame gets lost
#i97274# handle invalid tables
- sw/source/core/layout/tabfrm.cxx, sw/source/filter/xml/xmltbli.cxx:
+ SwXMLTableContext::MakeTable():
check that the table actually contains cells,
and abort (removing the inserted table nodes) if not
2009-02-26 13:11:48 +0100 mst r268507 : migration of cws odfmetadata2 from CVS (resync to m42): module sw
refactor SwXTextRange and SwXParagraph
- sw/inc/unoobj.hxx, sw/source/core/unocore/unoobj2.cxx:
+ remove 3 constructors of SwXTextRange
+ new method SwXTextRange::CreateParentXText
+ refactor SwXTextRange::CreateTextRangeFromPosition and
SwXTextRange::getText
- sw/inc/unoobj.hxx, sw/source/core/unocore/unoparagraph.cxx:
+ SwXParagraph no longer uses a cursor; it registers directly at SwTxtNode
+ replace SwXParagraph::GetCrsr with SwXParagraph::GetTxtNode
- sw/source/core/unocore/unotext.cxx, sw/source/ui/uno/unotxvw.cxx:
+ adapt to new SwXParagraph
#i90620#
- sw/inc/SwMetadatable.hxx,
sw/source/core/doc/SwMetadatable.cxx:
+ new files: base classes sw::Metadatable and sw::MetadatableMixin;
also, 2 implementations of IXmlIdRegistry:
sw::XmlIdRegistryDocument and sw::XmlIdRegistryClipboard
+ setMetadataReference: handle empty stream name as auto-detect
- sw/source/core/doc/makefile.mk:
+ add SwMetadatable
add a XmlIdRegistry to SwDoc
- sw/inc/doc.hxx:
+ SwDoc: add member m_pXmlIdRegistry, method GetXmlIdRegistry()
- sw/source/core/doc/docnew.cxx:
+ initialize XmlIdRegistry in SwDoc::GetXmlIdRegistry, not in constructor,
because the constructor is not told whether the SwDoc is a clipboard
- sw/inc/docsh.hxx, sw/source/ui/app/docsh.cxx:
+ SwDocShell: override GetXmlIdRegistry()
#i91563#: make the SwTxtNode metadatable
- sw/inc/ndtxt.hxx
+ SwTxtNode inherits sw::Metadatable
- sw/inc/unoobj.hxx, sw/source/core/unocore/unoparagraph.cxx:
+ SwXParagraph inherits sw::MetadatableMixin
#i91563#: handle SwTxtNode's metadata for delete
- sw/source/core/txtnode/ndtxt.cxx:
+ SwTxtNode::SplitCntntNode: handle XmlId
+ SwTxtNode::JoinNext: merge XmlIds
- sw/source/core/doc/docedt.cxx:
+ lcl_GetJoinFlags: document postcondition
+ SwDoc::Delete: remove XmlId only if SwTxtNode _becomes_ empty
#i91563#: handle SwTxtNode's metadata for delete with undo
- sw/inc/undobj.hxx
+ SwUndoDelete: new members m_pMetadataUndoStart, m_pMetadataUndoEnd
- sw/source/core/undo/undel.cxx:
+ SwUndoDelete::SaveCntnt: save XmlIds for start and end SwTxtNode
+ SwUndoDelete::SaveCntnt: remove XmlId only if SwTxtNode _becomes_ empty
+ SwUndoDelete::Undo: restore saved XmlIds for start and end SwTxtNode
- sw/source/core/docnode/ndcopy.cxx:
+ SwTxtNode::MakeCopy: register copy at XmlIdRegistry
#i91563#: handle SwTxtNode's metadata for find/replace with undo
- sw/source/core/undo/unins.cxx:
+ _UnReplaceData: rename members: add prefix m_
+ _UnReplaceData: new members m_pMetadataUndoStart, m_pMetadataUndoEnd
+ _UnReplaceData::_UnReplaceData: save XmlIds for start and end SwTxtNode
+ _UnReplaceData::Undo: restore saved XmlIds for start and end SwTxtNode
#i91563#: handle SwTxtNode's metadata for table-to-text with undo
- sw/source/core/undo/untbl.cxx:
+ SwTblToTxtSave: rename members: add prefix m_
+ SwTblToTxtSave: new members m_pMetadataUndoStart, m_pMetadataUndoEnd
+ SwTblToTxtSave::SwTblToTxtSave: save XmlIds for start and end SwTxtNode
+ SwTblToTxtSave::SwTblToTxtSave, SwNodes::UndoTableToText:
always store the index of the first SwTxtNode in the cell, instead of
the index of the first SwTxtNode in case of the first cell in a row,
and the cell start node in other cases
+ SwNodes::UndoTableToText: restore saved XmlIds for start and end SwTxtNode
- sw/source/core/docnode/ndtbl.cxx:
+ lcl_DelBox: simplify for refactored start index handling in SwTblToTxtSave
2009-02-26 13:02:28 +0100 mst r268505 : migration of cws odfmetadata2 from CVS (resync to m42): module sd
- sd/source/ui/table/tableobjectbar.cxx,sd/source/ui/view/*.cxx:
+ remove invocations of SFX_DECL_TYPE
- sd/source/ui/slideshow/SlideShowRestarter.cxx,
sd/source/ui/toolpanel/LayoutMenu.cxx,
sd/source/ui/unoidl/DrawController.cxx,
sd/source/ui/view/{ViewShellBase.cxx,ViewTabBar.cxx,frmview.cxx}:
+ fix abuses of comphelper_getProcessComponentContext (missing release)
2009-02-26 13:01:24 +0100 mst r268504 : migration of cws odfmetadata2 from CVS (resync to m42): module starmath
- starmath/source/document.cxx:
+ don't touch SfxObjectShell's privates
2009-02-26 13:00:37 +0100 mst r268503 : migration of cws odfmetadata2 from CVS (resync to m42): module sfx2
#i90620#
- sfx2/inc/sfx2/XmlIdRegistry.hxx:
+ new file: interfaces sfx2::IXmlIdRegistry and sfx2::IXmlIdRegistrySupplier
and a couple of utility functions
- sfx2/inc/sfx2/DocumentMetadataAccess.hxx,
sfx2/source/doc/DocumentMetadataAccess.cxx:
+ new class sfx2::DocumentMetadataAccess, implements XDocumentMetadataAccess
+ the URI of the DocumentMetadataAccess is now the URI from which the
document was loaded; for a new document, use a vnd.sun.star.tdoc URI
+ add new function sfx2::createBaseURI()
+ prevent using reserved file names
+ try not to recurse into embedded subdocuments
- sfx2/source/doc/makefile.mk:
+ add DocumentMetadataAccess
- sfx2/util/makefile.mk:
+ link libsfx2 against libxml2 (needed for xmlValidateNCName)
- sfx2/source/doc/makefile.mk:
+ add LIBXML_CFLAGS to CFLAGS
- sfx2/prj/build.lst:
+ add dependence on libxml2
- sfx2/prj/d.lst:
+ add XmlIdRegistry.hxx, DocumentMetadataAccess.hxx
- sfx2/inc/sfx2/objsh.hxx, sfx2/source/doc/objxtor.cxx:
+ make SfxObjectShell's members private
+ new method SfxObjectShell::GetAutoStyleFilterIndex
+ SfxObjectShell inherits sfx2::IXmlIdRegistrySupplier
- sfx2/source/dialog/templdlg.cxx, sfx2/source/doc/sfxbasemodel.cxx:
+ don't touch SfxObjectShell's privates
- sfx2/inc/sfx2/sfxbasemodel.hxx, sfx2/source/doc/sfxbasemodel.cxx:
+ SfxBaseModel inherits BaseMutex instead of IMPL_SfxBaseModel_MutexContainer
+ SfxBaseModel implements additional interface XDocumentMetadataAccess
+ IMPL_SfxBaseModel_DataContainer has new member:
a sfx2::DocumentMetadataAccess
+ implementation of XDocumentMetadataAccess forwards to
the sfx2::DocumentMetadataAccess member
- sfx2/qa/complex/DocumentMetadataAccessTest.java,
sfx2/qa/complex/{tests.sce,makefile.mk},
sfx2/qa/complex/testdocuments/TESTRDFA.odt:
+ add complex test: DocumentMetadataAccessTest
+ add RDFa test document
#i95863#
- sfx2/inc/sfx2/dinfdlg.hxx, sfx2/source/dialog/dinfdlg.cxx:
+ refactor SfxDocumentItem so it no longer requires a XDocumentInfo
+ move struct CustomProperty to implementation file
+ remove class SfxDocumentUserPage
+ QueryValue,PutValue: remove MID_DOCINFO_FIELD*
- sfx2/source/doc/objserv.cxx:
+ adapt to SfxDocumentItem change
- sfx2/inc/sfx2/sfx.hrc, sfx2/sdi/sfxslots.sdi, sfx2/inc/sfx2/msg.hxx:
+ remove MID_DOCINFO_FIELD*
+ put all invocations of SFX_DECL_TYPE in msg.hxx, and undef SFX_DECL_TYPE
- sfx2/source/doc/objxtor.cxx:
+ fix abuses of comphelper_getProcessComponentContext (missing release)
- sfx2/source/doc/docfile.cxx:
+ SfxMedium::SfxMedium: don't dereference NULL, throw exception instead
- sfx2/source/doc/objstor.cxx:
+ SfxObjectShell::DoLoad: fix bug: DocumentBaseURI is not initialized
2009-02-26 12:58:07 +0100 mst r268502 : migration of cws odfmetadata2 from CVS (resync to m42): module xmloff
#i90620#: implement RDFa import (interface change)
- xmloff/inc/xmloff/xmlimp.hxx. xmloff/source/core/xmlimp.cxx:
+ make SvXMLImport::GetAbsoluteReference() const
+ add SvXMLImport::GetComponentContext()
+ SvXMLImport::_InitCtor(): add RDFa namespace
+ add SvXMLImport::AddRDFa()
+ SvXMLImport::endDocument() inserts RDFa into document repository
- xmloff/inc/xmloff/xmltoken.hxx, xmloff/source/core/xmltoken.cxx:
+ new tokens for RDFa: XML_ABOUT, XML_DATATYPE
- xmloff/inc/RDFaImportHelper.hxx, xmloff/source/core/RDFaImportHelper.cxx:
+ new class RDFaImportHelper
+ adapt the code to the bleak reality of broken C++ implementations
+ handle empty xhtml:about attributes properly, which are actually
valid relative URIs
+ work around broken SvXMLImport::GetAbsoluteReference
- xmloff/source/core/makefile.mk:
+ add RDFaImportHelper.cxx
#i90620#: implement RDFa export
- xmloff/inc/xmloff/xmlexp.hxx, xmloff/source/core/xmlexp.cxx:
+ add SvXMLExport::EnsureNamespace(), and a stack of namespace maps
+ add SvXMLExport::GetComponentContext()
+ add SvXMLExport::AddAttributesRDFa()
- xmloff/inc/RDFaExportHelper.hxx, xmloff/source/core/RDFaExportHelper.cxx:
+ new class RDFaExportHelper
+ don't use std::map::data_type, which is actually called
std::map::mapped_type by libstdc++
- xmloff/source/core/makefile.mk:
+ add RDFaExportHelper.cxx
#i91563#
- xmloff/inc/xmloff/txtimp.hxx, xmloff/source/text/txtimp.cxx:
+ XMLTextPAttrTokens: add RDFa tokens
- xmloff/source/text/txtparai{.hxx,.cxx}:
+ import RDFa for text:p
- xmloff/source/text/txtparae.cxx:
+ export RDFa for text:p
interface change: use XHTML namespace instead of RDFA
- xmloff/inc/xmlnmspe.hxx, xmloff/inc/xmloff/xmltoken.hxx,
xmloff/source/core/{xmltoken.cxx,xmlimp.cxx,xmlexp.cxx,RDFaExportHelper.cxx},
xmloff/source/text/txtimp.cxx:
+ use XHTML namespace instead of RDFA
#i91565#, #i91566#: (preliminary) import for text:meta, text:meta-field
- xmloff/source/text/txtparai.cxx:
+ new class XMLMetaImportContextBase with subclasses to import
text:meta and text:meta-field
- xmloff/source/text/XMLTextMarkImportContext.cxx:
+ change XMLTextMarkImportContext::CreateAndInsertMark to handle marks
with no name (text:meta)
#i91565#, #i91566#: (preliminary) export for text:meta, text:meta-field
- xmloff/inc/txtflde.hxx, xmloff/source/text/txtflde.cxx:
+ add FIELD_ID_META to FieldIdEnum
+ new method XMLTextFieldExport::ExportMetaField()
+ change XMLTextFieldExport::ExportField{,AutoStyle,Helper}
to take additional parameter for progress bar
- xmloff/inc/xmloff/txtparae.hxx, xmloff/source/text/txtparae.cxx:
+ make XMLTextParagraphExport::exportTextRangeEnumeration() public
+ new method XMLTextParagraphExport::exportMeta()
#i90620#
- xmloff/inc/xmloff/xmlimp.hxx, xmloff/source/core/xmlimp.cxx,
xmloff/inc/xmloff/xmlexp.hxx, xmloff/source/core/xmlexp.cxx:
+ rename SvXML{Im,Ex}port::GetStreamPath() to GetStreamName()
+ fix xml:id {im,ex}port for embedded documents and non-packages
+ adapt to API change: XMetadatable
#i90620# GRDDL
- xmloff/inc/xmlnmspe.hxx, xmloff/inc/xmloff/xmltoken.hxx,
xmloff/source/core/{xmltoken.cxx,xmlexp.cxx}:
+ add GRDDL namespace
+ add token XML_TRANSFORMATION
+ add grddl:transformation attribute to root elements for meta.xml,
content.xml and styles.xml
2009-02-26 12:54:40 +0100 mst r268501 : migration of cws odfmetadata2 from CVS (resync to m42): module unoxml
#i90620#
- unoxml/source/rdf/librdf_repository.cxx:
+ librdf_Repository::importGraph: allocate buffer sized length of stream
+ switch from one librdf_world per repository to a single static world
because redland has global variables with a brain-damaged life-cycle...
+ exportGraph: use new raptor 1.4.18 feature to disable writing
an xml:base attribute in RDF/XML files
- unoxml/source/rdf/librdf_repository.cxx:
unoxml/qa/complex/RDFRepositoryTest.java:
+ adapt to predicate is URI change
+ adapt to RDFa API change
+ adapt to API change: RDFa has multiple predicates...
+ adapt to API change: XMetadatable derives from XURI
+ allow xhtml:datatype without xhtml:content
+ adapt to API change: attribute MetadataReference is StringPair
- unoxml/source/rdf/CURI.cxx:
+ add some more URI constants
2009-02-26 12:53:32 +0100 mst r268500 : migration of cws odfmetadata2 from CVS (resync to m42): module package
- package/inc/ImplValidCharacters.hxx:
+ remove (moved to comphelper)
2009-02-26 12:52:49 +0100 mst r268499 : migration of cws odfmetadata2 from CVS (resync to m42): module comphelper
- comphelper/inc/comphelper/processfactory.hxx,
comphelper/source/processfactory/processfactory.cxx:
+ add getProcessComponentContext()
+ change return type of comphelper_getProcessComponentContext to Reference
- comphelper/inc/comphelper/stl_types.hxx:
+ add OUStringBufferAppender
+ add algorithm intersperse
- comphelper/source/misc/string.cxx:
+ rewrite convertCommaSeparated with intersperse and OUStringBufferAppender
- comphelper/inc/comphelper/stlunosequence.hxx:
+ fix bug: begin() on empty sequence != end()
2009-02-26 12:50:47 +0100 mst r268498 : migration of cws odfmetadata2 from CVS (resync to m42): module offapi
#i96209#
- offapi/com/sun/star/text/fieldmaster/*.idl:
+ rename module from FieldMaster to fieldmaster
- offapi/type_reference/{typelibrary_history.txt,types.rdb}:
+ update reference types.rdb
#i90620#
- offapi/com/sun/star/rdf/{XMetadatable.idl,XDocumentMetadataAccess.idl}:
+ API change: XMetadatable derives from XURI
+ API change: replace XmlId (string) with MetadataReference (StringPair)
- offapi/com/sun/star/rdf/{Statement.idl,XDocumentRepository.idl,
XNamedGraph.idl,XRepository.idl}:
+ the predicate of a statement is a URI, not a Resource
- offapi/com/sun/star/rdf/XDocumentMetadataAccess.idl:
+ rename: s/Package/Document/
+ remove uuid
+ remove everything related to mapping
+ graph names are now generated from base URI and file names
+ load methods: improve error handling with XInteractionHandler
- offapi/com/sun/star/rdf/XDocumentRepository.idl:
+ change: RDFa permits using multiple predicates in one attribute
+ setStatementRDFa: subject is now XResource, object is now XMetadatable
- offapi/com/sun/star/rdf/URIs.idl:
+ add some more URI constants
- offapi/com/sun/star/rdf:
+ fix @since tags and replace <method> with <member>
2009-02-26 12:47:24 +0100 mst r268497 : migration of cws odfmetadata2 from CVS (resync to m42): module redland
fix #i93768#
- redland/raptor-1.4.17.patch, redland/raptor/makefile.mk:
+ disable GRDDL parser to prevent call to libxslt
xsltSetDefaultSecurityPrefs, which breaks xmlhelp
- redland/raptor/makefile.mk, redland/raptor-1.4.17.patch,
redland/raptor-1.4.18.patch:
+ upgrade raptor to 1.4.18
+ deactivate serializer for RSS/Atom (does not build)
- redland/rasqal/makefile.mk, redland/rasqal-0.9.15.patch,
redland/rasqal-0.9.16.patch,
+ upgrade rasqal to 0.9.16
- redland/redland/makefile.mk, redland/redland-1.0.7.patch,
redland/redland-1.0.8.patch:
+ upgrade redland to 1.0.8
- redland/redlandversion.mk:
+ the librasqal SONAME has changed
diff --git a/sd/source/ui/slideshow/SlideShowRestarter.cxx b/sd/source/ui/slideshow/SlideShowRestarter.cxx
index b24ffb9..1a9c226 100644
--- a/sd/source/ui/slideshow/SlideShowRestarter.cxx
+++ b/sd/source/ui/slideshow/SlideShowRestarter.cxx
@@ -98,7 +98,8 @@ void SlideShowRestarter::Restart (void)
sal_Int32 SlideShowRestarter::GetDisplayCount (void)
{
- Reference<XComponentContext> xContext (comphelper_getProcessComponentContext());
+ const Reference<XComponentContext> xContext (
+ ::comphelper::getProcessComponentContext() );
Reference<XMultiComponentFactory> xFactory (
xContext->getServiceManager(), UNO_QUERY);
if ( ! xFactory.is())
diff --git a/sd/source/ui/slidesorter/model/SlsPageEnumerationProvider.cxx b/sd/source/ui/slidesorter/model/SlsPageEnumerationProvider.cxx
index 6ef5122..3c5c727 100644
--- a/sd/source/ui/slidesorter/model/SlsPageEnumerationProvider.cxx
+++ b/sd/source/ui/slidesorter/model/SlsPageEnumerationProvider.cxx
@@ -84,8 +84,8 @@ public:
PageEnumeration PageEnumerationProvider::CreateAllPagesEnumeration (
const SlideSorterModel& rModel)
{
- AllPagesPredicate aPredicate;
- return PageEnumeration::Create(rModel, aPredicate);
+// AllPagesPredicate aPredicate; // spurious warning on unxsoli4 debug=t
+ return PageEnumeration::Create(rModel, AllPagesPredicate());
}
diff --git a/sd/source/ui/table/tableobjectbar.cxx b/sd/source/ui/table/tableobjectbar.cxx
index 34bea84..5bb1039 100644
--- a/sd/source/ui/table/tableobjectbar.cxx
+++ b/sd/source/ui/table/tableobjectbar.cxx
@@ -65,8 +65,6 @@ using namespace sd::ui::table;
#define TableObjectBar
#include "sdslots.hxx"
-SFX_DECL_TYPE( 13 );
-
namespace sd { namespace ui { namespace table {
diff --git a/sd/source/ui/toolpanel/LayoutMenu.cxx b/sd/source/ui/toolpanel/LayoutMenu.cxx
index 10744f9..59241fe 100644
--- a/sd/source/ui/toolpanel/LayoutMenu.cxx
+++ b/sd/source/ui/toolpanel/LayoutMenu.cxx
@@ -752,7 +752,7 @@ void LayoutMenu::Fill (void)
Reference<XControllerManager> xControllerManager (
Reference<XWeak>(&mrBase.GetDrawController()), UNO_QUERY_THROW);
Reference<XResourceId> xPaneId (ResourceId::create(
- comphelper_getProcessComponentContext(),
+ ::comphelper::getProcessComponentContext(),
FrameworkHelper::msCenterPaneURL));
Reference<XView> xView (FrameworkHelper::Instance(mrBase)->GetView(xPaneId));
if (xView.is())
diff --git a/sd/source/ui/unoidl/DrawController.cxx b/sd/source/ui/unoidl/DrawController.cxx
index ba9966b..09f0db0 100644
--- a/sd/source/ui/unoidl/DrawController.cxx
+++ b/sd/source/ui/unoidl/DrawController.cxx
@@ -879,7 +879,8 @@ void DrawController::ProvideFrameworkControllers (void)
try
{
Reference<XController> xController (this);
- Reference<XComponentContext> xContext (comphelper_getProcessComponentContext());
+ const Reference<XComponentContext> xContext (
+ ::comphelper::getProcessComponentContext() );
mxConfigurationController = ConfigurationController::create(
xContext,
xController);
diff --git a/sd/source/ui/view/GraphicObjectBar.cxx b/sd/source/ui/view/GraphicObjectBar.cxx
index b278bf6..fe87a1c 100644
--- a/sd/source/ui/view/GraphicObjectBar.cxx
+++ b/sd/source/ui/view/GraphicObjectBar.cxx
@@ -39,14 +39,10 @@
#include <svtools/itempool.hxx>
#include <sfx2/app.hxx>
#include <sfx2/shell.hxx>
-#ifndef _SVXIDS_HRC
#include <svx/svxids.hrc>
-#endif
#include <sfx2/request.hxx>
#include <sfx2/basedlgs.hxx>
-#ifndef _SVDOPATH_HXX //autogen
#include <svx/svdograf.hxx>
-#endif
#include <svx/grfflt.hxx>
#include <svtools/aeitem.hxx>
#include <svx/grafctrl.hxx>
@@ -72,8 +68,6 @@ using namespace sd;
namespace sd {
-SFX_DECL_TYPE( 13 );
-
// -----------------------
// - GraphicObjectBar -
diff --git a/sd/source/ui/view/MediaObjectBar.cxx b/sd/source/ui/view/MediaObjectBar.cxx
index 7bc7a9b..77f4039 100644
--- a/sd/source/ui/view/MediaObjectBar.cxx
+++ b/sd/source/ui/view/MediaObjectBar.cxx
@@ -61,8 +61,6 @@ using namespace sd;
namespace sd {
-SFX_DECL_TYPE( 13 );
-
// ------------------
// - MediaObjectBar -
// ------------------
diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx
index edbff25..a1aa60c 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -1378,10 +1378,12 @@ void ViewShellBase::Implementation::SetPaneVisibility (
{
Reference<XControllerManager> xControllerManager (mrBase.GetController(), UNO_QUERY_THROW);
+ const Reference< XComponentContext > xContext(
+ ::comphelper::getProcessComponentContext() );
Reference<XResourceId> xPaneId (ResourceId::create(
- comphelper_getProcessComponentContext(), rsPaneURL));
+ xContext, rsPaneURL));
Reference<XResourceId> xViewId (ResourceId::createWithAnchorURL(
- comphelper_getProcessComponentContext(), rsViewURL, rsPaneURL));
+ xContext, rsViewURL, rsPaneURL));
// Determine the new visibility state.
const SfxItemSet* pArguments = rRequest.GetArgs();
@@ -1448,6 +1450,8 @@ void ViewShellBase::Implementation::GetSlotState (SfxItemSet& rSet)
if ( ! xConfiguration.is())
throw RuntimeException();
+ const Reference< XComponentContext > xContext(
+ ::comphelper::getProcessComponentContext() );
SfxWhichIter aSetIterator (rSet);
sal_uInt16 nItemId (aSetIterator.FirstWhich());
while (nItemId > 0)
@@ -1460,25 +1464,22 @@ void ViewShellBase::Implementation::GetSlotState (SfxItemSet& rSet)
{
case SID_LEFT_PANE_IMPRESS:
xResourceId = ResourceId::create(
- comphelper_getProcessComponentContext(),
- FrameworkHelper::msLeftImpressPaneURL);
+ xContext, FrameworkHelper::msLeftImpressPaneURL);
break;
case SID_LEFT_PANE_DRAW:
xResourceId = ResourceId::create(
- comphelper_getProcessComponentContext(),
- FrameworkHelper::msLeftDrawPaneURL);
+ xContext, FrameworkHelper::msLeftDrawPaneURL);
break;
case SID_RIGHT_PANE:
xResourceId = ResourceId::create(
- comphelper_getProcessComponentContext(),
- FrameworkHelper::msRightPaneURL);
+ xContext, FrameworkHelper::msRightPaneURL);
break;
case SID_NORMAL_MULTI_PANE_GUI:
xResourceId = ResourceId::createWithAnchorURL(
- comphelper_getProcessComponentContext(),
+ xContext,
FrameworkHelper::msImpressViewURL,
FrameworkHelper::msCenterPaneURL);
break;
@@ -1486,14 +1487,14 @@ void ViewShellBase::Implementation::GetSlotState (SfxItemSet& rSet)
case SID_SLIDE_SORTER_MULTI_PANE_GUI:
case SID_DIAMODE:
xResourceId = ResourceId::createWithAnchorURL(
- comphelper_getProcessComponentContext(),
+ xContext,
FrameworkHelper::msSlideSorterURL,
FrameworkHelper::msCenterPaneURL);
break;
case SID_OUTLINEMODE:
xResourceId = ResourceId::createWithAnchorURL(
- comphelper_getProcessComponentContext(),
+ xContext,
FrameworkHelper::msOutlineViewURL,
FrameworkHelper::msCenterPaneURL);
break;
@@ -1502,14 +1503,14 @@ void ViewShellBase::Implementation::GetSlotState (SfxItemSet& rSet)
// There is only the master page mode for the handout
// view so ignore the master page flag.
xResourceId = ResourceId::createWithAnchorURL(
- comphelper_getProcessComponentContext(),
+ xContext,
FrameworkHelper::msHandoutViewURL,
FrameworkHelper::msCenterPaneURL);
break;
case SID_NOTESMODE:
xResourceId = ResourceId::createWithAnchorURL(
- comphelper_getProcessComponentContext(),
+ xContext,
FrameworkHelper::msNotesViewURL,
FrameworkHelper::msCenterPaneURL);
break;
diff --git a/sd/source/ui/view/ViewTabBar.cxx b/sd/source/ui/view/ViewTabBar.cxx
index 469a25e..10ede38 100644
--- a/sd/source/ui/view/ViewTabBar.cxx
+++ b/sd/source/ui/view/ViewTabBar.cxx
@@ -442,7 +442,7 @@ bool ViewTabBar::ActivatePage (void)
{
xView = Reference<XView>(xConfigurationController->getResource(
ResourceId::create(
- comphelper_getProcessComponentContext(),
+ ::comphelper::getProcessComponentContext(),
FrameworkHelper::msCenterPaneURL)),
UNO_QUERY);
}
diff --git a/sd/source/ui/view/drbezob.cxx b/sd/source/ui/view/drbezob.cxx
index e31bf7a..4797fd0 100644
--- a/sd/source/ui/view/drbezob.cxx
+++ b/sd/source/ui/view/drbezob.cxx
@@ -38,9 +38,7 @@
#include <sfx2/viewfrm.hxx>
#include <sfx2/objface.hxx>
-#ifndef _SVXIDS_HRC
#include <svx/svxids.hrc>
-#endif
#include <svtools/eitem.hxx>
#include <sfx2/request.hxx>
#include <svx/svdopath.hxx>
@@ -80,8 +78,6 @@ namespace sd {
\************************************************************************/
-SFX_DECL_TYPE(13);
-
SFX_IMPL_INTERFACE(BezierObjectBar, ::SfxShell, SdResId(STR_BEZIEROBJECTBARSHELL))
{
diff --git a/sd/source/ui/view/drtxtob.cxx b/sd/source/ui/view/drtxtob.cxx
index 0563037..9dafcd8 100644
--- a/sd/source/ui/view/drtxtob.cxx
+++ b/sd/source/ui/view/drtxtob.cxx
@@ -34,15 +34,9 @@
#include "TextObjectBar.hxx"
-#ifndef _ULSPITEM_HXX
#include <svx/ulspitem.hxx>
-#endif
-#ifndef _LSPCITEM_HXX
#include <svx/lspcitem.hxx>
-#endif
-#ifndef _ADJITEM_HXX
#include <svx/adjitem.hxx>
-#endif
#include <vcl/vclenum.hxx>
#include <sfx2/app.hxx>
#include <svtools/whiter.hxx>
@@ -53,9 +47,7 @@
#include <svx/escpitem.hxx>
#include <svx/svdoutl.hxx>
#include <svtools/intitem.hxx>
-#ifndef _SVX_SRIPTTYPEITEM_HXX //autogen
#include <svx/scripttypeitem.hxx>
-#endif
#include <svx/outlobj.hxx>
#include <svx/writingmodeitem.hxx>
#include <svx/frmdiritem.hxx>
@@ -93,8 +85,6 @@ namespace sd {
|*
\************************************************************************/
-SFX_DECL_TYPE(13);
-
SFX_IMPL_INTERFACE( TextObjectBar, SfxShell, SdResId(STR_TEXTOBJECTBARSHELL) )
{
diff --git a/sd/source/ui/view/drvwshrg.cxx b/sd/source/ui/view/drvwshrg.cxx
index c55c6a9..eb739c4 100644
--- a/sd/source/ui/view/drvwshrg.cxx
+++ b/sd/source/ui/view/drvwshrg.cxx
@@ -46,9 +46,7 @@
#include <svx/svxids.hrc>
#include <svx/hyprlink.hxx>
#include <svx/hyperdlg.hxx>
-#ifndef _AVMEDIA_MEDIAPLAYER_HXX
#include <avmedia/mediaplayer.hxx>
-#endif
#include "app.hrc"
@@ -80,8 +78,6 @@ namespace sd {
|*
\************************************************************************/
-SFX_DECL_TYPE(13);
-
SFX_IMPL_INTERFACE(DrawViewShell, SfxShell, SdResId(STR_DRAWVIEWSHELL))
{
diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx
index 0acef9b..f51ee43 100644
--- a/sd/source/ui/view/frmview.cxx
+++ b/sd/source/ui/view/frmview.cxx
@@ -121,7 +121,7 @@ FrameView::FrameView(SdDrawDocument* pDrawDoc, FrameView* pFrameView /* = NULK *
Reference<drawing::framework::XView> xView (
framework::FrameworkHelper::Instance(*pBase)->GetView(
drawing::framework::ResourceId::create(
- comphelper_getProcessComponentContext(),
+ ::comphelper::getProcessComponentContext(),
framework::FrameworkHelper::msCenterPaneURL)));
if (xView.is())
sViewURL = xView->getResourceId()->getResourceURL();
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index dada4aa..2c8b718 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -84,9 +84,7 @@
#include "sdresid.hxx"
#include "sdpage.hxx"
#include "fuoltext.hxx"
-#ifndef SD_FRAME_VIEW
#include "FrameView.hxx"
-#endif
#include "zoomlist.hxx"
#include "stlsheet.hxx"
#include "slideshow.hxx"
@@ -123,8 +121,6 @@ namespace sd {
|*
\************************************************************************/
-SFX_DECL_TYPE(13);
-
SFX_IMPL_INTERFACE(OutlineViewShell, SfxShell, SdResId(STR_OUTLINEVIEWSHELL))
{
More information about the ooo-build-commit
mailing list