summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2015-04-28 23:09:13 +0300
committerTor Lillqvist <tml@collabora.com>2015-04-30 07:27:52 +0300
commitd883c12556a71c5d3719454b1f95809a505f0ace (patch)
tree6f0c1cc518a3727db95b72d609ec9db793041b20 /sd
parentd1ca0f4ed0e30394ce6759a20d4896651dd43051 (diff)
Get rid of the initial :: for the vcl namespace
We used it all over the place without leading :: already anyway, even in many files in include. So let's be consistent. In the majority of cases, prefer the easier-on-the-eyes choice, not the "safe" one. In those files in include where *all* existing uses of ::vcl:: indeed used the :: prefix, there let's keep it for consistency. Change-Id: If99cb41d3bf290d38c601d91125c3c8d935e61d0
Diffstat (limited to 'sd')
-rw-r--r--sd/inc/Outliner.hxx2
-rw-r--r--sd/inc/drawdoc.hxx2
-rw-r--r--sd/source/core/drawdoc2.cxx2
-rw-r--r--sd/source/ui/animations/CustomAnimationPane.cxx4
-rw-r--r--sd/source/ui/animations/SlideTransitionPane.cxx4
-rw-r--r--sd/source/ui/annotations/annotationtag.hxx2
-rw-r--r--sd/source/ui/controller/slidelayoutcontroller.cxx2
-rw-r--r--sd/source/ui/dlg/assclass.cxx2
-rw-r--r--sd/source/ui/dlg/sddlgfact.cxx2
-rw-r--r--sd/source/ui/framework/factories/ChildWindowPane.cxx2
-rw-r--r--sd/source/ui/framework/factories/Pane.cxx2
-rw-r--r--sd/source/ui/framework/factories/ViewShellWrapper.cxx2
-rw-r--r--sd/source/ui/func/fupage.cxx6
-rw-r--r--sd/source/ui/inc/AccessibleOutlineView.hxx5
-rw-r--r--sd/source/ui/inc/ClientView.hxx4
-rw-r--r--sd/source/ui/inc/DrawDocShell.hxx2
-rw-r--r--sd/source/ui/inc/DrawViewShell.hxx6
-rw-r--r--sd/source/ui/inc/OutlineView.hxx8
-rw-r--r--sd/source/ui/inc/OutlineViewShell.hxx2
-rw-r--r--sd/source/ui/inc/Ruler.hxx2
-rw-r--r--sd/source/ui/inc/SlideSorter.hxx8
-rw-r--r--sd/source/ui/inc/SlideSorterViewShell.hxx6
-rw-r--r--sd/source/ui/inc/View.hxx4
-rw-r--r--sd/source/ui/inc/ViewShell.hxx8
-rw-r--r--sd/source/ui/inc/Window.hxx4
-rw-r--r--sd/source/ui/inc/createcustomanimationpanel.hxx2
-rw-r--r--sd/source/ui/inc/createslidetransitionpanel.hxx2
-rw-r--r--sd/source/ui/inc/createtabledesignpanel.hxx2
-rw-r--r--sd/source/ui/inc/drawview.hxx6
-rw-r--r--sd/source/ui/inc/fuconbez.hxx2
-rw-r--r--sd/source/ui/inc/fuolbull.hxx1
-rw-r--r--sd/source/ui/inc/fuoltext.hxx3
-rw-r--r--sd/source/ui/inc/fuoutl.hxx1
-rw-r--r--sd/source/ui/inc/fuprlout.hxx1
-rw-r--r--sd/source/ui/inc/fuprobjs.hxx1
-rw-r--r--sd/source/ui/inc/slideshow.hxx6
-rw-r--r--sd/source/ui/inc/unomodel.hxx2
-rw-r--r--sd/source/ui/sidebar/CustomAnimationPanel.cxx6
-rw-r--r--sd/source/ui/sidebar/MasterPagesSelector.cxx2
-rw-r--r--sd/source/ui/sidebar/PanelBase.hxx2
-rw-r--r--sd/source/ui/sidebar/SlideTransitionPanel.cxx6
-rw-r--r--sd/source/ui/sidebar/TableDesignPanel.cxx6
-rw-r--r--sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx4
-rw-r--r--sd/source/ui/slidesorter/controller/SlideSorterController.cxx8
-rw-r--r--sd/source/ui/slidesorter/controller/SlsClipboard.cxx16
-rw-r--r--sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx10
-rw-r--r--sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx14
-rw-r--r--sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx9
-rw-r--r--sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx2
-rw-r--r--sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx6
-rw-r--r--sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx2
-rw-r--r--sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx2
-rw-r--r--sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx2
-rw-r--r--sd/source/ui/slidesorter/inc/view/SlsTheme.hxx2
-rw-r--r--sd/source/ui/slidesorter/shell/SlideSorter.cxx24
-rw-r--r--sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx8
-rw-r--r--sd/source/ui/table/TableDesignPane.cxx6
-rw-r--r--sd/source/ui/view/ViewShellBase.cxx2
-rw-r--r--sd/source/ui/view/ViewShellManager.cxx14
-rw-r--r--sd/source/ui/view/drviewse.cxx6
-rw-r--r--sd/source/ui/view/outlnvsh.cxx6
61 files changed, 136 insertions, 151 deletions
diff --git a/sd/inc/Outliner.hxx b/sd/inc/Outliner.hxx
index c1a2b8286d08..2d5acaf454c5 100644
--- a/sd/inc/Outliner.hxx
+++ b/sd/inc/Outliner.hxx
@@ -155,7 +155,7 @@ public:
/** Starts the text conversion (hangul/hanja or Chinese simplified/traditional)
for the current viewshell */
void StartConversion( sal_Int16 nSourceLanguage, sal_Int16 nTargetLanguage,
- const ::vcl::Font *pTargetFont, sal_Int32 nOptions, bool bIsInteractive );
+ const vcl::Font *pTargetFont, sal_Int32 nOptions, bool bIsInteractive );
/** This is called internally when text conversion is started.
The position of current view mode/page/object/caret position
diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx
index 394f62f82286..c9acf89c889f 100644
--- a/sd/inc/drawdoc.hxx
+++ b/sd/inc/drawdoc.hxx
@@ -446,7 +446,7 @@ public:
static SdAnimationInfo* GetShapeUserData(SdrObject& rObject, bool bCreate = false );
SAL_DLLPRIVATE SdIMapInfo* GetIMapInfo( SdrObject* pObject ) const;
- SAL_DLLPRIVATE IMapObject* GetHitIMapObject( SdrObject* pObject, const Point& rWinPoint, const ::vcl::Window& rCmpWnd );
+ SAL_DLLPRIVATE IMapObject* GetHitIMapObject( SdrObject* pObject, const Point& rWinPoint, const vcl::Window& rCmpWnd );
SAL_DLLPRIVATE CharClass* GetCharClass() const { return mpCharClass; }
diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx
index 354942cee9a4..149378b2ba7b 100644
--- a/sd/source/core/drawdoc2.cxx
+++ b/sd/source/core/drawdoc2.cxx
@@ -965,7 +965,7 @@ SdIMapInfo* SdDrawDocument::GetIMapInfo( SdrObject* pObject ) const
IMapObject* SdDrawDocument::GetHitIMapObject( SdrObject* pObj,
const Point& rWinPoint,
- const ::vcl::Window& /* rCmpWnd */ )
+ const vcl::Window& /* rCmpWnd */ )
{
SdIMapInfo* pIMapInfo = GetIMapInfo( pObj );
IMapObject* pIMapObj = NULL;
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index 431c75b661f5..da9ba62eeb82 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -2278,9 +2278,9 @@ void CustomAnimationPane::updatePathFromMotionPathTag( const rtl::Reference< Mot
}
}
-::vcl::Window * createCustomAnimationPanel( ::vcl::Window* pParent, ViewShellBase& rBase, const css::uno::Reference<css::frame::XFrame>& rxFrame )
+vcl::Window * createCustomAnimationPanel( vcl::Window* pParent, ViewShellBase& rBase, const css::uno::Reference<css::frame::XFrame>& rxFrame )
{
- ::vcl::Window* pWindow = 0;
+ vcl::Window* pWindow = 0;
DrawDocShell* pDocSh = rBase.GetDocShell();
if( pDocSh )
diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx
index 917a53e03b77..274929e44409 100644
--- a/sd/source/ui/animations/SlideTransitionPane.cxx
+++ b/sd/source/ui/animations/SlideTransitionPane.cxx
@@ -1093,9 +1093,9 @@ IMPL_LINK_NOARG(SlideTransitionPane, LateInitCallback)
return 0;
}
-::vcl::Window * createSlideTransitionPanel( ::vcl::Window* pParent, ViewShellBase& rBase, const css::uno::Reference<css::frame::XFrame>& rxFrame )
+vcl::Window * createSlideTransitionPanel( vcl::Window* pParent, ViewShellBase& rBase, const css::uno::Reference<css::frame::XFrame>& rxFrame )
{
- ::vcl::Window* pWindow = 0;
+ vcl::Window* pWindow = 0;
DrawDocShell* pDocSh = rBase.GetDocShell();
if( pDocSh )
diff --git a/sd/source/ui/annotations/annotationtag.hxx b/sd/source/ui/annotations/annotationtag.hxx
index d53c5445f4d7..036e682ff118 100644
--- a/sd/source/ui/annotations/annotationtag.hxx
+++ b/sd/source/ui/annotations/annotationtag.hxx
@@ -82,7 +82,7 @@ private:
VclPtr<AnnotationWindow> mpAnnotationWindow;
Color maColor;
int mnIndex;
- const ::vcl::Font& mrFont;
+ const vcl::Font& mrFont;
Size maSize;
ImplSVEvent * mnClosePopupEvent;
VclPtr<vcl::Window> mpListenWindow;
diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx
index 801f7f2f2861..8d628912c285 100644
--- a/sd/source/ui/controller/slidelayoutcontroller.cxx
+++ b/sd/source/ui/controller/slidelayoutcontroller.cxx
@@ -351,7 +351,7 @@ void SAL_CALL SlideLayoutController::initialize( const css::uno::Sequence< css::
}
}
-VclPtr< ::vcl::Window> SlideLayoutController::createPopupWindow( ::vcl::Window* pParent )
+VclPtr<vcl::Window> SlideLayoutController::createPopupWindow( vcl::Window* pParent )
{
return VclPtr<sd::LayoutToolbarMenu>::Create( *this, m_xFrame, pParent, mbInsertPage );
}
diff --git a/sd/source/ui/dlg/assclass.cxx b/sd/source/ui/dlg/assclass.cxx
index 7049c5b10946..2c8a7dc3e549 100644
--- a/sd/source/ui/dlg/assclass.cxx
+++ b/sd/source/ui/dlg/assclass.cxx
@@ -34,7 +34,7 @@ Assistent::Assistent(int nNoOfPages)
mpPageStatus[i] = true;
}
-bool Assistent::InsertControl(int nDestPage, ::vcl::Window* pUsedControl)
+bool Assistent::InsertControl(int nDestPage, vcl::Window* pUsedControl)
{
DBG_ASSERT( (nDestPage > 0) && (nDestPage <= mnPages), "Page not aviable!");
diff --git a/sd/source/ui/dlg/sddlgfact.cxx b/sd/source/ui/dlg/sddlgfact.cxx
index ad902b933e38..ead579c831b8 100644
--- a/sd/source/ui/dlg/sddlgfact.cxx
+++ b/sd/source/ui/dlg/sddlgfact.cxx
@@ -279,7 +279,7 @@ bool AbstractSdInsertPasteDlg_Impl::IsInsertBefore() const
return pDlg->IsInsertBefore();
}
-::vcl::Window* AbstractSdInsertPagesObjsDlg_Impl::GetWindow()
+vcl::Window* AbstractSdInsertPagesObjsDlg_Impl::GetWindow()
{
return (vcl::Window*)pDlg;
}
diff --git a/sd/source/ui/framework/factories/ChildWindowPane.cxx b/sd/source/ui/framework/factories/ChildWindowPane.cxx
index 9f70355fb5f0..9692d6b65b1c 100644
--- a/sd/source/ui/framework/factories/ChildWindowPane.cxx
+++ b/sd/source/ui/framework/factories/ChildWindowPane.cxx
@@ -120,7 +120,7 @@ void SAL_CALL ChildWindowPane::disposing()
Pane::disposing();
}
-::vcl::Window* ChildWindowPane::GetWindow()
+vcl::Window* ChildWindowPane::GetWindow()
{
do
{
diff --git a/sd/source/ui/framework/factories/Pane.cxx b/sd/source/ui/framework/factories/Pane.cxx
index 696724e4d863..3d02f3411df8 100644
--- a/sd/source/ui/framework/factories/Pane.cxx
+++ b/sd/source/ui/framework/factories/Pane.cxx
@@ -53,7 +53,7 @@ void Pane::disposing()
mpWindow = NULL;
}
-::vcl::Window* Pane::GetWindow()
+vcl::Window* Pane::GetWindow()
{
if (mxWindow.is())
return mpWindow;
diff --git a/sd/source/ui/framework/factories/ViewShellWrapper.cxx b/sd/source/ui/framework/factories/ViewShellWrapper.cxx
index ba3361233568..68ebb2a1d536 100644
--- a/sd/source/ui/framework/factories/ViewShellWrapper.cxx
+++ b/sd/source/ui/framework/factories/ViewShellWrapper.cxx
@@ -210,7 +210,7 @@ sal_Bool SAL_CALL ViewShellWrapper::relocateToAnchor (
if (mpViewShell.get() != NULL)
{
- ::vcl::Window* pWindow = VCLUnoHelper::GetWindow(xPane->getWindow());
+ vcl::Window* pWindow = VCLUnoHelper::GetWindow(xPane->getWindow());
if (pWindow != NULL && mpViewShell->RelocateToParentWindow(pWindow))
{
bResult = true;
diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx
index a099da6dc8ed..83146e4b1a21 100644
--- a/sd/source/ui/func/fupage.cxx
+++ b/sd/source/ui/func/fupage.cxx
@@ -71,10 +71,10 @@
using namespace com::sun::star;
-namespace sd {
-
namespace vcl { class Window; }
+namespace sd {
+
// 50 cm 28350
// adapted from writer
#define MAXHEIGHT 28350
@@ -164,7 +164,7 @@ void FuPage::Deactivate()
{
}
-const SfxItemSet* FuPage::ExecuteDialog( ::vcl::Window* pParent )
+const SfxItemSet* FuPage::ExecuteDialog( vcl::Window* pParent )
{
if (!mpDrawViewShell)
return NULL;
diff --git a/sd/source/ui/inc/AccessibleOutlineView.hxx b/sd/source/ui/inc/AccessibleOutlineView.hxx
index e3d519a9ccc8..5ae89ae20f51 100644
--- a/sd/source/ui/inc/AccessibleOutlineView.hxx
+++ b/sd/source/ui/inc/AccessibleOutlineView.hxx
@@ -23,10 +23,7 @@
#include "AccessibleDocumentViewBase.hxx"
#include <svx/AccessibleTextHelper.hxx>
-namespace sd {
-class OutlineViewShell;
-namespace vcl { class Window; }
-}
+namespace sd { class OutlineViewShell; }
namespace accessibility {
diff --git a/sd/source/ui/inc/ClientView.hxx b/sd/source/ui/inc/ClientView.hxx
index 055fd8eb6802..5e9c85debf61 100644
--- a/sd/source/ui/inc/ClientView.hxx
+++ b/sd/source/ui/inc/ClientView.hxx
@@ -43,8 +43,8 @@ public:
/* if the view should not do a Invalidate() on the windows, you have to
override the following two methods and do something different */
- virtual void InvalidateOneWin(::vcl::Window& rWin) SAL_OVERRIDE;
- virtual void InvalidateOneWin(::vcl::Window& rWin, const Rectangle& rRect) SAL_OVERRIDE;
+ virtual void InvalidateOneWin(vcl::Window& rWin) SAL_OVERRIDE;
+ virtual void InvalidateOneWin(vcl::Window& rWin, const Rectangle& rRect) SAL_OVERRIDE;
};
} // end of namespace sd
diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx
index df7e337c1f1b..3d15c4d5fd85 100644
--- a/sd/source/ui/inc/DrawDocShell.hxx
+++ b/sd/source/ui/inc/DrawDocShell.hxx
@@ -102,7 +102,7 @@ public:
virtual Size GetFirstPageSize() SAL_OVERRIDE;
virtual void FillClass(SvGlobalName* pClassName, SotClipboardFormatId* pFormat, OUString* pAppName, OUString* pFullTypeName, OUString* pShortTypeName, sal_Int32 nFileFormat, bool bTemplate = false ) const SAL_OVERRIDE;
virtual void SetModified( bool = true ) SAL_OVERRIDE;
- virtual VclPtr<SfxDocumentInfoDialog> CreateDocumentInfoDialog( ::vcl::Window *pParent,
+ virtual VclPtr<SfxDocumentInfoDialog> CreateDocumentInfoDialog( vcl::Window *pParent,
const SfxItemSet &rSet ) SAL_OVERRIDE;
using SfxObjectShell::GetVisArea;
diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx
index a54937f2fabf..120fbeb5aa93 100644
--- a/sd/source/ui/inc/DrawViewShell.hxx
+++ b/sd/source/ui/inc/DrawViewShell.hxx
@@ -88,7 +88,7 @@ public:
DrawViewShell (
SfxViewFrame* pFrame,
ViewShellBase& rViewShellBase,
- ::vcl::Window* pParentWindow,
+ vcl::Window* pParentWindow,
PageKind ePageKind = PK_STANDARD,
FrameView* pFrameView = NULL);
@@ -260,7 +260,7 @@ public:
//false.
void FreshNavigatrEntry();
void FreshNavigatrTree();
- void MakeVisible(const Rectangle& rRect, ::vcl::Window& rWin);
+ void MakeVisible(const Rectangle& rRect, vcl::Window& rWin);
virtual void ReadFrameViewData(FrameView* pView) SAL_OVERRIDE;
virtual void WriteFrameViewData() SAL_OVERRIDE;
@@ -372,7 +372,7 @@ public:
/** Relocation to a new parent window is not supported for DrawViewShell
objects so this method always returns <FALSE/>.
*/
- virtual bool RelocateToParentWindow (::vcl::Window* pParentWindow) SAL_OVERRIDE;
+ virtual bool RelocateToParentWindow (vcl::Window* pParentWindow) SAL_OVERRIDE;
OUString GetSidebarContextName() const;
diff --git a/sd/source/ui/inc/OutlineView.hxx b/sd/source/ui/inc/OutlineView.hxx
index e5002ec52fe2..779b07669180 100644
--- a/sd/source/ui/inc/OutlineView.hxx
+++ b/sd/source/ui/inc/OutlineView.hxx
@@ -57,7 +57,7 @@ class OutlineView
friend class OutlineViewModelChangeGuard;
public:
OutlineView (DrawDocShell& rDocSh,
- ::vcl::Window* pWindow,
+ vcl::Window* pWindow,
OutlineViewShell& rOutlineViewSh);
virtual ~OutlineView();
@@ -80,7 +80,7 @@ public:
virtual void AddWindowToPaintView(OutputDevice* pWin) SAL_OVERRIDE;
virtual void DeleteWindowFromPaintView(OutputDevice* pWin) SAL_OVERRIDE;
- OutlinerView* GetViewByWindow(::vcl::Window* pWin) const;
+ OutlinerView* GetViewByWindow(vcl::Window* pWin) const;
SdrOutliner& GetOutliner() { return mrOutliner; }
Paragraph* GetPrevTitle(const Paragraph* pPara);
@@ -206,8 +206,8 @@ private:
/** holds a model guard during drag and drop between BeginMovingHdl and EndMovingHdl */
std::unique_ptr< OutlineViewModelChangeGuard > maDragAndDropModelGuard;
- ::vcl::Font maPageNumberFont;
- ::vcl::Font maBulletFont;
+ vcl::Font maPageNumberFont;
+ vcl::Font maBulletFont;
SvxLRSpaceItem maLRSpaceItem;
Image maSlideImage;
diff --git a/sd/source/ui/inc/OutlineViewShell.hxx b/sd/source/ui/inc/OutlineViewShell.hxx
index 9bf1d45c1b2a..3a25cc58ff1b 100644
--- a/sd/source/ui/inc/OutlineViewShell.hxx
+++ b/sd/source/ui/inc/OutlineViewShell.hxx
@@ -56,7 +56,7 @@ public:
OutlineViewShell (
SfxViewFrame* pFrame,
ViewShellBase& rViewShellBase,
- ::vcl::Window* pParentWindow,
+ vcl::Window* pParentWindow,
FrameView* pFrameView = NULL);
virtual ~OutlineViewShell();
diff --git a/sd/source/ui/inc/Ruler.hxx b/sd/source/ui/inc/Ruler.hxx
index 03f4da28376d..3136604cf9c5 100644
--- a/sd/source/ui/inc/Ruler.hxx
+++ b/sd/source/ui/inc/Ruler.hxx
@@ -35,7 +35,7 @@ class Ruler
public:
Ruler (
DrawViewShell& rViewSh,
- ::vcl::Window* pParent,
+ vcl::Window* pParent,
::sd::Window* pWin,
SvxRulerSupportFlags nRulerFlags,
SfxBindings& rBindings,
diff --git a/sd/source/ui/inc/SlideSorter.hxx b/sd/source/ui/inc/SlideSorter.hxx
index 940ec902a27d..42dc811b68c4 100644
--- a/sd/source/ui/inc/SlideSorter.hxx
+++ b/sd/source/ui/inc/SlideSorter.hxx
@@ -115,7 +115,7 @@ public:
static ::boost::shared_ptr<SlideSorter> CreateSlideSorter (
ViewShellBase& rBase,
ViewShell* pViewShell,
- ::vcl::Window& rParentWindow);
+ vcl::Window& rParentWindow);
/** Return the control of the vertical scroll bar.
*/
@@ -168,7 +168,7 @@ public:
const Point& rOffset,
const Size& rSize);
- bool RelocateToWindow (::vcl::Window* pWindow);
+ bool RelocateToWindow (vcl::Window* pWindow);
/** Set the current function at the view shell or, when it is not
present, set it at the content window. This method supports the use
@@ -246,7 +246,7 @@ private:
SlideSorter (
ViewShellBase& rBase,
ViewShell* pViewShell,
- ::vcl::Window& rParentWindow);
+ vcl::Window& rParentWindow);
void Init();
/** Create the controls for the slide sorter. This are the tab bar
@@ -255,7 +255,7 @@ private:
This method is usually called exactly one time from the
constructor.
*/
- void SetupControls (::vcl::Window* pParentWindow);
+ void SetupControls (vcl::Window* pParentWindow);
/** This method is usually called exactly one time from the
constructor.
diff --git a/sd/source/ui/inc/SlideSorterViewShell.hxx b/sd/source/ui/inc/SlideSorterViewShell.hxx
index 292993522034..dd382c39a414 100644
--- a/sd/source/ui/inc/SlideSorterViewShell.hxx
+++ b/sd/source/ui/inc/SlideSorterViewShell.hxx
@@ -52,7 +52,7 @@ public:
static ::boost::shared_ptr<SlideSorterViewShell> Create(
SfxViewFrame* pFrame,
ViewShellBase& rViewShellBase,
- ::vcl::Window* pParentWindow,
+ vcl::Window* pParentWindow,
FrameView* pFrameView,
const bool bIsCenterPane);
@@ -119,7 +119,7 @@ public:
void StartDrag (
const Point& rDragPt,
- ::vcl::Window* pWindow );
+ vcl::Window* pWindow );
virtual sal_Int8 AcceptDrop (
const AcceptDropEvent& rEvt,
DropTargetHelper& rTargetHelper,
@@ -178,7 +178,7 @@ public:
/** Try to relocate all toplevel window elements to the given parent
window.
*/
- virtual bool RelocateToParentWindow (::vcl::Window* pParentWindow) SAL_OVERRIDE;
+ virtual bool RelocateToParentWindow (vcl::Window* pParentWindow) SAL_OVERRIDE;
protected:
diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx
index f0e3c436df09..79207b406159 100644
--- a/sd/source/ui/inc/View.hxx
+++ b/sd/source/ui/inc/View.hxx
@@ -93,7 +93,7 @@ public:
ViewShell* pViewSh=NULL);
virtual ~View();
- void CompleteRedraw( OutputDevice* pOutDev, const ::vcl::Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0L) SAL_OVERRIDE;
+ void CompleteRedraw( OutputDevice* pOutDev, const vcl::Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0L) SAL_OVERRIDE;
virtual bool GetAttributes( SfxItemSet& rTargetSet, bool bOnlyHardAttr = false ) const;
virtual bool SetAttributes(const SfxItemSet& rSet, bool bReplaceAll = false);
@@ -137,7 +137,7 @@ public:
inline SdDrawDocument& GetDoc() const;
inline ViewShell* GetViewShell() const { return mpViewSh; }
- virtual bool SdrBeginTextEdit(SdrObject* pObj, SdrPageView* pPV = 0L, ::vcl::Window* pWin = 0L, bool bIsNewObj = false,
+ virtual bool SdrBeginTextEdit(SdrObject* pObj, SdrPageView* pPV = 0L, vcl::Window* pWin = 0L, bool bIsNewObj = false,
SdrOutliner* pGivenOutliner = 0L, OutlinerView* pGivenOutlinerView = 0L,
bool bDontDeleteOutliner = false, bool bOnlyOneView = false, bool bGrabFocus = true) SAL_OVERRIDE;
diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx
index 8bc7c6b2ea92..5019f3cca85e 100644
--- a/sd/source/ui/inc/ViewShell.hxx
+++ b/sd/source/ui/inc/ViewShell.hxx
@@ -115,7 +115,7 @@ public:
ViewShell (
SfxViewFrame *pFrame,
- ::vcl::Window* pParentWindow,
+ vcl::Window* pParentWindow,
ViewShellBase& rViewShellBase,
bool bAllowCenter = true);
virtual ~ViewShell();
@@ -145,7 +145,7 @@ public:
/** Return the window that is the parent of all controls of this view
shell. This may or may not be the window of the frame.
*/
- inline ::vcl::Window* GetParentWindow() const { return mpParentWindow; }
+ inline vcl::Window* GetParentWindow() const { return mpParentWindow; }
inline ::sd::View* GetView() const { return mpView; }
inline SdrView* GetDrawView() const;
@@ -418,7 +418,7 @@ public:
all views, so the return value tells the caller if the relocation
was successful.
*/
- virtual bool RelocateToParentWindow (::vcl::Window* pParentWindow);
+ virtual bool RelocateToParentWindow (vcl::Window* pParentWindow);
/** Depending on the given request create a new page or duplicate an
existing one. A new page is created behind the given slide.
@@ -568,7 +568,7 @@ protected:
void doShow();
private:
- VclPtr< ::vcl::Window> mpParentWindow;
+ VclPtr<vcl::Window> mpParentWindow;
/** This window updater is used to keep all relevant windows up to date
with reference to the digit language used to display digits in text
shapes.
diff --git a/sd/source/ui/inc/Window.hxx b/sd/source/ui/inc/Window.hxx
index 14d8aafb5b03..b26917e89d7c 100644
--- a/sd/source/ui/inc/Window.hxx
+++ b/sd/source/ui/inc/Window.hxx
@@ -40,7 +40,7 @@ class ViewShell;
be an integer percent value.
*/
class Window
- : public ::vcl::Window,
+ : public vcl::Window,
public ::DropTargetHelper
{
public:
@@ -172,7 +172,7 @@ protected:
virtual void Resize() SAL_OVERRIDE;
virtual void PrePaint() SAL_OVERRIDE;
- virtual void Paint(::vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE;
+ virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE;
virtual void MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE;
virtual void MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE;
virtual void MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE;
diff --git a/sd/source/ui/inc/createcustomanimationpanel.hxx b/sd/source/ui/inc/createcustomanimationpanel.hxx
index 12c98d7337ca..e397ec6b8d32 100644
--- a/sd/source/ui/inc/createcustomanimationpanel.hxx
+++ b/sd/source/ui/inc/createcustomanimationpanel.hxx
@@ -24,7 +24,7 @@
namespace sd {
-::vcl::Window * createCustomAnimationPanel (vcl::Window* pParent, ViewShellBase& rBase, const css::uno::Reference<css::frame::XFrame>& rxFrame);
+vcl::Window * createCustomAnimationPanel (vcl::Window* pParent, ViewShellBase& rBase, const css::uno::Reference<css::frame::XFrame>& rxFrame);
}
diff --git a/sd/source/ui/inc/createslidetransitionpanel.hxx b/sd/source/ui/inc/createslidetransitionpanel.hxx
index 6c159f9a5a38..f6431aeecefd 100644
--- a/sd/source/ui/inc/createslidetransitionpanel.hxx
+++ b/sd/source/ui/inc/createslidetransitionpanel.hxx
@@ -24,7 +24,7 @@
namespace sd {
-::vcl::Window* createSlideTransitionPanel (::vcl::Window* pParent, ViewShellBase& rBase, const css::uno::Reference<css::frame::XFrame>& rxFrame);
+vcl::Window* createSlideTransitionPanel (vcl::Window* pParent, ViewShellBase& rBase, const css::uno::Reference<css::frame::XFrame>& rxFrame);
}
diff --git a/sd/source/ui/inc/createtabledesignpanel.hxx b/sd/source/ui/inc/createtabledesignpanel.hxx
index 7f5394767b0e..880966846e90 100644
--- a/sd/source/ui/inc/createtabledesignpanel.hxx
+++ b/sd/source/ui/inc/createtabledesignpanel.hxx
@@ -25,7 +25,7 @@
namespace sd {
-VclPtr< ::vcl::Window> createTableDesignPanel (::vcl::Window* pParent, ViewShellBase& rBase);
+VclPtr<vcl::Window> createTableDesignPanel (vcl::Window* pParent, ViewShellBase& rBase);
}
diff --git a/sd/source/ui/inc/drawview.hxx b/sd/source/ui/inc/drawview.hxx
index d9fc8b5b7ec1..7f6553f171ad 100644
--- a/sd/source/ui/inc/drawview.hxx
+++ b/sd/source/ui/inc/drawview.hxx
@@ -42,7 +42,7 @@ public:
virtual ~DrawView();
virtual void MarkListHasChanged() SAL_OVERRIDE;
- void CompleteRedraw(OutputDevice* pOutDev, const ::vcl::Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0L) SAL_OVERRIDE;
+ void CompleteRedraw(OutputDevice* pOutDev, const vcl::Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0L) SAL_OVERRIDE;
virtual bool SetAttributes(const SfxItemSet& rSet, bool bReplaceAll = false) SAL_OVERRIDE;
@@ -53,10 +53,10 @@ public:
bool SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr = false) SAL_OVERRIDE;
virtual bool IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const SAL_OVERRIDE;
- virtual void MakeVisible(const Rectangle& rRect, ::vcl::Window& rWin) SAL_OVERRIDE;
+ virtual void MakeVisible(const Rectangle& rRect, vcl::Window& rWin) SAL_OVERRIDE;
virtual void HideSdrPage() SAL_OVERRIDE; // SdrPageView* pPV);
- void PresPaint(const ::vcl::Region& rRegion);
+ void PresPaint(const vcl::Region& rRegion);
virtual void DeleteMarked() SAL_OVERRIDE; // from SdrView
protected:
diff --git a/sd/source/ui/inc/fuconbez.hxx b/sd/source/ui/inc/fuconbez.hxx
index 149fef5b48f8..8889f7e5c1ab 100644
--- a/sd/source/ui/inc/fuconbez.hxx
+++ b/sd/source/ui/inc/fuconbez.hxx
@@ -27,8 +27,6 @@ class SdDrawDocument;
namespace sd {
-namespace vcl { class Window; }
-
class FuConstructBezierPolygon
: public FuConstruct
{
diff --git a/sd/source/ui/inc/fuolbull.hxx b/sd/source/ui/inc/fuolbull.hxx
index 3c952c167fc1..8ffbb194632d 100644
--- a/sd/source/ui/inc/fuolbull.hxx
+++ b/sd/source/ui/inc/fuolbull.hxx
@@ -31,7 +31,6 @@ namespace sd {
class View;
class ViewShell;
-namespace vcl { class Window; }
/**
* bullet functions in outline mode
diff --git a/sd/source/ui/inc/fuoltext.hxx b/sd/source/ui/inc/fuoltext.hxx
index 1f99701901d0..9f8e137fb748 100644
--- a/sd/source/ui/inc/fuoltext.hxx
+++ b/sd/source/ui/inc/fuoltext.hxx
@@ -25,11 +25,12 @@
class SdDrawDocument;
class SfxRequest;
+namespace vcl { class Window; }
+
namespace sd {
class View;
class ViewShell;
-namespace vcl { class Window; }
/**
* text functions in outline mode
diff --git a/sd/source/ui/inc/fuoutl.hxx b/sd/source/ui/inc/fuoutl.hxx
index 7d1339919adb..4fce58046b16 100644
--- a/sd/source/ui/inc/fuoutl.hxx
+++ b/sd/source/ui/inc/fuoutl.hxx
@@ -31,7 +31,6 @@ class OutlineView;
class OutlineViewShell;
class View;
class ViewShell;
-namespace vcl { class Window; }
/**
* Base class of functions of outline mode
diff --git a/sd/source/ui/inc/fuprlout.hxx b/sd/source/ui/inc/fuprlout.hxx
index a7debedadbb7..25aa75ab3ae6 100644
--- a/sd/source/ui/inc/fuprlout.hxx
+++ b/sd/source/ui/inc/fuprlout.hxx
@@ -29,7 +29,6 @@ namespace sd {
class View;
class ViewShell;
-namespace vcl { class Window; }
class FuPresentationLayout
: public FuPoor
diff --git a/sd/source/ui/inc/fuprobjs.hxx b/sd/source/ui/inc/fuprobjs.hxx
index 905542f8151c..78bc0a069c58 100644
--- a/sd/source/ui/inc/fuprobjs.hxx
+++ b/sd/source/ui/inc/fuprobjs.hxx
@@ -29,7 +29,6 @@ namespace sd {
class View;
class ViewShell;
-namespace vcl { class Window; }
class FuPresentationObjects
: public FuPoor
diff --git a/sd/source/ui/inc/slideshow.hxx b/sd/source/ui/inc/slideshow.hxx
index af0b1ef22f9c..b8c1178a7ac2 100644
--- a/sd/source/ui/inc/slideshow.hxx
+++ b/sd/source/ui/inc/slideshow.hxx
@@ -96,7 +96,7 @@ public:
static bool StartPreview( ViewShellBase& rBase,
const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xDrawPage,
const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xAnimationNode,
- ::vcl::Window* pParent = 0 );
+ vcl::Window* pParent = 0 );
static void Stop( ViewShellBase& rBase );
@@ -112,7 +112,7 @@ public:
bool startPreview(
const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xDrawPage,
const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xAnimationNode,
- ::vcl::Window* pParent = 0 );
+ vcl::Window* pParent = 0 );
// uno api
@@ -198,7 +198,7 @@ private:
void ThrowIfDisposed() const throw (css::uno::RuntimeException);
- void CreateController( ViewShell* pViewSh, ::sd::View* pView, ::vcl::Window* pParentWindow );
+ void CreateController( ViewShell* pViewSh, ::sd::View* pView, vcl::Window* pParentWindow );
WorkWindow *GetWorkWindow();
SlideShow(const SlideShow&) SAL_DELETED_FUNCTION;
diff --git a/sd/source/ui/inc/unomodel.hxx b/sd/source/ui/inc/unomodel.hxx
index b9c17ac4ba4e..43444b83c1b9 100644
--- a/sd/source/ui/inc/unomodel.hxx
+++ b/sd/source/ui/inc/unomodel.hxx
@@ -81,7 +81,7 @@ class SD_DLLPUBLIC SdXImpressDocument : public SfxBaseModel, // implements SfxLi
public ::com::sun::star::ucb::XAnyCompareFactory,
public ::com::sun::star::presentation::XHandoutMasterSupplier,
public ::com::sun::star::view::XRenderable,
- public ::vcl::ITiledRenderable
+ public vcl::ITiledRenderable
{
friend class SdDrawPagesAccess;
friend class SdMasterPagesAccess;
diff --git a/sd/source/ui/sidebar/CustomAnimationPanel.cxx b/sd/source/ui/sidebar/CustomAnimationPanel.cxx
index 7f0f2d5c4d69..9b755bd68201 100644
--- a/sd/source/ui/sidebar/CustomAnimationPanel.cxx
+++ b/sd/source/ui/sidebar/CustomAnimationPanel.cxx
@@ -25,7 +25,7 @@
namespace sd { namespace sidebar {
CustomAnimationPanel::CustomAnimationPanel (
- ::vcl::Window* pParentWindow,
+ vcl::Window* pParentWindow,
ViewShellBase& rViewShellBase,
const css::uno::Reference<css::frame::XFrame>& rxFrame
)
@@ -43,8 +43,8 @@ CustomAnimationPanel::~CustomAnimationPanel()
{
}
-::vcl::Window* CustomAnimationPanel::CreateWrappedControl (
- ::vcl::Window* pParentWindow,
+vcl::Window* CustomAnimationPanel::CreateWrappedControl (
+ vcl::Window* pParentWindow,
ViewShellBase& rViewShellBase)
{
return createCustomAnimationPanel(pParentWindow, rViewShellBase, mxFrame);
diff --git a/sd/source/ui/sidebar/MasterPagesSelector.cxx b/sd/source/ui/sidebar/MasterPagesSelector.cxx
index f17c15aecaee..4f5f284860c0 100644
--- a/sd/source/ui/sidebar/MasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/MasterPagesSelector.cxx
@@ -65,7 +65,7 @@ using namespace ::com::sun::star::text;
namespace sd { namespace sidebar {
MasterPagesSelector::MasterPagesSelector (
- ::vcl::Window* pParent,
+ vcl::Window* pParent,
SdDrawDocument& rDocument,
ViewShellBase& rBase,
const ::boost::shared_ptr<MasterPageContainer>& rpContainer,
diff --git a/sd/source/ui/sidebar/PanelBase.hxx b/sd/source/ui/sidebar/PanelBase.hxx
index b0f4fb0cfb5e..a9971fc5d9f6 100644
--- a/sd/source/ui/sidebar/PanelBase.hxx
+++ b/sd/source/ui/sidebar/PanelBase.hxx
@@ -59,7 +59,7 @@ public:
virtual void SetSidebar (const css::uno::Reference<css::ui::XSidebar>& rxSidebar) SAL_OVERRIDE;
protected:
- VclPtr< vcl::Window> mpWrappedControl;
+ VclPtr<vcl::Window> mpWrappedControl;
virtual vcl::Window* CreateWrappedControl (
vcl::Window* pParentWindow,
ViewShellBase& rViewShellBase) = 0;
diff --git a/sd/source/ui/sidebar/SlideTransitionPanel.cxx b/sd/source/ui/sidebar/SlideTransitionPanel.cxx
index 2d58b94ac6dc..afd6ccb8f692 100644
--- a/sd/source/ui/sidebar/SlideTransitionPanel.cxx
+++ b/sd/source/ui/sidebar/SlideTransitionPanel.cxx
@@ -25,7 +25,7 @@
namespace sd { namespace sidebar {
SlideTransitionPanel::SlideTransitionPanel (
- ::vcl::Window* pParentWindow,
+ vcl::Window* pParentWindow,
ViewShellBase& rViewShellBase,
const css::uno::Reference<css::frame::XFrame>& rxFrame
)
@@ -41,8 +41,8 @@ SlideTransitionPanel::~SlideTransitionPanel()
{
}
-::vcl::Window* SlideTransitionPanel::CreateWrappedControl (
- ::vcl::Window* pParentWindow,
+vcl::Window* SlideTransitionPanel::CreateWrappedControl (
+ vcl::Window* pParentWindow,
ViewShellBase& rViewShellBase)
{
return createSlideTransitionPanel(pParentWindow, rViewShellBase, mxFrame);
diff --git a/sd/source/ui/sidebar/TableDesignPanel.cxx b/sd/source/ui/sidebar/TableDesignPanel.cxx
index 30d31ebcac5b..d427d5743811 100644
--- a/sd/source/ui/sidebar/TableDesignPanel.cxx
+++ b/sd/source/ui/sidebar/TableDesignPanel.cxx
@@ -25,7 +25,7 @@
namespace sd { namespace sidebar {
TableDesignPanel::TableDesignPanel (
- ::vcl::Window* pParentWindow,
+ vcl::Window* pParentWindow,
ViewShellBase& rViewShellBase)
: PanelBase(pParentWindow, rViewShellBase)
{
@@ -38,8 +38,8 @@ TableDesignPanel::~TableDesignPanel()
{
}
-::vcl::Window* TableDesignPanel::CreateWrappedControl (
- ::vcl::Window* pParentWindow,
+vcl::Window* TableDesignPanel::CreateWrappedControl (
+ vcl::Window* pParentWindow,
ViewShellBase& rViewShellBase)
{
return createTableDesignPanel(pParentWindow, rViewShellBase);
diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx b/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx
index c124dc7923d2..d1e222214d4d 100644
--- a/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx
@@ -163,7 +163,7 @@ public:
::boost::shared_ptr<BitmapReplacement> PngCompression::Compress (const Bitmap& rBitmap) const
{
- ::vcl::PNGWriter aWriter (rBitmap);
+ vcl::PNGWriter aWriter (rBitmap);
SvMemoryStream aStream (32768, 32768);
aWriter.Write(aStream);
@@ -184,7 +184,7 @@ Bitmap PngCompression::Decompress (
if (pData != NULL)
{
SvMemoryStream aStream (pData->mpData, pData->mnDataSize, StreamMode::READ);
- ::vcl::PNGReader aReader (aStream);
+ vcl::PNGReader aReader (aStream);
aResult = aReader.Read().GetBitmap();
}
diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
index fcb7f44ecd7f..d17c08ad80dd 100644
--- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
+++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
@@ -123,7 +123,7 @@ SlideSorterController::SlideSorterController (SlideSorter& rSlideSorter)
if (pWindow)
{
// The whole background is painted by the view and controls.
- ::vcl::Window* pParentWindow = pWindow->GetParent();
+ vcl::Window* pParentWindow = pWindow->GetParent();
OSL_ASSERT(pParentWindow!=NULL);
pParentWindow->SetBackground (Wallpaper());
@@ -265,7 +265,7 @@ ScrollBarManager& SlideSorterController::GetScrollBarManager()
void SlideSorterController::Paint (
const Rectangle& rBBox,
- ::vcl::Window* pWindow)
+ vcl::Window* pWindow)
{
if (mnPaintEntranceCount == 0)
{
@@ -273,7 +273,7 @@ void SlideSorterController::Paint (
try
{
- mrView.CompleteRedraw(pWindow, ::vcl::Region(rBBox), 0);
+ mrView.CompleteRedraw(pWindow, vcl::Region(rBBox), 0);
}
catch (const Exception&)
{
@@ -540,7 +540,7 @@ IMPL_LINK(SlideSorterController, WindowEventHandler, VclWindowEvent*, pEvent)
{
if (pEvent != NULL)
{
- ::vcl::Window* pWindow = pEvent->GetWindow();
+ vcl::Window* pWindow = pEvent->GetWindow();
sd::Window *pActiveWindow (mrSlideSorter.GetContentWindow());
switch (pEvent->GetId())
{
diff --git a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
index 9d6bdb8d0feb..7dfc356a77b1 100644
--- a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
@@ -217,7 +217,7 @@ void Clipboard::HandleSlotCall (SfxRequest& rRequest)
}
}
-void Clipboard::DoCut (::vcl::Window* pWindow)
+void Clipboard::DoCut (vcl::Window* pWindow)
{
if (mrSlideSorter.GetModel().GetPageCount() > 1)
{
@@ -226,7 +226,7 @@ void Clipboard::DoCut (::vcl::Window* pWindow)
}
}
-void Clipboard::DoDelete (::vcl::Window* )
+void Clipboard::DoDelete (vcl::Window* )
{
if (mrSlideSorter.GetModel().GetPageCount() > 1)
{
@@ -234,12 +234,12 @@ void Clipboard::DoDelete (::vcl::Window* )
}
}
-void Clipboard::DoCopy (::vcl::Window* pWindow )
+void Clipboard::DoCopy (vcl::Window* pWindow )
{
CreateSlideTransferable( pWindow, false );
}
-void Clipboard::DoPaste (::vcl::Window* pWindow)
+void Clipboard::DoPaste (vcl::Window* pWindow)
{
SdTransferable* pClipTransferable = SD_MOD()->pTransferClip;
@@ -259,7 +259,7 @@ void Clipboard::DoPaste (::vcl::Window* pWindow)
}
}
-sal_Int32 Clipboard::GetInsertionPosition (::vcl::Window* pWindow)
+sal_Int32 Clipboard::GetInsertionPosition (vcl::Window* pWindow)
{
sal_Int32 nInsertPosition = -1;
@@ -377,7 +377,7 @@ void Clipboard::SelectPageRange (sal_Int32 nFirstIndex, sal_Int32 nPageCount)
}
void Clipboard::CreateSlideTransferable (
- ::vcl::Window* pWindow,
+ vcl::Window* pWindow,
bool bDrag)
{
std::vector<OUString> aBookmarkList;
@@ -442,7 +442,7 @@ void Clipboard::CreateSlideTransferable (
aObjDesc.maDisplayName = pDocument->GetDocSh()
->GetMedium()->GetURLObject().GetURLNoPass();
- ::vcl::Window* pActionWindow = pWindow;
+ vcl::Window* pActionWindow = pWindow;
if (pActionWindow == NULL)
{
ViewShell* pViewShell = mrSlideSorter.GetViewShell();
@@ -556,7 +556,7 @@ void Clipboard::CreateSlideTransferable (
void Clipboard::StartDrag (
const Point& rPosition,
- ::vcl::Window* pWindow)
+ vcl::Window* pWindow)
{
maPagesToRemove.clear();
maPagesToSelect.clear();
diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
index 1483befc1217..efadfa322174 100644
--- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
@@ -290,12 +290,12 @@ public:
#else
SelectionFunction& rSelectionFunction,
const Point& rMousePosition,
- ::vcl::Window* pWindow);
+ vcl::Window* pWindow);
#endif
virtual ~DragAndDropModeHandler();
#ifndef MACOSX
- void Initialize(const Point& rMousePosition, ::vcl::Window* pWindow);
+ void Initialize(const Point& rMousePosition, vcl::Window* pWindow);
#endif
virtual SelectionFunction::Mode GetMode() const SAL_OVERRIDE;
@@ -389,7 +389,7 @@ bool SelectionFunction::KeyInput (const KeyEvent& rEvent)
FocusManager& rFocusManager (mrController.GetFocusManager());
bool bResult = false;
- const ::vcl::KeyCode& rCode (rEvent.GetKeyCode());
+ const vcl::KeyCode& rCode (rEvent.GetKeyCode());
switch (rCode.GetCode())
{
case KEY_RETURN:
@@ -1507,14 +1507,14 @@ DragAndDropModeHandler::DragAndDropModeHandler (
#else
SelectionFunction& rSelectionFunction,
const Point& rMousePosition,
- ::vcl::Window* pWindow)
+ vcl::Window* pWindow)
#endif
: ModeHandler(rSlideSorter, rSelectionFunction, false)
{
#ifndef MACOSX
}
-void DragAndDropModeHandler::Initialize(const Point& rMousePosition, ::vcl::Window* pWindow)
+void DragAndDropModeHandler::Initialize(const Point& rMousePosition, vcl::Window* pWindow)
{
#endif
SdTransferable* pDragTransferable = SD_MOD()->pTransferDrag;
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx b/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx
index e4ffd2ff006d..76bc0ec9ace4 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx
@@ -70,14 +70,14 @@ public:
void HandleSlotCall (SfxRequest& rRequest);
- void DoCut (::vcl::Window* pWindow = 0);
- void DoCopy (::vcl::Window* pWindow = 0);
- void DoPaste (::vcl::Window* pWindow = 0);
- void DoDelete (::vcl::Window* pWindow = 0);
+ void DoCut (vcl::Window* pWindow = 0);
+ void DoCopy (vcl::Window* pWindow = 0);
+ void DoPaste (vcl::Window* pWindow = 0);
+ void DoDelete (vcl::Window* pWindow = 0);
void StartDrag (
const Point& rDragPt,
- ::vcl::Window* pWindow );
+ vcl::Window* pWindow );
void DragFinished (
sal_Int8 nDropAction);
@@ -139,7 +139,7 @@ private:
ImplSVEvent * mnDragFinishedUserEventId;
void CreateSlideTransferable (
- ::vcl::Window* pWindow,
+ vcl::Window* pWindow,
bool bDrag);
/** Determine the position of where to insert the pages in the current
@@ -151,7 +151,7 @@ private:
The index in the range [0,n] (both inclusive) with n the number
of pages is returned.
*/
- sal_Int32 GetInsertionPosition (::vcl::Window* pWindow);
+ sal_Int32 GetInsertionPosition (vcl::Window* pWindow);
/** Paste the pages of the transferable of the sd module at the given
position.
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx
index d62acead1377..58899c8627d5 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx
@@ -29,15 +29,8 @@
class ScrollBar;
class ScrollBarBox;
-namespace vcl { class Window; }
-namespace sd {
-namespace vcl { class Window; }
-}
-
-namespace sd { namespace slidesorter {
- class SlideSorter;
-} }
+namespace sd { namespace slidesorter { class SlideSorter; } }
namespace sd { namespace slidesorter { namespace controller {
diff --git a/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx b/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx
index c963b76a08a0..c2f20cf781a4 100644
--- a/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx
+++ b/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx
@@ -198,7 +198,7 @@ public:
The returned region has to be repainted to reflect the updated
selection states.
*/
- ::vcl::Region RestoreSelection();
+ vcl::Region RestoreSelection();
/** Typically called from controller::Listener this method handles the
insertion and deletion of single pages.
diff --git a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
index 38b5d4ac08c4..3d7a2bd4e60d 100644
--- a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
@@ -88,7 +88,7 @@ public:
void RequestRepaint();
void RequestRepaint (const model::SharedPageDescriptor& rDescriptor);
void RequestRepaint (const Rectangle& rRepaintBox);
- void RequestRepaint (const ::vcl::Region& rRepaintRegion);
+ void RequestRepaint (const vcl::Region& rRepaintRegion);
Rectangle GetModelArea();
@@ -129,7 +129,7 @@ public:
void Resize();
virtual void CompleteRedraw (
OutputDevice* pDevice,
- const ::vcl::Region& rPaintArea,
+ const vcl::Region& rPaintArea,
sdr::contact::ViewObjectContactRedirector* pRedirector = NULL) SAL_OVERRIDE;
void Paint (OutputDevice& rDevice, const Rectangle& rRepaintArea);
@@ -255,7 +255,7 @@ private:
sal_Int32 mnButtonUnderMouse;
::boost::shared_ptr<PageObjectPainter> mpPageObjectPainter;
::boost::shared_ptr<SelectionPainter> mpSelectionPainter;
- ::vcl::Region maRedrawRegion;
+ vcl::Region maRedrawRegion;
SharedILayerPainter mpBackgroundPainter;
::boost::scoped_ptr<ToolTip> mpToolTip;
bool mbIsRearrangePending;
diff --git a/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx b/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx
index 6f51d058ea84..d4b781736392 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx
@@ -36,7 +36,7 @@ class FontProvider
: public SdGlobalResource
{
public:
- typedef boost::shared_ptr< ::vcl::Font> SharedFontPointer;
+ typedef boost::shared_ptr<vcl::Font> SharedFontPointer;
/** Return the single instance of this class. Throws a RuntimeException
when no instance can be created.
diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx b/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx
index a6bb3345b532..97a4db1329d5 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx
@@ -135,7 +135,7 @@ private:
Rectangle maCustomAnimationEffectBoundingBox;
const Image maTransitionEffectIcon;
const Image maCustomAnimationEffectIcon;
- const boost::shared_ptr< ::vcl::Font> mpPageNumberFont;
+ const boost::shared_ptr<vcl::Font> mpPageNumberFont;
Size GetPageNumberAreaSize (const int nPageCount);
Rectangle CalculatePreviewBoundingBox (
diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx b/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx
index 4058c063dddb..ecda1a7bb951 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx
@@ -73,7 +73,7 @@ private:
::boost::shared_ptr<cache::PageCache> mpCache;
::boost::shared_ptr<controller::Properties> mpProperties;
::boost::shared_ptr<view::Theme> mpTheme;
- ::boost::shared_ptr< ::vcl::Font> mpPageNumberFont;
+ ::boost::shared_ptr<vcl::Font> mpPageNumberFont;
::boost::scoped_ptr<FramePainter> mpShadowPainter;
::boost::scoped_ptr<FramePainter> mpFocusBorderPainter;
Bitmap maNormalBackground;
diff --git a/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx b/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx
index 568086a58b88..808b515de22c 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx
@@ -58,7 +58,7 @@ public:
Font_PageNumber,
Font_PageCount
};
- static boost::shared_ptr< ::vcl::Font> GetFont (
+ static boost::shared_ptr<vcl::Font> GetFont (
const FontType eType,
const OutputDevice& rDevice);
diff --git a/sd/source/ui/slidesorter/shell/SlideSorter.cxx b/sd/source/ui/slidesorter/shell/SlideSorter.cxx
index 3a5320fd4c54..a97135c718a2 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorter.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorter.cxx
@@ -50,10 +50,10 @@ namespace {
class ContentWindow : public ::sd::Window
{
public:
- ContentWindow(::vcl::Window& rParent, SlideSorter& rSlideSorter);
+ ContentWindow(vcl::Window& rParent, SlideSorter& rSlideSorter);
virtual ~ContentWindow();
void SetCurrentFunction (const rtl::Reference<FuPoor>& rpFunction);
- virtual void Paint(::vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect) SAL_OVERRIDE;
+ virtual void Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect) SAL_OVERRIDE;
virtual void KeyInput (const KeyEvent& rEvent) SAL_OVERRIDE;
virtual void MouseMove (const MouseEvent& rEvent) SAL_OVERRIDE;
virtual void MouseButtonUp (const MouseEvent& rEvent) SAL_OVERRIDE;
@@ -90,7 +90,7 @@ private:
::boost::shared_ptr<SlideSorter> SlideSorter::CreateSlideSorter (
ViewShellBase& rBase,
ViewShell* pViewShell,
- ::vcl::Window& rParentWindow)
+ vcl::Window& rParentWindow)
{
::boost::shared_ptr<SlideSorter> pSlideSorter(
new SlideSorter(
@@ -128,7 +128,7 @@ SlideSorter::SlideSorter (
SlideSorter::SlideSorter (
ViewShellBase& rBase,
ViewShell* pViewShell,
- ::vcl::Window& rParentWindow)
+ vcl::Window& rParentWindow)
: mbIsValid(false),
mpSlideSorterController(),
mpSlideSorterModel(),
@@ -173,7 +173,7 @@ void SlideSorter::Init()
sd::Window *pContentWindow (GetContentWindow());
if (pContentWindow)
{
- ::vcl::Window* pParentWindow = pContentWindow->GetParent();
+ vcl::Window* pParentWindow = pContentWindow->GetParent();
if (pParentWindow != NULL)
pParentWindow->SetBackground(Wallpaper());
pContentWindow->SetBackground(Wallpaper());
@@ -244,7 +244,7 @@ void SlideSorter::Paint (const Rectangle& rRepaintArea)
GetContentWindow());
}
-void SlideSorter::SetupControls (::vcl::Window* )
+void SlideSorter::SetupControls (vcl::Window* )
{
GetVerticalScrollBar()->Show();
}
@@ -254,7 +254,7 @@ void SlideSorter::SetupListeners()
sd::Window *pWindow (GetContentWindow());
if (pWindow)
{
- ::vcl::Window* pParentWindow = pWindow->GetParent();
+ vcl::Window* pParentWindow = pWindow->GetParent();
if (pParentWindow != NULL)
pParentWindow->AddEventListener(
LINK(
@@ -288,7 +288,7 @@ void SlideSorter::ReleaseListeners()
controller::SlideSorterController,
WindowEventHandler));
- ::vcl::Window* pParentWindow = pWindow->GetParent();
+ vcl::Window* pParentWindow = pWindow->GetParent();
if (pParentWindow != NULL)
pParentWindow->RemoveEventListener(
LINK(mpSlideSorterController.get(),
@@ -371,14 +371,14 @@ void SlideSorter::ArrangeGUIElements (
}
}
-bool SlideSorter::RelocateToWindow (::vcl::Window* pParentWindow)
+bool SlideSorter::RelocateToWindow (vcl::Window* pParentWindow)
{
// Stop all animations for they have been started for the old window.
mpSlideSorterController->GetAnimator()->RemoveAllAnimations();
ReleaseListeners();
- ::vcl::Window *pNewWindow = NULL;
+ vcl::Window *pNewWindow = NULL;
if (mpViewShell)
{
mpViewShell->ViewShell::RelocateToParentWindow(pParentWindow);
@@ -436,7 +436,7 @@ void SlideSorter::SetCurrentFunction (const rtl::Reference<FuPoor>& rpFunction)
namespace {
ContentWindow::ContentWindow(
- ::vcl::Window& rParent,
+ vcl::Window& rParent,
SlideSorter& rSlideSorter)
: ::sd::Window(&rParent),
mrSlideSorter(rSlideSorter),
@@ -455,7 +455,7 @@ void ContentWindow::SetCurrentFunction (const rtl::Reference<FuPoor>& rpFunction
mpCurrentFunction = rpFunction;
}
-void ContentWindow::Paint (::vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect)
+void ContentWindow::Paint (vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect)
{
mrSlideSorter.Paint(rRect);
}
diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
index 2f2aa0d73505..d58ac87098d6 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
@@ -93,7 +93,7 @@ TYPEINIT1(SlideSorterViewShell, ViewShell);
::boost::shared_ptr<SlideSorterViewShell> SlideSorterViewShell::Create (
SfxViewFrame* pFrame,
ViewShellBase& rViewShellBase,
- ::vcl::Window* pParentWindow,
+ vcl::Window* pParentWindow,
FrameView* pFrameViewArgument,
const bool bIsCenterPane)
{
@@ -118,7 +118,7 @@ TYPEINIT1(SlideSorterViewShell, ViewShell);
SlideSorterViewShell::SlideSorterViewShell (
SfxViewFrame* pFrame,
ViewShellBase& rViewShellBase,
- ::vcl::Window* pParentWindow,
+ vcl::Window* pParentWindow,
FrameView* pFrameViewArgument)
: ViewShell (pFrame, pParentWindow, rViewShellBase),
mpSlideSorter(),
@@ -292,7 +292,7 @@ SlideSorter& SlideSorterViewShell::GetSlideSorter() const
return *mpSlideSorter;
}
-bool SlideSorterViewShell::RelocateToParentWindow (::vcl::Window* pParentWindow)
+bool SlideSorterViewShell::RelocateToParentWindow (vcl::Window* pParentWindow)
{
OSL_ASSERT(mpSlideSorter);
if ( ! mpSlideSorter)
@@ -638,7 +638,7 @@ void SlideSorterViewShell::UpdateScrollBars()
void SlideSorterViewShell::StartDrag (
const Point& rDragPt,
- ::vcl::Window* pWindow )
+ vcl::Window* pWindow )
{
OSL_ASSERT(mpSlideSorter.get()!=NULL);
mpSlideSorter->GetController().GetClipboard().StartDrag (
diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx
index 016c730a898e..6515c6e4b594 100644
--- a/sd/source/ui/table/TableDesignPane.cxx
+++ b/sd/source/ui/table/TableDesignPane.cxx
@@ -365,7 +365,7 @@ void TableValueSet::updateSettings()
}
}
-extern "C" SAL_DLLPUBLIC_EXPORT ::vcl::Window* SAL_CALL makeTableValueSet(::vcl::Window *pParent, VclBuilder::stringmap &rMap)
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeTableValueSet(vcl::Window *pParent, VclBuilder::stringmap &rMap)
{
WinBits nWinStyle = WB_TABSTOP;
OString sBorder = VclBuilder::extractCustomProperty(rMap);
@@ -806,12 +806,12 @@ short TableDesignDialog::Execute()
return RET_CANCEL;
}
-VclPtr< ::vcl::Window> createTableDesignPanel( ::vcl::Window* pParent, ViewShellBase& rBase )
+VclPtr<vcl::Window> createTableDesignPanel( vcl::Window* pParent, ViewShellBase& rBase )
{
return VclPtr<TableDesignPane>::Create( pParent, rBase );
}
-void showTableDesignDialog( ::vcl::Window* pParent, ViewShellBase& rBase )
+void showTableDesignDialog( vcl::Window* pParent, ViewShellBase& rBase )
{
ScopedVclPtrInstance< TableDesignDialog > xDialog( pParent, rBase );
xDialog->Execute();
diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx
index 1f1adb72fa89..440030f38a8f 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -956,7 +956,7 @@ void ViewShellBase::SetViewTabBar (const ::rtl::Reference<ViewTabBar>& rViewTabB
mpImpl->mpViewTabBar = rViewTabBar;
}
-::vcl::Window* ViewShellBase::GetViewWindow()
+vcl::Window* ViewShellBase::GetViewWindow()
{
OSL_ASSERT(mpImpl.get()!=NULL);
diff --git a/sd/source/ui/view/ViewShellManager.cxx b/sd/source/ui/view/ViewShellManager.cxx
index f6e3b11be435..4b38aa92506f 100644
--- a/sd/source/ui/view/ViewShellManager.cxx
+++ b/sd/source/ui/view/ViewShellManager.cxx
@@ -59,7 +59,7 @@ public:
ShellDescriptor (const ShellDescriptor& rDescriptor);
ShellDescriptor& operator= (const ShellDescriptor& rDescriptor);
bool IsMainViewShell() const;
- ::vcl::Window* GetWindow() const;
+ vcl::Window* GetWindow() const;
};
/** This functor can be used to search for a shell in an STL container when the
@@ -221,7 +221,7 @@ private:
ShellDescriptor CreateSubShell (
SfxShell* pShell,
ShellId nShellId,
- ::vcl::Window* pParentWindow,
+ vcl::Window* pParentWindow,
FrameView* pFrameView);
void DestroyViewShell (ShellDescriptor& rDescriptor);
void DestroySubShell (
@@ -429,7 +429,7 @@ void ViewShellManager::Implementation::ActivateViewShell (ViewShell* pViewShell)
// window can be moved to the top of the shell stack.
if (aResult.mpShell != NULL)
{
- ::vcl::Window* pWindow = aResult.GetWindow();
+ vcl::Window* pWindow = aResult.GetWindow();
if (pWindow != NULL)
{
pWindow->AddEventListener(
@@ -988,7 +988,7 @@ IMPL_LINK(ViewShellManager::Implementation, WindowEventHandler, VclWindowEvent*,
{
if (pEvent != NULL)
{
- ::vcl::Window* pEventWindow
+ vcl::Window* pEventWindow
= static_cast<VclWindowEvent*>(pEvent)->GetWindow();
switch (pEvent->GetId())
@@ -999,7 +999,7 @@ IMPL_LINK(ViewShellManager::Implementation, WindowEventHandler, VclWindowEvent*,
aI!=maActiveViewShells.end();
++aI)
{
- if (pEventWindow == static_cast< ::vcl::Window*>(aI->GetWindow()))
+ if (pEventWindow == static_cast< vcl::Window*>(aI->GetWindow()))
{
MoveToTop(*aI->mpShell);
break;
@@ -1035,7 +1035,7 @@ IMPL_LINK(ViewShellManager::Implementation, WindowEventHandler, VclWindowEvent*,
ShellDescriptor ViewShellManager::Implementation::CreateSubShell (
SfxShell* pParentShell,
ShellId nShellId,
- ::vcl::Window* pParentWindow,
+ vcl::Window* pParentWindow,
FrameView* pFrameView)
{
::osl::MutexGuard aGuard (maMutex);
@@ -1072,7 +1072,7 @@ void ViewShellManager::Implementation::DestroyViewShell (
if (rDescriptor.mbIsListenerAddedToWindow)
{
rDescriptor.mbIsListenerAddedToWindow = false;
- ::vcl::Window* pWindow = rDescriptor.GetWindow();
+ vcl::Window* pWindow = rDescriptor.GetWindow();
if (pWindow != NULL)
{
pWindow->RemoveEventListener(
diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx
index ef6b102007d5..5a13836699eb 100644
--- a/sd/source/ui/view/drviewse.cxx
+++ b/sd/source/ui/view/drviewse.cxx
@@ -126,7 +126,7 @@ void ImpAddPrintableCharactersToTextEdit(SfxRequest& rReq, ::sd::View* pView)
for(sal_Int32 a(0); a < aInputString.getLength(); a++)
{
sal_Char aChar = (sal_Char)aInputString[a];
- ::vcl::KeyCode aKeyCode;
+ vcl::KeyCode aKeyCode;
KeyEvent aKeyEvent(aChar, aKeyCode);
// add actual character
@@ -682,7 +682,7 @@ void DrawViewShell::FuDeleteSelectedObjects()
if (!bConsumed)
{
- ::vcl::KeyCode aKCode(KEY_DELETE);
+ vcl::KeyCode aKCode(KEY_DELETE);
KeyEvent aKEvt( 0, aKCode);
bConsumed = mpDrawView->getSmartTags().KeyInput( aKEvt );
@@ -937,7 +937,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq)
if (pOLV)
{
- ::vcl::KeyCode aKCode(KEY_DELETE);
+ vcl::KeyCode aKCode(KEY_DELETE);
KeyEvent aKEvt( 0, aKCode);
pOLV->PostKeyEvent(aKEvt);
}
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index fe3ff77142c4..f72aa2f3512c 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -189,7 +189,7 @@ Reference<drawing::XDrawSubController> OutlineViewShell::CreateSubController()
OutlineViewShell::OutlineViewShell (
SfxViewFrame* pFrame,
ViewShellBase& rViewShellBase,
- ::vcl::Window* pParentWindow,
+ vcl::Window* pParentWindow,
FrameView* pFrameViewArgument)
: ViewShell(pFrame, pParentWindow, rViewShellBase),
pOlView(NULL),
@@ -525,7 +525,7 @@ void OutlineViewShell::FuSupport(SfxRequest &rReq)
{
OutlineViewPageChangesGuard aGuard2(pOlView);
- ::vcl::KeyCode aKCode(KEY_DELETE);
+ vcl::KeyCode aKCode(KEY_DELETE);
KeyEvent aKEvt( 0, aKCode );
pOutlView->PostKeyEvent(aKEvt);
@@ -1424,7 +1424,7 @@ bool OutlineViewShell::KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin)
Invalidate(SID_STYLE_FAMILY5);
// check and distinguish cursor movements- or input-keys
- ::vcl::KeyCode aKeyGroup( rKEvt.GetKeyCode().GetGroup() );
+ vcl::KeyCode aKeyGroup( rKEvt.GetKeyCode().GetGroup() );
if( (aKeyGroup != KEYGROUP_CURSOR && aKeyGroup != KEYGROUP_FKEYS) ||
(GetActualPage() != pLastPage) )
{