diff options
author | Tor Lillqvist <tml@collabora.com> | 2015-04-30 07:18:59 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2015-04-30 09:11:40 +0300 |
commit | 5a27f808beff001bc69755095e08e50900d7c863 (patch) | |
tree | 1df6fbc012958c178be6f4bd7e5e60e08e7ef189 /sd | |
parent | c07a3b0396ab131bef7ef23305180c8f27bf5c9b (diff) |
Get rid of initial :: for the sdr namespace
Change-Id: Ibbeb069b6fcb2aa0581429ac5cb6db519548fd00
Diffstat (limited to 'sd')
-rw-r--r-- | sd/source/ui/animations/motionpathtag.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/annotations/annotationtag.cxx | 8 | ||||
-rw-r--r-- | sd/source/ui/table/tablefunction.cxx | 6 | ||||
-rw-r--r-- | sd/source/ui/tools/PreviewRenderer.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/unoidl/unomodel.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/view/sdview.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/view/viewoverlaymanager.cxx | 6 |
7 files changed, 16 insertions, 16 deletions
diff --git a/sd/source/ui/animations/motionpathtag.cxx b/sd/source/ui/animations/motionpathtag.cxx index bd918c151acf..e15ac0db2701 100644 --- a/sd/source/ui/animations/motionpathtag.cxx +++ b/sd/source/ui/animations/motionpathtag.cxx @@ -56,7 +56,7 @@ #include <svx/sdr/contact/viewcontact.hxx> #include <svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx> -using ::sdr::PolyPolygonEditor; +using sdr::PolyPolygonEditor; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -287,7 +287,7 @@ void SdPathHdl::CreateB2dIAObject() if(rPageWindow.GetPaintWindow().OutputToWindow()) { - rtl::Reference< ::sdr::overlay::OverlayManager > xManager = rPageWindow.GetOverlayManager(); + rtl::Reference< sdr::overlay::OverlayManager > xManager = rPageWindow.GetOverlayManager(); if (xManager.is() && mpPathObj) { const sdr::contact::ViewContact& rVC = mpPathObj->GetViewContact(); diff --git a/sd/source/ui/annotations/annotationtag.cxx b/sd/source/ui/annotations/annotationtag.cxx index ae9dc833b3fe..8b9fef40f97e 100644 --- a/sd/source/ui/annotations/annotationtag.cxx +++ b/sd/source/ui/annotations/annotationtag.cxx @@ -211,21 +211,21 @@ void AnnotationHdl::CreateB2dIAObject() const SdrPageWindow& rPageWindow = *pPageView->GetPageWindow(b); SdrPaintWindow& rPaintWindow = rPageWindow.GetPaintWindow(); - rtl::Reference< ::sdr::overlay::OverlayManager > xManager = rPageWindow.GetOverlayManager(); + rtl::Reference< sdr::overlay::OverlayManager > xManager = rPageWindow.GetOverlayManager(); if(rPaintWindow.OutputToWindow() && xManager.is() ) { - ::sdr::overlay::OverlayObject* pOverlayObject = 0; + sdr::overlay::OverlayObject* pOverlayObject = 0; // animate focused handles if(bFocused) { const sal_uInt64 nBlinkTime = rStyleSettings.GetCursorBlinkTime(); - pOverlayObject = new ::sdr::overlay::OverlayAnimatedBitmapEx(aPosition, aBitmapEx, aBitmapEx2, nBlinkTime, 0, 0, 0, 0 ); + pOverlayObject = new sdr::overlay::OverlayAnimatedBitmapEx(aPosition, aBitmapEx, aBitmapEx2, nBlinkTime, 0, 0, 0, 0 ); } else { - pOverlayObject = new ::sdr::overlay::OverlayBitmapEx( aPosition, aBitmapEx, 0, 0 ); + pOverlayObject = new sdr::overlay::OverlayBitmapEx( aPosition, aBitmapEx, 0, 0 ); } xManager->add(*pOverlayObject); diff --git a/sd/source/ui/table/tablefunction.cxx b/sd/source/ui/table/tablefunction.cxx index 6a242eb98433..291cff7798f5 100644 --- a/sd/source/ui/table/tablefunction.cxx +++ b/sd/source/ui/table/tablefunction.cxx @@ -67,7 +67,7 @@ #include <boost/scoped_ptr.hpp> using namespace ::sd; -using namespace ::sdr::table; +using namespace sdr::table; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; @@ -159,7 +159,7 @@ void DrawViewShell::FuTable(SfxRequest& rReq) aRect = Rectangle(aPos, aSize); } - ::sdr::table::SdrTableObj* pObj = new ::sdr::table::SdrTableObj( GetDoc(), aRect, nColumns, nRows ); + sdr::table::SdrTableObj* pObj = new sdr::table::SdrTableObj( GetDoc(), aRect, nColumns, nRows ); pObj->NbcSetStyleSheet( GetDoc()->GetDefaultStyleSheet(), true ); apply_table_style( pObj, GetDoc(), sTableStyle ); SdrPageView* pPV = mpView->GetSdrPageView(); @@ -256,7 +256,7 @@ void CreateTableFromRTF( SvStream& rStream, SdDrawDocument* pModel ) Size aSize( 200, 200 ); Point aPos; Rectangle aRect (aPos, aSize); - ::sdr::table::SdrTableObj* pObj = new ::sdr::table::SdrTableObj( pModel, aRect, 1, 1 ); + sdr::table::SdrTableObj* pObj = new sdr::table::SdrTableObj( pModel, aRect, 1, 1 ); pObj->NbcSetStyleSheet( pModel->GetDefaultStyleSheet(), true ); OUString sTableStyle; apply_table_style( pObj, pModel, sTableStyle ); diff --git a/sd/source/ui/tools/PreviewRenderer.cxx b/sd/source/ui/tools/PreviewRenderer.cxx index c1c4b2185a7b..a9befddd82ef 100644 --- a/sd/source/ui/tools/PreviewRenderer.cxx +++ b/sd/source/ui/tools/PreviewRenderer.cxx @@ -48,7 +48,7 @@ namespace { /** This incarnation of the ViewObjectContactRedirector filters away all PageObj objects, unconditionally. */ - class ViewRedirector : public ::sdr::contact::ViewObjectContactRedirector + class ViewRedirector : public sdr::contact::ViewObjectContactRedirector { public: ViewRedirector(); diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index 3425148d3fc7..68a617cb1ecd 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -1534,7 +1534,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SdXImpressDocument::getRenderer( return aRenderer; } -class ImplRenderPaintProc : public ::sdr::contact::ViewObjectContactRedirector +class ImplRenderPaintProc : public sdr::contact::ViewObjectContactRedirector { const SdrLayerAdmin& rLayerAdmin; SdrPageView* pSdrPageView; @@ -1802,7 +1802,7 @@ drawinglayer::primitive2d::Primitive2DSequence ImplRenderPaintProc::createRedire const vcl::PDFWriter::StructElement eElement(ImplBegStructureTag( *pObject )); const bool bTagUsed(vcl::PDFWriter::NonStructElement != eElement); - xRetval = ::sdr::contact::ViewObjectContactRedirector::createRedirectedPrimitive2DSequence(rOriginal, rDisplayInfo); + xRetval = sdr::contact::ViewObjectContactRedirector::createRedirectedPrimitive2DSequence(rOriginal, rDisplayInfo); if(xRetval.hasElements() && bTagUsed) { diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx index 522d3be21fb3..1eca9a1f3788 100644 --- a/sd/source/ui/view/sdview.cxx +++ b/sd/source/ui/view/sdview.cxx @@ -172,7 +172,7 @@ View::~View() } } -class ViewRedirector : public ::sdr::contact::ViewObjectContactRedirector +class ViewRedirector : public sdr::contact::ViewObjectContactRedirector { public: ViewRedirector(); diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx index 7254f56709f4..40906cb21b19 100644 --- a/sd/source/ui/view/viewoverlaymanager.cxx +++ b/sd/source/ui/view/viewoverlaymanager.cxx @@ -243,12 +243,12 @@ void ImageButtonHdl::CreateB2dIAObject() const SdrPageWindow& rPageWindow = *pPageView->GetPageWindow(b); SdrPaintWindow& rPaintWindow = rPageWindow.GetPaintWindow(); - rtl::Reference< ::sdr::overlay::OverlayManager > xManager = rPageWindow.GetOverlayManager(); + rtl::Reference< sdr::overlay::OverlayManager > xManager = rPageWindow.GetOverlayManager(); if(rPaintWindow.OutputToWindow() && xManager.is() ) { - ::sdr::overlay::OverlayObject* pOverlayObject = 0; + sdr::overlay::OverlayObject* pOverlayObject = 0; - pOverlayObject = new ::sdr::overlay::OverlayBitmapEx( aPosition, aBitmapEx, 0, 0 ); + pOverlayObject = new sdr::overlay::OverlayBitmapEx( aPosition, aBitmapEx, 0, 0 ); xManager->add(*pOverlayObject); maOverlayGroup.append(*pOverlayObject); } |