summaryrefslogtreecommitdiff
path: root/svx/source/svdraw
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2015-04-30 07:18:59 +0300
committerTor Lillqvist <tml@collabora.com>2015-04-30 09:11:40 +0300
commit5a27f808beff001bc69755095e08e50900d7c863 (patch)
tree1df6fbc012958c178be6f4bd7e5e60e08e7ef189 /svx/source/svdraw
parentc07a3b0396ab131bef7ef23305180c8f27bf5c9b (diff)
Get rid of initial :: for the sdr namespace
Change-Id: Ibbeb069b6fcb2aa0581429ac5cb6db519548fd00
Diffstat (limited to 'svx/source/svdraw')
-rw-r--r--svx/source/svdraw/sdrpagewindow.cxx4
-rw-r--r--svx/source/svdraw/sdrpaintwindow.cxx6
-rw-r--r--svx/source/svdraw/svdcrtv.cxx12
-rw-r--r--svx/source/svdraw/svdetc.cxx2
-rw-r--r--svx/source/svdraw/svdhdl.cxx70
-rw-r--r--svx/source/svdraw/svdmrkv.cxx8
-rw-r--r--svx/source/svdraw/svdobj.cxx6
-rw-r--r--svx/source/svdraw/svdomedia.cxx6
-rw-r--r--svx/source/svdraw/svdouno.cxx6
-rw-r--r--svx/source/svdraw/svdpage.cxx12
-rw-r--r--svx/source/svdraw/svdsnpv.cxx12
-rw-r--r--svx/source/svdraw/svdview.cxx10
12 files changed, 77 insertions, 77 deletions
diff --git a/svx/source/svdraw/sdrpagewindow.cxx b/svx/source/svdraw/sdrpagewindow.cxx
index 0e4cdf41dc10..8b03862b90b1 100644
--- a/svx/source/svdraw/sdrpagewindow.cxx
+++ b/svx/source/svdraw/sdrpagewindow.cxx
@@ -170,7 +170,7 @@ const SdrPaintWindow* SdrPageWindow::GetOriginalPaintWindow() const
}
// OVERLAY MANAGER
-rtl::Reference< ::sdr::overlay::OverlayManager > SdrPageWindow::GetOverlayManager() const
+rtl::Reference< sdr::overlay::OverlayManager > SdrPageWindow::GetOverlayManager() const
{
return GetPaintWindow().GetOverlayManager();
}
@@ -471,7 +471,7 @@ void SdrPageWindow::ResetObjectContact()
void SdrPageWindow::SetDesignMode( bool _bDesignMode ) const
{
- const ::sdr::contact::ObjectContactOfPageView* pOC = dynamic_cast< const ::sdr::contact::ObjectContactOfPageView* >( &GetObjectContact() );
+ const sdr::contact::ObjectContactOfPageView* pOC = dynamic_cast< const sdr::contact::ObjectContactOfPageView* >( &GetObjectContact() );
DBG_ASSERT( pOC, "SdrPageWindow::SetDesignMode: invalid object contact!" );
if ( pOC )
pOC->SetUNOControlsDesignMode( _bDesignMode );
diff --git a/svx/source/svdraw/sdrpaintwindow.cxx b/svx/source/svdraw/sdrpaintwindow.cxx
index 0440ba195faf..b31308d62d25 100644
--- a/svx/source/svdraw/sdrpaintwindow.cxx
+++ b/svx/source/svdraw/sdrpaintwindow.cxx
@@ -209,7 +209,7 @@ void SdrPaintWindow::impCreateOverlayManager()
// whether that refresh itself will use a 2nd vdev to avoid flickering.
// Also hand over the old OverlayManager if existent; this means to take over
// the registered OverlayObjects from it
- mxOverlayManager = ::sdr::overlay::OverlayManagerBuffered::create(GetOutputDevice(), GetPaintView().GetModel(), true);
+ mxOverlayManager = sdr::overlay::OverlayManagerBuffered::create(GetOutputDevice(), GetPaintView().GetModel(), true);
}
else
{
@@ -217,7 +217,7 @@ void SdrPaintWindow::impCreateOverlayManager()
// take place
// Also hand over the old OverlayManager if existent; this means to take over
// the registered OverlayObjects from it
- mxOverlayManager = ::sdr::overlay::OverlayManager::create(GetOutputDevice(), GetPaintView().GetModel());
+ mxOverlayManager = sdr::overlay::OverlayManager::create(GetOutputDevice(), GetPaintView().GetModel());
}
OSL_ENSURE(mxOverlayManager.is(), "SdrPaintWindow::SdrPaintWindow: Could not allocate an overlayManager (!)");
@@ -261,7 +261,7 @@ SdrPaintWindow::~SdrPaintWindow()
DestroyPreRenderDevice();
}
-rtl::Reference< ::sdr::overlay::OverlayManager > SdrPaintWindow::GetOverlayManager() const
+rtl::Reference< sdr::overlay::OverlayManager > SdrPaintWindow::GetOverlayManager() const
{
if(!mxOverlayManager.is())
{
diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx
index 8dccf7e78ced..0c9db46473d7 100644
--- a/svx/source/svdraw/svdcrtv.cxx
+++ b/svx/source/svdraw/svdcrtv.cxx
@@ -46,7 +46,7 @@ using namespace com::sun::star;
class ImplConnectMarkerOverlay
{
// The OverlayObjects
- ::sdr::overlay::OverlayObjectList maObjects;
+ sdr::overlay::OverlayObjectList maObjects;
// The remembered target object
const SdrObject& mrObject;
@@ -66,7 +66,7 @@ ImplConnectMarkerOverlay::ImplConnectMarkerOverlay(const SdrCreateView& rView, S
for(sal_uInt32 a(0L); a < rView.PaintWindowCount(); a++)
{
SdrPaintWindow* pCandidate = rView.GetPaintWindow(a);
- rtl::Reference< ::sdr::overlay::OverlayManager > xTargetOverlay = pCandidate->GetOverlayManager();
+ rtl::Reference< sdr::overlay::OverlayManager > xTargetOverlay = pCandidate->GetOverlayManager();
if(xTargetOverlay.is())
{
@@ -74,7 +74,7 @@ ImplConnectMarkerOverlay::ImplConnectMarkerOverlay(const SdrCreateView& rView, S
Size aHalfLogicSize(xTargetOverlay->getOutputDevice().PixelToLogic(Size(4 * nScalingFactor, 4 * nScalingFactor)));
// object
- ::sdr::overlay::OverlayPolyPolygonStripedAndFilled* pNew = new ::sdr::overlay::OverlayPolyPolygonStripedAndFilled(
+ sdr::overlay::OverlayPolyPolygonStripedAndFilled* pNew = new sdr::overlay::OverlayPolyPolygonStripedAndFilled(
aB2DPolyPolygon);
xTargetOverlay->add(*pNew);
maObjects.append(*pNew);
@@ -100,7 +100,7 @@ ImplConnectMarkerOverlay::ImplConnectMarkerOverlay(const SdrCreateView& rView, S
basegfx::B2DPolyPolygon aTempPolyPoly;
aTempPolyPoly.append(aTempPoly);
- pNew = new ::sdr::overlay::OverlayPolyPolygonStripedAndFilled(
+ pNew = new sdr::overlay::OverlayPolyPolygonStripedAndFilled(
aTempPolyPoly);
xTargetOverlay->add(*pNew);
maObjects.append(*pNew);
@@ -122,7 +122,7 @@ ImplConnectMarkerOverlay::~ImplConnectMarkerOverlay()
class ImpSdrCreateViewExtraData
{
// The OverlayObjects for XOR replacement
- ::sdr::overlay::OverlayObjectList maObjects;
+ sdr::overlay::OverlayObjectList maObjects;
public:
ImpSdrCreateViewExtraData();
@@ -162,7 +162,7 @@ void ImpSdrCreateViewExtraData::CreateAndShowOverlay(const SdrCreateView& rView,
if(rPolyPoly.count())
{
- ::sdr::overlay::OverlayPolyPolygonStripedAndFilled* pNew = new ::sdr::overlay::OverlayPolyPolygonStripedAndFilled(
+ sdr::overlay::OverlayPolyPolygonStripedAndFilled* pNew = new sdr::overlay::OverlayPolyPolygonStripedAndFilled(
rPolyPoly);
xOverlayManager->add(*pNew);
maObjects.append(*pNew);
diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx
index 32e8b24389cd..b5577781ad69 100644
--- a/svx/source/svdraw/svdetc.cxx
+++ b/svx/source/svdraw/svdetc.cxx
@@ -836,7 +836,7 @@ Color GetTextEditBackgroundColor(const SdrObjEditView& rView)
if(pText && pText->IsClosedObj())
{
- ::sdr::table::SdrTableObj* pTable = dynamic_cast< ::sdr::table::SdrTableObj * >( pText );
+ sdr::table::SdrTableObj* pTable = dynamic_cast< sdr::table::SdrTableObj * >( pText );
if( pTable )
bFound = GetDraftFillColor(pTable->GetActiveCellItemSet(), aBackground );
diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index 348cf2d37bd9..f7d32624db90 100644
--- a/svx/source/svdraw/svdhdl.cxx
+++ b/svx/source/svdraw/svdhdl.cxx
@@ -574,7 +574,7 @@ void SdrHdl::CreateB2dIAObject()
aMoveOutsideOffset.X() += aOffset.Height();
}
- rtl::Reference< ::sdr::overlay::OverlayManager > xManager = rPageWindow.GetOverlayManager();
+ rtl::Reference< sdr::overlay::OverlayManager > xManager = rPageWindow.GetOverlayManager();
if (xManager.is())
{
basegfx::B2DPoint aPosition(aPos.X(), aPos.Y());
@@ -681,11 +681,11 @@ BitmapEx SdrHdl::ImpGetBitmapEx( BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd
return aModernSet.get()->GetBitmapEx(eKindOfMarker, nInd);
}
-::sdr::overlay::OverlayObject* SdrHdl::CreateOverlayObject(
+sdr::overlay::OverlayObject* SdrHdl::CreateOverlayObject(
const basegfx::B2DPoint& rPos,
BitmapColorIndex eColIndex, BitmapMarkerKind eKindOfMarker, OutputDevice& rOutDev, Point aMoveOutsideOffset)
{
- ::sdr::overlay::OverlayObject* pRetval = 0L;
+ sdr::overlay::OverlayObject* pRetval = 0L;
// support bigger sizes
bool bForceBiggerSize(false);
@@ -764,19 +764,19 @@ BitmapEx SdrHdl::ImpGetBitmapEx( BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd
if(eKindOfMarker == Anchor || eKindOfMarker == AnchorPressed)
{
// when anchor is used take upper left as reference point inside the handle
- pRetval = new ::sdr::overlay::OverlayAnimatedBitmapEx(rPos, aBmpEx1, aBmpEx2, nBlinkTime);
+ pRetval = new sdr::overlay::OverlayAnimatedBitmapEx(rPos, aBmpEx1, aBmpEx2, nBlinkTime);
}
else if(eKindOfMarker == AnchorTR || eKindOfMarker == AnchorPressedTR)
{
// AnchorTR for SW, take top right as (0,0)
- pRetval = new ::sdr::overlay::OverlayAnimatedBitmapEx(rPos, aBmpEx1, aBmpEx2, nBlinkTime,
+ pRetval = new sdr::overlay::OverlayAnimatedBitmapEx(rPos, aBmpEx1, aBmpEx2, nBlinkTime,
(sal_uInt16)(aBmpEx1.GetSizePixel().Width() - 1), 0,
(sal_uInt16)(aBmpEx2.GetSizePixel().Width() - 1), 0);
}
else
{
// create centered handle as default
- pRetval = new ::sdr::overlay::OverlayAnimatedBitmapEx(rPos, aBmpEx1, aBmpEx2, nBlinkTime,
+ pRetval = new sdr::overlay::OverlayAnimatedBitmapEx(rPos, aBmpEx1, aBmpEx2, nBlinkTime,
(sal_uInt16)(aBmpEx1.GetSizePixel().Width() - 1) >> 1,
(sal_uInt16)(aBmpEx1.GetSizePixel().Height() - 1) >> 1,
(sal_uInt16)(aBmpEx2.GetSizePixel().Width() - 1) >> 1,
@@ -808,12 +808,12 @@ BitmapEx SdrHdl::ImpGetBitmapEx( BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd
if(eKindOfMarker == Anchor || eKindOfMarker == AnchorPressed)
{
// upper left as reference point inside the handle for AnchorPressed, too
- pRetval = new ::sdr::overlay::OverlayBitmapEx(rPos, aBmpEx);
+ pRetval = new sdr::overlay::OverlayBitmapEx(rPos, aBmpEx);
}
else if(eKindOfMarker == AnchorTR || eKindOfMarker == AnchorPressedTR)
{
// AnchorTR for SW, take top right as (0,0)
- pRetval = new ::sdr::overlay::OverlayBitmapEx(rPos, aBmpEx,
+ pRetval = new sdr::overlay::OverlayBitmapEx(rPos, aBmpEx,
(sal_uInt16)(aBmpEx.GetSizePixel().Width() - 1), 0);
}
else
@@ -840,7 +840,7 @@ BitmapEx SdrHdl::ImpGetBitmapEx( BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd
}
// create centered handle as default
- pRetval = new ::sdr::overlay::OverlayBitmapEx(rPos, aBmpEx, nCenX, nCenY);
+ pRetval = new sdr::overlay::OverlayBitmapEx(rPos, aBmpEx, nCenX, nCenY);
}
}
@@ -1014,13 +1014,13 @@ void SdrHdlColor::CreateB2dIAObject()
if(rPageWindow.GetPaintWindow().OutputToWindow())
{
- rtl::Reference< ::sdr::overlay::OverlayManager > xManager = rPageWindow.GetOverlayManager();
+ rtl::Reference< sdr::overlay::OverlayManager > xManager = rPageWindow.GetOverlayManager();
if (xManager.is())
{
Bitmap aBmpCol(CreateColorDropper(aMarkerColor));
basegfx::B2DPoint aPosition(aPos.X(), aPos.Y());
- ::sdr::overlay::OverlayObject* pNewOverlayObject = new
- ::sdr::overlay::OverlayBitmapEx(
+ sdr::overlay::OverlayObject* pNewOverlayObject = new
+ sdr::overlay::OverlayBitmapEx(
aPosition,
BitmapEx(aBmpCol),
(sal_uInt16)(aBmpCol.GetSizePixel().Width() - 1) >> 1,
@@ -1174,7 +1174,7 @@ void SdrHdlGradient::CreateB2dIAObject()
if(rPageWindow.GetPaintWindow().OutputToWindow())
{
- rtl::Reference< ::sdr::overlay::OverlayManager > xManager = rPageWindow.GetOverlayManager();
+ rtl::Reference< sdr::overlay::OverlayManager > xManager = rPageWindow.GetOverlayManager();
if (xManager.is())
{
// striped line in between
@@ -1191,8 +1191,8 @@ void SdrHdlGradient::CreateB2dIAObject()
basegfx::B2DPoint aPosition(aPos.X(), aPos.Y());
basegfx::B2DPoint aMidPos(aMidPoint.X(), aMidPoint.Y());
- ::sdr::overlay::OverlayObject* pNewOverlayObject = new
- ::sdr::overlay::OverlayLineStriped(
+ sdr::overlay::OverlayObject* pNewOverlayObject = new
+ sdr::overlay::OverlayLineStriped(
aPosition, aMidPos
);
DBG_ASSERT(pNewOverlayObject, "Got NO new IAO!");
@@ -1212,7 +1212,7 @@ void SdrHdlGradient::CreateB2dIAObject()
basegfx::B2DPoint aPosition2(a2ndPos.X(), a2ndPos.Y());
pNewOverlayObject = new
- ::sdr::overlay::OverlayTriangle(
+ sdr::overlay::OverlayTriangle(
aPositionLeft,
aPosition2,
aPositionRight,
@@ -1334,14 +1334,14 @@ void SdrHdlLine::CreateB2dIAObject()
if(rPageWindow.GetPaintWindow().OutputToWindow())
{
- rtl::Reference< ::sdr::overlay::OverlayManager > xManager = rPageWindow.GetOverlayManager();
+ rtl::Reference< sdr::overlay::OverlayManager > xManager = rPageWindow.GetOverlayManager();
if (xManager.is())
{
basegfx::B2DPoint aPosition1(pHdl1->GetPos().X(), pHdl1->GetPos().Y());
basegfx::B2DPoint aPosition2(pHdl2->GetPos().X(), pHdl2->GetPos().Y());
- ::sdr::overlay::OverlayObject* pNewOverlayObject = new
- ::sdr::overlay::OverlayLineStriped(
+ sdr::overlay::OverlayObject* pNewOverlayObject = new
+ sdr::overlay::OverlayLineStriped(
aPosition1,
aPosition2
);
@@ -1391,7 +1391,7 @@ void SdrHdlBezWgt::CreateB2dIAObject()
if(rPageWindow.GetPaintWindow().OutputToWindow())
{
- rtl::Reference< ::sdr::overlay::OverlayManager > xManager = rPageWindow.GetOverlayManager();
+ rtl::Reference< sdr::overlay::OverlayManager > xManager = rPageWindow.GetOverlayManager();
if (xManager.is())
{
basegfx::B2DPoint aPosition1(pHdl1->GetPos().X(), pHdl1->GetPos().Y());
@@ -1399,8 +1399,8 @@ void SdrHdlBezWgt::CreateB2dIAObject()
if(!aPosition1.equal(aPosition2))
{
- ::sdr::overlay::OverlayObject* pNewOverlayObject = new
- ::sdr::overlay::OverlayLineStriped(
+ sdr::overlay::OverlayObject* pNewOverlayObject = new
+ sdr::overlay::OverlayLineStriped(
aPosition1,
aPosition2
);
@@ -1448,11 +1448,11 @@ void E3dVolumeMarker::CreateB2dIAObject()
if(rPageWindow.GetPaintWindow().OutputToWindow())
{
- rtl::Reference< ::sdr::overlay::OverlayManager > xManager = rPageWindow.GetOverlayManager();
+ rtl::Reference< sdr::overlay::OverlayManager > xManager = rPageWindow.GetOverlayManager();
if (xManager.is() && aWireframePoly.count())
{
- ::sdr::overlay::OverlayObject* pNewOverlayObject = new
- ::sdr::overlay::OverlayPolyPolygonStripedAndFilled(
+ sdr::overlay::OverlayObject* pNewOverlayObject = new
+ sdr::overlay::OverlayPolyPolygonStripedAndFilled(
aWireframePoly);
// OVERLAYMANAGER
@@ -1511,7 +1511,7 @@ void ImpEdgeHdl::CreateB2dIAObject()
if(rPageWindow.GetPaintWindow().OutputToWindow())
{
- rtl::Reference< ::sdr::overlay::OverlayManager > xManager = rPageWindow.GetOverlayManager();
+ rtl::Reference< sdr::overlay::OverlayManager > xManager = rPageWindow.GetOverlayManager();
if (xManager.is())
{
basegfx::B2DPoint aPosition(aPos.X(), aPos.Y());
@@ -1633,7 +1633,7 @@ void ImpMeasureHdl::CreateB2dIAObject()
if(rPageWindow.GetPaintWindow().OutputToWindow())
{
- rtl::Reference< ::sdr::overlay::OverlayManager > xManager = rPageWindow.GetOverlayManager();
+ rtl::Reference< sdr::overlay::OverlayManager > xManager = rPageWindow.GetOverlayManager();
if (xManager.is())
{
basegfx::B2DPoint aPosition(aPos.X(), aPos.Y());
@@ -1698,7 +1698,7 @@ void ImpTextframeHdl::CreateB2dIAObject()
if(rPageWindow.GetPaintWindow().OutputToWindow())
{
- rtl::Reference< ::sdr::overlay::OverlayManager > xManager = rPageWindow.GetOverlayManager();
+ rtl::Reference< sdr::overlay::OverlayManager > xManager = rPageWindow.GetOverlayManager();
if (xManager.is())
{
const basegfx::B2DPoint aTopLeft(maRect.Left(), maRect.Top());
@@ -1707,7 +1707,7 @@ void ImpTextframeHdl::CreateB2dIAObject()
const Color aHilightColor(aSvtOptionsDrawinglayer.getHilightColor());
const double fTransparence(aSvtOptionsDrawinglayer.GetTransparentSelectionPercent() * 0.01);
- ::sdr::overlay::OverlayRectangle* pNewOverlayObject = new ::sdr::overlay::OverlayRectangle(
+ sdr::overlay::OverlayRectangle* pNewOverlayObject = new sdr::overlay::OverlayRectangle(
aTopLeft,
aBottomRight,
aHilightColor,
@@ -2324,12 +2324,12 @@ void SdrCropHdl::CreateB2dIAObject()
if(rPageWindow.GetPaintWindow().OutputToWindow())
{
- rtl::Reference< ::sdr::overlay::OverlayManager > xManager = rPageWindow.GetOverlayManager();
+ rtl::Reference< sdr::overlay::OverlayManager > xManager = rPageWindow.GetOverlayManager();
if (xManager.is())
{
basegfx::B2DPoint aPosition(aPos.X(), aPos.Y());
- ::sdr::overlay::OverlayObject* pOverlayObject = 0L;
+ sdr::overlay::OverlayObject* pOverlayObject = 0L;
// animate focused handles
if(IsFocusHdl() && (pHdlList->GetFocusHdl() == this))
@@ -2341,7 +2341,7 @@ void SdrCropHdl::CreateB2dIAObject()
const sal_uInt64 nBlinkTime = rStyleSettings.GetCursorBlinkTime();
- pOverlayObject = new ::sdr::overlay::OverlayAnimatedBitmapEx(
+ pOverlayObject = new sdr::overlay::OverlayAnimatedBitmapEx(
aPosition,
aBmpEx1,
aBmpEx2,
@@ -2356,7 +2356,7 @@ void SdrCropHdl::CreateB2dIAObject()
else
{
// create centered handle as default
- pOverlayObject = new ::sdr::overlay::OverlayBitmapEx(
+ pOverlayObject = new sdr::overlay::OverlayBitmapEx(
aPosition,
aBmpEx1,
(sal_uInt16)(aBmpEx1.GetSizePixel().Width() - 1) >> 1,
@@ -2565,10 +2565,10 @@ void SdrCropViewHdl::CreateB2dIAObject()
if(rPageWindow.GetPaintWindow().OutputToWindow())
{
- rtl::Reference< ::sdr::overlay::OverlayManager > xManager = rPageWindow.GetOverlayManager();
+ rtl::Reference< sdr::overlay::OverlayManager > xManager = rPageWindow.GetOverlayManager();
if(xManager.is())
{
- ::sdr::overlay::OverlayObject* pNew = new sdr::overlay::OverlayPrimitive2DSequenceObject(aSequence);
+ sdr::overlay::OverlayObject* pNew = new sdr::overlay::OverlayPrimitive2DSequenceObject(aSequence);
// only informative object, no hit
pNew->setHittable(false);
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index a9baeb9a35aa..d8efa35a5685 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -60,7 +60,7 @@ using namespace com::sun::star;
class ImplMarkingOverlay
{
// The OverlayObjects
- ::sdr::overlay::OverlayObjectList maObjects;
+ sdr::overlay::OverlayObjectList maObjects;
// The remembered second position in logical coordinates
basegfx::B2DPoint maSecondPosition;
@@ -84,11 +84,11 @@ ImplMarkingOverlay::ImplMarkingOverlay(const SdrPaintView& rView, const basegfx:
for(sal_uInt32 a(0L); a < rView.PaintWindowCount(); a++)
{
SdrPaintWindow* pCandidate = rView.GetPaintWindow(a);
- rtl::Reference< ::sdr::overlay::OverlayManager > xTargetOverlay = pCandidate->GetOverlayManager();
+ rtl::Reference< sdr::overlay::OverlayManager > xTargetOverlay = pCandidate->GetOverlayManager();
if (xTargetOverlay.is())
{
- ::sdr::overlay::OverlayRollingRectangleStriped* pNew = new ::sdr::overlay::OverlayRollingRectangleStriped(
+ sdr::overlay::OverlayRollingRectangleStriped* pNew = new sdr::overlay::OverlayRollingRectangleStriped(
rStartPos, rStartPos, false);
xTargetOverlay->add(*pNew);
maObjects.append(*pNew);
@@ -110,7 +110,7 @@ void ImplMarkingOverlay::SetSecondPosition(const basegfx::B2DPoint& rNewPosition
// apply to OverlayObjects
for(sal_uInt32 a(0L); a < maObjects.count(); a++)
{
- ::sdr::overlay::OverlayRollingRectangleStriped& rCandidate = static_cast< ::sdr::overlay::OverlayRollingRectangleStriped&>(maObjects.getOverlayObject(a));
+ sdr::overlay::OverlayRollingRectangleStriped& rCandidate = static_cast< sdr::overlay::OverlayRollingRectangleStriped&>(maObjects.getOverlayObject(a));
rCandidate.setSecondPosition(rNewPosition);
}
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 220d103c86ee..8afbb4f969a4 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -350,7 +350,7 @@ SdrObject::~SdrObject()
{
// tell all the registered ObjectUsers that the page is in destruction
sdr::ObjectUserVector aListCopy(mpImpl->maObjectUsers.begin(), mpImpl->maObjectUsers.end());
- for(::sdr::ObjectUserVector::iterator aIterator = aListCopy.begin(); aIterator != aListCopy.end(); ++aIterator)
+ for(sdr::ObjectUserVector::iterator aIterator = aListCopy.begin(); aIterator != aListCopy.end(); ++aIterator)
{
sdr::ObjectUser* pObjectUser = *aIterator;
DBG_ASSERT(pObjectUser, "SdrObject::~SdrObject: corrupt ObjectUser list (!)");
@@ -3225,7 +3225,7 @@ SdrObject* SdrObjFactory::MakeNewObject(sal_uInt32 nInvent, sal_uInt16 nIdent, S
#if HAVE_FEATURE_AVMEDIA
case sal_uInt16(OBJ_MEDIA ): pObj=new SdrMediaObj(); break;
#endif
- case sal_uInt16(OBJ_TABLE ): pObj=new ::sdr::table::SdrTableObj(pModel); break;
+ case sal_uInt16(OBJ_TABLE ): pObj=new sdr::table::SdrTableObj(pModel); break;
case sal_uInt16(OBJ_OPENGL ): pObj=new SdrOpenGLObj; break;
}
}
@@ -3313,7 +3313,7 @@ SdrObject* SdrObjFactory::MakeNewObject(
#if HAVE_FEATURE_AVMEDIA
case sal_uInt16(OBJ_MEDIA ): pObj=new SdrMediaObj(); break;
#endif
- case sal_uInt16(OBJ_TABLE ): pObj=new ::sdr::table::SdrTableObj(pModel); break;
+ case sal_uInt16(OBJ_TABLE ): pObj=new sdr::table::SdrTableObj(pModel); break;
case sal_uInt16(OBJ_OPENGL ): pObj=new SdrOpenGLObj; break;
}
}
diff --git a/svx/source/svdraw/svdomedia.cxx b/svx/source/svdraw/svdomedia.cxx
index 05c5589c32fe..074d2faaaae5 100644
--- a/svx/source/svdraw/svdomedia.cxx
+++ b/svx/source/svdraw/svdomedia.cxx
@@ -104,7 +104,7 @@ bool SdrMediaObj::HasTextEdit() const
sdr::contact::ViewContact* SdrMediaObj::CreateObjectSpecificViewContact()
{
- return new ::sdr::contact::ViewContactOfSdrMediaObj( *this );
+ return new sdr::contact::ViewContactOfSdrMediaObj( *this );
}
void SdrMediaObj::TakeObjInfo( SdrObjTransformInfoRec& rInfo ) const
@@ -248,7 +248,7 @@ const OUString& SdrMediaObj::getURL() const
void SdrMediaObj::setMediaProperties( const ::avmedia::MediaItem& rState )
{
mediaPropertiesChanged( rState );
- static_cast< ::sdr::contact::ViewContactOfSdrMediaObj& >( GetViewContact() ).executeMediaItem( getMediaProperties() );
+ static_cast< sdr::contact::ViewContactOfSdrMediaObj& >( GetViewContact() ).executeMediaItem( getMediaProperties() );
}
const ::avmedia::MediaItem& SdrMediaObj::getMediaProperties() const
@@ -258,7 +258,7 @@ const ::avmedia::MediaItem& SdrMediaObj::getMediaProperties() const
Size SdrMediaObj::getPreferredSize() const
{
- return static_cast< ::sdr::contact::ViewContactOfSdrMediaObj& >( GetViewContact() ).getPreferredSize();
+ return static_cast< sdr::contact::ViewContactOfSdrMediaObj& >( GetViewContact() ).getPreferredSize();
}
uno::Reference<io::XInputStream> SdrMediaObj::GetInputStream()
diff --git a/svx/source/svdraw/svdouno.cxx b/svx/source/svdraw/svdouno.cxx
index ebbacf522052..aac9a6d8711f 100644
--- a/svx/source/svdraw/svdouno.cxx
+++ b/svx/source/svdraw/svdouno.cxx
@@ -51,7 +51,7 @@
#include <svx/svdograf.hxx>
using namespace ::com::sun::star;
-using namespace ::sdr::contact;
+using namespace sdr::contact;
// Defines
@@ -576,9 +576,9 @@ bool SdrUnoObj::impl_getViewContact( ViewContactOfUnoControl*& _out_rpContact )
}
-::sdr::contact::ViewContact* SdrUnoObj::CreateObjectSpecificViewContact()
+sdr::contact::ViewContact* SdrUnoObj::CreateObjectSpecificViewContact()
{
- return new ::sdr::contact::ViewContactOfUnoControl( *this );
+ return new sdr::contact::ViewContactOfUnoControl( *this );
}
diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx
index 6c35b7128752..8fe3df18977b 100644
--- a/svx/source/svdraw/svdpage.cxx
+++ b/svx/source/svdraw/svdpage.cxx
@@ -1047,7 +1047,7 @@ void SdrPage::AddPageUser(sdr::PageUser& rNewUser)
void SdrPage::RemovePageUser(sdr::PageUser& rOldUser)
{
- const ::sdr::PageUserVector::iterator aFindResult = ::std::find(maPageUsers.begin(), maPageUsers.end(), &rOldUser);
+ const sdr::PageUserVector::iterator aFindResult = ::std::find(maPageUsers.begin(), maPageUsers.end(), &rOldUser);
if(aFindResult != maPageUsers.end())
{
maPageUsers.erase(aFindResult);
@@ -1259,8 +1259,8 @@ SdrPage::~SdrPage()
// This causes some (all?) PageUsers to remove themselves from the list
// of page users. Therefore we have to use a copy of the list for the
// iteration.
- ::sdr::PageUserVector aListCopy (maPageUsers.begin(), maPageUsers.end());
- for(::sdr::PageUserVector::iterator aIterator = aListCopy.begin(); aIterator != aListCopy.end(); ++aIterator)
+ sdr::PageUserVector aListCopy (maPageUsers.begin(), maPageUsers.end());
+ for(sdr::PageUserVector::iterator aIterator = aListCopy.begin(); aIterator != aListCopy.end(); ++aIterator)
{
sdr::PageUser* pPageUser = *aIterator;
DBG_ASSERT(pPageUser, "SdrPage::~SdrPage: corrupt PageUser list (!)");
@@ -1604,7 +1604,7 @@ void SdrPage::TRG_SetMasterPage(SdrPage& rNew)
if(mpMasterPageDescriptor)
TRG_ClearMasterPage();
- mpMasterPageDescriptor = new ::sdr::MasterPageDescriptor(*this, rNew);
+ mpMasterPageDescriptor = new sdr::MasterPageDescriptor(*this, rNew);
GetViewContact().ActionChanged();
}
@@ -1822,7 +1822,7 @@ drawinglayer::primitive2d::Primitive2DSequence StandardCheckVisisbilityRedirecto
{
if(pObject->GetPage()->checkVisibility(rOriginal, rDisplayInfo, false))
{
- return ::sdr::contact::ViewObjectContactRedirector::createRedirectedPrimitive2DSequence(rOriginal, rDisplayInfo);
+ return sdr::contact::ViewObjectContactRedirector::createRedirectedPrimitive2DSequence(rOriginal, rDisplayInfo);
}
}
@@ -1831,7 +1831,7 @@ drawinglayer::primitive2d::Primitive2DSequence StandardCheckVisisbilityRedirecto
else
{
// not an object, maybe a page
- return ::sdr::contact::ViewObjectContactRedirector::createRedirectedPrimitive2DSequence(rOriginal, rDisplayInfo);
+ return sdr::contact::ViewObjectContactRedirector::createRedirectedPrimitive2DSequence(rOriginal, rDisplayInfo);
}
}
diff --git a/svx/source/svdraw/svdsnpv.cxx b/svx/source/svdraw/svdsnpv.cxx
index c692a3ac5066..5d108d102ab0 100644
--- a/svx/source/svdraw/svdsnpv.cxx
+++ b/svx/source/svdraw/svdsnpv.cxx
@@ -37,7 +37,7 @@
class ImplPageOriginOverlay
{
// The OverlayObjects
- ::sdr::overlay::OverlayObjectList maObjects;
+ sdr::overlay::OverlayObjectList maObjects;
// The current position in logical coodinates
basegfx::B2DPoint maPosition;
@@ -55,11 +55,11 @@ ImplPageOriginOverlay::ImplPageOriginOverlay(const SdrPaintView& rView, const ba
for(sal_uInt32 a(0L); a < rView.PaintWindowCount(); a++)
{
SdrPaintWindow* pCandidate = rView.GetPaintWindow(a);
- rtl::Reference< ::sdr::overlay::OverlayManager > xTargetOverlay = pCandidate->GetOverlayManager();
+ rtl::Reference< sdr::overlay::OverlayManager > xTargetOverlay = pCandidate->GetOverlayManager();
if (xTargetOverlay.is())
{
- ::sdr::overlay::OverlayCrosshairStriped* aNew = new ::sdr::overlay::OverlayCrosshairStriped(
+ sdr::overlay::OverlayCrosshairStriped* aNew = new sdr::overlay::OverlayCrosshairStriped(
maPosition);
xTargetOverlay->add(*aNew);
maObjects.append(*aNew);
@@ -99,7 +99,7 @@ void ImplPageOriginOverlay::SetPosition(const basegfx::B2DPoint& rNewPosition)
class ImplHelpLineOverlay
{
// The OverlayObjects
- ::sdr::overlay::OverlayObjectList maObjects;
+ sdr::overlay::OverlayObjectList maObjects;
// The current position in logical coodinates
basegfx::B2DPoint maPosition;
@@ -133,11 +133,11 @@ ImplHelpLineOverlay::ImplHelpLineOverlay(
for(sal_uInt32 a(0L); a < rView.PaintWindowCount(); a++)
{
SdrPaintWindow* pCandidate = rView.GetPaintWindow(a);
- rtl::Reference< ::sdr::overlay::OverlayManager > xTargetOverlay = pCandidate->GetOverlayManager();
+ rtl::Reference< sdr::overlay::OverlayManager > xTargetOverlay = pCandidate->GetOverlayManager();
if (xTargetOverlay.is())
{
- ::sdr::overlay::OverlayHelplineStriped* aNew = new ::sdr::overlay::OverlayHelplineStriped(
+ sdr::overlay::OverlayHelplineStriped* aNew = new sdr::overlay::OverlayHelplineStriped(
maPosition, meHelpLineKind);
xTargetOverlay->add(*aNew);
maObjects.append(*aNew);
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index 14fdff48c207..b79f39f26197 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -98,11 +98,11 @@ void SdrDropMarkerOverlay::ImplCreateOverlays(
for(sal_uInt32 a(0L); a < rView.PaintWindowCount(); a++)
{
SdrPaintWindow* pCandidate = rView.GetPaintWindow(a);
- rtl::Reference< ::sdr::overlay::OverlayManager > xTargetOverlay = pCandidate->GetOverlayManager();
+ rtl::Reference< sdr::overlay::OverlayManager > xTargetOverlay = pCandidate->GetOverlayManager();
if (xTargetOverlay.is())
{
- ::sdr::overlay::OverlayPolyPolygonStripedAndFilled* pNew = new ::sdr::overlay::OverlayPolyPolygonStripedAndFilled(
+ sdr::overlay::OverlayPolyPolygonStripedAndFilled* pNew = new sdr::overlay::OverlayPolyPolygonStripedAndFilled(
rLinePolyPolygon);
xTargetOverlay->add(*pNew);
@@ -367,7 +367,7 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co
else if (PickObj(aLocalLogicPosition,nHitTolLog,pHitObj,pPV,SdrSearchOptions::DEEP|SdrSearchOptions::MARKED,&pObj,&bHitPassDirect))
{
eHit=SDRHIT_MARKEDOBJECT;
- ::sdr::table::SdrTableObj* pTableObj = dynamic_cast< ::sdr::table::SdrTableObj* >( pObj );
+ sdr::table::SdrTableObj* pTableObj = dynamic_cast< sdr::table::SdrTableObj* >( pObj );
if( pTableObj )
{
sal_Int32 nX = 0, nY = 0;
@@ -388,7 +388,7 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co
{
// MasterPages and WholePage for Macro and URL
eHit=SDRHIT_UNMARKEDOBJECT;
- ::sdr::table::SdrTableObj* pTableObj = dynamic_cast< ::sdr::table::SdrTableObj* >( pObj );
+ sdr::table::SdrTableObj* pTableObj = dynamic_cast< sdr::table::SdrTableObj* >( pObj );
if( pTableObj )
{
sal_Int32 nX = 0, nY = 0;
@@ -1342,7 +1342,7 @@ SdrViewContext SdrView::GetContext() const
if( !pMarkObj->ISA( SdrMediaObj ) )
bMedia = false;
- if( !pMarkObj->ISA( ::sdr::table::SdrTableObj ) )
+ if( !pMarkObj->ISA( sdr::table::SdrTableObj ) )
bTable = false;
}