summaryrefslogtreecommitdiff
path: root/include/svx
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2015-04-30 07:18:59 +0300
committerTor Lillqvist <tml@collabora.com>2015-04-30 09:11:40 +0300
commit5a27f808beff001bc69755095e08e50900d7c863 (patch)
tree1df6fbc012958c178be6f4bd7e5e60e08e7ef189 /include/svx
parentc07a3b0396ab131bef7ef23305180c8f27bf5c9b (diff)
Get rid of initial :: for the sdr namespace
Change-Id: Ibbeb069b6fcb2aa0581429ac5cb6db519548fd00
Diffstat (limited to 'include/svx')
-rw-r--r--include/svx/sdr/overlay/overlayanimatedbitmapex.hxx2
-rw-r--r--include/svx/sdr/overlay/overlaymanager.hxx2
-rw-r--r--include/svx/sdr/overlay/overlayobject.hxx4
-rw-r--r--include/svx/sdr/table/tablecontroller.hxx4
-rw-r--r--include/svx/sdrpagewindow.hxx2
-rw-r--r--include/svx/sdrpaintwindow.hxx4
-rw-r--r--include/svx/svdhdl.hxx6
-rw-r--r--include/svx/svdomedia.hxx4
-rw-r--r--include/svx/svdotable.hxx10
-rw-r--r--include/svx/svdouno.hxx4
-rw-r--r--include/svx/svdpage.hxx4
-rw-r--r--include/svx/svdview.hxx2
12 files changed, 24 insertions, 24 deletions
diff --git a/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx b/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx
index ccd768ff8816..83566f8feecb 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 9fdb9de93cf0..6710f61c5cc7 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 ee7aad6902c3..fe27964690f7 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 b366a582f845..2ad8e2284118 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 51303d21fe1d..16cce1c9bf28 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 d079da81f2e6..ba267e3026d7 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 6310077ac3fc..22a55ed40e02 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 b2a662dc78b9..f1cb4a705fb3 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 d2bfd39fd8da..c0213b30e140 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 0a796da753ba..56f177e9d0ed 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 f01675219564..4647772b85d3 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 f583301726f9..ab97b798274e 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,