chart2/source/controller/main/DragMethod_RotateDiagram.cxx | 2 cui/source/inc/dbregister.hxx | 2 cui/source/inc/optpath.hxx | 2 cui/source/options/dbregister.cxx | 2 cui/source/options/treeopt.cxx | 6 - dbaccess/source/ext/macromigration/macromigrationpages.cxx | 2 dbaccess/source/ext/macromigration/macromigrationpages.hxx | 2 dbaccess/source/ui/app/AppController.hxx | 2 dbaccess/source/ui/app/AppControllerDnD.cxx | 2 dbaccess/source/ui/browser/unodatbr.cxx | 12 +- dbaccess/source/ui/inc/TableCopyHelper.hxx | 4 dbaccess/source/ui/inc/TokenWriter.hxx | 12 +- dbaccess/source/ui/inc/dbexchange.hxx | 2 dbaccess/source/ui/inc/sbagrid.hxx | 2 dbaccess/source/ui/inc/unodatbr.hxx | 8 - dbaccess/source/ui/misc/RowSetDrop.cxx | 2 dbaccess/source/ui/misc/TableCopyHelper.cxx | 4 dbaccess/source/ui/misc/TokenWriter.cxx | 4 editeng/source/editeng/editeng.cxx | 4 editeng/source/editeng/impedit.hxx | 10 - editeng/source/editeng/impedit4.cxx | 8 - editeng/source/outliner/outlin2.cxx | 4 extensions/source/abpilot/abpfinalpage.cxx | 2 extensions/source/abpilot/abpfinalpage.hxx | 2 filter/source/msfilter/svdfppt.cxx | 2 include/editeng/editeng.hxx | 4 include/editeng/outliner.hxx | 4 include/svx/charmap.hxx | 4 include/svx/fmshell.hxx | 2 include/svx/fmview.hxx | 4 include/svx/sdr/overlay/overlayanimatedbitmapex.hxx | 2 include/svx/sdr/overlay/overlaymanager.hxx | 2 include/svx/sdr/overlay/overlayobject.hxx | 4 include/svx/sdr/table/tablecontroller.hxx | 4 include/svx/sdrpagewindow.hxx | 2 include/svx/sdrpaintwindow.hxx | 4 include/svx/svdhdl.hxx | 6 - include/svx/svdobj.hxx | 4 include/svx/svdomedia.hxx | 4 include/svx/svdotable.hxx | 10 - include/svx/svdouno.hxx | 4 include/svx/svdpage.hxx | 4 include/svx/svdview.hxx | 2 include/svx/unoshape.hxx | 2 reportdesign/source/ui/dlg/AddField.cxx | 16 +- reportdesign/source/ui/dlg/Condition.cxx | 4 reportdesign/source/ui/dlg/Condition.hxx | 4 reportdesign/source/ui/dlg/Formula.cxx | 4 reportdesign/source/ui/inc/AddField.hxx | 2 reportdesign/source/ui/report/ReportController.cxx | 10 - reportdesign/source/ui/report/ReportSection.cxx | 12 +- sc/source/filter/xml/XMLExportDatabaseRanges.cxx | 6 - sc/source/ui/docshell/dbdocimp.cxx | 2 sc/source/ui/drawfunc/drawsh2.cxx | 2 sc/source/ui/inc/overlayobject.hxx | 2 sc/source/ui/inc/spelldialog.hxx | 8 - sc/source/ui/unoobj/datauno.cxx | 2 sc/source/ui/unoobj/dispuno.cxx | 2 sc/source/ui/unoobj/shapeuno.cxx | 4 sc/source/ui/view/overlayobject.cxx | 4 sc/source/ui/view/spelldialog.cxx | 12 +- sc/source/ui/view/tabvwshb.cxx | 2 sc/source/ui/view/viewfun5.cxx | 4 sd/inc/Outliner.hxx | 2 sd/source/ui/animations/motionpathtag.cxx | 4 sd/source/ui/annotations/annotationtag.cxx | 8 - sd/source/ui/dlg/SpellDialogChildWindow.cxx | 12 +- sd/source/ui/inc/SpellDialogChildWindow.hxx | 8 - sd/source/ui/table/tablefunction.cxx | 6 - sd/source/ui/tools/PreviewRenderer.cxx | 2 sd/source/ui/unoidl/unomodel.cxx | 4 sd/source/ui/view/Outliner.cxx | 4 sd/source/ui/view/drviewsa.cxx | 12 +- sd/source/ui/view/drviewse.cxx | 2 sd/source/ui/view/sdview.cxx | 2 sd/source/ui/view/viewoverlaymanager.cxx | 6 - sd/source/ui/view/viewshel.cxx | 4 svx/inc/dragmt3d.hxx | 2 svx/inc/sdr/contact/viewobjectcontactofsdrmediaobj.hxx | 2 svx/inc/sdr/overlay/overlayrectangle.hxx | 2 svx/source/accessibility/charmapacc.cxx | 2 svx/source/core/coreservices.cxx | 48 ++++---- svx/source/dialog/charmap.cxx | 6 - svx/source/engine3d/dragmt3d.cxx | 4 svx/source/engine3d/view3d.cxx | 6 - svx/source/form/ParseContext.cxx | 2 svx/source/form/fmshell.cxx | 12 +- svx/source/form/fmshimp.cxx | 6 - svx/source/form/fmvwimp.cxx | 4 svx/source/form/formcontroller.cxx | 8 - svx/source/form/tabwin.cxx | 2 svx/source/inc/fmshimp.hxx | 12 +- svx/source/inc/fmvwimp.hxx | 4 svx/source/sdr/overlay/overlayobjectlist.cxx | 4 svx/source/sidebar/ColorPanel.hxx | 2 svx/source/sidebar/EmptyPanel.cxx | 2 svx/source/sidebar/EmptyPanel.hxx | 2 svx/source/sidebar/SelectionAnalyzer.cxx | 2 svx/source/sidebar/area/AreaPropertyPanel.hxx | 2 svx/source/sidebar/graphic/GraphicPropertyPanel.cxx | 2 svx/source/sidebar/graphic/GraphicPropertyPanel.hxx | 2 svx/source/sidebar/insert/InsertPropertyPanel.hxx | 2 svx/source/sidebar/paragraph/ParaPropertyPanel.hxx | 2 svx/source/sidebar/text/TextPropertyPanel.hxx | 2 svx/source/svdraw/sdrpagewindow.cxx | 4 svx/source/svdraw/sdrpaintwindow.cxx | 6 - svx/source/svdraw/svdcrtv.cxx | 12 +- svx/source/svdraw/svdetc.cxx | 2 svx/source/svdraw/svdhdl.cxx | 70 ++++++------- svx/source/svdraw/svdmrkv.cxx | 8 - svx/source/svdraw/svdobj.cxx | 14 +- svx/source/svdraw/svdomedia.cxx | 6 - svx/source/svdraw/svdouno.cxx | 6 - svx/source/svdraw/svdpage.cxx | 12 +- svx/source/svdraw/svdsnpv.cxx | 12 +- svx/source/svdraw/svdview.cxx | 10 - svx/source/table/accessiblecell.cxx | 2 svx/source/table/accessibletableshape.cxx | 8 - svx/source/table/tablecontroller.cxx | 36 +++--- svx/source/table/tablehandles.cxx | 2 svx/source/table/viewcontactoftableobj.cxx | 2 svx/source/table/viewcontactoftableobj.hxx | 6 - svx/source/tbxctrls/tbcontrl.cxx | 2 svx/source/unodraw/UnoGraphicExporter.cxx | 6 - svx/source/unodraw/recoveryui.cxx | 2 svx/source/unodraw/shapepropertynotifier.cxx | 2 svx/source/unodraw/tableshape.cxx | 2 svx/source/unodraw/unoshape.cxx | 16 +- sw/inc/dbmgr.hxx | 4 sw/inc/editsh.hxx | 4 sw/inc/fesh.hxx | 2 sw/source/core/crsr/viscrs.cxx | 2 sw/source/core/draw/dcontact.cxx | 2 sw/source/core/edit/edlingu.cxx | 16 +- sw/source/core/frmedt/feshview.cxx | 4 sw/source/core/layout/paintfrm.cxx | 2 sw/source/core/unocore/unodraw.cxx | 4 sw/source/ui/dbui/mmpreparemergepage.cxx | 2 sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx | 2 sw/source/uibase/docvw/AnchorOverlayObject.cxx | 2 sw/source/uibase/docvw/ShadowOverlayObject.cxx | 2 sw/source/uibase/inc/SwSpellDialogChildWindow.hxx | 4 sw/source/uibase/shells/txtcrsr.cxx | 2 sw/source/uibase/sidebar/PageColumnControl.cxx | 6 - sw/source/uibase/sidebar/PageColumnControl.hxx | 4 sw/source/uibase/sidebar/PageMarginControl.cxx | 6 - sw/source/uibase/sidebar/PageMarginControl.hxx | 4 sw/source/uibase/sidebar/PageOrientationControl.cxx | 6 - sw/source/uibase/sidebar/PageOrientationControl.hxx | 4 sw/source/uibase/sidebar/PagePropertyPanel.cxx | 8 - sw/source/uibase/sidebar/PagePropertyPanel.hxx | 16 +- sw/source/uibase/sidebar/PageSizeControl.cxx | 6 - sw/source/uibase/sidebar/PageSizeControl.hxx | 4 sw/source/uibase/uiview/viewdraw.cxx | 2 sw/source/uibase/uno/unodispatch.cxx | 14 +- 155 files changed, 441 insertions(+), 441 deletions(-)
New commits: commit 5a27f808beff001bc69755095e08e50900d7c863 Author: Tor Lillqvist <[email protected]> Date: Thu Apr 30 07:18:59 2015 +0300 Get rid of initial :: for the sdr namespace Change-Id: Ibbeb069b6fcb2aa0581429ac5cb6db519548fd00 diff --git a/chart2/source/controller/main/DragMethod_RotateDiagram.cxx b/chart2/source/controller/main/DragMethod_RotateDiagram.cxx index d98bc32..d929342 100644 --- a/chart2/source/controller/main/DragMethod_RotateDiagram.cxx +++ b/chart2/source/controller/main/DragMethod_RotateDiagram.cxx @@ -212,7 +212,7 @@ void DragMethod_RotateDiagram::CreateOverlayGeometry(sdr::overlay::OverlayManage // transform to 2D view coordinates aPolyPolygon.transform(rVCScene.getObjectTransformation()); - sdr::overlay::OverlayPolyPolygonStripedAndFilled* pNew = new ::sdr::overlay::OverlayPolyPolygonStripedAndFilled( + sdr::overlay::OverlayPolyPolygonStripedAndFilled* pNew = new sdr::overlay::OverlayPolyPolygonStripedAndFilled( aPolyPolygon); rOverlayManager.add(*pNew); addToOverlayObjectList(*pNew); diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 1456fc9..ae35716 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -7464,7 +7464,7 @@ SdrObject* SdrPowerPointImport::CreateTable( SdrObject* pGroup, sal_uInt32* pTab aColumns.insert( aSnapRect.Left() ); } } - ::sdr::table::SdrTableObj* pTable = new ::sdr::table::SdrTableObj( pSdrModel ); + sdr::table::SdrTableObj* pTable = new sdr::table::SdrTableObj( pSdrModel ); pTable->uno_lock(); Reference< XTable > xTable( pTable->getTable() ); try diff --git a/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx b/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx index ccd768f..83566f8 100644 --- a/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx +++ b/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx @@ -78,7 +78,7 @@ namespace sdr sal_uInt16 getCenterX2() const { return mnCenterX2; } sal_uInt16 getCenterY2() const { return mnCenterY2; } - // execute event from base class ::sdr::animation::Event. Default + // execute event from base class sdr::animation::Event. Default // implementation does nothing and does not create a new event. virtual void Trigger(sal_uInt32 nTime) SAL_OVERRIDE; diff --git a/include/svx/sdr/overlay/overlaymanager.hxx b/include/svx/sdr/overlay/overlaymanager.hxx index 9fdb9de..6710f61 100644 --- a/include/svx/sdr/overlay/overlaymanager.hxx +++ b/include/svx/sdr/overlay/overlaymanager.hxx @@ -49,7 +49,7 @@ namespace sdr namespace overlay { class SVX_DLLPUBLIC OverlayManager - : protected ::sdr::animation::Scheduler + : protected sdr::animation::Scheduler , public salhelper::SimpleReferenceObject { private: diff --git a/include/svx/sdr/overlay/overlayobject.hxx b/include/svx/sdr/overlay/overlayobject.hxx index ee7aad6..fe27964 100644 --- a/include/svx/sdr/overlay/overlayobject.hxx +++ b/include/svx/sdr/overlay/overlayobject.hxx @@ -51,7 +51,7 @@ namespace sdr { namespace overlay { - class SVX_DLLPUBLIC OverlayObject : public ::sdr::animation::Event + class SVX_DLLPUBLIC OverlayObject : public sdr::animation::Event { private: OverlayObject(const OverlayObject&) SAL_DELETED_FUNCTION; @@ -147,7 +147,7 @@ namespace sdr Color getBaseColor() const { return maBaseColor; } void setBaseColor(Color aNew); - // execute event from base class ::sdr::animation::Event. Default + // execute event from base class sdr::animation::Event. Default // implementation does nothing and does not create a new event. virtual void Trigger(sal_uInt32 nTime) SAL_OVERRIDE; diff --git a/include/svx/sdr/table/tablecontroller.hxx b/include/svx/sdr/table/tablecontroller.hxx index b366a58..2ad8e22 100644 --- a/include/svx/sdr/table/tablecontroller.hxx +++ b/include/svx/sdr/table/tablecontroller.hxx @@ -111,7 +111,7 @@ public: bool isColumnSelected( sal_Int32 nColumn ); bool isRowHeader(); bool isColumnHeader(); - ::sdr::table::SdrTableObj* GetTableObj() { return dynamic_cast< ::sdr::table::SdrTableObj* >( mxTableObj.get() ); } + sdr::table::SdrTableObj* GetTableObj() { return dynamic_cast< sdr::table::SdrTableObj* >( mxTableObj.get() ); } //declare event notification method void NotifySelection( const CellPos& firstPos, const CellPos& lastPos, const CellPos& newPos ); private: @@ -161,7 +161,7 @@ private: bool mbCellSelectionMode; CellPos maMouseDownPos; bool mbLeftButtonDown; - ::sdr::overlay::OverlayObjectList* mpSelectionOverlay; + sdr::overlay::OverlayObjectList* mpSelectionOverlay; SdrView* mpView; SdrObjectWeakRef mxTableObj; diff --git a/include/svx/sdrpagewindow.hxx b/include/svx/sdrpagewindow.hxx index 51303d2..16cce1c 100644 --- a/include/svx/sdrpagewindow.hxx +++ b/include/svx/sdrpagewindow.hxx @@ -63,7 +63,7 @@ public: css::uno::Reference<css::awt::XControlContainer> GetControlContainer( bool _bCreateIfNecessary = true ) const; // OVERLAYMANAGER - rtl::Reference< ::sdr::overlay::OverlayManager > GetOverlayManager() const; + rtl::Reference< sdr::overlay::OverlayManager > GetOverlayManager() const; // #i72752# allow patcing SdrPaintWindow from SdrPageView::DrawLayer if needed void patchPaintWindow(SdrPaintWindow& rPaintWindow); diff --git a/include/svx/sdrpaintwindow.hxx b/include/svx/sdrpaintwindow.hxx index d079da8..ba267e3 100644 --- a/include/svx/sdrpaintwindow.hxx +++ b/include/svx/sdrpaintwindow.hxx @@ -73,7 +73,7 @@ private: // the new OverlayManager for the new OverlayObjects. Test add here, will // replace the IAOManager as soon as it works. - rtl::Reference< ::sdr::overlay::OverlayManager > mxOverlayManager; + rtl::Reference< sdr::overlay::OverlayManager > mxOverlayManager; // The PreRenderDevice for PreRendering SdrPreRenderDevice* mpPreRenderDevice; @@ -103,7 +103,7 @@ public: OutputDevice& GetOutputDevice() const { return mrOutputDevice; } // OVERLAYMANAGER - rtl::Reference< ::sdr::overlay::OverlayManager > GetOverlayManager() const; + rtl::Reference< sdr::overlay::OverlayManager > GetOverlayManager() const; // #i73602# add flag if buffer shall be used void DrawOverlay(const vcl::Region& rRegion); diff --git a/include/svx/svdhdl.hxx b/include/svx/svdhdl.hxx index 6310077..22a55ed 100644 --- a/include/svx/svdhdl.hxx +++ b/include/svx/svdhdl.hxx @@ -146,7 +146,7 @@ protected: SdrHdlList* pHdlList; // Zum Feststelen der Handlegroesse // OVERLAYMANAGER - ::sdr::overlay::OverlayObjectList maOverlayGroup; + sdr::overlay::OverlayObjectList maOverlayGroup; Point aPos; @@ -174,7 +174,7 @@ private: bool mbMouseOver; // is true if the mouse is over this handle protected: - ::sdr::overlay::OverlayObject* CreateOverlayObject( + sdr::overlay::OverlayObject* CreateOverlayObject( const basegfx::B2DPoint& rPos, BitmapColorIndex eColIndex, BitmapMarkerKind eKindOfMarker, OutputDevice& rOutDev, Point aMoveOutsideOffset = Point()); @@ -185,7 +185,7 @@ public: explicit SdrHdl(const Point& rPnt, SdrHdlKind eNewKind=HDL_MOVE); virtual ~SdrHdl(); - const ::sdr::overlay::OverlayObjectList& getOverlayObjectList() const { return maOverlayGroup; } + const sdr::overlay::OverlayObjectList& getOverlayObjectList() const { return maOverlayGroup; } void SetHdlList(SdrHdlList* pList); SdrHdlKind GetKind() const { return eKind; } diff --git a/include/svx/svdomedia.hxx b/include/svx/svdomedia.hxx index b2a662d..f1cb4a7 100644 --- a/include/svx/svdomedia.hxx +++ b/include/svx/svdomedia.hxx @@ -34,7 +34,7 @@ namespace sdr { namespace contact { class ViewContactOfSdrMediaObj; } } class SVX_DLLPUBLIC SdrMediaObj : public SdrRectObj { - friend class ::sdr::contact::ViewContactOfSdrMediaObj; + friend class sdr::contact::ViewContactOfSdrMediaObj; public: @@ -77,7 +77,7 @@ public: protected: void mediaPropertiesChanged( const ::avmedia::MediaItem& rNewState ); - virtual ::sdr::contact::ViewContact* CreateObjectSpecificViewContact() SAL_OVERRIDE; + virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact() SAL_OVERRIDE; private: struct Impl; diff --git a/include/svx/svdotable.hxx b/include/svx/svdotable.hxx index d2bfd39..c0213b3 100644 --- a/include/svx/svdotable.hxx +++ b/include/svx/svdotable.hxx @@ -131,10 +131,10 @@ public: CellPos getPreviousRow( const CellPos& rPos, bool bEdgeTravel ) const; CellPos getNextRow( const CellPos& rPos, bool bEdgeTravel ) const; - void createCell( ::sdr::table::CellRef& xCell ); + void createCell( sdr::table::CellRef& xCell ); - const ::sdr::table::TableStyleSettings& getTableStyleSettings() const; - void setTableStyleSettings( const ::sdr::table::TableStyleSettings& rStyle ); + const sdr::table::TableStyleSettings& getTableStyleSettings() const; + void setTableStyleSettings( const sdr::table::TableStyleSettings& rStyle ); TableHitKind CheckTableHit( const Point& rPos, sal_Int32& rnX, sal_Int32& rnY, int nTol ) const; @@ -142,7 +142,7 @@ public: void uno_unlock(); /** the active table has the focus or is currently edited */ - const ::sdr::table::CellRef& getActiveCell() const; + const sdr::table::CellRef& getActiveCell() const; void setActiveCell( const sdr::table::CellPos& rPos ); void getActiveCellPos( sdr::table::CellPos& rPos ) const; @@ -305,7 +305,7 @@ protected: virtual void RestGeoData(const SdrObjGeoData& rGeo) SAL_OVERRIDE; private: - SdrOutliner* GetCellTextEditOutliner( const ::sdr::table::Cell& rCell ) const; + SdrOutliner* GetCellTextEditOutliner( const sdr::table::Cell& rCell ) const; private: // for the ViewContactOfTableObj to build the primitive representation, it is necessary to access the diff --git a/include/svx/svdouno.hxx b/include/svx/svdouno.hxx index 0a796da..56f177e 100644 --- a/include/svx/svdouno.hxx +++ b/include/svx/svdouno.hxx @@ -135,7 +135,7 @@ public: protected: // SdrObject overridables - virtual ::sdr::contact::ViewContact* CreateObjectSpecificViewContact() SAL_OVERRIDE; + virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact() SAL_OVERRIDE; private: /** retrieves the typed ViewContact for the object @@ -146,7 +146,7 @@ private: ->_out_rpContact contains a pointer to this contact. A failure to retrieve the contact object fires an assertion in non-product builds. */ - SVX_DLLPRIVATE bool impl_getViewContact( ::sdr::contact::ViewContactOfUnoControl*& _out_rpContact ) const; + SVX_DLLPRIVATE bool impl_getViewContact( sdr::contact::ViewContactOfUnoControl*& _out_rpContact ) const; }; diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx index f016752..4647772 100644 --- a/include/svx/svdpage.hxx +++ b/include/svx/svdpage.hxx @@ -462,7 +462,7 @@ public: protected: // new MasterPageDescriptorVector - ::sdr::MasterPageDescriptor* mpMasterPageDescriptor; + sdr::MasterPageDescriptor* mpMasterPageDescriptor; SetOfByte aPrefVisiLayers; sal_uInt16 nPageNum; @@ -582,7 +582,7 @@ typedef tools::WeakReference< SdrPage > SdrPageWeakRef; // use new redirector instead of pPaintProc -class SVX_DLLPUBLIC StandardCheckVisisbilityRedirector : public ::sdr::contact::ViewObjectContactRedirector +class SVX_DLLPUBLIC StandardCheckVisisbilityRedirector : public sdr::contact::ViewObjectContactRedirector { public: StandardCheckVisisbilityRedirector(); diff --git a/include/svx/svdview.hxx b/include/svx/svdview.hxx index f583301..ab97b79 100644 --- a/include/svx/svdview.hxx +++ b/include/svx/svdview.hxx @@ -138,7 +138,7 @@ public: class SVX_DLLPUBLIC SdrDropMarkerOverlay { // The OverlayObjects - ::sdr::overlay::OverlayObjectList maObjects; + sdr::overlay::OverlayObjectList maObjects; void ImplCreateOverlays( const SdrView& rView, diff --git a/sc/source/ui/inc/overlayobject.hxx b/sc/source/ui/inc/overlayobject.hxx index 2db52ce..e825528 100644 --- a/sc/source/ui/inc/overlayobject.hxx +++ b/sc/source/ui/inc/overlayobject.hxx @@ -22,7 +22,7 @@ #include <svx/sdr/overlay/overlayobject.hxx> -class ScOverlayDashedBorder : public ::sdr::overlay::OverlayObject +class ScOverlayDashedBorder : public sdr::overlay::OverlayObject { public: ScOverlayDashedBorder(const ::basegfx::B2DRange& rRange, const Color& rColor); diff --git a/sc/source/ui/view/overlayobject.cxx b/sc/source/ui/view/overlayobject.cxx index c494d59..a0cb86f 100644 --- a/sc/source/ui/view/overlayobject.cxx +++ b/sc/source/ui/view/overlayobject.cxx @@ -29,8 +29,8 @@ #include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx> #include <officecfg/Office/Common.hxx> -using ::sdr::overlay::OverlayObject; -using ::sdr::overlay::OverlayManager; +using sdr::overlay::OverlayObject; +using sdr::overlay::OverlayManager; using ::drawinglayer::primitive2d::Primitive2DSequence; #define DASH_UPDATE_INTERVAL 180 // in msec diff --git a/sd/source/ui/animations/motionpathtag.cxx b/sd/source/ui/animations/motionpathtag.cxx index bd918c1..e15ac0d 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 ae9dc83..8b9fef4 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 6a242eb..291cff7 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 c1c4b21..a9befdd 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 3425148..68a617c 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 522d3be..1eca9a1 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 7254f56..40906cb 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); } diff --git a/svx/inc/dragmt3d.hxx b/svx/inc/dragmt3d.hxx index 65a0ee8..61b95fb 100644 --- a/svx/inc/dragmt3d.hxx +++ b/svx/inc/dragmt3d.hxx @@ -79,7 +79,7 @@ public: E3dView& Get3DView() { return static_cast<E3dView&>(getSdrDragView()); } // for migration from XOR to overlay - virtual void CreateOverlayGeometry(::sdr::overlay::OverlayManager& rOverlayManager) SAL_OVERRIDE; + virtual void CreateOverlayGeometry(sdr::overlay::OverlayManager& rOverlayManager) SAL_OVERRIDE; }; // Derivative of SdrDragMethod for spinning 3D objects diff --git a/svx/inc/sdr/contact/viewobjectcontactofsdrmediaobj.hxx b/svx/inc/sdr/contact/viewobjectcontactofsdrmediaobj.hxx index d5a3d74..a7f5bf9 100644 --- a/svx/inc/sdr/contact/viewobjectcontactofsdrmediaobj.hxx +++ b/svx/inc/sdr/contact/viewobjectcontactofsdrmediaobj.hxx @@ -53,7 +53,7 @@ namespace sdr private: - ::sdr::contact::SdrMediaWindow* mpMediaWindow; + sdr::contact::SdrMediaWindow* mpMediaWindow; }; } // end of namespace contact diff --git a/svx/inc/sdr/overlay/overlayrectangle.hxx b/svx/inc/sdr/overlay/overlayrectangle.hxx index 8be8a36..2a72b61 100644 --- a/svx/inc/sdr/overlay/overlayrectangle.hxx +++ b/svx/inc/sdr/overlay/overlayrectangle.hxx @@ -65,7 +65,7 @@ namespace sdr double getDiscreteShrink() const { return mfDiscreteShrink; } double getRotation() const { return mfRotation; } - // execute event from base class ::sdr::animation::Event. Default + // execute event from base class sdr::animation::Event. Default // implementation does nothing and does not create a new event. virtual void Trigger(sal_uInt32 nTime) SAL_OVERRIDE; }; diff --git a/svx/source/engine3d/dragmt3d.cxx b/svx/source/engine3d/dragmt3d.cxx index 39dd69f..64ba176 100644 --- a/svx/source/engine3d/dragmt3d.cxx +++ b/svx/source/engine3d/dragmt3d.cxx @@ -209,7 +209,7 @@ void E3dDragMethod::MoveSdrDrag(const Point& /*rPnt*/) // Draw the wire frame model // for migration from XOR to overlay -void E3dDragMethod::CreateOverlayGeometry(::sdr::overlay::OverlayManager& rOverlayManager) +void E3dDragMethod::CreateOverlayGeometry(sdr::overlay::OverlayManager& rOverlayManager) { const sal_uInt32 nCnt(maGrp.size()); basegfx::B2DPolyPolygon aResult; @@ -244,7 +244,7 @@ void E3dDragMethod::CreateOverlayGeometry(::sdr::overlay::OverlayManager& rOverl if(aResult.count()) { - ::sdr::overlay::OverlayPolyPolygonStripedAndFilled* pNew = new ::sdr::overlay::OverlayPolyPolygonStripedAndFilled( + sdr::overlay::OverlayPolyPolygonStripedAndFilled* pNew = new sdr::overlay::OverlayPolyPolygonStripedAndFilled( aResult); rOverlayManager.add(*pNew); addToOverlayObjectList(*pNew); diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx index 6132a0e..7f4ce94 100644 --- a/svx/source/engine3d/view3d.cxx +++ b/svx/source/engine3d/view3d.cxx @@ -78,7 +78,7 @@ TYPEINIT1(E3dView, SdrView); class Impl3DMirrorConstructOverlay { // The OverlayObjects - ::sdr::overlay::OverlayObjectList maObjects; + sdr::overlay::OverlayObjectList maObjects; // the view const E3dView& mrView; @@ -168,7 +168,7 @@ void Impl3DMirrorConstructOverlay::SetMirrorAxis(Point aMirrorAxisA, Point aMirr for(sal_uInt32 a(0); a < mrView.PaintWindowCount(); a++) { SdrPaintWindow* pCandidate = mrView.GetPaintWindow(a); - rtl::Reference< ::sdr::overlay::OverlayManager > xTargetOverlay = pCandidate->GetOverlayManager(); + rtl::Reference< sdr::overlay::OverlayManager > xTargetOverlay = pCandidate->GetOverlayManager(); if(xTargetOverlay.is()) { @@ -214,7 +214,7 @@ void Impl3DMirrorConstructOverlay::SetMirrorAxis(Point aMirrorAxisA, Point aMirr basegfx::B2DPolyPolygon aPolyPolygon(mpPolygons[b]); aPolyPolygon.transform(aMatrixTransform); - ::sdr::overlay::OverlayPolyPolygonStripedAndFilled* pNew = new ::sdr::overlay::OverlayPolyPolygonStripedAndFilled( + sdr::overlay::OverlayPolyPolygonStripedAndFilled* pNew = new sdr::overlay::OverlayPolyPolygonStripedAndFilled( aPolyPolygon); xTargetOverlay->add(*pNew); maObjects.append(*pNew); diff --git a/svx/source/sdr/overlay/overlayobjectlist.cxx b/svx/source/sdr/overlay/overlayobjectlist.cxx index 484f645..1f8af0d 100644 --- a/svx/source/sdr/overlay/overlayobjectlist.cxx +++ b/svx/source/sdr/overlay/overlayobjectlist.cxx @@ -47,7 +47,7 @@ namespace sdr for(; aStart != maVector.end(); ++aStart) { - ::sdr::overlay::OverlayObject* pCandidate = *aStart; + sdr::overlay::OverlayObject* pCandidate = *aStart; if(pCandidate->getOverlayManager()) { @@ -159,7 +159,7 @@ namespace sdr for(; aStart != maVector.end(); ++aStart) { - ::sdr::overlay::OverlayObject* pCandidate = *aStart; + sdr::overlay::OverlayObject* pCandidate = *aStart; aRetval.expand(pCandidate->getBaseRange()); } } diff --git a/svx/source/svdraw/sdrpagewindow.cxx b/svx/source/svdraw/sdrpagewindow.cxx index 0e4cdf4..8b03862 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 0440ba1..b31308d 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 8dccf7e..0c9db46 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 32e8b24..b557778 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 348cf2d..f7d3262 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 a9baeb9..d8efa35 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 220d103..8afbb4f 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 05c5589..074d2fa 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 ebbacf5..aac9a6d 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 6c35b71..8fe3df1 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 c692a3a..5d108d1 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 14fdff4..b79f39f 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; } diff --git a/svx/source/table/accessiblecell.cxx b/svx/source/table/accessiblecell.cxx index 3770c65..b41e500 100644 --- a/svx/source/table/accessiblecell.cxx +++ b/svx/source/table/accessiblecell.cxx @@ -37,7 +37,7 @@ #include <svx/unoshtxt.hxx> #include <svx/svdotext.hxx> -using namespace ::sdr::table; +using namespace sdr::table; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::accessibility; diff --git a/svx/source/table/accessibletableshape.cxx b/svx/source/table/accessibletableshape.cxx index 862c39f..a0841f0 100644 --- a/svx/source/table/accessibletableshape.cxx +++ b/svx/source/table/accessibletableshape.cxx @@ -38,7 +38,7 @@ using namespace ::accessibility; -using namespace ::sdr::table; +using namespace sdr::table; using namespace ::com::sun::star::accessibility; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; @@ -928,7 +928,7 @@ void SAL_CALL void SAL_CALL AccessibleTableShape::selectionChanged (const EventObject& rEvent) throw (RuntimeException, std::exception) { - //::sdr::table::CellRef xCellRef = static_cast< ::sdr::table::CellRef > (rEvent.Source); + //sdr::table::CellRef xCellRef = static_cast< sdr::table::CellRef > (rEvent.Source); Reference< XCell > xCell(rEvent.Source, UNO_QUERY); if (xCell.is()) { @@ -965,10 +965,10 @@ AccessibleCell* AccessibleTableShape::GetActiveAccessibleCell() SvxTableController* pController = getTableController(); if (pController) { - ::sdr::table::SdrTableObj* pTableObj = pController->GetTableObj(); + sdr::table::SdrTableObj* pTableObj = pController->GetTableObj(); if ( pTableObj ) { - ::sdr::table::CellRef xCellRef (pTableObj->getActiveCell()); + sdr::table::CellRef xCellRef (pTableObj->getActiveCell()); if ( xCellRef.is() ) { const bool bCellEditing = xCellRef->IsTextEditActive(); diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx index 1adcc31..38a41b5 100644 --- a/svx/source/table/tablecontroller.cxx +++ b/svx/source/table/tablecontroller.cxx @@ -72,7 +72,7 @@ #include <o3tl/enumrange.hxx> using ::editeng::SvxBorderLine; -using namespace ::sdr::table; +using namespace sdr::table; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::table; @@ -297,7 +297,7 @@ bool SvxTableController::onMouseButtonDown(const MouseEvent& rMEvt, vcl::Window* } else { - ::sdr::table::SdrTableObj* pTableObj = dynamic_cast< ::sdr::table::SdrTableObj* >( mxTableObj.get() ); + sdr::table::SdrTableObj* pTableObj = dynamic_cast< sdr::table::SdrTableObj* >( mxTableObj.get() ); if( !pWindow || !pTableObj || eHit == SDRTABLEHIT_NONE) { @@ -518,7 +518,7 @@ void SvxTableController::GetState( SfxItemSet& rSet ) void SvxTableController::onInsert( sal_uInt16 nSId, const SfxItemSet* pArgs ) { - ::sdr::table::SdrTableObj* pTableObj = dynamic_cast< ::sdr::table::SdrTableObj* >( mxTableObj.get() ); + sdr::table::SdrTableObj* pTableObj = dynamic_cast< sdr::table::SdrTableObj* >( mxTableObj.get() ); if( !pTableObj ) return; @@ -795,7 +795,7 @@ void SvxTableController::onInsert( sal_uInt16 nSId, const SfxItemSet* pArgs ) void SvxTableController::onDelete( sal_uInt16 nSId ) { - ::sdr::table::SdrTableObj* pTableObj = dynamic_cast< ::sdr::table::SdrTableObj* >( mxTableObj.get() ); + sdr::table::SdrTableObj* pTableObj = dynamic_cast< sdr::table::SdrTableObj* >( mxTableObj.get() ); if( !pTableObj ) return; @@ -901,7 +901,7 @@ namespace void SvxTableController::onFormatTable( SfxRequest& rReq ) { - ::sdr::table::SdrTableObj* pTableObj = dynamic_cast< ::sdr::table::SdrTableObj* >( mxTableObj.get() ); + sdr::table::SdrTableObj* pTableObj = dynamic_cast< sdr::table::SdrTableObj* >( mxTableObj.get() ); if( !pTableObj ) return; @@ -1041,7 +1041,7 @@ void SvxTableController::Execute( SfxRequest& rReq ) void SvxTableController::SetTableStyle( const SfxItemSet* pArgs ) { - SdrTableObj* pTableObj = dynamic_cast< ::sdr::table::SdrTableObj* >( mxTableObj.get() ); + SdrTableObj* pTableObj = dynamic_cast< sdr::table::SdrTableObj* >( mxTableObj.get() ); SdrModel* pModel = pTableObj ? pTableObj->GetModel() : 0; if( !pTableObj || !pModel || !pArgs || (SfxItemState::SET != pArgs->GetItemState(SID_TABLE_STYLE, false)) ) @@ -1119,7 +1119,7 @@ void SvxTableController::SetTableStyle( const SfxItemSet* pArgs ) void SvxTableController::SetTableStyleSettings( const SfxItemSet* pArgs ) { - SdrTableObj* pTableObj = dynamic_cast< ::sdr::table::SdrTableObj* >( mxTableObj.get() ); + SdrTableObj* pTableObj = dynamic_cast< sdr::table::SdrTableObj* >( mxTableObj.get() ); SdrModel* pModel = pTableObj ? pTableObj->GetModel() : 0; if( !pTableObj || !pModel ) @@ -1166,7 +1166,7 @@ void SvxTableController::SetTableStyleSettings( const SfxItemSet* pArgs ) void SvxTableController::SetVertical( sal_uInt16 nSId ) { - SdrTableObj* pTableObj = dynamic_cast< ::sdr::table::SdrTableObj* >( mxTableObj.get() ); + SdrTableObj* pTableObj = dynamic_cast< sdr::table::SdrTableObj* >( mxTableObj.get() ); if( mxTable.is() && pTableObj ) { TableModelNotifyGuard aGuard( mxTable.get() ); @@ -1209,7 +1209,7 @@ void SvxTableController::MergeMarkedCells() { CellPos aStart, aEnd; getSelectedCells( aStart, aEnd ); - SdrTableObj* pTableObj = dynamic_cast< ::sdr::table::SdrTableObj* >( mxTableObj.get() ); + SdrTableObj* pTableObj = dynamic_cast< sdr::table::SdrTableObj* >( mxTableObj.get() ); if( pTableObj ) { if( pTableObj->IsTextEditActive() ) @@ -1433,7 +1433,7 @@ sal_uInt16 SvxTableController::getKeyboardAction( const KeyEvent& rKEvt, vcl::Wi sal_uInt16 nAction = ACTION_HANDLED_BY_VIEW; - ::sdr::table::SdrTableObj* pTableObj = dynamic_cast< ::sdr::table::SdrTableObj* >( mxTableObj.get() ); + sdr::table::SdrTableObj* pTableObj = dynamic_cast< sdr::table::SdrTableObj* >( mxTableObj.get() ); if( !pTableObj ) return nAction; @@ -1613,7 +1613,7 @@ sal_uInt16 SvxTableController::getKeyboardAction( const KeyEvent& rKEvt, vcl::Wi bool SvxTableController::executeAction( sal_uInt16 nAction, bool bSelect, vcl::Window* pWindow ) { - ::sdr::table::SdrTableObj* pTableObj = dynamic_cast< ::sdr::table::SdrTableObj* >( mxTableObj.get() ); + sdr::table::SdrTableObj* pTableObj = dynamic_cast< sdr::table::SdrTableObj* >( mxTableObj.get() ); if( !pTableObj ) return false; @@ -1845,7 +1845,7 @@ void SvxTableController::EditCell( const CellPos& rPos, vcl::Window* pWindow, co { SdrPageView* pPV = mpView->GetSdrPageView(); - ::sdr::table::SdrTableObj* pTableObj = dynamic_cast< ::sdr::table::SdrTableObj* >( mxTableObj.get() ); + sdr::table::SdrTableObj* pTableObj = dynamic_cast< sdr::table::SdrTableObj* >( mxTableObj.get() ); if( pTableObj && pTableObj->GetPage() == pPV->GetPage() ) { bool bEmptyOutliner = false; @@ -2107,7 +2107,7 @@ void SvxTableController::updateSelectionOverlay() destroySelectionOverlay(); if( mbCellSelectionMode ) { - ::sdr::table::SdrTableObj* pTableObj = dynamic_cast< ::sdr::table::SdrTableObj* >( mxTableObj.get() ); + sdr::table::SdrTableObj* pTableObj = dynamic_cast< sdr::table::SdrTableObj* >( mxTableObj.get() ); if( pTableObj ) { sdr::overlay::OverlayObjectCell::RangeVector aRanges; @@ -2137,7 +2137,7 @@ void SvxTableController::updateSelectionOverlay() SdrPaintWindow* pPaintWindow = mpView->GetPaintWindow(nIndex); if( pPaintWindow ) { - rtl::Reference < ::sdr::overlay::OverlayManager > xOverlayManager = pPaintWindow->GetOverlayManager(); + rtl::Reference < sdr::overlay::OverlayManager > xOverlayManager = pPaintWindow->GetOverlayManager(); if( xOverlayManager.is() ) { // sdr::overlay::CellOverlayType eType = sdr::overlay::CELL_OVERLAY_INVERT; @@ -2146,7 +2146,7 @@ void SvxTableController::updateSelectionOverlay() sdr::overlay::OverlayObjectCell* pOverlay = new sdr::overlay::OverlayObjectCell( eType, aHighlight, aRanges ); xOverlayManager->add(*pOverlay); - mpSelectionOverlay = new ::sdr::overlay::OverlayObjectList; + mpSelectionOverlay = new sdr::overlay::OverlayObjectList; mpSelectionOverlay->append(*pOverlay); } } @@ -2606,7 +2606,7 @@ bool SvxTableController::GetMarkedObjModel( SdrPage* pNewPage ) { if( mxTableObj.is() && mbCellSelectionMode && pNewPage ) try { - ::sdr::table::SdrTableObj& rTableObj = *static_cast< ::sdr::table::SdrTableObj* >( mxTableObj.get() ); + sdr::table::SdrTableObj& rTableObj = *static_cast< sdr::table::SdrTableObj* >( mxTableObj.get() ); CellPos aStart, aEnd; getSelectedCells( aStart, aEnd ); @@ -3128,7 +3128,7 @@ bool SvxTableController::isColumnSelected( sal_Int32 nColumn ) bool SvxTableController::isRowHeader() { - SdrTableObj* pTableObj = dynamic_cast< ::sdr::table::SdrTableObj* >( mxTableObj.get() ); + SdrTableObj* pTableObj = dynamic_cast< sdr::table::SdrTableObj* >( mxTableObj.get() ); SdrModel* pModel = pTableObj ? pTableObj->GetModel() : 0; if( !pTableObj || !pModel ) @@ -3141,7 +3141,7 @@ bool SvxTableController::isRowHeader() bool SvxTableController::isColumnHeader() { - SdrTableObj* pTableObj = dynamic_cast< ::sdr::table::SdrTableObj* >( mxTableObj.get() ); + SdrTableObj* pTableObj = dynamic_cast< sdr::table::SdrTableObj* >( mxTableObj.get() ); SdrModel* pModel = pTableObj ? pTableObj->GetModel() : 0; if( !pTableObj || !pModel ) diff --git a/svx/source/table/tablehandles.cxx b/svx/source/table/tablehandles.cxx index 2b16ff2..8b6453f 100644 --- a/svx/source/table/tablehandles.cxx +++ b/svx/source/table/tablehandles.cxx @@ -171,7 +171,7 @@ void TableEdgeHdl::CreateB2dIAObject() if(rPageWindow.GetPaintWindow().OutputToWindow()) { - rtl::Reference< ::sdr::overlay::OverlayManager > xManager = rPageWindow.GetOverlayManager(); + rtl::Reference< sdr::overlay::OverlayManager > xManager = rPageWindow.GetOverlayManager(); if (xManager.is()) { if(aVisible.count()) diff --git a/svx/source/table/viewcontactoftableobj.cxx b/svx/source/table/viewcontactoftableobj.cxx index 4c9b2e7..48169aa 100644 --- a/svx/source/table/viewcontactoftableobj.cxx +++ b/svx/source/table/viewcontactoftableobj.cxx @@ -726,7 +726,7 @@ namespace sdr } } - ViewContactOfTableObj::ViewContactOfTableObj(::sdr::table::SdrTableObj& rTableObj) + ViewContactOfTableObj::ViewContactOfTableObj(sdr::table::SdrTableObj& rTableObj) : ViewContactOfSdrObj(rTableObj) { } diff --git a/svx/source/table/viewcontactoftableobj.hxx b/svx/source/table/viewcontactoftableobj.hxx index 4c33259..737fc11 100644 --- a/svx/source/table/viewcontactoftableobj.hxx +++ b/svx/source/table/viewcontactoftableobj.hxx @@ -31,9 +31,9 @@ namespace sdr { protected: // internal access to SdrTextObj - const ::sdr::table::SdrTableObj& GetTableObj() const + const sdr::table::SdrTableObj& GetTableObj() const { - return static_cast<const ::sdr::table::SdrTableObj&>(GetSdrObject()); + return static_cast<const sdr::table::SdrTableObj&>(GetSdrObject()); } // This method is responsible for creating the graphical visualisation data derived ONLY from @@ -42,7 +42,7 @@ namespace sdr public: // basic constructor, used from SdrObject. - ViewContactOfTableObj(::sdr::table::SdrTableObj& rTextObj); + ViewContactOfTableObj(sdr::table::SdrTableObj& rTextObj); virtual ~ViewContactOfTableObj(); }; } // end of namespace contact diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx index afe0c72..5c68c35 100644 --- a/svx/source/unodraw/UnoGraphicExporter.cxx +++ b/svx/source/unodraw/UnoGraphicExporter.cxx @@ -281,7 +281,7 @@ namespace { return &aOutSize; } -class ImplExportCheckVisisbilityRedirector : public ::sdr::contact::ViewObjectContactRedirector +class ImplExportCheckVisisbilityRedirector : public sdr::contact::ViewObjectContactRedirector { public: ImplExportCheckVisisbilityRedirector( SdrPage* pCurrentPage ); @@ -318,7 +318,7 @@ drawinglayer::primitive2d::Primitive2DSequence ImplExportCheckVisisbilityRedirec if( (pPage == 0) || pPage->checkVisibility(rOriginal, rDisplayInfo, false) ) { - return ::sdr::contact::ViewObjectContactRedirector::createRedirectedPrimitive2DSequence(rOriginal, rDisplayInfo); + return sdr::contact::ViewObjectContactRedirector::createRedirectedPrimitive2DSequence(rOriginal, rDisplayInfo); } return drawinglayer::primitive2d::Primitive2DSequence(); @@ -326,7 +326,7 @@ drawinglayer::primitive2d::Primitive2DSequence ImplExportCheckVisisbilityRedirec 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/unodraw/tableshape.cxx b/svx/source/unodraw/tableshape.cxx index b5c0c22..faa6d40 100644 --- a/svx/source/unodraw/tableshape.cxx +++ b/svx/source/unodraw/tableshape.cxx @@ -30,7 +30,7 @@ using namespace ::osl; using namespace ::cppu; -using namespace ::sdr::table; +using namespace sdr::table; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx index f5cdeb8..a67aa88 100644 --- a/sw/source/core/crsr/viscrs.cxx +++ b/sw/source/core/crsr/viscrs.cxx @@ -319,7 +319,7 @@ void SwSelPaintRects::Show() else if(!empty()) { SdrPaintWindow* pCandidate = pView->GetPaintWindow(0); - rtl::Reference< ::sdr::overlay::OverlayManager > xTargetOverlay = pCandidate->GetOverlayManager(); + rtl::Reference< sdr::overlay::OverlayManager > xTargetOverlay = pCandidate->GetOverlayManager(); if (xTargetOverlay.is()) { diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index 2f53711..fe20895 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -3125,7 +3125,7 @@ void SwTabFrmPainter::Insert( SwLineEntry& rNew, bool bHori ) */ namespace { - class SwViewObjectContactRedirector : public ::sdr::contact::ViewObjectContactRedirector + class SwViewObjectContactRedirector : public sdr::contact::ViewObjectContactRedirector { private: const SwViewShell& mrViewShell; diff --git a/sw/source/uibase/docvw/AnchorOverlayObject.cxx b/sw/source/uibase/docvw/AnchorOverlayObject.cxx index 4f3fa86b..c16fc7d 100644 --- a/sw/source/uibase/docvw/AnchorOverlayObject.cxx +++ b/sw/source/uibase/docvw/AnchorOverlayObject.cxx @@ -241,7 +241,7 @@ ImplPrimitive2DIDBlock(AnchorPrimitive, PRIMITIVE2D_ID_SWSIDEBARANCHORPRIMITIVE) SdrPaintWindow* pPaintWindow = rDocView.GetDrawView()->GetPaintWindow(0); if( pPaintWindow ) { - rtl::Reference< ::sdr::overlay::OverlayManager > xOverlayManager = pPaintWindow->GetOverlayManager(); + rtl::Reference< sdr::overlay::OverlayManager > xOverlayManager = pPaintWindow->GetOverlayManager(); if ( xOverlayManager.is() ) { diff --git a/sw/source/uibase/docvw/ShadowOverlayObject.cxx b/sw/source/uibase/docvw/ShadowOverlayObject.cxx index 2b9b4d2..fe60589 100644 --- a/sw/source/uibase/docvw/ShadowOverlayObject.cxx +++ b/sw/source/uibase/docvw/ShadowOverlayObject.cxx @@ -174,7 +174,7 @@ ImplPrimitive2DIDBlock(ShadowPrimitive, PRIMITIVE2D_ID_SWSIDEBARSHADOWPRIMITIVE) SdrPaintWindow* pPaintWindow = rDocView.GetDrawView()->GetPaintWindow(0); if( pPaintWindow ) { - rtl::Reference< ::sdr::overlay::OverlayManager > xOverlayManager = pPaintWindow->GetOverlayManager(); + rtl::Reference< sdr::overlay::OverlayManager > xOverlayManager = pPaintWindow->GetOverlayManager(); if ( xOverlayManager.is() ) { commit c07a3b0396ab131bef7ef23305180c8f27bf5c9b Author: Tor Lillqvist <[email protected]> Date: Thu Apr 30 07:15:55 2015 +0300 Get rid of initial :: for the svx namespace Change-Id: I03e428a749bca409ebac9c142acaddafcbfeca23 diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx index e7a37c4..0c9d91e 100644 --- a/cui/source/inc/dbregister.hxx +++ b/cui/source/inc/dbregister.hxx @@ -51,7 +51,7 @@ namespace svx VclPtr<PushButton> m_pEdit; VclPtr<PushButton> m_pDelete; - VclPtr< ::svx::OptHeaderTabListBox> pPathBox; + VclPtr<svx::OptHeaderTabListBox> pPathBox; SvTreeListEntry* m_pCurEntry; sal_uLong m_nOldCount; bool m_bModified; diff --git a/cui/source/inc/optpath.hxx b/cui/source/inc/optpath.hxx index 0e94b73..a394d09 100644 --- a/cui/source/inc/optpath.hxx +++ b/cui/source/inc/optpath.hxx @@ -46,7 +46,7 @@ private: VclPtr<PushButton> m_pStandardBtn; VclPtr<PushButton> m_pPathBtn; - VclPtr< ::svx::OptHeaderTabListBox> pPathBox; + VclPtr<svx::OptHeaderTabListBox> pPathBox; OptPath_Impl* pImpl; ::com::sun::star::uno::Reference< ::svt::DialogClosedListener > xDialogListener; diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx index 5d834e2..2d7e8a5 100644 --- a/cui/source/options/dbregister.cxx +++ b/cui/source/options/dbregister.cxx @@ -125,7 +125,7 @@ DbRegistrationOptionsPage::DbRegistrationOptionsPage( vcl::Window* pParent, cons Size aBoxSize = m_pPathCtrl->GetOutputSizePixel(); WinBits nBits = WB_SORT | WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP; - pPathBox = new ::svx::OptHeaderTabListBox( *m_pPathCtrl, nBits ); + pPathBox = new svx::OptHeaderTabListBox( *m_pPathCtrl, nBits ); HeaderBar &rBar = pPathBox->GetTheHeaderBar(); diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index 2267d16..3768084 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -318,7 +318,7 @@ VclPtr<SfxTabPage> CreateGeneralTabPage( sal_uInt16 nId, vcl::Window* pParent, c case RID_OFAPAGE_MSFILTEROPT2: fnCreate = &OfaMSFilterTabPage2::Create; break; case RID_SVXPAGE_JSEARCH_OPTIONS: fnCreate = &SvxJSearchOptionsPage::Create ; break; case SID_SB_CONNECTIONPOOLING: fnCreate = &::offapp::ConnectionPoolOptionsPage::Create; break; - case SID_SB_DBREGISTEROPTIONS: fnCreate = &::svx::DbRegistrationOptionsPage::Create; break; + case SID_SB_DBREGISTEROPTIONS: fnCreate = &svx::DbRegistrationOptionsPage::Create; break; case RID_SVXPAGE_ACCESSIBILITYCONFIG: fnCreate = &SvxAccessibilityOptionsTabPage::Create; break; case RID_SVXPAGE_OPTIONS_CTL: fnCreate = &SvxCTLOptionsPage::Create ; break; case RID_SVXPAGE_OPTIONS_JAVA: fnCreate = &SvxJavaOptionsPage::Create ; break; @@ -1306,7 +1306,7 @@ SfxItemSet* OfaTreeOptionsDialog::CreateItemSet( sal_uInt16 nId ) SID_SB_POOLING_ENABLED, SID_SB_DB_REGISTER, 0 ); ::offapp::ConnectionPoolConfig::GetOptions(*pRet); - ::svx::DbRegisteredNamesConfig::GetOptions(*pRet); + svx::DbRegisteredNamesConfig::GetOptions(*pRet); break; case SID_SCH_EDITOPTIONS: @@ -1383,7 +1383,7 @@ void OfaTreeOptionsDialog::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet case SID_SB_STARBASEOPTIONS: ::offapp::ConnectionPoolConfig::SetOptions( rSet ); - ::svx::DbRegisteredNamesConfig::SetOptions(rSet); + svx::DbRegisteredNamesConfig::SetOptions(rSet); break; case SID_SCH_EDITOPTIONS: diff --git a/dbaccess/source/ext/macromigration/macromigrationpages.cxx b/dbaccess/source/ext/macromigration/macromigrationpages.cxx index c97494f..6d101ca3 100644 --- a/dbaccess/source/ext/macromigration/macromigrationpages.cxx +++ b/dbaccess/source/ext/macromigration/macromigrationpages.cxx @@ -95,7 +95,7 @@ namespace dbmm get(m_pStartMigration, "startmigrate"); get(m_pBrowseSaveAsLocation, "browse"); get(m_pSaveAsLocation, "location"); - m_pLocationController = new ::svx::DatabaseLocationInputController( + m_pLocationController = new svx::DatabaseLocationInputController( _rParentDialog.getComponentContext(), *m_pSaveAsLocation, *m_pBrowseSaveAsLocation); m_pSaveAsLocation->SetModifyHdl( LINK( this, SaveDBDocPage, OnLocationModified ) ); diff --git a/dbaccess/source/ext/macromigration/macromigrationpages.hxx b/dbaccess/source/ext/macromigration/macromigrationpages.hxx index 90a5e5e2..f9ee4d6 100644 --- a/dbaccess/source/ext/macromigration/macromigrationpages.hxx +++ b/dbaccess/source/ext/macromigration/macromigrationpages.hxx @@ -86,7 +86,7 @@ namespace dbmm VclPtr< ::svt::OFileURLControl> m_pSaveAsLocation; VclPtr<PushButton> m_pBrowseSaveAsLocation; VclPtr<FixedText> m_pStartMigration; - ::svx::DatabaseLocationInputController* m_pLocationController; + svx::DatabaseLocationInputController* m_pLocationController; protected: // IWizardPageController overridables diff --git a/dbaccess/source/ui/app/AppController.hxx b/dbaccess/source/ui/app/AppController.hxx index 959f8c0..e02281d 100644 --- a/dbaccess/source/ui/app/AppController.hxx +++ b/dbaccess/source/ui/app/AppController.hxx @@ -273,7 +273,7 @@ namespace dbaui @return <TRUE/> if the paste opertions was successful, otherwise <FALSE/>. */ - bool paste( ElementType _eType, const ::svx::ODataAccessDescriptor& _rPasteData, const OUString& _sParentFolder = OUString(), bool _bMove = false); + bool paste( ElementType _eType, const svx::ODataAccessDescriptor& _rPasteData, const OUString& _sParentFolder = OUString(), bool _bMove = false); /// returns the system clipboard. const TransferableDataHelper& getViewClipboard() const { return m_aSystemClipboard; } diff --git a/dbaccess/source/ui/app/AppControllerDnD.cxx b/dbaccess/source/ui/app/AppControllerDnD.cxx index f18b2d0..4381e55 100644 --- a/dbaccess/source/ui/app/AppControllerDnD.cxx +++ b/dbaccess/source/ui/app/AppControllerDnD.cxx @@ -578,7 +578,7 @@ TransferableHelper* OApplicationController::copyObject() return NULL; } -bool OApplicationController::paste( ElementType _eType, const ::svx::ODataAccessDescriptor& _rPasteData, const OUString& _sParentFolder, bool _bMove) +bool OApplicationController::paste( ElementType _eType, const svx::ODataAccessDescriptor& _rPasteData, const OUString& _sParentFolder, bool _bMove) { try { diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index e546a4a..a98919f 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -1070,7 +1070,7 @@ void SbaTableQueryBrowser::checkDocumentDataSource() implCheckExternalSlot(ID_BROWSER_DOCUMENT_DATASOURCE); } -void SbaTableQueryBrowser::extractDescriptorProps(const ::svx::ODataAccessDescriptor& _rDescriptor, OUString& _rDataSource, OUString& _rCommand, sal_Int32& _rCommandType, bool& _rEscapeProcessing) +void SbaTableQueryBrowser::extractDescriptorProps(const svx::ODataAccessDescriptor& _rDescriptor, OUString& _rDataSource, OUString& _rCommand, sal_Int32& _rCommandType, bool& _rEscapeProcessing) { _rDataSource = _rDescriptor.getDataSource(); if ( _rDescriptor.has(daCommand) ) @@ -1253,7 +1253,7 @@ SvTreeListEntry* SbaTableQueryBrowser::getObjectEntry(const OUString& _rDataSour return pObject; } -SvTreeListEntry* SbaTableQueryBrowser::getObjectEntry(const ::svx::ODataAccessDescriptor& _rDescriptor, +SvTreeListEntry* SbaTableQueryBrowser::getObjectEntry(const svx::ODataAccessDescriptor& _rDescriptor, SvTreeListEntry** _ppDataSourceEntry, SvTreeListEntry** _ppContainerEntry, bool _bExpandAncestors) { @@ -1860,7 +1860,7 @@ void SbaTableQueryBrowser::Execute(sal_uInt16 nId, const Sequence< PropertyValue break; case ID_TREE_ADMINISTRATE: - ::svx::administrateDatabaseRegistration( getView() ); + svx::administrateDatabaseRegistration( getView() ); break; case ID_BROWSER_REFRESH: @@ -1911,7 +1911,7 @@ void SbaTableQueryBrowser::Execute(sal_uInt16 nId, const Sequence< PropertyValue else { Reference<XPropertySet> xProp(getRowSet(),UNO_QUERY); - implSelect(::svx::ODataAccessDescriptor(xProp)); + implSelect(svx::ODataAccessDescriptor(xProp)); } } break; @@ -2350,7 +2350,7 @@ bool SbaTableQueryBrowser::ensureEntryObject( SvTreeListEntry* _pEntry ) return bSuccess; } -bool SbaTableQueryBrowser::implSelect(const ::svx::ODataAccessDescriptor& _rDescriptor, bool _bSelectDirect) +bool SbaTableQueryBrowser::implSelect(const svx::ODataAccessDescriptor& _rDescriptor, bool _bSelectDirect) { // extract the props OUString sDataSource; @@ -3675,7 +3675,7 @@ bool SbaTableQueryBrowser::preReloadForm() getBrowserView()->getGridControl()->setDesignMode(sal_True); // we had an invalid statement so we need to connect the column models Reference<XPropertySet> xRowSetProps(getRowSet(),UNO_QUERY); - ::svx::ODataAccessDescriptor aDesc(xRowSetProps); + svx::ODataAccessDescriptor aDesc(xRowSetProps); // extract the props OUString sDataSource; OUString sCommand; diff --git a/dbaccess/source/ui/inc/TableCopyHelper.hxx b/dbaccess/source/ui/inc/TableCopyHelper.hxx index d7795d1..512132e 100644 --- a/dbaccess/source/ui/inc/TableCopyHelper.hxx +++ b/dbaccess/source/ui/inc/TableCopyHelper.hxx @@ -70,7 +70,7 @@ namespace dbaui // is needed to describe the drop target struct DropDescriptor { - ::svx::ODataAccessDescriptor aDroppedData; + svx::ODataAccessDescriptor aDroppedData; //for transfor the tablename OUString sDefaultTableName; @@ -168,7 +168,7 @@ namespace dbaui The name of the dest data source. */ void pasteTable( - const ::svx::ODataAccessDescriptor& _rPasteData, + const svx::ODataAccessDescriptor& _rPasteData, const OUString& _sDestDataSourceName, const SharedConnection& _xDestConnection ); diff --git a/dbaccess/source/ui/inc/TokenWriter.hxx b/dbaccess/source/ui/inc/TokenWriter.hxx index 35b81ad..d1b87f0 100644 --- a/dbaccess/source/ui/inc/TokenWriter.hxx +++ b/dbaccess/source/ui/inc/TokenWriter.hxx @@ -86,7 +86,7 @@ namespace dbaui bool m_bCheckOnly; // export data - ODatabaseImportExport( const ::svx::ODataAccessDescriptor& _aDataDescriptor, + ODatabaseImportExport( const svx::ODataAccessDescriptor& _aDataDescriptor, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rM, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxNumberF, const OUString& rExchange = OUString()); @@ -108,7 +108,7 @@ namespace dbaui virtual bool Write(); // Export virtual bool Read(); // Import - void initialize(const ::svx::ODataAccessDescriptor& _aDataDescriptor); + void initialize(const svx::ODataAccessDescriptor& _aDataDescriptor); void dispose(); void enableCheckOnly() { m_bCheckOnly = true; } @@ -116,7 +116,7 @@ namespace dbaui private: virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - void impl_initFromDescriptor( const ::svx::ODataAccessDescriptor& _aDataDescriptor, bool _bPlusDefaultInit ); + void impl_initFromDescriptor( const svx::ODataAccessDescriptor& _aDataDescriptor, bool _bPlusDefaultInit ); }; // RTF Import and Export @@ -126,7 +126,7 @@ namespace dbaui void appendRow(OString* pHorzChar,sal_Int32 _nColumnCount,sal_Int32& k,sal_Int32& kk); public: // export data - ORTFImportExport( const ::svx::ODataAccessDescriptor& _aDataDescriptor, + ORTFImportExport( const svx::ODataAccessDescriptor& _aDataDescriptor, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rM, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxNumberF, const OUString& rExchange = OUString()) @@ -170,7 +170,7 @@ namespace dbaui public: // export data - OHTMLImportExport( const ::svx::ODataAccessDescriptor& _aDataDescriptor, + OHTMLImportExport( const svx::ODataAccessDescriptor& _aDataDescriptor, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rM, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxNumberF, const OUString& rExchange = OUString()); @@ -207,7 +207,7 @@ namespace dbaui // export data ORowSetImportExport(vcl::Window* _pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetUpdate >& _xResultSetUpdate, - const ::svx::ODataAccessDescriptor& _aDataDescriptor, + const svx::ODataAccessDescriptor& _aDataDescriptor, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rM, const OUString& rExchange = OUString()); diff --git a/dbaccess/source/ui/inc/dbexchange.hxx b/dbaccess/source/ui/inc/dbexchange.hxx index 47dfd7a..8e856b9 100644 --- a/dbaccess/source/ui/inc/dbexchange.hxx +++ b/dbaccess/source/ui/inc/dbexchange.hxx @@ -41,7 +41,7 @@ namespace dbaui class ORTFImportExport; class OHTMLImportExport; - class ODataClipboard : public ::svx::ODataAccessObjectTransferable + class ODataClipboard : public svx::ODataAccessObjectTransferable { ::rtl::Reference< OHTMLImportExport > m_pHtml; diff --git a/dbaccess/source/ui/inc/sbagrid.hxx b/dbaccess/source/ui/inc/sbagrid.hxx index 25292c9..4b9bd43 100644 --- a/dbaccess/source/ui/inc/sbagrid.hxx +++ b/dbaccess/source/ui/inc/sbagrid.hxx @@ -214,7 +214,7 @@ namespace dbaui // Attributes protected: - ::svx::ODataAccessDescriptor m_aDataDescriptor; + svx::ODataAccessDescriptor m_aDataDescriptor; SbaGridListener* m_pMasterListener; ImplSVEvent * m_nAsyncDropEvent; diff --git a/dbaccess/source/ui/inc/unodatbr.hxx b/dbaccess/source/ui/inc/unodatbr.hxx index 18cb432..fc592a3 100644 --- a/dbaccess/source/ui/inc/unodatbr.hxx +++ b/dbaccess/source/ui/inc/unodatbr.hxx @@ -88,7 +88,7 @@ namespace dbaui typedef ::std::map< sal_uInt16, ExternalFeature, ::std::less< sal_uInt16 > > ExternalFeaturesMap; ExternalFeaturesMap m_aExternalFeatures; - ::svx::ODataAccessDescriptor m_aDocumentDataSource; + svx::ODataAccessDescriptor m_aDocumentDataSource; // if we're part of a document, this is the state of the DocumentDataSource slot ::cppu::OInterfaceContainerHelper m_aSelectionListeners; @@ -358,7 +358,7 @@ namespace dbaui void implRemoveStatusListeners(); - bool implSelect(const ::svx::ODataAccessDescriptor& _rDescriptor, bool _bSelectDirect = false); + bool implSelect(const svx::ODataAccessDescriptor& _rDescriptor, bool _bSelectDirect = false); bool implSelect( SvTreeListEntry* _pEntry ); /// selects the entry given and loads the grid control with the object's data @@ -394,7 +394,7 @@ namespace dbaui @param _bExpandAncestors If <TRUE/>, all ancestor on the way to the entry will be expanded */ - SvTreeListEntry* getObjectEntry(const ::svx::ODataAccessDescriptor& _rDescriptor, + SvTreeListEntry* getObjectEntry(const svx::ODataAccessDescriptor& _rDescriptor, SvTreeListEntry** _ppDataSourceEntry = NULL, SvTreeListEntry** _ppContainerEntry = NULL, bool _bExpandAncestors = true ); @@ -424,7 +424,7 @@ namespace dbaui /// checks if m_aDocumentDataSource describes a known object void checkDocumentDataSource(); - void extractDescriptorProps(const ::svx::ODataAccessDescriptor& _rDescriptor, + void extractDescriptorProps(const svx::ODataAccessDescriptor& _rDescriptor, OUString& _rDataSource, OUString& _rCommand, sal_Int32& _rCommandType, bool& _rEscapeProcessing); void transferChangedControlProperty(const OUString& _rProperty, const ::com::sun::star::uno::Any& _rNewValue); diff --git a/dbaccess/source/ui/misc/RowSetDrop.cxx b/dbaccess/source/ui/misc/RowSetDrop.cxx index 1d2316a..a1f5f4b 100644 --- a/dbaccess/source/ui/misc/RowSetDrop.cxx +++ b/dbaccess/source/ui/misc/RowSetDrop.cxx @@ -40,7 +40,7 @@ using namespace ::com::sun::star::lang; // export data ORowSetImportExport::ORowSetImportExport( vcl::Window* _pParent, const Reference< XResultSetUpdate >& _xResultSetUpdate, - const ::svx::ODataAccessDescriptor& _aDataDescriptor, + const svx::ODataAccessDescriptor& _aDataDescriptor, const Reference< XComponentContext >& _rM, const OUString& rExchange ) diff --git a/dbaccess/source/ui/misc/TableCopyHelper.cxx b/dbaccess/source/ui/misc/TableCopyHelper.cxx index b9ad29c1..aa4d752 100644 --- a/dbaccess/source/ui/misc/TableCopyHelper.cxx +++ b/dbaccess/source/ui/misc/TableCopyHelper.cxx @@ -134,7 +134,7 @@ void OTableCopyHelper::insertTable( const OUString& i_rSourceDataSource, const R } } -void OTableCopyHelper::pasteTable( const ::svx::ODataAccessDescriptor& _rPasteData, const OUString& i_rDestDataSourceName, +void OTableCopyHelper::pasteTable( const svx::ODataAccessDescriptor& _rPasteData, const OUString& i_rDestDataSourceName, const SharedConnection& i_rDestConnection ) { OUString sSrcDataSourceName = _rPasteData.getDataSource(); @@ -186,7 +186,7 @@ void OTableCopyHelper::pasteTable( SotClipboardFormatId _nFormatId { if ( ODataAccessObjectTransferable::canExtractObjectDescriptor(_rTransData.GetDataFlavorExVector()) ) { - ::svx::ODataAccessDescriptor aPasteData = ODataAccessObjectTransferable::extractObjectDescriptor(_rTransData); + svx::ODataAccessDescriptor aPasteData = ODataAccessObjectTransferable::extractObjectDescriptor(_rTransData); pasteTable( aPasteData,i_rDestDataSource,_xConnection); } } diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx index a879755..a05a3f8 100644 --- a/dbaccess/source/ui/misc/TokenWriter.cxx +++ b/dbaccess/source/ui/misc/TokenWriter.cxx @@ -82,7 +82,7 @@ const static char sFontSize[] = "font-size: "; #define SBA_FORMAT_SELECTION_COUNT 4 #define CELL_X 1437 -ODatabaseImportExport::ODatabaseImportExport(const ::svx::ODataAccessDescriptor& _aDataDescriptor, +ODatabaseImportExport::ODatabaseImportExport(const svx::ODataAccessDescriptor& _aDataDescriptor, const Reference< XComponentContext >& _rM, const Reference< ::com::sun::star::util::XNumberFormatter >& _rxNumberF, const OUString& rExchange) @@ -636,7 +636,7 @@ const char OHTMLImportExport::sIndentSource[nIndentMax+1] = "\t\t\t\t\t\t\t\t\t\ #define TAG_ON_LF( tag ) (TAG_ON( tag ).WriteCharPtr( SAL_NEWLINE_STRING ).WriteCharPtr( GetIndentStr() )) #define TAG_OFF_LF( tag ) (TAG_OFF( tag ).WriteCharPtr( SAL_NEWLINE_STRING ).WriteCharPtr( GetIndentStr() )) -OHTMLImportExport::OHTMLImportExport(const ::svx::ODataAccessDescriptor& _aDataDescriptor, +OHTMLImportExport::OHTMLImportExport(const svx::ODataAccessDescriptor& _aDataDescriptor, const Reference< XComponentContext >& _rM, ... etc. - the rest is truncated _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
