4 files changed, 13 insertions, 13 deletions
diff --git a/extensions/source/scanner/grid.cxx b/extensions/source/scanner/grid.cxx
index 5a593b0b1377..38c951c7c171 100644
--- a/extensions/source/scanner/grid.cxx
+++ b/extensions/source/scanner/grid.cxx
@@ -30,7 +30,7 @@
 #include <algorithm>
 #include <boost/scoped_array.hpp>
 
-class GridWindow : public Window
+class GridWindow : public vcl::Window
 {
     // helper class for handles
     struct impHandle
@@ -49,13 +49,13 @@ class GridWindow : public Window
             return (maPos.X() < rComp.maPos.X());
         }
 
-        void draw(Window& rWin, const BitmapEx& rBitmapEx)
+        void draw(vcl::Window& rWin, const BitmapEx& rBitmapEx)
         {
             const Point aOffset(rWin.PixelToLogic(Point(mnOffX, mnOffY)));
             rWin.DrawBitmapEx(maPos - aOffset, rBitmapEx);
         }
 
-        bool isHit(Window& rWin, const Point& rPos)
+        bool isHit(vcl::Window& rWin, const Point& rPos)
         {
             const Point aOffset(rWin.PixelToLogic(Point(mnOffX, mnOffY)));
             const Rectangle aTarget(maPos - aOffset, maPos + aOffset);
@@ -117,7 +117,7 @@ class GridWindow : public Window
     virtual Size GetOptimalSize() const SAL_OVERRIDE;
     void drawLine( double x1, double y1, double x2, double y2 );
 public:
-    GridWindow(Window* pParent);
+    GridWindow(vcl::Window* pParent);
     void Init(double* pXValues, double* pYValues, int nValues, bool bCutValues, const BitmapEx &rMarkerBitmap);
     virtual ~GridWindow();
 
@@ -130,7 +130,7 @@ public:
     virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE;
 };
 
-GridWindow::GridWindow(Window* pParent)
+GridWindow::GridWindow(vcl::Window* pParent)
     : Window(pParent, 0)
     , m_aGridArea(50, 15, 100, 100)
     , m_fMinX(0.0)
@@ -198,7 +198,7 @@ Size GridWindow::GetOptimalSize() const
     return LogicToPixel(Size(240, 200), MAP_APPFONT);
 }
 
-GridDialog::GridDialog(double* pXValues, double* pYValues, int nValues, Window* pParent, bool bCutValues )
+GridDialog::GridDialog(double* pXValues, double* pYValues, int nValues, vcl::Window* pParent, bool bCutValues )
     : ModalDialog(pParent, "GridDialog", "modules/scanner/ui/griddialog.ui")
 {
     get(m_pOKButton, "ok");
@@ -694,7 +694,7 @@ double* GridDialog::getNewYValues()
     return m_pGridWindow->getNewYValues();
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeGridWindow(Window *pParent, VclBuilder::stringmap &)
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeGridWindow(vcl::Window *pParent, VclBuilder::stringmap &)
 {
     return new GridWindow(pParent);
 }
diff --git a/extensions/source/scanner/grid.hxx b/extensions/source/scanner/grid.hxx
index 7416c6abcfe4..6fca647facd5 100644
--- a/extensions/source/scanner/grid.hxx
+++ b/extensions/source/scanner/grid.hxx
@@ -48,7 +48,7 @@ class GridDialog : public ModalDialog
 
 public:
     GridDialog(double* pXValues, double* pYValues, int nValues,
-                Window* pParent, bool bCutValues = true);
+                vcl::Window* pParent, bool bCutValues = true);
 
     void setBoundings(double fMinX, double fMinY, double fMaxX, double fMaxY);
     double* getNewYValues();
diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx
index c47e1a6096d9..bc7ee8e4a978 100644
--- a/extensions/source/scanner/sanedlg.cxx
+++ b/extensions/source/scanner/sanedlg.cxx
@@ -33,7 +33,7 @@
 #define PREVIEW_WIDTH       113
 #define PREVIEW_HEIGHT      160
 
-class ScanPreview : public Window
+class ScanPreview : public vcl::Window
 {
 private:
     enum DragDirection { TopLeft, Top, TopRight, Right, BottomRight, Bottom,
@@ -51,7 +51,7 @@ private:
 
     void DrawRectangles(Point& rUL, Point& rBR);
 public:
-    ScanPreview(Window* pParent, WinBits nStyle)
+    ScanPreview(vcl::Window* pParent, WinBits nStyle)
         : Window(pParent, nStyle)
         , maMaxBottomRight(PREVIEW_WIDTH,  PREVIEW_HEIGHT)
         , mpParentDialog(NULL)
@@ -145,7 +145,7 @@ public:
     }
 };
 
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeScanPreview(Window *pParent, VclBuilder::stringmap &rMap)
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeScanPreview(vcl::Window *pParent, VclBuilder::stringmap &rMap)
 {
     WinBits nWinStyle = 0;
     OString sBorder = VclBuilder::extractCustomProperty(rMap);
@@ -155,7 +155,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeScanPreview(Window *pParent
     return pWindow;
 }
 
-SaneDlg::SaneDlg( Window* pParent, Sane& rSane, bool bScanEnabled ) :
+SaneDlg::SaneDlg( vcl::Window* pParent, Sane& rSane, bool bScanEnabled ) :
         ModalDialog(pParent, "SaneDialog", "modules/scanner/ui/sanedialog.ui"),
         mrSane( rSane ),
         mbScanEnabled( bScanEnabled ),
diff --git a/extensions/source/scanner/sanedlg.hxx b/extensions/source/scanner/sanedlg.hxx
index 45750e5a452b..57eaa54b0cb3 100644
--- a/extensions/source/scanner/sanedlg.hxx
+++ b/extensions/source/scanner/sanedlg.hxx
@@ -103,7 +103,7 @@ private:
     // helper
     bool SetAdjustedNumericalValue( const char* pOption, double fValue, int nElement = 0 );
 public:
-    SaneDlg( Window*, Sane&, bool );
+    SaneDlg( vcl::Window*, Sane&, bool );
     virtual ~SaneDlg();
 
     virtual short Execute() SAL_OVERRIDE;