summaryrefslogtreecommitdiff
path: root/sd/source/ui/sidebar
diff options
context:
space:
mode:
Diffstat (limited to 'sd/source/ui/sidebar')
-rw-r--r--sd/source/ui/sidebar/AllMasterPagesSelector.cxx4
-rw-r--r--sd/source/ui/sidebar/AllMasterPagesSelector.hxx4
-rw-r--r--sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx4
-rw-r--r--sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx4
-rw-r--r--sd/source/ui/sidebar/CustomAnimationPanel.cxx6
-rw-r--r--sd/source/ui/sidebar/CustomAnimationPanel.hxx6
-rw-r--r--sd/source/ui/sidebar/IDisposable.hxx2
-rw-r--r--sd/source/ui/sidebar/LayoutMenu.cxx2
-rw-r--r--sd/source/ui/sidebar/LayoutMenu.hxx4
-rw-r--r--sd/source/ui/sidebar/MasterPagesSelector.cxx4
-rw-r--r--sd/source/ui/sidebar/MasterPagesSelector.hxx4
-rw-r--r--sd/source/ui/sidebar/NavigatorWrapper.cxx2
-rw-r--r--sd/source/ui/sidebar/NavigatorWrapper.hxx2
-rw-r--r--sd/source/ui/sidebar/PanelBase.cxx2
-rw-r--r--sd/source/ui/sidebar/PanelBase.hxx8
-rw-r--r--sd/source/ui/sidebar/PanelFactory.cxx4
-rw-r--r--sd/source/ui/sidebar/PreviewValueSet.cxx2
-rw-r--r--sd/source/ui/sidebar/PreviewValueSet.hxx2
-rw-r--r--sd/source/ui/sidebar/RecentMasterPagesSelector.cxx4
-rw-r--r--sd/source/ui/sidebar/RecentMasterPagesSelector.hxx4
-rw-r--r--sd/source/ui/sidebar/SidebarFocusManager.hxx20
-rw-r--r--sd/source/ui/sidebar/SlideTransitionPanel.cxx8
-rw-r--r--sd/source/ui/sidebar/SlideTransitionPanel.hxx6
-rw-r--r--sd/source/ui/sidebar/TableDesignPanel.cxx6
-rw-r--r--sd/source/ui/sidebar/TableDesignPanel.hxx6
25 files changed, 60 insertions, 60 deletions
diff --git a/sd/source/ui/sidebar/AllMasterPagesSelector.cxx b/sd/source/ui/sidebar/AllMasterPagesSelector.cxx
index 08c9dda54c65..b0ff1af75dcd 100644
--- a/sd/source/ui/sidebar/AllMasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/AllMasterPagesSelector.cxx
@@ -78,7 +78,7 @@ public:
};
MasterPagesSelector* AllMasterPagesSelector::Create (
- ::Window* pParent,
+ vcl::Window* pParent,
ViewShellBase& rViewShellBase,
const css::uno::Reference<css::ui::XSidebar>& rxSidebar)
{
@@ -102,7 +102,7 @@ MasterPagesSelector* AllMasterPagesSelector::Create (
}
AllMasterPagesSelector::AllMasterPagesSelector (
- ::Window* pParent,
+ vcl::Window* pParent,
SdDrawDocument& rDocument,
ViewShellBase& rBase,
const ::boost::shared_ptr<MasterPageContainer>& rpContainer,
diff --git a/sd/source/ui/sidebar/AllMasterPagesSelector.hxx b/sd/source/ui/sidebar/AllMasterPagesSelector.hxx
index eebc8691fa8a..0ce98e24ada6 100644
--- a/sd/source/ui/sidebar/AllMasterPagesSelector.hxx
+++ b/sd/source/ui/sidebar/AllMasterPagesSelector.hxx
@@ -38,7 +38,7 @@ class AllMasterPagesSelector
{
public:
static MasterPagesSelector* Create (
- ::Window* pParent,
+ vcl::Window* pParent,
ViewShellBase& rViewShellBase,
const css::uno::Reference<css::ui::XSidebar>& rxSidebar);
@@ -59,7 +59,7 @@ private:
::std::auto_ptr<SortedMasterPageDescriptorList> mpSortedMasterPages;
AllMasterPagesSelector (
- ::Window* pParent,
+ vcl::Window* pParent,
SdDrawDocument& rDocument,
ViewShellBase& rBase,
const ::boost::shared_ptr<MasterPageContainer>& rpContainer,
diff --git a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
index 4525bc8c16cb..00d0f8d5eea6 100644
--- a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
@@ -43,7 +43,7 @@ using namespace ::com::sun::star;
namespace sd { namespace sidebar {
MasterPagesSelector* CurrentMasterPagesSelector::Create (
- ::Window* pParent,
+ vcl::Window* pParent,
ViewShellBase& rViewShellBase,
const css::uno::Reference<css::ui::XSidebar>& rxSidebar)
{
@@ -67,7 +67,7 @@ MasterPagesSelector* CurrentMasterPagesSelector::Create (
}
CurrentMasterPagesSelector::CurrentMasterPagesSelector (
- ::Window* pParent,
+ vcl::Window* pParent,
SdDrawDocument& rDocument,
ViewShellBase& rBase,
const ::boost::shared_ptr<MasterPageContainer>& rpContainer,
diff --git a/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx b/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx
index 2a11328a88e6..e5c2932b90be 100644
--- a/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx
+++ b/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx
@@ -36,7 +36,7 @@ class CurrentMasterPagesSelector
{
public:
static MasterPagesSelector* Create (
- ::Window* pParent,
+ vcl::Window* pParent,
ViewShellBase& rViewShellBase,
const css::uno::Reference<css::ui::XSidebar>& rxSidebar);
@@ -62,7 +62,7 @@ private:
css::uno::Reference<css::lang::XComponent> mxListener;
CurrentMasterPagesSelector (
- ::Window* pParent,
+ vcl::Window* pParent,
SdDrawDocument& rDocument,
ViewShellBase& rBase,
const ::boost::shared_ptr<MasterPageContainer>& rpContainer,
diff --git a/sd/source/ui/sidebar/CustomAnimationPanel.cxx b/sd/source/ui/sidebar/CustomAnimationPanel.cxx
index d0bd23a5fcbe..804b6c143aa7 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 (
- ::Window* pParentWindow,
+ ::vcl::Window* pParentWindow,
ViewShellBase& rViewShellBase,
const css::uno::Reference<css::frame::XFrame>& rxFrame
)
@@ -43,8 +43,8 @@ CustomAnimationPanel::~CustomAnimationPanel (void)
{
}
-::Window* CustomAnimationPanel::CreateWrappedControl (
- ::Window* pParentWindow,
+::vcl::Window* CustomAnimationPanel::CreateWrappedControl (
+ ::vcl::Window* pParentWindow,
ViewShellBase& rViewShellBase)
{
return createCustomAnimationPanel(pParentWindow, rViewShellBase, mxFrame);
diff --git a/sd/source/ui/sidebar/CustomAnimationPanel.hxx b/sd/source/ui/sidebar/CustomAnimationPanel.hxx
index cb391919564c..f9a9d708c8e3 100644
--- a/sd/source/ui/sidebar/CustomAnimationPanel.hxx
+++ b/sd/source/ui/sidebar/CustomAnimationPanel.hxx
@@ -29,7 +29,7 @@ class CustomAnimationPanel
{
public:
CustomAnimationPanel (
- ::Window* pParentWindow,
+ vcl::Window* pParentWindow,
ViewShellBase& rViewShellBase,
const css::uno::Reference<css::frame::XFrame>& rxFrame);
virtual ~CustomAnimationPanel (void);
@@ -38,8 +38,8 @@ public:
virtual css::ui::LayoutSize GetHeightForWidth (const sal_Int32 nWidth) SAL_OVERRIDE;
protected:
- virtual ::Window* CreateWrappedControl (
- ::Window* pParentWindow,
+ virtual vcl::Window* CreateWrappedControl (
+ vcl::Window* pParentWindow,
ViewShellBase& rViewShellBase) SAL_OVERRIDE;
private:
diff --git a/sd/source/ui/sidebar/IDisposable.hxx b/sd/source/ui/sidebar/IDisposable.hxx
index ef68ac282788..41dc811e0f57 100644
--- a/sd/source/ui/sidebar/IDisposable.hxx
+++ b/sd/source/ui/sidebar/IDisposable.hxx
@@ -22,7 +22,7 @@
#include <tools/gen.hxx>
#include <sal/types.h>
-class Window;
+namespace vcl { class Window; }
namespace sd { namespace sidebar {
diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx
index ebf319ce6ce9..4e15c5c56abd 100644
--- a/sd/source/ui/sidebar/LayoutMenu.cxx
+++ b/sd/source/ui/sidebar/LayoutMenu.cxx
@@ -121,7 +121,7 @@ static const snewfoil_value_info standard[] =
};
LayoutMenu::LayoutMenu (
- ::Window* pParent,
+ vcl::Window* pParent,
ViewShellBase& rViewShellBase,
const css::uno::Reference<css::ui::XSidebar>& rxSidebar)
: ValueSet (pParent, WB_ITEMBORDER),
diff --git a/sd/source/ui/sidebar/LayoutMenu.hxx b/sd/source/ui/sidebar/LayoutMenu.hxx
index 2e65d19f938e..45fce7f55c08 100644
--- a/sd/source/ui/sidebar/LayoutMenu.hxx
+++ b/sd/source/ui/sidebar/LayoutMenu.hxx
@@ -69,7 +69,7 @@ public:
the view shell of the task pane.
*/
LayoutMenu (
- ::Window* pParent,
+ vcl::Window* pParent,
ViewShellBase& rViewShellBase,
const css::uno::Reference<css::ui::XSidebar>& rxSidebar);
virtual ~LayoutMenu (void);
@@ -84,7 +84,7 @@ public:
// From ILayoutableWindow
virtual css::ui::LayoutSize GetHeightForWidth (const sal_Int32 nWidth) SAL_OVERRIDE;
- // From ::Window
+ // From vcl::Window
virtual void Paint (const Rectangle& rRect) SAL_OVERRIDE;
virtual void Resize (void) SAL_OVERRIDE;
diff --git a/sd/source/ui/sidebar/MasterPagesSelector.cxx b/sd/source/ui/sidebar/MasterPagesSelector.cxx
index a9602906c702..e198b0f681c9 100644
--- a/sd/source/ui/sidebar/MasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/MasterPagesSelector.cxx
@@ -61,7 +61,7 @@ using namespace ::com::sun::star::text;
namespace sd { namespace sidebar {
MasterPagesSelector::MasterPagesSelector (
- ::Window* pParent,
+ ::vcl::Window* pParent,
SdDrawDocument& rDocument,
ViewShellBase& rBase,
const ::boost::shared_ptr<MasterPageContainer>& rpContainer,
@@ -500,7 +500,7 @@ bool MasterPagesSelector::IsResizable (void)
return false;
}
-::Window* MasterPagesSelector::GetWindow (void)
+::vcl::Window* MasterPagesSelector::GetWindow (void)
{
return this;
}
diff --git a/sd/source/ui/sidebar/MasterPagesSelector.hxx b/sd/source/ui/sidebar/MasterPagesSelector.hxx
index e299b12eae8c..1d9097f9d4c3 100644
--- a/sd/source/ui/sidebar/MasterPagesSelector.hxx
+++ b/sd/source/ui/sidebar/MasterPagesSelector.hxx
@@ -57,7 +57,7 @@ class MasterPagesSelector
{
public:
MasterPagesSelector (
- ::Window* pParent,
+ vcl::Window* pParent,
SdDrawDocument& rDocument,
ViewShellBase& rBase,
const ::boost::shared_ptr<MasterPageContainer>& rpContainer,
@@ -83,7 +83,7 @@ public:
virtual sal_Int32 GetPreferredWidth (sal_Int32 nHeight);
virtual sal_Int32 GetPreferredHeight (sal_Int32 nWidth);
virtual bool IsResizable (void);
- virtual ::Window* GetWindow (void);
+ virtual vcl::Window* GetWindow (void);
virtual sal_Int32 GetMinimumWidth (void);
/** Update the selection of previews according to whatever
diff --git a/sd/source/ui/sidebar/NavigatorWrapper.cxx b/sd/source/ui/sidebar/NavigatorWrapper.cxx
index 3df03cc05f88..3197ffcb7daa 100644
--- a/sd/source/ui/sidebar/NavigatorWrapper.cxx
+++ b/sd/source/ui/sidebar/NavigatorWrapper.cxx
@@ -28,7 +28,7 @@
namespace sd { namespace sidebar {
NavigatorWrapper::NavigatorWrapper (
- ::Window* pParent,
+ vcl::Window* pParent,
sd::ViewShellBase& rViewShellBase,
SfxBindings* pBindings)
: Control(pParent, 0),
diff --git a/sd/source/ui/sidebar/NavigatorWrapper.hxx b/sd/source/ui/sidebar/NavigatorWrapper.hxx
index 61445b1b984a..edc258ffae64 100644
--- a/sd/source/ui/sidebar/NavigatorWrapper.hxx
+++ b/sd/source/ui/sidebar/NavigatorWrapper.hxx
@@ -41,7 +41,7 @@ class NavigatorWrapper
{
public:
NavigatorWrapper (
- ::Window* pParent,
+ vcl::Window* pParent,
sd::ViewShellBase& rViewShellBase,
SfxBindings* pBindings);
diff --git a/sd/source/ui/sidebar/PanelBase.cxx b/sd/source/ui/sidebar/PanelBase.cxx
index 270705054c93..a159d80e86ee 100644
--- a/sd/source/ui/sidebar/PanelBase.cxx
+++ b/sd/source/ui/sidebar/PanelBase.cxx
@@ -22,7 +22,7 @@
namespace sd { namespace sidebar {
PanelBase::PanelBase (
- ::Window* pParentWindow,
+ vcl::Window* pParentWindow,
ViewShellBase& rViewShellBase)
: Control(pParentWindow),
mpWrappedControl(NULL),
diff --git a/sd/source/ui/sidebar/PanelBase.hxx b/sd/source/ui/sidebar/PanelBase.hxx
index f2e54b0f1aae..797308f83187 100644
--- a/sd/source/ui/sidebar/PanelBase.hxx
+++ b/sd/source/ui/sidebar/PanelBase.hxx
@@ -42,7 +42,7 @@ class PanelBase
{
public:
PanelBase (
- ::Window* pParentWindow,
+ vcl::Window* pParentWindow,
ViewShellBase& rViewShellBase);
virtual ~PanelBase (void);
@@ -63,9 +63,9 @@ public:
::com::sun::star::accessibility::XAccessible>& rxParent);
protected:
- ::boost::scoped_ptr< ::Window> mpWrappedControl;
- virtual ::Window* CreateWrappedControl (
- ::Window* pParentWindow,
+ ::boost::scoped_ptr< vcl::Window> mpWrappedControl;
+ virtual vcl::Window* CreateWrappedControl (
+ vcl::Window* pParentWindow,
ViewShellBase& rViewShellBase) = 0;
private:
diff --git a/sd/source/ui/sidebar/PanelFactory.cxx b/sd/source/ui/sidebar/PanelFactory.cxx
index a64b986ffbba..3bff21b0b05a 100644
--- a/sd/source/ui/sidebar/PanelFactory.cxx
+++ b/sd/source/ui/sidebar/PanelFactory.cxx
@@ -114,7 +114,7 @@ Reference<ui::XUIElement> SAL_CALL PanelFactory::createUIElement (
Reference<ui::XSidebar> xSidebar (aArguments.getOrDefault("Sidebar", Reference<ui::XSidebar>()));
// Throw exceptions when the arguments are not as expected.
- ::Window* pParentWindow = VCLUnoHelper::GetWindow(xParentWindow);
+ vcl::Window* pParentWindow = VCLUnoHelper::GetWindow(xParentWindow);
if ( ! xParentWindow.is() || pParentWindow==NULL)
throw RuntimeException(
"PanelFactory::createUIElement called without ParentWindow");
@@ -140,7 +140,7 @@ Reference<ui::XUIElement> SAL_CALL PanelFactory::createUIElement (
SfxBindings* pBindings = reinterpret_cast<SfxBindings*>(nBindingsValue);
// Create a framework view.
- ::Window* pControl = NULL;
+ vcl::Window* pControl = NULL;
css::ui::LayoutSize aLayoutSize (-1,-1,-1);
#define EndsWith(s,t) s.endsWithAsciiL(t,strlen(t))
diff --git a/sd/source/ui/sidebar/PreviewValueSet.cxx b/sd/source/ui/sidebar/PreviewValueSet.cxx
index e532d7ace50f..59242ddbae8d 100644
--- a/sd/source/ui/sidebar/PreviewValueSet.cxx
+++ b/sd/source/ui/sidebar/PreviewValueSet.cxx
@@ -22,7 +22,7 @@
namespace sd { namespace sidebar {
-PreviewValueSet::PreviewValueSet (::Window* pParent)
+PreviewValueSet::PreviewValueSet (vcl::Window* pParent)
: ValueSet (pParent, WB_TABSTOP),
maPreviewSize(10,10),
mnBorderWidth(3),
diff --git a/sd/source/ui/sidebar/PreviewValueSet.hxx b/sd/source/ui/sidebar/PreviewValueSet.hxx
index 9bd390f7c18f..8ed413de2351 100644
--- a/sd/source/ui/sidebar/PreviewValueSet.hxx
+++ b/sd/source/ui/sidebar/PreviewValueSet.hxx
@@ -30,7 +30,7 @@ class PreviewValueSet
: public ValueSet
{
public:
- PreviewValueSet (::Window* pParent);
+ PreviewValueSet (vcl::Window* pParent);
virtual ~PreviewValueSet (void);
void SetRightMouseClickHandler (const Link& rLink);
diff --git a/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx b/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx
index 2705e2b31392..002f088746bf 100644
--- a/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx
@@ -33,7 +33,7 @@
namespace sd { namespace sidebar {
MasterPagesSelector* RecentMasterPagesSelector::Create (
- ::Window* pParent,
+ vcl::Window* pParent,
ViewShellBase& rViewShellBase,
const css::uno::Reference<css::ui::XSidebar>& rxSidebar)
{
@@ -57,7 +57,7 @@ MasterPagesSelector* RecentMasterPagesSelector::Create (
}
RecentMasterPagesSelector::RecentMasterPagesSelector (
- ::Window* pParent,
+ vcl::Window* pParent,
SdDrawDocument& rDocument,
ViewShellBase& rBase,
const ::boost::shared_ptr<MasterPageContainer>& rpContainer,
diff --git a/sd/source/ui/sidebar/RecentMasterPagesSelector.hxx b/sd/source/ui/sidebar/RecentMasterPagesSelector.hxx
index f5bacc780c53..0c1c53f67ccd 100644
--- a/sd/source/ui/sidebar/RecentMasterPagesSelector.hxx
+++ b/sd/source/ui/sidebar/RecentMasterPagesSelector.hxx
@@ -31,7 +31,7 @@ class RecentMasterPagesSelector
{
public:
static MasterPagesSelector* Create (
- ::Window* pParent,
+ vcl::Window* pParent,
ViewShellBase& rViewShellBase,
const css::uno::Reference<css::ui::XSidebar>& rxSidebar);
@@ -59,7 +59,7 @@ protected:
private:
RecentMasterPagesSelector (
- ::Window* pParent,
+ vcl::Window* pParent,
SdDrawDocument& rDocument,
ViewShellBase& rBase,
const ::boost::shared_ptr<MasterPageContainer>& rpContainer,
diff --git a/sd/source/ui/sidebar/SidebarFocusManager.hxx b/sd/source/ui/sidebar/SidebarFocusManager.hxx
index 2904dd56767c..6fde5d417695 100644
--- a/sd/source/ui/sidebar/SidebarFocusManager.hxx
+++ b/sd/source/ui/sidebar/SidebarFocusManager.hxx
@@ -26,7 +26,7 @@
#include <memory>
class VclSimpleEvent;
-class Window;
+namespace vcl { class Window; }
namespace sd { namespace toolpanel {
@@ -54,8 +54,8 @@ public:
window to the target window.
*/
void RegisterLink (
- ::Window* pSource,
- ::Window* pTarget,
+ vcl::Window* pSource,
+ vcl::Window* pTarget,
const vcl::KeyCode& rKey);
/** Register a link that will move the focus from the source window to
@@ -66,7 +66,7 @@ public:
@param pTarget
The window to which the focus will be transferred.
*/
- void RegisterUpLink (::Window* pSource, ::Window* pTarget);
+ void RegisterUpLink (vcl::Window* pSource, vcl::Window* pTarget);
/** Register a link that will move the focus from the source window to
the target window when the source window is focused and KEY_RETURN
@@ -76,15 +76,15 @@ public:
@param pTarget
The window to which the focus will be transferred.
*/
- void RegisterDownLink (::Window* pSource, ::Window* pTarget);
+ void RegisterDownLink (vcl::Window* pSource, vcl::Window* pTarget);
/** Remove all links from the source window to the target window. When
there are links from the target window to the source window then
these are not touced.
*/
void RemoveLinks (
- ::Window* pSource,
- ::Window* pTarget);
+ vcl::Window* pSource,
+ vcl::Window* pTarget);
/** Let the focus manager transfer the focus from the specified source
window to a target window that is determined according the the
@@ -92,7 +92,7 @@ public:
When there is no rule for this combination of source window and key
code then the focus stays where it is.
*/
- bool TransferFocus (::Window* pSource, const vcl::KeyCode& rCode);
+ bool TransferFocus (vcl::Window* pSource, const vcl::KeyCode& rCode);
private:
friend struct FocusManagerCreator;
@@ -110,12 +110,12 @@ private:
/** Remove all links from or to the given window.
*/
- void RemoveLinks (::Window* pWindow);
+ void RemoveLinks (vcl::Window* pWindow);
/** Unregister as event listener from the given window when there are no
links from this window anymore.
*/
- void RemoveUnusedEventListener (::Window* pWindow);
+ void RemoveUnusedEventListener (vcl::Window* pWindow);
/** Listen for key events and on KEY_RETURN go down and on
KEY_ESCAPE go up.
diff --git a/sd/source/ui/sidebar/SlideTransitionPanel.cxx b/sd/source/ui/sidebar/SlideTransitionPanel.cxx
index cc9a5776cafc..7051d3a957db 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 (
- ::Window* pParentWindow,
+ ::vcl::Window* pParentWindow,
ViewShellBase& rViewShellBase,
const css::uno::Reference<css::frame::XFrame>& rxFrame
)
@@ -41,8 +41,8 @@ SlideTransitionPanel::~SlideTransitionPanel (void)
{
}
-::Window* SlideTransitionPanel::CreateWrappedControl (
- ::Window* pParentWindow,
+::vcl::Window* SlideTransitionPanel::CreateWrappedControl (
+ ::vcl::Window* pParentWindow,
ViewShellBase& rViewShellBase)
{
return createSlideTransitionPanel(pParentWindow, rViewShellBase, mxFrame);
@@ -50,7 +50,7 @@ SlideTransitionPanel::~SlideTransitionPanel (void)
css::ui::LayoutSize SlideTransitionPanel::GetHeightForWidth (const sal_Int32 /*nWidth*/)
{
- Window *pControl = mpWrappedControl.get();
+ vcl::Window *pControl = mpWrappedControl.get();
sal_Int32 nMinimumHeight = pControl ? pControl->get_preferred_size().Height() : 0;
return css::ui::LayoutSize(nMinimumHeight,-1, nMinimumHeight);
}
diff --git a/sd/source/ui/sidebar/SlideTransitionPanel.hxx b/sd/source/ui/sidebar/SlideTransitionPanel.hxx
index 74ef56a4d9a9..ab36313cbea6 100644
--- a/sd/source/ui/sidebar/SlideTransitionPanel.hxx
+++ b/sd/source/ui/sidebar/SlideTransitionPanel.hxx
@@ -29,7 +29,7 @@ class SlideTransitionPanel
{
public:
SlideTransitionPanel (
- ::Window* pParentWindow,
+ vcl::Window* pParentWindow,
ViewShellBase& rViewShellBase,
const css::uno::Reference<css::frame::XFrame>& rxFrame );
virtual ~SlideTransitionPanel (void);
@@ -38,8 +38,8 @@ public:
virtual css::ui::LayoutSize GetHeightForWidth (const sal_Int32 nWidth) SAL_OVERRIDE;
protected:
- virtual ::Window* CreateWrappedControl (
- ::Window* pParentWindow,
+ virtual vcl::Window* CreateWrappedControl (
+ vcl::Window* pParentWindow,
ViewShellBase& rViewShellBase) SAL_OVERRIDE;
private:
diff --git a/sd/source/ui/sidebar/TableDesignPanel.cxx b/sd/source/ui/sidebar/TableDesignPanel.cxx
index 61212dd7db17..f0008cd28a88 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 (
- ::Window* pParentWindow,
+ ::vcl::Window* pParentWindow,
ViewShellBase& rViewShellBase)
: PanelBase(pParentWindow, rViewShellBase)
{
@@ -38,8 +38,8 @@ TableDesignPanel::~TableDesignPanel (void)
{
}
-::Window* TableDesignPanel::CreateWrappedControl (
- ::Window* pParentWindow,
+::vcl::Window* TableDesignPanel::CreateWrappedControl (
+ ::vcl::Window* pParentWindow,
ViewShellBase& rViewShellBase)
{
return createTableDesignPanel(pParentWindow, rViewShellBase);
diff --git a/sd/source/ui/sidebar/TableDesignPanel.hxx b/sd/source/ui/sidebar/TableDesignPanel.hxx
index 25d125dc510a..9d9c5d188c4b 100644
--- a/sd/source/ui/sidebar/TableDesignPanel.hxx
+++ b/sd/source/ui/sidebar/TableDesignPanel.hxx
@@ -28,7 +28,7 @@ class TableDesignPanel
{
public:
TableDesignPanel (
- ::Window* pParentWindow,
+ vcl::Window* pParentWindow,
ViewShellBase& rViewShellBase);
virtual ~TableDesignPanel (void);
@@ -36,8 +36,8 @@ public:
virtual css::ui::LayoutSize GetHeightForWidth (const sal_Int32 nWidth) SAL_OVERRIDE;
protected:
- virtual ::Window* CreateWrappedControl (
- ::Window* pParentWindow,
+ virtual vcl::Window* CreateWrappedControl (
+ vcl::Window* pParentWindow,
ViewShellBase& rViewShellBase) SAL_OVERRIDE;
};