summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config_host.mk.in1
-rw-r--r--configure.ac15
-rw-r--r--external/gpgmepp/ExternalProject_gpgmepp.mk2
-rw-r--r--external/harfbuzz/ExternalProject_harfbuzz.mk2
-rw-r--r--external/hunspell/ExternalProject_hunspell.mk2
-rw-r--r--external/libnumbertext/ExternalProject_libnumbertext.mk2
-rw-r--r--solenv/gbuild/LinkTarget.mk13
-rw-r--r--solenv/gbuild/gbuild.help.txt2
-rw-r--r--solenv/gbuild/platform/com_GCC_defs.mk6
9 files changed, 11 insertions, 34 deletions
diff --git a/config_host.mk.in b/config_host.mk.in
index aa64c32b77ab..2056ce282bb3 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -250,7 +250,6 @@ export HAVE_GCC_STACK_PROTECTOR_STRONG=@HAVE_GCC_STACK_PROTECTOR_STRONG@
export HAVE_GCC_BUILTIN_ATOMIC=@HAVE_GCC_BUILTIN_ATOMIC@
export HAVE_GCC_BUILTIN_FFS=@HAVE_GCC_BUILTIN_FFS@
export HAVE_GCC_FINLINE_LIMIT=@HAVE_GCC_FINLINE_LIMIT@
-export HAVE_GCC_FNO_DEFAULT_INLINE=@HAVE_GCC_FNO_DEFAULT_INLINE@
export HAVE_GCC_FNO_ENFORCE_EH_SPECS=@HAVE_GCC_FNO_ENFORCE_EH_SPECS@
export HAVE_GCC_FNO_INLINE=@HAVE_GCC_FNO_INLINE@
export HAVE_GCC_FNO_SIZED_DEALLOCATION=@HAVE_GCC_FNO_SIZED_DEALLOCATION@
diff --git a/configure.ac b/configure.ac
index 19f1f5803d5e..a0cda0719711 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6711,22 +6711,8 @@ dnl ===================================================================
dnl Clang++ tests
dnl ===================================================================
-HAVE_GCC_FNO_DEFAULT_INLINE=
HAVE_GCC_FNO_ENFORCE_EH_SPECS=
if test "$GCC" = "yes"; then
- AC_MSG_CHECKING([whether $CXX supports -fno-default-inline])
- AC_LANG_PUSH([C++])
- save_CXXFLAGS=$CXXFLAGS
- CXXFLAGS="$CFLAGS -Werror -fno-default-inline"
- AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ return 0; ]])],[ HAVE_GCC_FNO_DEFAULT_INLINE=TRUE ],[])
- CXXFLAGS=$save_CXXFLAGS
- AC_LANG_POP([C++])
- if test "$HAVE_GCC_FNO_DEFAULT_INLINE" = "TRUE"; then
- AC_MSG_RESULT([yes])
- else
- AC_MSG_RESULT([no])
- fi
-
AC_MSG_CHECKING([whether $CXX supports -fno-enforce-eh-specs])
AC_LANG_PUSH([C++])
save_CXXFLAGS=$CXXFLAGS
@@ -6740,7 +6726,6 @@ if test "$GCC" = "yes"; then
AC_MSG_RESULT([no])
fi
fi
-AC_SUBST(HAVE_GCC_FNO_DEFAULT_INLINE)
AC_SUBST(HAVE_GCC_FNO_ENFORCE_EH_SPECS)
dnl ===================================================================
diff --git a/external/gpgmepp/ExternalProject_gpgmepp.mk b/external/gpgmepp/ExternalProject_gpgmepp.mk
index 452f922750d6..703783bf1854 100644
--- a/external/gpgmepp/ExternalProject_gpgmepp.mk
+++ b/external/gpgmepp/ExternalProject_gpgmepp.mk
@@ -63,7 +63,7 @@ $(call gb_ExternalProject_get_state_target,gpgmepp,build):
CXXFLAGS='$(CXXFLAGS) \
$(if $(ENABLE_OPTIMIZED), \
$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) \
- $(if $(ENABLE_DEBUG),$(gb_DEBUG_CXXFLAGS)) \
+ $(if $(ENABLE_DEBUG),$(gb_DEBUG_CFLAGS)) \
$(if $(ENABLE_DBGUTIL),-D_GLIBCXX_DEBUG) \
$(if $(filter $(true),$(gb_SYMBOL)),$(gb_DEBUGINFO_FLAGS))' \
$(if $(filter LINUX,$(OS)), \
diff --git a/external/harfbuzz/ExternalProject_harfbuzz.mk b/external/harfbuzz/ExternalProject_harfbuzz.mk
index ad5c187ba4c5..4fab439641fb 100644
--- a/external/harfbuzz/ExternalProject_harfbuzz.mk
+++ b/external/harfbuzz/ExternalProject_harfbuzz.mk
@@ -47,7 +47,7 @@ $(call gb_ExternalProject_get_state_target,harfbuzz,build) :
$(if $(filter $(true),$(gb_SYMBOL)),$(gb_DEBUGINFO_FLAGS)) \
$(if $(ENABLE_OPTIMIZED), \
$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) \
- $(if $(debug),$(gb_DEBUG_CFLAGS) $(gb_DEBUG_CXXFLAGS)) \
+ $(if $(debug),$(gb_DEBUG_CFLAGS)) \
$(CXXFLAGS) $(CXXFLAGS_CXX11) \
$(ICU_UCHAR_TYPE) \
$(if $(filter LINUX,$(OS)),-fvisibility=hidden)' \
diff --git a/external/hunspell/ExternalProject_hunspell.mk b/external/hunspell/ExternalProject_hunspell.mk
index 375092bf390a..7afa04bf893d 100644
--- a/external/hunspell/ExternalProject_hunspell.mk
+++ b/external/hunspell/ExternalProject_hunspell.mk
@@ -27,7 +27,7 @@ $(call gb_ExternalProject_get_state_target,hunspell,build):
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM))\
$(if $(filter AIX,$(OS)),CFLAGS="-D_LINUX_SOURCE_COMPAT") \
$(if $(hunspell_CPPFLAGS),CPPFLAGS='$(hunspell_CPPFLAGS)') \
- CXXFLAGS="$(CXXFLAGS) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) $(if $(debug),$(gb_DEBUGINFO_FLAGS) $(gb_DEBUG_CXXFLAGS))" \
+ CXXFLAGS="$(CXXFLAGS) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) $(if $(debug),$(gb_DEBUGINFO_FLAGS) $(gb_DEBUG_CFLAGS))" \
&& cd src/hunspell && $(MAKE) \
)
diff --git a/external/libnumbertext/ExternalProject_libnumbertext.mk b/external/libnumbertext/ExternalProject_libnumbertext.mk
index 679772700aad..52507d6e3dda 100644
--- a/external/libnumbertext/ExternalProject_libnumbertext.mk
+++ b/external/libnumbertext/ExternalProject_libnumbertext.mk
@@ -38,7 +38,7 @@ $(call gb_ExternalProject_get_state_target,libnumbertext,build):
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM))\
$(if $(filter AIX,$(OS)),CFLAGS="-D_LINUX_SOURCE_COMPAT") \
$(if $(libnumbertext_CPPFLAGS),CPPFLAGS='$(libnumbertext_CPPFLAGS)') \
- CXXFLAGS="$(libnumbertext_CXXFLAGS) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) $(if $(debug),$(gb_DEBUGINFO_FLAGS) $(gb_DEBUG_CXXFLAGS)) $(gb_VISIBILITY_FLAGS) $(gb_VISIBILITY_FLAGS_CXX)" \
+ CXXFLAGS="$(libnumbertext_CXXFLAGS) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) $(if $(debug),$(gb_DEBUGINFO_FLAGS) $(gb_DEBUG_CFLAGS)) $(gb_VISIBILITY_FLAGS) $(gb_VISIBILITY_FLAGS_CXX)" \
&& cd src && $(MAKE) \
)
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 96be7ad5f01c..b9ea5f55ec3d 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -44,8 +44,7 @@ gb_LinkTarget__debug_enabled = \
# debug flags, if ENABLE_DEBUG is set and the LinkTarget is named
# in the list of libraries of ENABLE_DEBUGINFO_FOR
-gb_LinkTarget__get_debugcflags=$(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) $(if $(call gb_LinkTarget__debug_enabled,$(1)),$(gb_DEBUG_CFLAGS)) $(if $(filter $(true),$(gb_SYMBOL)),$(gb_DEBUGINFO_FLAGS))
-gb_LinkTarget__get_debugcxxflags=$(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) $(if $(call gb_LinkTarget__debug_enabled,$(1)),$(gb_DEBUG_CFLAGS)) $(if $(filter $(true),$(gb_SYMBOL)),$(gb_DEBUGINFO_FLAGS))
+gb_LinkTarget__get_debugflags=$(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) $(if $(call gb_LinkTarget__debug_enabled,$(1)),$(gb_DEBUG_CFLAGS)) $(if $(filter $(true),$(gb_SYMBOL)),$(gb_DEBUGINFO_FLAGS))
# similar for LDFLAGS, use linker optimization flags in non-debug case,
# but moreover strip debug from libraries for which debuginfo is not wanted
@@ -56,11 +55,11 @@ gb_LinkTarget__get_debugldflags=$(if $(call gb_LinkTarget__debug_enabled,$(1)),,
# generic cflags/cxxflags to use (optimization flags, debug flags)
# user supplied CFLAGS/CXXFLAGS override default debug/optimization flags
# call gb_LinkTarget__get_cflags,linktargetmakefilename
-gb_LinkTarget__get_cflags=$(if $(CFLAGS),$(CFLAGS),$(call gb_LinkTarget__get_debugcflags,$(1)))
-gb_LinkTarget__get_objcflags=$(if $(OBJCFLAGS),$(OBJCFLAGS),$(call gb_LinkTarget__get_debugcflags,$(1)))
-gb_LinkTarget__get_cxxflags=$(if $(CXXFLAGS),$(CXXFLAGS),$(call gb_LinkTarget__get_debugcxxflags,$(1)))
-gb_LinkTarget__get_objcxxflags=$(if $(OBJCXXFLAGS),$(OBJCXXFLAGS),$(call gb_LinkTarget__get_debugcxxflags,$(1)))
-gb_LinkTarget__get_cxxclrflags=$(call gb_LinkTarget__get_debugcxxflags,$(1))
+gb_LinkTarget__get_cflags=$(if $(CFLAGS),$(CFLAGS),$(call gb_LinkTarget__get_debugflags,$(1)))
+gb_LinkTarget__get_objcflags=$(if $(OBJCFLAGS),$(OBJCFLAGS),$(call gb_LinkTarget__get_debugflags,$(1)))
+gb_LinkTarget__get_cxxflags=$(if $(CXXFLAGS),$(CXXFLAGS),$(call gb_LinkTarget__get_debugflags,$(1)))
+gb_LinkTarget__get_objcxxflags=$(if $(OBJCXXFLAGS),$(OBJCXXFLAGS),$(call gb_LinkTarget__get_debugflags,$(1)))
+gb_LinkTarget__get_cxxclrflags=$(call gb_LinkTarget__get_debugflags,$(1))
# call gb_LinkTarget__get_ldflags,linktargetmakefilename
gb_LinkTarget__get_ldflags=$(if $(LDFLAGS),$(LDFLAGS),$(call gb_LinkTarget__get_debugldflags,$(1)))
diff --git a/solenv/gbuild/gbuild.help.txt b/solenv/gbuild/gbuild.help.txt
index 51094b42ae50..665feb578fb1 100644
--- a/solenv/gbuild/gbuild.help.txt
+++ b/solenv/gbuild/gbuild.help.txt
@@ -132,7 +132,7 @@ INTERACTIVE VARIABLES:
CXXFLAGS Override compiler flags for C++ compilation.
Note: this overrides default optimization and debug
flags; to append flags without overriding, use:
- CXXFLAGS='$(call gb_LinkTarget__get_debugcxxflags,$(1)) -Wfoo'
+ CXXFLAGS='$(call gb_LinkTarget__get_debugflags,$(1)) -Wfoo'
ENVCFLAGSCXX Append compiler flags for C++ compilation.
OBJCFLAGS Override compiler flags for Objective C compilation.
OBJCXXFLAGS Override compiler flags for Objective C++ compilation.
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk
index 14d82ccdc0e2..5698e70d53f8 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -212,13 +212,7 @@ ifeq ($(HAVE_GCC_FNO_INLINE),TRUE)
FNO_INLINE=-fno-inline
endif
-ifeq ($(HAVE_GCC_FNO_DEFAULT_INLINE),TRUE)
-FNO_DEFAULT_INLINE=-fno-default-inline
-endif
-
gb_DEBUG_CFLAGS := $(FINLINE_LIMIT0) $(FNO_INLINE)
-gb_DEBUG_CXXFLAGS := $(FNO_DEFAULT_INLINE)
-
gb_LinkTarget_INCLUDE :=\
$(SOLARINC) \
ssibility/source/standard/vclxaccessibletoolboxitem.cxx2
-rw-r--r--avmedia/inc/mediacontrol.hxx2
-rw-r--r--avmedia/source/framework/mediacontrol.cxx2
-rw-r--r--avmedia/source/framework/mediaplayer.cxx6
-rw-r--r--avmedia/source/framework/mediatoolbox.cxx6
-rw-r--r--avmedia/source/opengl/oglwindow.cxx2
-rw-r--r--avmedia/source/opengl/oglwindow.hxx4
-rw-r--r--avmedia/source/viewer/mediaevent_impl.cxx16
-rw-r--r--avmedia/source/viewer/mediaevent_impl.hxx4
-rw-r--r--avmedia/source/viewer/mediawindow.cxx8
-rw-r--r--avmedia/source/viewer/mediawindow_impl.cxx8
-rw-r--r--avmedia/source/viewer/mediawindow_impl.hxx8
-rw-r--r--basctl/source/accessibility/accessibledialogcontrolshape.cxx12
-rw-r--r--basctl/source/accessibility/accessibledialogwindow.cxx8
-rw-r--r--basctl/source/basicide/basicbox.cxx12
-rw-r--r--basctl/source/basicide/basicbox.hxx10
-rw-r--r--basctl/source/basicide/baside2.cxx4
-rw-r--r--basctl/source/basicide/baside2.hxx16
-rw-r--r--basctl/source/basicide/baside2b.cxx6
-rw-r--r--basctl/source/basicide/baside3.cxx12
-rw-r--r--basctl/source/basicide/basides1.cxx8
-rw-r--r--basctl/source/basicide/basidesh.cxx2
-rw-r--r--basctl/source/basicide/basobj2.cxx4
-rw-r--r--basctl/source/basicide/basobj3.cxx4
-rw-r--r--basctl/source/basicide/bastype2.cxx6
-rw-r--r--basctl/source/basicide/bastype2.hxx4
-rw-r--r--basctl/source/basicide/bastype3.hxx2
-rw-r--r--basctl/source/basicide/bastypes.cxx20
-rw-r--r--basctl/source/basicide/brkdlg.cxx2
-rw-r--r--basctl/source/basicide/brkdlg.hxx2
-rw-r--r--basctl/source/basicide/layout.cxx2
-rw-r--r--basctl/source/basicide/layout.hxx4
-rw-r--r--basctl/source/basicide/linenumberwindow.cxx2
-rw-r--r--basctl/source/basicide/linenumberwindow.hxx4
-rw-r--r--basctl/source/basicide/macrodlg.cxx10
-rw-r--r--basctl/source/basicide/macrodlg.hxx2
-rw-r--r--basctl/source/basicide/moduldl2.cxx16
-rw-r--r--basctl/source/basicide/moduldlg.cxx16
-rw-r--r--basctl/source/basicide/moduldlg.hxx22
-rw-r--r--basctl/source/basicide/objdlg.cxx2
-rw-r--r--basctl/source/basicide/objdlg.hxx2
-rw-r--r--basctl/source/dlged/dlged.cxx2
-rw-r--r--basctl/source/dlged/dlgedfunc.cxx18
-rw-r--r--basctl/source/dlged/dlgedobj.cxx2
-rw-r--r--basctl/source/dlged/dlgedview.cxx2
-rw-r--r--basctl/source/dlged/managelang.cxx4
-rw-r--r--basctl/source/inc/accessibledialogcontrolshape.hxx4
-rw-r--r--basctl/source/inc/baside3.hxx4
-rw-r--r--basctl/source/inc/basidesh.hxx2
-rw-r--r--basctl/source/inc/basobj.hxx6
-rw-r--r--basctl/source/inc/bastypes.hxx18
-rw-r--r--basctl/source/inc/dlged.hxx8
-rw-r--r--basctl/source/inc/dlgedview.hxx2
-rw-r--r--basctl/source/inc/managelang.hxx4
-rw-r--r--basic/source/runtime/inputbox.cxx4
-rw-r--r--basic/source/runtime/iosys.cxx18
-rw-r--r--basic/source/runtime/methods.cxx2
-rw-r--r--canvas/source/cairo/cairo_cairo.cxx2
-rw-r--r--canvas/source/cairo/cairo_cairo.hxx4
-rw-r--r--canvas/source/cairo/cairo_quartz_cairo.cxx2
-rw-r--r--canvas/source/cairo/cairo_spritecanvas.cxx2
-rw-r--r--canvas/source/cairo/cairo_spritedevicehelper.cxx2
-rw-r--r--canvas/source/cairo/cairo_spritedevicehelper.hxx2
-rw-r--r--canvas/source/cairo/cairo_win32_cairo.cxx2
-rw-r--r--canvas/source/cairo/cairo_xlib_cairo.cxx6
-rw-r--r--canvas/source/directx/dx_9rm.cxx12
-rw-r--r--canvas/source/directx/dx_rendermodule.hxx4
-rw-r--r--canvas/source/directx/dx_spritecanvas.cxx2
-rw-r--r--canvas/source/directx/dx_spritedevicehelper.cxx2
-rw-r--r--canvas/source/directx/dx_spritedevicehelper.hxx2
-rw-r--r--canvas/source/opengl/ogl_spritecanvas.cxx2
-rw-r--r--canvas/source/opengl/ogl_spritedevicehelper.cxx2
-rw-r--r--canvas/source/opengl/ogl_spritedevicehelper.hxx4
-rw-r--r--canvas/source/tools/canvastools.cxx2
-rw-r--r--canvas/source/vcl/canvashelper.cxx4
-rw-r--r--canvas/source/vcl/spritecanvashelper.cxx4
-rw-r--r--canvas/source/vcl/windowoutdevholder.cxx4
-rw-r--r--canvas/source/vcl/windowoutdevholder.hxx2
-rw-r--r--canvas/workben/canvasdemo.cxx2
-rw-r--r--chart2/source/controller/accessibility/AccessibleBase.cxx2
-rw-r--r--chart2/source/controller/accessibility/AccessibleChartView.cxx4
-rw-r--r--chart2/source/controller/accessibility/AccessibleTextHelper.cxx2
-rw-r--r--chart2/source/controller/accessibility/AccessibleViewForwarder.cxx2
-rw-r--r--chart2/source/controller/accessibility/AccessibleViewForwarder.hxx6
-rw-r--r--chart2/source/controller/dialogs/DataBrowser.cxx22
-rw-r--r--chart2/source/controller/dialogs/DataBrowser.hxx2
-rw-r--r--chart2/source/controller/dialogs/TextDirectionListBox.cxx4
-rw-r--r--chart2/source/controller/dialogs/dlg_ChartType.cxx2
-rw-r--r--chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx2
-rw-r--r--chart2/source/controller/dialogs/dlg_CreationWizard.cxx2
-rw-r--r--chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx2
-rw-r--r--chart2/source/controller/dialogs/dlg_DataEditor.cxx10
-rw-r--r--chart2/source/controller/dialogs/dlg_DataSource.cxx6
-rw-r--r--chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx4
-rw-r--r--chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx2
-rw-r--r--chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx2
-rw-r--r--chart2/source/controller/dialogs/dlg_InsertLegend.cxx2
-rw-r--r--chart2/source/controller/dialogs/dlg_InsertTitle.cxx2
-rw-r--r--chart2/source/controller/dialogs/dlg_NumberFormat.cxx2
-rw-r--r--chart2/source/controller/dialogs/dlg_NumberFormat.hxx4
-rw-r--r--chart2/source/controller/dialogs/dlg_ObjectProperties.cxx2
-rw-r--r--chart2/source/controller/dialogs/dlg_ShapeFont.cxx2
-rw-r--r--chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx2
-rw-r--r--chart2/source/controller/dialogs/dlg_View3D.cxx2
-rw-r--r--chart2/source/controller/dialogs/res_DataLabel.cxx2
-rw-r--r--chart2/source/controller/dialogs/res_DataLabel.hxx4
-rw-r--r--chart2/source/controller/dialogs/res_Trendline.cxx2
-rw-r--r--chart2/source/controller/dialogs/res_Trendline.hxx2
-rw-r--r--chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx2
-rw-r--r--chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx2
-rw-r--r--chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx2
-rw-r--r--chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx2
-rw-r--r--chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx6
-rw-r--r--chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx4
-rw-r--r--chart2/source/controller/dialogs/tp_AxisLabel.cxx4
-rw-r--r--chart2/source/controller/dialogs/tp_AxisLabel.hxx4
-rw-r--r--chart2/source/controller/dialogs/tp_AxisPositions.cxx4
-rw-r--r--chart2/source/controller/dialogs/tp_AxisPositions.hxx4
-rw-r--r--chart2/source/controller/dialogs/tp_ChartType.cxx10
-rw-r--r--chart2/source/controller/dialogs/tp_ChartType.hxx2
-rw-r--r--chart2/source/controller/dialogs/tp_DataLabel.cxx4
-rw-r--r--chart2/source/controller/dialogs/tp_DataLabel.hxx4
-rw-r--r--chart2/source/controller/dialogs/tp_DataSource.cxx2
-rw-r--r--chart2/source/controller/dialogs/tp_DataSource.hxx2
-rw-r--r--chart2/source/controller/dialogs/tp_DataSourceControls.cxx4
-rw-r--r--chart2/source/controller/dialogs/tp_DataSourceControls.hxx2
-rw-r--r--chart2/source/controller/dialogs/tp_ErrorBars.cxx4
-rw-r--r--chart2/source/controller/dialogs/tp_ErrorBars.hxx4
-rw-r--r--chart2/source/controller/dialogs/tp_LegendPosition.cxx4
-rw-r--r--chart2/source/controller/dialogs/tp_LegendPosition.hxx4
-rw-r--r--chart2/source/controller/dialogs/tp_PointGeometry.cxx4
-rw-r--r--chart2/source/controller/dialogs/tp_PointGeometry.hxx4
-rw-r--r--chart2/source/controller/dialogs/tp_PolarOptions.cxx4
-rw-r--r--chart2/source/controller/dialogs/tp_PolarOptions.hxx4
-rw-r--r--chart2/source/controller/dialogs/tp_RangeChooser.cxx2
-rw-r--r--chart2/source/controller/dialogs/tp_RangeChooser.hxx2
-rw-r--r--chart2/source/controller/dialogs/tp_Scale.cxx4
-rw-r--r--chart2/source/controller/dialogs/tp_Scale.hxx4
-rw-r--r--chart2/source/controller/dialogs/tp_SeriesToAxis.cxx4
-rw-r--r--chart2/source/controller/dialogs/tp_SeriesToAxis.hxx4
-rw-r--r--chart2/source/controller/dialogs/tp_TitleRotation.cxx6
-rw-r--r--chart2/source/controller/dialogs/tp_TitleRotation.hxx6
-rw-r--r--chart2/source/controller/dialogs/tp_Trendline.cxx4
-rw-r--r--chart2/source/controller/dialogs/tp_Trendline.hxx4
-rw-r--r--chart2/source/controller/inc/TextDirectionListBox.hxx6
-rw-r--r--chart2/source/controller/inc/dlg_ChartType.hxx2
-rw-r--r--chart2/source/controller/inc/dlg_ChartType_UNO.hxx2
-rw-r--r--chart2/source/controller/inc/dlg_CreationWizard.hxx2
-rw-r--r--chart2/source/controller/inc/dlg_DataEditor.hxx8
-rw-r--r--chart2/source/controller/inc/dlg_DataSource.hxx2
-rw-r--r--chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx4
-rw-r--r--chart2/source/controller/inc/dlg_InsertDataLabel.hxx2
-rw-r--r--chart2/source/controller/inc/dlg_InsertErrorBars.hxx2
-rw-r--r--chart2/source/controller/inc/dlg_InsertLegend.hxx2
-rw-r--r--chart2/source/controller/inc/dlg_InsertTitle.hxx2
-rw-r--r--chart2/source/controller/inc/dlg_ObjectProperties.hxx2
-rw-r--r--chart2/source/controller/inc/dlg_ShapeFont.hxx2
-rw-r--r--chart2/source/controller/inc/dlg_ShapeParagraph.hxx2
-rw-r--r--chart2/source/controller/inc/dlg_View3D.hxx2
-rw-r--r--chart2/source/controller/main/ChartController.cxx4
-rw-r--r--chart2/source/controller/main/ChartController_EditData.cxx2
-rw-r--r--chart2/source/controller/main/ChartController_Window.cxx2
-rw-r--r--chart2/source/controller/main/ChartWindow.cxx14
-rw-r--r--chart2/source/controller/main/ChartWindow.hxx4
-rw-r--r--chart2/source/controller/main/ElementSelector.cxx4
-rw-r--r--chart2/source/controller/main/ElementSelector.hxx2
-rw-r--r--chart2/source/controller/main/ShapeController.cxx12
-rw-r--r--compilerplugins/clang/returnbyref.cxx2
-rw-r--r--cppcanvas/qa/unit/test.cxx2
-rw-r--r--cppcanvas/source/wrapper/vclfactory.cxx2
-rw-r--r--cui/source/customize/acccfg.cxx4
-rw-r--r--cui/source/customize/cfg.cxx34
-rw-r--r--cui/source/customize/cfgutil.cxx8
-rw-r--r--cui/source/customize/eventdlg.cxx2
-rw-r--r--cui/source/customize/eventdlg.hxx2
-rw-r--r--cui/source/customize/macropg.cxx14
-rw-r--r--cui/source/customize/macropg_impl.hxx2
-rw-r--r--cui/source/customize/selector.cxx10
-rw-r--r--cui/source/dialogs/SpellDialog.cxx8
-rw-r--r--cui/source/dialogs/about.cxx2
-rw-r--r--cui/source/dialogs/colorpicker.cxx28
-rw-r--r--cui/source/dialogs/cuicharmap.cxx6
-rw-r--r--cui/source/dialogs/cuifmsearch.cxx4
-rw-r--r--cui/source/dialogs/cuigaldlg.cxx20
-rw-r--r--cui/source/dialogs/cuigrfflt.cxx20
-rw-r--r--cui/source/dialogs/cuihyperdlg.cxx2
-rw-r--r--cui/source/dialogs/cuiimapwnd.cxx2
-rw-r--r--cui/source/dialogs/cuitbxform.cxx2
-rw-r--r--cui/source/dialogs/dlgname.cxx8
-rw-r--r--cui/source/dialogs/hangulhanjadlg.cxx30
-rw-r--r--cui/source/dialogs/hldocntp.cxx4
-rw-r--r--cui/source/dialogs/hldoctp.cxx4
-rw-r--r--cui/source/dialogs/hlinettp.cxx4
-rw-r--r--cui/source/dialogs/hlmailtp.cxx4
-rw-r--r--cui/source/dialogs/hlmarkwn.cxx4
-rw-r--r--cui/source/dialogs/hltpbase.cxx8
-rw-r--r--cui/source/dialogs/hyphen.cxx6
-rw-r--r--cui/source/dialogs/iconcdlg.cxx8
-rw-r--r--cui/source/dialogs/insdlg.cxx12
-rw-r--r--cui/source/dialogs/insrc.cxx2
-rw-r--r--cui/source/dialogs/linkdlg.cxx2
-rw-r--r--cui/source/dialogs/multipat.cxx4
-rw-r--r--cui/source/dialogs/newtabledlg.cxx2
-rw-r--r--cui/source/dialogs/passwdomdlg.cxx2
-rw-r--r--cui/source/dialogs/pastedlg.cxx2
-rw-r--r--cui/source/dialogs/postdlg.cxx2
-rw-r--r--cui/source/dialogs/scriptdlg.cxx26
-rw-r--r--cui/source/dialogs/sdrcelldlg.cxx2
-rw-r--r--cui/source/dialogs/showcols.cxx2
-rw-r--r--cui/source/dialogs/splitcelldlg.cxx2
-rw-r--r--cui/source/dialogs/srchxtra.cxx6
-rw-r--r--cui/source/dialogs/thesdlg.cxx14
-rw-r--r--cui/source/dialogs/zoom.cxx2
-rw-r--r--cui/source/factory/dlgfact.cxx152
-rw-r--r--cui/source/factory/dlgfact.hxx140
-rw-r--r--cui/source/factory/init.cxx2
-rw-r--r--cui/source/inc/ControlFocusHelper.hxx2
-rw-r--r--cui/source/inc/SpellDialog.hxx4
-rw-r--r--cui/source/inc/about.hxx2
-rw-r--r--cui/source/inc/acccfg.hxx4
-rw-r--r--cui/source/inc/align.hxx4
-rw-r--r--cui/source/inc/autocdlg.hxx36
-rw-r--r--cui/source/inc/backgrnd.hxx6
-rw-r--r--cui/source/inc/bbdlg.hxx2
-rw-r--r--cui/source/inc/border.hxx4
-rw-r--r--cui/source/inc/cfg.hxx24
-rw-r--r--cui/source/inc/cfgutil.hxx4
-rw-r--r--cui/source/inc/chardlg.hxx18
-rw-r--r--cui/source/inc/connect.hxx6
-rw-r--r--cui/source/inc/cuicharmap.hxx4
-rw-r--r--cui/source/inc/cuifmsearch.hxx4
-rw-r--r--cui/source/inc/cuigaldlg.hxx24
-rw-r--r--cui/source/inc/cuigrfflt.hxx18
-rw-r--r--cui/source/inc/cuihyperdlg.hxx2
-rw-r--r--cui/source/inc/cuiimapwnd.hxx2
-rw-r--r--cui/source/inc/cuioptgenrl.hxx4
-rw-r--r--cui/source/inc/cuisrchdlg.hxx2
-rw-r--r--cui/source/inc/cuitabarea.hxx42
-rw-r--r--cui/source/inc/cuitabline.hxx16
-rw-r--r--cui/source/inc/cuitbxform.hxx2
-rw-r--r--cui/source/inc/dbregister.hxx6
-rw-r--r--cui/source/inc/dlgname.hxx8
-rw-r--r--cui/source/inc/dstribut.hxx8
-rw-r--r--cui/source/inc/grfpage.hxx8
-rw-r--r--cui/source/inc/hangulhanjadlg.hxx14
-rw-r--r--cui/source/inc/headertablistbox.hxx2
-rw-r--r--cui/source/inc/hldocntp.hxx4
-rw-r--r--cui/source/inc/hldoctp.hxx4
-rw-r--r--cui/source/inc/hlinettp.hxx4
-rw-r--r--cui/source/inc/hlmailtp.hxx4
-rw-r--r--cui/source/inc/hlmarkwn.hxx2
-rw-r--r--cui/source/inc/hltpbase.hxx12
-rw-r--r--cui/source/inc/hyphen.hxx4
-rw-r--r--cui/source/inc/iconcdlg.hxx6
-rw-r--r--cui/source/inc/insdlg.hxx10
-rw-r--r--cui/source/inc/insrc.hxx2
-rw-r--r--cui/source/inc/labdlg.hxx6
-rw-r--r--cui/source/inc/linkdlg.hxx2
-rw-r--r--cui/source/inc/macroass.hxx8
-rw-r--r--cui/source/inc/macropg.hxx8
-rw-r--r--cui/source/inc/measure.hxx8
-rw-r--r--cui/source/inc/multipat.hxx4
-rw-r--r--cui/source/inc/newtabledlg.hxx2
-rw-r--r--cui/source/inc/numfmt.hxx10
-rw-r--r--cui/source/inc/numpages.hxx28
-rw-r--r--cui/source/inc/optasian.hxx4
-rw-r--r--cui/source/inc/optdict.hxx8
-rw-r--r--cui/source/inc/optlingu.hxx6
-rw-r--r--cui/source/inc/optpath.hxx4
-rw-r--r--cui/source/inc/page.hxx4
-rw-r--r--cui/source/inc/paragrph.hxx16
-rw-r--r--cui/source/inc/passwdomdlg.hxx2
-rw-r--r--cui/source/inc/pastedlg.hxx2
-rw-r--r--cui/source/inc/postdlg.hxx2
-rw-r--r--cui/source/inc/scriptdlg.hxx8
-rw-r--r--cui/source/inc/sdrcelldlg.hxx2
-rw-r--r--cui/source/inc/selector.hxx6
-rw-r--r--cui/source/inc/showcols.hxx2
-rw-r--r--cui/source/inc/splitcelldlg.hxx2
-rw-r--r--cui/source/inc/srchxtra.hxx6
-rw-r--r--cui/source/inc/swpossizetabpage.hxx4
-rw-r--r--cui/source/inc/tabstpge.hxx4
-rw-r--r--cui/source/inc/textanim.hxx6
-rw-r--r--cui/source/inc/textattr.hxx6
-rw-r--r--cui/source/inc/thesdlg.hxx8
-rw-r--r--cui/source/inc/transfrm.hxx20
-rw-r--r--cui/source/inc/treeopt.hxx6
-rw-r--r--cui/source/inc/zoom.hxx2
-rw-r--r--cui/source/options/certpath.cxx2
-rw-r--r--cui/source/options/certpath.hxx2
-rw-r--r--cui/source/options/connpooloptions.cxx10
-rw-r--r--cui/source/options/connpooloptions.hxx4
-rw-r--r--cui/source/options/cuisrchdlg.cxx2
-rw-r--r--cui/source/options/dbregister.cxx6
-rw-r--r--cui/source/options/doclinkdialog.cxx2
-rw-r--r--cui/source/options/doclinkdialog.hxx2
-rw-r--r--cui/source/options/fontsubs.cxx6
-rw-r--r--cui/source/options/fontsubs.hxx6
-rw-r--r--cui/source/options/optaboutconfig.cxx6
-rw-r--r--cui/source/options/optaboutconfig.hxx6
-rw-r--r--cui/source/options/optaccessibility.cxx4
-rw-r--r--cui/source/options/optaccessibility.hxx4
-rw-r--r--cui/source/options/optasian.cxx4
-rw-r--r--cui/source/options/optbasic.cxx4
-rw-r--r--cui/source/options/optbasic.hxx4
-rw-r--r--cui/source/options/optchart.cxx4
-rw-r--r--cui/source/options/optchart.hxx4
-rw-r--r--cui/source/options/optcolor.cxx40
-rw-r--r--cui/source/options/optcolor.hxx4
-rw-r--r--cui/source/options/optctl.cxx4
-rw-r--r--cui/source/options/optctl.hxx4
-rw-r--r--cui/source/options/optdict.cxx6
-rw-r--r--cui/source/options/optfltr.cxx8
-rw-r--r--cui/source/options/optfltr.hxx8
-rw-r--r--cui/source/options/optgdlg.cxx14
-rw-r--r--cui/source/options/optgdlg.hxx12
-rw-r--r--cui/source/options/optgenrl.cxx4
-rw-r--r--cui/source/options/opthtml.cxx4
-rw-r--r--cui/source/options/opthtml.hxx4
-rw-r--r--cui/source/options/optinet2.cxx14
-rw-r--r--cui/source/options/optinet2.hxx18
-rw-r--r--cui/source/options/optjava.cxx10
-rw-r--r--cui/source/options/optjava.hxx8
-rw-r--r--cui/source/options/optjsearch.cxx4
-rw-r--r--cui/source/options/optjsearch.hxx6
-rw-r--r--cui/source/options/optlingu.cxx8
-rw-r--r--cui/source/options/optmemory.cxx4
-rw-r--r--cui/source/options/optmemory.hxx4
-rw-r--r--cui/source/options/optpath.cxx4
-rw-r--r--cui/source/options/optsave.cxx4
-rw-r--r--cui/source/options/optsave.hxx4
-rw-r--r--cui/source/options/optupdt.cxx4
-rw-r--r--cui/source/options/optupdt.hxx4
-rw-r--r--cui/source/options/personalization.cxx6
-rw-r--r--cui/source/options/personalization.hxx6
-rw-r--r--cui/source/options/securityoptions.cxx2
-rw-r--r--cui/source/options/securityoptions.hxx2
-rw-r--r--cui/source/options/treeopt.cxx16
-rw-r--r--cui/source/options/webconninfo.cxx2
-rw-r--r--cui/source/options/webconninfo.hxx2
-rw-r--r--cui/source/tabpages/align.cxx4
-rw-r--r--cui/source/tabpages/autocdlg.cxx46
-rw-r--r--cui/source/tabpages/backgrnd.cxx16
-rw-r--r--cui/source/tabpages/bbdlg.cxx2
-rw-r--r--cui/source/tabpages/border.cxx4
-rw-r--r--cui/source/tabpages/chardlg.cxx18
-rw-r--r--cui/source/tabpages/connect.cxx6
-rw-r--r--cui/source/tabpages/dstribut.cxx8
-rw-r--r--cui/source/tabpages/grfpage.cxx8
-rw-r--r--cui/source/tabpages/labdlg.cxx6
-rw-r--r--cui/source/tabpages/macroass.cxx10
-rw-r--r--cui/source/tabpages/measure.cxx8
-rw-r--r--cui/source/tabpages/numfmt.cxx10
-rw-r--r--cui/source/tabpages/numpages.cxx28
-rw-r--r--cui/source/tabpages/page.cxx4
-rw-r--r--cui/source/tabpages/paragrph.cxx16
-rw-r--r--cui/source/tabpages/swpossizetabpage.cxx4
-rw-r--r--cui/source/tabpages/tabarea.cxx2
-rw-r--r--cui/source/tabpages/tabline.cxx2
-rw-r--r--cui/source/tabpages/tabstpge.cxx10
-rw-r--r--cui/source/tabpages/textanim.cxx6
-rw-r--r--cui/source/tabpages/textattr.cxx6
-rw-r--r--cui/source/tabpages/tparea.cxx12
-rw-r--r--cui/source/tabpages/tpbitmap.cxx8
-rw-r--r--cui/source/tabpages/tpcolor.cxx6
-rw-r--r--cui/source/tabpages/tpgradnt.cxx4
-rw-r--r--cui/source/tabpages/tphatch.cxx6
-rw-r--r--cui/source/tabpages/tpline.cxx6
-rw-r--r--cui/source/tabpages/tplnedef.cxx4
-rw-r--r--cui/source/tabpages/tplneend.cxx4
-rw-r--r--cui/source/tabpages/tpshadow.cxx6
-rw-r--r--cui/source/tabpages/transfrm.cxx20
-rw-r--r--dbaccess/source/ext/macromigration/macromigrationdialog.cxx2
-rw-r--r--dbaccess/source/ext/macromigration/macromigrationdialog.hxx2
-rw-r--r--dbaccess/source/ext/macromigration/macromigrationpages.cxx8
-rw-r--r--dbaccess/source/ext/macromigration/macromigrationpages.hxx8
-rw-r--r--dbaccess/source/ext/macromigration/macromigrationwizard.cxx4
-rw-r--r--dbaccess/source/filter/xml/xmlfilter.cxx4
-rw-r--r--dbaccess/source/ui/app/AppController.cxx6
-rw-r--r--dbaccess/source/ui/app/AppController.hxx2
-rw-r--r--dbaccess/source/ui/app/AppDetailPageHelper.cxx16
-rw-r--r--dbaccess/source/ui/app/AppDetailPageHelper.hxx12
-rw-r--r--dbaccess/source/ui/app/AppDetailView.cxx4
-rw-r--r--dbaccess/source/ui/app/AppDetailView.hxx6
-rw-r--r--dbaccess/source/ui/app/AppIconControl.cxx2
-rw-r--r--dbaccess/source/ui/app/AppIconControl.hxx2
-rw-r--r--dbaccess/source/ui/app/AppSwapWindow.cxx2
-rw-r--r--dbaccess/source/ui/app/AppSwapWindow.hxx4
-rw-r--r--dbaccess/source/ui/app/AppTitleWindow.cxx10
-rw-r--r--dbaccess/source/ui/app/AppTitleWindow.hxx10
-rw-r--r--dbaccess/source/ui/app/AppView.cxx8
-rw-r--r--dbaccess/source/ui/app/AppView.hxx4
-rw-r--r--dbaccess/source/ui/browser/brwctrlr.cxx2
-rw-r--r--dbaccess/source/ui/browser/brwview.cxx4
-rw-r--r--dbaccess/source/ui/browser/dataview.cxx2
-rw-r--r--dbaccess/source/ui/browser/dbtreeview.cxx4
-rw-r--r--dbaccess/source/ui/browser/dbtreeview.hxx4
-rw-r--r--dbaccess/source/ui/browser/genericcontroller.cxx6
-rw-r--r--dbaccess/source/ui/browser/sbagrid.cxx6
-rw-r--r--dbaccess/source/ui/browser/unodatbr.cxx4
-rw-r--r--dbaccess/source/ui/control/ColumnControlWindow.cxx2
-rw-r--r--dbaccess/source/ui/control/FieldControls.cxx10
-rw-r--r--dbaccess/source/ui/control/FieldDescControl.cxx10
-rw-r--r--dbaccess/source/ui/control/RelationControl.cxx6
-rw-r--r--dbaccess/source/ui/control/SqlNameEdit.cxx4
-rw-r--r--dbaccess/source/ui/control/TableGrantCtrl.cxx2
-rw-r--r--dbaccess/source/ui/control/VertSplitView.cxx4
-rw-r--r--dbaccess/source/ui/control/charsetlistbox.cxx4
-rw-r--r--dbaccess/source/ui/control/curledit.cxx4
-rw-r--r--dbaccess/source/ui/control/dbtreelistbox.cxx2
-rw-r--r--dbaccess/source/ui/control/marktree.cxx2
-rw-r--r--dbaccess/source/ui/control/opendoccontrols.cxx8
-rw-r--r--dbaccess/source/ui/control/tabletree.cxx4
-rw-r--r--dbaccess/source/ui/dlg/CollectionView.cxx2
-rw-r--r--dbaccess/source/ui/dlg/ConnectionHelper.cxx2
-rw-r--r--dbaccess/source/ui/dlg/ConnectionHelper.hxx2
-rw-r--r--dbaccess/source/ui/dlg/ConnectionPage.cxx4
-rw-r--r--dbaccess/source/ui/dlg/ConnectionPage.hxx4
-rw-r--r--dbaccess/source/ui/dlg/ConnectionPageSetup.cxx12
-rw-r--r--dbaccess/source/ui/dlg/ConnectionPageSetup.hxx12
-rw-r--r--dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx38
-rw-r--r--dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx38
-rw-r--r--dbaccess/source/ui/dlg/DbAdminImpl.cxx2
-rw-r--r--dbaccess/source/ui/dlg/DbAdminImpl.hxx6
-rw-r--r--dbaccess/source/ui/dlg/DriverSettings.hxx28
-rw-r--r--dbaccess/source/ui/dlg/QueryPropertiesDialog.cxx2
-rw-r--r--dbaccess/source/ui/dlg/TablesSingleDlg.cxx2
-rw-r--r--dbaccess/source/ui/dlg/TextConnectionHelper.cxx12
-rw-r--r--dbaccess/source/ui/dlg/TextConnectionHelper.hxx2
-rw-r--r--dbaccess/source/ui/dlg/UserAdmin.cxx8
-rw-r--r--dbaccess/source/ui/dlg/UserAdmin.hxx4
-rw-r--r--dbaccess/source/ui/dlg/UserAdminDlg.cxx4
-rw-r--r--dbaccess/source/ui/dlg/admincontrols.cxx8
-rw-r--r--dbaccess/source/ui/dlg/admincontrols.hxx2
-rw-r--r--dbaccess/source/ui/dlg/adminpages.cxx4
-rw-r--r--dbaccess/source/ui/dlg/adminpages.hxx4
-rw-r--r--dbaccess/source/ui/dlg/adtabdlg.cxx2
-rw-r--r--dbaccess/source/ui/dlg/advancedsettings.cxx8
-rw-r--r--dbaccess/source/ui/dlg/advancedsettings.hxx4
-rw-r--r--dbaccess/source/ui/dlg/dbadmin.cxx4
-rw-r--r--dbaccess/source/ui/dlg/dbfindex.cxx2
-rw-r--r--dbaccess/source/ui/dlg/dbfindex.hxx2
-rw-r--r--dbaccess/source/ui/dlg/dbwiz.cxx2
-rw-r--r--dbaccess/source/ui/dlg/dbwizsetup.cxx2
-rw-r--r--dbaccess/source/ui/dlg/detailpages.cxx44
-rw-r--r--dbaccess/source/ui/dlg/detailpages.hxx22
-rw-r--r--dbaccess/source/ui/dlg/directsql.cxx2
-rw-r--r--dbaccess/source/ui/dlg/dlgattr.cxx2
-rw-r--r--dbaccess/source/ui/dlg/dlgsave.cxx4
-rw-r--r--dbaccess/source/ui/dlg/dlgsize.cxx2
-rw-r--r--dbaccess/source/ui/dlg/dsselect.cxx2
-rw-r--r--dbaccess/source/ui/dlg/dsselect.hxx2
-rw-r--r--dbaccess/source/ui/dlg/generalpage.cxx6
-rw-r--r--dbaccess/source/ui/dlg/generalpage.hxx6
-rw-r--r--dbaccess/source/ui/dlg/indexdialog.cxx6
-rw-r--r--dbaccess/source/ui/dlg/indexfieldscontrol.cxx4
-rw-r--r--dbaccess/source/ui/dlg/paramdialog.cxx4
-rw-r--r--dbaccess/source/ui/dlg/queryfilter.cxx2
-rw-r--r--dbaccess/source/ui/dlg/queryorder.cxx2
-rw-r--r--dbaccess/source/ui/dlg/sqlmessage.cxx14
-rw-r--r--dbaccess/source/ui/dlg/tablespage.cxx2
-rw-r--r--dbaccess/source/ui/dlg/tablespage.hxx2
-rw-r--r--dbaccess/source/ui/dlg/textconnectionsettings.cxx2
-rw-r--r--dbaccess/source/ui/inc/CollectionView.hxx2
-rw-r--r--dbaccess/source/ui/inc/ColumnControlWindow.hxx2
-rw-r--r--dbaccess/source/ui/inc/FieldControls.hxx8
-rw-r--r--dbaccess/source/ui/inc/FieldDescControl.hxx8
-rw-r--r--dbaccess/source/ui/inc/JoinDesignView.hxx2
-rw-r--r--dbaccess/source/ui/inc/JoinExchange.hxx2
-rw-r--r--dbaccess/source/ui/inc/JoinTableView.hxx10
-rw-r--r--dbaccess/source/ui/inc/LimitBox.hxx2
-rw-r--r--dbaccess/source/ui/inc/QueryPropertiesDialog.hxx2
-rw-r--r--dbaccess/source/ui/inc/QueryTableView.hxx2
-rw-r--r--dbaccess/source/ui/inc/QueryTextView.hxx2
-rw-r--r--dbaccess/source/ui/inc/RelationController.hxx2
-rw-r--r--dbaccess/source/ui/inc/RelationDesignView.hxx2
-rw-r--r--dbaccess/source/ui/inc/RelationTableView.hxx2
-rw-r--r--dbaccess/source/ui/inc/SqlNameEdit.hxx8
-rw-r--r--dbaccess/source/ui/inc/TableConnection.hxx2
-rw-r--r--dbaccess/source/ui/inc/TableController.hxx2
-rw-r--r--dbaccess/source/ui/inc/TableDesignControl.hxx2
-rw-r--r--dbaccess/source/ui/inc/TableDesignHelpBar.hxx2
-rw-r--r--dbaccess/source/ui/inc/TableDesignView.hxx6
-rw-r--r--dbaccess/source/ui/inc/TableFieldDescription.hxx8
-rw-r--r--dbaccess/source/ui/inc/TableGrantCtrl.hxx2
-rw-r--r--dbaccess/source/ui/inc/TableWindow.hxx4
-rw-r--r--dbaccess/source/ui/inc/TablesSingleDlg.hxx2
-rw-r--r--dbaccess/source/ui/inc/TokenWriter.hxx4
-rw-r--r--dbaccess/source/ui/inc/UITools.hxx22
-rw-r--r--dbaccess/source/ui/inc/UserAdminDlg.hxx2
-rw-r--r--dbaccess/source/ui/inc/VertSplitView.hxx10
-rw-r--r--dbaccess/source/ui/inc/WCPage.hxx2
-rw-r--r--dbaccess/source/ui/inc/WColumnSelect.hxx2
-rw-r--r--dbaccess/source/ui/inc/WCopyTable.hxx4
-rw-r--r--dbaccess/source/ui/inc/WExtendPages.hxx10
-rw-r--r--dbaccess/source/ui/inc/WNameMatch.hxx4
-rw-r--r--dbaccess/source/ui/inc/WTabPage.hxx2
-rw-r--r--dbaccess/source/ui/inc/WTypeSelect.hxx14
-rw-r--r--dbaccess/source/ui/inc/adtabdlg.hxx4
-rw-r--r--dbaccess/source/ui/inc/advancedsettingsdlg.hxx2
-rw-r--r--dbaccess/source/ui/inc/brwctrlr.hxx2
-rw-r--r--dbaccess/source/ui/inc/brwview.hxx4
-rw-r--r--dbaccess/source/ui/inc/charsetlistbox.hxx2
-rw-r--r--dbaccess/source/ui/inc/curledit.hxx2
-rw-r--r--dbaccess/source/ui/inc/datasourceconnector.hxx8
-rw-r--r--dbaccess/source/ui/inc/dbadmin.hxx2
-rw-r--r--dbaccess/source/ui/inc/dbtreelistbox.hxx2
-rw-r--r--dbaccess/source/ui/inc/dbwiz.hxx2
-rw-r--r--dbaccess/source/ui/inc/dbwizsetup.hxx2
-rw-r--r--dbaccess/source/ui/inc/directsql.hxx2
-rw-r--r--dbaccess/source/ui/inc/dlgattr.hxx2
-rw-r--r--dbaccess/source/ui/inc/dlgsave.hxx4
-rw-r--r--dbaccess/source/ui/inc/dlgsize.hxx2
-rw-r--r--dbaccess/source/ui/inc/indexdialog.hxx4
-rw-r--r--dbaccess/source/ui/inc/indexfieldscontrol.hxx2
-rw-r--r--dbaccess/source/ui/inc/linkeddocuments.hxx6
-rw-r--r--dbaccess/source/ui/inc/marktree.hxx2
-rw-r--r--dbaccess/source/ui/inc/opendoccontrols.hxx4
-rw-r--r--dbaccess/source/ui/inc/paramdialog.hxx2
-rw-r--r--dbaccess/source/ui/inc/querycontainerwindow.hxx4
-rw-r--r--dbaccess/source/ui/inc/querycontroller.hxx2
-rw-r--r--dbaccess/source/ui/inc/queryfilter.hxx2
-rw-r--r--dbaccess/source/ui/inc/queryorder.hxx2
-rw-r--r--dbaccess/source/ui/inc/queryview.hxx2
-rw-r--r--dbaccess/source/ui/inc/sbagrid.hxx4
-rw-r--r--dbaccess/source/ui/inc/sqlmessage.hxx8
-rw-r--r--dbaccess/source/ui/inc/tabletree.hxx2
-rw-r--r--dbaccess/source/ui/inc/textconnectionsettings.hxx2
-rw-r--r--dbaccess/source/ui/inc/unodatbr.hxx2
-rw-r--r--dbaccess/source/ui/inc/unosqlmessage.hxx2
-rw-r--r--dbaccess/source/ui/misc/RowSetDrop.cxx2
-rw-r--r--dbaccess/source/ui/misc/UITools.cxx16
-rw-r--r--dbaccess/source/ui/misc/WCPage.cxx2
-rw-r--r--dbaccess/source/ui/misc/WColumnSelect.cxx4
-rw-r--r--dbaccess/source/ui/misc/WCopyTable.cxx4
-rw-r--r--dbaccess/source/ui/misc/WExtendPages.cxx2
-rw-r--r--dbaccess/source/ui/misc/WNameMatch.cxx6
-rw-r--r--dbaccess/source/ui/misc/WTypeSelect.cxx6
-rw-r--r--dbaccess/source/ui/misc/controllerframe.cxx2
-rw-r--r--dbaccess/source/ui/misc/databaseobjectview.cxx2
-rw-r--r--dbaccess/source/ui/misc/datasourceconnector.cxx4
-rw-r--r--dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx2
-rw-r--r--dbaccess/source/ui/misc/linkeddocuments.cxx2
-rw-r--r--dbaccess/source/ui/querydesign/JoinController.cxx8
-rw-r--r--dbaccess/source/ui/querydesign/JoinDesignView.cxx6
-rw-r--r--dbaccess/source/ui/querydesign/JoinExchange.cxx2
-rw-r--r--dbaccess/source/ui/querydesign/JoinTableView.cxx12
-rw-r--r--dbaccess/source/ui/querydesign/LimitBox.cxx4
-rw-r--r--dbaccess/source/ui/querydesign/QTableWindow.cxx2
-rw-r--r--dbaccess/source/ui/querydesign/QTableWindow.hxx2
-rw-r--r--dbaccess/source/ui/querydesign/QueryDesignView.cxx4
-rw-r--r--dbaccess/source/ui/querydesign/QueryTableView.cxx2
-rw-r--r--dbaccess/source/ui/querydesign/QueryTextView.cxx2
-rw-r--r--dbaccess/source/ui/querydesign/QueryViewSwitch.cxx6
-rw-r--r--dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx2
-rw-r--r--dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx2
-rw-r--r--dbaccess/source/ui/querydesign/TableWindow.cxx4
-rw-r--r--dbaccess/source/ui/querydesign/TableWindowListBox.cxx2
-rw-r--r--dbaccess/source/ui/querydesign/limitboxcontroller.cxx6
-rw-r--r--dbaccess/source/ui/querydesign/querycontainerwindow.cxx4
-rw-r--r--dbaccess/source/ui/querydesign/querycontroller.cxx6
-rw-r--r--dbaccess/source/ui/querydesign/queryview.cxx2
-rw-r--r--dbaccess/source/ui/relationdesign/RTableWindow.hxx2
-rw-r--r--dbaccess/source/ui/relationdesign/RelationController.cxx2
-rw-r--r--dbaccess/source/ui/relationdesign/RelationDesignView.cxx2
-rw-r--r--dbaccess/source/ui/relationdesign/RelationTableView.cxx2
-rw-r--r--dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx4
-rw-r--r--dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx2
-rw-r--r--dbaccess/source/ui/tabledesign/TEditControl.cxx2
-rw-r--r--dbaccess/source/ui/tabledesign/TEditControl.hxx2
-rw-r--r--dbaccess/source/ui/tabledesign/TableController.cxx2
-rw-r--r--dbaccess/source/ui/tabledesign/TableDesignControl.cxx2
-rw-r--r--dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx4
-rw-r--r--dbaccess/source/ui/tabledesign/TableDesignView.cxx10
-rw-r--r--dbaccess/source/ui/tabledesign/TableFieldControl.cxx2
-rw-r--r--dbaccess/source/ui/tabledesign/TableFieldControl.hxx2
-rw-r--r--dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx8
-rw-r--r--dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx2
-rw-r--r--dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx4
-rw-r--r--dbaccess/source/ui/uno/ColumnControl.cxx2
-rw-r--r--dbaccess/source/ui/uno/ColumnPeer.cxx2
-rw-r--r--dbaccess/source/ui/uno/ColumnPeer.hxx2
-rw-r--r--dbaccess/source/ui/uno/DBTypeWizDlg.cxx2
-rw-r--r--dbaccess/source/ui/uno/DBTypeWizDlg.hxx2
-rw-r--r--dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx2
-rw-r--r--dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx2
-rw-r--r--dbaccess/source/ui/uno/TableFilterDlg.cxx2
-rw-r--r--dbaccess/source/ui/uno/TableFilterDlg.hxx2
-rw-r--r--dbaccess/source/ui/uno/UserSettingsDlg.cxx2
-rw-r--r--dbaccess/source/ui/uno/UserSettingsDlg.hxx2
-rw-r--r--dbaccess/source/ui/uno/admindlg.cxx2
-rw-r--r--dbaccess/source/ui/uno/admindlg.hxx2
-rw-r--r--dbaccess/source/ui/uno/composerdialogs.cxx6
-rw-r--r--dbaccess/source/ui/uno/composerdialogs.hxx8
-rw-r--r--dbaccess/source/ui/uno/copytablewizard.cxx4
-rw-r--r--dbaccess/source/ui/uno/textconnectionsettings_uno.cxx4
-rw-r--r--dbaccess/source/ui/uno/unoDirectSql.cxx2
-rw-r--r--dbaccess/source/ui/uno/unoDirectSql.hxx2
-rw-r--r--dbaccess/source/ui/uno/unosqlmessage.cxx2
-rw-r--r--desktop/source/app/app.cxx4
-rw-r--r--desktop/source/deployment/gui/dp_gui_dependencydialog.cxx4
-rw-r--r--desktop/source/deployment/gui/dp_gui_dependencydialog.hxx4
-rw-r--r--desktop/source/deployment/gui/dp_gui_dialog2.cxx14
-rw-r--r--desktop/source/deployment/gui/dp_gui_dialog2.hxx8
-rw-r--r--desktop/source/deployment/gui/dp_gui_extlistbox.cxx4
-rw-r--r--desktop/source/deployment/gui/dp_gui_extlistbox.hxx2
-rw-r--r--desktop/source/deployment/gui/dp_gui_theextmgr.cxx4
-rw-r--r--desktop/source/deployment/gui/dp_gui_theextmgr.hxx4
-rw-r--r--desktop/source/deployment/gui/dp_gui_updatedialog.cxx6
-rw-r--r--desktop/source/deployment/gui/dp_gui_updatedialog.hxx6
-rw-r--r--desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx4
-rw-r--r--desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx4
-rw-r--r--desktop/source/deployment/gui/license_dialog.cxx10
-rw-r--r--drawinglayer/source/primitive2d/controlprimitive2d.cxx2
-rw-r--r--editeng/source/editeng/editeng.cxx2
-rw-r--r--editeng/source/editeng/editsel.cxx4
-rw-r--r--editeng/source/editeng/editview.cxx10
-rw-r--r--editeng/source/editeng/edtspell.cxx2
-rw-r--r--editeng/source/editeng/edtspell.hxx2
-rw-r--r--editeng/source/editeng/impedit.cxx8
-rw-r--r--editeng/source/editeng/impedit.hxx12
-rw-r--r--editeng/source/editeng/impedit2.cxx2
-rw-r--r--editeng/source/editeng/textconv.cxx2
-rw-r--r--editeng/source/editeng/textconv.hxx4
-rw-r--r--editeng/source/misc/hangulhanja.cxx8
-rw-r--r--editeng/source/misc/splwrap.cxx6
-rw-r--r--editeng/source/misc/svxacorr.cxx2
-rw-r--r--editeng/source/misc/unolingu.cxx2
-rw-r--r--editeng/source/outliner/outlvw.cxx8
-rw-r--r--extensions/source/abpilot/abspilot.cxx2
-rw-r--r--extensions/source/abpilot/abspilot.hxx2
-rw-r--r--extensions/source/abpilot/admininvokationimpl.cxx2
-rw-r--r--extensions/source/abpilot/admininvokationimpl.hxx6
-rw-r--r--extensions/source/abpilot/datasourcehandling.cxx2
-rw-r--r--extensions/source/abpilot/datasourcehandling.hxx4
-rw-r--r--extensions/source/abpilot/fieldmappingimpl.cxx2
-rw-r--r--extensions/source/abpilot/fieldmappingimpl.hxx4
-rw-r--r--extensions/source/abpilot/unodialogabp.cxx2
-rw-r--r--extensions/source/abpilot/unodialogabp.hxx2
-rw-r--r--extensions/source/bibliography/bibbeam.cxx12
-rw-r--r--extensions/source/bibliography/bibbeam.hxx2
-rw-r--r--extensions/source/bibliography/bibcont.cxx18
-rw-r--r--extensions/source/bibliography/bibcont.hxx8
-rw-r--r--extensions/source/bibliography/bibload.cxx2
-rw-r--r--extensions/source/bibliography/bibshortcuthandler.hxx18
-rw-r--r--extensions/source/bibliography/bibtools.hxx6
-rw-r--r--extensions/source/bibliography/bibview.cxx2
-rw-r--r--extensions/source/bibliography/bibview.hxx2
-rw-r--r--extensions/source/bibliography/datman.cxx12
-rw-r--r--extensions/source/bibliography/datman.hxx6
-rw-r--r--extensions/source/bibliography/framectr.cxx22
-rw-r--r--extensions/source/bibliography/general.cxx12
-rw-r--r--extensions/source/bibliography/general.hxx6
-rw-r--r--extensions/source/bibliography/toolbar.cxx2
-rw-r--r--extensions/source/bibliography/toolbar.hxx2
-rw-r--r--extensions/source/dbpilots/controlwizard.cxx4
-rw-r--r--extensions/source/dbpilots/controlwizard.hxx4
-rw-r--r--extensions/source/dbpilots/gridwizard.cxx2
-rw-r--r--extensions/source/dbpilots/gridwizard.hxx2
-rw-r--r--extensions/source/dbpilots/groupboxwiz.cxx2
-rw-r--r--extensions/source/dbpilots/groupboxwiz.hxx2
-rw-r--r--extensions/source/dbpilots/listcombowizard.cxx2
-rw-r--r--extensions/source/dbpilots/listcombowizard.hxx2
-rw-r--r--extensions/source/dbpilots/unoautopilot.hxx2
-rw-r--r--extensions/source/dbpilots/unoautopilot.inl2
-rw-r--r--extensions/source/plugin/base/plctrl.cxx2
-rw-r--r--extensions/source/propctrlr/MasterDetailLinkDialog.cxx2
-rw-r--r--extensions/source/propctrlr/MasterDetailLinkDialog.hxx2
-rw-r--r--extensions/source/propctrlr/browserline.cxx16
-rw-r--r--extensions/source/propctrlr/browserline.hxx12
-rw-r--r--extensions/source/propctrlr/browserlistbox.cxx8
-rw-r--r--extensions/source/propctrlr/browserlistbox.hxx2
-rw-r--r--extensions/source/propctrlr/browserpage.cxx2
-rw-r--r--extensions/source/propctrlr/browserpage.hxx2
-rw-r--r--extensions/source/propctrlr/browserview.cxx4
-rw-r--r--extensions/source/propctrlr/browserview.hxx4
-rw-r--r--extensions/source/propctrlr/commoncontrol.cxx8
-rw-r--r--extensions/source/propctrlr/commoncontrol.hxx20
-rw-r--r--extensions/source/propctrlr/controlfontdialog.cxx2
-rw-r--r--extensions/source/propctrlr/controlfontdialog.hxx2
-rw-r--r--extensions/source/propctrlr/defaulthelpprovider.cxx6
-rw-r--r--extensions/source/propctrlr/defaulthelpprovider.hxx4
-rw-r--r--extensions/source/propctrlr/fontdialog.cxx2
-rw-r--r--extensions/source/propctrlr/fontdialog.hxx2
-rw-r--r--extensions/source/propctrlr/formcomponenthandler.hxx2
-rw-r--r--extensions/source/propctrlr/formlinkdialog.cxx8
-rw-r--r--extensions/source/propctrlr/formlinkdialog.hxx2
-rw-r--r--extensions/source/propctrlr/handlerhelper.cxx4
-rw-r--r--extensions/source/propctrlr/handlerhelper.hxx6
-rw-r--r--extensions/source/propctrlr/inspectorhelpwindow.cxx2
-rw-r--r--extensions/source/propctrlr/inspectorhelpwindow.hxx4
-rw-r--r--extensions/source/propctrlr/listselectiondlg.cxx2
-rw-r--r--extensions/source/propctrlr/listselectiondlg.hxx2
-rw-r--r--extensions/source/propctrlr/newdatatype.cxx2
-rw-r--r--extensions/source/propctrlr/newdatatype.hxx2
-rw-r--r--extensions/source/propctrlr/pcrunodialogs.cxx2
-rw-r--r--extensions/source/propctrlr/pcrunodialogs.hxx2
-rw-r--r--extensions/source/propctrlr/propcontroller.cxx4
-rw-r--r--extensions/source/propctrlr/propcontroller.hxx4
-rw-r--r--extensions/source/propctrlr/propertyeditor.cxx2
-rw-r--r--extensions/source/propctrlr/propertyeditor.hxx2
-rw-r--r--extensions/source/propctrlr/propertyhandler.cxx2
-rw-r--r--extensions/source/propctrlr/propertyhandler.hxx4
-rw-r--r--extensions/source/propctrlr/selectlabeldialog.cxx2
-rw-r--r--extensions/source/propctrlr/selectlabeldialog.hxx2
-rw-r--r--extensions/source/propctrlr/standardcontrol.cxx36
-rw-r--r--extensions/source/propctrlr/standardcontrol.hxx28
-rw-r--r--extensions/source/propctrlr/taborder.cxx6
-rw-r--r--extensions/source/propctrlr/taborder.hxx4
-rw-r--r--extensions/source/propctrlr/usercontrol.cxx8
-rw-r--r--extensions/source/propctrlr/usercontrol.hxx10
-rw-r--r--extensions/source/scanner/grid.cxx14
-rw-r--r--extensions/source/scanner/grid.hxx2
-rw-r--r--extensions/source/scanner/sanedlg.cxx8
-rw-r--r--extensions/source/scanner/sanedlg.hxx2
-rw-r--r--extensions/source/update/ui/updatecheckui.cxx16
-rw-r--r--filter/source/flash/impswfdialog.cxx2
-rw-r--r--filter/source/flash/impswfdialog.hxx4
-rw-r--r--filter/source/flash/swfdialog.cxx2
-rw-r--r--filter/source/flash/swfdialog.hxx4
-rw-r--r--filter/source/msfilter/mstoolbar.cxx2
-rw-r--r--filter/source/pdf/impdialog.cxx28
-rw-r--r--filter/source/pdf/impdialog.hxx26
-rw-r--r--filter/source/pdf/pdfdialog.cxx2
-rw-r--r--filter/source/pdf/pdfdialog.hxx4
-rw-r--r--filter/source/pdf/pdffilter.cxx2
-rw-r--r--filter/source/svg/impsvgdialog.cxx4
-rw-r--r--filter/source/svg/impsvgdialog.hxx4
-rw-r--r--filter/source/svg/svgdialog.cxx2
-rw-r--r--filter/source/svg/svgdialog.hxx2
-rw-r--r--filter/source/svg/svgfilter.cxx2
-rw-r--r--filter/source/xsltdialog/xmlfilterdialogcomponent.cxx2
-rw-r--r--filter/source/xsltdialog/xmlfiltersettingsdialog.cxx6
-rw-r--r--filter/source/xsltdialog/xmlfiltersettingsdialog.hxx4
-rw-r--r--filter/source/xsltdialog/xmlfiltertabdialog.cxx4
-rw-r--r--filter/source/xsltdialog/xmlfiltertabdialog.hxx4
-rw-r--r--filter/source/xsltdialog/xmlfiltertabpagebasic.cxx2
-rw-r--r--filter/source/xsltdialog/xmlfiltertabpagebasic.hxx4
-rw-r--r--filter/source/xsltdialog/xmlfiltertabpagexslt.cxx2
-rw-r--r--filter/source/xsltdialog/xmlfiltertabpagexslt.hxx4
-rw-r--r--filter/source/xsltdialog/xmlfiltertestdialog.cxx2
-rw-r--r--filter/source/xsltdialog/xmlfiltertestdialog.hxx2
-rw-r--r--forms/source/richtext/richtextcontrol.cxx6
-rw-r--r--forms/source/richtext/richtextcontrol.hxx2
-rw-r--r--forms/source/richtext/richtextimplcontrol.hxx4
-rw-r--r--forms/source/richtext/richtextvclcontrol.cxx4
-rw-r--r--forms/source/richtext/richtextvclcontrol.hxx4
-rw-r--r--forms/source/richtext/richtextviewport.cxx2
-rw-r--r--forms/source/richtext/richtextviewport.hxx2
-rw-r--r--forms/source/solar/component/navbarcontrol.cxx4
-rw-r--r--forms/source/solar/component/navbarcontrol.hxx2
-rw-r--r--forms/source/solar/control/navtoolbar.cxx28
-rw-r--r--forms/source/solar/inc/navtoolbar.hxx24
-rw-r--r--formula/source/ui/dlg/ControlHelper.hxx4
-rw-r--r--formula/source/ui/dlg/formula.cxx16
-rw-r--r--formula/source/ui/dlg/funcpage.cxx6
-rw-r--r--formula/source/ui/dlg/funcpage.hxx4
-rw-r--r--formula/source/ui/dlg/funcutl.cxx22
-rw-r--r--formula/source/ui/dlg/parawin.cxx4
-rw-r--r--formula/source/ui/dlg/parawin.hxx2
-rw-r--r--formula/source/ui/dlg/structpg.cxx6
-rw-r--r--formula/source/ui/dlg/structpg.hxx4
-rw-r--r--fpicker/source/office/OfficeControlAccess.cxx4
-rw-r--r--fpicker/source/office/OfficeControlAccess.hxx4
-rw-r--r--fpicker/source/office/OfficeFilePicker.cxx2
-rw-r--r--fpicker/source/office/OfficeFilePicker.hxx2
-rw-r--r--fpicker/source/office/OfficeFolderPicker.cxx2
-rw-r--r--fpicker/source/office/OfficeFolderPicker.hxx2
-rw-r--r--fpicker/source/office/PlacesListBox.cxx2
-rw-r--r--fpicker/source/office/PlacesListBox.hxx2
-rw-r--r--fpicker/source/office/QueryFolderName.hxx2
-rw-r--r--fpicker/source/office/commonpicker.hxx4
-rw-r--r--fpicker/source/office/iodlg.cxx18
-rw-r--r--fpicker/source/office/iodlg.hxx6
-rw-r--r--fpicker/source/office/iodlgimp.cxx4
-rw-r--r--fpicker/source/office/iodlgimp.hxx4
-rw-r--r--fpicker/test/svdem.cxx4
-rw-r--r--framework/inc/classes/fwktabwindow.hxx8
-rw-r--r--framework/inc/helper/vclstatusindicator.hxx4
-rw-r--r--framework/inc/uielement/complextoolbarcontroller.hxx4
-rw-r--r--framework/inc/uielement/statusbar.hxx2
-rw-r--r--framework/source/classes/fwktabwindow.cxx8
-rw-r--r--framework/source/classes/menumanager.cxx4
-rw-r--r--framework/source/dispatch/closedispatcher.cxx4
-rw-r--r--framework/source/dispatch/menudispatcher.cxx4
-rw-r--r--framework/source/dispatch/windowcommanddispatch.cxx4
-rw-r--r--framework/source/helper/persistentwindowstate.cxx4
-rw-r--r--framework/source/helper/statusindicatorfactory.cxx2
-rw-r--r--framework/source/helper/tagwindowasmodified.cxx2
-rw-r--r--framework/source/helper/titlebarupdate.cxx6
-rw-r--r--framework/source/helper/vclstatusindicator.cxx6
-rw-r--r--framework/source/inc/pattern/window.hxx6
-rw-r--r--framework/source/layoutmanager/helpers.cxx12
-rw-r--r--framework/source/layoutmanager/helpers.hxx6
-rw-r--r--framework/source/layoutmanager/layoutmanager.cxx36
-rw-r--r--framework/source/layoutmanager/toolbarlayoutmanager.cxx84
-rw-r--r--framework/source/layoutmanager/toolbarlayoutmanager.hxx2
-rw-r--r--framework/source/loadenv/loadenv.cxx10
-rw-r--r--framework/source/services/frame.cxx10
-rw-r--r--framework/source/services/tabwindowservice.cxx2
-rw-r--r--framework/source/services/taskcreatorsrv.cxx2
-rw-r--r--framework/source/tabwin/tabwindow.cxx10
-rw-r--r--framework/source/uielement/addonstoolbarmanager.cxx4
-rw-r--r--framework/source/uielement/addonstoolbarwrapper.cxx4
-rw-r--r--framework/source/uielement/comboboxtoolbarcontroller.cxx6
-rw-r--r--framework/source/uielement/complextoolbarcontroller.cxx2
-rw-r--r--framework/source/uielement/dropdownboxtoolbarcontroller.cxx6
-rw-r--r--framework/source/uielement/edittoolbarcontroller.cxx4
-rw-r--r--framework/source/uielement/menubarmanager.cxx2
-rw-r--r--framework/source/uielement/progressbarwrapper.cxx8
-rw-r--r--framework/source/uielement/spinfieldtoolbarcontroller.cxx4
-rw-r--r--framework/source/uielement/statusbar.cxx2
-rw-r--r--framework/source/uielement/statusbarwrapper.cxx4
-rw-r--r--framework/source/uielement/toolbarmanager.cxx14
-rw-r--r--framework/source/uielement/toolbarsmenucontroller.cxx2
-rw-r--r--framework/source/uielement/toolbarwrapper.cxx4
-rw-r--r--include/avmedia/mediaplayer.hxx4
-rw-r--r--include/avmedia/mediatoolbox.hxx2
-rw-r--r--include/avmedia/mediawindow.hxx10
-rw-r--r--include/cppcanvas/vclfactory.hxx4
-rw-r--r--include/dbaccess/dataview.hxx4
-rw-r--r--include/dbaccess/genericcontroller.hxx4
-rw-r--r--include/editeng/editeng.hxx4
-rw-r--r--include/editeng/editview.hxx12
-rw-r--r--include/editeng/edtdlg.hxx12
-rw-r--r--include/editeng/hangulhanja.hxx2
-rw-r--r--include/editeng/outliner.hxx10
-rw-r--r--include/editeng/splwrap.hxx10
-rw-r--r--include/editeng/svxacorr.hxx4
-rw-r--r--include/editeng/unolingu.hxx4
-rw-r--r--include/formula/formula.hxx8
-rw-r--r--include/formula/funcutl.hxx12
-rw-r--r--include/postx.h1
-rw-r--r--include/prex.h1
-rw-r--r--include/sfx2/QuerySaveDocument.hxx4
-rw-r--r--include/sfx2/app.hxx4
-rw-r--r--include/sfx2/basedlgs.hxx14
-rw-r--r--include/sfx2/checkin.hxx2
-rw-r--r--include/sfx2/childwin.hxx38
-rw-r--r--include/sfx2/controlwrapper.hxx4
-rw-r--r--include/sfx2/dialoghelper.hxx14
-rw-r--r--include/sfx2/dinfdlg.hxx50
-rw-r--r--include/sfx2/dinfedt.hxx2
-rw-r--r--include/sfx2/dispatch.hxx6
-rw-r--r--include/sfx2/dockwin.hxx6
-rw-r--r--include/sfx2/fcontnr.hxx10
-rw-r--r--include/sfx2/filedlghelper.hxx6
-rw-r--r--include/sfx2/frame.hxx10
-rw-r--r--include/sfx2/infobar.hxx8
-rw-r--r--include/sfx2/ipclient.hxx8
-rw-r--r--include/sfx2/itemconnect.hxx2
-rw-r--r--include/sfx2/linkmgr.hxx2
-rw-r--r--include/sfx2/linksrc.hxx4
-rw-r--r--include/sfx2/lnkbase.hxx2
-rw-r--r--include/sfx2/mgetempl.hxx4
-rw-r--r--include/sfx2/mnumgr.hxx6
-rw-r--r--include/sfx2/module.hxx4
-rw-r--r--include/sfx2/navigat.hxx4
-rw-r--r--include/sfx2/new.hxx2
-rw-r--r--include/sfx2/newstyle.hxx2
-rw-r--r--include/sfx2/objsh.hxx6
-rw-r--r--include/sfx2/passwd.hxx2
-rw-r--r--include/sfx2/printopt.hxx8
-rw-r--r--include/sfx2/prnmon.hxx2
-rw-r--r--include/sfx2/recentdocsview.hxx2
-rw-r--r--include/sfx2/securitypage.hxx4
-rw-r--r--include/sfx2/sfxdlg.hxx26
-rw-r--r--include/sfx2/sfxhelp.hxx6
-rw-r--r--include/sfx2/shell.hxx2
-rw-r--r--include/sfx2/sidebar/ControlFactory.hxx4
-rw-r--r--include/sfx2/sidebar/ILayoutableWindow.hxx2
-rw-r--r--include/sfx2/sidebar/SidebarChildWindow.hxx4
-rw-r--r--include/sfx2/sidebar/SidebarPanelBase.hxx8
-rw-r--r--include/sfx2/sidebar/SidebarToolBox.hxx2
-rw-r--r--include/sfx2/styledlg.hxx2
-rw-r--r--include/sfx2/tabdlg.hxx8
-rw-r--r--include/sfx2/taskpane.hxx8
-rw-r--r--include/sfx2/tbxctrl.hxx10
-rw-r--r--include/sfx2/templateabstractview.hxx4
-rw-r--r--include/sfx2/templatedlg.hxx2
-rw-r--r--include/sfx2/templateinfodlg.hxx4
-rw-r--r--include/sfx2/templatelocalview.hxx2
-rw-r--r--include/sfx2/templateremoteview.hxx2
-rw-r--r--include/sfx2/templdlg.hxx6
-rw-r--r--include/sfx2/thumbnailview.hxx2
-rw-r--r--include/sfx2/thumbnailviewitem.hxx2
-rw-r--r--include/sfx2/titledockwin.hxx8
-rw-r--r--include/sfx2/viewfac.hxx2
-rw-r--r--include/sfx2/viewfrm.hxx2
-rw-r--r--include/sfx2/viewsh.hxx12
-rw-r--r--include/svtools/DocumentInfoPreview.hxx4
-rw-r--r--include/svtools/GraphicExportOptionsDialog.hxx2
-rw-r--r--include/svtools/PlaceEditDialog.hxx4
-rw-r--r--include/svtools/accessibleruler.hxx2
-rw-r--r--include/svtools/accessibletable.hxx6
-rw-r--r--include/svtools/accessibletableprovider.hxx6
-rw-r--r--include/svtools/addresstemplate.hxx4
-rw-r--r--include/svtools/brwbox.hxx24
-rw-r--r--include/svtools/calendar.hxx6
-rw-r--r--include/svtools/cliplistener.hxx4
-rw-r--r--include/svtools/colrdlg.hxx6
-rw-r--r--include/svtools/ctrlbox.hxx12
-rw-r--r--include/svtools/dialogcontrolling.hxx28
-rw-r--r--include/svtools/editbrowsebox.hxx14
-rw-r--r--include/svtools/editsyntaxhighlighter.hxx2
-rw-r--r--include/svtools/ehdl.hxx6
-rw-r--r--include/svtools/extensionlistbox.hxx2
-rw-r--r--include/svtools/filectrl.hxx4
-rw-r--r--include/svtools/fileurlbox.hxx2
-rw-r--r--include/svtools/fileview.hxx4
-rw-r--r--include/svtools/fmtfield.hxx6
-rw-r--r--include/svtools/genericunodialog.hxx4
-rw-r--r--include/svtools/headbar.hxx4
-rw-r--r--include/svtools/hyperlabel.hxx2
-rw-r--r--include/svtools/inettbc.hxx6
-rw-r--r--include/svtools/ivctrl.hxx2
-rw-r--r--include/svtools/popupwindowcontroller.hxx4
-rw-r--r--include/svtools/prnsetup.hxx2
-rw-r--r--include/svtools/restartdialog.hxx4
-rw-r--r--include/svtools/roadmapwizard.hxx4
-rw-r--r--include/svtools/ruler.hxx4
-rw-r--r--include/svtools/scrwin.hxx4
-rw-r--r--include/svtools/simptabl.hxx2
-rw-r--r--include/svtools/stdctrl.hxx2
-rw-r--r--include/svtools/stringtransfer.hxx6
-rw-r--r--include/svtools/svlbitm.hxx2
-rw-r--r--include/svtools/svmedit.hxx2
-rw-r--r--include/svtools/svmedit2.hxx2
-rw-r--r--include/svtools/svtabbx.hxx10
-rw-r--r--include/svtools/tabbar.hxx4
-rw-r--r--include/svtools/table/tablerenderer.hxx4
-rw-r--r--include/svtools/toolbarmenu.hxx4
-rw-r--r--include/svtools/toolpanel/drawerlayouter.hxx6
-rw-r--r--include/svtools/toolpanel/paneltabbar.hxx2
-rw-r--r--include/svtools/toolpanel/tablayouter.hxx4
-rw-r--r--include/svtools/toolpanel/toolpanel.hxx4
-rw-r--r--include/svtools/toolpanel/toolpaneldeck.hxx6
-rw-r--r--include/svtools/transfer.hxx20
-rw-r--r--include/svtools/treelistbox.hxx6
-rw-r--r--include/svtools/urlcontrol.hxx2
-rw-r--r--include/svtools/valueset.hxx4
-rw-r--r--include/svtools/wizardmachine.hxx10
-rw-r--r--include/svtools/wizdlg.hxx10
-rw-r--r--include/svtools/xwindowitem.hxx4
-rw-r--r--include/svx/AccessibleShapeTreeInfo.hxx8
-rw-r--r--include/svx/SpellDialogChildWindow.hxx2
-rw-r--r--include/svx/SvxColorChildWindow.hxx2
-rw-r--r--include/svx/SvxColorValueSet.hxx4
-rw-r--r--include/svx/bmpmask.hxx4
-rw-r--r--include/svx/charmap.hxx2
-rw-r--r--include/svx/checklbx.hxx2
-rw-r--r--include/svx/colrctrl.hxx6
-rw-r--r--include/svx/compressgraphicdialog.hxx4
-rw-r--r--include/svx/connctrl.hxx2
-rw-r--r--include/svx/contdlg.hxx4
-rw-r--r--include/svx/ctredlin.hxx6
-rw-r--r--include/svx/databaseregistrationui.hxx4
-rw-r--r--include/svx/dialcontrol.hxx8
-rw-r--r--include/svx/dlgctl3d.hxx10
-rw-r--r--include/svx/dlgctrl.hxx38
-rw-r--r--include/svx/f3dchild.hxx2
-rw-r--r--include/svx/fillctrl.hxx6
-rw-r--r--include/svx/float3d.hxx2
-rw-r--r--include/svx/fmgridcl.hxx2
-rw-r--r--include/svx/fmgridif.hxx6
-rw-r--r--include/svx/fmpage.hxx2
-rw-r--r--include/svx/fmshell.hxx2
-rw-r--r--include/svx/fmtools.hxx12
-rw-r--r--include/svx/fmview.hxx4
-rw-r--r--include/svx/fntctrl.hxx6
-rw-r--r--include/svx/fontlb.hxx2
-rw-r--r--include/svx/fontwork.hxx4
-rw-r--r--include/svx/fontworkgallery.hxx6
-rw-r--r--include/svx/frmdirlbox.hxx2
-rw-r--r--include/svx/frmsel.hxx2
-rw-r--r--include/svx/galctrl.hxx4
-rw-r--r--include/svx/galmisc.hxx4
-rw-r--r--include/svx/galtheme.hxx4
-rw-r--r--include/svx/grafctrl.hxx4
-rw-r--r--include/svx/graphctl.hxx2
-rw-r--r--include/svx/gridctrl.hxx6
-rw-r--r--include/svx/hdft.hxx16
-rw-r--r--include/svx/hyperdlg.hxx2
-rw-r--r--include/svx/imapdlg.hxx4
-rw-r--r--include/svx/itemwin.hxx8
-rw-r--r--include/svx/langbox.hxx4
-rw-r--r--include/svx/linectrl.hxx6
-rw-r--r--include/svx/linkwarn.hxx2
-rw-r--r--include/svx/measctrl.hxx2
-rw-r--r--include/svx/numvset.hxx4
-rw-r--r--include/svx/optgrid.hxx4
-rw-r--r--include/svx/orienthelper.hxx2
-rw-r--r--include/svx/pagectrl.hxx4
-rw-r--r--include/svx/paraprev.hxx4
-rw-r--r--include/svx/passwd.hxx2
-rw-r--r--include/svx/pfiledlg.hxx2
-rw-r--r--include/svx/prtqry.hxx2
-rw-r--r--include/svx/relfld.hxx2
-rw-r--r--include/svx/rubydialog.hxx12
-rw-r--r--include/svx/ruler.hxx4
-rw-r--r--include/svx/sdr/table/tablecontroller.hxx16
-rw-r--r--include/svx/sdrpaintwindow.hxx2
-rw-r--r--include/svx/selectioncontroller.hxx10
-rw-r--r--include/svx/sidebar/ColorControl.hxx4
-rw-r--r--include/svx/sidebar/ColorPopup.hxx2
-rw-r--r--include/svx/sidebar/PanelLayout.hxx2
-rw-r--r--include/svx/sidebar/Popup.hxx6
-rw-r--r--include/svx/sidebar/PopupContainer.hxx2
-rw-r--r--include/svx/sidebar/PopupControl.hxx2
-rw-r--r--include/svx/sidebar/SidebarDialControl.hxx2
-rw-r--r--include/svx/sidebar/ValueSetWithTextControl.hxx6
-rw-r--r--include/svx/srchdlg.hxx10
-rw-r--r--include/svx/stddlg.hxx2
-rw-r--r--include/svx/svdcrtv.hxx2
-rw-r--r--include/svx/svdedxv.hxx28
-rw-r--r--include/svx/svdglue.hxx6
-rw-r--r--include/svx/svdhdl.hxx2
-rw-r--r--include/svx/svdmrkv.hxx2
-rw-r--r--include/svx/svdouno.hxx2
-rw-r--r--include/svx/svdpntv.hxx22
-rw-r--r--include/svx/svdview.hxx22
-rw-r--r--include/svx/svdviter.hxx4
-rw-r--r--include/svx/svdxcgv.hxx2
-rw-r--r--include/svx/svxdlg.hxx110
-rw-r--r--include/svx/swframeexample.hxx4
-rw-r--r--include/svx/tbcontrl.hxx4
-rw-r--r--include/svx/txencbox.hxx2
-rw-r--r--include/svx/unoshtxt.hxx4
-rw-r--r--include/svx/wrapfield.hxx2
-rw-r--r--include/toolkit/awt/scrollabledialog.hxx2
-rw-r--r--include/toolkit/awt/vclxaccessiblecomponent.hxx4
-rw-r--r--include/toolkit/awt/vclxtopwindow.hxx4
-rw-r--r--include/toolkit/awt/vclxwindow.hxx8
-rw-r--r--include/toolkit/awt/vclxwindows.hxx2
-rw-r--r--include/toolkit/controls/accessiblecontrolcontext.hxx4
-rw-r--r--include/toolkit/helper/vclunohelper.hxx12
-rw-r--r--include/tools/errinf.hxx10
-rw-r--r--include/vcl/abstdlg.hxx6
-rw-r--r--include/vcl/btndlg.hxx2
-rw-r--r--include/vcl/builder.hxx68
-rw-r--r--include/vcl/button.hxx54
-rw-r--r--include/vcl/combobox.hxx6
-rw-r--r--include/vcl/ctrl.hxx6
-rw-r--r--include/vcl/cursor.hxx8
-rw-r--r--include/vcl/debugevent.hxx2
-rw-r--r--include/vcl/dialog.hxx18
-rw-r--r--include/vcl/dockingarea.hxx4
-rw-r--r--include/vcl/dockwin.hxx52
-rw-r--r--include/vcl/edit.hxx14
-rw-r--r--include/vcl/event.hxx10
-rw-r--r--include/vcl/field.hxx32
-rw-r--r--include/vcl/fixed.hxx32
-rw-r--r--include/vcl/fixedhyper.hxx2
-rw-r--r--include/vcl/floatwin.hxx18
-rw-r--r--include/vcl/fltcall.hxx6
-rw-r--r--include/vcl/group.hxx4
-rw-r--r--include/vcl/help.hxx18
-rw-r--r--include/vcl/imgctrl.hxx2
-rw-r--r--include/vcl/keycod.hxx22
-rw-r--r--include/vcl/layout.hxx130
-rw-r--r--include/vcl/longcurr.hxx4
-rw-r--r--include/vcl/lstbox.hxx10
-rw-r--r--include/vcl/menu.hxx28
-rw-r--r--include/vcl/menubtn.hxx4
-rw-r--r--include/vcl/morebtn.hxx4
-rw-r--r--include/vcl/msgbox.hxx12
-rw-r--r--include/vcl/opengl/OpenGLContext.hxx12
-rw-r--r--include/vcl/openglwin.hxx4
-rw-r--r--include/vcl/outdev.hxx6
-rw-r--r--include/vcl/popupmenuwindow.hxx4
-rw-r--r--include/vcl/prgsbar.hxx4
-rw-r--r--include/vcl/print.hxx8
-rw-r--r--include/vcl/region.hxx3
-rw-r--r--include/vcl/scrbar.hxx10
-rw-r--r--include/vcl/seleng.hxx10
-rw-r--r--include/vcl/slider.hxx4
-rw-r--r--include/vcl/sound.hxx4
-rw-r--r--include/vcl/spin.hxx4
-rw-r--r--include/vcl/spinfld.hxx6
-rw-r--r--include/vcl/split.hxx14
-rw-r--r--include/vcl/splitwin.hxx8
-rw-r--r--include/vcl/status.hxx8
-rw-r--r--include/vcl/stdtext.hxx4
-rw-r--r--include/vcl/svapp.hxx32
-rw-r--r--include/vcl/syschild.hxx8
-rw-r--r--include/vcl/syswin.hxx10
-rw-r--r--include/vcl/tabctrl.hxx4
-rw-r--r--include/vcl/tabdlg.hxx10
-rw-r--r--include/vcl/tabpage.hxx8
-rw-r--r--include/vcl/taskpanelist.hxx12
-rw-r--r--include/vcl/textview.hxx6
-rw-r--r--include/vcl/throbber.hxx2
-rw-r--r--include/vcl/toolbox.hxx12
-rw-r--r--include/vcl/unowrap.hxx8
-rw-r--r--include/vcl/vclevent.hxx14
-rw-r--r--include/vcl/vclmedit.hxx2
-rw-r--r--include/vcl/waitobj.hxx4
-rw-r--r--include/vcl/window.hxx177
-rw-r--r--include/vcl/wrkwin.hxx8
-rw-r--r--include/vcl/xtextedt.hxx2
-rw-r--r--reportdesign/inc/RptModel.hxx2
-rw-r--r--reportdesign/source/filter/xml/xmlfilter.cxx2
-rw-r--r--reportdesign/source/ui/dlg/AddField.cxx2
-rw-r--r--reportdesign/source/ui/dlg/CondFormat.cxx12
-rw-r--r--reportdesign/source/ui/dlg/Condition.cxx6
-rw-r--r--reportdesign/source/ui/dlg/Condition.hxx2
-rw-r--r--reportdesign/source/ui/dlg/DateTime.cxx2
-rw-r--r--reportdesign/source/ui/dlg/Formula.cxx4
-rw-r--r--reportdesign/source/ui/dlg/GroupsSorting.cxx8
-rw-r--r--reportdesign/source/ui/dlg/Navigator.cxx8
-rw-r--r--reportdesign/source/ui/dlg/PageNumber.cxx2
-rw-r--r--reportdesign/source/ui/dlg/dlgpage.cxx2
-rw-r--r--reportdesign/source/ui/inc/AddField.hxx2
-rw-r--r--reportdesign/source/ui/inc/ColorListener.hxx4
-rw-r--r--reportdesign/source/ui/inc/CondFormat.hxx4
-rw-r--r--reportdesign/source/ui/inc/DateTime.hxx2
-rw-r--r--reportdesign/source/ui/inc/DesignView.hxx6
-rw-r--r--reportdesign/source/ui/inc/EndMarker.hxx2
-rw-r--r--reportdesign/source/ui/inc/Formula.hxx2
-rw-r--r--reportdesign/source/ui/inc/GroupsSorting.hxx2
-rw-r--r--reportdesign/source/ui/inc/Navigator.hxx2
-rw-r--r--reportdesign/source/ui/inc/PageNumber.hxx2
-rw-r--r--reportdesign/source/ui/inc/ReportController.hxx2
-rw-r--r--reportdesign/source/ui/inc/ReportSection.hxx2
-rw-r--r--reportdesign/source/ui/inc/ReportWindow.hxx2
-rw-r--r--reportdesign/source/ui/inc/ScrollHelper.hxx4
-rw-r--r--reportdesign/source/ui/inc/SectionView.hxx2
-rw-r--r--reportdesign/source/ui/inc/SectionWindow.hxx2
-rw-r--r--reportdesign/source/ui/inc/UITools.hxx4
-rw-r--r--reportdesign/source/ui/inc/ViewsWindow.hxx14
-rw-r--r--reportdesign/source/ui/inc/dlgpage.hxx2
-rw-r--r--reportdesign/source/ui/inspection/GeometryHandler.cxx2
-rw-r--r--reportdesign/source/ui/misc/ColorListener.cxx2
-rw-r--r--reportdesign/source/ui/misc/UITools.cxx10
-rw-r--r--reportdesign/source/ui/report/DesignView.cxx14
-rw-r--r--reportdesign/source/ui/report/EndMarker.cxx2
-rw-r--r--reportdesign/source/ui/report/ReportController.cxx2
-rw-r--r--reportdesign/source/ui/report/SectionView.cxx2
-rw-r--r--reportdesign/source/ui/report/SectionWindow.cxx4
-rw-r--r--reportdesign/source/ui/report/propbrw.cxx2
-rw-r--r--rsc/source/res/rscall.cxx2
-rw-r--r--sc/inc/arealink.hxx2
-rw-r--r--sc/inc/document.hxx6
-rw-r--r--sc/inc/documentlinkmgr.hxx4
-rw-r--r--sc/inc/drwlayer.hxx2
-rw-r--r--sc/inc/externalrefmgr.hxx4
-rw-r--r--sc/inc/scabstdlg.hxx84
-rw-r--r--sc/inc/scmod.hxx10
-rw-r--r--sc/inc/scopetools.hxx6
-rw-r--r--sc/inc/tablink.hxx2
-rw-r--r--sc/inc/validat.hxx6
-rw-r--r--sc/inc/waitoff.hxx6
-rw-r--r--sc/source/core/data/documen8.cxx2
-rw-r--r--sc/source/core/data/documen9.cxx2
-rw-r--r--sc/source/core/data/drwlayer.cxx2
-rw-r--r--sc/source/core/data/validat.cxx6
-rw-r--r--sc/source/core/tool/scopetools.cxx2
-rw-r--r--sc/source/filter/excel/xiescher.cxx2
-rw-r--r--sc/source/ui/Accessibility/AccessibleCell.cxx4
-rw-r--r--sc/source/ui/Accessibility/AccessibleDocument.cxx14
-rw-r--r--sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx24
-rw-r--r--sc/source/ui/Accessibility/AccessibleEditObject.cxx8
-rw-r--r--sc/source/ui/Accessibility/AccessiblePageHeader.cxx4
-rw-r--r--sc/source/ui/Accessibility/AccessiblePreviewCell.cxx2
-rw-r--r--sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx4
-rw-r--r--sc/source/ui/Accessibility/AccessiblePreviewTable.cxx4
-rw-r--r--sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx6
-rw-r--r--sc/source/ui/Accessibility/AccessibleText.cxx48
-rw-r--r--sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx2
-rw-r--r--sc/source/ui/StatisticsDialogs/CorrelationDialog.cxx2
-rw-r--r--sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx2
-rw-r--r--sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx2
-rw-r--r--sc/source/ui/StatisticsDialogs/ExponentialSmoothingDialog.cxx2
-rw-r--r--sc/source/ui/StatisticsDialogs/FTestDialog.cxx2
-rw-r--r--sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx2
-rw-r--r--sc/source/ui/StatisticsDialogs/MovingAverageDialog.cxx2
-rw-r--r--sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx2
-rw-r--r--sc/source/ui/StatisticsDialogs/SamplingDialog.cxx2
-rw-r--r--sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx2
-rw-r--r--sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx2
-rw-r--r--sc/source/ui/StatisticsDialogs/TTestDialog.cxx2
-rw-r--r--sc/source/ui/app/client.cxx4
-rw-r--r--sc/source/ui/app/drwtrans.cxx2
-rw-r--r--sc/source/ui/app/inputhdl.cxx10
-rw-r--r--sc/source/ui/app/inputwin.cxx24
-rw-r--r--sc/source/ui/app/scmod.cxx26
-rw-r--r--sc/source/ui/app/transobj.cxx2
-rw-r--r--sc/source/ui/attrdlg/attrdlg.cxx2
-rw-r--r--sc/source/ui/attrdlg/scdlgfact.cxx84
-rw-r--r--sc/source/ui/attrdlg/scdlgfact.hxx84
-rw-r--r--sc/source/ui/attrdlg/tabpages.cxx4
-rw-r--r--sc/source/ui/cctrl/checklistmenu.cxx8
-rw-r--r--sc/source/ui/cctrl/editfield.cxx4
-rw-r--r--sc/source/ui/cctrl/tbzoomsliderctrl.cxx4
-rw-r--r--sc/source/ui/condformat/colorformat.cxx2
-rw-r--r--sc/source/ui/condformat/condformatdlg.cxx6
-rw-r--r--sc/source/ui/condformat/condformatdlgentry.cxx22
-rw-r--r--sc/source/ui/condformat/condformatmgr.cxx2
-rw-r--r--sc/source/ui/dbgui/PivotLayoutDialog.cxx2
-rw-r--r--sc/source/ui/dbgui/PivotLayoutTreeList.cxx4
-rw-r--r--sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx2
-rw-r--r--sc/source/ui/dbgui/PivotLayoutTreeListData.cxx4
-rw-r--r--sc/source/ui/dbgui/PivotLayoutTreeListLabel.cxx4
-rw-r--r--sc/source/ui/dbgui/consdlg.cxx2
-rw-r--r--sc/source/ui/dbgui/csvcontrol.cxx2
-rw-r--r--sc/source/ui/dbgui/csvtablebox.cxx4
-rw-r--r--sc/source/ui/dbgui/dapidata.cxx2
-rw-r--r--sc/source/ui/dbgui/dapitype.cxx4
-rw-r--r--sc/source/ui/dbgui/dbnamdlg.cxx6
-rw-r--r--sc/source/ui/dbgui/dpgroupdlg.cxx4
-rw-r--r--sc/source/ui/dbgui/filtdlg.cxx2
-rw-r--r--sc/source/ui/dbgui/pfiltdlg.cxx2
-rw-r--r--sc/source/ui/dbgui/pvfundlg.cxx12
-rw-r--r--sc/source/ui/dbgui/scendlg.cxx2
-rw-r--r--sc/source/ui/dbgui/scuiasciiopt.cxx2
-rw-r--r--sc/source/ui/dbgui/scuiimoptdlg.cxx2
-rw-r--r--sc/source/ui/dbgui/sfiltdlg.cxx2
-rw-r--r--sc/source/ui/dbgui/sortdlg.cxx4
-rw-r--r--sc/source/ui/dbgui/sortkeydlg.cxx2
-rw-r--r--sc/source/ui/dbgui/subtdlg.cxx2
-rw-r--r--sc/source/ui/dbgui/textimportoptions.cxx2
-rw-r--r--sc/source/ui/dbgui/tpsort.cxx8
-rw-r--r--sc/source/ui/dbgui/tpsubt.cxx18
-rw-r--r--sc/source/ui/dbgui/validate.cxx28
-rw-r--r--sc/source/ui/dialogs/searchresults.cxx4
-rw-r--r--sc/source/ui/docshell/arealink.cxx2
-rw-r--r--sc/source/ui/docshell/dbdocimp.cxx2
-rw-r--r--sc/source/ui/docshell/docfunc.cxx2
-rw-r--r--sc/source/ui/docshell/docsh.cxx10
-rw-r--r--sc/source/ui/docshell/docsh3.cxx2
-rw-r--r--sc/source/ui/docshell/docsh4.cxx8
-rw-r--r--sc/source/ui/docshell/docsh5.cxx2
-rw-r--r--sc/source/ui/docshell/docsh6.cxx4
-rw-r--r--sc/source/ui/docshell/documentlinkmgr.cxx2
-rw-r--r--sc/source/ui/docshell/externalrefmgr.cxx2
-rw-r--r--sc/source/ui/docshell/tablink.cxx4
-rw-r--r--sc/source/ui/docshell/tpstat.cxx4
-rw-r--r--sc/source/ui/drawfunc/drawsh.cxx4
-rw-r--r--sc/source/ui/drawfunc/drawsh2.cxx2
-rw-r--r--sc/source/ui/drawfunc/drtxtob.cxx2
-rw-r--r--sc/source/ui/drawfunc/fuconarc.cxx2
-rw-r--r--sc/source/ui/drawfunc/fuconcustomshape.cxx2
-rw-r--r--sc/source/ui/drawfunc/fuconpol.cxx2
-rw-r--r--sc/source/ui/drawfunc/fuconrec.cxx2
-rw-r--r--sc/source/ui/drawfunc/fuconstr.cxx2
-rw-r--r--sc/source/ui/drawfunc/fuconuno.cxx2
-rw-r--r--sc/source/ui/drawfunc/fudraw.cxx4
-rw-r--r--sc/source/ui/drawfunc/fuins1.cxx8
-rw-r--r--sc/source/ui/drawfunc/fuins2.cxx12
-rw-r--r--sc/source/ui/drawfunc/fupoor.cxx2
-rw-r--r--sc/source/ui/drawfunc/fusel.cxx2
-rw-r--r--sc/source/ui/drawfunc/futext.cxx2
-rw-r--r--sc/source/ui/formdlg/dwfunctr.cxx6
-rw-r--r--sc/source/ui/formdlg/formula.cxx2
-rw-r--r--sc/source/ui/formdlg/privsplt.cxx2
-rw-r--r--sc/source/ui/inc/AccessibleEditObject.hxx6
-rw-r--r--sc/source/ui/inc/AccessibleText.hxx10
-rw-r--r--sc/source/ui/inc/AnalysisOfVarianceDialog.hxx2
-rw-r--r--sc/source/ui/inc/ChildWindowWrapper.hxx4
-rw-r--r--sc/source/ui/inc/CorrelationDialog.hxx2
-rw-r--r--sc/source/ui/inc/CovarianceDialog.hxx2
-rw-r--r--sc/source/ui/inc/DescriptiveStatisticsDialog.hxx2
-rw-r--r--sc/source/ui/inc/ExponentialSmoothingDialog.hxx2
-rw-r--r--sc/source/ui/inc/FTestDialog.hxx2
-rw-r--r--sc/source/ui/inc/MatrixComparisonGenerator.hxx2
-rw-r--r--sc/source/ui/inc/MovingAverageDialog.hxx2
-rw-r--r--sc/source/ui/inc/PivotLayoutDialog.hxx2
-rw-r--r--sc/source/ui/inc/PivotLayoutTreeList.hxx2
-rw-r--r--sc/source/ui/inc/PivotLayoutTreeListBase.hxx2
-rw-r--r--sc/source/ui/inc/PivotLayoutTreeListData.hxx2
-rw-r--r--sc/source/ui/inc/PivotLayoutTreeListLabel.hxx2
-rw-r--r--sc/source/ui/inc/RandomNumberGeneratorDialog.hxx2
-rw-r--r--sc/source/ui/inc/SamplingDialog.hxx2
-rw-r--r--sc/source/ui/inc/StatisticsInputOutputDialog.hxx2
-rw-r--r--sc/source/ui/inc/StatisticsTwoVariableDialog.hxx2
-rw-r--r--sc/source/ui/inc/TTestDialog.hxx2
-rw-r--r--sc/source/ui/inc/acredlin.hxx2
-rw-r--r--sc/source/ui/inc/anyrefdg.hxx24
-rw-r--r--sc/source/ui/inc/areasdlg.hxx2
-rw-r--r--sc/source/ui/inc/attrdlg.hxx4
-rw-r--r--sc/source/ui/inc/autofmt.hxx4
-rw-r--r--sc/source/ui/inc/checklistmenu.hxx10
-rw-r--r--sc/source/ui/inc/client.hxx2
-rw-r--r--sc/source/ui/inc/colorformat.hxx2
-rw-r--r--sc/source/ui/inc/colrowba.hxx4
-rw-r--r--sc/source/ui/inc/condformatdlg.hxx4
-rw-r--r--sc/source/ui/inc/condformatdlgentry.hxx16
-rw-r--r--sc/source/ui/inc/condformatmgr.hxx2
-rw-r--r--sc/source/ui/inc/conflictsdlg.hxx2
-rw-r--r--sc/source/ui/inc/consdlg.hxx2
-rw-r--r--sc/source/ui/inc/content.hxx2
-rw-r--r--sc/source/ui/inc/corodlg.hxx2
-rw-r--r--sc/source/ui/inc/crdlg.hxx2
-rw-r--r--sc/source/ui/inc/crnrdlg.hxx2
-rw-r--r--sc/source/ui/inc/csvcontrol.hxx2
-rw-r--r--sc/source/ui/inc/csvtablebox.hxx2
-rw-r--r--sc/source/ui/inc/dapidata.hxx2
-rw-r--r--sc/source/ui/inc/dapitype.hxx4
-rw-r--r--sc/source/ui/inc/datafdlg.hxx2
-rw-r--r--sc/source/ui/inc/datastream.hxx2
-rw-r--r--sc/source/ui/inc/datastreamdlg.hxx2
-rw-r--r--sc/source/ui/inc/dbfunc.hxx2
-rw-r--r--sc/source/ui/inc/dbnamdlg.hxx2
-rw-r--r--sc/source/ui/inc/delcldlg.hxx2
-rw-r--r--sc/source/ui/inc/delcodlg.hxx2
-rw-r--r--sc/source/ui/inc/docsh.hxx8
-rw-r--r--sc/source/ui/inc/dpgroupdlg.hxx4
-rw-r--r--sc/source/ui/inc/drawsh.hxx2
-rw-r--r--sc/source/ui/inc/drawview.hxx10
-rw-r--r--sc/source/ui/inc/drwtrans.hxx2
-rw-r--r--sc/source/ui/inc/dwfunctr.hxx4
-rw-r--r--sc/source/ui/inc/editfield.hxx2
-rw-r--r--sc/source/ui/inc/filldlg.hxx2
-rw-r--r--sc/source/ui/inc/filtdlg.hxx4
-rw-r--r--sc/source/ui/inc/formula.hxx2
-rw-r--r--sc/source/ui/inc/fuconarc.hxx2
-rw-r--r--sc/source/ui/inc/fuconcustomshape.hxx2
-rw-r--r--sc/source/ui/inc/fuconpol.hxx2
-rw-r--r--sc/source/ui/inc/fuconrec.hxx2
-rw-r--r--sc/source/ui/inc/fuconstr.hxx2
-rw-r--r--sc/source/ui/inc/fuconuno.hxx2
-rw-r--r--sc/source/ui/inc/fudraw.hxx2
-rw-r--r--sc/source/ui/inc/fuinsert.hxx10
-rw-r--r--sc/source/ui/inc/funcpage.hxx4
-rw-r--r--sc/source/ui/inc/fupoor.hxx10
-rw-r--r--sc/source/ui/inc/fusel.hxx2
-rw-r--r--sc/source/ui/inc/futext.hxx2
-rw-r--r--sc/source/ui/inc/gridwin.hxx4
-rw-r--r--sc/source/ui/inc/groupdlg.hxx2
-rw-r--r--sc/source/ui/inc/hdrcont.hxx4
-rw-r--r--sc/source/ui/inc/hfedtdlg.hxx22
-rw-r--r--sc/source/ui/inc/highred.hxx2
-rw-r--r--sc/source/ui/inc/hintwin.hxx4
-rw-r--r--sc/source/ui/inc/inputhdl.hxx4
-rw-r--r--sc/source/ui/inc/inputwin.hxx14
-rw-r--r--sc/source/ui/inc/inscldlg.hxx2
-rw-r--r--sc/source/ui/inc/inscodlg.hxx2
-rw-r--r--sc/source/ui/inc/instbdlg.hxx2
-rw-r--r--sc/source/ui/inc/lbseldlg.hxx2
-rw-r--r--sc/source/ui/inc/linkarea.hxx2
-rw-r--r--sc/source/ui/inc/mtrindlg.hxx2
-rw-r--r--sc/source/ui/inc/mvtabdlg.hxx2
-rw-r--r--sc/source/ui/inc/namecrea.hxx2
-rw-r--r--sc/source/ui/inc/namedefdlg.hxx2
-rw-r--r--sc/source/ui/inc/namedlg.hxx2
-rw-r--r--sc/source/ui/inc/namepast.hxx2
-rw-r--r--sc/source/ui/inc/navipi.hxx10
-rw-r--r--sc/source/ui/inc/notemark.hxx10
-rw-r--r--sc/source/ui/inc/olinewin.hxx4
-rw-r--r--sc/source/ui/inc/opredlin.hxx4
-rw-r--r--sc/source/ui/inc/optsolver.hxx10
-rw-r--r--sc/source/ui/inc/pfiltdlg.hxx2
-rw-r--r--sc/source/ui/inc/preview.hxx4
-rw-r--r--sc/source/ui/inc/prevwsh.hxx6
-rw-r--r--sc/source/ui/inc/privsplt.hxx2
-rw-r--r--sc/source/ui/inc/protectiondlg.hxx4
-rw-r--r--sc/source/ui/inc/pvfundlg.hxx10
-rw-r--r--sc/source/ui/inc/redcom.hxx2
-rw-r--r--sc/source/ui/inc/reffact.hxx10
-rw-r--r--sc/source/ui/inc/retypepassdlg.hxx6
-rw-r--r--sc/source/ui/inc/scendlg.hxx2
-rw-r--r--sc/source/ui/inc/scuiasciiopt.hxx2
-rw-r--r--sc/source/ui/inc/scuiautofmt.hxx2
-rw-r--r--sc/source/ui/inc/scuiimoptdlg.hxx2
-rw-r--r--sc/source/ui/inc/scuitphfedit.hxx18
-rw-r--r--sc/source/ui/inc/searchresults.hxx4
-rw-r--r--sc/source/ui/inc/select.hxx4
-rw-r--r--sc/source/ui/inc/sharedocdlg.hxx2
-rw-r--r--sc/source/ui/inc/shtabdlg.hxx2
-rw-r--r--sc/source/ui/inc/simpref.hxx2
-rw-r--r--sc/source/ui/inc/solveroptions.hxx6
-rw-r--r--sc/source/ui/inc/solvrdlg.hxx2
-rw-r--r--sc/source/ui/inc/sortdlg.hxx4
-rw-r--r--sc/source/ui/inc/sortkeydlg.hxx2
-rw-r--r--sc/source/ui/inc/spelldialog.hxx2
-rw-r--r--sc/source/ui/inc/spelleng.hxx2
-rw-r--r--sc/source/ui/inc/strindlg.hxx2
-rw-r--r--sc/source/ui/inc/styledlg.hxx2
-rw-r--r--sc/source/ui/inc/subtdlg.hxx2
-rw-r--r--sc/source/ui/inc/tabbgcolordlg.hxx4
-rw-r--r--sc/source/ui/inc/tabcont.hxx2
-rw-r--r--sc/source/ui/inc/tabopdlg.hxx2
-rw-r--r--sc/source/ui/inc/tabpages.hxx4
-rw-r--r--sc/source/ui/inc/tabsplit.hxx2
-rw-r--r--sc/source/ui/inc/tabview.hxx14
-rw-r--r--sc/source/ui/inc/tabvwsh.hxx6
-rw-r--r--sc/source/ui/inc/tbzoomsliderctrl.hxx6
-rw-r--r--sc/source/ui/inc/textdlgs.hxx4
-rw-r--r--sc/source/ui/inc/textimportoptions.hxx2
-rw-r--r--sc/source/ui/inc/tpcalc.hxx4
-rw-r--r--sc/source/ui/inc/tpcompatibility.hxx4
-rw-r--r--sc/source/ui/inc/tpdefaults.hxx4
-rw-r--r--sc/source/ui/inc/tpformula.hxx4
-rw-r--r--sc/source/ui/inc/tphf.hxx10
-rw-r--r--sc/source/ui/inc/tphfedit.hxx4
-rw-r--r--sc/source/ui/inc/tpprint.hxx4
-rw-r--r--sc/source/ui/inc/tpsort.hxx8
-rw-r--r--sc/source/ui/inc/tpstat.hxx4
-rw-r--r--sc/source/ui/inc/tpsubt.hxx18
-rw-r--r--sc/source/ui/inc/tptable.hxx4
-rw-r--r--sc/source/ui/inc/tpusrlst.hxx4
-rw-r--r--sc/source/ui/inc/tpview.hxx8
-rw-r--r--sc/source/ui/inc/transobj.hxx2
-rw-r--r--sc/source/ui/inc/validate.hxx22
-rw-r--r--sc/source/ui/inc/viewdata.hxx8
-rw-r--r--sc/source/ui/inc/viewfunc.hxx2
-rw-r--r--sc/source/ui/inc/warnbox.hxx4
-rw-r--r--sc/source/ui/inc/xmlsourcedlg.hxx2
-rw-r--r--sc/source/ui/miscdlgs/acredlin.cxx6
-rw-r--r--sc/source/ui/miscdlgs/anyrefdg.cxx48
-rw-r--r--sc/source/ui/miscdlgs/autofmt.cxx4
-rw-r--r--sc/source/ui/miscdlgs/conflictsdlg.cxx2
-rw-r--r--sc/source/ui/miscdlgs/crdlg.cxx2
-rw-r--r--sc/source/ui/miscdlgs/crnrdlg.cxx2
-rw-r--r--sc/source/ui/miscdlgs/datafdlg.cxx2
-rw-r--r--sc/source/ui/miscdlgs/datastreamdlg.cxx2
-rw-r--r--sc/source/ui/miscdlgs/delcldlg.cxx2
-rw-r--r--sc/source/ui/miscdlgs/delcodlg.cxx2
-rw-r--r--sc/source/ui/miscdlgs/filldlg.cxx2
-rw-r--r--sc/source/ui/miscdlgs/groupdlg.cxx2
-rw-r--r--sc/source/ui/miscdlgs/highred.cxx4
-rw-r--r--sc/source/ui/miscdlgs/inscldlg.cxx2
-rw-r--r--sc/source/ui/miscdlgs/inscodlg.cxx2
-rw-r--r--sc/source/ui/miscdlgs/instbdlg.cxx4
-rw-r--r--sc/source/ui/miscdlgs/lbseldlg.cxx2
-rw-r--r--sc/source/ui/miscdlgs/linkarea.cxx4
-rw-r--r--sc/source/ui/miscdlgs/mtrindlg.cxx2
-rw-r--r--sc/source/ui/miscdlgs/mvtabdlg.cxx2
-rw-r--r--sc/source/ui/miscdlgs/namecrea.cxx2
-rw-r--r--sc/source/ui/miscdlgs/optsolver.cxx12
-rw-r--r--sc/source/ui/miscdlgs/protectiondlg.cxx2
-rw-r--r--sc/source/ui/miscdlgs/redcom.cxx2
-rw-r--r--sc/source/ui/miscdlgs/retypepassdlg.cxx12
-rw-r--r--sc/source/ui/miscdlgs/scuiautofmt.cxx2
-rw-r--r--sc/source/ui/miscdlgs/sharedocdlg.cxx2
-rw-r--r--sc/source/ui/miscdlgs/shtabdlg.cxx2
-rw-r--r--sc/source/ui/miscdlgs/simpref.cxx2
-rw-r--r--sc/source/ui/miscdlgs/solveroptions.cxx6
-rw-r--r--sc/source/ui/miscdlgs/solvrdlg.cxx4
-rw-r--r--sc/source/ui/miscdlgs/strindlg.cxx2
-rw-r--r--sc/source/ui/miscdlgs/tabbgcolordlg.cxx6
-rw-r--r--sc/source/ui/miscdlgs/tabopdlg.cxx2
-rw-r--r--sc/source/ui/miscdlgs/textdlgs.cxx4
-rw-r--r--sc/source/ui/miscdlgs/warnbox.cxx4
-rw-r--r--sc/source/ui/namedlg/namedefdlg.cxx2
-rw-r--r--sc/source/ui/namedlg/namedlg.cxx2
-rw-r--r--sc/source/ui/namedlg/namepast.cxx2
-rw-r--r--sc/source/ui/navipi/content.cxx12
-rw-r--r--sc/source/ui/navipi/navipi.cxx6
-rw-r--r--sc/source/ui/navipi/scenwnd.cxx2
-rw-r--r--sc/source/ui/optdlg/calcoptionsdlg.cxx30
-rw-r--r--sc/source/ui/optdlg/calcoptionsdlg.hxx2
-rw-r--r--sc/source/ui/optdlg/opredlin.cxx4
-rw-r--r--sc/source/ui/optdlg/tpcalc.cxx4
-rw-r--r--sc/source/ui/optdlg/tpcompatibility.cxx4
-rw-r--r--sc/source/ui/optdlg/tpdefaults.cxx4
-rw-r--r--sc/source/ui/optdlg/tpformula.cxx4
-rw-r--r--sc/source/ui/optdlg/tpprint.cxx4
-rw-r--r--sc/source/ui/optdlg/tpusrlst.cxx4
-rw-r--r--sc/source/ui/optdlg/tpview.cxx8
-rw-r--r--sc/source/ui/pagedlg/areasdlg.cxx2
-rw-r--r--sc/source/ui/pagedlg/hfedtdlg.cxx22
-rw-r--r--sc/source/ui/pagedlg/scuitphfedit.cxx22
-rw-r--r--sc/source/ui/pagedlg/tphf.cxx10
-rw-r--r--sc/source/ui/pagedlg/tphfedit.cxx8
-rw-r--r--sc/source/ui/pagedlg/tptable.cxx4
-rw-r--r--sc/source/ui/sidebar/AlignmentPropertyPanel.cxx4
-rw-r--r--sc/source/ui/sidebar/AlignmentPropertyPanel.hxx4
-rw-r--r--sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx4
-rw-r--r--sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx4
-rw-r--r--sc/source/ui/sidebar/CellBorderStyleControl.cxx2
-rw-r--r--sc/source/ui/sidebar/CellBorderStyleControl.hxx2
-rw-r--r--sc/source/ui/sidebar/CellBorderStylePopup.cxx2
-rw-r--r--sc/source/ui/sidebar/CellBorderStylePopup.hxx2
-rw-r--r--sc/source/ui/sidebar/CellLineStyleControl.cxx2
-rw-r--r--sc/source/ui/sidebar/CellLineStyleControl.hxx2
-rw-r--r--sc/source/ui/sidebar/CellLineStylePopup.cxx2
-rw-r--r--sc/source/ui/sidebar/CellLineStylePopup.hxx2
-rw-r--r--sc/source/ui/sidebar/CellLineStyleValueSet.cxx2
-rw-r--r--sc/source/ui/sidebar/CellLineStyleValueSet.hxx2
-rw-r--r--sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx4
-rw-r--r--sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx4
-rw-r--r--sc/source/ui/sidebar/ScPanelFactory.cxx6
-rw-r--r--sc/source/ui/styleui/styledlg.cxx2
-rw-r--r--sc/source/ui/unoobj/chartuno.cxx2
-rw-r--r--sc/source/ui/unoobj/viewuno.cxx14
-rw-r--r--sc/source/ui/vba/excelvbahelper.cxx2
-rw-r--r--sc/source/ui/vba/vbaeventshelper.cxx30
-rw-r--r--sc/source/ui/vba/vbahelper.cxx2
-rw-r--r--sc/source/ui/view/cellsh.cxx8
-rw-r--r--sc/source/ui/view/cellsh1.cxx8
-rw-r--r--sc/source/ui/view/cellsh3.cxx2
-rw-r--r--sc/source/ui/view/cliputil.cxx2
-rw-r--r--sc/source/ui/view/colrowba.cxx4
-rw-r--r--sc/source/ui/view/dbfunc.cxx2
-rw-r--r--sc/source/ui/view/drawvie2.cxx4
-rw-r--r--sc/source/ui/view/drawvie4.cxx4
-rw-r--r--sc/source/ui/view/drawview.cxx6
-rw-r--r--sc/source/ui/view/editsh.cxx2
-rw-r--r--sc/source/ui/view/formatsh.cxx2
-rw-r--r--sc/source/ui/view/gridwin.cxx18
-rw-r--r--sc/source/ui/view/gridwin4.cxx2
-rw-r--r--sc/source/ui/view/gridwin5.cxx8
-rw-r--r--sc/source/ui/view/hdrcont.cxx2
-rw-r--r--sc/source/ui/view/hintwin.cxx2
-rw-r--r--sc/source/ui/view/notemark.cxx4
-rw-r--r--sc/source/ui/view/olinewin.cxx2
-rw-r--r--sc/source/ui/view/preview.cxx2
-rw-r--r--sc/source/ui/view/prevwsh.cxx6
-rw-r--r--sc/source/ui/view/reffact.cxx10
-rw-r--r--sc/source/ui/view/select.cxx8
-rw-r--r--sc/source/ui/view/spelldialog.cxx2
-rw-r--r--sc/source/ui/view/spelleng.cxx10
-rw-r--r--sc/source/ui/view/tabcont.cxx4
-rw-r--r--sc/source/ui/view/tabsplit.cxx4
-rw-r--r--sc/source/ui/view/tabview.cxx20
-rw-r--r--sc/source/ui/view/tabview2.cxx2
-rw-r--r--sc/source/ui/view/tabview3.cxx10
-rw-r--r--sc/source/ui/view/tabview4.cxx4
-rw-r--r--sc/source/ui/view/tabview5.cxx2
-rw-r--r--sc/source/ui/view/tabvwsh2.cxx4
-rw-r--r--sc/source/ui/view/tabvwsh4.cxx18
-rw-r--r--sc/source/ui/view/tabvwshb.cxx6
-rw-r--r--sc/source/ui/view/tabvwshc.cxx2
-rw-r--r--sc/source/ui/view/tabvwshd.cxx4
-rw-r--r--sc/source/ui/view/tabvwshe.cxx4
-rw-r--r--sc/source/ui/view/viewdata.cxx10
-rw-r--r--sc/source/ui/view/viewfun3.cxx10
-rw-r--r--sc/source/ui/view/viewfun4.cxx4
-rw-r--r--sc/source/ui/view/viewfun7.cxx2
-rw-r--r--sc/source/ui/view/viewfunc.cxx2
-rw-r--r--sc/source/ui/view/waitoff.cxx2
-rw-r--r--sc/source/ui/xmlsource/xmlsourcedlg.cxx2
-rw-r--r--sc/workben/test.cxx10
-rw-r--r--sd/inc/Outliner.hxx2
-rw-r--r--sd/inc/drawdoc.hxx4
-rw-r--r--sd/inc/sdabstdlg.hxx60
-rw-r--r--sd/inc/sdmod.hxx2
-rw-r--r--sd/source/core/drawdoc2.cxx2
-rw-r--r--sd/source/filter/html/htmlattr.cxx4
-rw-r--r--sd/source/filter/html/htmlattr.hxx2
-rw-r--r--sd/source/filter/html/htmlex.cxx2
-rw-r--r--sd/source/filter/html/htmlex.hxx2
-rw-r--r--sd/source/filter/html/pubdlg.cxx6
-rw-r--r--sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx14
-rw-r--r--sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx2
-rw-r--r--sd/source/ui/accessibility/AccessibleSlideSorterView.cxx10
-rw-r--r--sd/source/ui/accessibility/AccessibleViewForwarder.cxx4
-rw-r--r--sd/source/ui/animations/CustomAnimationCreateDialog.cxx20
-rw-r--r--sd/source/ui/animations/CustomAnimationCreateDialog.hxx2
-rw-r--r--sd/source/ui/animations/CustomAnimationDialog.cxx56
-rw-r--r--sd/source/ui/animations/CustomAnimationDialog.hxx6
-rw-r--r--sd/source/ui/animations/CustomAnimationList.cxx4
-rw-r--r--sd/source/ui/animations/CustomAnimationList.hxx2
-rw-r--r--sd/source/ui/animations/CustomAnimationPane.cxx6
-rw-r--r--sd/source/ui/animations/CustomAnimationPane.hxx2
-rw-r--r--sd/source/ui/animations/SlideTransitionPane.cxx6
-rw-r--r--sd/source/ui/animations/SlideTransitionPane.hxx2
-rw-r--r--sd/source/ui/annotations/annotationmanager.cxx2
-rw-r--r--sd/source/ui/annotations/annotationmanagerimpl.hxx2
-rw-r--r--sd/source/ui/annotations/annotationtag.cxx10
-rw-r--r--sd/source/ui/annotations/annotationtag.hxx4
-rw-r--r--sd/source/ui/annotations/annotationwindow.cxx4
-rw-r--r--sd/source/ui/annotations/annotationwindow.hxx2
-rw-r--r--sd/source/ui/app/sdmod2.cxx2
-rw-r--r--sd/source/ui/controller/slidelayoutcontroller.cxx6
-rw-r--r--sd/source/ui/controller/slidelayoutcontroller.hxx2
-rw-r--r--sd/source/ui/dlg/AnimationChildWindow.cxx2
-rw-r--r--sd/source/ui/dlg/LayerTabBar.cxx2
-rw-r--r--sd/source/ui/dlg/NavigatorChildWindow.cxx2
-rw-r--r--sd/source/ui/dlg/PaneChildWindows.cxx6
-rw-r--r--sd/source/ui/dlg/PaneDockingWindow.cxx4
-rw-r--r--sd/source/ui/dlg/PhotoAlbumDialog.cxx2
-rw-r--r--sd/source/ui/dlg/PhotoAlbumDialog.hxx2
-rw-r--r--sd/source/ui/dlg/RemoteDialog.cxx2
-rw-r--r--sd/source/ui/dlg/RemoteDialog.hxx2
-rw-r--r--sd/source/ui/dlg/RemoteDialogClientBox.cxx4
-rw-r--r--sd/source/ui/dlg/RemoteDialogClientBox.hxx2
-rw-r--r--sd/source/ui/dlg/SpellDialogChildWindow.cxx2
-rw-r--r--sd/source/ui/dlg/animobjs.cxx6
-rw-r--r--sd/source/ui/dlg/assclass.cxx6
-rw-r--r--sd/source/ui/dlg/brkdlg.cxx2
-rw-r--r--sd/source/ui/dlg/copydlg.cxx2
-rw-r--r--sd/source/ui/dlg/custsdlg.cxx4
-rw-r--r--sd/source/ui/dlg/diactrl.cxx4
-rw-r--r--sd/source/ui/dlg/dlgass.cxx16
-rw-r--r--sd/source/ui/dlg/dlgassim.cxx4
-rw-r--r--sd/source/ui/dlg/dlgassim.hxx2
-rw-r--r--sd/source/ui/dlg/dlgchar.cxx2
-rw-r--r--sd/source/ui/dlg/dlgctrls.cxx4
-rw-r--r--sd/source/ui/dlg/dlgfield.cxx2
-rw-r--r--sd/source/ui/dlg/dlgolbul.cxx2
-rw-r--r--sd/source/ui/dlg/dlgpage.cxx2
-rw-r--r--sd/source/ui/dlg/dlgsnap.cxx2
-rw-r--r--sd/source/ui/dlg/docprev.cxx4
-rw-r--r--sd/source/ui/dlg/gluectrl.cxx4
-rw-r--r--sd/source/ui/dlg/headerfooterdlg.cxx12
-rw-r--r--sd/source/ui/dlg/ins_paste.cxx2
-rw-r--r--sd/source/ui/dlg/inspagob.cxx2
-rw-r--r--sd/source/ui/dlg/layeroptionsdlg.cxx2
-rw-r--r--sd/source/ui/dlg/masterlayoutdlg.cxx2
-rw-r--r--sd/source/ui/dlg/morphdlg.cxx2
-rw-r--r--sd/source/ui/dlg/navigatr.cxx6
-rw-r--r--sd/source/ui/dlg/paragr.cxx10
-rw-r--r--sd/source/ui/dlg/present.cxx2
-rw-r--r--sd/source/ui/dlg/prltempl.cxx2
-rw-r--r--sd/source/ui/dlg/prntopts.cxx4
-rw-r--r--sd/source/ui/dlg/sddlgfact.cxx54
-rw-r--r--sd/source/ui/dlg/sddlgfact.hxx52
-rw-r--r--sd/source/ui/dlg/sdpreslt.cxx2
-rw-r--r--sd/source/ui/dlg/sdtreelb.cxx22
-rw-r--r--sd/source/ui/dlg/tabtempl.cxx2
-rw-r--r--sd/source/ui/dlg/tpaction.cxx8
-rw-r--r--sd/source/ui/dlg/tpoption.cxx12
-rw-r--r--sd/source/ui/dlg/vectdlg.cxx2
-rw-r--r--sd/source/ui/docshell/docshel2.cxx4
-rw-r--r--sd/source/ui/docshell/docshel4.cxx8
-rw-r--r--sd/source/ui/docshell/sdclient.cxx2
-rw-r--r--sd/source/ui/framework/factories/BasicViewFactory.cxx6
-rw-r--r--sd/source/ui/framework/factories/BasicViewFactory.hxx8
-rw-r--r--sd/source/ui/framework/factories/ChildWindowPane.cxx4
-rw-r--r--sd/source/ui/framework/factories/ChildWindowPane.hxx2
-rw-r--r--sd/source/ui/framework/factories/FrameWindowPane.cxx2
-rw-r--r--sd/source/ui/framework/factories/FrameWindowPane.hxx2
-rw-r--r--sd/source/ui/framework/factories/FullScreenPane.cxx10
-rw-r--r--sd/source/ui/framework/factories/FullScreenPane.hxx2
-rw-r--r--sd/source/ui/framework/factories/Pane.cxx12
-rw-r--r--sd/source/ui/framework/factories/ViewShellWrapper.cxx2
-rw-r--r--sd/source/ui/func/fucon3d.cxx2
-rw-r--r--sd/source/ui/func/fudraw.cxx6
-rw-r--r--sd/source/ui/func/fuinsfil.cxx2
-rw-r--r--sd/source/ui/func/fumorph.cxx2
-rw-r--r--sd/source/ui/func/fupage.cxx4
-rw-r--r--sd/source/ui/func/futext.cxx4
-rw-r--r--sd/source/ui/inc/AccessibleOutlineEditSource.hxx6
-rw-r--r--sd/source/ui/inc/AccessibleOutlineView.hxx2
-rw-r--r--sd/source/ui/inc/AccessibleSlideSorterView.hxx6
-rw-r--r--sd/source/ui/inc/AnimationChildWindow.hxx4
-rw-r--r--sd/source/ui/inc/BreakDlg.hxx2
-rw-r--r--sd/source/ui/inc/Client.hxx2
-rw-r--r--sd/source/ui/inc/ClientView.hxx4
-rw-r--r--sd/source/ui/inc/DrawDocShell.hxx4
-rw-r--r--sd/source/ui/inc/DrawViewShell.hxx6
-rw-r--r--sd/source/ui/inc/FormShellManager.hxx2
-rw-r--r--sd/source/ui/inc/GraphicViewShell.hxx4
-rw-r--r--sd/source/ui/inc/LayerTabBar.hxx2
-rw-r--r--sd/source/ui/inc/NavigatorChildWindow.hxx4
-rw-r--r--sd/source/ui/inc/OutlineBulletDlg.hxx2
-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/PaneChildWindows.hxx6
-rw-r--r--sd/source/ui/inc/PaneDockingWindow.hxx2
-rw-r--r--sd/source/ui/inc/PresentationViewShell.hxx2
-rw-r--r--sd/source/ui/inc/Ruler.hxx2
-rw-r--r--sd/source/ui/inc/ShellFactory.hxx4
-rw-r--r--sd/source/ui/inc/SlideSorter.hxx10
-rw-r--r--sd/source/ui/inc/SlideSorterViewShell.hxx8
-rw-r--r--sd/source/ui/inc/SpellDialogChildWindow.hxx2
-rw-r--r--sd/source/ui/inc/TabControl.hxx2
-rw-r--r--sd/source/ui/inc/View.hxx16
-rw-r--r--sd/source/ui/inc/ViewShell.hxx8
-rw-r--r--sd/source/ui/inc/ViewShellBase.hxx2
-rw-r--r--sd/source/ui/inc/ViewTabBar.hxx2
-rw-r--r--sd/source/ui/inc/Window.hxx4
-rw-r--r--sd/source/ui/inc/WindowUpdater.hxx8
-rw-r--r--sd/source/ui/inc/animobjs.hxx6
-rw-r--r--sd/source/ui/inc/assclass.hxx6
-rw-r--r--sd/source/ui/inc/celltempl.hxx2
-rw-r--r--sd/source/ui/inc/copydlg.hxx2
-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/custsdlg.hxx4
-rw-r--r--sd/source/ui/inc/diactrl.hxx4
-rw-r--r--sd/source/ui/inc/dlg_char.hxx2
-rw-r--r--sd/source/ui/inc/dlgass.hxx2
-rw-r--r--sd/source/ui/inc/dlgctrls.hxx2
-rw-r--r--sd/source/ui/inc/dlgfield.hxx2
-rw-r--r--sd/source/ui/inc/dlgpage.hxx2
-rw-r--r--sd/source/ui/inc/dlgsnap.hxx2
-rw-r--r--sd/source/ui/inc/docprev.hxx2
-rw-r--r--sd/source/ui/inc/drawview.hxx2
-rw-r--r--sd/source/ui/inc/framework/Pane.hxx8
-rw-r--r--sd/source/ui/inc/fuconbez.hxx2
-rw-r--r--sd/source/ui/inc/fuolbull.hxx2
-rw-r--r--sd/source/ui/inc/fuoltext.hxx2
-rw-r--r--sd/source/ui/inc/fuoutl.hxx2
-rw-r--r--sd/source/ui/inc/fupage.hxx2
-rw-r--r--sd/source/ui/inc/fuprlout.hxx2
-rw-r--r--sd/source/ui/inc/fuprobjs.hxx2
-rw-r--r--sd/source/ui/inc/gluectrl.hxx4
-rw-r--r--sd/source/ui/inc/headerfooterdlg.hxx2
-rw-r--r--sd/source/ui/inc/ins_paste.hxx2
-rw-r--r--sd/source/ui/inc/inspagob.hxx2
-rw-r--r--sd/source/ui/inc/layeroptionsdlg.hxx2
-rw-r--r--sd/source/ui/inc/masterlayoutdlg.hxx2
-rw-r--r--sd/source/ui/inc/morphdlg.hxx2
-rw-r--r--sd/source/ui/inc/navigatr.hxx4
-rw-r--r--sd/source/ui/inc/paragr.hxx2
-rw-r--r--sd/source/ui/inc/present.hxx2
-rw-r--r--sd/source/ui/inc/prltempl.hxx2
-rw-r--r--sd/source/ui/inc/prntopts.hxx4
-rw-r--r--sd/source/ui/inc/pubdlg.hxx2
-rw-r--r--sd/source/ui/inc/sdpreslt.hxx2
-rw-r--r--sd/source/ui/inc/sdtreelb.hxx6
-rw-r--r--sd/source/ui/inc/slideshow.hxx8
-rw-r--r--sd/source/ui/inc/tabtempl.hxx2
-rw-r--r--sd/source/ui/inc/taskpane/ILayoutableWindow.hxx4
-rw-r--r--sd/source/ui/inc/taskpane/ScrollPanel.hxx12
-rw-r--r--sd/source/ui/inc/taskpane/SlideSorterCacheDisplay.hxx8
-rw-r--r--sd/source/ui/inc/taskpane/SubToolPanel.hxx8
-rw-r--r--sd/source/ui/inc/taskpane/TaskPaneControlFactory.hxx6
-rw-r--r--sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx4
-rw-r--r--sd/source/ui/inc/taskpane/TitleBar.hxx6
-rw-r--r--sd/source/ui/inc/taskpane/TitledControl.hxx6
-rw-r--r--sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx6
-rw-r--r--sd/source/ui/inc/tools/IdleDetection.hxx6
-rw-r--r--sd/source/ui/inc/tpaction.hxx6
-rw-r--r--sd/source/ui/inc/tpoption.hxx12
-rw-r--r--sd/source/ui/inc/vectdlg.hxx2
-rw-r--r--sd/source/ui/presenter/PresenterCanvas.cxx8
-rw-r--r--sd/source/ui/presenter/PresenterHelper.cxx18
-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
-rw-r--r--sd/source/ui/slideshow/showwin.cxx4
-rw-r--r--sd/source/ui/slideshow/showwindow.hxx2
-rw-r--r--sd/source/ui/slideshow/slideshow.cxx8
-rw-r--r--sd/source/ui/slideshow/slideshowimpl.cxx4
-rw-r--r--sd/source/ui/slideshow/slideshowimpl.hxx8
-rw-r--r--sd/source/ui/slidesorter/controller/SlideSorterController.cxx6
-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/SlideSorterController.hxx2
-rw-r--r--sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx18
-rw-r--r--sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx4
-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.cxx20
-rw-r--r--sd/source/ui/slidesorter/shell/SlideSorterService.cxx2
-rw-r--r--sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx8
-rw-r--r--sd/source/ui/slidesorter/view/SlideSorterView.cxx2
-rw-r--r--sd/source/ui/slidesorter/view/SlsToolTip.cxx2
-rw-r--r--sd/source/ui/table/TableDesignPane.cxx6
-rw-r--r--sd/source/ui/table/TableDesignPane.hxx8
-rw-r--r--sd/source/ui/tools/IdleDetection.cxx4
-rw-r--r--sd/source/ui/view/FormShellManager.cxx4
-rw-r--r--sd/source/ui/view/Outliner.cxx6
-rw-r--r--sd/source/ui/view/ViewShellBase.cxx16
-rw-r--r--sd/source/ui/view/ViewShellManager.cxx16
-rw-r--r--sd/source/ui/view/ViewTabBar.cxx8
-rw-r--r--sd/source/ui/view/WindowUpdater.cxx4
-rw-r--r--sd/source/ui/view/clview.cxx4
-rw-r--r--sd/source/ui/view/drawview.cxx2
-rw-r--r--sd/source/ui/view/drviews6.cxx2
-rw-r--r--sd/source/ui/view/drviewsa.cxx4
-rw-r--r--sd/source/ui/view/drviewse.cxx6
-rw-r--r--sd/source/ui/view/drviewsh.cxx2
-rw-r--r--sd/source/ui/view/grviewsh.cxx2
-rw-r--r--sd/source/ui/view/outlnvsh.cxx6
-rw-r--r--sd/source/ui/view/outlview.cxx8
-rw-r--r--sd/source/ui/view/presvish.cxx2
-rw-r--r--sd/source/ui/view/sdruler.cxx2
-rw-r--r--sd/source/ui/view/sdview.cxx4
-rw-r--r--sd/source/ui/view/sdview2.cxx14
-rw-r--r--sd/source/ui/view/sdwindow.cxx26
-rw-r--r--sd/source/ui/view/tabcontr.cxx2
-rw-r--r--sd/source/ui/view/viewoverlaymanager.cxx2
-rw-r--r--sd/source/ui/view/viewshel.cxx10
-rw-r--r--sfx2/inc/guisaveas.hxx4
-rw-r--r--sfx2/inc/inettbc.hxx2
-rw-r--r--sfx2/inc/sidebar/PopupContainer.hxx2
-rw-r--r--sfx2/inc/srchdlg.hxx2
-rw-r--r--sfx2/source/appl/app.cxx2
-rw-r--r--sfx2/source/appl/appinit.cxx6
-rw-r--r--sfx2/source/appl/appopen.cxx6
-rw-r--r--sfx2/source/appl/appserv.cxx10
-rw-r--r--sfx2/source/appl/childwin.cxx8
-rw-r--r--sfx2/source/appl/fileobj.cxx2
-rw-r--r--sfx2/source/appl/fileobj.hxx4
-rw-r--r--sfx2/source/appl/impldde.cxx6
-rw-r--r--sfx2/source/appl/impldde.hxx2
-rw-r--r--sfx2/source/appl/linkmgr2.cxx2
-rw-r--r--sfx2/source/appl/linksrc.cxx2
-rw-r--r--sfx2/source/appl/lnkbase2.cxx4
-rw-r--r--sfx2/source/appl/module.cxx2
-rw-r--r--sfx2/source/appl/newhelp.cxx48
-rw-r--r--sfx2/source/appl/newhelp.hxx32
-rw-r--r--sfx2/source/appl/panelist.hxx6
-rw-r--r--sfx2/source/appl/sfxhelp.cxx20
-rw-r--r--sfx2/source/appl/workwin.cxx20
-rw-r--r--sfx2/source/control/dispatch.cxx12
-rw-r--r--sfx2/source/control/recentdocsview.cxx4
-rw-r--r--sfx2/source/control/templateabstractview.cxx4
-rw-r--r--sfx2/source/control/templatelocalview.cxx4
-rw-r--r--sfx2/source/control/templateremoteview.cxx4
-rw-r--r--sfx2/source/control/templatesearchview.cxx4
-rw-r--r--sfx2/source/control/thumbnailview.cxx2
-rw-r--r--sfx2/source/control/thumbnailviewacc.cxx6
-rw-r--r--sfx2/source/control/thumbnailviewitem.cxx4
-rw-r--r--sfx2/source/dialog/alienwarn.cxx2
-rw-r--r--sfx2/source/dialog/backingcomp.cxx10
-rw-r--r--sfx2/source/dialog/backingwindow.cxx10
-rw-r--r--sfx2/source/dialog/backingwindow.hxx6
-rw-r--r--sfx2/source/dialog/basedlgs.cxx12
-rw-r--r--sfx2/source/dialog/checkin.cxx2
-rw-r--r--sfx2/source/dialog/dialoghelper.cxx24
-rw-r--r--sfx2/source/dialog/dinfdlg.cxx74
-rw-r--r--sfx2/source/dialog/dockwin.cxx26
-rw-r--r--sfx2/source/dialog/documentfontsdialog.cxx4
-rw-r--r--sfx2/source/dialog/filedlghelper.cxx6
-rw-r--r--sfx2/source/dialog/filedlgimpl.hxx4
-rw-r--r--sfx2/source/dialog/infobar.cxx6
-rw-r--r--sfx2/source/dialog/inputdlg.cxx2
-rw-r--r--sfx2/source/dialog/itemconnect.cxx4
-rw-r--r--sfx2/source/dialog/mailmodel.cxx2
-rw-r--r--sfx2/source/dialog/mgetempl.cxx4
-rw-r--r--sfx2/source/dialog/navigat.cxx4
-rw-r--r--sfx2/source/dialog/newstyle.cxx2
-rw-r--r--sfx2/source/dialog/partwnd.cxx4
-rw-r--r--sfx2/source/dialog/passwd.cxx2
-rw-r--r--sfx2/source/dialog/printopt.cxx16
-rw-r--r--sfx2/source/dialog/recfloat.cxx6
-rw-r--r--sfx2/source/dialog/securitypage.cxx6
-rw-r--r--sfx2/source/dialog/splitwin.cxx4
-rw-r--r--sfx2/source/dialog/srchdlg.cxx2
-rw-r--r--sfx2/source/dialog/styledlg.cxx2
-rw-r--r--sfx2/source/dialog/tabdlg.cxx6
-rw-r--r--sfx2/source/dialog/taskpane.cxx14
-rw-r--r--sfx2/source/dialog/templateinfodlg.cxx4
-rw-r--r--sfx2/source/dialog/templdlg.cxx22
-rw-r--r--sfx2/source/dialog/titledockwin.cxx4
-rw-r--r--sfx2/source/dialog/versdlg.cxx2
-rw-r--r--sfx2/source/doc/QuerySaveDocument.cxx2
-rw-r--r--sfx2/source/doc/guisaveas.cxx8
-rw-r--r--sfx2/source/doc/iframe.cxx8
-rw-r--r--sfx2/source/doc/new.cxx10
-rw-r--r--sfx2/source/doc/objcont.cxx2
-rw-r--r--sfx2/source/doc/objmisc.cxx4
-rw-r--r--sfx2/source/doc/objstor.cxx2
-rw-r--r--sfx2/source/doc/plugin.cxx6
-rw-r--r--sfx2/source/doc/querytemplate.cxx2
-rw-r--r--sfx2/source/doc/querytemplate.hxx2
-rw-r--r--sfx2/source/doc/sfxbasemodel.cxx12
-rw-r--r--sfx2/source/doc/templatedlg.cxx2
-rw-r--r--sfx2/source/inc/alienwarn.hxx2
-rw-r--r--sfx2/source/inc/documentfontsdialog.hxx4
-rw-r--r--sfx2/source/inc/inputdlg.hxx2
-rw-r--r--sfx2/source/inc/partwnd.hxx4
-rw-r--r--sfx2/source/inc/preview.hxx8
-rw-r--r--sfx2/source/inc/recfloat.hxx4
-rw-r--r--sfx2/source/inc/splitwin.hxx2
-rw-r--r--sfx2/source/inc/templatesearchview.hxx2
-rw-r--r--sfx2/source/inc/templdgi.hxx16
-rw-r--r--sfx2/source/inc/versdlg.hxx2
-rw-r--r--sfx2/source/inc/workwin.hxx22
-rw-r--r--sfx2/source/inet/inettbc.cxx4
-rw-r--r--sfx2/source/menu/mnumgr.cxx6
-rw-r--r--sfx2/source/menu/virtmenu.cxx4
-rw-r--r--sfx2/source/sidebar/ControlFactory.cxx4
-rw-r--r--sfx2/source/sidebar/ControllerFactory.cxx2
-rw-r--r--sfx2/source/sidebar/Deck.cxx14
-rw-r--r--sfx2/source/sidebar/Deck.hxx16
-rw-r--r--sfx2/source/sidebar/DeckLayouter.cxx18
-rw-r--r--sfx2/source/sidebar/DeckLayouter.hxx20
-rw-r--r--sfx2/source/sidebar/DeckTitleBar.cxx2
-rw-r--r--sfx2/source/sidebar/DeckTitleBar.hxx2
-rw-r--r--sfx2/source/sidebar/FocusManager.cxx18
-rw-r--r--sfx2/source/sidebar/FocusManager.hxx14
-rw-r--r--sfx2/source/sidebar/MenuButton.cxx2
-rw-r--r--sfx2/source/sidebar/MenuButton.hxx2
-rw-r--r--sfx2/source/sidebar/Panel.cxx2
-rw-r--r--sfx2/source/sidebar/Panel.hxx4
-rw-r--r--sfx2/source/sidebar/PanelTitleBar.cxx2
-rw-r--r--sfx2/source/sidebar/PanelTitleBar.hxx2
-rw-r--r--sfx2/source/sidebar/PopupContainer.cxx2
-rw-r--r--sfx2/source/sidebar/SidebarChildWindow.cxx4
-rw-r--r--sfx2/source/sidebar/SidebarController.cxx6
-rw-r--r--sfx2/source/sidebar/SidebarController.hxx4
-rw-r--r--sfx2/source/sidebar/SidebarDockingWindow.cxx2
-rw-r--r--sfx2/source/sidebar/SidebarDockingWindow.hxx2
-rw-r--r--sfx2/source/sidebar/SidebarPanelBase.cxx4
-rw-r--r--sfx2/source/sidebar/SidebarToolBox.cxx4
-rw-r--r--sfx2/source/sidebar/TabBar.cxx2
-rw-r--r--sfx2/source/sidebar/TabBar.hxx4
-rw-r--r--sfx2/source/sidebar/TabItem.cxx2
-rw-r--r--sfx2/source/sidebar/TabItem.hxx4
-rw-r--r--sfx2/source/sidebar/TitleBar.cxx2
-rw-r--r--sfx2/source/sidebar/TitleBar.hxx4
-rw-r--r--sfx2/source/sidebar/ToolBox.hxx2
-rw-r--r--sfx2/source/toolbox/tbxitem.cxx34
-rw-r--r--sfx2/source/view/frame.cxx2
-rw-r--r--sfx2/source/view/frame2.cxx16
-rw-r--r--sfx2/source/view/impframe.hxx2
-rw-r--r--sfx2/source/view/impviewframe.hxx8
-rw-r--r--sfx2/source/view/ipclient.cxx4
-rw-r--r--sfx2/source/view/printer.cxx2
-rw-r--r--sfx2/source/view/sfxbasecontroller.cxx4
-rw-r--r--sfx2/source/view/viewfrm.cxx8
-rw-r--r--sfx2/source/view/viewprn.cxx4
-rw-r--r--sfx2/source/view/viewsh.cxx8
-rw-r--r--slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx2
-rw-r--r--slideshow/source/engine/shapes/viewmediashape.cxx4
-rw-r--r--slideshow/source/engine/shapes/viewmediashape.hxx4
-rw-r--r--slideshow/test/demoshow.cxx8
-rw-r--r--starmath/inc/ElementsDockingWindow.hxx6
-rw-r--r--starmath/inc/dialog.hxx30
-rw-r--r--starmath/inc/edit.hxx2
-rw-r--r--starmath/inc/smmod.hxx2
-rw-r--r--starmath/inc/toolbox.hxx2
-rw-r--r--starmath/inc/utility.hxx2
-rw-r--r--starmath/inc/view.hxx6
-rw-r--r--starmath/source/ElementsDockingWindow.cxx6
-rw-r--r--starmath/source/accessibility.cxx14
-rw-r--r--starmath/source/dialog.cxx38
-rw-r--r--starmath/source/document.cxx2
-rw-r--r--starmath/source/smmod.cxx2
-rw-r--r--starmath/source/tmpdevice.cxx2
-rw-r--r--starmath/source/toolbox.cxx6
-rw-r--r--starmath/source/utility.cxx4
-rw-r--r--starmath/source/view.cxx6
-rw-r--r--svtools/inc/roadmap.hxx4
-rw-r--r--svtools/inc/table/gridtablerenderer.hxx4
-rw-r--r--svtools/inc/table/tablecontrol.hxx10
-rw-r--r--svtools/inc/vclxaccessibleheaderbar.hxx2
-rw-r--r--svtools/source/brwbox/brwbox1.cxx4
-rw-r--r--svtools/source/brwbox/brwbox2.cxx8
-rw-r--r--svtools/source/brwbox/brwbox3.cxx8
-rw-r--r--svtools/source/brwbox/datwin.cxx8
-rw-r--r--svtools/source/brwbox/datwin.hxx8
-rw-r--r--svtools/source/brwbox/ebbcontrols.cxx6
-rw-r--r--svtools/source/brwbox/editbrowsebox.cxx12
-rw-r--r--svtools/source/brwbox/editbrowsebox2.cxx2
-rw-r--r--svtools/source/contnr/DocumentInfoPreview.cxx4
-rw-r--r--svtools/source/contnr/fileview.cxx10
-rw-r--r--svtools/source/contnr/imivctl1.cxx2
-rw-r--r--svtools/source/contnr/ivctrl.cxx4
-rw-r--r--svtools/source/contnr/simptabl.cxx4
-rw-r--r--svtools/source/contnr/svlbitm.cxx2
-rw-r--r--svtools/source/contnr/svtabbx.cxx22
-rw-r--r--svtools/source/contnr/treelistbox.cxx18
-rw-r--r--svtools/source/control/calendar.cxx10
-rw-r--r--svtools/source/control/ctrlbox.cxx22
-rw-r--r--svtools/source/control/filectrl.cxx2
-rw-r--r--svtools/source/control/fileurlbox.cxx2
-rw-r--r--svtools/source/control/fmtfield.cxx6
-rw-r--r--svtools/source/control/headbar.cxx4
-rw-r--r--svtools/source/control/hyperlabel.cxx2
-rw-r--r--svtools/source/control/inettbc.cxx8
-rw-r--r--svtools/source/control/roadmap.cxx14
-rw-r--r--svtools/source/control/ruler.cxx4
-rw-r--r--svtools/source/control/scrwin.cxx2
-rw-r--r--svtools/source/control/stdctrl.cxx2
-rw-r--r--svtools/source/control/tabbar.cxx4
-rw-r--r--svtools/source/control/toolbarmenu.cxx14
-rw-r--r--svtools/source/control/toolbarmenuacc.cxx6
-rw-r--r--svtools/source/control/urlcontrol.cxx4
-rw-r--r--svtools/source/control/valueacc.cxx12
-rw-r--r--svtools/source/control/valueset.cxx6
-rw-r--r--svtools/source/control/vclxaccessibleheaderbar.cxx2
-rw-r--r--svtools/source/dialogs/PlaceEditDialog.cxx4
-rw-r--r--svtools/source/dialogs/addresstemplate.cxx4
-rw-r--r--svtools/source/dialogs/colrdlg.cxx2
-rw-r--r--svtools/source/dialogs/prnsetup.cxx2
-rw-r--r--svtools/source/dialogs/restartdialog.cxx6
-rw-r--r--svtools/source/dialogs/roadmapwizard.cxx4
-rw-r--r--svtools/source/dialogs/wizardmachine.cxx10
-rw-r--r--svtools/source/dialogs/wizdlg.cxx4
-rw-r--r--svtools/source/edit/editsyntaxhighlighter.cxx4
-rw-r--r--svtools/source/edit/svmedit.cxx2
-rw-r--r--svtools/source/edit/svmedit2.cxx2
-rw-r--r--svtools/source/filter/GraphicExportOptionsDialog.cxx2
-rw-r--r--svtools/source/graphic/grfmgr2.cxx2
-rw-r--r--svtools/source/hatchwindow/documentcloser.cxx2
-rw-r--r--svtools/source/hatchwindow/hatchwindow.cxx2
-rw-r--r--svtools/source/hatchwindow/ipwin.cxx12
-rw-r--r--svtools/source/hatchwindow/ipwin.hxx14
-rw-r--r--svtools/source/inc/unoiface.hxx4
-rw-r--r--svtools/source/misc/cliplistener.cxx2
-rw-r--r--svtools/source/misc/dialogcontrolling.cxx28
-rw-r--r--svtools/source/misc/ehdl.cxx6
-rw-r--r--svtools/source/misc/stringtransfer.cxx6
-rw-r--r--svtools/source/misc/transfer.cxx14
-rw-r--r--svtools/source/misc/transfer2.cxx6
-rw-r--r--svtools/source/table/gridtablerenderer.cxx4
-rw-r--r--svtools/source/table/tablecontrol.cxx12
-rw-r--r--svtools/source/table/tablecontrol_impl.cxx6
-rw-r--r--svtools/source/table/tablecontrol_impl.hxx2
-rw-r--r--svtools/source/table/tabledatawindow.hxx2
-rw-r--r--svtools/source/toolpanel/drawerlayouter.cxx4
-rw-r--r--svtools/source/toolpanel/dummypanel.cxx2
-rw-r--r--svtools/source/toolpanel/dummypanel.hxx2
-rw-r--r--svtools/source/toolpanel/paneltabbar.cxx16
-rw-r--r--svtools/source/toolpanel/paneltabbarpeer.cxx2
-rw-r--r--svtools/source/toolpanel/tablayouter.cxx4
-rw-r--r--svtools/source/toolpanel/toolpaneldeck.cxx10
-rw-r--r--svtools/source/toolpanel/toolpaneldeckpeer.cxx2
-rw-r--r--svtools/source/toolpanel/toolpaneldrawer.cxx2
-rw-r--r--svtools/source/toolpanel/toolpaneldrawer.hxx6
-rw-r--r--svtools/source/uno/addrtempuno.cxx4
-rw-r--r--svtools/source/uno/contextmenuhelper.cxx2
-rw-r--r--svtools/source/uno/genericunodialog.cxx2
-rw-r--r--svtools/source/uno/popupwindowcontroller.cxx16
-rw-r--r--svtools/source/uno/statusbarcontroller.cxx2
-rw-r--r--svtools/source/uno/svtxgridcontrol.cxx4
-rw-r--r--svtools/source/uno/svtxgridcontrol.hxx2
-rw-r--r--svtools/source/uno/treecontrolpeer.cxx8
-rw-r--r--svtools/source/uno/treecontrolpeer.hxx4
-rw-r--r--svtools/source/uno/unoiface.cxx20
-rw-r--r--svtools/source/uno/wizard/unowizard.cxx4
-rw-r--r--svtools/source/uno/wizard/wizardpagecontroller.cxx2
-rw-r--r--svtools/source/uno/wizard/wizardshell.cxx2
-rw-r--r--svtools/source/uno/wizard/wizardshell.hxx2
-rw-r--r--svx/inc/AccessibleSvxFindReplaceDialog.hxx2
-rw-r--r--svx/inc/GalleryControl.hxx6
-rw-r--r--svx/inc/extrusiondepthdialog.hxx2
-rw-r--r--svx/inc/galbrws2.hxx12
-rw-r--r--svx/inc/sdr/contact/viewcontactofunocontrol.hxx4
-rw-r--r--svx/inc/sdr/contact/viewobjectcontactofopenglobj.hxx4
-rw-r--r--svx/inc/sdr/contact/viewobjectcontactofsdrmediaobj.hxx4
-rw-r--r--svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx4
-rw-r--r--svx/inc/svdibrow.hxx6
-rw-r--r--svx/inc/tbunosearchcontrollers.hxx2
-rw-r--r--svx/source/accessibility/AccessibleControlShape.cxx4
-rw-r--r--svx/source/accessibility/AccessibleEmptyEditSource.cxx6
-rw-r--r--svx/source/accessibility/AccessibleEmptyEditSource.hxx6
-rw-r--r--svx/source/accessibility/AccessibleFrameSelector.cxx10
-rw-r--r--svx/source/accessibility/AccessibleShape.cxx2
-rw-r--r--svx/source/accessibility/AccessibleShapeTreeInfo.cxx2
-rw-r--r--svx/source/accessibility/AccessibleSvxFindReplaceDialog.cxx4
-rw-r--r--svx/source/accessibility/ChildrenManagerImpl.cxx4
-rw-r--r--svx/source/accessibility/GraphCtlAccessibleContext.cxx4
-rw-r--r--svx/source/accessibility/charmapacc.cxx6
-rw-r--r--svx/source/accessibility/svxpixelctlaccessiblecontext.cxx8
-rw-r--r--svx/source/accessibility/svxrectctaccessiblecontext.cxx10
-rw-r--r--svx/source/dialog/SpellDialogChildWindow.cxx2
-rw-r--r--svx/source/dialog/_bmpmask.cxx6
-rw-r--r--svx/source/dialog/_contdlg.cxx8
-rw-r--r--svx/source/dialog/charmap.cxx4
-rw-r--r--svx/source/dialog/checklbx.cxx4
-rw-r--r--svx/source/dialog/compressgraphicdialog.cxx4
-rw-r--r--svx/source/dialog/connctrl.cxx4
-rw-r--r--svx/source/dialog/contimp.hxx2
-rw-r--r--svx/source/dialog/contwnd.cxx2
-rw-r--r--svx/source/dialog/contwnd.hxx2
-rw-r--r--svx/source/dialog/ctredlin.cxx6
-rw-r--r--svx/source/dialog/databaseregistrationui.cxx2
-rw-r--r--svx/source/dialog/dialcontrol.cxx8
-rw-r--r--svx/source/dialog/dlgctl3d.cxx12
-rw-r--r--svx/source/dialog/dlgctrl.cxx58
-rw-r--r--svx/source/dialog/docrecovery.cxx14
-rw-r--r--svx/source/dialog/fntctrl.cxx6
-rw-r--r--svx/source/dialog/fontlb.cxx4
-rw-r--r--svx/source/dialog/fontwork.cxx4
-rw-r--r--svx/source/dialog/frmdirlbox.cxx4
-rw-r--r--svx/source/dialog/frmsel.cxx4
-rw-r--r--svx/source/dialog/graphctl.cxx6
-rw-r--r--svx/source/dialog/grfflt.cxx2
-rw-r--r--svx/source/dialog/hdft.cxx16
-rw-r--r--svx/source/dialog/hyperdlg.cxx4
-rw-r--r--svx/source/dialog/imapdlg.cxx6
-rw-r--r--svx/source/dialog/imapwnd.cxx2
-rw-r--r--svx/source/dialog/imapwnd.hxx2
-rw-r--r--svx/source/dialog/langbox.cxx8
-rw-r--r--svx/source/dialog/linkwarn.cxx2
-rw-r--r--svx/source/dialog/measctrl.cxx4
-rw-r--r--svx/source/dialog/optgrid.cxx4
-rw-r--r--svx/source/dialog/orienthelper.cxx12
-rw-r--r--svx/source/dialog/pagectrl.cxx4
-rw-r--r--svx/source/dialog/paraprev.cxx4
-rw-r--r--svx/source/dialog/passwd.cxx2
-rw-r--r--svx/source/dialog/pfiledlg.cxx2
-rw-r--r--svx/source/dialog/prtqry.cxx2
-rw-r--r--svx/source/dialog/relfld.cxx6
-rw-r--r--svx/source/dialog/rubydialog.cxx10
-rw-r--r--svx/source/dialog/srchdlg.cxx8
-rw-r--r--svx/source/dialog/stddlg.cxx2
-rw-r--r--svx/source/dialog/svxbmpnumvalueset.cxx8
-rw-r--r--svx/source/dialog/svxruler.cxx10
-rw-r--r--svx/source/dialog/swframeexample.cxx4
-rw-r--r--svx/source/dialog/txencbox.cxx4
-rw-r--r--svx/source/dialog/wrapfield.cxx4
-rw-r--r--svx/source/engine3d/float3d.cxx4
-rw-r--r--svx/source/fmcomp/fmgridcl.cxx2
-rw-r--r--svx/source/fmcomp/fmgridif.cxx16
-rw-r--r--svx/source/fmcomp/gridcell.cxx58
-rw-r--r--svx/source/fmcomp/gridctrl.cxx10
-rw-r--r--svx/source/form/datanavi.cxx30
-rw-r--r--svx/source/form/filtnav.cxx6
-rw-r--r--svx/source/form/fmPropBrw.cxx6
-rw-r--r--svx/source/form/fmexch.cxx6
-rw-r--r--svx/source/form/fmexpl.cxx4
-rw-r--r--svx/source/form/fmpage.cxx2
-rw-r--r--svx/source/form/fmshell.cxx6
-rw-r--r--svx/source/form/fmshimp.cxx2
-rw-r--r--svx/source/form/fmtextcontroldialogs.cxx4
-rw-r--r--svx/source/form/fmtextcontrolshell.cxx6
-rw-r--r--svx/source/form/fmtools.cxx12
-rw-r--r--svx/source/form/fmview.cxx8
-rw-r--r--svx/source/form/fmvwimp.cxx12
-rw-r--r--svx/source/form/formcontroller.cxx6
-rw-r--r--svx/source/form/navigatortree.cxx6
-rw-r--r--svx/source/form/tabwin.cxx4
-rw-r--r--svx/source/form/tbxform.cxx10
-rw-r--r--svx/source/form/xfm_addcondition.cxx2
-rw-r--r--svx/source/gallery2/GalleryControl.cxx4
-rw-r--r--svx/source/gallery2/GallerySplitter.cxx2
-rw-r--r--svx/source/gallery2/GallerySplitter.hxx2
-rw-r--r--svx/source/gallery2/galbrws1.cxx4
-rw-r--r--svx/source/gallery2/galbrws1.hxx4
-rw-r--r--svx/source/gallery2/galbrws2.cxx26
-rw-r--r--svx/source/gallery2/galctrl.cxx4
-rw-r--r--svx/source/gallery2/galmisc.cxx6
-rw-r--r--svx/source/gallery2/galtheme.cxx4
-rw-r--r--svx/source/inc/datanavi.hxx26
-rw-r--r--svx/source/inc/docrecovery.hxx18
-rw-r--r--svx/source/inc/filtnav.hxx8
-rw-r--r--svx/source/inc/fmPropBrw.hxx4
-rw-r--r--svx/source/inc/fmexch.hxx12
-rw-r--r--svx/source/inc/fmexpl.hxx6
-rw-r--r--svx/source/inc/fmtextcontroldialogs.hxx4
-rw-r--r--svx/source/inc/fmvwimp.hxx6
-rw-r--r--svx/source/inc/formcontroller.hxx4
-rw-r--r--svx/source/inc/gridcell.hxx56
-rw-r--r--svx/source/inc/recoveryui.hxx2
-rw-r--r--svx/source/inc/svxrectctaccessiblecontext.hxx6
-rw-r--r--svx/source/inc/tabwin.hxx4
-rw-r--r--svx/source/inc/tbxform.hxx10
-rw-r--r--svx/source/inc/xfm_addcondition.hxx2
-rw-r--r--svx/source/sdr/contact/sdrmediawindow.cxx20
-rw-r--r--svx/source/sdr/contact/sdrmediawindow.hxx2
-rw-r--r--svx/source/sdr/contact/viewcontactofunocontrol.cxx2
-rw-r--r--svx/source/sdr/contact/viewobjectcontactofopenglobj.cxx6
-rw-r--r--svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx8
-rw-r--r--svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx12
-rw-r--r--svx/source/sdr/overlay/overlaymanager.cxx4
-rw-r--r--svx/source/sdr/overlay/overlaymanagerbuffered.cxx8
-rw-r--r--svx/source/sidebar/ColorPanel.cxx4
-rw-r--r--svx/source/sidebar/ColorPanel.hxx4
-rw-r--r--svx/source/sidebar/EmptyPanel.cxx2
-rw-r--r--svx/source/sidebar/EmptyPanel.hxx2
-rw-r--r--svx/source/sidebar/PanelFactory.cxx4
-rw-r--r--svx/source/sidebar/PanelLayout.cxx6
-rw-r--r--svx/source/sidebar/area/AreaPropertyPanel.cxx4
-rw-r--r--svx/source/sidebar/area/AreaPropertyPanel.hxx4
-rw-r--r--svx/source/sidebar/area/AreaTransparencyGradientControl.cxx2
-rw-r--r--svx/source/sidebar/area/AreaTransparencyGradientControl.hxx2
-rw-r--r--svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx2
-rw-r--r--svx/source/sidebar/area/AreaTransparencyGradientPopup.hxx2
-rw-r--r--svx/source/sidebar/debug/ColorPanel.cxx4
-rw-r--r--svx/source/sidebar/debug/ColorPanel.hxx4
-rw-r--r--svx/source/sidebar/debug/ContextPanel.cxx2
-rw-r--r--svx/source/sidebar/debug/ContextPanel.hxx4
-rw-r--r--svx/source/sidebar/debug/NotYetImplementedPanel.cxx2
-rw-r--r--svx/source/sidebar/debug/NotYetImplementedPanel.hxx4
-rw-r--r--svx/source/sidebar/graphic/GraphicPropertyPanel.cxx4
-rw-r--r--svx/source/sidebar/graphic/GraphicPropertyPanel.hxx4
-rw-r--r--svx/source/sidebar/insert/InsertPropertyPanel.cxx8
-rw-r--r--svx/source/sidebar/insert/InsertPropertyPanel.hxx2
-rw-r--r--svx/source/sidebar/line/LinePropertyPanel.cxx4
-rw-r--r--svx/source/sidebar/line/LinePropertyPanel.hxx4
-rw-r--r--svx/source/sidebar/line/LineWidthControl.cxx2
-rw-r--r--svx/source/sidebar/line/LineWidthControl.hxx2
-rw-r--r--svx/source/sidebar/line/LineWidthPopup.cxx2
-rw-r--r--svx/source/sidebar/line/LineWidthPopup.hxx2
-rw-r--r--svx/source/sidebar/line/LineWidthValueSet.cxx2
-rw-r--r--svx/source/sidebar/line/LineWidthValueSet.hxx2
-rw-r--r--svx/source/sidebar/paragraph/ParaBulletsControl.cxx2
-rw-r--r--svx/source/sidebar/paragraph/ParaBulletsControl.hxx2
-rw-r--r--svx/source/sidebar/paragraph/ParaBulletsPopup.cxx2
-rw-r--r--svx/source/sidebar/paragraph/ParaBulletsPopup.hxx2
-rw-r--r--svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx2
-rw-r--r--svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx2
-rw-r--r--svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx2
-rw-r--r--svx/source/sidebar/paragraph/ParaLineSpacingPopup.hxx2
-rw-r--r--svx/source/sidebar/paragraph/ParaNumberingControl.cxx2
-rw-r--r--svx/source/sidebar/paragraph/ParaNumberingControl.hxx2
-rw-r--r--svx/source/sidebar/paragraph/ParaNumberingPopup.cxx2
-rw-r--r--svx/source/sidebar/paragraph/ParaNumberingPopup.hxx2
-rw-r--r--svx/source/sidebar/paragraph/ParaPropertyPanel.cxx4
-rw-r--r--svx/source/sidebar/paragraph/ParaPropertyPanel.hxx4
-rw-r--r--svx/source/sidebar/possize/PosSizePropertyPanel.cxx4
-rw-r--r--svx/source/sidebar/possize/PosSizePropertyPanel.hxx4
-rw-r--r--svx/source/sidebar/possize/SidebarDialControl.cxx4
-rw-r--r--svx/source/sidebar/text/TextCharacterSpacingControl.cxx2
-rw-r--r--svx/source/sidebar/text/TextCharacterSpacingControl.hxx2
-rw-r--r--svx/source/sidebar/text/TextCharacterSpacingPopup.cxx2
-rw-r--r--svx/source/sidebar/text/TextCharacterSpacingPopup.hxx2
-rw-r--r--svx/source/sidebar/text/TextPropertyPanel.cxx4
-rw-r--r--svx/source/sidebar/text/TextPropertyPanel.hxx4
-rw-r--r--svx/source/sidebar/text/TextUnderlineControl.cxx2
-rw-r--r--svx/source/sidebar/text/TextUnderlineControl.hxx2
-rw-r--r--svx/source/sidebar/text/TextUnderlinePopup.cxx2
-rw-r--r--svx/source/sidebar/text/TextUnderlinePopup.hxx2
-rw-r--r--svx/source/sidebar/tools/ColorControl.cxx2
-rw-r--r--svx/source/sidebar/tools/ColorPopup.cxx2
-rw-r--r--svx/source/sidebar/tools/Popup.cxx2
-rw-r--r--svx/source/sidebar/tools/PopupContainer.cxx2
-rw-r--r--svx/source/sidebar/tools/PopupControl.cxx2
-rw-r--r--svx/source/sidebar/tools/ValueSetWithTextControl.cxx6
-rw-r--r--svx/source/svdraw/sdrpagewindow.cxx4
-rw-r--r--svx/source/svdraw/sdrpaintwindow.cxx22
-rw-r--r--svx/source/svdraw/selectioncontroller.cxx8
-rw-r--r--svx/source/svdraw/svdcrtv.cxx4
-rw-r--r--svx/source/svdraw/svdedxv.cxx38
-rw-r--r--svx/source/svdraw/svdglue.cxx4
-rw-r--r--svx/source/svdraw/svdibrow.cxx18
-rw-r--r--svx/source/svdraw/svdmrkv.cxx2
-rw-r--r--svx/source/svdraw/svdouno.cxx2
-rw-r--r--svx/source/svdraw/svdpagv.cxx2
-rw-r--r--svx/source/svdraw/svdpntv.cxx18
-rw-r--r--svx/source/svdraw/svdview.cxx20
-rw-r--r--svx/source/svdraw/svdxcgv.cxx2
-rw-r--r--svx/source/table/accessiblecell.cxx2
-rw-r--r--svx/source/table/tablecontroller.cxx16
-rw-r--r--svx/source/tbxctrls/SvxColorChildWindow.cxx2
-rw-r--r--svx/source/tbxctrls/SvxColorValueSet.cxx8
-rw-r--r--svx/source/tbxctrls/colorwindow.hxx2
-rw-r--r--svx/source/tbxctrls/colrctrl.cxx4
-rw-r--r--svx/source/tbxctrls/extrusioncontrols.cxx18
-rw-r--r--svx/source/tbxctrls/extrusioncontrols.hxx16
-rw-r--r--svx/source/tbxctrls/fillctrl.cxx4
-rw-r--r--svx/source/tbxctrls/fontworkgallery.cxx20
-rw-r--r--svx/source/tbxctrls/grafctrl.cxx18
-rw-r--r--svx/source/tbxctrls/itemwin.cxx20
-rw-r--r--svx/source/tbxctrls/lboxctrl.cxx6
-rw-r--r--svx/source/tbxctrls/linectrl.cxx6
-rw-r--r--svx/source/tbxctrls/tbcontrl.cxx38
-rw-r--r--svx/source/tbxctrls/tbunocontroller.cxx8
-rw-r--r--svx/source/tbxctrls/tbunosearchcontrollers.cxx26
-rw-r--r--svx/source/tbxctrls/verttexttbxctrl.cxx2
-rw-r--r--svx/source/toolbars/fontworkbar.cxx4
-rw-r--r--svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx6
-rw-r--r--svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx10
-rw-r--r--svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx2
-rw-r--r--svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx2
-rw-r--r--svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx2
-rw-r--r--svx/source/unodraw/recoveryui.cxx2
-rw-r--r--svx/source/unodraw/unoshtxt.cxx8
-rw-r--r--svx/workben/msview/msview.cxx4
-rw-r--r--svx/workben/pixelctl.cxx4
-rw-r--r--sw/inc/PostItMgr.hxx6
-rw-r--r--sw/inc/SidebarWin.hxx2
-rw-r--r--sw/inc/accmap.hxx8
-rw-r--r--sw/inc/colwd.hxx2
-rw-r--r--sw/inc/crsrsh.hxx4
-rw-r--r--sw/inc/docsh.hxx2
-rw-r--r--sw/inc/dpage.hxx2
-rw-r--r--sw/inc/editsh.hxx4
-rw-r--r--sw/inc/fesh.hxx4
-rw-r--r--sw/inc/hhcwrp.hxx4
-rw-r--r--sw/inc/swabstdlg.hxx92
-rw-r--r--sw/inc/swmodule.hxx2
-rw-r--r--sw/inc/viewopt.hxx4
-rw-r--r--sw/inc/viewsh.hxx22
-rw-r--r--sw/source/core/access/acccontext.cxx22
-rw-r--r--sw/source/core/access/acccontext.hxx8
-rw-r--r--sw/source/core/access/accdoc.cxx30
-rw-r--r--sw/source/core/access/accdoc.hxx6
-rw-r--r--sw/source/core/access/accframebase.cxx6
-rw-r--r--sw/source/core/access/accfrmobj.cxx8
-rw-r--r--sw/source/core/access/accfrmobj.hxx14
-rw-r--r--sw/source/core/access/accfrmobjmap.cxx6
-rw-r--r--sw/source/core/access/accmap.cxx14
-rw-r--r--sw/source/core/access/accpage.cxx6
-rw-r--r--sw/source/core/access/accpara.cxx16
-rw-r--r--sw/source/core/crsr/crsrsh.cxx4
-rw-r--r--sw/source/core/crsr/viscrs.cxx2
-rw-r--r--sw/source/core/doc/DocumentLinksAdministrationManager.cxx2
-rw-r--r--sw/source/core/doc/DocumentRedlineManager.cxx2
-rw-r--r--sw/source/core/draw/dpage.cxx2
-rw-r--r--sw/source/core/draw/dview.cxx2
-rw-r--r--sw/source/core/edit/edws.cxx4
-rw-r--r--sw/source/core/frmedt/fetab.cxx2
-rw-r--r--sw/source/core/frmedt/fews.cxx4
-rw-r--r--sw/source/core/inc/dview.hxx2
-rw-r--r--sw/source/core/layout/layact.cxx2
-rw-r--r--sw/source/core/layout/paintfrm.cxx4
-rw-r--r--sw/source/core/view/viewimp.cxx2
-rw-r--r--sw/source/core/view/viewsh.cxx16
-rw-r--r--sw/source/core/view/vnew.cxx4
-rw-r--r--sw/source/ui/chrdlg/break.cxx2
-rw-r--r--sw/source/ui/chrdlg/chardlg.cxx6
-rw-r--r--sw/source/ui/chrdlg/drpcps.cxx10
-rw-r--r--sw/source/ui/chrdlg/numpara.cxx4
-rw-r--r--sw/source/ui/chrdlg/pardlg.cxx2
-rw-r--r--sw/source/ui/chrdlg/swuiccoll.cxx4
-rw-r--r--sw/source/ui/chrdlg/tblnumfm.cxx2
-rw-r--r--sw/source/ui/config/mailconfigpage.cxx6
-rw-r--r--sw/source/ui/config/optcomp.cxx4
-rw-r--r--sw/source/ui/config/optload.cxx16
-rw-r--r--sw/source/ui/config/optpage.cxx38
-rw-r--r--sw/source/ui/dbui/createaddresslistdialog.cxx10
-rw-r--r--sw/source/ui/dbui/createaddresslistdialog.hxx2
-rw-r--r--sw/source/ui/dbui/customizeaddresslistdialog.cxx4
-rw-r--r--sw/source/ui/dbui/customizeaddresslistdialog.hxx8
-rw-r--r--sw/source/ui/dbui/dbtablepreviewdialog.cxx2
-rw-r--r--sw/source/ui/dbui/dbtablepreviewdialog.hxx4
-rw-r--r--sw/source/ui/dbui/mmaddressblockpage.cxx20
-rw-r--r--sw/source/ui/dbui/mmaddressblockpage.hxx10
-rw-r--r--sw/source/ui/dbui/mmgreetingspage.cxx2
-rw-r--r--sw/source/ui/dbui/mmgreetingspage.hxx2
-rw-r--r--sw/source/ui/dbui/mmlayoutpage.hxx2
-rw-r--r--sw/source/ui/dbui/mmoutputpage.cxx18
-rw-r--r--sw/source/ui/dbui/mmoutputpage.hxx2
-rw-r--r--sw/source/ui/dbui/mmoutputtypepage.cxx6
-rw-r--r--sw/source/ui/dbui/selectdbtabledialog.cxx2
-rw-r--r--sw/source/ui/dbui/selectdbtabledialog.hxx2
-rw-r--r--sw/source/ui/dialog/abstract.cxx2
-rw-r--r--sw/source/ui/dialog/addrdlg.cxx2
-rw-r--r--sw/source/ui/dialog/ascfldlg.cxx2
-rw-r--r--sw/source/ui/dialog/docstdlg.cxx4
-rw-r--r--sw/source/ui/dialog/macassgn.cxx2
-rw-r--r--sw/source/ui/dialog/swdlgfact.cxx100
-rw-r--r--sw/source/ui/dialog/swdlgfact.hxx92
-rw-r--r--sw/source/ui/dialog/swmessdialog.cxx2
-rw-r--r--sw/source/ui/dialog/uiregionsw.cxx18
-rw-r--r--sw/source/ui/dialog/wordcountdialog.cxx2
-rw-r--r--sw/source/ui/dochdl/selglos.cxx2
-rw-r--r--sw/source/ui/envelp/envfmt.cxx4
-rw-r--r--sw/source/ui/envelp/envfmt.hxx4
-rw-r--r--sw/source/ui/envelp/envlop1.cxx10
-rw-r--r--sw/source/ui/envelp/envprt.cxx4
-rw-r--r--sw/source/ui/envelp/envprt.hxx4
-rw-r--r--sw/source/ui/envelp/label1.cxx18
-rw-r--r--sw/source/ui/envelp/labfmt.cxx8
-rw-r--r--sw/source/ui/envelp/labfmt.hxx8
-rw-r--r--sw/source/ui/envelp/labprt.cxx4
-rw-r--r--sw/source/ui/envelp/labprt.hxx4
-rw-r--r--sw/source/ui/envelp/mailmrge.cxx6
-rw-r--r--sw/source/ui/envelp/swuilabimp.hxx18
-rw-r--r--sw/source/ui/fldui/DropDownFieldDialog.cxx2
-rw-r--r--sw/source/ui/fldui/FldRefTreeListBox.cxx4
-rw-r--r--sw/source/ui/fldui/FldRefTreeListBox.hxx2
-rw-r--r--sw/source/ui/fldui/flddb.cxx4
-rw-r--r--sw/source/ui/fldui/flddb.hxx4
-rw-r--r--sw/source/ui/fldui/flddinf.cxx4
-rw-r--r--sw/source/ui/fldui/flddinf.hxx4
-rw-r--r--sw/source/ui/fldui/flddok.cxx4
-rw-r--r--sw/source/ui/fldui/flddok.hxx4
-rw-r--r--sw/source/ui/fldui/fldfunc.cxx6
-rw-r--r--sw/source/ui/fldui/fldfunc.hxx4
-rw-r--r--sw/source/ui/fldui/fldpage.cxx2
-rw-r--r--sw/source/ui/fldui/fldpage.hxx2
-rw-r--r--sw/source/ui/fldui/fldref.cxx4
-rw-r--r--sw/source/ui/fldui/fldref.hxx4
-rw-r--r--sw/source/ui/fldui/fldtdlg.cxx2
-rw-r--r--sw/source/ui/fldui/fldvar.cxx8
-rw-r--r--sw/source/ui/fldui/fldvar.hxx6
-rw-r--r--sw/source/ui/fldui/inpdlg.cxx2
-rw-r--r--sw/source/ui/fldui/javaedit.cxx2
-rw-r--r--sw/source/ui/fmtui/tmpdlg.cxx2
-rw-r--r--sw/source/ui/frmdlg/column.cxx10
-rw-r--r--sw/source/ui/frmdlg/cption.cxx6
-rw-r--r--sw/source/ui/frmdlg/frmdlg.cxx2
-rw-r--r--sw/source/ui/frmdlg/frmpage.cxx20
-rw-r--r--sw/source/ui/frmdlg/pattern.cxx2
-rw-r--r--sw/source/ui/frmdlg/uiborder.cxx2
-rw-r--r--sw/source/ui/frmdlg/wrap.cxx6
-rw-r--r--sw/source/ui/index/cnttab.cxx62
-rw-r--r--sw/source/ui/index/multmrk.cxx2
-rw-r--r--sw/source/ui/index/swuiidxmrk.cxx12
-rw-r--r--sw/source/ui/misc/bookmark.cxx6
-rw-r--r--sw/source/ui/misc/docfnote.cxx10
-rw-r--r--sw/source/ui/misc/glosbib.cxx6
-rw-r--r--sw/source/ui/misc/glossary.cxx8
-rw-r--r--sw/source/ui/misc/impfnote.hxx8
-rw-r--r--sw/source/ui/misc/insfnote.cxx2
-rw-r--r--sw/source/ui/misc/linenum.cxx4
-rw-r--r--sw/source/ui/misc/num.cxx6
-rw-r--r--sw/source/ui/misc/outline.cxx12
-rw-r--r--sw/source/ui/misc/pgfnote.cxx4
-rw-r--r--sw/source/ui/misc/pggrid.cxx4
-rw-r--r--sw/source/ui/misc/srtdlg.cxx2
-rw-r--r--sw/source/ui/misc/swmodalredlineacceptdlg.cxx2
-rw-r--r--sw/source/ui/misc/titlepage.cxx2
-rw-r--r--sw/source/ui/table/colwd.cxx2
-rw-r--r--sw/source/ui/table/mergetbl.cxx2
-rw-r--r--sw/source/ui/table/rowht.cxx2
-rw-r--r--sw/source/ui/table/splittbl.cxx2
-rw-r--r--sw/source/ui/table/tabledlg.cxx14
-rw-r--r--sw/source/ui/table/tautofmt.cxx14
-rw-r--r--sw/source/ui/utlui/swrenamexnameddlg.cxx2
-rw-r--r--sw/source/uibase/app/appenv.cxx2
-rw-r--r--sw/source/uibase/app/appopt.cxx2
-rw-r--r--sw/source/uibase/app/docsh.cxx4
-rw-r--r--sw/source/uibase/app/docsh2.cxx6
-rw-r--r--sw/source/uibase/cctrl/actctrl.cxx2
-rw-r--r--sw/source/uibase/cctrl/swlbox.cxx2
-rw-r--r--sw/source/uibase/config/viewopt.cxx2
-rw-r--r--sw/source/uibase/dbui/dbtree.cxx4
-rw-r--r--sw/source/uibase/dbui/dbui.cxx4
-rw-r--r--sw/source/uibase/dbui/mailmergechildwindow.cxx4
-rw-r--r--sw/source/uibase/dbui/mailmergehelper.cxx6
-rw-r--r--sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx4
-rw-r--r--sw/source/uibase/dialog/regionsw.cxx2
-rw-r--r--sw/source/uibase/dialog/wordcountwrapper.cxx2
-rw-r--r--sw/source/uibase/dochdl/swdtflvr.cxx6
-rw-r--r--sw/source/uibase/docvw/AnnotationMenuButton.hxx2
-rw-r--r--sw/source/uibase/docvw/DashedLine.cxx2
-rw-r--r--sw/source/uibase/docvw/PageBreakWin.cxx2
-rw-r--r--sw/source/uibase/docvw/PostItMgr.cxx6
-rw-r--r--sw/source/uibase/docvw/edtwin.cxx6
-rw-r--r--sw/source/uibase/docvw/frmsidebarwincontainer.cxx2
-rw-r--r--sw/source/uibase/docvw/frmsidebarwincontainer.hxx4
-rw-r--r--sw/source/uibase/docvw/romenu.cxx4
-rw-r--r--sw/source/uibase/docvw/romenu.hxx4
-rw-r--r--sw/source/uibase/docvw/srcedtw.cxx2
-rw-r--r--sw/source/uibase/envelp/syncbtn.cxx4
-rw-r--r--sw/source/uibase/fldui/fldwrap.cxx6
-rw-r--r--sw/source/uibase/frmdlg/colex.cxx8
-rw-r--r--sw/source/uibase/inc/DashedLine.hxx2
-rw-r--r--sw/source/uibase/inc/DropDownFieldDialog.hxx2
-rw-r--r--sw/source/uibase/inc/HeaderFooterWin.hxx2
-rw-r--r--sw/source/uibase/inc/PageBreakWin.hxx2
-rw-r--r--sw/source/uibase/inc/SwSpellDialogChildWindow.hxx2
-rw-r--r--sw/source/uibase/inc/abstract.hxx2
-rw-r--r--sw/source/uibase/inc/actctrl.hxx4
-rw-r--r--sw/source/uibase/inc/addrdlg.hxx2
-rw-r--r--sw/source/uibase/inc/ascfldlg.hxx2
-rw-r--r--sw/source/uibase/inc/autoedit.hxx2
-rw-r--r--sw/source/uibase/inc/bmpwin.hxx4
-rw-r--r--sw/source/uibase/inc/bookmark.hxx4
-rw-r--r--sw/source/uibase/inc/break.hxx2
-rw-r--r--sw/source/uibase/inc/chartins.hxx4
-rw-r--r--sw/source/uibase/inc/chldwrap.hxx2
-rw-r--r--sw/source/uibase/inc/chrdlg.hxx6
-rw-r--r--sw/source/uibase/inc/colex.hxx10
-rw-r--r--sw/source/uibase/inc/column.hxx10
-rw-r--r--sw/source/uibase/inc/condedit.hxx2
-rw-r--r--sw/source/uibase/inc/conttree.hxx6
-rw-r--r--sw/source/uibase/inc/cption.hxx2
-rw-r--r--sw/source/uibase/inc/dbtree.hxx2
-rw-r--r--sw/source/uibase/inc/dbui.hxx4
-rw-r--r--sw/source/uibase/inc/docfnote.hxx2
-rw-r--r--sw/source/uibase/inc/docstdlg.hxx4
-rw-r--r--sw/source/uibase/inc/drpcps.hxx6
-rw-r--r--sw/source/uibase/inc/edtwin.hxx4
-rw-r--r--sw/source/uibase/inc/envlop.hxx10
-rw-r--r--sw/source/uibase/inc/fldmgr.hxx4
-rw-r--r--sw/source/uibase/inc/fldtdlg.hxx2
-rw-r--r--sw/source/uibase/inc/fldwrap.hxx4
-rw-r--r--sw/source/uibase/inc/formedt.hxx2
-rw-r--r--sw/source/uibase/inc/frmdlg.hxx2
-rw-r--r--sw/source/uibase/inc/frmpage.hxx16
-rw-r--r--sw/source/uibase/inc/glosbib.hxx8
-rw-r--r--sw/source/uibase/inc/glossary.hxx4
-rw-r--r--sw/source/uibase/inc/idxmrk.hxx4
-rw-r--r--sw/source/uibase/inc/inpdlg.hxx2
-rw-r--r--sw/source/uibase/inc/inputwin.hxx6
-rw-r--r--sw/source/uibase/inc/insfnote.hxx2
-rw-r--r--sw/source/uibase/inc/javaedit.hxx4
-rw-r--r--sw/source/uibase/inc/label.hxx2
-rw-r--r--sw/source/uibase/inc/linenum.hxx6
-rw-r--r--sw/source/uibase/inc/macassgn.hxx2
-rw-r--r--sw/source/uibase/inc/mailconfigpage.hxx6
-rw-r--r--sw/source/uibase/inc/mailmergechildwindow.hxx4
-rw-r--r--sw/source/uibase/inc/mailmergehelper.hxx10
-rw-r--r--sw/source/uibase/inc/mailmrge.hxx8
-rw-r--r--sw/source/uibase/inc/mergetbl.hxx2
-rw-r--r--sw/source/uibase/inc/multmrk.hxx2
-rw-r--r--sw/source/uibase/inc/navipi.hxx8
-rw-r--r--sw/source/uibase/inc/num.hxx6
-rw-r--r--sw/source/uibase/inc/numberingtypelistbox.hxx2
-rw-r--r--sw/source/uibase/inc/numfmtlb.hxx2
-rw-r--r--sw/source/uibase/inc/numpara.hxx4
-rw-r--r--sw/source/uibase/inc/numprevw.hxx6
-rw-r--r--sw/source/uibase/inc/olmenu.hxx2
-rw-r--r--sw/source/uibase/inc/optcomp.hxx4
-rw-r--r--sw/source/uibase/inc/optload.hxx16
-rw-r--r--sw/source/uibase/inc/optpage.hxx36
-rw-r--r--sw/source/uibase/inc/outline.hxx6
-rw-r--r--sw/source/uibase/inc/pattern.hxx4
-rw-r--r--sw/source/uibase/inc/pgfnote.hxx4
-rw-r--r--sw/source/uibase/inc/pggrid.hxx4
-rw-r--r--sw/source/uibase/inc/pview.hxx12
-rw-r--r--sw/source/uibase/inc/redlndlg.hxx4
-rw-r--r--sw/source/uibase/inc/regionsw.hxx22
-rw-r--r--sw/source/uibase/inc/rowht.hxx2
-rw-r--r--sw/source/uibase/inc/scroll.hxx2
-rw-r--r--sw/source/uibase/inc/selglos.hxx2
-rw-r--r--sw/source/uibase/inc/shdwcrsr.hxx6
-rw-r--r--sw/source/uibase/inc/splittbl.hxx2
-rw-r--r--sw/source/uibase/inc/srcedtw.hxx8
-rw-r--r--sw/source/uibase/inc/srtdlg.hxx2
-rw-r--r--sw/source/uibase/inc/stmenu.hxx2
-rw-r--r--sw/source/uibase/inc/swdtflvr.hxx4
-rw-r--r--sw/source/uibase/inc/swlbox.hxx4
-rw-r--r--sw/source/uibase/inc/swmessdialog.hxx2
-rw-r--r--sw/source/uibase/inc/swmodalredlineacceptdlg.hxx2
-rw-r--r--sw/source/uibase/inc/swrenamexnameddlg.hxx2
-rw-r--r--sw/source/uibase/inc/swruler.hxx4
-rw-r--r--sw/source/uibase/inc/swuiccoll.hxx4
-rw-r--r--sw/source/uibase/inc/swuicnttab.hxx22
-rw-r--r--sw/source/uibase/inc/swuiidxmrk.hxx8
-rw-r--r--sw/source/uibase/inc/swuipardlg.hxx2
-rw-r--r--sw/source/uibase/inc/swvset.hxx2
-rw-r--r--sw/source/uibase/inc/syncbtn.hxx4
-rw-r--r--sw/source/uibase/inc/tabledlg.hxx2
-rw-r--r--sw/source/uibase/inc/tablemgr.hxx4
-rw-r--r--sw/source/uibase/inc/tautofmt.hxx2
-rw-r--r--sw/source/uibase/inc/tblnumfm.hxx4
-rw-r--r--sw/source/uibase/inc/titlepage.hxx4
-rw-r--r--sw/source/uibase/inc/tmpdlg.hxx2
-rw-r--r--sw/source/uibase/inc/uiborder.hxx4
-rw-r--r--sw/source/uibase/inc/unotools.hxx6
-rw-r--r--sw/source/uibase/inc/view.hxx12
-rw-r--r--sw/source/uibase/inc/wordcountdialog.hxx4
-rw-r--r--sw/source/uibase/inc/workctrl.hxx8
-rw-r--r--sw/source/uibase/inc/wrap.hxx8
-rw-r--r--sw/source/uibase/inc/wrtsh.hxx8
-rw-r--r--sw/source/uibase/index/idxmrk.cxx4
-rw-r--r--sw/source/uibase/lingu/olmenu.cxx2
-rw-r--r--sw/source/uibase/misc/numberingtypelistbox.cxx4
-rw-r--r--sw/source/uibase/misc/redlndlg.cxx4
-rw-r--r--sw/source/uibase/misc/swruler.cxx2
-rw-r--r--sw/source/uibase/ribbar/inputwin.cxx4
-rw-r--r--sw/source/uibase/ribbar/workctrl.cxx14
-rw-r--r--sw/source/uibase/shells/basesh.cxx2
-rw-r--r--sw/source/uibase/shells/grfshex.cxx2
-rw-r--r--sw/source/uibase/shells/langhelper.cxx2
-rw-r--r--sw/source/uibase/shells/textfld.cxx2
-rw-r--r--sw/source/uibase/shells/textidx.cxx2
-rw-r--r--sw/source/uibase/shells/textsh1.cxx2
-rw-r--r--sw/source/uibase/shells/txtcrsr.cxx2
-rw-r--r--sw/source/uibase/sidebar/PageColumnControl.cxx2
-rw-r--r--sw/source/uibase/sidebar/PageColumnControl.hxx2
-rw-r--r--sw/source/uibase/sidebar/PageMarginControl.cxx2
-rw-r--r--sw/source/uibase/sidebar/PageMarginControl.hxx2
-rw-r--r--sw/source/uibase/sidebar/PageOrientationControl.cxx2
-rw-r--r--sw/source/uibase/sidebar/PageOrientationControl.hxx2
-rw-r--r--sw/source/uibase/sidebar/PagePropertyPanel.cxx4
-rw-r--r--sw/source/uibase/sidebar/PagePropertyPanel.hxx4
-rw-r--r--sw/source/uibase/sidebar/PageSizeControl.cxx2
-rw-r--r--sw/source/uibase/sidebar/PageSizeControl.hxx2
-rw-r--r--sw/source/uibase/sidebar/SwPanelFactory.cxx4
-rw-r--r--sw/source/uibase/sidebar/WrapPropertyPanel.cxx4
-rw-r--r--sw/source/uibase/sidebar/WrapPropertyPanel.hxx4
-rw-r--r--sw/source/uibase/smartmenu/stmenu.cxx2
-rw-r--r--sw/source/uibase/table/chartins.cxx4
-rw-r--r--sw/source/uibase/table/tablemgr.cxx2
-rw-r--r--sw/source/uibase/table/tablepg.hxx12
-rw-r--r--sw/source/uibase/uiview/pview.cxx6
-rw-r--r--sw/source/uibase/uiview/scroll.cxx2
-rw-r--r--sw/source/uibase/uiview/srcview.cxx2
-rw-r--r--sw/source/uibase/uiview/view2.cxx8
-rw-r--r--sw/source/uibase/uiview/viewdlg2.cxx2
-rw-r--r--sw/source/uibase/uiview/viewdraw.cxx4
-rw-r--r--sw/source/uibase/uiview/viewfunc.hxx8
-rw-r--r--sw/source/uibase/uiview/viewmdi.cxx4
-rw-r--r--sw/source/uibase/uiview/viewport.cxx6
-rw-r--r--sw/source/uibase/uiview/viewprt.cxx4
-rw-r--r--sw/source/uibase/uiview/viewsrch.cxx12
-rw-r--r--sw/source/uibase/uno/unotxvw.cxx4
-rw-r--r--sw/source/uibase/utlui/condedit.cxx4
-rw-r--r--sw/source/uibase/utlui/content.cxx4
-rw-r--r--sw/source/uibase/utlui/glbltree.cxx2
-rw-r--r--sw/source/uibase/utlui/gloslst.cxx4
-rw-r--r--sw/source/uibase/utlui/navipi.cxx8
-rw-r--r--sw/source/uibase/utlui/numfmtlb.cxx4
-rw-r--r--sw/source/uibase/utlui/unotools.cxx6
-rw-r--r--sw/source/uibase/wrtsh/wrtsh1.cxx6
-rw-r--r--sw/source/uibase/wrtsh/wrtsh2.cxx2
-rw-r--r--toolkit/inc/helper/unowrapper.hxx40
-rw-r--r--toolkit/source/awt/scrollabledialog.cxx4
-rw-r--r--toolkit/source/awt/stylesettings.cxx20
-rw-r--r--toolkit/source/awt/vclxaccessiblecomponent.cxx40
-rw-r--r--toolkit/source/awt/vclxcontainer.cxx22
-rw-r--r--toolkit/source/awt/vclxdevice.cxx4
-rw-r--r--toolkit/source/awt/vclxspinbutton.cxx6
-rw-r--r--toolkit/source/awt/vclxsystemdependentwindow.cxx2
-rw-r--r--toolkit/source/awt/vclxtabpagecontainer.cxx2
-rw-r--r--toolkit/source/awt/vclxtoolkit.cxx46
-rw-r--r--toolkit/source/awt/vclxtopwindow.cxx6
-rw-r--r--toolkit/source/awt/vclxwindow.cxx68
-rw-r--r--toolkit/source/awt/vclxwindow1.cxx2
-rw-r--r--toolkit/source/awt/vclxwindows.cxx70
-rw-r--r--toolkit/source/awt/vclxwindows_internal.hxx4
-rw-r--r--toolkit/source/controls/accessiblecontrolcontext.cxx12
-rw-r--r--toolkit/source/controls/unocontrol.cxx6
-rw-r--r--toolkit/source/helper/unowrapper.cxx30
-rw-r--r--toolkit/source/helper/vclunohelper.cxx10
-rw-r--r--tools/source/ref/errinf.cxx4
-rw-r--r--ucb/workben/ucb/ucbdemo.cxx6
-rw-r--r--uui/source/alreadyopen.cxx2
-rw-r--r--uui/source/alreadyopen.hxx2
-rw-r--r--uui/source/filechanged.cxx2
-rw-r--r--uui/source/filechanged.hxx2
-rw-r--r--uui/source/fltdlg.cxx2
-rw-r--r--uui/source/fltdlg.hxx2
-rw-r--r--uui/source/iahndl-authentication.cxx14
-rw-r--r--uui/source/iahndl-errorhandler.cxx2
-rw-r--r--uui/source/iahndl-filter.cxx4
-rw-r--r--uui/source/iahndl-locking.cxx6
-rw-r--r--uui/source/iahndl-ssl.cxx6
-rw-r--r--uui/source/iahndl.cxx6
-rw-r--r--uui/source/iahndl.hxx4
-rw-r--r--uui/source/lockfailed.cxx2
-rw-r--r--uui/source/lockfailed.hxx2
-rw-r--r--uui/source/logindlg.cxx2
-rw-r--r--uui/source/logindlg.hxx2
-rw-r--r--uui/source/masterpasscrtdlg.cxx2
-rw-r--r--uui/source/masterpasscrtdlg.hxx2
-rw-r--r--uui/source/masterpassworddlg.cxx2
-rw-r--r--uui/source/masterpassworddlg.hxx2
-rw-r--r--uui/source/nameclashdlg.cxx2
-rw-r--r--uui/source/nameclashdlg.hxx2
-rw-r--r--uui/source/openlocked.cxx2
-rw-r--r--uui/source/openlocked.hxx2
-rw-r--r--uui/source/passworddlg.cxx2
-rw-r--r--uui/source/passworddlg.hxx2
-rw-r--r--uui/source/secmacrowarnings.cxx2
-rw-r--r--uui/source/secmacrowarnings.hxx2
-rw-r--r--uui/source/sslwarndlg.cxx2
-rw-r--r--uui/source/sslwarndlg.hxx2
-rw-r--r--uui/source/trylater.cxx2
-rw-r--r--uui/source/trylater.hxx2
-rw-r--r--uui/source/unknownauthdlg.cxx2
-rw-r--r--uui/source/unknownauthdlg.hxx2
-rw-r--r--vbahelper/source/msforms/vbacontrol.cxx4
-rw-r--r--vbahelper/source/vbahelper/vbahelper.cxx8
-rw-r--r--vcl/generic/fontmanager/fontconfig.cxx2
-rw-r--r--vcl/generic/print/genprnpsp.cxx4
-rw-r--r--vcl/generic/print/prtsetup.cxx2
-rw-r--r--vcl/generic/print/prtsetup.hxx2
-rw-r--r--vcl/inc/brdwin.hxx16
-rw-r--r--vcl/inc/dbggui.hxx4
-rw-r--r--vcl/inc/dndevdis.hxx20
-rw-r--r--vcl/inc/helpwin.hxx6
-rw-r--r--vcl/inc/ilstbox.hxx18
-rw-r--r--vcl/inc/osx/a11yfocustracker.hxx14
-rw-r--r--vcl/inc/printdlg.hxx22
-rw-r--r--vcl/inc/salframe.hxx8
-rw-r--r--vcl/inc/salwtype.hxx4
-rw-r--r--vcl/inc/svdata.hxx37
-rw-r--r--vcl/inc/toolbox.h4
-rw-r--r--vcl/inc/unx/gtk/gtkdata.hxx2
-rw-r--r--vcl/inc/unx/gtk/gtkframe.hxx4
-rw-r--r--vcl/inc/unx/i18n_ic.hxx2
-rw-r--r--vcl/inc/unx/i18n_im.hxx2
-rw-r--r--vcl/inc/unx/saldisp.hxx10
-rw-r--r--vcl/inc/unx/salframe.h22
-rw-r--r--vcl/inc/unx/salobj.h4
-rw-r--r--vcl/inc/unx/wmadaptor.hxx2
-rw-r--r--vcl/inc/window.h62
-rw-r--r--vcl/osx/a11yfocustracker.cxx14
-rw-r--r--vcl/osx/salinst.cxx2
-rw-r--r--vcl/qa/cppunit/complextext.cxx2
-rw-r--r--vcl/qa/cppunit/dndtest.cxx16
-rw-r--r--vcl/source/app/dbggui.cxx12
-rw-r--r--vcl/source/app/help.cxx28
-rw-r--r--vcl/source/app/sound.cxx2
-rw-r--r--vcl/source/app/stdtext.cxx2
-rw-r--r--vcl/source/app/svapp.cxx74
-rw-r--r--vcl/source/app/svdata.cxx8
-rw-r--r--vcl/source/app/svmain.cxx2
-rw-r--r--vcl/source/control/button.cxx72
-rw-r--r--vcl/source/control/combobox.cxx16
-rw-r--r--vcl/source/control/ctrl.cxx6
-rw-r--r--vcl/source/control/edit.cxx26
-rw-r--r--vcl/source/control/field.cxx16
-rw-r--r--vcl/source/control/field2.cxx16
-rw-r--r--vcl/source/control/fixed.cxx40
-rw-r--r--vcl/source/control/fixedhyper.cxx2
-rw-r--r--vcl/source/control/group.cxx6
-rw-r--r--vcl/source/control/ilstbox.cxx32
-rw-r--r--vcl/source/control/imgctrl.cxx4
-rw-r--r--vcl/source/control/longcurr.cxx4
-rw-r--r--vcl/source/control/lstbox.cxx18
-rw-r--r--vcl/source/control/menubtn.cxx4
-rw-r--r--vcl/source/control/morebtn.cxx8
-rw-r--r--vcl/source/control/prgsbar.cxx4
-rw-r--r--vcl/source/control/scrbar.cxx12
-rw-r--r--vcl/source/control/slider.cxx6
-rw-r--r--vcl/source/control/spinbtn.cxx4
-rw-r--r--vcl/source/control/spinfld.cxx22
-rw-r--r--vcl/source/control/tabctrl.cxx10
-rw-r--r--vcl/source/control/throbber.cxx2
-rw-r--r--vcl/source/edit/texteng.cxx2
-rw-r--r--vcl/source/edit/textview.cxx6
-rw-r--r--vcl/source/edit/vclmedit.cxx14
-rw-r--r--vcl/source/edit/xtextedt.cxx2
-rw-r--r--vcl/source/gdi/gdimtf.cxx4
-rw-r--r--vcl/source/gdi/impanmvw.cxx6
-rw-r--r--vcl/source/gdi/print.cxx4
-rw-r--r--vcl/source/gdi/print3.cxx2
-rw-r--r--vcl/source/helper/lazydelete.cxx4
-rw-r--r--vcl/source/opengl/OpenGLContext.cxx10
-rw-r--r--vcl/source/outdev/font.cxx10
-rw-r--r--vcl/source/outdev/map.cxx15
-rw-r--r--vcl/source/outdev/nativecontrols.cxx2
-rw-r--r--vcl/source/outdev/outdev.cxx2
-rw-r--r--vcl/source/uipreviewer/previewer.cxx2
-rw-r--r--vcl/source/window/accessibility.cxx56
-rw-r--r--vcl/source/window/brdwin.cxx38
-rw-r--r--vcl/source/window/btndlg.cxx2
-rw-r--r--vcl/source/window/builder.cxx100
-rw-r--r--vcl/source/window/clipping.cxx55
-rw-r--r--vcl/source/window/cursor.cxx10
-rw-r--r--vcl/source/window/debug.cxx4
-rw-r--r--vcl/source/window/debugevent.cxx14
-rw-r--r--vcl/source/window/decoview.cxx4
-rw-r--r--vcl/source/window/dialog.cxx76
-rw-r--r--vcl/source/window/dlgctrl.cxx152
-rw-r--r--vcl/source/window/dlgctrl.hxx6
-rw-r--r--vcl/source/window/dndevdis.cxx28
-rw-r--r--vcl/source/window/dockingarea.cxx10
-rw-r--r--vcl/source/window/dockmgr.cxx62
-rw-r--r--vcl/source/window/dockwin.cxx18
-rw-r--r--vcl/source/window/event.cxx35
-rw-r--r--vcl/source/window/floatwin.cxx24
-rw-r--r--vcl/source/window/globalization.cxx4
-rw-r--r--vcl/source/window/keycod.cxx2
-rw-r--r--vcl/source/window/layout.cxx168
-rw-r--r--vcl/source/window/legacyaccessibility.cxx10
-rw-r--r--vcl/source/window/menu.cxx38
-rw-r--r--vcl/source/window/menubarwindow.cxx12
-rw-r--r--vcl/source/window/menubarwindow.hxx6
-rw-r--r--vcl/source/window/menufloatingwindow.cxx4
-rw-r--r--vcl/source/window/menufloatingwindow.hxx2
-rw-r--r--vcl/source/window/menuitemlist.cxx4
-rw-r--r--vcl/source/window/menuwindow.cxx6
-rw-r--r--vcl/source/window/menuwindow.hxx6
-rw-r--r--vcl/source/window/mouse.cxx26
-rw-r--r--vcl/source/window/msgbox.cxx12
-rw-r--r--vcl/source/window/openglwin.cxx6
-rw-r--r--vcl/source/window/paint.cxx54
-rw-r--r--vcl/source/window/popupmenuwindow.cxx4
-rw-r--r--vcl/source/window/printdlg.cxx44
-rw-r--r--vcl/source/window/resource.cxx3
-rw-r--r--vcl/source/window/scrwnd.cxx4
-rw-r--r--vcl/source/window/scrwnd.hxx2
-rw-r--r--vcl/source/window/seleng.cxx4
-rw-r--r--vcl/source/window/settings.cxx8
-rw-r--r--vcl/source/window/split.cxx10
-rw-r--r--vcl/source/window/splitwin.cxx18
-rw-r--r--vcl/source/window/stacking.cxx122
-rw-r--r--vcl/source/window/status.cxx8
-rw-r--r--vcl/source/window/syschild.cxx8
-rw-r--r--vcl/source/window/syswin.cxx36
-rw-r--r--vcl/source/window/tabdlg.cxx10
-rw-r--r--vcl/source/window/tabpage.cxx8
-rw-r--r--vcl/source/window/taskpanelist.cxx44
-rw-r--r--vcl/source/window/toolbox.cxx42
-rw-r--r--vcl/source/window/toolbox2.cxx8
-rw-r--r--vcl/source/window/window.cxx183
-rw-r--r--vcl/source/window/window2.cxx43
-rw-r--r--vcl/source/window/window3.cxx7
-rw-r--r--vcl/source/window/winproc.cxx162
-rw-r--r--vcl/source/window/wrkwin.cxx10
-rw-r--r--vcl/unx/generic/app/i18n_ic.cxx10
-rw-r--r--vcl/unx/generic/app/i18n_im.cxx2
-rw-r--r--vcl/unx/generic/app/i18n_status.cxx12
-rw-r--r--vcl/unx/generic/app/randrwrapper.cxx18
-rw-r--r--vcl/unx/generic/app/saldisp.cxx6
-rw-r--r--vcl/unx/generic/app/sm.cxx2
-rw-r--r--vcl/unx/generic/app/wmadaptor.cxx32
-rw-r--r--vcl/unx/generic/desktopdetect/desktopdetector.cxx2
-rw-r--r--vcl/unx/generic/dtrans/X11_dndcontext.cxx6
-rw-r--r--vcl/unx/generic/dtrans/X11_dndcontext.hxx12
-rw-r--r--vcl/unx/generic/dtrans/X11_selection.cxx80
-rw-r--r--vcl/unx/generic/dtrans/X11_selection.hxx50
-rw-r--r--vcl/unx/generic/dtrans/bmp.cxx2
-rw-r--r--vcl/unx/generic/gdi/salgdi2.cxx2
-rw-r--r--vcl/unx/generic/gdi/salvd.cxx2
-rw-r--r--vcl/unx/generic/printer/cupsmgr.cxx4
-rw-r--r--vcl/unx/generic/window/FWS.cxx2
-rw-r--r--vcl/unx/generic/window/salframe.cxx50
-rw-r--r--vcl/unx/generic/window/salobj.cxx8
-rw-r--r--vcl/unx/gtk/a11y/atkfactory.cxx4
-rw-r--r--vcl/unx/gtk/a11y/atkutil.cxx12
-rw-r--r--vcl/unx/gtk/a11y/atkwindow.cxx12
-rw-r--r--vcl/unx/gtk/fpicker/SalGtkPicker.cxx2
-rw-r--r--vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx2
-rw-r--r--vcl/unx/gtk/gdi/salprn-gtk.cxx2
-rw-r--r--vcl/unx/gtk/window/gtksalframe.cxx24
-rw-r--r--vcl/unx/kde/UnxFilePicker.cxx2
-rw-r--r--vcl/unx/kde/salnativewidgets-kde.cxx6
-rw-r--r--vcl/unx/kde4/KDE4FilePicker.cxx2
-rw-r--r--vcl/win/source/window/salframe.cxx14
-rw-r--r--vcl/workben/outdevgrind.cxx2
-rw-r--r--vcl/workben/svdem.cxx4
-rw-r--r--vcl/workben/svpclient.cxx4
-rw-r--r--vcl/workben/svptest.cxx4
-rw-r--r--vcl/workben/vcldemo.cxx4
-rw-r--r--winaccessibility/source/service/AccFrameEventListener.cxx2
-rw-r--r--winaccessibility/source/service/AccTopWindowListener.cxx2
-rw-r--r--winaccessibility/source/service/msaaservice_impl.cxx6
-rw-r--r--xmlsecurity/inc/xmlsecurity/certificatechooser.hxx2
-rw-r--r--xmlsecurity/inc/xmlsecurity/certificateviewer.hxx10
-rw-r--r--xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx2
-rw-r--r--xmlsecurity/inc/xmlsecurity/macrosecurity.hxx8
-rw-r--r--xmlsecurity/source/dialogs/certificatechooser.cxx6
-rw-r--r--xmlsecurity/source/dialogs/certificateviewer.cxx10
-rw-r--r--xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx2
-rw-r--r--xmlsecurity/source/dialogs/macrosecurity.cxx8
-rw-r--r--xmlsecurity/workben/signaturetest.cxx4
2857 files changed, 10040 insertions, 9938 deletions
diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx
index 7fad609d60b3..a10356fe276f 100644
--- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx
@@ -47,7 +47,7 @@
-class Window;
+namespace vcl { class Window; }
namespace utl {
class AccessibleStateSetHelper;
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx
index 904ddec28d43..93b4da974f31 100644
--- a/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx
@@ -43,7 +43,7 @@
-class Window;
+namespace vcl { class Window; }
namespace utl {
class AccessibleStateSetHelper;
diff --git a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
index 2655b8950e76..bd0dbd1324a0 100644
--- a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
+++ b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
@@ -92,14 +92,14 @@ public:
inline ~WindowListenerGuard() { endListening(); }
// Not thread safe:
- void startListening(::Window & rNotifier);
+ void startListening(vcl::Window & rNotifier);
// Not thread safe:
void endListening();
private:
::Link m_aListener;
- ::Window * m_pNotifier;
+ vcl::Window * m_pNotifier;
};
class ParagraphInfo
diff --git a/accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx b/accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx
index dc3c93e54d24..c218d0e59ee2 100644
--- a/accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx
+++ b/accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx
@@ -30,7 +30,7 @@ namespace com { namespace sun { namespace star { namespace datatransfer { namesp
class Point;
class Rectangle;
-class Window;
+namespace vcl { class Window; }
namespace accessibility
{
class IComboListBoxHelper
@@ -41,7 +41,7 @@ namespace accessibility
virtual OUString GetEntry( sal_Int32 nPos ) const = 0;
virtual Rectangle GetDropDownPosSizePixel( ) const = 0;
virtual Rectangle GetBoundingRectangle( sal_uInt16 nItem ) const = 0;
- virtual Rectangle GetWindowExtentsRelative( Window* pRelativeWindow ) = 0;
+ virtual Rectangle GetWindowExtentsRelative( vcl::Window* pRelativeWindow ) = 0;
virtual bool IsActive() const = 0;
virtual bool IsEnabled() const = 0;
virtual bool IsEntryVisible( sal_Int32 nPos ) const = 0;
diff --git a/accessibility/inc/accessibility/helper/listboxhelper.hxx b/accessibility/inc/accessibility/helper/listboxhelper.hxx
index 96a45909e7e4..98ee64ddcfde 100644
--- a/accessibility/inc/accessibility/helper/listboxhelper.hxx
+++ b/accessibility/inc/accessibility/helper/listboxhelper.hxx
@@ -76,7 +76,7 @@ public:
return aRect;
}
- virtual Rectangle GetWindowExtentsRelative( Window* pRelativeWindow ) SAL_OVERRIDE
+ virtual Rectangle GetWindowExtentsRelative( vcl::Window* pRelativeWindow ) SAL_OVERRIDE
{
return m_aComboListBox.GetWindowExtentsRelative( pRelativeWindow );
}
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblemenubar.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblemenubar.hxx
index 7861dc397e0c..a792d51cccad 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessiblemenubar.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblemenubar.hxx
@@ -24,7 +24,7 @@
class VclSimpleEvent;
class VclWindowEvent;
-class Window;
+namespace vcl { class Window; }
@@ -34,7 +34,7 @@ class Window;
class VCLXAccessibleMenuBar : public OAccessibleMenuComponent
{
protected:
- Window* m_pWindow;
+ vcl::Window* m_pWindow;
virtual bool IsFocused() SAL_OVERRIDE;
diff --git a/accessibility/inc/accessibility/standard/vclxaccessibletoolbox.hxx b/accessibility/inc/accessibility/standard/vclxaccessibletoolbox.hxx
index 2a4defcbfad2..213a570b853c 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessibletoolbox.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessibletoolbox.hxx
@@ -49,7 +49,7 @@ private:
void UpdateAllItems_Impl();
void UpdateItemName_Impl( sal_Int32 _nPos );
void UpdateItemEnabled_Impl( sal_Int32 _nPos );
- void UpdateCustomPopupItemp_Impl( Window* pWindow, bool bOpen );
+ void UpdateCustomPopupItemp_Impl( vcl::Window* pWindow, bool bOpen );
void HandleSubToolBarEvent( const VclWindowEvent& rVclWindowEvent, bool _bShow );
void ReleaseSubToolBox( ToolBox* _pSubToolBox );
diff --git a/accessibility/source/extended/AccessibleBrowseBox.cxx b/accessibility/source/extended/AccessibleBrowseBox.cxx
index 91af550b5d23..1215c78867a5 100644
--- a/accessibility/source/extended/AccessibleBrowseBox.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBox.cxx
@@ -208,7 +208,7 @@ OUString SAL_CALL AccessibleBrowseBox::getImplementationName()
Rectangle AccessibleBrowseBox::implGetBoundingBox()
{
- Window* pParent = mpBrowseBox->GetAccessibleParentWindow();
+ vcl::Window* pParent = mpBrowseBox->GetAccessibleParentWindow();
OSL_ENSURE( pParent, "implGetBoundingBox - missing parent window" );
return mpBrowseBox->GetWindowExtentsRelative( pParent );
}
diff --git a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
index bc0ad897f1a1..7427feac6b9a 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
@@ -502,7 +502,7 @@ sal_Int32 SAL_CALL AccessibleBrowseBoxBase::getForeground( ) throw (::com::sun:
ensureIsAlive();
sal_Int32 nColor = 0;
- Window* pInst = mpBrowseBox->GetWindowInstance();
+ vcl::Window* pInst = mpBrowseBox->GetWindowInstance();
if ( pInst )
{
if ( pInst->IsControlForeground() )
@@ -527,7 +527,7 @@ sal_Int32 SAL_CALL AccessibleBrowseBoxBase::getBackground( ) throw (::com::sun:
::osl::MutexGuard aGuard( getOslMutex() );
ensureIsAlive();
sal_Int32 nColor = 0;
- Window* pInst = mpBrowseBox->GetWindowInstance();
+ vcl::Window* pInst = mpBrowseBox->GetWindowInstance();
if ( pInst )
{
if ( pInst->IsControlBackground() )
diff --git a/accessibility/source/extended/AccessibleGridControl.cxx b/accessibility/source/extended/AccessibleGridControl.cxx
index 109b6cd0845d..23f2f9c70b0a 100644
--- a/accessibility/source/extended/AccessibleGridControl.cxx
+++ b/accessibility/source/extended/AccessibleGridControl.cxx
@@ -236,7 +236,7 @@ OUString SAL_CALL AccessibleGridControl::getImplementationName()
Rectangle AccessibleGridControl::implGetBoundingBox()
{
- Window* pParent = m_aTable.GetAccessibleParentWindow();
+ vcl::Window* pParent = m_aTable.GetAccessibleParentWindow();
OSL_ENSURE( pParent, "implGetBoundingBox - missing parent window" );
return m_aTable.GetWindowExtentsRelative( pParent );
}
diff --git a/accessibility/source/extended/AccessibleGridControlBase.cxx b/accessibility/source/extended/AccessibleGridControlBase.cxx
index cb9a6bf3b7a8..e523ec1c9eed 100644
--- a/accessibility/source/extended/AccessibleGridControlBase.cxx
+++ b/accessibility/source/extended/AccessibleGridControlBase.cxx
@@ -419,7 +419,7 @@ sal_Int32 SAL_CALL AccessibleGridControlBase::getForeground( ) throw (::com::su
ensureIsAlive();
sal_Int32 nColor = 0;
- Window* pInst = m_aTable.GetWindowInstance();
+ vcl::Window* pInst = m_aTable.GetWindowInstance();
if ( pInst )
{
if ( pInst->IsControlForeground() )
@@ -443,7 +443,7 @@ sal_Int32 SAL_CALL AccessibleGridControlBase::getBackground( ) throw (::com::su
ensureIsAlive();
sal_Int32 nColor = 0;
- Window* pInst = m_aTable.GetWindowInstance();
+ vcl::Window* pInst = m_aTable.GetWindowInstance();
if ( pInst )
{
if ( pInst->IsControlBackground() )
diff --git a/accessibility/source/extended/AccessibleGridControlHeader.cxx b/accessibility/source/extended/AccessibleGridControlHeader.cxx
index 7fbf33684f03..f114bb53c1f4 100644
--- a/accessibility/source/extended/AccessibleGridControlHeader.cxx
+++ b/accessibility/source/extended/AccessibleGridControlHeader.cxx
@@ -217,7 +217,7 @@ Sequence< sal_Int8 > SAL_CALL AccessibleGridControlHeader::getImplementationId()
Rectangle AccessibleGridControlHeader::implGetBoundingBox()
{
- Window* pParent = m_aTable.GetAccessibleParentWindow();
+ vcl::Window* pParent = m_aTable.GetAccessibleParentWindow();
Rectangle aGridRect( m_aTable.GetWindowExtentsRelative( pParent ) );
Rectangle aHeaderRect (m_aTable.calcHeaderRect(isColumnBar()));
if(isColumnBar())
diff --git a/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx b/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx
index ced105fc8acc..662328c27910 100644
--- a/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx
+++ b/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx
@@ -134,7 +134,7 @@ OUString SAL_CALL AccessibleGridControlHeaderCell::getImplementationName()
Rectangle AccessibleGridControlHeaderCell::implGetBoundingBox()
{
- Window* pParent = m_aTable.GetAccessibleParentWindow();
+ vcl::Window* pParent = m_aTable.GetAccessibleParentWindow();
Rectangle aGridRect( m_aTable.GetWindowExtentsRelative( pParent ) );
sal_Int32 nIndex = getAccessibleIndexInParent();
Rectangle aCellRect;
diff --git a/accessibility/source/extended/AccessibleGridControlTable.cxx b/accessibility/source/extended/AccessibleGridControlTable.cxx
index 33aac08d4eb8..5392c54af73b 100644
--- a/accessibility/source/extended/AccessibleGridControlTable.cxx
+++ b/accessibility/source/extended/AccessibleGridControlTable.cxx
@@ -344,7 +344,7 @@ OUString SAL_CALL AccessibleGridControlTable::getImplementationName()
Rectangle AccessibleGridControlTable::implGetBoundingBox()
{
- Window* pParent = m_aTable.GetAccessibleParentWindow();
+ vcl::Window* pParent = m_aTable.GetAccessibleParentWindow();
DBG_ASSERT( pParent, "implGetBoundingBox - missing parent window" );
Rectangle aGridRect( m_aTable.GetWindowExtentsRelative( pParent ));
Rectangle aTableRect( m_aTable.calcTableRect() );
diff --git a/accessibility/source/extended/AccessibleGridControlTableCell.cxx b/accessibility/source/extended/AccessibleGridControlTableCell.cxx
index a7b02564d5eb..85f10f7c7e0b 100644
--- a/accessibility/source/extended/AccessibleGridControlTableCell.cxx
+++ b/accessibility/source/extended/AccessibleGridControlTableCell.cxx
@@ -338,7 +338,7 @@ namespace accessibility
Rectangle AccessibleGridControlTableCell::implGetBoundingBox()
{
- Window* pParent = m_aTable.GetAccessibleParentWindow();
+ vcl::Window* pParent = m_aTable.GetAccessibleParentWindow();
DBG_ASSERT( pParent, "implGetBoundingBox - missing parent window" );
Rectangle aGridRect = m_aTable.GetWindowExtentsRelative( pParent );
sal_Int32 nIndex = getAccessibleIndexInParent();
diff --git a/accessibility/source/extended/AccessibleToolPanelDeck.cxx b/accessibility/source/extended/AccessibleToolPanelDeck.cxx
index d1d11ed051fd..78e093d21a88 100644
--- a/accessibility/source/extended/AccessibleToolPanelDeck.cxx
+++ b/accessibility/source/extended/AccessibleToolPanelDeck.cxx
@@ -291,7 +291,7 @@ namespace accessibility
const ::Point aRequestedPoint( VCLUnoHelper::ConvertToVCLPoint( i_rPoint ) );
// check the panel window itself
- const ::Window& rActivePanelAnchor( m_pImpl->m_pPanelDeck->GetPanelWindowAnchor() );
+ const vcl::Window& rActivePanelAnchor( m_pImpl->m_pPanelDeck->GetPanelWindowAnchor() );
const Rectangle aPanelAnchorArea( rActivePanelAnchor.GetPosPixel(), rActivePanelAnchor.GetOutputSizePixel() );
if ( aPanelAnchorArea.IsInside( aRequestedPoint ) )
// note that this assumes that the Window which actually implements the concrete panel covers
diff --git a/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx b/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx
index 3bd67c112b77..658c5e9dc92c 100644
--- a/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx
+++ b/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx
@@ -337,7 +337,7 @@ namespace accessibility
namespace
{
- bool lcl_covers( const ::Window& i_rWindow, const ::Point& i_rPoint )
+ bool lcl_covers( const vcl::Window& i_rWindow, const ::Point& i_rPoint )
{
const Rectangle aWindowBounds( i_rWindow.GetWindowExtentsRelative( i_rWindow.GetParent() ) );
return aWindowBounds.IsInside( i_rPoint );
diff --git a/accessibility/source/extended/accessiblelistbox.cxx b/accessibility/source/extended/accessiblelistbox.cxx
index 177210436e1f..5cf07bc2bf31 100644
--- a/accessibility/source/extended/accessiblelistbox.cxx
+++ b/accessibility/source/extended/accessiblelistbox.cxx
@@ -127,7 +127,7 @@ namespace accessibility
bool bNeedFocus = false;
if (pBox)
{
- Window* pParent = ((Window*)pBox)->GetParent();
+ vcl::Window* pParent = ((vcl::Window*)pBox)->GetParent();
if (pParent && pParent->GetType() == WINDOW_FLOATINGWINDOW)
{
// MT: ImplGetAppSVData shouldn't be exported from VCL.
diff --git a/accessibility/source/extended/accessibletabbar.cxx b/accessibility/source/extended/accessibletabbar.cxx
index 1fc53c747045..5a368d7b4629 100644
--- a/accessibility/source/extended/accessibletabbar.cxx
+++ b/accessibility/source/extended/accessibletabbar.cxx
@@ -253,7 +253,7 @@ namespace accessibility
if ( i < nCount )
{
- Window* pChild = m_pTabBar->GetAccessibleChildWindow( (sal_uInt16)i );
+ vcl::Window* pChild = m_pTabBar->GetAccessibleChildWindow( (sal_uInt16)i );
if ( pChild )
xChild = pChild->GetAccessible();
}
@@ -279,7 +279,7 @@ namespace accessibility
Reference< XAccessible > xParent;
if ( m_pTabBar )
{
- Window* pParent = m_pTabBar->GetAccessibleParentWindow();
+ vcl::Window* pParent = m_pTabBar->GetAccessibleParentWindow();
if ( pParent )
xParent = pParent->GetAccessible();
}
@@ -296,13 +296,13 @@ namespace accessibility
sal_Int32 nIndexInParent = -1;
if ( m_pTabBar )
{
- Window* pParent = m_pTabBar->GetAccessibleParentWindow();
+ vcl::Window* pParent = m_pTabBar->GetAccessibleParentWindow();
if ( pParent )
{
for ( sal_uInt16 i = 0, nCount = pParent->GetAccessibleChildWindowCount(); i < nCount; ++i )
{
- Window* pChild = pParent->GetAccessibleChildWindow( i );
- if ( pChild == static_cast< Window* >( m_pTabBar ) )
+ vcl::Window* pChild = pParent->GetAccessibleChildWindow( i );
+ if ( pChild == static_cast< vcl::Window* >( m_pTabBar ) )
{
nIndexInParent = i;
break;
diff --git a/accessibility/source/extended/accessibletabbarbase.cxx b/accessibility/source/extended/accessibletabbarbase.cxx
index 1de69c655679..01ff84ebdea2 100644
--- a/accessibility/source/extended/accessibletabbarbase.cxx
+++ b/accessibility/source/extended/accessibletabbarbase.cxx
@@ -49,7 +49,7 @@ IMPL_LINK( AccessibleTabBarBase, WindowEventListener, VclSimpleEvent*, pEvent )
OSL_ENSURE( pWinEvent, "AccessibleTabBarBase::WindowEventListener - unknown window event" );
if( pWinEvent )
{
- Window* pEventWindow = pWinEvent->GetWindow();
+ vcl::Window* pEventWindow = pWinEvent->GetWindow();
OSL_ENSURE( pEventWindow, "AccessibleTabBarBase::WindowEventListener: no window!" );
if( ( pWinEvent->GetId() == VCLEVENT_TABBAR_PAGEREMOVED ) &&
diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx
index 24f0be2652e8..9e53b48808b0 100644
--- a/accessibility/source/extended/textwindowaccessibility.cxx
+++ b/accessibility/source/extended/textwindowaccessibility.cxx
@@ -46,7 +46,7 @@ void SfxListenerGuard::endListening()
}
}
-void WindowListenerGuard::startListening(::Window & rNotifier)
+void WindowListenerGuard::startListening(vcl::Window & rNotifier)
{
OSL_ENSURE(m_pNotifier == 0, "called more than once");
m_pNotifier = &rNotifier;
@@ -267,7 +267,7 @@ css::awt::Size SAL_CALL Paragraph::getSize()
void SAL_CALL Paragraph::grabFocus() throw (css::uno::RuntimeException, std::exception)
{
checkDisposed();
- Window* pWindow = m_xDocument->GetWindow();
+ vcl::Window* pWindow = m_xDocument->GetWindow();
if ( pWindow )
{
pWindow->GrabFocus();
diff --git a/accessibility/source/helper/acc_factory.cxx b/accessibility/source/helper/acc_factory.cxx
index 5b9bdca63b95..34e29e5f27a7 100644
--- a/accessibility/source/helper/acc_factory.cxx
+++ b/accessibility/source/helper/acc_factory.cxx
@@ -74,9 +74,9 @@ using namespace ::svt::table;
namespace {
-inline bool hasFloatingChild(Window *pWindow)
+inline bool hasFloatingChild(vcl::Window *pWindow)
{
- Window * pChild = pWindow->GetAccessibleChildWindow(0);
+ vcl::Window * pChild = pWindow->GetAccessibleChildWindow(0);
if( pChild && WINDOW_FLOATINGWINDOW == pChild->GetType() )
return true;
@@ -304,7 +304,7 @@ Reference< XAccessibleContext > AccessibleFactory::createAccessibleContext( VCLX
{
Reference< XAccessibleContext > xContext;
- Window* pWindow = _pXWindow->GetWindow();
+ vcl::Window* pWindow = _pXWindow->GetWindow();
if ( pWindow )
{
WindowType nType = pWindow->GetType();
@@ -348,7 +348,7 @@ Reference< XAccessibleContext > AccessibleFactory::createAccessibleContext( VCLX
// The logic here has to match that of Window::GetAccessibleParentWindow in
// vcl/source/window/window.cxx to avoid PopupMenuFloatingWindow
// becoming a11y parents of themselves
- Window* pChild = pWindow->GetAccessibleChildWindow(0);
+ vcl::Window* pChild = pWindow->GetAccessibleChildWindow(0);
if (PopupMenuFloatingWindow::isPopupMenu(pChild))
{
// Get the accessible context from the child window.
diff --git a/accessibility/source/standard/accessiblemenucomponent.cxx b/accessibility/source/standard/accessiblemenucomponent.cxx
index 0824882917ec..1590d99510e8 100644
--- a/accessibility/source/standard/accessiblemenucomponent.cxx
+++ b/accessibility/source/standard/accessiblemenucomponent.cxx
@@ -111,7 +111,7 @@ awt::Rectangle OAccessibleMenuComponent::implGetBounds() throw (RuntimeException
if ( m_pMenu )
{
- Window* pWindow = m_pMenu->GetWindow();
+ vcl::Window* pWindow = m_pMenu->GetWindow();
if ( pWindow )
{
// get bounding rectangle of the window in screen coordinates
@@ -183,10 +183,10 @@ Reference< XAccessible > OAccessibleMenuComponent::getAccessibleParent( ) throw
if ( m_pMenu )
{
- Window* pWindow = m_pMenu->GetWindow();
+ vcl::Window* pWindow = m_pMenu->GetWindow();
if ( pWindow )
{
- Window* pParent = pWindow->GetAccessibleParentWindow();
+ vcl::Window* pParent = pWindow->GetAccessibleParentWindow();
if ( pParent )
xParent = pParent->GetAccessible();
}
@@ -213,7 +213,7 @@ OUString OAccessibleMenuComponent::getAccessibleDescription( ) throw (RuntimeExc
OUString sDescription;
if ( m_pMenu )
{
- Window* pWindow = m_pMenu->GetWindow();
+ vcl::Window* pWindow = m_pMenu->GetWindow();
if ( pWindow )
sDescription = pWindow->GetAccessibleDescription();
}
@@ -271,7 +271,7 @@ awt::Point OAccessibleMenuComponent::getLocationOnScreen( ) throw (RuntimeExcep
if ( m_pMenu )
{
- Window* pWindow = m_pMenu->GetWindow();
+ vcl::Window* pWindow = m_pMenu->GetWindow();
if ( pWindow )
{
Rectangle aRect = pWindow->GetWindowExtentsRelative( NULL );
@@ -290,7 +290,7 @@ void OAccessibleMenuComponent::grabFocus( ) throw (RuntimeException, std::excep
if ( m_pMenu )
{
- Window* pWindow = m_pMenu->GetWindow();
+ vcl::Window* pWindow = m_pMenu->GetWindow();
if ( pWindow )
pWindow->GrabFocus();
}
@@ -329,7 +329,7 @@ Reference< awt::XFont > OAccessibleMenuComponent::getFont( ) throw (RuntimeExce
if ( m_pMenu )
{
- Window* pWindow = m_pMenu->GetWindow();
+ vcl::Window* pWindow = m_pMenu->GetWindow();
if ( pWindow )
{
Reference< awt::XDevice > xDev( pWindow->GetComponentInterface(), UNO_QUERY );
diff --git a/accessibility/source/standard/accessiblemenuitemcomponent.cxx b/accessibility/source/standard/accessiblemenuitemcomponent.cxx
index 79fbcbc43aba..60c7b6b77e96 100644
--- a/accessibility/source/standard/accessiblemenuitemcomponent.cxx
+++ b/accessibility/source/standard/accessiblemenuitemcomponent.cxx
@@ -137,7 +137,7 @@ void OAccessibleMenuItemComponent::Click()
// click the menu item
if ( m_pParent )
{
- Window* pWindow = m_pParent->GetWindow();
+ vcl::Window* pWindow = m_pParent->GetWindow();
if ( pWindow )
{
// #102438# Menu items are not selectable
@@ -264,7 +264,7 @@ awt::Rectangle OAccessibleMenuItemComponent::implGetBounds() throw (RuntimeExcep
aBounds = AWTRectangle( m_pParent->GetBoundingRectangle( m_nItemPos ) );
// get position of containing window in screen coordinates
- Window* pWindow = m_pParent->GetWindow();
+ vcl::Window* pWindow = m_pParent->GetWindow();
if ( pWindow )
{
Rectangle aRect = pWindow->GetWindowExtentsRelative( NULL );
diff --git a/accessibility/source/standard/floatingwindowaccessible.cxx b/accessibility/source/standard/floatingwindowaccessible.cxx
index f75e7ce5b15a..a6238c0dc977 100644
--- a/accessibility/source/standard/floatingwindowaccessible.cxx
+++ b/accessibility/source/standard/floatingwindowaccessible.cxx
@@ -37,10 +37,10 @@ FloatingWindowAccessible::~FloatingWindowAccessible()
void FloatingWindowAccessible::FillAccessibleRelationSet(utl::AccessibleRelationSetHelper& rRelationSet)
{
- Window* pWindow = GetWindow();
+ vcl::Window* pWindow = GetWindow();
if ( pWindow )
{
- Window* pParentWindow = pWindow->GetParent();
+ vcl::Window* pParentWindow = pWindow->GetParent();
if( pParentWindow )
{
uno::Sequence< uno::Reference< uno::XInterface > > aSequence(1);
diff --git a/accessibility/source/standard/vclxaccessiblebox.cxx b/accessibility/source/standard/vclxaccessiblebox.cxx
index fdf2e58c0457..295bbe41153d 100644
--- a/accessibility/source/standard/vclxaccessiblebox.cxx
+++ b/accessibility/source/standard/vclxaccessiblebox.cxx
@@ -69,7 +69,7 @@ void VCLXAccessibleBox::ProcessWindowChildEvent( const VclWindowEvent& rVclWindo
case VCLEVENT_WINDOW_SHOW:
case VCLEVENT_WINDOW_HIDE:
{
- Window* pChildWindow = (Window *) rVclWindowEvent.GetData();
+ vcl::Window* pChildWindow = (vcl::Window *) rVclWindowEvent.GetData();
// Just compare to the combo box text field. All other children
// are identical to this object in which case this object will
// be removed in a short time.
@@ -164,7 +164,7 @@ void VCLXAccessibleBox::ProcessWindowEvent (const VclWindowEvent& rVclWindowEven
{
pList->ProcessWindowEvent (rVclWindowEvent);
}
- Window* pWindow = GetWindow();
+ vcl::Window* pWindow = GetWindow();
if( pWindow && (pWindow->HasFocus() || pWindow->HasChildPathFocus()) )
{
Any aOldValue, aNewValue;
diff --git a/accessibility/source/standard/vclxaccessiblebutton.cxx b/accessibility/source/standard/vclxaccessiblebutton.cxx
index 078d4100340a..4e9c9f20a910 100644
--- a/accessibility/source/standard/vclxaccessiblebutton.cxx
+++ b/accessibility/source/standard/vclxaccessiblebutton.cxx
@@ -227,7 +227,7 @@ Reference< XAccessibleKeyBinding > VCLXAccessibleButton::getAccessibleActionKeyB
OAccessibleKeyBindingHelper* pKeyBindingHelper = new OAccessibleKeyBindingHelper();
Reference< XAccessibleKeyBinding > xKeyBinding = pKeyBindingHelper;
- Window* pWindow = GetWindow();
+ vcl::Window* pWindow = GetWindow();
if ( pWindow )
{
KeyEvent aKeyEvent = pWindow->GetActivationKey();
diff --git a/accessibility/source/standard/vclxaccessiblecheckbox.cxx b/accessibility/source/standard/vclxaccessiblecheckbox.cxx
index a9cc86c9bc2f..bdaf8593d5b7 100644
--- a/accessibility/source/standard/vclxaccessiblecheckbox.cxx
+++ b/accessibility/source/standard/vclxaccessiblecheckbox.cxx
@@ -248,7 +248,7 @@ Reference< XAccessibleKeyBinding > VCLXAccessibleCheckBox::getAccessibleActionKe
OAccessibleKeyBindingHelper* pKeyBindingHelper = new OAccessibleKeyBindingHelper();
Reference< XAccessibleKeyBinding > xKeyBinding = pKeyBindingHelper;
- Window* pWindow = GetWindow();
+ vcl::Window* pWindow = GetWindow();
if ( pWindow )
{
KeyEvent aKeyEvent = pWindow->GetActivationKey();
diff --git a/accessibility/source/standard/vclxaccessibleedit.cxx b/accessibility/source/standard/vclxaccessibleedit.cxx
index ef800f2a754c..8a1fd5c9fdbe 100644
--- a/accessibility/source/standard/vclxaccessibleedit.cxx
+++ b/accessibility/source/standard/vclxaccessibleedit.cxx
@@ -82,7 +82,7 @@ void VCLXAccessibleEdit::ProcessWindowEvent( const VclWindowEvent& rVclWindowEve
sal_Int32 nOldCaretPosition = m_nCaretPosition;
m_nCaretPosition = getCaretPosition();
- Window* pWindow = GetWindow();
+ vcl::Window* pWindow = GetWindow();
if (pWindow && pWindow->HasChildPathFocus())
{
if (m_nCaretPosition != nOldCaretPosition)
@@ -97,7 +97,7 @@ void VCLXAccessibleEdit::ProcessWindowEvent( const VclWindowEvent& rVclWindowEve
break;
case VCLEVENT_EDIT_SELECTIONCHANGED:
{
- Window* pWindow = GetWindow();
+ vcl::Window* pWindow = GetWindow();
if (pWindow && pWindow->HasChildPathFocus())
{
NotifyAccessibleEvent( AccessibleEventId::TEXT_SELECTION_CHANGED, Any(), Any() );
@@ -256,7 +256,7 @@ sal_Bool VCLXAccessibleEdit::doAccessibleAction ( sal_Int32 nIndex ) throw (Inde
throw IndexOutOfBoundsException();
bool bDoAction = false;
- Window* pWindow = GetWindow();
+ vcl::Window* pWindow = GetWindow();
if ( pWindow )
{
pWindow->GrabFocus();
diff --git a/accessibility/source/standard/vclxaccessiblelist.cxx b/accessibility/source/standard/vclxaccessiblelist.cxx
index 77c597037642..f5b103433db9 100644
--- a/accessibility/source/standard/vclxaccessiblelist.cxx
+++ b/accessibility/source/standard/vclxaccessiblelist.cxx
@@ -660,7 +660,7 @@ bool SAL_CALL VCLXAccessibleList::contains( const awt::Point& rPoint ) throw (Ru
bool bInside = false;
- Window* pListBox = GetWindow();
+ vcl::Window* pListBox = GetWindow();
if ( pListBox )
{
Rectangle aRect( Point(0,0), pListBox->GetSizePixel() );
diff --git a/accessibility/source/standard/vclxaccessiblemenubar.cxx b/accessibility/source/standard/vclxaccessiblemenubar.cxx
index 2cb4cc4c353d..fc541ab388d1 100644
--- a/accessibility/source/standard/vclxaccessiblemenubar.cxx
+++ b/accessibility/source/standard/vclxaccessiblemenubar.cxx
@@ -160,15 +160,15 @@ sal_Int32 VCLXAccessibleMenuBar::getAccessibleIndexInParent( ) throw (RuntimeEx
if ( m_pMenu )
{
- Window* pWindow = m_pMenu->GetWindow();
+ vcl::Window* pWindow = m_pMenu->GetWindow();
if ( pWindow )
{
- Window* pParent = pWindow->GetAccessibleParentWindow();
+ vcl::Window* pParent = pWindow->GetAccessibleParentWindow();
if ( pParent )
{
for ( sal_uInt16 n = pParent->GetAccessibleChildWindowCount(); n; )
{
- Window* pChild = pParent->GetAccessibleChildWindow( --n );
+ vcl::Window* pChild = pParent->GetAccessibleChildWindow( --n );
if ( pChild == pWindow )
{
nIndexInParent = n;
diff --git a/accessibility/source/standard/vclxaccessiblemenuitem.cxx b/accessibility/source/standard/vclxaccessiblemenuitem.cxx
index 971f3194bbf8..95c59ebe4b4d 100644
--- a/accessibility/source/standard/vclxaccessiblemenuitem.cxx
+++ b/accessibility/source/standard/vclxaccessiblemenuitem.cxx
@@ -395,7 +395,7 @@ sal_Bool VCLXAccessibleMenuItem::copyText( sal_Int32 nStartIndex, sal_Int32 nEnd
if ( m_pParent )
{
- Window* pWindow = m_pParent->GetWindow();
+ vcl::Window* pWindow = m_pParent->GetWindow();
if ( pWindow )
{
Reference< datatransfer::clipboard::XClipboard > xClipboard = pWindow->GetClipboard();
diff --git a/accessibility/source/standard/vclxaccessibleradiobutton.cxx b/accessibility/source/standard/vclxaccessibleradiobutton.cxx
index a2e07ee050d8..baabdd5555f1 100644
--- a/accessibility/source/standard/vclxaccessibleradiobutton.cxx
+++ b/accessibility/source/standard/vclxaccessibleradiobutton.cxx
@@ -204,7 +204,7 @@ Reference< XAccessibleKeyBinding > VCLXAccessibleRadioButton::getAccessibleActio
OAccessibleKeyBindingHelper* pKeyBindingHelper = new OAccessibleKeyBindingHelper();
Reference< XAccessibleKeyBinding > xKeyBinding = pKeyBindingHelper;
- Window* pWindow = GetWindow();
+ vcl::Window* pWindow = GetWindow();
if ( pWindow )
{
KeyEvent aKeyEvent = pWindow->GetActivationKey();
diff --git a/accessibility/source/standard/vclxaccessibletabcontrol.cxx b/accessibility/source/standard/vclxaccessibletabcontrol.cxx
index f71f561700f9..3a40f68778d1 100644
--- a/accessibility/source/standard/vclxaccessibletabcontrol.cxx
+++ b/accessibility/source/standard/vclxaccessibletabcontrol.cxx
@@ -271,7 +271,7 @@ void VCLXAccessibleTabControl::ProcessWindowChildEvent( const VclWindowEvent& rV
{
if ( m_pTabControl )
{
- Window* pChild = static_cast< Window* >( rVclWindowEvent.GetData() );
+ vcl::Window* pChild = static_cast< vcl::Window* >( rVclWindowEvent.GetData() );
if ( pChild && pChild->GetType() == WINDOW_TABPAGE )
{
for ( sal_Int32 i = 0, nCount = m_pTabControl->GetPageCount(); i < nCount; ++i )
diff --git a/accessibility/source/standard/vclxaccessibletabpagewindow.cxx b/accessibility/source/standard/vclxaccessibletabpagewindow.cxx
index 33e929e59832..6b43aa3d4b2c 100644
--- a/accessibility/source/standard/vclxaccessibletabpagewindow.cxx
+++ b/accessibility/source/standard/vclxaccessibletabpagewindow.cxx
@@ -41,7 +41,7 @@ VCLXAccessibleTabPageWindow::VCLXAccessibleTabPageWindow( VCLXWindow* pVCLXWindo
m_nPageId = 0;
if ( m_pTabPage )
{
- Window* pParent = m_pTabPage->GetAccessibleParentWindow();
+ vcl::Window* pParent = m_pTabPage->GetAccessibleParentWindow();
if ( pParent && pParent->GetType() == WINDOW_TABCONTROL )
{
m_pTabControl = static_cast< TabControl* >( pParent );
diff --git a/accessibility/source/standard/vclxaccessibletoolbox.cxx b/accessibility/source/standard/vclxaccessibletoolbox.cxx
index 00267fca7947..003eaa517211 100644
--- a/accessibility/source/standard/vclxaccessibletoolbox.cxx
+++ b/accessibility/source/standard/vclxaccessibletoolbox.cxx
@@ -425,7 +425,7 @@ void VCLXAccessibleToolBox::UpdateAllItems_Impl()
}
}
-void VCLXAccessibleToolBox::UpdateCustomPopupItemp_Impl( Window* pWindow, bool bOpen )
+void VCLXAccessibleToolBox::UpdateCustomPopupItemp_Impl( vcl::Window* pWindow, bool bOpen )
{
ToolBox* pToolBox = static_cast< ToolBox* >( GetWindow() );
if( pWindow && pToolBox )
@@ -458,7 +458,7 @@ void VCLXAccessibleToolBox::UpdateItemEnabled_Impl( sal_Int32 _nPos )
void VCLXAccessibleToolBox::HandleSubToolBarEvent( const VclWindowEvent& rVclWindowEvent, bool _bShow )
{
- Window* pChildWindow = (Window *) rVclWindowEvent.GetData();
+ vcl::Window* pChildWindow = (vcl::Window *) rVclWindowEvent.GetData();
ToolBox* pToolBox = static_cast< ToolBox* >( GetWindow() );
if ( pChildWindow
&& pToolBox
@@ -605,7 +605,7 @@ void VCLXAccessibleToolBox::ProcessWindowEvent( const VclWindowEvent& rVclWindow
case VCLEVENT_DROPDOWN_OPEN:
case VCLEVENT_DROPDOWN_CLOSE:
{
- UpdateCustomPopupItemp_Impl( static_cast< Window* >( rVclWindowEvent.GetData() ), rVclWindowEvent.GetId() == VCLEVENT_DROPDOWN_OPEN );
+ UpdateCustomPopupItemp_Impl( static_cast< vcl::Window* >( rVclWindowEvent.GetData() ), rVclWindowEvent.GetId() == VCLEVENT_DROPDOWN_OPEN );
break;
}
@@ -723,7 +723,7 @@ Reference< XAccessible > SAL_CALL VCLXAccessibleToolBox::getAccessibleChild( sal
{
sal_uInt16 nItemId = pToolBox->GetItemId( (sal_uInt16)i );
sal_uInt16 nHighlightItemId = pToolBox->GetHighlightItemId();
- Window* pItemWindow = pToolBox->GetItemWindow( nItemId );
+ vcl::Window* pItemWindow = pToolBox->GetItemWindow( nItemId );
// not found -> create a new child
VCLXAccessibleToolBoxItem* pChild = new VCLXAccessibleToolBoxItem( pToolBox, i );
Reference< XAccessible> xParent = pChild;
@@ -772,7 +772,7 @@ Reference< XAccessible > SAL_CALL VCLXAccessibleToolBox::getAccessibleAtPoint( c
Reference< XAccessible > VCLXAccessibleToolBox::GetItemWindowAccessible( const VclWindowEvent& rVclWindowEvent )
{
Reference< XAccessible > xReturn;
- Window* pChildWindow = (Window *) rVclWindowEvent.GetData();
+ vcl::Window* pChildWindow = (vcl::Window *) rVclWindowEvent.GetData();
ToolBox* pToolBox = static_cast< ToolBox* >( GetWindow() );
if ( pChildWindow && pToolBox )
{
@@ -780,7 +780,7 @@ Reference< XAccessible > VCLXAccessibleToolBox::GetItemWindowAccessible( const V
for (sal_uInt16 i = 0 ; i < nCount && !xReturn.is() ; ++i)
{
sal_uInt16 nItemId = pToolBox->GetItemId( i );
- Window* pItemWindow = pToolBox->GetItemWindow( nItemId );
+ vcl::Window* pItemWindow = pToolBox->GetItemWindow( nItemId );
if ( pItemWindow == pChildWindow )
xReturn = getAccessibleChild(i);
}
diff --git a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
index 7afe893c73ad..3f77107d42fb 100644
--- a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
+++ b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
@@ -133,7 +133,7 @@ OUString VCLXAccessibleToolBoxItem::GetText( bool _bAsName )
sRet = m_pToolBox->GetQuickHelpText( m_nItemId );
if (sRet.isEmpty())
{
- Window* pItemWindow = m_pToolBox->GetItemWindow( m_nItemId );
+ vcl::Window* pItemWindow = m_pToolBox->GetItemWindow( m_nItemId );
if ( m_nRole == AccessibleRole::PANEL && pItemWindow && pItemWindow->GetAccessible().is() &&
pItemWindow->GetAccessible()->getAccessibleContext().is() )
{
diff --git a/avmedia/inc/mediacontrol.hxx b/avmedia/inc/mediacontrol.hxx
index 2e0f20b9b8d6..099a0fc73019 100644
--- a/avmedia/inc/mediacontrol.hxx
+++ b/avmedia/inc/mediacontrol.hxx
@@ -55,7 +55,7 @@ class MediaControl : public Control
{
public:
- MediaControl( Window* pParent, MediaControlStyle eControlStyle );
+ MediaControl( vcl::Window* pParent, MediaControlStyle eControlStyle );
virtual ~MediaControl();
const Size& getMinSizePixel() const;
diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx
index 540613caaa26..2dc79fa716a0 100644
--- a/avmedia/source/framework/mediacontrol.cxx
+++ b/avmedia/source/framework/mediacontrol.cxx
@@ -62,7 +62,7 @@ namespace avmedia
// - MediaControl -
-MediaControl::MediaControl( Window* pParent, MediaControlStyle eControlStyle ) :
+MediaControl::MediaControl( vcl::Window* pParent, MediaControlStyle eControlStyle ) :
Control( pParent ),
maImageList( SvtMiscOptions().AreCurrentSymbolsLarge() ? AVMEDIA_RESID( AVMEDIA_IMGLST_L ) : AVMEDIA_RESID( AVMEDIA_IMGLST ) ),
maItem( 0, AVMEDIA_SETMASK_ALL ),
diff --git a/avmedia/source/framework/mediaplayer.cxx b/avmedia/source/framework/mediaplayer.cxx
index cc592c2caf8d..1883aadbd9cd 100644
--- a/avmedia/source/framework/mediaplayer.cxx
+++ b/avmedia/source/framework/mediaplayer.cxx
@@ -37,7 +37,7 @@ namespace avmedia
// - MediaPlayer -
-MediaPlayer::MediaPlayer( Window* _pParent, sal_uInt16 nId, SfxBindings* _pBindings, SfxChildWinInfo* pInfo ) :
+MediaPlayer::MediaPlayer( vcl::Window* _pParent, sal_uInt16 nId, SfxBindings* _pBindings, SfxChildWinInfo* pInfo ) :
SfxChildWindow( _pParent, nId )
{
pWindow = new MediaFloater( _pBindings, this, _pParent );
@@ -59,7 +59,7 @@ SFX_IMPL_DOCKINGWINDOW_WITHID( MediaPlayer, SID_AVMEDIA_PLAYER )
// - MediaFloater -
-MediaFloater::MediaFloater( SfxBindings* _pBindings, SfxChildWindow* pCW, Window* pParent ) :
+MediaFloater::MediaFloater( SfxBindings* _pBindings, SfxChildWindow* pCW, vcl::Window* pParent ) :
SfxDockingWindow( _pBindings, pCW, pParent, WB_CLOSEABLE | WB_MOVEABLE | WB_SIZEABLE | WB_DOCKABLE ),
mpMediaWindow( new MediaWindow( this, true ) )
{
@@ -106,7 +106,7 @@ void MediaFloater::ToggleFloatingMode()
mpMediaWindow->setPosSize( Rectangle( Point(), GetOutputSizePixel() ) );
mpMediaWindow->executeMediaItem( aRestoreItem );
- Window* pWindow = mpMediaWindow->getWindow();
+ vcl::Window* pWindow = mpMediaWindow->getWindow();
if( pWindow )
pWindow->SetHelpId( HID_AVMEDIA_PLAYERWINDOW );
diff --git a/avmedia/source/framework/mediatoolbox.cxx b/avmedia/source/framework/mediatoolbox.cxx
index ec44381ef29e..22e5a50c0a17 100644
--- a/avmedia/source/framework/mediatoolbox.cxx
+++ b/avmedia/source/framework/mediatoolbox.cxx
@@ -39,7 +39,7 @@ class MediaToolBoxControl_Impl : public MediaControl
{
public:
- MediaToolBoxControl_Impl( Window& rParent, MediaToolBoxControl& rControl );
+ MediaToolBoxControl_Impl( vcl::Window& rParent, MediaToolBoxControl& rControl );
virtual ~MediaToolBoxControl_Impl();
void update() SAL_OVERRIDE;
@@ -52,7 +52,7 @@ private:
-MediaToolBoxControl_Impl::MediaToolBoxControl_Impl( Window& rParent, MediaToolBoxControl& rControl ) :
+MediaToolBoxControl_Impl::MediaToolBoxControl_Impl( vcl::Window& rParent, MediaToolBoxControl& rControl ) :
MediaControl( &rParent, MEDIACONTROLSTYLE_SINGLELINE ),
mpToolBoxControl( &rControl )
{
@@ -129,7 +129,7 @@ void MediaToolBoxControl::StateChanged( sal_uInt16 /* nSID */, SfxItemState eSta
-Window* MediaToolBoxControl::CreateItemWindow( Window *pParent )
+vcl::Window* MediaToolBoxControl::CreateItemWindow( vcl::Window *pParent )
{
return( pParent ? new MediaToolBoxControl_Impl( *pParent, *this ) : NULL );
}
diff --git a/avmedia/source/opengl/oglwindow.cxx b/avmedia/source/opengl/oglwindow.cxx
index 6c1c9f16a2d8..767844ddb5b4 100644
--- a/avmedia/source/opengl/oglwindow.cxx
+++ b/avmedia/source/opengl/oglwindow.cxx
@@ -15,7 +15,7 @@ using namespace libgltf;
namespace avmedia { namespace ogl {
-OGLWindow::OGLWindow( glTFHandle& rHandle, OpenGLContext& rContext, Window& rEventHandlerParent )
+OGLWindow::OGLWindow( glTFHandle& rHandle, OpenGLContext& rContext, vcl::Window& rEventHandlerParent )
: m_rHandle( rHandle )
, m_rContext( rContext )
, m_rEventHandler( rEventHandlerParent )
diff --git a/avmedia/source/opengl/oglwindow.hxx b/avmedia/source/opengl/oglwindow.hxx
index 5078ebedfb0b..5b0e151c9b84 100644
--- a/avmedia/source/opengl/oglwindow.hxx
+++ b/avmedia/source/opengl/oglwindow.hxx
@@ -28,7 +28,7 @@ class OGLWindow : public ::cppu::WeakImplHelper2 < com::sun::star::media::XPlaye
com::sun::star::lang::XServiceInfo >
{
public:
- OGLWindow( libgltf::glTFHandle& rHandle, OpenGLContext& rContext, Window& rEventHandlerParent );
+ OGLWindow( libgltf::glTFHandle& rHandle, OpenGLContext& rContext, vcl::Window& rEventHandlerParent );
virtual ~OGLWindow();
virtual void SAL_CALL update() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
@@ -68,7 +68,7 @@ private:
libgltf::glTFHandle& m_rHandle;
OpenGLContext& m_rContext;
- Window& m_rEventHandler;
+ vcl::Window& m_rEventHandler;
bool m_bVisible;
Point m_aLastMousePos;
diff --git a/avmedia/source/viewer/mediaevent_impl.cxx b/avmedia/source/viewer/mediaevent_impl.cxx
index b994bd3ecdf1..2db883172d5e 100644
--- a/avmedia/source/viewer/mediaevent_impl.cxx
+++ b/avmedia/source/viewer/mediaevent_impl.cxx
@@ -30,7 +30,7 @@ namespace avmedia { namespace priv {
// - MediaEventListenersImpl -
-MediaEventListenersImpl::MediaEventListenersImpl( Window& rEventWindow ) :
+MediaEventListenersImpl::MediaEventListenersImpl( vcl::Window& rEventWindow ) :
mpNotifyWindow( &rEventWindow )
{
}
@@ -45,7 +45,7 @@ MediaEventListenersImpl::~MediaEventListenersImpl()
void MediaEventListenersImpl::cleanUp()
{
- Application::RemoveMouseAndKeyEvents( reinterpret_cast< ::Window* >( mpNotifyWindow ) );
+ Application::RemoveMouseAndKeyEvents( reinterpret_cast< vcl::Window* >( mpNotifyWindow ) );
mpNotifyWindow = NULL;
}
@@ -72,7 +72,7 @@ void SAL_CALL MediaEventListenersImpl::keyPressed( const ::com::sun::star::awt::
( ( e.Modifiers & 4 ) ? KEY_MOD2 : 0 ) );
KeyEvent aVCLKeyEvt( e.KeyChar, aVCLKeyCode );
- Application::PostKeyEvent( VCLEVENT_WINDOW_KEYINPUT, reinterpret_cast< ::Window* >( mpNotifyWindow ), &aVCLKeyEvt );
+ Application::PostKeyEvent( VCLEVENT_WINDOW_KEYINPUT, reinterpret_cast< vcl::Window* >( mpNotifyWindow ), &aVCLKeyEvt );
}
}
@@ -91,7 +91,7 @@ void SAL_CALL MediaEventListenersImpl::keyReleased( const ::com::sun::star::awt:
( ( e.Modifiers & 2 ) ? KEY_MOD1 : 0 ) |
( ( e.Modifiers & 4 ) ? KEY_MOD2 : 0 ) );
KeyEvent aVCLKeyEvt( e.KeyChar, aVCLKeyCode );
- Application::PostKeyEvent( VCLEVENT_WINDOW_KEYUP, reinterpret_cast< ::Window* >( mpNotifyWindow ), &aVCLKeyEvt );
+ Application::PostKeyEvent( VCLEVENT_WINDOW_KEYUP, reinterpret_cast< vcl::Window* >( mpNotifyWindow ), &aVCLKeyEvt );
}
}
@@ -112,7 +112,7 @@ void SAL_CALL MediaEventListenersImpl::mousePressed( const ::com::sun::star::awt
( ( e.Buttons & 2 ) ? MOUSE_RIGHT : 0 ) |
( ( e.Buttons & 4 ) ? MOUSE_MIDDLE : 0 ),
e.Modifiers );
- Application::PostMouseEvent( VCLEVENT_WINDOW_MOUSEBUTTONDOWN, reinterpret_cast< ::Window* >( mpNotifyWindow ), &aVCLMouseEvt );
+ Application::PostMouseEvent( VCLEVENT_WINDOW_MOUSEBUTTONDOWN, reinterpret_cast< vcl::Window* >( mpNotifyWindow ), &aVCLMouseEvt );
}
}
@@ -133,7 +133,7 @@ void SAL_CALL MediaEventListenersImpl::mouseReleased( const ::com::sun::star::aw
( ( e.Buttons & 2 ) ? MOUSE_RIGHT : 0 ) |
( ( e.Buttons & 4 ) ? MOUSE_MIDDLE : 0 ),
e.Modifiers );
- Application::PostMouseEvent( VCLEVENT_WINDOW_MOUSEBUTTONUP, reinterpret_cast< ::Window* >( mpNotifyWindow ), &aVCLMouseEvt );
+ Application::PostMouseEvent( VCLEVENT_WINDOW_MOUSEBUTTONUP, reinterpret_cast< vcl::Window* >( mpNotifyWindow ), &aVCLMouseEvt );
}
}
@@ -174,7 +174,7 @@ void SAL_CALL MediaEventListenersImpl::mouseDragged( const ::com::sun::star::awt
if( mpNotifyWindow )
{
MouseEvent aVCLMouseEvt( Point( e.X, e.Y ), 0, 0, e.Buttons, e.Modifiers );
- Application::PostMouseEvent( VCLEVENT_WINDOW_MOUSEMOVE, reinterpret_cast< ::Window* >( mpNotifyWindow ), &aVCLMouseEvt );
+ Application::PostMouseEvent( VCLEVENT_WINDOW_MOUSEMOVE, reinterpret_cast< vcl::Window* >( mpNotifyWindow ), &aVCLMouseEvt );
}
}
@@ -189,7 +189,7 @@ void SAL_CALL MediaEventListenersImpl::mouseMoved( const ::com::sun::star::awt::
if( mpNotifyWindow )
{
MouseEvent aVCLMouseEvt( Point( e.X, e.Y ), 0, 0, e.Buttons, e.Modifiers );
- Application::PostMouseEvent( VCLEVENT_WINDOW_MOUSEMOVE, reinterpret_cast< ::Window* >( mpNotifyWindow ), &aVCLMouseEvt );
+ Application::PostMouseEvent( VCLEVENT_WINDOW_MOUSEMOVE, reinterpret_cast< vcl::Window* >( mpNotifyWindow ), &aVCLMouseEvt );
}
}
diff --git a/avmedia/source/viewer/mediaevent_impl.hxx b/avmedia/source/viewer/mediaevent_impl.hxx
index 9f551bd2ea51..63e1a0d77ba2 100644
--- a/avmedia/source/viewer/mediaevent_impl.hxx
+++ b/avmedia/source/viewer/mediaevent_impl.hxx
@@ -41,7 +41,7 @@ namespace avmedia
{
public:
- MediaEventListenersImpl( Window& rNotifyWindow );
+ MediaEventListenersImpl( vcl::Window& rNotifyWindow );
virtual ~MediaEventListenersImpl();
void cleanUp();
@@ -69,7 +69,7 @@ namespace avmedia
private:
- Window* mpNotifyWindow;
+ vcl::Window* mpNotifyWindow;
mutable ::osl::Mutex maMutex;
};
}
diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx
index b824c2dd4217..2e5d92fd8c1d 100644
--- a/avmedia/source/viewer/mediawindow.cxx
+++ b/avmedia/source/viewer/mediawindow.cxx
@@ -45,7 +45,7 @@ namespace avmedia {
// - MediaWindow -
-MediaWindow::MediaWindow( Window* parent, bool bInternalMediaControl ) :
+MediaWindow::MediaWindow( vcl::Window* parent, bool bInternalMediaControl ) :
mpImpl( new priv::MediaWindowImpl( parent, this, bInternalMediaControl ) )
{
mpImpl->Show();
@@ -190,7 +190,7 @@ void MediaWindow::hide()
-Window* MediaWindow::getWindow() const
+vcl::Window* MediaWindow::getWindow() const
{
return mpImpl.get();
}
@@ -236,7 +236,7 @@ void MediaWindow::getMediaFilters( FilterNameVector& rFilterNameVector )
-bool MediaWindow::executeMediaURLDialog(Window* /* pParent */,
+bool MediaWindow::executeMediaURLDialog(vcl::Window* /* pParent */,
OUString& rURL, bool *const o_pbLink)
{
::sfx2::FileDialogHelper aDlg( (o_pbLink)
@@ -325,7 +325,7 @@ bool MediaWindow::executeMediaURLDialog(Window* /* pParent */,
-void MediaWindow::executeFormatErrorBox( Window* pParent )
+void MediaWindow::executeFormatErrorBox( vcl::Window* pParent )
{
MessageDialog aErrBox( pParent, AVMEDIA_RESID( AVMEDIA_STR_ERR_URL ) );
diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx
index f4c88561f426..3bd2b46595f5 100644
--- a/avmedia/source/viewer/mediawindow_impl.cxx
+++ b/avmedia/source/viewer/mediawindow_impl.cxx
@@ -49,7 +49,7 @@ namespace avmedia { namespace priv {
// - MediaWindowControl -
-MediaWindowControl::MediaWindowControl( Window* pParent ) :
+MediaWindowControl::MediaWindowControl( vcl::Window* pParent ) :
MediaControl( pParent, MEDIACONTROLSTYLE_MULTILINE )
{
}
@@ -81,13 +81,13 @@ void MediaWindowControl::execute( const MediaItem& rItem )
// - MediaChildWindow -
-MediaChildWindow::MediaChildWindow( Window* pParent ) :
+MediaChildWindow::MediaChildWindow( vcl::Window* pParent ) :
SystemChildWindow( pParent, WB_CLIPCHILDREN )
{
}
#if HAVE_FEATURE_GLTF
-MediaChildWindow::MediaChildWindow( Window* pParent, SystemWindowData* pData ) :
+MediaChildWindow::MediaChildWindow( vcl::Window* pParent, SystemWindowData* pData ) :
SystemChildWindow( pParent, WB_CLIPCHILDREN, pData )
{
}
@@ -161,7 +161,7 @@ void MediaChildWindow::Command( const CommandEvent& rCEvt )
// - MediaWindowImpl -
-MediaWindowImpl::MediaWindowImpl( Window* pParent, MediaWindow* pMediaWindow, bool bInternalMediaControl ) :
+MediaWindowImpl::MediaWindowImpl( vcl::Window* pParent, MediaWindow* pMediaWindow, bool bInternalMediaControl ) :
Control( pParent ),
DropTargetHelper( this ),
DragSourceHelper( this ),
diff --git a/avmedia/source/viewer/mediawindow_impl.hxx b/avmedia/source/viewer/mediawindow_impl.hxx
index 7bf7f369143f..ce2c24bb9ab9 100644
--- a/avmedia/source/viewer/mediawindow_impl.hxx
+++ b/avmedia/source/viewer/mediawindow_impl.hxx
@@ -48,7 +48,7 @@ namespace avmedia
{
public:
- MediaWindowControl( Window* pParent );
+ MediaWindowControl( vcl::Window* pParent );
virtual ~MediaWindowControl();
protected:
@@ -65,8 +65,8 @@ namespace avmedia
{
public:
- MediaChildWindow( Window* pParent );
- MediaChildWindow( Window* pParent, SystemWindowData* pData );
+ MediaChildWindow( vcl::Window* pParent );
+ MediaChildWindow( vcl::Window* pParent, SystemWindowData* pData );
virtual ~MediaChildWindow();
protected:
@@ -92,7 +92,7 @@ namespace avmedia
{
public:
- MediaWindowImpl( Window* parent, MediaWindow* pMediaWindow, bool bInternalMediaControl );
+ MediaWindowImpl( vcl::Window* parent, MediaWindow* pMediaWindow, bool bInternalMediaControl );
virtual ~MediaWindowImpl();
static ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > createPlayer( const OUString& rURL, const OUString& rReferer, const OUString* pMimeType = 0 );
diff --git a/basctl/source/accessibility/accessibledialogcontrolshape.cxx b/basctl/source/accessibility/accessibledialogcontrolshape.cxx
index aaec4fba9104..75dd5f8f0129 100644
--- a/basctl/source/accessibility/accessibledialogcontrolshape.cxx
+++ b/basctl/source/accessibility/accessibledialogcontrolshape.cxx
@@ -178,9 +178,9 @@ void AccessibleDialogControlShape::SetBounds( const awt::Rectangle& aBounds )
-Window* AccessibleDialogControlShape::GetWindow() const
+vcl::Window* AccessibleDialogControlShape::GetWindow() const
{
- Window* pWindow = NULL;
+ vcl::Window* pWindow = NULL;
if ( m_pDlgEdObj )
{
Reference< awt::XControl > xControl( m_pDlgEdObj->GetControl(), UNO_QUERY );
@@ -495,7 +495,7 @@ sal_Int32 AccessibleDialogControlShape::getForeground( ) throw (RuntimeExceptio
OExternalLockGuard aGuard( this );
sal_Int32 nColor = 0;
- Window* pWindow = GetWindow();
+ vcl::Window* pWindow = GetWindow();
if ( pWindow )
{
if ( pWindow->IsControlForeground() )
@@ -521,7 +521,7 @@ sal_Int32 AccessibleDialogControlShape::getBackground( ) throw (RuntimeExceptio
OExternalLockGuard aGuard( this );
sal_Int32 nColor = 0;
- Window* pWindow = GetWindow();
+ vcl::Window* pWindow = GetWindow();
if ( pWindow )
{
if ( pWindow->IsControlBackground() )
@@ -542,7 +542,7 @@ Reference< awt::XFont > AccessibleDialogControlShape::getFont( ) throw (Runtime
OExternalLockGuard aGuard( this );
Reference< awt::XFont > xFont;
- Window* pWindow = GetWindow();
+ vcl::Window* pWindow = GetWindow();
if ( pWindow )
{
Reference< awt::XDevice > xDev( pWindow->GetComponentInterface(), UNO_QUERY );
@@ -578,7 +578,7 @@ OUString AccessibleDialogControlShape::getToolTipText( ) throw (RuntimeExceptio
OExternalLockGuard aGuard( this );
OUString sText;
- Window* pWindow = GetWindow();
+ vcl::Window* pWindow = GetWindow();
if ( pWindow )
sText = pWindow->GetQuickHelpText();
diff --git a/basctl/source/accessibility/accessibledialogwindow.cxx b/basctl/source/accessibility/accessibledialogwindow.cxx
index 527da88e2dde..1d00867f3894 100644
--- a/basctl/source/accessibility/accessibledialogwindow.cxx
+++ b/basctl/source/accessibility/accessibledialogwindow.cxx
@@ -667,7 +667,7 @@ Reference< XAccessible > AccessibleDialogWindow::getAccessibleParent( ) throw (
Reference< XAccessible > xParent;
if ( m_pDialogWindow )
{
- Window* pParent = m_pDialogWindow->GetAccessibleParentWindow();
+ vcl::Window* pParent = m_pDialogWindow->GetAccessibleParentWindow();
if ( pParent )
xParent = pParent->GetAccessible();
}
@@ -684,13 +684,13 @@ sal_Int32 AccessibleDialogWindow::getAccessibleIndexInParent( ) throw (RuntimeE
sal_Int32 nIndexInParent = -1;
if ( m_pDialogWindow )
{
- Window* pParent = m_pDialogWindow->GetAccessibleParentWindow();
+ vcl::Window* pParent = m_pDialogWindow->GetAccessibleParentWindow();
if ( pParent )
{
for ( sal_uInt16 i = 0, nCount = pParent->GetAccessibleChildWindowCount(); i < nCount; ++i )
{
- Window* pChild = pParent->GetAccessibleChildWindow( i );
- if ( pChild == static_cast< Window* >( m_pDialogWindow ) )
+ vcl::Window* pChild = pParent->GetAccessibleChildWindow( i );
+ if ( pChild == static_cast< vcl::Window* >( m_pDialogWindow ) )
{
nIndexInParent = i;
break;
diff --git a/basctl/source/basicide/basicbox.cxx b/basctl/source/basicide/basicbox.cxx
index 194004ba392b..5699f1aacd95 100644
--- a/basctl/source/basicide/basicbox.cxx
+++ b/basctl/source/basicide/basicbox.cxx
@@ -78,7 +78,7 @@ void LibBoxControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPool
-Window* LibBoxControl::CreateItemWindow( Window *pParent )
+vcl::Window* LibBoxControl::CreateItemWindow( vcl::Window *pParent )
{
return new LibBox( pParent, m_xFrame );
}
@@ -87,7 +87,7 @@ Window* LibBoxControl::CreateItemWindow( Window *pParent )
//= DocListenerBox
-DocListenerBox::DocListenerBox( Window* pParent )
+DocListenerBox::DocListenerBox( vcl::Window* pParent )
:ListBox( pParent, WinBits( WB_BORDER | WB_DROPDOWN ) )
,m_aNotifier( *this )
{
@@ -146,7 +146,7 @@ void DocListenerBox::onDocumentModeChanged( const ScriptDocument& /*_rDocument*/
//= basctl::LibBox
-LibBox::LibBox( Window* pParent, const uno::Reference< frame::XFrame >& rFrame ) :
+LibBox::LibBox( vcl::Window* pParent, const uno::Reference< frame::XFrame >& rFrame ) :
DocListenerBox( pParent ),
m_xFrame( rFrame )
{
@@ -190,7 +190,7 @@ void LibBox::ReleaseFocus()
if ( pCurSh )
{
- Window* pShellWin = pCurSh->GetWindow();
+ vcl::Window* pShellWin = pCurSh->GetWindow();
if ( !pShellWin )
pShellWin = Application::GetDefDialogParent();
@@ -367,14 +367,14 @@ void LanguageBoxControl::StateChanged( sal_uInt16 nID, SfxItemState eState, cons
}
}
-Window* LanguageBoxControl::CreateItemWindow( Window *pParent )
+vcl::Window* LanguageBoxControl::CreateItemWindow( vcl::Window *pParent )
{
return new LanguageBox( pParent );
}
// class basctl::LanguageBox -----------------------------------------------
-LanguageBox::LanguageBox( Window* pParent ) :
+LanguageBox::LanguageBox( vcl::Window* pParent ) :
DocListenerBox( pParent ),
diff --git a/basctl/source/basicide/basicbox.hxx b/basctl/source/basicide/basicbox.hxx
index ea71b7286ac6..572765bacbc4 100644
--- a/basctl/source/basicide/basicbox.hxx
+++ b/basctl/source/basicide/basicbox.hxx
@@ -38,7 +38,7 @@ public:
virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState ) SAL_OVERRIDE;
- virtual Window* CreateItemWindow( Window *pParent ) SAL_OVERRIDE;
+ virtual vcl::Window* CreateItemWindow( vcl::Window *pParent ) SAL_OVERRIDE;
};
/** base class for list boxes which need to update their content according to the list
@@ -48,7 +48,7 @@ class DocListenerBox :public ListBox
,public DocumentEventListener
{
protected:
- DocListenerBox( Window* pParent );
+ DocListenerBox( vcl::Window* pParent );
virtual ~DocListenerBox();
protected:
@@ -94,7 +94,7 @@ protected:
virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
public:
- LibBox( Window* pParent,
+ LibBox( vcl::Window* pParent,
const com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame );
virtual ~LibBox();
@@ -111,7 +111,7 @@ public:
virtual ~LanguageBoxControl();
virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE;
- virtual Window* CreateItemWindow( Window *pParent ) SAL_OVERRIDE;
+ virtual vcl::Window* CreateItemWindow( vcl::Window *pParent ) SAL_OVERRIDE;
};
class LanguageBox : public DocListenerBox
@@ -134,7 +134,7 @@ protected:
virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
public:
- LanguageBox( Window* pParent );
+ LanguageBox( vcl::Window* pParent );
virtual ~LanguageBox();
using Window::Update;
diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx
index 57cf39d6c1f2..97a31e140aa3 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -654,7 +654,7 @@ bool ModulWindow::BasicErrorHdl( StarBASIC * pBasic )
ErrorHandler::HandleError( StarBASIC::GetErrorCode() );
// #i47002#
- Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
+ vcl::Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
if ( !pWindow )
return false;
@@ -1443,7 +1443,7 @@ void ModulWindow::UpdateModule ()
-ModulWindowLayout::ModulWindowLayout (Window* pParent, ObjectCatalog& rObjectCatalog_) :
+ModulWindowLayout::ModulWindowLayout (vcl::Window* pParent, ObjectCatalog& rObjectCatalog_) :
Layout(pParent),
pChild(0),
aWatchWindow(this),
diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx
index 02ce15c3c414..df3aae8cec4a 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -75,7 +75,7 @@ class CodeCompleteWindow;
OUString getTextEngineText (ExtTextEngine&);
void setTextEngineText (ExtTextEngine&, OUString const&);
-class EditorWindow : public Window, public SfxListener
+class EditorWindow : public vcl::Window, public SfxListener
{
friend class CodeCompleteListBox;
private:
@@ -144,7 +144,7 @@ protected:
bool ImpCanModify();
public:
- EditorWindow (Window* pParent, ModulWindow*);
+ EditorWindow (vcl::Window* pParent, ModulWindow*);
virtual ~EditorWindow();
ExtTextEngine* GetEditEngine() const { return pEditEngine.get(); }
@@ -169,7 +169,7 @@ public:
};
-class BreakPointWindow : public Window
+class BreakPointWindow : public vcl::Window
{
private:
ModulWindow& rModulWindow;
@@ -192,7 +192,7 @@ protected:
bool SyncYOffset();
public:
- BreakPointWindow (Window* pParent, ModulWindow*);
+ BreakPointWindow (vcl::Window* pParent, ModulWindow*);
virtual ~BreakPointWindow();
void SetMarkerPos( sal_uInt16 nLine, bool bErrorMarker = false );
@@ -216,7 +216,7 @@ protected:
SbxBase* ImplGetSBXForEntry( SvTreeListEntry* pEntry, bool& rbArrayElement );
public:
- WatchTreeListBox( Window* pParent, WinBits nWinBits );
+ WatchTreeListBox( vcl::Window* pParent, WinBits nWinBits );
virtual ~WatchTreeListBox();
void RequestingChildren( SvTreeListEntry * pParent ) SAL_OVERRIDE;
@@ -277,7 +277,7 @@ public:
};
-class ComplexEditorWindow : public Window
+class ComplexEditorWindow : public vcl::Window
{
private:
BreakPointWindow aBrkWindow;
@@ -426,7 +426,7 @@ public:
class ModulWindowLayout: public Layout
{
public:
- ModulWindowLayout (Window* pParent, ObjectCatalog&);
+ ModulWindowLayout (vcl::Window* pParent, ObjectCatalog&);
public:
// Layout:
virtual void Activating (BaseWindow&) SAL_OVERRIDE;
@@ -507,7 +507,7 @@ protected:
virtual void KeyInput( const KeyEvent& rKeyEvt ) SAL_OVERRIDE;
};
-class CodeCompleteWindow: public Window
+class CodeCompleteWindow: public vcl::Window
{
friend class CodeCompleteListBox;
private:
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index d3e2bb48ab96..9b34fc328760 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -229,7 +229,7 @@ private:
sal_uLong nCurState;
};
-EditorWindow::EditorWindow (Window* pParent, ModulWindow* pModulWindow) :
+EditorWindow::EditorWindow (vcl::Window* pParent, ModulWindow* pModulWindow) :
Window(pParent, WB_BORDER),
pEditView(0),
pEditEngine(0),
@@ -1355,7 +1355,7 @@ void EditorWindow::ForceSyntaxTimeout()
-BreakPointWindow::BreakPointWindow (Window* pParent, ModulWindow* pModulWindow)
+BreakPointWindow::BreakPointWindow (vcl::Window* pParent, ModulWindow* pModulWindow)
: Window(pParent, WB_BORDER)
, rModulWindow(*pModulWindow)
, nCurYOffset(0) // memorize nCurYOffset and not take it from EditEngine
@@ -2119,7 +2119,7 @@ EditorWindow::GetComponentInterface(bool bCreate)
-WatchTreeListBox::WatchTreeListBox( Window* pParent, WinBits nWinBits )
+WatchTreeListBox::WatchTreeListBox( vcl::Window* pParent, WinBits nWinBits )
: SvHeaderTabListBox( pParent, nWinBits )
{}
diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx
index c9973c4ba175..e294a3b825ff 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -903,11 +903,11 @@ std::vector< lang::Locale > implGetLanguagesOnlyContainedInFirstSeq
class NameClashQueryBox : public MessBox
{
public:
- NameClashQueryBox( Window* pParent,
+ NameClashQueryBox( vcl::Window* pParent,
const OUString& rTitle, const OUString& rMessage );
};
-NameClashQueryBox::NameClashQueryBox( Window* pParent,
+NameClashQueryBox::NameClashQueryBox( vcl::Window* pParent,
const OUString& rTitle, const OUString& rMessage )
: MessBox( pParent, 0, rTitle, rMessage )
{
@@ -928,11 +928,11 @@ NameClashQueryBox::NameClashQueryBox( Window* pParent,
class LanguageMismatchQueryBox : public MessBox
{
public:
- LanguageMismatchQueryBox( Window* pParent,
+ LanguageMismatchQueryBox( vcl::Window* pParent,
const OUString& rTitle, const OUString& rMessage );
};
-LanguageMismatchQueryBox::LanguageMismatchQueryBox( Window* pParent,
+LanguageMismatchQueryBox::LanguageMismatchQueryBox( vcl::Window* pParent,
const OUString& rTitle, const OUString& rMessage )
: MessBox( pParent, 0, rTitle, rMessage )
{
@@ -950,7 +950,7 @@ LanguageMismatchQueryBox::LanguageMismatchQueryBox( Window* pParent,
}
-bool implImportDialog( Window* pWin, const OUString& rCurPath, const ScriptDocument& rDocument, const OUString& aLibName )
+bool implImportDialog( vcl::Window* pWin, const OUString& rCurPath, const ScriptDocument& rDocument, const OUString& aLibName )
{
bool bDone = false;
@@ -1406,7 +1406,7 @@ ItemType DialogWindow::GetType () const
-DialogWindowLayout::DialogWindowLayout (Window* pParent, ObjectCatalog& rObjectCatalog_) :
+DialogWindowLayout::DialogWindowLayout (vcl::Window* pParent, ObjectCatalog& rObjectCatalog_) :
Layout(pParent),
pChild(0),
rObjectCatalog(rObjectCatalog_),
diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx
index eb05257bcb71..4b2582ee66ff 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -139,7 +139,7 @@ void Shell::ExecuteCurrent( SfxRequest& rReq )
{
SfxViewFrame* pViewFrame = GetViewFrame();
SfxChildWindow* pChildWin = pViewFrame ? pViewFrame->GetChildWindow( SID_SEARCH_DLG ) : NULL;
- Window* pParent = pChildWin ? pChildWin->GetWindow() : NULL;
+ vcl::Window* pParent = pChildWin ? pChildWin->GetWindow() : NULL;
QueryBox aQuery(pParent, WB_YES_NO|WB_DEF_YES, IDE_RESSTR(RID_STR_SEARCHFROMSTART));
if ( aQuery.Execute() == RET_YES )
{
@@ -665,7 +665,7 @@ void Shell::ExecuteGlobal( SfxRequest& rReq )
TextSelection aSel( TextPaM( nLine, nCol1 ), TextPaM( nLine, nCol2 ) );
pTextView->SetSelection( aSel );
pTextView->ShowCursor();
- Window* pWindow_ = pTextView->GetWindow();
+ vcl::Window* pWindow_ = pTextView->GetWindow();
if ( pWindow_ )
pWindow_->GrabFocus();
}
@@ -1002,8 +1002,8 @@ void Shell::SetCurWindow( BaseWindow* pNewWin, bool bUpdateTabBar, bool bRemembe
pCurWin->Init();
if (!GetExtraData()->ShellInCriticalSection())
{
- Window* pFrameWindow = &GetViewFrame()->GetWindow();
- Window* pFocusWindow = Application::GetFocusWindow();
+ vcl::Window* pFrameWindow = &GetViewFrame()->GetWindow();
+ vcl::Window* pFocusWindow = Application::GetFocusWindow();
while ( pFocusWindow && ( pFocusWindow != pFrameWindow ) )
pFocusWindow = pFocusWindow->GetParent();
if ( pFocusWindow ) // Focus in BasicIDE
diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx
index 18be9999cbf8..aeb2acb22451 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -391,7 +391,7 @@ bool Shell::PrepareClose( bool bUI )
{
if( bUI )
{
- Window *pParent = &GetViewFrame()->GetWindow();
+ vcl::Window *pParent = &GetViewFrame()->GetWindow();
InfoBox( pParent, IDE_RESSTR(RID_STR_CANNOTCLOSE)).Execute();
}
return false;
diff --git a/basctl/source/basicide/basobj2.cxx b/basctl/source/basicide/basobj2.cxx
index eee39ba9b08e..32933e3b9bad 100644
--- a/basctl/source/basicide/basobj2.cxx
+++ b/basctl/source/basicide/basobj2.cxx
@@ -77,7 +77,7 @@ void Organize( sal_Int16 tabId )
if (BaseWindow* pCurWin = pShell->GetCurWindow())
aDesc = pCurWin->CreateEntryDescriptor();
- Window* pParent = Application::GetDefDialogParent();
+ vcl::Window* pParent = Application::GetDefDialogParent();
OrganizeDialog(pParent, tabId, aDesc).Execute();
}
@@ -145,7 +145,7 @@ Sequence< OUString > GetMergedLibraryNames( const Reference< script::XLibraryCon
}
bool RenameModule (
- Window* pErrorParent,
+ vcl::Window* pErrorParent,
const ScriptDocument& rDocument,
const OUString& rLibName,
const OUString& rOldName,
diff --git a/basctl/source/basicide/basobj3.cxx b/basctl/source/basicide/basobj3.cxx
index 97008a1107f6..288900794dba 100644
--- a/basctl/source/basicide/basobj3.cxx
+++ b/basctl/source/basicide/basobj3.cxx
@@ -155,7 +155,7 @@ SbMethod* CreateMacro( SbModule* pModule, const OUString& rMacroName )
}
bool RenameDialog (
- Window* pErrorParent,
+ vcl::Window* pErrorParent,
ScriptDocument const& rDocument,
OUString const& rLibName,
OUString const& rOldName,
@@ -348,7 +348,7 @@ void BasicStopped(
*pnWaitCount = nWait;
}
- Window* pDefParent = Application::GetDefDialogParent();
+ vcl::Window* pDefParent = Application::GetDefDialogParent();
if ( pDefParent && !pDefParent->IsEnabled() )
{
pDefParent->Enable(true);
diff --git a/basctl/source/basicide/bastype2.cxx b/basctl/source/basicide/bastype2.cxx
index 51729f9e5619..4c9f52abc237 100644
--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.cxx
@@ -183,14 +183,14 @@ bool EntryDescriptor::operator == (EntryDescriptor const& rDesc) const
-TreeListBox::TreeListBox (Window* pParent, ResId const& rRes)
+TreeListBox::TreeListBox (vcl::Window* pParent, ResId const& rRes)
: SvTreeListBox( pParent, IDEResId( sal::static_int_cast<sal_uInt16>( rRes.GetId() ) ) )
, m_aNotifier( *this )
{
Init();
}
-TreeListBox::TreeListBox (Window* pParent, WinBits nStyle)
+TreeListBox::TreeListBox (vcl::Window* pParent, WinBits nStyle)
: SvTreeListBox(pParent, nStyle)
, m_aNotifier( *this )
{
@@ -204,7 +204,7 @@ void TreeListBox::Init()
nMode = 0xFF; // everything
}
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeTreeListBox(Window *pParent, VclBuilder::stringmap &rMap)
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeTreeListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap)
{
WinBits nWinBits = WB_TABSTOP;
OString sBorder = VclBuilder::extractCustomProperty(rMap);
diff --git a/basctl/source/basicide/bastype2.hxx b/basctl/source/basicide/bastype2.hxx
index e703d2e4613b..0eac7b8875a9 100644
--- a/basctl/source/basicide/bastype2.hxx
+++ b/basctl/source/basicide/bastype2.hxx
@@ -206,8 +206,8 @@ protected:
virtual void onDocumentModeChanged( const ScriptDocument& _rDocument ) SAL_OVERRIDE;
public:
- TreeListBox(Window* pParent, const ResId& rRes);
- TreeListBox(Window* pParent, WinBits nStyle);
+ TreeListBox(vcl::Window* pParent, const ResId& rRes);
+ TreeListBox(vcl::Window* pParent, WinBits nStyle);
virtual ~TreeListBox();
void ScanEntry( const ScriptDocument& rDocument, LibraryLocation eLocation );
diff --git a/basctl/source/basicide/bastype3.hxx b/basctl/source/basicide/bastype3.hxx
index cf732b132676..43ad48511504 100644
--- a/basctl/source/basicide/bastype3.hxx
+++ b/basctl/source/basicide/bastype3.hxx
@@ -40,7 +40,7 @@ protected:
DECL_LINK(ImplLoseFocusHdl, void *);
public:
- ExtendedEdit( Window* pParent, IDEResId nRes );
+ ExtendedEdit( vcl::Window* pParent, IDEResId nRes );
void SetAccHdl( const Link& rLink ) { aAccHdl = rLink; }
void SetLoseFocusHdl( const Link& rLink ) { aLoseFocusHdl = rLink; }
diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx
index 5fbdd63c2004..994ad6eafdd3 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -47,7 +47,7 @@ using namespace ::com::sun::star;
TYPEINIT0( BaseWindow )
TYPEINIT1( SbxItem, SfxPoolItem );
-BaseWindow::BaseWindow( Window* pParent, const ScriptDocument& rDocument, const OUString& aLibName, const OUString& aName )
+BaseWindow::BaseWindow( vcl::Window* pParent, const ScriptDocument& rDocument, const OUString& aLibName, const OUString& aName )
:Window( pParent, WinBits( WB_3DLOOK ) )
,m_aDocument( rDocument )
,m_aLibName( aLibName )
@@ -266,7 +266,7 @@ WinBits const DockingWindow::StyleBits =
WB_BORDER | WB_3DLOOK | WB_CLIPCHILDREN |
WB_MOVEABLE | WB_SIZEABLE | WB_ROLLABLE | WB_DOCKABLE;
-DockingWindow::DockingWindow (Window* pParent) :
+DockingWindow::DockingWindow (vcl::Window* pParent) :
::DockingWindow(pParent, StyleBits),
pLayout(0),
nShowCount(0)
@@ -418,7 +418,7 @@ void DockingWindow::DockThis ()
-ExtendedEdit::ExtendedEdit( Window* pParent, IDEResId nRes ) :
+ExtendedEdit::ExtendedEdit( vcl::Window* pParent, IDEResId nRes ) :
Edit( pParent, nRes )
{
aAcc.SetSelectHdl( LINK( this, ExtendedEdit, EditAccHdl ) );
@@ -454,7 +454,7 @@ IMPL_LINK_INLINE_END( ExtendedEdit, EditAccHdl, Accelerator *, pAcc )
-TabBar::TabBar( Window* pParent ) :
+TabBar::TabBar( vcl::Window* pParent ) :
::TabBar( pParent, WinBits( WB_3DLOOK | WB_SCROLL | WB_BORDER | WB_SIZEABLE | WB_DRAG ) )
{
EnableEditMode(true);
@@ -782,7 +782,7 @@ LibInfos::Item::Item (
LibInfos::Item::~Item ()
{ }
-bool QueryDel( const OUString& rName, const ResId& rId, Window* pParent )
+bool QueryDel( const OUString& rName, const ResId& rId, vcl::Window* pParent )
{
OUString aQuery(rId.toString());
OUStringBuffer aNameBuf( rName );
@@ -793,27 +793,27 @@ bool QueryDel( const OUString& rName, const ResId& rId, Window* pParent )
return ( aQueryBox.Execute() == RET_YES );
}
-bool QueryDelMacro( const OUString& rName, Window* pParent )
+bool QueryDelMacro( const OUString& rName, vcl::Window* pParent )
{
return QueryDel( rName, IDEResId( RID_STR_QUERYDELMACRO ), pParent );
}
-bool QueryReplaceMacro( const OUString& rName, Window* pParent )
+bool QueryReplaceMacro( const OUString& rName, vcl::Window* pParent )
{
return QueryDel( rName, IDEResId( RID_STR_QUERYREPLACEMACRO ), pParent );
}
-bool QueryDelDialog( const OUString& rName, Window* pParent )
+bool QueryDelDialog( const OUString& rName, vcl::Window* pParent )
{
return QueryDel( rName, IDEResId( RID_STR_QUERYDELDIALOG ), pParent );
}
-bool QueryDelLib( const OUString& rName, bool bRef, Window* pParent )
+bool QueryDelLib( const OUString& rName, bool bRef, vcl::Window* pParent )
{
return QueryDel( rName, IDEResId( bRef ? RID_STR_QUERYDELLIBREF : RID_STR_QUERYDELLIB ), pParent );
}
-bool QueryDelModule( const OUString& rName, Window* pParent )
+bool QueryDelModule( const OUString& rName, vcl::Window* pParent )
{
return QueryDel( rName, IDEResId( RID_STR_QUERYDELMODULE ), pParent );
}
diff --git a/basctl/source/basicide/brkdlg.cxx b/basctl/source/basicide/brkdlg.cxx
index 77c4c77accc3..30d94cc08873 100644
--- a/basctl/source/basicide/brkdlg.cxx
+++ b/basctl/source/basicide/brkdlg.cxx
@@ -63,7 +63,7 @@ bool lcl_ParseText(OUString const &rText, size_t& rLineNr )
} // namespace
-BreakPointDialog::BreakPointDialog( Window* pParent, BreakPointList& rBrkPntList )
+BreakPointDialog::BreakPointDialog( vcl::Window* pParent, BreakPointList& rBrkPntList )
: ModalDialog(pParent, "ManageBreakpointsDialog",
"modules/BasicIDE/ui/managebreakpoints.ui")
, m_rOriginalBreakPointList(rBrkPntList)
diff --git a/basctl/source/basicide/brkdlg.hxx b/basctl/source/basicide/brkdlg.hxx
index da61756fecea..2ae1ff77546a 100644
--- a/basctl/source/basicide/brkdlg.hxx
+++ b/basctl/source/basicide/brkdlg.hxx
@@ -54,7 +54,7 @@ protected:
public:
- BreakPointDialog( Window* pParent, BreakPointList& rBrkList );
+ BreakPointDialog( vcl::Window* pParent, BreakPointList& rBrkList );
void SetCurrentBreakPoint( BreakPoint* pBrk );
};
diff --git a/basctl/source/basicide/layout.cxx b/basctl/source/basicide/layout.cxx
index 02fb50f5c373..50c9d5e41dc4 100644
--- a/basctl/source/basicide/layout.cxx
+++ b/basctl/source/basicide/layout.cxx
@@ -35,7 +35,7 @@ static long const nSplitThickness = 3;
// ctor for derived classes
// pParent: the parent window (Shell)
-Layout::Layout (Window* pParent) :
+Layout::Layout (vcl::Window* pParent) :
Window(pParent, WB_CLIPCHILDREN),
pChild(0),
bFirstSize(true),
diff --git a/basctl/source/basicide/layout.hxx b/basctl/source/basicide/layout.hxx
index 3db298349cd5..9a6ab12fc3ca 100644
--- a/basctl/source/basicide/layout.hxx
+++ b/basctl/source/basicide/layout.hxx
@@ -41,7 +41,7 @@ class BaseWindow;
// Layout -- the common base of ModulLayout and DialogLayout.
// Handles the splitting lines and the dockable windows.
-class Layout: public Window
+class Layout: public vcl::Window
{
public:
void DockaWindow (DockingWindow*);
@@ -54,7 +54,7 @@ public:
virtual void UpdateDebug (bool bBasicStopped ) = 0;
protected:
- Layout (Window* pParent);
+ Layout (vcl::Window* pParent);
virtual ~Layout ();
void AddToLeft (DockingWindow* pWin, Size const& rSize) { aLeftSide.Add(pWin, rSize); }
diff --git a/basctl/source/basicide/linenumberwindow.cxx b/basctl/source/basicide/linenumberwindow.cxx
index d7064e9d2485..57dde92c3cc0 100644
--- a/basctl/source/basicide/linenumberwindow.cxx
+++ b/basctl/source/basicide/linenumberwindow.cxx
@@ -17,7 +17,7 @@
namespace basctl
{
-LineNumberWindow::LineNumberWindow (Window* pParent, ModulWindow* pModulWindow) :
+LineNumberWindow::LineNumberWindow (vcl::Window* pParent, ModulWindow* pModulWindow) :
Window(pParent, WB_BORDER),
m_pModulWindow(pModulWindow),
m_nCurYOffset(0)
diff --git a/basctl/source/basicide/linenumberwindow.hxx b/basctl/source/basicide/linenumberwindow.hxx
index e01c078a378f..5c539d6a767e 100644
--- a/basctl/source/basicide/linenumberwindow.hxx
+++ b/basctl/source/basicide/linenumberwindow.hxx
@@ -17,7 +17,7 @@ namespace basctl
class ModulWindow;
-class LineNumberWindow : public Window
+class LineNumberWindow : public vcl::Window
{
private:
ModulWindow* m_pModulWindow;
@@ -30,7 +30,7 @@ protected:
virtual void Paint( const Rectangle& ) SAL_OVERRIDE;
public:
- LineNumberWindow (Window* pParent, ModulWindow* pModulWin);
+ LineNumberWindow (vcl::Window* pParent, ModulWindow* pModulWin);
virtual ~LineNumberWindow();
void DoScroll( long nHorzScroll, long nVertScroll );
diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx
index fb8621255a31..a88cca451cc2 100644
--- a/basctl/source/basicide/macrodlg.cxx
+++ b/basctl/source/basicide/macrodlg.cxx
@@ -59,7 +59,7 @@ using ::std::pair;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
-MacroChooser::MacroChooser( Window* pParnt, bool bCreateEntries )
+MacroChooser::MacroChooser( vcl::Window* pParnt, bool bCreateEntries )
: SfxModalDialog(pParnt, "BasicMacroDialog", "modules/BasicIDE/ui/basicmacrodialog.ui")
, bNewDelIsDel(true)
// the Sfx doesn't aske the BasicManger whether modified or not
@@ -232,7 +232,7 @@ short MacroChooser::Execute()
if ( StarBASIC::IsRunning() )
m_pCloseButton->GrabFocus();
- Window* pPrevDlgParent = Application::GetDefDialogParent();
+ vcl::Window* pPrevDlgParent = Application::GetDefDialogParent();
Application::SetDefDialogParent( this );
short nRet = ModalDialog::Execute();
// #57314# If the BasicIDE has been activated, don't reset the DefModalDialogParent to the inactive document.
@@ -365,7 +365,7 @@ SbMethod* MacroChooser::CreateMacro()
if ( !pModule )
{
- pModule = createModImpl( static_cast<Window*>( this ),
+ pModule = createModImpl( static_cast<vcl::Window*>( this ),
aDocument, *m_pBasicBox, aLibName, aModName );
}
@@ -749,7 +749,7 @@ IMPL_LINK( MacroChooser, ButtonHdl, Button *, pButton )
SvTreeListEntry* pCurEntry = m_pBasicBox->GetCurEntry();
EntryDescriptor aDesc = m_pBasicBox->GetEntryDescriptor(pCurEntry);
ScriptDocument aDocument( aDesc.GetDocument() );
- createLibImpl( static_cast<Window*>( this ), aDocument, NULL, m_pBasicBox );
+ createLibImpl( static_cast<vcl::Window*>( this ), aDocument, NULL, m_pBasicBox );
}
else if (pButton == m_pNewModButton)
{
@@ -758,7 +758,7 @@ IMPL_LINK( MacroChooser, ButtonHdl, Button *, pButton )
ScriptDocument aDocument( aDesc.GetDocument() );
OUString aLibName( aDesc.GetLibName() );
OUString aModName;
- createModImpl( static_cast<Window*>( this ), aDocument,
+ createModImpl( static_cast<vcl::Window*>( this ), aDocument,
*m_pBasicBox, aLibName, aModName, true );
}
else if (pButton == m_pOrganizeButton)
diff --git a/basctl/source/basicide/macrodlg.hxx b/basctl/source/basicide/macrodlg.hxx
index 7efa94d20979..68dcd8c4c0ac 100644
--- a/basctl/source/basicide/macrodlg.hxx
+++ b/basctl/source/basicide/macrodlg.hxx
@@ -87,7 +87,7 @@ private:
void RestoreMacroDescription();
public:
- MacroChooser( Window* pParent, bool bCreateEntries = true );
+ MacroChooser( vcl::Window* pParent, bool bCreateEntries = true );
virtual ~MacroChooser();
SbMethod* GetMacro();
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index e727ccf6ebe1..a889ca2d7adb 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -150,7 +150,7 @@ void LibLBoxString::Paint(const Point& rPos, SvTreeListBox& rDev, const SvViewDa
} // namespace
// basctl::CheckBox
-CheckBox::CheckBox(Window* pParent, WinBits nStyle)
+CheckBox::CheckBox(vcl::Window* pParent, WinBits nStyle)
: SvTabListBox(pParent, nStyle)
, eMode(ObjectMode::Module)
, m_aDocument(ScriptDocument::getApplicationScriptDocument())
@@ -161,7 +161,7 @@ CheckBox::CheckBox(Window* pParent, WinBits nStyle)
Init();
}
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeCheckBox(Window *pParent, VclBuilder::stringmap &rMap)
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeCheckBox(vcl::Window *pParent, VclBuilder::stringmap &rMap)
{
WinBits nWinBits = WB_TABSTOP;
OString sBorder = VclBuilder::extractCustomProperty(rMap);
@@ -364,7 +364,7 @@ IMPL_LINK_NOARG(NewObjectDialog, OkButtonHandler)
return 0;
}
-NewObjectDialog::NewObjectDialog(Window * pParent, ObjectMode::Mode eMode,
+NewObjectDialog::NewObjectDialog(vcl::Window * pParent, ObjectMode::Mode eMode,
bool bCheckName)
: ModalDialog(pParent, "NewLibDialog", "modules/BasicIDE/ui/newlibdialog.ui")
{
@@ -396,7 +396,7 @@ NewObjectDialog::NewObjectDialog(Window * pParent, ObjectMode::Mode eMode,
}
// GotoLineDialog
-GotoLineDialog::GotoLineDialog(Window * pParent )
+GotoLineDialog::GotoLineDialog(vcl::Window * pParent )
: ModalDialog(pParent, "GotoLineDialog",
"modules/BasicIDE/ui/gotolinedialog.ui")
{
@@ -428,7 +428,7 @@ IMPL_LINK_NOARG(ExportDialog, OkButtonHandler)
return 0;
}
-ExportDialog::ExportDialog(Window * pParent)
+ExportDialog::ExportDialog(vcl::Window * pParent)
: ModalDialog(pParent, "ExportDialog",
"modules/BasicIDE/ui/exportdialog.ui")
, mbExportAsPackage(false)
@@ -441,7 +441,7 @@ ExportDialog::ExportDialog(Window * pParent)
}
// LibPage
-LibPage::LibPage(Window * pParent)
+LibPage::LibPage(vcl::Window * pParent)
: TabPage(pParent, "LibPage",
"modules/BasicIDE/ui/libpage.ui")
, m_aCurDocument(ScriptDocument::getApplicationScriptDocument())
@@ -689,7 +689,7 @@ IMPL_LINK_INLINE_END( LibPage, CheckPasswordHdl, SvxPasswordDialog *, pDlg )
void LibPage::NewLib()
{
- createLibImpl( static_cast<Window*>( this ), m_aCurDocument, m_pLibBox, NULL);
+ createLibImpl( static_cast<vcl::Window*>( this ), m_aCurDocument, m_pLibBox, NULL);
}
void LibPage::InsertLib()
@@ -1428,7 +1428,7 @@ SvTreeListEntry* LibPage::ImpInsertLibEntry( const OUString& rLibName, sal_uLong
}
// Helper function
-void createLibImpl( Window* pWin, const ScriptDocument& rDocument,
+void createLibImpl( vcl::Window* pWin, const ScriptDocument& rDocument,
CheckBox* pLibBox, TreeListBox* pBasicBox )
{
OSL_ENSURE( rDocument.isAlive(), "createLibImpl: invalid document!" );
diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx
index 9586a4ff88d4..7f6359212a51 100644
--- a/basctl/source/basicide/moduldlg.cxx
+++ b/basctl/source/basicide/moduldlg.cxx
@@ -52,12 +52,12 @@ using namespace ::com::sun::star::resource;
-ExtTreeListBox::ExtTreeListBox(Window* pParent, WinBits nStyle)
+ExtTreeListBox::ExtTreeListBox(vcl::Window* pParent, WinBits nStyle)
: TreeListBox(pParent, nStyle)
{
}
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeExtTreeListBox(Window *pParent, VclBuilder::stringmap &rMap)
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeExtTreeListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap)
{
WinBits nWinBits = WB_TABSTOP;
OString sBorder = VclBuilder::extractCustomProperty(rMap);
@@ -462,7 +462,7 @@ TriState ExtTreeListBox::NotifyCopyingMoving( SvTreeListEntry* pTarget, SvTreeLi
}
// OrganizeDialog
-OrganizeDialog::OrganizeDialog(Window* pParent, sal_Int16 tabId,
+OrganizeDialog::OrganizeDialog(vcl::Window* pParent, sal_Int16 tabId,
EntryDescriptor& rDesc )
: TabDialog( pParent, "OrganizeDialog",
"modules/BasicIDE/ui/organizedialog.ui" )
@@ -499,7 +499,7 @@ OrganizeDialog::~OrganizeDialog()
short OrganizeDialog::Execute()
{
- Window* pPrevDlgParent = Application::GetDefDialogParent();
+ vcl::Window* pPrevDlgParent = Application::GetDefDialogParent();
Application::SetDefDialogParent( this );
short nRet = TabDialog::Execute();
Application::SetDefDialogParent( pPrevDlgParent );
@@ -550,7 +550,7 @@ IMPL_LINK( OrganizeDialog, ActivatePageHdl, TabControl *, pTabCtrl )
-ObjectPage::ObjectPage(Window *pParent, const OString &rName, sal_uInt16 nMode)
+ObjectPage::ObjectPage(vcl::Window *pParent, const OString &rName, sal_uInt16 nMode)
: TabPage(pParent, rName, OUString("modules/BasicIDE/ui/") +
OStringToOUString(rName, RTL_TEXTENCODING_UTF8).toAsciiLowerCase() +
OUString(".ui"))
@@ -791,7 +791,7 @@ void ObjectPage::NewModule()
if ( GetSelection( aDocument, aLibName ) )
{
OUString aModName;
- createModImpl( static_cast<Window*>( this ), aDocument,
+ createModImpl( static_cast<vcl::Window*>( this ), aDocument,
*m_pBasicBox, aLibName, aModName, true );
}
}
@@ -912,7 +912,7 @@ void ObjectPage::EndTabDialog( sal_uInt16 nRet )
pTabDlg->EndDialog( nRet );
}
-LibDialog::LibDialog( Window* pParent )
+LibDialog::LibDialog( vcl::Window* pParent )
: ModalDialog(pParent, "ImportLibDialog", "modules/BasicIDE/ui/importlibdialog.ui")
{
get(m_pStorageFrame, "storageframe");
@@ -931,7 +931,7 @@ void LibDialog::SetStorageName( const OUString& rName )
}
// Helper function
-SbModule* createModImpl( Window* pWin, const ScriptDocument& rDocument,
+SbModule* createModImpl( vcl::Window* pWin, const ScriptDocument& rDocument,
TreeListBox& rBasicBox, const OUString& rLibName, const OUString& _aModName, bool bMain )
{
OSL_ENSURE( rDocument.isAlive(), "createModImpl: invalid document!" );
diff --git a/basctl/source/basicide/moduldlg.hxx b/basctl/source/basicide/moduldlg.hxx
index e57f6e870651..9ba3e894deab 100644
--- a/basctl/source/basicide/moduldlg.hxx
+++ b/basctl/source/basicide/moduldlg.hxx
@@ -56,7 +56,7 @@ private:
DECL_LINK(OkButtonHandler, void *);
public:
- NewObjectDialog (Window* pParent, ObjectMode::Mode, bool bCheckName = false);
+ NewObjectDialog (vcl::Window* pParent, ObjectMode::Mode, bool bCheckName = false);
OUString GetObjectName() const { return m_pEdit->GetText(); }
void SetObjectName( const OUString& rName )
{
@@ -71,7 +71,7 @@ class GotoLineDialog : public ModalDialog
OKButton* m_pOKButton;
DECL_LINK(OkButtonHandler, void *);
public:
- GotoLineDialog(Window * pParent);
+ GotoLineDialog(vcl::Window * pParent);
sal_Int32 GetLineNumber() const;
};
@@ -86,7 +86,7 @@ private:
DECL_LINK(OkButtonHandler, void *);
public:
- ExportDialog( Window * pParent );
+ ExportDialog( vcl::Window * pParent );
bool isExportAsPackage () const { return mbExportAsPackage; }
};
@@ -109,7 +109,7 @@ protected:
SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos, bool bMove );
public:
- ExtTreeListBox(Window* pParent, WinBits nStyle);
+ ExtTreeListBox(vcl::Window* pParent, WinBits nStyle);
virtual ~ExtTreeListBox();
};
@@ -122,7 +122,7 @@ private:
void Init();
public:
- CheckBox(Window* pParent, WinBits nStyle);
+ CheckBox(vcl::Window* pParent, WinBits nStyle);
virtual ~CheckBox();
SvTreeListEntry* DoInsertEntry( const OUString& rStr, sal_uLong nPos = LISTBOX_APPEND );
@@ -150,7 +150,7 @@ private:
::CheckBox* m_pReplaceBox;
public:
- LibDialog( Window* pParent );
+ LibDialog( vcl::Window* pParent );
void SetStorageName( const OUString& rName );
@@ -169,7 +169,7 @@ private:
EntryDescriptor m_aCurEntry;
public:
- OrganizeDialog( Window* pParent, sal_Int16 tabId, EntryDescriptor& rDesc );
+ OrganizeDialog( vcl::Window* pParent, sal_Int16 tabId, EntryDescriptor& rDesc );
virtual ~OrganizeDialog();
virtual short Execute() SAL_OVERRIDE;
@@ -201,7 +201,7 @@ protected:
virtual void DeactivatePage() SAL_OVERRIDE;
public:
- ObjectPage(Window* pParent, const OString& rName, sal_uInt16 nMode);
+ ObjectPage(vcl::Window* pParent, const OString& rName, sal_uInt16 nMode);
void SetCurrentEntry( EntryDescriptor& rDesc );
void SetTabDlg( TabDialog* p ) { pTabDlg = p;}
@@ -247,16 +247,16 @@ protected:
TabDialog* pTabDlg;
public:
- LibPage( Window* pParent );
+ LibPage( vcl::Window* pParent );
virtual ~LibPage();
void SetTabDlg( TabDialog* p ) { pTabDlg = p;}
};
// Helper functions
-SbModule* createModImpl( Window* pWin, const ScriptDocument& rDocument,
+SbModule* createModImpl( vcl::Window* pWin, const ScriptDocument& rDocument,
TreeListBox& rBasicBox, const OUString& rLibName, const OUString& aModName, bool bMain = false );
-void createLibImpl( Window* pWin, const ScriptDocument& rDocument,
+void createLibImpl( vcl::Window* pWin, const ScriptDocument& rDocument,
CheckBox* pLibBox, TreeListBox* pBasicBox );
} // namespace basctl
diff --git a/basctl/source/basicide/objdlg.cxx b/basctl/source/basicide/objdlg.cxx
index 3244507fc9ab..82b49f6659f9 100644
--- a/basctl/source/basicide/objdlg.cxx
+++ b/basctl/source/basicide/objdlg.cxx
@@ -37,7 +37,7 @@
namespace basctl
{
-ObjectCatalog::ObjectCatalog (Window* pParent) :
+ObjectCatalog::ObjectCatalog (vcl::Window* pParent) :
DockingWindow(pParent),
aTitle(this),
aTree(this, IDEResId(RID_TLB_MACROS))
diff --git a/basctl/source/basicide/objdlg.hxx b/basctl/source/basicide/objdlg.hxx
index f91eaa4e0245..43a0953b2584 100644
--- a/basctl/source/basicide/objdlg.hxx
+++ b/basctl/source/basicide/objdlg.hxx
@@ -38,7 +38,7 @@ namespace basctl
class ObjectCatalog : public DockingWindow
{
public:
- ObjectCatalog (Window* pParent);
+ ObjectCatalog (vcl::Window* pParent);
virtual ~ObjectCatalog ();
public:
void UpdateEntries () { aTree.UpdateEntries(); }
diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx
index bd1edb03633d..b6c7f7f11782 100644
--- a/basctl/source/dlged/dlged.cxx
+++ b/basctl/source/dlged/dlged.cxx
@@ -174,7 +174,7 @@ bool DlgEditor::RemarkDialog()
DlgEditor::DlgEditor (
- Window& rWindow_, DialogWindowLayout& rLayout_,
+ vcl::Window& rWindow_, DialogWindowLayout& rLayout_,
com::sun::star::uno::Reference<com::sun::star::frame::XModel> const& xModel,
com::sun::star::uno::Reference<com::sun::star::container::XNameContainer> xDialogModel
)
diff --git a/basctl/source/dlged/dlgedfunc.cxx b/basctl/source/dlged/dlgedfunc.cxx
index 76c43de874b4..7beccb6ce29f 100644
--- a/basctl/source/dlged/dlgedfunc.cxx
+++ b/basctl/source/dlged/dlgedfunc.cxx
@@ -30,7 +30,7 @@ namespace basctl
IMPL_LINK_INLINE_START( DlgEdFunc, ScrollTimeout, Timer *, pTimer )
{
(void)pTimer;
- Window& rWindow = rParent.GetWindow();
+ vcl::Window& rWindow = rParent.GetWindow();
Point aPos = rWindow.ScreenToOutputPixel( rWindow.GetPointerPosPixel() );
aPos = rWindow.PixelToLogic( aPos );
ForceScroll( aPos );
@@ -42,7 +42,7 @@ void DlgEdFunc::ForceScroll( const Point& rPos )
{
aScrollTimer.Stop();
- Window& rWindow = rParent.GetWindow();
+ vcl::Window& rWindow = rParent.GetWindow();
static Point aDefPoint;
Rectangle aOutRect( aDefPoint, rWindow.GetOutputSizePixel() );
@@ -111,7 +111,7 @@ bool DlgEdFunc::KeyInput( const KeyEvent& rKEvt )
bool bReturn = false;
SdrView& rView = rParent.GetView();
- Window& rWindow = rParent.GetWindow();
+ vcl::Window& rWindow = rParent.GetWindow();
vcl::KeyCode aCode = rKEvt.GetKeyCode();
sal_uInt16 nCode = aCode.GetCode();
@@ -350,7 +350,7 @@ bool DlgEdFuncInsert::MouseButtonDown( const MouseEvent& rMEvt )
return true;
SdrView& rView = rParent.GetView();
- Window& rWindow = rParent.GetWindow();
+ vcl::Window& rWindow = rParent.GetWindow();
rView.SetActualWin(&rWindow);
Point aPos = rWindow.PixelToLogic( rMEvt.GetPosPixel() );
@@ -388,7 +388,7 @@ bool DlgEdFuncInsert::MouseButtonUp( const MouseEvent& rMEvt )
DlgEdFunc::MouseButtonUp( rMEvt );
SdrView& rView = rParent.GetView();
- Window& rWindow = rParent.GetWindow();
+ vcl::Window& rWindow = rParent.GetWindow();
rView.SetActualWin(&rWindow);
rWindow.ReleaseMouse();
@@ -418,7 +418,7 @@ bool DlgEdFuncInsert::MouseButtonUp( const MouseEvent& rMEvt )
bool DlgEdFuncInsert::MouseMove( const MouseEvent& rMEvt )
{
SdrView& rView = rParent.GetView();
- Window& rWindow = rParent.GetWindow();
+ vcl::Window& rWindow = rParent.GetWindow();
rView.SetActualWin(&rWindow);
Point aPos = rWindow.PixelToLogic(rMEvt.GetPosPixel());
@@ -449,7 +449,7 @@ bool DlgEdFuncSelect::MouseButtonDown( const MouseEvent& rMEvt )
{
// get view from parent
SdrView& rView = rParent.GetView();
- Window& rWindow = rParent.GetWindow();
+ vcl::Window& rWindow = rParent.GetWindow();
rView.SetActualWin(&rWindow);
sal_uInt16 nDrgLog = static_cast<sal_uInt16>(rWindow.PixelToLogic(Size(3, 0)).Width());
@@ -513,7 +513,7 @@ bool DlgEdFuncSelect::MouseButtonUp( const MouseEvent& rMEvt )
// get view from parent
SdrView& rView = rParent.GetView();
- Window& rWindow = rParent.GetWindow();
+ vcl::Window& rWindow = rParent.GetWindow();
rView.SetActualWin(&rWindow);
Point aPnt = rWindow.PixelToLogic(rMEvt.GetPosPixel());
@@ -544,7 +544,7 @@ bool DlgEdFuncSelect::MouseButtonUp( const MouseEvent& rMEvt )
bool DlgEdFuncSelect::MouseMove( const MouseEvent& rMEvt )
{
SdrView& rView = rParent.GetView();
- Window& rWindow = rParent.GetWindow();
+ vcl::Window& rWindow = rParent.GetWindow();
rView.SetActualWin(&rWindow);
Point aPnt = rWindow.PixelToLogic(rMEvt.GetPosPixel());
diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx
index c91c80029c11..4d52b5f1b5ad 100644
--- a/basctl/source/dlged/dlgedobj.cxx
+++ b/basctl/source/dlged/dlgedobj.cxx
@@ -1636,7 +1636,7 @@ awt::DeviceInfo DlgEdForm::getDeviceInfo() const
awt::DeviceInfo aDeviceInfo;
DlgEditor& rEditor = GetDlgEditor();
- Window& rWindow = rEditor.GetWindow();
+ vcl::Window& rWindow = rEditor.GetWindow();
// obtain an XControl
::utl::SharedUNOComponent< awt::XControl > xDialogControl; // ensures auto-disposal, if needed
diff --git a/basctl/source/dlged/dlgedview.cxx b/basctl/source/dlged/dlgedview.cxx
index c75fd1915a22..8f07c70edad7 100644
--- a/basctl/source/dlged/dlgedview.cxx
+++ b/basctl/source/dlged/dlgedview.cxx
@@ -55,7 +55,7 @@ void DlgEdView::MarkListHasChanged()
rDlgEditor.UpdatePropertyBrowserDelayed();
}
-void DlgEdView::MakeVisible( const Rectangle& rRect, Window& rWin )
+void DlgEdView::MakeVisible( const Rectangle& rRect, vcl::Window& rWin )
{
// visible area
MapMode aMap( rWin.GetMapMode() );
diff --git a/basctl/source/dlged/managelang.cxx b/basctl/source/dlged/managelang.cxx
index 5751fe4c24ba..55d1527fc0e7 100644
--- a/basctl/source/dlged/managelang.cxx
+++ b/basctl/source/dlged/managelang.cxx
@@ -55,7 +55,7 @@ bool localesAreEqual( const Locale& rLocaleLeft, const Locale& rLocaleRight )
return bRet;
}
-ManageLanguageDialog::ManageLanguageDialog(Window* pParent, boost::shared_ptr<LocalizationMgr> xLMgr)
+ManageLanguageDialog::ManageLanguageDialog(vcl::Window* pParent, boost::shared_ptr<LocalizationMgr> xLMgr)
: ModalDialog(pParent, "ManageLanguagesDialog", "modules/BasicIDE/ui/managelanguages.ui")
, m_xLocalizationMgr(xLMgr)
, m_sDefLangStr(IDE_RESSTR(RID_STR_DEF_LANG))
@@ -217,7 +217,7 @@ IMPL_LINK_NOARG(ManageLanguageDialog, SelectHdl)
// class SetDefaultLanguageDialog -----------------------------------------------
-SetDefaultLanguageDialog::SetDefaultLanguageDialog(Window* pParent, boost::shared_ptr<LocalizationMgr> xLMgr)
+SetDefaultLanguageDialog::SetDefaultLanguageDialog(vcl::Window* pParent, boost::shared_ptr<LocalizationMgr> xLMgr)
: ModalDialog(pParent, "DefaultLanguageDialog", "modules/BasicIDE/ui/defaultlanguage.ui")
, m_pCheckLangLB(NULL)
, m_xLocalizationMgr(xLMgr)
diff --git a/basctl/source/inc/accessibledialogcontrolshape.hxx b/basctl/source/inc/accessibledialogcontrolshape.hxx
index ecbc219a1266..bd0fa268c427 100644
--- a/basctl/source/inc/accessibledialogcontrolshape.hxx
+++ b/basctl/source/inc/accessibledialogcontrolshape.hxx
@@ -25,7 +25,7 @@
#include <comphelper/accessiblecomponenthelper.hxx>
#include <cppuhelper/implbase3.hxx>
-class Window;
+namespace vcl { class Window; }
class VCLExternalSolarLock;
namespace utl {
@@ -74,7 +74,7 @@ protected:
::com::sun::star::awt::Rectangle GetBounds();
void SetBounds( const ::com::sun::star::awt::Rectangle& aBounds );
- Window* GetWindow() const;
+ vcl::Window* GetWindow() const;
OUString GetModelStringProperty( const sal_Char* pPropertyName );
diff --git a/basctl/source/inc/baside3.hxx b/basctl/source/inc/baside3.hxx
index e5fb443c08ce..b73b9e571b6e 100644
--- a/basctl/source/inc/baside3.hxx
+++ b/basctl/source/inc/baside3.hxx
@@ -50,7 +50,7 @@ class DlgEdView;
class DialogWindowLayout;
class ObjectCatalog;
-bool implImportDialog( Window* pWin, const OUString& rCurPath, const ScriptDocument& rDocument, const OUString& aLibName );
+bool implImportDialog( vcl::Window* pWin, const OUString& rCurPath, const ScriptDocument& rDocument, const OUString& aLibName );
class DialogWindow: public BaseWindow
{
@@ -127,7 +127,7 @@ public:
class DialogWindowLayout : public Layout
{
public:
- DialogWindowLayout (Window* pParent, ObjectCatalog&);
+ DialogWindowLayout (vcl::Window* pParent, ObjectCatalog&);
virtual ~DialogWindowLayout();
public:
void ShowPropertyBrowser ();
diff --git a/basctl/source/inc/basidesh.hxx b/basctl/source/inc/basidesh.hxx
index 27011d27bc82..8ded0fcda3bd 100644
--- a/basctl/source/inc/basidesh.hxx
+++ b/basctl/source/inc/basidesh.hxx
@@ -62,7 +62,7 @@ public:
private:
friend class JavaDebuggingListenerImpl;
friend class LocalizationMgr;
- friend bool implImportDialog( Window* pWin, const OUString& rCurPath, const ScriptDocument& rDocument, const OUString& aLibName ); // defined in baside3.cxx
+ friend bool implImportDialog( vcl::Window* pWin, const OUString& rCurPath, const ScriptDocument& rDocument, const OUString& aLibName ); // defined in baside3.cxx
WindowTable aWindowTable;
sal_uInt16 nCurKey;
diff --git a/basctl/source/inc/basobj.hxx b/basctl/source/inc/basobj.hxx
index 0c6af6cf536a..ef996125840a 100644
--- a/basctl/source/inc/basobj.hxx
+++ b/basctl/source/inc/basobj.hxx
@@ -30,7 +30,7 @@ class StarBASIC;
class SfxUInt16Item;
class SfxBindings;
class SfxDispatcher;
-class Window;
+namespace vcl { class Window; }
namespace basctl
{
@@ -68,7 +68,7 @@ namespace basctl
Will show an error message when renaming fails because the new name is already used.
*/
bool RenameModule(
- Window* pErrorParent, const ScriptDocument& rDocument,
+ vcl::Window* pErrorParent, const ScriptDocument& rDocument,
const OUString& rLibName, const OUString& rOldName, const OUString& rNewName );
// new methods for macros
@@ -91,7 +91,7 @@ namespace basctl
Will show an error message when renaming fails because the new name is already used.
*/
bool RenameDialog(
- Window* pErrorParent, const ScriptDocument& rDocument, const OUString& rLibName, const OUString& rOldName, const OUString& rNewName )
+ vcl::Window* pErrorParent, const ScriptDocument& rDocument, const OUString& rLibName, const OUString& rOldName, const OUString& rNewName )
throw (css::container::ElementExistException, css::container::NoSuchElementException, css::uno::RuntimeException, std::exception);
bool RemoveDialog( const ScriptDocument& rDocument, const OUString& rLibName, const OUString& rDlgName );
diff --git a/basctl/source/inc/bastypes.hxx b/basctl/source/inc/bastypes.hxx
index 0d0db7e94072..7ccf51130579 100644
--- a/basctl/source/inc/bastypes.hxx
+++ b/basctl/source/inc/bastypes.hxx
@@ -78,7 +78,7 @@ struct BasicStatus
class DockingWindow : public ::DockingWindow
{
public:
- DockingWindow (Window* pParent);
+ DockingWindow (vcl::Window* pParent);
DockingWindow (Layout* pParent);
public:
void ResizeIfDocking (Point const&, Size const&);
@@ -126,7 +126,7 @@ protected:
virtual void EndRenaming() SAL_OVERRIDE;
public:
- TabBar (Window* pParent);
+ TabBar (vcl::Window* pParent);
void Sort();
};
@@ -145,7 +145,7 @@ class EntryDescriptor;
// BaseWindow -- the base of both ModulWindow and DialogWindow.
-class BaseWindow : public Window
+class BaseWindow : public vcl::Window
{
private:
ScrollBar* pShellHScrollBar;
@@ -166,7 +166,7 @@ protected:
public:
TYPEINFO();
- BaseWindow( Window* pParent, const ScriptDocument& rDocument, const OUString& aLibName, const OUString& aName );
+ BaseWindow( vcl::Window* pParent, const ScriptDocument& rDocument, const OUString& aLibName, const OUString& aName );
virtual ~BaseWindow();
void Init();
@@ -295,11 +295,11 @@ void CutLines( OUString& rStr, sal_Int32 nStartLine, sal_Int32 nLines
OUString CreateMgrAndLibStr( const OUString& rMgrName, const OUString& rLibName );
sal_uLong CalcLineCount( SvStream& rStream );
-bool QueryReplaceMacro( const OUString& rName, Window* pParent = 0 );
-bool QueryDelMacro( const OUString& rName, Window* pParent = 0 );
-bool QueryDelDialog( const OUString& rName, Window* pParent = 0 );
-bool QueryDelModule( const OUString& rName, Window* pParent = 0 );
-bool QueryDelLib( const OUString& rName, bool bRef = false, Window* pParent = 0 );
+bool QueryReplaceMacro( const OUString& rName, vcl::Window* pParent = 0 );
+bool QueryDelMacro( const OUString& rName, vcl::Window* pParent = 0 );
+bool QueryDelDialog( const OUString& rName, vcl::Window* pParent = 0 );
+bool QueryDelModule( const OUString& rName, vcl::Window* pParent = 0 );
+bool QueryDelLib( const OUString& rName, bool bRef = false, vcl::Window* pParent = 0 );
bool QueryPassword( const ::com::sun::star::uno::Reference< ::com::sun::star::script::XLibraryContainer >& xLibContainer, const OUString& rLibName, OUString& rPassword, bool bRepeat = false, bool bNewTitle = false );
class ModuleInfoHelper
diff --git a/basctl/source/inc/dlged.hxx b/basctl/source/inc/dlged.hxx
index c0e5c95ecc47..981bc08300d1 100644
--- a/basctl/source/inc/dlged.hxx
+++ b/basctl/source/inc/dlged.hxx
@@ -37,7 +37,7 @@ class Printer;
class KeyEvent;
class MouseEvent;
class Timer;
-class Window;
+namespace vcl { class Window; }
namespace basctl
{
@@ -118,7 +118,7 @@ private:
::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor > m_ClipboardDataFlavorsResource;
::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > m_xSupplier;
boost::scoped_ptr<DlgEdFactory> pObjFac; // never nullptr
- Window& rWindow; // DialogWindow
+ vcl::Window& rWindow; // DialogWindow
boost::scoped_ptr<DlgEdFunc> pFunc;
DialogWindowLayout& rLayout;
Mode eMode;
@@ -137,13 +137,13 @@ private:
public:
DlgEditor (
- Window&, DialogWindowLayout&,
+ vcl::Window&, DialogWindowLayout&,
com::sun::star::uno::Reference<com::sun::star::frame::XModel> const& xModel,
com::sun::star::uno::Reference<com::sun::star::container::XNameContainer> xDialogModel
);
virtual ~DlgEditor();
- Window& GetWindow() const { return rWindow; }
+ vcl::Window& GetWindow() const { return rWindow; }
/** returns the control container associated with our window
@see GetWindow
diff --git a/basctl/source/inc/dlgedview.hxx b/basctl/source/inc/dlgedview.hxx
index 9b094888ba7c..7ba534d24bac 100644
--- a/basctl/source/inc/dlgedview.hxx
+++ b/basctl/source/inc/dlgedview.hxx
@@ -44,7 +44,7 @@ public:
virtual ~DlgEdView();
virtual void MarkListHasChanged() SAL_OVERRIDE;
- virtual void MakeVisible( const Rectangle& rRect, Window& rWin ) SAL_OVERRIDE;
+ virtual void MakeVisible( const Rectangle& rRect, vcl::Window& rWin ) SAL_OVERRIDE;
protected:
// overloaded to handle HitTest for some objects special
diff --git a/basctl/source/inc/managelang.hxx b/basctl/source/inc/managelang.hxx
index de364c316c6a..1cc2db170bd2 100644
--- a/basctl/source/inc/managelang.hxx
+++ b/basctl/source/inc/managelang.hxx
@@ -73,7 +73,7 @@ private:
DECL_LINK(SelectHdl, void *);
public:
- ManageLanguageDialog( Window* pParent, boost::shared_ptr<LocalizationMgr> _pLMgr );
+ ManageLanguageDialog( vcl::Window* pParent, boost::shared_ptr<LocalizationMgr> _pLMgr );
virtual ~ManageLanguageDialog();
};
@@ -92,7 +92,7 @@ private:
void FillLanguageBox();
public:
- SetDefaultLanguageDialog(Window* pParent, boost::shared_ptr<LocalizationMgr> xLMgr);
+ SetDefaultLanguageDialog(vcl::Window* pParent, boost::shared_ptr<LocalizationMgr> xLMgr);
::com::sun::star::uno::Sequence< ::com::sun::star::lang::Locale > GetLocales() const;
};
diff --git a/basic/source/runtime/inputbox.cxx b/basic/source/runtime/inputbox.cxx
index b8e26962de97..884600d6ed2a 100644
--- a/basic/source/runtime/inputbox.cxx
+++ b/basic/source/runtime/inputbox.cxx
@@ -44,12 +44,12 @@ class SvRTLInputBox : public ModalDialog
DECL_LINK( CancelHdl, Button * );
public:
- SvRTLInputBox( Window* pParent, const OUString& rPrompt, const OUString& rTitle,
+ SvRTLInputBox( vcl::Window* pParent, const OUString& rPrompt, const OUString& rTitle,
const OUString& rDefault, long nXTwips = -1, long nYTwips = -1 );
OUString GetText() const SAL_OVERRIDE { return aText; }
};
-SvRTLInputBox::SvRTLInputBox( Window* pParent, const OUString& rPrompt,
+SvRTLInputBox::SvRTLInputBox( vcl::Window* pParent, const OUString& rPrompt,
const OUString& rTitle, const OUString& rDefault,
long nXTwips, long nYTwips ) :
ModalDialog( pParent,WB_3DLOOK | WB_MOVEABLE | WB_CLOSEABLE ),
diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx
index 865f01908761..4465743a6581 100644
--- a/basic/source/runtime/iosys.cxx
+++ b/basic/source/runtime/iosys.cxx
@@ -70,14 +70,14 @@ class SbiInputDialog : public ModalDialog {
OKButton aOk;
CancelButton aCancel;
OUString aText;
- DECL_LINK( Ok, Window * );
- DECL_LINK( Cancel, Window * );
+ DECL_LINK( Ok, vcl::Window * );
+ DECL_LINK( Cancel, vcl::Window * );
public:
- SbiInputDialog( Window*, const OUString& );
+ SbiInputDialog( vcl::Window*, const OUString& );
const OUString& GetInput() { return aText; }
};
-SbiInputDialog::SbiInputDialog( Window* pParent, const OUString& rPrompt )
+SbiInputDialog::SbiInputDialog( vcl::Window* pParent, const OUString& rPrompt )
:ModalDialog( pParent, WB_3DLOOK | WB_MOVEABLE | WB_CLOSEABLE ),
aInput( this, WB_3DLOOK | WB_LEFT | WB_BORDER ),
aOk( this ), aCancel( this )
@@ -105,7 +105,7 @@ SbiInputDialog::SbiInputDialog( Window* pParent, const OUString& rPrompt )
aCancel.Show();
}
-IMPL_LINK_INLINE_START( SbiInputDialog, Ok, Window *, pWindow )
+IMPL_LINK_INLINE_START( SbiInputDialog, Ok, vcl::Window *, pWindow )
{
(void)pWindow;
@@ -113,16 +113,16 @@ IMPL_LINK_INLINE_START( SbiInputDialog, Ok, Window *, pWindow )
EndDialog( 1 );
return 0;
}
-IMPL_LINK_INLINE_END( SbiInputDialog, Ok, Window *, pWindow )
+IMPL_LINK_INLINE_END( SbiInputDialog, Ok, vcl::Window *, pWindow )
-IMPL_LINK_INLINE_START( SbiInputDialog, Cancel, Window *, pWindow )
+IMPL_LINK_INLINE_START( SbiInputDialog, Cancel, vcl::Window *, pWindow )
{
(void)pWindow;
EndDialog( 0 );
return 0;
}
-IMPL_LINK_INLINE_END( SbiInputDialog, Cancel, Window *, pWindow )
+IMPL_LINK_INLINE_END( SbiInputDialog, Cancel, vcl::Window *, pWindow )
SbiStream::SbiStream()
@@ -851,7 +851,7 @@ void SbiIoSystem::Shutdown()
if( !aOut.isEmpty() )
{
#if defined __GNUC__
- Window* pParent = Application::GetDefDialogParent();
+ vcl::Window* pParent = Application::GetDefDialogParent();
MessBox( pParent, WinBits( WB_OK ), OUString(), aOut ).Execute();
#else
MessBox( GetpApp()->GetDefDialogParent(), WinBits( WB_OK ), OUString(), aOut ).Execute();
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index d6fcad2d509a..0d8ff6426158 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -4601,7 +4601,7 @@ RTLFUNC(MsgBox)
SolarMutexGuard aSolarGuard;
- Window* pParent = Application::GetDefDialogParent();
+ vcl::Window* pParent = Application::GetDefDialogParent();
switch( nType )
{
case 16:
diff --git a/canvas/source/cairo/cairo_cairo.cxx b/canvas/source/cairo/cairo_cairo.cxx
index 290235a6d25f..cb5eeb951d72 100644
--- a/canvas/source/cairo/cairo_cairo.cxx
+++ b/canvas/source/cairo/cairo_cairo.cxx
@@ -30,7 +30,7 @@ namespace cairo
* Surface classes), see platform specific cairo_<platform>_cairo.cxx *
****************************************************************************************/
- const SystemEnvData* GetSysData(const Window *pOutputWindow)
+ const SystemEnvData* GetSysData(const vcl::Window *pOutputWindow)
{
const SystemEnvData* pSysData = NULL;
// check whether we're a SysChild: have to fetch system data
diff --git a/canvas/source/cairo/cairo_cairo.hxx b/canvas/source/cairo/cairo_cairo.hxx
index b971988333d1..10c92038f5dd 100644
--- a/canvas/source/cairo/cairo_cairo.hxx
+++ b/canvas/source/cairo/cairo_cairo.hxx
@@ -28,7 +28,7 @@ struct BitmapSystemData;
struct SystemGraphicsData;
class VirtualDevice;
class OutputDevice;
-class Window;
+namespace vcl { class Window; }
class Size;
#include <cairo.h>
@@ -43,7 +43,7 @@ namespace cairo {
typedef boost::shared_ptr<cairo_surface_t> CairoSurfaceSharedPtr;
typedef boost::shared_ptr<Cairo> CairoSharedPtr;
- const SystemEnvData* GetSysData(const Window *pOutputWindow);
+ const SystemEnvData* GetSysData(const vcl::Window *pOutputWindow);
/** Cairo surface interface
diff --git a/canvas/source/cairo/cairo_quartz_cairo.cxx b/canvas/source/cairo/cairo_quartz_cairo.cxx
index 07951eeba94c..390402a9bde5 100644
--- a/canvas/source/cairo/cairo_quartz_cairo.cxx
+++ b/canvas/source/cairo/cairo_quartz_cairo.cxx
@@ -301,7 +301,7 @@ namespace cairo
if( rRefDevice.GetOutDevType() == OUTDEV_WINDOW )
{
- const Window &rWindow = (const Window &) rRefDevice;
+ const vcl::Window &rWindow = (const vcl::Window &) rRefDevice;
const SystemEnvData* pSysData = GetSysData(&rWindow);
if (pSysData)
surf = SurfaceSharedPtr(new QuartzSurface(pSysData->pView, x, y, width, height));
diff --git a/canvas/source/cairo/cairo_spritecanvas.cxx b/canvas/source/cairo/cairo_spritecanvas.cxx
index 78f2450a9029..782d0433aebb 100644
--- a/canvas/source/cairo/cairo_spritecanvas.cxx
+++ b/canvas/source/cairo/cairo_spritecanvas.cxx
@@ -80,7 +80,7 @@ namespace cairocanvas
uno::Reference< awt::XWindow > xParentWindow;
maArguments[4] >>= xParentWindow;
- Window* pParentWindow = VCLUnoHelper::GetWindow(xParentWindow);
+ vcl::Window* pParentWindow = VCLUnoHelper::GetWindow(xParentWindow);
if( !pParentWindow )
throw lang::NoSupportException(
"Parent window not VCL window, or canvas out-of-process!", NULL);
diff --git a/canvas/source/cairo/cairo_spritedevicehelper.cxx b/canvas/source/cairo/cairo_spritedevicehelper.cxx
index 8288186c2f17..ceba72a0ac4b 100644
--- a/canvas/source/cairo/cairo_spritedevicehelper.cxx
+++ b/canvas/source/cairo/cairo_spritedevicehelper.cxx
@@ -51,7 +51,7 @@ namespace cairocanvas
mbFullScreen( false )
{}
- void SpriteDeviceHelper::init( Window& rOutputWindow,
+ void SpriteDeviceHelper::init( vcl::Window& rOutputWindow,
SpriteCanvas& rSpriteCanvas,
const ::basegfx::B2ISize& rSize,
bool bFullscreen )
diff --git a/canvas/source/cairo/cairo_spritedevicehelper.hxx b/canvas/source/cairo/cairo_spritedevicehelper.hxx
index b359de0b76b2..a8be2b676b9b 100644
--- a/canvas/source/cairo/cairo_spritedevicehelper.hxx
+++ b/canvas/source/cairo/cairo_spritedevicehelper.hxx
@@ -43,7 +43,7 @@ namespace cairocanvas
public:
SpriteDeviceHelper();
- void init( Window& rOutputWindow,
+ void init( vcl::Window& rOutputWindow,
SpriteCanvas& rSpriteCanvas,
const ::basegfx::B2ISize& rSize,
bool bFullscreen );
diff --git a/canvas/source/cairo/cairo_win32_cairo.cxx b/canvas/source/cairo/cairo_win32_cairo.cxx
index a70add9500a2..8d4a4d2ff680 100644
--- a/canvas/source/cairo/cairo_win32_cairo.cxx
+++ b/canvas/source/cairo/cairo_win32_cairo.cxx
@@ -231,7 +231,7 @@ namespace cairo
if( rRefDevice.GetOutDevType() == OUTDEV_WINDOW )
{
- const Window &rWindow = (const Window &) rRefDevice;
+ const vcl::Window &rWindow = (const vcl::Window &) rRefDevice;
const SystemEnvData* pSysData = GetSysData(&rWindow);
if (pSysData && pSysData->hWnd)
surf = SurfaceSharedPtr(new Win32Surface(GetDC((HWND) pSysData->hWnd), x, y));
diff --git a/canvas/source/cairo/cairo_xlib_cairo.cxx b/canvas/source/cairo/cairo_xlib_cairo.cxx
index 9b49c7e88cbc..8f496a45f39d 100644
--- a/canvas/source/cairo/cairo_xlib_cairo.cxx
+++ b/canvas/source/cairo/cairo_xlib_cairo.cxx
@@ -318,7 +318,7 @@ namespace cairo
return SurfaceSharedPtr(new X11Surface(rSurface));
}
- static X11SysData getSysData( const Window& rWindow )
+ static X11SysData getSysData( const vcl::Window& rWindow )
{
const SystemEnvData* pSysData = GetSysData(&rWindow);
@@ -337,7 +337,7 @@ namespace cairo
int x, int y, int width, int height )
{
if( rRefDevice.GetOutDevType() == OUTDEV_WINDOW )
- return SurfaceSharedPtr(new X11Surface(getSysData((const Window&)rRefDevice),
+ return SurfaceSharedPtr(new X11Surface(getSysData((const vcl::Window&)rRefDevice),
x,y,width,height));
else if( rRefDevice.GetOutDevType() == OUTDEV_VIRDEV )
return SurfaceSharedPtr(new X11Surface(getSysData((const VirtualDevice&)rRefDevice),
@@ -355,7 +355,7 @@ namespace cairo
if ( rData.mnWidth == rSize.Width() && rData.mnHeight == rSize.Height() )
{
if( rRefDevice.GetOutDevType() == OUTDEV_WINDOW )
- return SurfaceSharedPtr(new X11Surface(getSysData((const Window&)rRefDevice), rData ));
+ return SurfaceSharedPtr(new X11Surface(getSysData((const vcl::Window&)rRefDevice), rData ));
else if( rRefDevice.GetOutDevType() == OUTDEV_VIRDEV )
return SurfaceSharedPtr(new X11Surface(getSysData((const VirtualDevice&)rRefDevice), rData ));
}
diff --git a/canvas/source/directx/dx_9rm.cxx b/canvas/source/directx/dx_9rm.cxx
index e34233849fcc..cc48395d8b23 100644
--- a/canvas/source/directx/dx_9rm.cxx
+++ b/canvas/source/directx/dx_9rm.cxx
@@ -181,7 +181,7 @@ namespace dxcanvas
class DXRenderModule : public IDXRenderModule
{
public:
- explicit DXRenderModule( const ::Window& rWindow );
+ explicit DXRenderModule( const vcl::Window& rWindow );
~DXRenderModule();
virtual void lock() const { maMutex.acquire(); }
@@ -211,7 +211,7 @@ namespace dxcanvas
private:
- bool create( const ::Window& rWindow );
+ bool create( const vcl::Window& rWindow );
bool createDevice();
bool verifyDevice( const UINT nAdapter );
UINT getAdapterFromWindow();
@@ -563,7 +563,7 @@ namespace dxcanvas
// DXRenderModule::DXRenderModule
- DXRenderModule::DXRenderModule( const ::Window& rWindow ) :
+ DXRenderModule::DXRenderModule( const vcl::Window& rWindow ) :
mhWnd(0),
mpDevice(),
mpDirect3D9(),
@@ -660,7 +660,7 @@ namespace dxcanvas
// DXRenderModule::create
- bool DXRenderModule::create( const ::Window& rWindow )
+ bool DXRenderModule::create( const vcl::Window& rWindow )
{
// TODO(P2): get rid of those fine-grained locking
::osl::MutexGuard aGuard( maMutex );
@@ -669,7 +669,7 @@ namespace dxcanvas
mpWindow.reset(
new SystemChildWindow(
- const_cast<Window *>(&rWindow), 0) );
+ const_cast<vcl::Window *>(&rWindow), 0) );
// system child window must not receive mouse events
mpWindow->SetMouseTransparent( TRUE );
@@ -1336,7 +1336,7 @@ namespace dxcanvas
// createRenderModule
- IDXRenderModuleSharedPtr createRenderModule( const ::Window& rParent )
+ IDXRenderModuleSharedPtr createRenderModule( const vcl::Window& rParent )
{
return IDXRenderModuleSharedPtr( new DXRenderModule(rParent) );
}
diff --git a/canvas/source/directx/dx_rendermodule.hxx b/canvas/source/directx/dx_rendermodule.hxx
index f15d3d3bd01e..6a61a64b09dc 100644
--- a/canvas/source/directx/dx_rendermodule.hxx
+++ b/canvas/source/directx/dx_rendermodule.hxx
@@ -26,7 +26,7 @@
#include <boost/shared_ptr.hpp>
#include "dx_winstuff.hxx"
-class Window;
+namespace vcl { class Window; }
namespace basegfx
{
class B2IRange;
@@ -75,7 +75,7 @@ namespace dxcanvas
/** Factory method, to create an IRenderModule instance for the
given VCL window instance
*/
- IDXRenderModuleSharedPtr createRenderModule( const ::Window& rParent );
+ IDXRenderModuleSharedPtr createRenderModule( const vcl::Window& rParent );
}
#endif
diff --git a/canvas/source/directx/dx_spritecanvas.cxx b/canvas/source/directx/dx_spritecanvas.cxx
index 3d36b2033962..6b72848b647d 100644
--- a/canvas/source/directx/dx_spritecanvas.cxx
+++ b/canvas/source/directx/dx_spritecanvas.cxx
@@ -88,7 +88,7 @@ namespace dxcanvas
uno::Reference< awt::XWindow > xParentWindow;
maArguments[4] >>= xParentWindow;
- Window* pParentWindow = VCLUnoHelper::GetWindow(xParentWindow);
+ vcl::Window* pParentWindow = VCLUnoHelper::GetWindow(xParentWindow);
if( !pParentWindow )
throw lang::NoSupportException( "Parent window not VCL window, or canvas out-of-process!" );
diff --git a/canvas/source/directx/dx_spritedevicehelper.cxx b/canvas/source/directx/dx_spritedevicehelper.cxx
index 76cf78efceb0..feede348af1c 100644
--- a/canvas/source/directx/dx_spritedevicehelper.cxx
+++ b/canvas/source/directx/dx_spritedevicehelper.cxx
@@ -51,7 +51,7 @@ namespace dxcanvas
{
}
- void SpriteDeviceHelper::init( Window& rWindow,
+ void SpriteDeviceHelper::init( vcl::Window& rWindow,
SpriteCanvas& rSpriteCanvas,
const awt::Rectangle& rRect,
bool /*bFullscreen*/ )
diff --git a/canvas/source/directx/dx_spritedevicehelper.hxx b/canvas/source/directx/dx_spritedevicehelper.hxx
index 81a8bb4ee263..bd6ec175b96b 100644
--- a/canvas/source/directx/dx_spritedevicehelper.hxx
+++ b/canvas/source/directx/dx_spritedevicehelper.hxx
@@ -42,7 +42,7 @@ namespace dxcanvas
public:
SpriteDeviceHelper();
- void init( Window& rWindow,
+ void init( vcl::Window& rWindow,
SpriteCanvas& rSpriteCanvas,
const ::com::sun::star::awt::Rectangle& rRect,
bool bFullscreen );
diff --git a/canvas/source/opengl/ogl_spritecanvas.cxx b/canvas/source/opengl/ogl_spritecanvas.cxx
index a7e255fa8dda..c378baeae21e 100644
--- a/canvas/source/opengl/ogl_spritecanvas.cxx
+++ b/canvas/source/opengl/ogl_spritecanvas.cxx
@@ -64,7 +64,7 @@ namespace oglcanvas
uno::Reference< awt::XWindow > xParentWindow;
maArguments[4] >>= xParentWindow;
- Window* pParentWindow = VCLUnoHelper::GetWindow(xParentWindow);
+ vcl::Window* pParentWindow = VCLUnoHelper::GetWindow(xParentWindow);
if( !pParentWindow )
throw lang::NoSupportException(
"Parent window not VCL window, or canvas out-of-process!", NULL);
diff --git a/canvas/source/opengl/ogl_spritedevicehelper.cxx b/canvas/source/opengl/ogl_spritedevicehelper.cxx
index 58a59ea1fe1c..5b712b841692 100644
--- a/canvas/source/opengl/ogl_spritedevicehelper.cxx
+++ b/canvas/source/opengl/ogl_spritedevicehelper.cxx
@@ -93,7 +93,7 @@ namespace oglcanvas
SpriteDeviceHelper::~SpriteDeviceHelper()
{}
- void SpriteDeviceHelper::init( Window& rWindow,
+ void SpriteDeviceHelper::init( vcl::Window& rWindow,
SpriteCanvas& rSpriteCanvas,
const awt::Rectangle& rViewArea )
{
diff --git a/canvas/source/opengl/ogl_spritedevicehelper.hxx b/canvas/source/opengl/ogl_spritedevicehelper.hxx
index bb4a976985a1..4eb3c4b0e94c 100644
--- a/canvas/source/opengl/ogl_spritedevicehelper.hxx
+++ b/canvas/source/opengl/ogl_spritedevicehelper.hxx
@@ -22,7 +22,7 @@
#include <set>
-class Window;
+namespace vcl { class Window; }
class SystemChildWindow;
namespace basegfx{ class B2IVector; class B2DHomMatrix; }
namespace com { namespace sun { namespace star {
@@ -43,7 +43,7 @@ namespace oglcanvas
SpriteDeviceHelper();
~SpriteDeviceHelper();
- void init( Window& rWindow,
+ void init( vcl::Window& rWindow,
SpriteCanvas& rSpriteCanvas,
const ::com::sun::star::awt::Rectangle& rViewArea );
diff --git a/canvas/source/tools/canvastools.cxx b/canvas/source/tools/canvastools.cxx
index e06d0170f9df..3feb2351eddd 100644
--- a/canvas/source/tools/canvastools.cxx
+++ b/canvas/source/tools/canvastools.cxx
@@ -1183,7 +1183,7 @@ namespace canvas
{
awt::Rectangle aRetVal( rRect );
- ::Window* pWindow = VCLUnoHelper::GetWindow(xWin);
+ vcl::Window* pWindow = VCLUnoHelper::GetWindow(xWin);
if( pWindow )
{
::Point aPoint( aRetVal.X,
diff --git a/canvas/source/vcl/canvashelper.cxx b/canvas/source/vcl/canvashelper.cxx
index d14ec6bed060..116b4ac116c0 100644
--- a/canvas/source/vcl/canvashelper.cxx
+++ b/canvas/source/vcl/canvashelper.cxx
@@ -1436,14 +1436,14 @@ namespace vclcanvas
{
// TODO(Q3): Evil downcast. And what's more, Window::Flush is
// not even const. Wah.
- static_cast<Window&>(mpOutDev->getOutDev()).Flush();
+ static_cast<vcl::Window&>(mpOutDev->getOutDev()).Flush();
}
if( mp2ndOutDev && mp2ndOutDev->getOutDev().GetOutDevType() == OUTDEV_WINDOW )
{
// TODO(Q3): Evil downcast. And what's more, Window::Flush is
// not even const. Wah.
- static_cast<Window&>(mp2ndOutDev->getOutDev()).Flush();
+ static_cast<vcl::Window&>(mp2ndOutDev->getOutDev()).Flush();
}
}
diff --git a/canvas/source/vcl/spritecanvashelper.cxx b/canvas/source/vcl/spritecanvashelper.cxx
index 58dfa55d3bb3..08c532cc8421 100644
--- a/canvas/source/vcl/spritecanvashelper.cxx
+++ b/canvas/source/vcl/spritecanvashelper.cxx
@@ -266,10 +266,10 @@ namespace vclcanvas
const Size aOutDevSize( rBackOutDev.GetOutputSizePixel() );
const Point aEmptyPoint(0,0);
- Window* pTargetWindow = NULL;
+ vcl::Window* pTargetWindow = NULL;
if( rOutDev.GetOutDevType() == OUTDEV_WINDOW )
{
- pTargetWindow = &static_cast<Window&>(rOutDev); // TODO(Q3): Evil downcast.
+ pTargetWindow = &static_cast<vcl::Window&>(rOutDev); // TODO(Q3): Evil downcast.
// we're double-buffered, thus no need for paint area-limiting
// clips. besides that, will interfere with animations (as for
diff --git a/canvas/source/vcl/windowoutdevholder.cxx b/canvas/source/vcl/windowoutdevholder.cxx
index 92f4e0ebf0eb..398ae72e829b 100644
--- a/canvas/source/vcl/windowoutdevholder.cxx
+++ b/canvas/source/vcl/windowoutdevholder.cxx
@@ -29,9 +29,9 @@ namespace vclcanvas
{
namespace
{
- Window& windowFromXWin( const uno::Reference<awt::XWindow>& xWin )
+ vcl::Window& windowFromXWin( const uno::Reference<awt::XWindow>& xWin )
{
- Window* pWindow = VCLUnoHelper::GetWindow(xWin);
+ vcl::Window* pWindow = VCLUnoHelper::GetWindow(xWin);
if( !pWindow )
throw lang::NoSupportException(
"Parent window not VCL window, or canvas out-of-process!",
diff --git a/canvas/source/vcl/windowoutdevholder.hxx b/canvas/source/vcl/windowoutdevholder.hxx
index 8ac11e7fb243..1d652d1d81d2 100644
--- a/canvas/source/vcl/windowoutdevholder.hxx
+++ b/canvas/source/vcl/windowoutdevholder.hxx
@@ -51,7 +51,7 @@ namespace vclcanvas
// vcl/source/window/window.cxx is broken, that disposes the
// canvas during window deletion, we're riding a dead horse
// here
- Window& mrOutputWindow;
+ vcl::Window& mrOutputWindow;
};
}
diff --git a/canvas/workben/canvasdemo.cxx b/canvas/workben/canvasdemo.cxx
index 2d5fa092c8c5..ac8869abdb7d 100644
--- a/canvas/workben/canvasdemo.cxx
+++ b/canvas/workben/canvasdemo.cxx
@@ -76,7 +76,7 @@ static void PrintHelp()
class TestWindow : public Dialog
{
public:
- TestWindow() : Dialog( (Window *) NULL )
+ TestWindow() : Dialog( (vcl::Window *) NULL )
{
SetText( OUString( "Canvas test" ) );
SetSizePixel( Size( 600, 450 ) );
diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx b/chart2/source/controller/accessibility/AccessibleBase.cxx
index 95992f425c5c..c03c0b16ad92 100644
--- a/chart2/source/controller/accessibility/AccessibleBase.cxx
+++ b/chart2/source/controller/accessibility/AccessibleBase.cxx
@@ -697,7 +697,7 @@ awt::Rectangle SAL_CALL AccessibleBase::getBounds()
ExplicitValueProvider::getExplicitValueProvider( m_aAccInfo.m_xView ));
if( pExplicitValueProvider )
{
- Window* pWindow( VCLUnoHelper::GetWindow( m_aAccInfo.m_xWindow ));
+ vcl::Window* pWindow( VCLUnoHelper::GetWindow( m_aAccInfo.m_xWindow ));
awt::Rectangle aLogicRect( pExplicitValueProvider->getRectangleOfObject( m_aAccInfo.m_aOID.getObjectCID() ));
if( pWindow )
{
diff --git a/chart2/source/controller/accessibility/AccessibleChartView.cxx b/chart2/source/controller/accessibility/AccessibleChartView.cxx
index 83bec76014c8..4b742f17a54c 100644
--- a/chart2/source/controller/accessibility/AccessibleChartView.cxx
+++ b/chart2/source/controller/accessibility/AccessibleChartView.cxx
@@ -76,7 +76,7 @@ awt::Rectangle AccessibleChartView::GetWindowPosSize() const
awt::Rectangle aBBox( xWindow->getPosSize() );
- Window* pWindow( VCLUnoHelper::GetWindow( GetInfo().m_xWindow ));
+ vcl::Window* pWindow( VCLUnoHelper::GetWindow( GetInfo().m_xWindow ));
if( pWindow )
{
SolarMutexGuard aSolarGuard;
@@ -324,7 +324,7 @@ void SAL_CALL AccessibleChartView::initialize( const Sequence< Any >& rArguments
aAccInfo.m_pParent = 0;
aAccInfo.m_spObjectHierarchy = m_spObjectHierarchy;
aAccInfo.m_pSdrView = m_pSdrView;
- Window* pWindow = VCLUnoHelper::GetWindow( m_xWindow );
+ vcl::Window* pWindow = VCLUnoHelper::GetWindow( m_xWindow );
if ( m_pViewForwarder )
{
delete m_pViewForwarder;
diff --git a/chart2/source/controller/accessibility/AccessibleTextHelper.cxx b/chart2/source/controller/accessibility/AccessibleTextHelper.cxx
index 6fcf15d9dacc..9c3f3c15dbbf 100644
--- a/chart2/source/controller/accessibility/AccessibleTextHelper.cxx
+++ b/chart2/source/controller/accessibility/AccessibleTextHelper.cxx
@@ -78,7 +78,7 @@ void SAL_CALL AccessibleTextHelper::initialize( const Sequence< uno::Any >& aArg
if( m_pTextHelper )
delete m_pTextHelper;
- Window* pWindow( VCLUnoHelper::GetWindow( xWindow ));
+ vcl::Window* pWindow( VCLUnoHelper::GetWindow( xWindow ));
if( pWindow )
{
SdrView * pView = m_pDrawViewWrapper;
diff --git a/chart2/source/controller/accessibility/AccessibleViewForwarder.cxx b/chart2/source/controller/accessibility/AccessibleViewForwarder.cxx
index ff0b68354b4a..28fe99fa7b73 100644
--- a/chart2/source/controller/accessibility/AccessibleViewForwarder.cxx
+++ b/chart2/source/controller/accessibility/AccessibleViewForwarder.cxx
@@ -27,7 +27,7 @@ using namespace ::com::sun::star;
namespace chart
{
-AccessibleViewForwarder::AccessibleViewForwarder( AccessibleChartView* pAccChartView, Window* pWindow )
+AccessibleViewForwarder::AccessibleViewForwarder( AccessibleChartView* pAccChartView, vcl::Window* pWindow )
:m_pAccChartView( pAccChartView )
,m_pWindow( pWindow )
,m_aMapMode( MAP_100TH_MM )
diff --git a/chart2/source/controller/accessibility/AccessibleViewForwarder.hxx b/chart2/source/controller/accessibility/AccessibleViewForwarder.hxx
index 715fa61d51f0..577a02970763 100644
--- a/chart2/source/controller/accessibility/AccessibleViewForwarder.hxx
+++ b/chart2/source/controller/accessibility/AccessibleViewForwarder.hxx
@@ -22,7 +22,7 @@
#include <vcl/mapmod.hxx>
#include <svx/IAccessibleViewForwarder.hxx>
-class Window;
+namespace vcl { class Window; }
namespace chart
{
@@ -32,7 +32,7 @@ class AccessibleChartView;
class AccessibleViewForwarder : public ::accessibility::IAccessibleViewForwarder
{
public:
- AccessibleViewForwarder( AccessibleChartView* pAccChartView, Window* pWindow );
+ AccessibleViewForwarder( AccessibleChartView* pAccChartView, vcl::Window* pWindow );
virtual ~AccessibleViewForwarder();
// ________ IAccessibleViewforwarder ________
@@ -48,7 +48,7 @@ private:
AccessibleViewForwarder& operator=( AccessibleViewForwarder& );
AccessibleChartView* m_pAccChartView;
- Window* m_pWindow;
+ vcl::Window* m_pWindow;
MapMode m_aMapMode;
};
diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx
index 5d6f1dd6db63..a58043df97c0 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -101,7 +101,7 @@ namespace impl
class SeriesHeaderEdit : public Edit
{
public:
- SeriesHeaderEdit( Window * pParent );
+ SeriesHeaderEdit( vcl::Window * pParent );
virtual ~SeriesHeaderEdit();
virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
@@ -114,7 +114,7 @@ private:
bool m_bShowWarningBox;
};
-SeriesHeaderEdit::SeriesHeaderEdit( Window * pParent ) :
+SeriesHeaderEdit::SeriesHeaderEdit( vcl::Window * pParent ) :
Edit( pParent ),
m_nStartColumn( 0 ),
m_bShowWarningBox( false )
@@ -147,7 +147,7 @@ void SeriesHeaderEdit::MouseButtonDown( const MouseEvent& rMEvt )
class SeriesHeader
{
public:
- explicit SeriesHeader(Window * pParent, Window *pColorParent);
+ explicit SeriesHeader(vcl::Window * pParent, vcl::Window *pColorParent);
void SetColor( const Color & rCol );
void SetPos( const Point & rPos );
@@ -200,7 +200,7 @@ private:
bool m_bSeriesNameChangePending;
};
-SeriesHeader::SeriesHeader( Window * pParent, Window *pColorParent ) :
+SeriesHeader::SeriesHeader( vcl::Window * pParent, vcl::Window *pColorParent ) :
m_spSymbol( new FixedImage( pParent, WB_NOBORDER )),
m_spSeriesName( new SeriesHeaderEdit( pParent )),
m_spColorBar( new FixedText( pColorParent, WB_NOBORDER )),
@@ -455,7 +455,7 @@ sal_Int32 lcl_getColumnInDataOrHeader(
} // anonymous namespace
-DataBrowser::DataBrowser( Window* pParent, WinBits nStyle, bool bLiveUpdate ) :
+DataBrowser::DataBrowser( vcl::Window* pParent, WinBits nStyle, bool bLiveUpdate ) :
::svt::EditBrowseBox( pParent, nStyle, EBBF_SMART_TAB_TRAVEL | EBBF_HANDLE_COLUMN_TEXT, BROWSER_STANDARD_FLAGS ),
m_nSeekRow( 0 ),
m_bIsReadOnly( false ),
@@ -580,8 +580,8 @@ void DataBrowser::RenewTable()
GoToColumnId( ::std::min( nOldColId, static_cast< sal_uInt16 >( ColCount() - 1 )));
Dialog* pDialog = GetParentDialog();
- Window* pWin = pDialog->get<VclContainer>("columns");
- Window* pColorWin = pDialog->get<VclContainer>("colorcolumns");
+ vcl::Window* pWin = pDialog->get<VclContainer>("columns");
+ vcl::Window* pColorWin = pDialog->get<VclContainer>("colorcolumns");
// fill series headers
clearHeaders();
@@ -1216,8 +1216,8 @@ void DataBrowser::EndScroll()
void DataBrowser::RenewSeriesHeaders()
{
Dialog* pDialog = GetParentDialog();
- Window* pWin = pDialog->get<VclContainer>("columns");
- Window* pColorWin = pDialog->get<VclContainer>("colorcolumns");
+ vcl::Window* pWin = pDialog->get<VclContainer>("columns");
+ vcl::Window* pColorWin = pDialog->get<VclContainer>("colorcolumns");
clearHeaders();
DataBrowserModel::tDataHeaderVector aHeaders( m_apDataBrowserModel->getDataHeaders());
@@ -1260,8 +1260,8 @@ void DataBrowser::ImplAdjustHeaderControls()
nCurrentPos += this->GetColumnWidth( 0 );
Dialog* pDialog = GetParentDialog();
- Window* pWin = pDialog->get<VclContainer>("columns");
- Window* pColorWin = pDialog->get<VclContainer>("colorcolumns");
+ vcl::Window* pWin = pDialog->get<VclContainer>("columns");
+ vcl::Window* pColorWin = pDialog->get<VclContainer>("colorcolumns");
pWin->set_margin_left(nCurrentPos);
pColorWin->set_margin_left(nCurrentPos);
diff --git a/chart2/source/controller/dialogs/DataBrowser.hxx b/chart2/source/controller/dialogs/DataBrowser.hxx
index 3d908aa4517c..f4c82b3dd012 100644
--- a/chart2/source/controller/dialogs/DataBrowser.hxx
+++ b/chart2/source/controller/dialogs/DataBrowser.hxx
@@ -67,7 +67,7 @@ protected:
void SetDirty();
public:
- DataBrowser( Window* pParent, WinBits nStyle, bool bLiveUpdate );
+ DataBrowser( vcl::Window* pParent, WinBits nStyle, bool bLiveUpdate );
virtual ~DataBrowser();
/** GetCellText returns the text at the given position
diff --git a/chart2/source/controller/dialogs/TextDirectionListBox.cxx b/chart2/source/controller/dialogs/TextDirectionListBox.cxx
index 46149a6befc5..85c1def2c08d 100644
--- a/chart2/source/controller/dialogs/TextDirectionListBox.cxx
+++ b/chart2/source/controller/dialogs/TextDirectionListBox.cxx
@@ -27,7 +27,7 @@
namespace chart
{
-TextDirectionListBox::TextDirectionListBox( Window* pParent, Window* pWindow1, Window* pWindow2 ) :
+TextDirectionListBox::TextDirectionListBox( vcl::Window* pParent, vcl::Window* pWindow1, vcl::Window* pWindow2 ) :
svx::FrameDirectionListBox( pParent, WB_BORDER | WB_TABSTOP | WB_DROPDOWN)
{
InsertEntryValue( SCH_RESSTR( STR_TEXT_DIRECTION_LTR ), FRMDIR_HORI_LEFT_TOP );
@@ -42,7 +42,7 @@ TextDirectionListBox::TextDirectionListBox( Window* pParent, Window* pWindow1, W
}
}
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeTextDirectionListBox(Window *pParent, VclBuilder::stringmap &)
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeTextDirectionListBox(vcl::Window *pParent, VclBuilder::stringmap &)
{
return new TextDirectionListBox(pParent);
}
diff --git a/chart2/source/controller/dialogs/dlg_ChartType.cxx b/chart2/source/controller/dialogs/dlg_ChartType.cxx
index 4acb3382866e..30d03d140def 100644
--- a/chart2/source/controller/dialogs/dlg_ChartType.cxx
+++ b/chart2/source/controller/dialogs/dlg_ChartType.cxx
@@ -33,7 +33,7 @@ namespace chart
using namespace ::com::sun::star;
using namespace ::com::sun::star::chart2;
-ChartTypeDialog::ChartTypeDialog( Window* pParent
+ChartTypeDialog::ChartTypeDialog( vcl::Window* pParent
, const uno::Reference< frame::XModel >& xChartModel
, const uno::Reference< uno::XComponentContext >& xContext )
: ModalDialog( pParent, "ChartTypeDialog",
diff --git a/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx b/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx
index 3ca294af9a3b..9cd0f7c863f1 100644
--- a/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx
+++ b/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx
@@ -84,7 +84,7 @@ void ChartTypeUnoDlg::implInitialize(const uno::Any& _rValue)
else
ChartTypeUnoDlg_BASE::implInitialize(_rValue);
}
-Dialog* ChartTypeUnoDlg::createDialog(Window* _pParent)
+Dialog* ChartTypeUnoDlg::createDialog(vcl::Window* _pParent)
{
return new ChartTypeDialog( _pParent, m_xChartModel, m_aContext );
}
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
index a1cf29d3d9ea..d7faca0c4571 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
@@ -50,7 +50,7 @@ namespace
const sal_Int32 nPageCount = 4;
}
-CreationWizard::CreationWizard( Window* pParent, const uno::Reference< frame::XModel >& xChartModel
+CreationWizard::CreationWizard( vcl::Window* pParent, const uno::Reference< frame::XModel >& xChartModel
, const uno::Reference< uno::XComponentContext >& xContext
, sal_Int32 nOnePageOnlyIndex )
: svt::RoadmapWizard( pParent,
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
index 8bc46fd193bd..edf8d85cf4f8 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
@@ -173,7 +173,7 @@ void CreationWizardUnoDlg::createDialogOnDemand()
SolarMutexGuard aSolarGuard;
if( !m_pDialog )
{
- Window* pParent = NULL;
+ vcl::Window* pParent = NULL;
if( !m_xParentWindow.is() && m_xChartModel.is() )
{
uno::Reference< frame::XController > xController(
diff --git a/chart2/source/controller/dialogs/dlg_DataEditor.cxx b/chart2/source/controller/dialogs/dlg_DataEditor.cxx
index a1ebedc7bafc..4183aaf6b503 100644
--- a/chart2/source/controller/dialogs/dlg_DataEditor.cxx
+++ b/chart2/source/controller/dialogs/dlg_DataEditor.cxx
@@ -39,7 +39,7 @@ using ::com::sun::star::uno::Reference;
namespace chart
{
-DataEditor::DataEditor(Window* pParent,
+DataEditor::DataEditor(vcl::Window* pParent,
const Reference< chart2::XChartDocument > & xChartDoc,
const Reference< uno::XComponentContext > & xContext)
: ModalDialog(pParent, "ChartDataDialog",
@@ -48,7 +48,7 @@ DataEditor::DataEditor(Window* pParent,
, m_xChartDoc(xChartDoc)
, m_xContext(xContext)
{
- m_xBrwData.reset(new DataBrowser(get<Window>("datawindow"), WB_BORDER | WB_TABSTOP, true /* bLiveUpdate */));
+ m_xBrwData.reset(new DataBrowser(get<vcl::Window>("datawindow"), WB_BORDER | WB_TABSTOP, true /* bLiveUpdate */));
m_xBrwData->set_hexpand(true);
m_xBrwData->set_vexpand(true);
m_xBrwData->set_expand(true);
@@ -201,13 +201,13 @@ bool DataEditor::ApplyChangesToModel()
// travels/no longer travels over this window. _rMemFunc may be
// TaskPaneList::AddWindow or TaskPaneList::RemoveWindow
void DataEditor::notifySystemWindow(
- Window* pWindow, Window* pToRegister,
- ::comphelper::mem_fun1_t< TaskPaneList, Window* > rMemFunc )
+ vcl::Window* pWindow, vcl::Window* pToRegister,
+ ::comphelper::mem_fun1_t< TaskPaneList, vcl::Window* > rMemFunc )
{
OSL_ENSURE( pWindow, "Window must not be null!" );
if( !pWindow )
return;
- Window* pParent = pWindow->GetParent();
+ vcl::Window* pParent = pWindow->GetParent();
while( pParent && ! pParent->IsSystemWindow() )
{
pParent = pParent->GetParent();
diff --git a/chart2/source/controller/dialogs/dlg_DataSource.cxx b/chart2/source/controller/dialogs/dlg_DataSource.cxx
index a0e810df8e05..bfa90c7647be 100644
--- a/chart2/source/controller/dialogs/dlg_DataSource.cxx
+++ b/chart2/source/controller/dialogs/dlg_DataSource.cxx
@@ -84,7 +84,7 @@ Reference< chart2::XChartTypeTemplate > DocumentChartTypeTemplateProvider::getCu
class DataSourceTabControl : public TabControl
{
public:
- DataSourceTabControl(Window* pParent);
+ DataSourceTabControl(vcl::Window* pParent);
virtual bool DeactivatePage() SAL_OVERRIDE;
@@ -95,7 +95,7 @@ private:
bool m_bTogglingEnabled;
};
-DataSourceTabControl::DataSourceTabControl(Window* pParent)
+DataSourceTabControl::DataSourceTabControl(vcl::Window* pParent)
: TabControl(pParent)
, m_bTogglingEnabled(true)
{
@@ -124,7 +124,7 @@ enum DataSourceDialogPages
TP_DATA_SOURCE = 2
};
-DataSourceDialog::DataSourceDialog(Window * pParent,
+DataSourceDialog::DataSourceDialog(vcl::Window * pParent,
const Reference< XChartDocument > & xChartDocument,
const Reference< uno::XComponentContext > & xContext)
: TabDialog(pParent, "DataRangeDialog",
diff --git a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
index 92699fee0fd9..50fbc2f57daa 100644
--- a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
@@ -42,7 +42,7 @@ InsertAxisOrGridDialogData::InsertAxisOrGridDialogData()
// SchAxisDlg
-SchAxisDlg::SchAxisDlg(Window* pWindow,
+SchAxisDlg::SchAxisDlg(vcl::Window* pWindow,
const InsertAxisOrGridDialogData& rInput, bool bAxisDlg)
: ModalDialog(pWindow,
bAxisDlg ?
@@ -95,7 +95,7 @@ void SchAxisDlg::getResult( InsertAxisOrGridDialogData& rOutput )
rOutput.aExistenceList[5]=m_pCbSecondaryZ->IsChecked();
}
-SchGridDlg::SchGridDlg( Window* pParent, const InsertAxisOrGridDialogData& rInput )
+SchGridDlg::SchGridDlg( vcl::Window* pParent, const InsertAxisOrGridDialogData& rInput )
: SchAxisDlg( pParent, rInput, false )//rInAttrs, b3D, bNet, bSecondaryX, bSecondaryY, false )
{
}
diff --git a/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx b/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx
index f68e4ae955f4..83c13095025f 100644
--- a/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx
@@ -23,7 +23,7 @@
namespace chart
{
-DataLabelsDialog::DataLabelsDialog(Window* pWindow, const SfxItemSet& rInAttrs, SvNumberFormatter* pFormatter) :
+DataLabelsDialog::DataLabelsDialog(vcl::Window* pWindow, const SfxItemSet& rInAttrs, SvNumberFormatter* pFormatter) :
ModalDialog(pWindow
,"dlg_DataLabels"
,"modules/schart/ui/dlg_DataLabel.ui"),
diff --git a/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx b/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx
index b392b717a2df..fd7f0a0e03bb 100644
--- a/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx
@@ -39,7 +39,7 @@ namespace chart
{
InsertErrorBarsDialog::InsertErrorBarsDialog(
- Window* pParent, const SfxItemSet& rMyAttrs,
+ vcl::Window* pParent, const SfxItemSet& rMyAttrs,
const uno::Reference< chart2::XChartDocument > & xChartDocument,
ErrorBarResources::tErrorBarType eType /* = ErrorBarResources::ERROR_BAR_Y */ ) :
ModalDialog( pParent
diff --git a/chart2/source/controller/dialogs/dlg_InsertLegend.cxx b/chart2/source/controller/dialogs/dlg_InsertLegend.cxx
index 836223934ac1..9e113052eadb 100644
--- a/chart2/source/controller/dialogs/dlg_InsertLegend.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertLegend.cxx
@@ -25,7 +25,7 @@ namespace chart
using namespace ::com::sun::star;
-SchLegendDlg::SchLegendDlg(Window* pWindow, const uno::Reference< uno::XComponentContext>& xCC )
+SchLegendDlg::SchLegendDlg(vcl::Window* pWindow, const uno::Reference< uno::XComponentContext>& xCC )
: ModalDialog(pWindow
,"dlg_InsertLegend"
,"modules/schart/ui/dlg_InsertLegend.ui")
diff --git a/chart2/source/controller/dialogs/dlg_InsertTitle.cxx b/chart2/source/controller/dialogs/dlg_InsertTitle.cxx
index 5e5c83ded6ca..742d6a5ae1d6 100644
--- a/chart2/source/controller/dialogs/dlg_InsertTitle.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertTitle.cxx
@@ -25,7 +25,7 @@
namespace chart
{
-SchTitleDlg::SchTitleDlg(Window* pWindow, const TitleDialogData& rInput )
+SchTitleDlg::SchTitleDlg(vcl::Window* pWindow, const TitleDialogData& rInput )
: ModalDialog(pWindow, "InsertTitleDialog", "modules/schart/ui/inserttitledlg.ui")
, m_xTitleResources(new TitleResources(*this, true))
{
diff --git a/chart2/source/controller/dialogs/dlg_NumberFormat.cxx b/chart2/source/controller/dialogs/dlg_NumberFormat.cxx
index 100af2798467..a2ba7f3c0ca0 100644
--- a/chart2/source/controller/dialogs/dlg_NumberFormat.cxx
+++ b/chart2/source/controller/dialogs/dlg_NumberFormat.cxx
@@ -30,7 +30,7 @@ namespace chart
{
using namespace ::com::sun::star;
-NumberFormatDialog::NumberFormatDialog(Window* pParent, SfxItemSet& rSet)
+NumberFormatDialog::NumberFormatDialog(vcl::Window* pParent, SfxItemSet& rSet)
: SfxSingleTabDialog(pParent, rSet, "FormatNumberDialog",
"cui/ui/formatnumberdialog.ui")
{
diff --git a/chart2/source/controller/dialogs/dlg_NumberFormat.hxx b/chart2/source/controller/dialogs/dlg_NumberFormat.hxx
index 0faabc29e93f..a27ff0caf7f0 100644
--- a/chart2/source/controller/dialogs/dlg_NumberFormat.hxx
+++ b/chart2/source/controller/dialogs/dlg_NumberFormat.hxx
@@ -21,7 +21,7 @@
#include <sfx2/basedlgs.hxx>
-class Window;
+namespace vcl { class Window; }
class SfxItemSet;
namespace chart
@@ -30,7 +30,7 @@ namespace chart
class NumberFormatDialog : public SfxSingleTabDialog
{
public:
- NumberFormatDialog(Window* pParent, SfxItemSet& rSet);
+ NumberFormatDialog(vcl::Window* pParent, SfxItemSet& rSet);
virtual ~NumberFormatDialog();
static SfxItemSet CreateEmptyItemSetForNumberFormatDialog( SfxItemPool& rItemPool );
diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
index 0bc20aea2d37..ac3157760999 100644
--- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
+++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
@@ -319,7 +319,7 @@ void SchAttribTabDlg::SetAxisMinorStepWidthForErrorBarDecimals( double fMinorSte
m_fAxisMinorStepWidthForErrorBarDecimals = fMinorStepWidth;
}
-SchAttribTabDlg::SchAttribTabDlg(Window* pParent,
+SchAttribTabDlg::SchAttribTabDlg(vcl::Window* pParent,
const SfxItemSet* pAttr,
const ObjectPropertiesDialogParameter* pDialogParameter,
const ViewElementListProvider* pViewElementListProvider,
diff --git a/chart2/source/controller/dialogs/dlg_ShapeFont.cxx b/chart2/source/controller/dialogs/dlg_ShapeFont.cxx
index 929c9cd846fb..95a19805471b 100644
--- a/chart2/source/controller/dialogs/dlg_ShapeFont.cxx
+++ b/chart2/source/controller/dialogs/dlg_ShapeFont.cxx
@@ -34,7 +34,7 @@ using namespace ::com::sun::star;
namespace chart
{
-ShapeFontDialog::ShapeFontDialog( Window* pParent, const SfxItemSet* pAttr,
+ShapeFontDialog::ShapeFontDialog( vcl::Window* pParent, const SfxItemSet* pAttr,
const ViewElementListProvider* pViewElementListProvider )
: SfxTabDialog(pParent, "CharDialog",
"modules/schart/ui/chardialog.ui", pAttr)
diff --git a/chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx b/chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx
index 44b343719d08..4ce313050cbe 100644
--- a/chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx
+++ b/chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx
@@ -32,7 +32,7 @@ using namespace ::com::sun::star;
namespace chart
{
-ShapeParagraphDialog::ShapeParagraphDialog(Window* pParent,
+ShapeParagraphDialog::ShapeParagraphDialog(vcl::Window* pParent,
const SfxItemSet* pAttr)
: SfxTabDialog(pParent, "ParagraphDialog",
"modules/schart/ui/paradialog.ui", pAttr)
diff --git a/chart2/source/controller/dialogs/dlg_View3D.cxx b/chart2/source/controller/dialogs/dlg_View3D.cxx
index b393c17c388d..c346fdd23aaa 100644
--- a/chart2/source/controller/dialogs/dlg_View3D.cxx
+++ b/chart2/source/controller/dialogs/dlg_View3D.cxx
@@ -39,7 +39,7 @@ using namespace ::com::sun::star::chart2;
sal_uInt16 View3DDialog::m_nLastPageId = 0;
-View3DDialog::View3DDialog(Window* pParent, const uno::Reference< frame::XModel > & xChartModel, const XColorListRef &pColorTable )
+View3DDialog::View3DDialog(vcl::Window* pParent, const uno::Reference< frame::XModel > & xChartModel, const XColorListRef &pColorTable )
: TabDialog(pParent, "3DViewDialog", "modules/schart/ui/3dviewdialog.ui")
, m_pGeometry(0)
, m_pAppearance(0)
diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx b/chart2/source/controller/dialogs/res_DataLabel.cxx
index 0057bbe99ac6..24315a3de371 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.cxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.cxx
@@ -84,7 +84,7 @@ void lcl_setBoolItemToCheckBox( const SfxItemSet& rInAttrs, sal_uInt16 nWhichId,
}//end anonymous namespace
-DataLabelResources::DataLabelResources(VclBuilderContainer* pWindow, Window* pParent, const SfxItemSet& rInAttrs )
+DataLabelResources::DataLabelResources(VclBuilderContainer* pWindow, vcl::Window* pParent, const SfxItemSet& rInAttrs )
:
m_pNumberFormatter(0),
m_bNumberFormatMixedState(true),
diff --git a/chart2/source/controller/dialogs/res_DataLabel.hxx b/chart2/source/controller/dialogs/res_DataLabel.hxx
index b6d278969b92..0044e4a9d26e 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.hxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.hxx
@@ -37,7 +37,7 @@ namespace chart
class DataLabelResources
{
public:
- DataLabelResources( VclBuilderContainer* pWindow, Window* pParent, const SfxItemSet& rInAttrs );
+ DataLabelResources( VclBuilderContainer* pWindow, vcl::Window* pParent, const SfxItemSet& rInAttrs );
virtual ~DataLabelResources();
bool FillItemSet(SfxItemSet* rOutAttrs) const;
@@ -83,7 +83,7 @@ private:
bool m_bSourceFormatForValue;
bool m_bSourceFormatForPercent;
- Window* m_pWindow;
+ vcl::Window* m_pWindow;
SfxItemPool* m_pPool;
DECL_LINK(NumberFormatDialogHdl, PushButton * );
diff --git a/chart2/source/controller/dialogs/res_Trendline.cxx b/chart2/source/controller/dialogs/res_Trendline.cxx
index 911f3931ac01..9dd896f32362 100644
--- a/chart2/source/controller/dialogs/res_Trendline.cxx
+++ b/chart2/source/controller/dialogs/res_Trendline.cxx
@@ -39,7 +39,7 @@ void lcl_setValue( FormattedField& rFmtField, double fValue )
rFmtField.SetDefaultValue( fValue );
}
-TrendlineResources::TrendlineResources( Window * pParent, const SfxItemSet& rInAttrs ) :
+TrendlineResources::TrendlineResources( vcl::Window * pParent, const SfxItemSet& rInAttrs ) :
m_eTrendLineType( CHREGRESS_LINEAR ),
m_bTrendLineUnique( true ),
m_pNumFormatter( NULL ),
diff --git a/chart2/source/controller/dialogs/res_Trendline.hxx b/chart2/source/controller/dialogs/res_Trendline.hxx
index 128d436ab863..0d4be04cdf4d 100644
--- a/chart2/source/controller/dialogs/res_Trendline.hxx
+++ b/chart2/source/controller/dialogs/res_Trendline.hxx
@@ -34,7 +34,7 @@ namespace chart
class TrendlineResources
{
public:
- TrendlineResources( Window* pParent, const SfxItemSet& rInAttrs );
+ TrendlineResources( vcl::Window* pParent, const SfxItemSet& rInAttrs );
virtual ~TrendlineResources();
void Reset(const SfxItemSet& rInAttrs);
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
index ea1c355e6f4e..6a15742ff548 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
@@ -86,7 +86,7 @@ namespace chart
#define POS_3DSCHEME_CUSTOM 2
ThreeD_SceneAppearance_TabPage::ThreeD_SceneAppearance_TabPage(
- Window* pWindow
+ vcl::Window* pWindow
, const uno::Reference< frame::XModel > & xChartModel
, ControllerLockHelper & rControllerLockHelper )
: TabPage ( pWindow
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx
index c08cea186df6..b00718c76e9c 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx
@@ -35,7 +35,7 @@ class ThreeD_SceneAppearance_TabPage : public TabPage
{
public:
ThreeD_SceneAppearance_TabPage(
- Window* pWindow,
+ vcl::Window* pWindow,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & xChartModel,
ControllerLockHelper & rControllerLockHelper );
virtual ~ThreeD_SceneAppearance_TabPage();
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
index 164f930c164c..a4930b38f0f4 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
@@ -54,7 +54,7 @@ void lcl_SetMetricFieldLimits( MetricField& rField, sal_Int64 nLimit )
}
}
-ThreeD_SceneGeometry_TabPage::ThreeD_SceneGeometry_TabPage( Window* pWindow
+ThreeD_SceneGeometry_TabPage::ThreeD_SceneGeometry_TabPage( vcl::Window* pWindow
, const uno::Reference< beans::XPropertySet > & xSceneProperties
, ControllerLockHelper & rControllerLockHelper )
: TabPage ( pWindow
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx
index decc521e87fa..21bc08a7ccc1 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx
@@ -35,7 +35,7 @@ namespace chart
class ThreeD_SceneGeometry_TabPage : public TabPage
{
public:
- ThreeD_SceneGeometry_TabPage( Window* pWindow,
+ ThreeD_SceneGeometry_TabPage( vcl::Window* pWindow,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > & xSceneProperties,
ControllerLockHelper & rControllerLockHelper );
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
index 27fb132dd420..81ccc2bbfa60 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
@@ -36,14 +36,14 @@ namespace chart
using namespace ::com::sun::star;
using namespace ::com::sun::star::chart2;
-LightButton::LightButton( Window* pParent)
+LightButton::LightButton( vcl::Window* pParent)
: ImageButton( pParent)
, m_bLightOn(false)
{
SetModeImage( Image( SVX_RES(RID_SVXIMAGE_LIGHT_OFF) ) );
}
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeLightButton(Window *pParent, VclBuilder::stringmap &)
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeLightButton(vcl::Window *pParent, VclBuilder::stringmap &)
{
return new LightButton(pParent);
}
@@ -225,7 +225,7 @@ namespace
}
}
-ThreeD_SceneIllumination_TabPage::ThreeD_SceneIllumination_TabPage( Window* pWindow
+ThreeD_SceneIllumination_TabPage::ThreeD_SceneIllumination_TabPage( vcl::Window* pWindow
, const uno::Reference< beans::XPropertySet > & xSceneProperties
, const uno::Reference< frame::XModel >& xChartModel
, const XColorListRef & pColorTable )
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx
index 7bfe1ab59602..3f7af791d290 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx
@@ -36,7 +36,7 @@ namespace chart
class LightButton : public ImageButton
{
public:
- LightButton( Window* pParent);
+ LightButton( vcl::Window* pParent);
virtual ~LightButton();
void switchLightOn(bool bOn);
@@ -52,7 +52,7 @@ class ThreeD_SceneIllumination_TabPage : public TabPage
{
public:
ThreeD_SceneIllumination_TabPage(
- Window* pWindow,
+ vcl::Window* pWindow,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > & xSceneProperties,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel,
diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.cxx b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
index 5181402a9c3c..f80402c093a2 100644
--- a/chart2/source/controller/dialogs/tp_AxisLabel.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
@@ -31,7 +31,7 @@
namespace chart
{
-SchAxisLabelTabPage::SchAxisLabelTabPage( Window* pParent, const SfxItemSet& rInAttrs ) :
+SchAxisLabelTabPage::SchAxisLabelTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ) :
SfxTabPage( pParent, "AxisLabelTabPage","modules/schart/ui/tp_axisLabel.ui", &rInAttrs ),
m_bShowStaggeringControls( true ),
@@ -79,7 +79,7 @@ void SchAxisLabelTabPage::Construct()
{
}
-SfxTabPage* SchAxisLabelTabPage::Create( Window* pParent, const SfxItemSet* rAttrs )
+SfxTabPage* SchAxisLabelTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrs )
{
return new SchAxisLabelTabPage( pParent, *rAttrs );
}
diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.hxx b/chart2/source/controller/dialogs/tp_AxisLabel.hxx
index be28343340c9..059215b911b8 100644
--- a/chart2/source/controller/dialogs/tp_AxisLabel.hxx
+++ b/chart2/source/controller/dialogs/tp_AxisLabel.hxx
@@ -69,12 +69,12 @@ private:
DECL_LINK ( ToggleShowLabel, void* );
public:
- SchAxisLabelTabPage( Window* pParent, const SfxItemSet& rInAttrs );
+ SchAxisLabelTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs );
virtual ~SchAxisLabelTabPage();
void Construct();
- static SfxTabPage* Create( Window* pParent, const SfxItemSet* rInAttrs );
+ static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rInAttrs );
virtual bool FillItemSet( SfxItemSet* rOutAttrs ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rInAttrs ) SAL_OVERRIDE;
diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.cxx b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
index 71b5221e859d..8fda04263f47 100644
--- a/chart2/source/controller/dialogs/tp_AxisPositions.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
@@ -42,7 +42,7 @@ using namespace ::com::sun::star;
namespace chart
{
-AxisPositionsTabPage::AxisPositionsTabPage(Window* pWindow,const SfxItemSet& rInAttrs)
+AxisPositionsTabPage::AxisPositionsTabPage(vcl::Window* pWindow,const SfxItemSet& rInAttrs)
: SfxTabPage(pWindow
,"tp_AxisPositions"
,"modules/schart/ui/tp_AxisPositions.ui"
@@ -84,7 +84,7 @@ AxisPositionsTabPage::AxisPositionsTabPage(Window* pWindow,const SfxItemSet& rIn
m_pLB_PlaceTicks->SetDropDownLineCount( m_pLB_PlaceTicks->GetEntryCount() );
}
-SfxTabPage* AxisPositionsTabPage::Create(Window* pWindow,const SfxItemSet* rOutAttrs)
+SfxTabPage* AxisPositionsTabPage::Create(vcl::Window* pWindow,const SfxItemSet* rOutAttrs)
{
return new AxisPositionsTabPage(pWindow, *rOutAttrs);
}
diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.hxx b/chart2/source/controller/dialogs/tp_AxisPositions.hxx
index 78ce532c13fc..3dfeecd8f3ff 100644
--- a/chart2/source/controller/dialogs/tp_AxisPositions.hxx
+++ b/chart2/source/controller/dialogs/tp_AxisPositions.hxx
@@ -32,9 +32,9 @@ namespace chart
class AxisPositionsTabPage : public SfxTabPage
{
public:
- AxisPositionsTabPage( Window* pParent, const SfxItemSet& rInAttrs );
+ AxisPositionsTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs );
- static SfxTabPage* Create( Window* pParent, const SfxItemSet* rInAttrs );
+ static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rInAttrs );
virtual bool FillItemSet( SfxItemSet* rOutAttrs ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rInAttrs ) SAL_OVERRIDE;
using TabPage::DeactivatePage;
diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx
index 00defcfeeec0..0703e1d7a979 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.cxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.cxx
@@ -312,7 +312,7 @@ IMPL_LINK_NOARG( GL3DResourceGroup, SettingChangedHdl )
class SplinePropertiesDialog : public ModalDialog
{
public:
- SplinePropertiesDialog( Window* pParent );
+ SplinePropertiesDialog( vcl::Window* pParent );
virtual ~SplinePropertiesDialog();
void fillControls( const ChartTypeParameter& rParameter );
@@ -334,7 +334,7 @@ private:
const sal_uInt16 CUBIC_SPLINE_POS = 0;
const sal_uInt16 B_SPLINE_POS = 1;
-SplinePropertiesDialog::SplinePropertiesDialog( Window* pParent )
+SplinePropertiesDialog::SplinePropertiesDialog( vcl::Window* pParent )
: ModalDialog( pParent, "SmoothLinesDialog", "modules/schart/ui/smoothlinesdlg.ui")
{
get(m_pLB_Spline_Type, "SplineTypeComboBox");
@@ -399,7 +399,7 @@ IMPL_LINK_NOARG(SplinePropertiesDialog, SplineTypeListBoxHdl)
class SteppedPropertiesDialog : public ModalDialog
{
public:
- SteppedPropertiesDialog( Window* pParent );
+ SteppedPropertiesDialog( vcl::Window* pParent );
virtual ~SteppedPropertiesDialog();
void fillControls( const ChartTypeParameter& rParameter );
@@ -416,7 +416,7 @@ private:
RadioButton* m_pRB_CenterY;
};
-SteppedPropertiesDialog::SteppedPropertiesDialog( Window* pParent )
+SteppedPropertiesDialog::SteppedPropertiesDialog( vcl::Window* pParent )
: ModalDialog( pParent, "SteppedLinesDialog", "modules/schart/ui/steppedlinesdlg.ui")
{
get(m_pRB_Start, "step_start_rb");
@@ -675,7 +675,7 @@ IMPL_LINK_NOARG(GeometryResourceGroup, GeometryChangeHdl)
return 0;
}
-ChartTypeTabPage::ChartTypeTabPage(Window* pParent
+ChartTypeTabPage::ChartTypeTabPage(vcl::Window* pParent
, const uno::Reference< XChartDocument >& xChartModel
, const uno::Reference< uno::XComponentContext >& xContext
, bool bDoLiveUpdate, bool bShowDescription)
diff --git a/chart2/source/controller/dialogs/tp_ChartType.hxx b/chart2/source/controller/dialogs/tp_ChartType.hxx
index 81557a421db8..486ae1540805 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.hxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.hxx
@@ -48,7 +48,7 @@ class GL3DResourceGroup;
class ChartTypeTabPage : public ResourceChangeListener, public svt::OWizardPage, public ChartTypeTemplateProvider
{
public:
- ChartTypeTabPage( Window* pParent
+ ChartTypeTabPage( vcl::Window* pParent
, const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XChartDocument >& xChartModel
, const ::com::sun::star::uno::Reference<
diff --git a/chart2/source/controller/dialogs/tp_DataLabel.cxx b/chart2/source/controller/dialogs/tp_DataLabel.cxx
index c5e9cce2e2c5..ef795fa2e2ca 100644
--- a/chart2/source/controller/dialogs/tp_DataLabel.cxx
+++ b/chart2/source/controller/dialogs/tp_DataLabel.cxx
@@ -25,7 +25,7 @@
namespace chart
{
-DataLabelsTabPage::DataLabelsTabPage(Window* pWindow, const SfxItemSet& rInAttrs)
+DataLabelsTabPage::DataLabelsTabPage(vcl::Window* pWindow, const SfxItemSet& rInAttrs)
: SfxTabPage(pWindow
, "tp_DataLabel"
, "modules/schart/ui/tp_DataLabel.ui"
@@ -38,7 +38,7 @@ DataLabelsTabPage::~DataLabelsTabPage()
{
}
-SfxTabPage* DataLabelsTabPage::Create(Window* pWindow, const SfxItemSet* rOutAttrs)
+SfxTabPage* DataLabelsTabPage::Create(vcl::Window* pWindow, const SfxItemSet* rOutAttrs)
{
return new DataLabelsTabPage(pWindow, *rOutAttrs);
}
diff --git a/chart2/source/controller/dialogs/tp_DataLabel.hxx b/chart2/source/controller/dialogs/tp_DataLabel.hxx
index 5e14a412fb67..1bad928af04d 100644
--- a/chart2/source/controller/dialogs/tp_DataLabel.hxx
+++ b/chart2/source/controller/dialogs/tp_DataLabel.hxx
@@ -33,10 +33,10 @@ namespace chart
class DataLabelsTabPage : public SfxTabPage
{
public:
- DataLabelsTabPage(Window* pWindow, const SfxItemSet& rInAttrs);
+ DataLabelsTabPage(vcl::Window* pWindow, const SfxItemSet& rInAttrs);
virtual ~DataLabelsTabPage();
- static SfxTabPage* Create(Window* pWindow, const SfxItemSet* rInAttrs);
+ static SfxTabPage* Create(vcl::Window* pWindow, const SfxItemSet* rInAttrs);
void SetNumberFormatter( SvNumberFormatter* pFormatter );
diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx
index a92298b229ba..14da20cbaaf6 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -181,7 +181,7 @@ namespace chart
{
DataSourceTabPage::DataSourceTabPage(
- Window * pParent,
+ vcl::Window * pParent,
DialogModel & rDialogModel,
ChartTypeTemplateProvider* pTemplateProvider,
Dialog * pParentDialog,
diff --git a/chart2/source/controller/dialogs/tp_DataSource.hxx b/chart2/source/controller/dialogs/tp_DataSource.hxx
index 496333e31cdc..1cc0439a1065 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.hxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.hxx
@@ -53,7 +53,7 @@ class DataSourceTabPage :
{
public:
explicit DataSourceTabPage(
- Window * pParent,
+ vcl::Window * pParent,
DialogModel & rDialogModel,
ChartTypeTemplateProvider* pTemplateProvider,
Dialog * pParentDialog,
diff --git a/chart2/source/controller/dialogs/tp_DataSourceControls.cxx b/chart2/source/controller/dialogs/tp_DataSourceControls.cxx
index 11ebbcf9df75..54ecfe64ea79 100644
--- a/chart2/source/controller/dialogs/tp_DataSourceControls.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSourceControls.cxx
@@ -31,11 +31,11 @@ namespace chart
SeriesEntry::~SeriesEntry()
{}
-SeriesListBox::SeriesListBox(Window* pParent, WinBits nStyle)
+SeriesListBox::SeriesListBox(vcl::Window* pParent, WinBits nStyle)
: SvTreeListBox(pParent, nStyle)
{}
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSeriesListBox(Window *pParent, VclBuilder::stringmap &rMap)
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSeriesListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap)
{
WinBits nWinStyle = 0;
OString sBorder = VclBuilder::extractCustomProperty(rMap);
diff --git a/chart2/source/controller/dialogs/tp_DataSourceControls.hxx b/chart2/source/controller/dialogs/tp_DataSourceControls.hxx
index 82ae7addf888..e5a5ec54e333 100644
--- a/chart2/source/controller/dialogs/tp_DataSourceControls.hxx
+++ b/chart2/source/controller/dialogs/tp_DataSourceControls.hxx
@@ -45,7 +45,7 @@ public:
class SeriesListBox : public ::SvTreeListBox
{
public:
- explicit SeriesListBox(Window* pParent, WinBits nStyle);
+ explicit SeriesListBox(vcl::Window* pParent, WinBits nStyle);
virtual SvTreeListEntry* CreateEntry() const SAL_OVERRIDE;
};
diff --git a/chart2/source/controller/dialogs/tp_ErrorBars.cxx b/chart2/source/controller/dialogs/tp_ErrorBars.cxx
index c240e7652db8..28280253b48f 100644
--- a/chart2/source/controller/dialogs/tp_ErrorBars.cxx
+++ b/chart2/source/controller/dialogs/tp_ErrorBars.cxx
@@ -28,7 +28,7 @@ using namespace ::com::sun::star;
namespace chart
{
-ErrorBarsTabPage::ErrorBarsTabPage( Window* pParent, const SfxItemSet& rInAttrs ) :
+ErrorBarsTabPage::ErrorBarsTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ) :
SfxTabPage( pParent
,"tp_ErrorBars"
,"modules/schart/ui/tp_ErrorBars.ui"
@@ -42,7 +42,7 @@ ErrorBarsTabPage::ErrorBarsTabPage( Window* pParent, const SfxItemSet& rInAttrs
}
SfxTabPage* ErrorBarsTabPage::Create(
- Window* pParent, const SfxItemSet* rOutAttrs )
+ vcl::Window* pParent, const SfxItemSet* rOutAttrs )
{
return new ErrorBarsTabPage( pParent, *rOutAttrs );
}
diff --git a/chart2/source/controller/dialogs/tp_ErrorBars.hxx b/chart2/source/controller/dialogs/tp_ErrorBars.hxx
index 05f2e59607d8..6da7692d8c9f 100644
--- a/chart2/source/controller/dialogs/tp_ErrorBars.hxx
+++ b/chart2/source/controller/dialogs/tp_ErrorBars.hxx
@@ -29,7 +29,7 @@ namespace chart
class ErrorBarsTabPage : public SfxTabPage
{
public:
- ErrorBarsTabPage ( Window* pParent, const SfxItemSet& rInAttrs );
+ ErrorBarsTabPage ( vcl::Window* pParent, const SfxItemSet& rInAttrs );
void SetAxisMinorStepWidthForErrorBarDecimals( double fMinorStepWidth );
void SetErrorBarType( ErrorBarResources::tErrorBarType eNewType );
@@ -37,7 +37,7 @@ public:
const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XChartDocument > & xChartDocument );
- static SfxTabPage* Create( Window* pParent, const SfxItemSet* rInAttrs );
+ static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rInAttrs );
virtual bool FillItemSet( SfxItemSet* rOutAttrs ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rInAttrs ) SAL_OVERRIDE;
diff --git a/chart2/source/controller/dialogs/tp_LegendPosition.cxx b/chart2/source/controller/dialogs/tp_LegendPosition.cxx
index 1381159d24e7..c275c25660d8 100644
--- a/chart2/source/controller/dialogs/tp_LegendPosition.cxx
+++ b/chart2/source/controller/dialogs/tp_LegendPosition.cxx
@@ -29,7 +29,7 @@
namespace chart
{
-SchLegendPosTabPage::SchLegendPosTabPage(Window* pWindow, const SfxItemSet& rInAttrs)
+SchLegendPosTabPage::SchLegendPosTabPage(vcl::Window* pWindow, const SfxItemSet& rInAttrs)
: SfxTabPage( pWindow
,"tp_LegendPosition"
,"modules/schart/ui/tp_LegendPosition.ui"
@@ -41,7 +41,7 @@ SchLegendPosTabPage::SchLegendPosTabPage(Window* pWindow, const SfxItemSet& rInA
m_pLbTextDirection->SetDropDownLineCount(3);
}
-SfxTabPage* SchLegendPosTabPage::Create(Window* pWindow, const SfxItemSet* rOutAttrs)
+SfxTabPage* SchLegendPosTabPage::Create(vcl::Window* pWindow, const SfxItemSet* rOutAttrs)
{
return new SchLegendPosTabPage(pWindow, *rOutAttrs);
}
diff --git a/chart2/source/controller/dialogs/tp_LegendPosition.hxx b/chart2/source/controller/dialogs/tp_LegendPosition.hxx
index 0c767d81f44b..0d4f4acf0d07 100644
--- a/chart2/source/controller/dialogs/tp_LegendPosition.hxx
+++ b/chart2/source/controller/dialogs/tp_LegendPosition.hxx
@@ -36,9 +36,9 @@ private:
TextDirectionListBox* m_pLbTextDirection;
public:
- SchLegendPosTabPage(Window* pParent, const SfxItemSet& rInAttrs);
+ SchLegendPosTabPage(vcl::Window* pParent, const SfxItemSet& rInAttrs);
- static SfxTabPage* Create(Window* pParent, const SfxItemSet* rInAttrs);
+ static SfxTabPage* Create(vcl::Window* pParent, const SfxItemSet* rInAttrs);
virtual bool FillItemSet(SfxItemSet* rOutAttrs) SAL_OVERRIDE;
virtual void Reset(const SfxItemSet* rInAttrs) SAL_OVERRIDE;
};
diff --git a/chart2/source/controller/dialogs/tp_PointGeometry.cxx b/chart2/source/controller/dialogs/tp_PointGeometry.cxx
index da008a1a964a..5e32432af83d 100644
--- a/chart2/source/controller/dialogs/tp_PointGeometry.cxx
+++ b/chart2/source/controller/dialogs/tp_PointGeometry.cxx
@@ -30,7 +30,7 @@
namespace chart
{
-SchLayoutTabPage::SchLayoutTabPage(Window* pWindow,const SfxItemSet& rInAttrs)
+SchLayoutTabPage::SchLayoutTabPage(vcl::Window* pWindow,const SfxItemSet& rInAttrs)
: SfxTabPage(pWindow, "tp_ChartType", "modules/schart/ui/tp_ChartType.ui", &rInAttrs)
, m_pGeometryResources(0)
{
@@ -42,7 +42,7 @@ SchLayoutTabPage::~SchLayoutTabPage()
delete m_pGeometryResources;
}
-SfxTabPage* SchLayoutTabPage::Create(Window* pWindow,
+SfxTabPage* SchLayoutTabPage::Create(vcl::Window* pWindow,
const SfxItemSet* rOutAttrs)
{
return new SchLayoutTabPage(pWindow, *rOutAttrs);
diff --git a/chart2/source/controller/dialogs/tp_PointGeometry.hxx b/chart2/source/controller/dialogs/tp_PointGeometry.hxx
index f0424bc57133..635768fe1178 100644
--- a/chart2/source/controller/dialogs/tp_PointGeometry.hxx
+++ b/chart2/source/controller/dialogs/tp_PointGeometry.hxx
@@ -28,10 +28,10 @@ class BarGeometryResources;
class SchLayoutTabPage : public SfxTabPage
{
public:
- SchLayoutTabPage(Window* pParent, const SfxItemSet& rInAttrs);
+ SchLayoutTabPage(vcl::Window* pParent, const SfxItemSet& rInAttrs);
virtual ~SchLayoutTabPage();
- static SfxTabPage* Create(Window* pParent, const SfxItemSet* rInAttrs);
+ static SfxTabPage* Create(vcl::Window* pParent, const SfxItemSet* rInAttrs);
virtual bool FillItemSet(SfxItemSet* rOutAttrs) SAL_OVERRIDE;
virtual void Reset(const SfxItemSet* rInAttrs) SAL_OVERRIDE;
diff --git a/chart2/source/controller/dialogs/tp_PolarOptions.cxx b/chart2/source/controller/dialogs/tp_PolarOptions.cxx
index 73a9d41439f2..32b09b5398ff 100644
--- a/chart2/source/controller/dialogs/tp_PolarOptions.cxx
+++ b/chart2/source/controller/dialogs/tp_PolarOptions.cxx
@@ -28,7 +28,7 @@
namespace chart
{
-PolarOptionsTabPage::PolarOptionsTabPage( Window* pWindow,const SfxItemSet& rInAttrs ) :
+PolarOptionsTabPage::PolarOptionsTabPage( vcl::Window* pWindow,const SfxItemSet& rInAttrs ) :
SfxTabPage( pWindow
,"tp_PolarOptions"
,"modules/schart/ui/tp_PolarOptions.ui"
@@ -48,7 +48,7 @@ PolarOptionsTabPage::~PolarOptionsTabPage()
{
}
-SfxTabPage* PolarOptionsTabPage::Create( Window* pWindow,const SfxItemSet* rOutAttrs )
+SfxTabPage* PolarOptionsTabPage::Create( vcl::Window* pWindow,const SfxItemSet* rOutAttrs )
{
return new PolarOptionsTabPage( pWindow, *rOutAttrs );
}
diff --git a/chart2/source/controller/dialogs/tp_PolarOptions.hxx b/chart2/source/controller/dialogs/tp_PolarOptions.hxx
index d0cbe2e0e98b..7d0ea5034122 100644
--- a/chart2/source/controller/dialogs/tp_PolarOptions.hxx
+++ b/chart2/source/controller/dialogs/tp_PolarOptions.hxx
@@ -32,10 +32,10 @@ class PolarOptionsTabPage : public SfxTabPage
{
public:
- PolarOptionsTabPage(Window* pParent, const SfxItemSet& rInAttrs );
+ PolarOptionsTabPage(vcl::Window* pParent, const SfxItemSet& rInAttrs );
virtual ~PolarOptionsTabPage();
- static SfxTabPage* Create(Window* pParent, const SfxItemSet* rInAttrs);
+ static SfxTabPage* Create(vcl::Window* pParent, const SfxItemSet* rInAttrs);
virtual bool FillItemSet(SfxItemSet* rOutAttrs) SAL_OVERRIDE;
virtual void Reset(const SfxItemSet* rInAttrs) SAL_OVERRIDE;
diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.cxx b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
index a9e854f9e58b..451945e89ab9 100644
--- a/chart2/source/controller/dialogs/tp_RangeChooser.cxx
+++ b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
@@ -61,7 +61,7 @@ using namespace ::com::sun::star::chart2;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-RangeChooserTabPage::RangeChooserTabPage( Window* pParent
+RangeChooserTabPage::RangeChooserTabPage( vcl::Window* pParent
, DialogModel & rDialogModel
, ChartTypeTemplateProvider* pTemplateProvider
, Dialog * pParentDialog
diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.hxx b/chart2/source/controller/dialogs/tp_RangeChooser.hxx
index 8c2111928d13..3b88a46dd845 100644
--- a/chart2/source/controller/dialogs/tp_RangeChooser.hxx
+++ b/chart2/source/controller/dialogs/tp_RangeChooser.hxx
@@ -43,7 +43,7 @@ class RangeChooserTabPage : public svt::OWizardPage, public RangeSelectionListen
{
public:
- RangeChooserTabPage( Window* pParent
+ RangeChooserTabPage( vcl::Window* pParent
, DialogModel & rDialogModel
, ChartTypeTemplateProvider* pTemplateProvider
, Dialog * pParentDialog
diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx
index e0cefa06cf01..363de5376a87 100644
--- a/chart2/source/controller/dialogs/tp_Scale.cxx
+++ b/chart2/source/controller/dialogs/tp_Scale.cxx
@@ -51,7 +51,7 @@ void lcl_setValue( FormattedField& rFmtField, double fValue )
}
-ScaleTabPage::ScaleTabPage(Window* pWindow,const SfxItemSet& rInAttrs) :
+ScaleTabPage::ScaleTabPage(vcl::Window* pWindow,const SfxItemSet& rInAttrs) :
SfxTabPage(pWindow
, "tp_Scale"
, "modules/schart/ui/tp_Scale.ui"
@@ -236,7 +236,7 @@ IMPL_LINK_NOARG(ScaleTabPage, SelectAxisTypeHdl)
return 0;
}
-SfxTabPage* ScaleTabPage::Create(Window* pWindow,const SfxItemSet* rOutAttrs)
+SfxTabPage* ScaleTabPage::Create(vcl::Window* pWindow,const SfxItemSet* rOutAttrs)
{
return new ScaleTabPage(pWindow, *rOutAttrs);
}
diff --git a/chart2/source/controller/dialogs/tp_Scale.hxx b/chart2/source/controller/dialogs/tp_Scale.hxx
index 3c65b604845f..ff8bbe7e9d1b 100644
--- a/chart2/source/controller/dialogs/tp_Scale.hxx
+++ b/chart2/source/controller/dialogs/tp_Scale.hxx
@@ -32,9 +32,9 @@ namespace chart
class ScaleTabPage : public SfxTabPage
{
public:
- ScaleTabPage( Window* pParent, const SfxItemSet& rInAttrs );
+ ScaleTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs );
- static SfxTabPage* Create( Window* pParent, const SfxItemSet* rInAttrs );
+ static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rInAttrs );
virtual bool FillItemSet( SfxItemSet* rOutAttrs ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rInAttrs ) SAL_OVERRIDE;
using TabPage::DeactivatePage;
diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
index a04d2efb0d42..26c158406f6d 100644
--- a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
+++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
@@ -32,7 +32,7 @@
namespace chart
{
-SchOptionTabPage::SchOptionTabPage(Window* pWindow,const SfxItemSet& rInAttrs)
+SchOptionTabPage::SchOptionTabPage(vcl::Window* pWindow,const SfxItemSet& rInAttrs)
: SfxTabPage(pWindow,
"TP_OPTIONS",
"modules/schart/ui/tp_SeriesToAxis.ui",
@@ -76,7 +76,7 @@ IMPL_LINK_NOARG(SchOptionTabPage, EnableHdl)
return 0;
}
-SfxTabPage* SchOptionTabPage::Create(Window* pWindow,const SfxItemSet* rOutAttrs)
+SfxTabPage* SchOptionTabPage::Create(vcl::Window* pWindow,const SfxItemSet* rOutAttrs)
{
return new SchOptionTabPage(pWindow, *rOutAttrs);
}
diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx
index 56de1da3d449..db4afb60e9fb 100644
--- a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx
+++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx
@@ -30,10 +30,10 @@ namespace chart
class SchOptionTabPage : public SfxTabPage
{
public:
- SchOptionTabPage(Window* pParent, const SfxItemSet& rInAttrs);
+ SchOptionTabPage(vcl::Window* pParent, const SfxItemSet& rInAttrs);
virtual ~SchOptionTabPage();
- static SfxTabPage* Create(Window* pParent, const SfxItemSet* rInAttrs);
+ static SfxTabPage* Create(vcl::Window* pParent, const SfxItemSet* rInAttrs);
virtual bool FillItemSet(SfxItemSet* rOutAttrs) SAL_OVERRIDE;
virtual void Reset(const SfxItemSet* rInAttrs) SAL_OVERRIDE;
diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.cxx b/chart2/source/controller/dialogs/tp_TitleRotation.cxx
index 89f78a95d534..6fc90a273926 100644
--- a/chart2/source/controller/dialogs/tp_TitleRotation.cxx
+++ b/chart2/source/controller/dialogs/tp_TitleRotation.cxx
@@ -31,7 +31,7 @@
namespace chart
{
-SchAlignmentTabPage::SchAlignmentTabPage(Window* pWindow,
+SchAlignmentTabPage::SchAlignmentTabPage(vcl::Window* pWindow,
const SfxItemSet& rInAttrs, bool bWithRotation) :
SfxTabPage(pWindow, "TitleRotationTabPage","modules/schart/ui/titlerotationtabpage.ui", &rInAttrs)
{
@@ -60,13 +60,13 @@ SchAlignmentTabPage::~SchAlignmentTabPage()
delete m_pOrientHlp;
}
-SfxTabPage* SchAlignmentTabPage::Create(Window* pParent,
+SfxTabPage* SchAlignmentTabPage::Create(vcl::Window* pParent,
const SfxItemSet* rInAttrs)
{
return new SchAlignmentTabPage(pParent, *rInAttrs);
}
-SfxTabPage* SchAlignmentTabPage::CreateWithoutRotation(Window* pParent,
+SfxTabPage* SchAlignmentTabPage::CreateWithoutRotation(vcl::Window* pParent,
const SfxItemSet* rInAttrs)
{
return new SchAlignmentTabPage(pParent, *rInAttrs, false);
diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.hxx b/chart2/source/controller/dialogs/tp_TitleRotation.hxx
index 86f49e9402de..dd3ceb0902d6 100644
--- a/chart2/source/controller/dialogs/tp_TitleRotation.hxx
+++ b/chart2/source/controller/dialogs/tp_TitleRotation.hxx
@@ -42,11 +42,11 @@ private:
FixedText* m_pFtABCD;
public:
- SchAlignmentTabPage(Window* pParent, const SfxItemSet& rInAttrs, bool bWithRotation = true);
+ SchAlignmentTabPage(vcl::Window* pParent, const SfxItemSet& rInAttrs, bool bWithRotation = true);
virtual ~SchAlignmentTabPage();
- static SfxTabPage* Create(Window* pParent, const SfxItemSet* rInAttrs);
- static SfxTabPage* CreateWithoutRotation(Window* pParent, const SfxItemSet* rInAttrs);
+ static SfxTabPage* Create(vcl::Window* pParent, const SfxItemSet* rInAttrs);
+ static SfxTabPage* CreateWithoutRotation(vcl::Window* pParent, const SfxItemSet* rInAttrs);
virtual bool FillItemSet(SfxItemSet* rOutAttrs) SAL_OVERRIDE;
virtual void Reset(const SfxItemSet* rInAttrs) SAL_OVERRIDE;
};
diff --git a/chart2/source/controller/dialogs/tp_Trendline.cxx b/chart2/source/controller/dialogs/tp_Trendline.cxx
index fe7c81f044e6..d95a213dafa9 100644
--- a/chart2/source/controller/dialogs/tp_Trendline.cxx
+++ b/chart2/source/controller/dialogs/tp_Trendline.cxx
@@ -25,7 +25,7 @@
namespace chart
{
-TrendlineTabPage::TrendlineTabPage( Window* pParent, const SfxItemSet& rInAttrs ) :
+TrendlineTabPage::TrendlineTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ) :
SfxTabPage( pParent, "TP_TRENDLINE", "modules/schart/ui/tp_Trendline.ui", &rInAttrs ),
m_aTrendlineResources( this, rInAttrs )
{
@@ -36,7 +36,7 @@ TrendlineTabPage::~TrendlineTabPage()
}
SfxTabPage* TrendlineTabPage::Create(
- Window* pParent, const SfxItemSet* rOutAttrs )
+ vcl::Window* pParent, const SfxItemSet* rOutAttrs )
{
return new TrendlineTabPage( pParent, *rOutAttrs );
}
diff --git a/chart2/source/controller/dialogs/tp_Trendline.hxx b/chart2/source/controller/dialogs/tp_Trendline.hxx
index c18ceb74922c..a88c858c7b9a 100644
--- a/chart2/source/controller/dialogs/tp_Trendline.hxx
+++ b/chart2/source/controller/dialogs/tp_Trendline.hxx
@@ -29,10 +29,10 @@ namespace chart
class TrendlineTabPage : public SfxTabPage
{
public:
- TrendlineTabPage ( Window* pParent, const SfxItemSet& rInAttrs );
+ TrendlineTabPage ( vcl::Window* pParent, const SfxItemSet& rInAttrs );
virtual ~TrendlineTabPage ();
- static SfxTabPage* Create( Window* pParent, const SfxItemSet* rInAttrs );
+ static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rInAttrs );
virtual bool FillItemSet( SfxItemSet* rOutAttrs ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rInAttrs ) SAL_OVERRIDE;
diff --git a/chart2/source/controller/inc/TextDirectionListBox.hxx b/chart2/source/controller/inc/TextDirectionListBox.hxx
index 40144e31d728..bee03f2fb247 100644
--- a/chart2/source/controller/inc/TextDirectionListBox.hxx
+++ b/chart2/source/controller/inc/TextDirectionListBox.hxx
@@ -22,7 +22,7 @@
#include <svx/frmdirlbox.hxx>
-class Window;
+namespace vcl { class Window; }
namespace chart
{
@@ -30,8 +30,8 @@ namespace chart
class TextDirectionListBox : public svx::FrameDirectionListBox
{
public:
- explicit TextDirectionListBox( Window* pParent,
- Window* pWindow1 = 0, Window* pWindow2 = 0 );
+ explicit TextDirectionListBox( vcl::Window* pParent,
+ vcl::Window* pWindow1 = 0, vcl::Window* pWindow2 = 0 );
virtual ~TextDirectionListBox();
};
diff --git a/chart2/source/controller/inc/dlg_ChartType.hxx b/chart2/source/controller/inc/dlg_ChartType.hxx
index 227bf968aea2..b67a06fd729b 100644
--- a/chart2/source/controller/inc/dlg_ChartType.hxx
+++ b/chart2/source/controller/inc/dlg_ChartType.hxx
@@ -32,7 +32,7 @@ class ChartTypeTabPage;
class ChartTypeDialog : public ModalDialog
{
public:
- ChartTypeDialog( Window* pWindow
+ ChartTypeDialog( vcl::Window* pWindow
, const ::com::sun::star::uno::Reference<
::com::sun::star::frame::XModel >& xChartModel
, const ::com::sun::star::uno::Reference<
diff --git a/chart2/source/controller/inc/dlg_ChartType_UNO.hxx b/chart2/source/controller/inc/dlg_ChartType_UNO.hxx
index 7098e9f6f9af..98bb3d160ca3 100644
--- a/chart2/source/controller/inc/dlg_ChartType_UNO.hxx
+++ b/chart2/source/controller/inc/dlg_ChartType_UNO.hxx
@@ -46,7 +46,7 @@ private:
// OGenericUnoDialog overridables
virtual void implInitialize(const com::sun::star::uno::Any& _rValue) SAL_OVERRIDE;
- virtual Dialog* createDialog(Window* _pParent) SAL_OVERRIDE;
+ virtual Dialog* createDialog(vcl::Window* _pParent) SAL_OVERRIDE;
// XTypeProvider
virtual com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/chart2/source/controller/inc/dlg_CreationWizard.hxx b/chart2/source/controller/inc/dlg_CreationWizard.hxx
index b81ae23dd37c..cc3b5d51a29a 100644
--- a/chart2/source/controller/inc/dlg_CreationWizard.hxx
+++ b/chart2/source/controller/inc/dlg_CreationWizard.hxx
@@ -42,7 +42,7 @@ class DialogModel;
class CreationWizard : public svt::RoadmapWizard, public TabPageNotifiable
{
public:
- CreationWizard( Window* pParent,
+ CreationWizard( vcl::Window* pParent,
const ::com::sun::star::uno::Reference<
::com::sun::star::frame::XModel >& xChartModel
, const ::com::sun::star::uno::Reference<
diff --git a/chart2/source/controller/inc/dlg_DataEditor.hxx b/chart2/source/controller/inc/dlg_DataEditor.hxx
index c1caf7950d03..997cdad006b3 100644
--- a/chart2/source/controller/inc/dlg_DataEditor.hxx
+++ b/chart2/source/controller/inc/dlg_DataEditor.hxx
@@ -42,7 +42,7 @@ class DataBrowser;
class DataEditor : public ModalDialog
{
public:
- DataEditor( Window* pParent,
+ DataEditor( vcl::Window* pParent,
const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XChartDocument > & xChartDoc,
const ::com::sun::star::uno::Reference<
@@ -102,9 +102,9 @@ private:
@note this code is taken from dbaccess/source/ui/inc/UITools.hxx
*/
- void notifySystemWindow( Window* pWindow,
- Window* pToRegister,
- ::comphelper::mem_fun1_t< TaskPaneList, Window* > rMemFunc );
+ void notifySystemWindow( vcl::Window* pWindow,
+ vcl::Window* pToRegister,
+ ::comphelper::mem_fun1_t< TaskPaneList, vcl::Window* > rMemFunc );
};
} // namespace chart
diff --git a/chart2/source/controller/inc/dlg_DataSource.hxx b/chart2/source/controller/inc/dlg_DataSource.hxx
index 6341fe050094..8f4dd54c84cc 100644
--- a/chart2/source/controller/inc/dlg_DataSource.hxx
+++ b/chart2/source/controller/inc/dlg_DataSource.hxx
@@ -44,7 +44,7 @@ class DataSourceDialog :
{
public:
explicit DataSourceDialog(
- Window * pParent,
+ vcl::Window * pParent,
const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XChartDocument > & xChartDocument,
const ::com::sun::star::uno::Reference<
diff --git a/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx b/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx
index 82636bc2090e..bf3bf85750e7 100644
--- a/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx
+++ b/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx
@@ -51,7 +51,7 @@ protected:
CheckBox* m_pCbSecondaryZ;
public:
- SchAxisDlg(Window* pParent, const InsertAxisOrGridDialogData& rInput, bool bAxisDlg=true);
+ SchAxisDlg(vcl::Window* pParent, const InsertAxisOrGridDialogData& rInput, bool bAxisDlg=true);
virtual ~SchAxisDlg();
void getResult( InsertAxisOrGridDialogData& rOutput );
@@ -65,7 +65,7 @@ public:
class SchGridDlg : public SchAxisDlg
{
public:
- SchGridDlg( Window* pParent, const InsertAxisOrGridDialogData& rInput );
+ SchGridDlg( vcl::Window* pParent, const InsertAxisOrGridDialogData& rInput );
virtual ~SchGridDlg();
};
diff --git a/chart2/source/controller/inc/dlg_InsertDataLabel.hxx b/chart2/source/controller/inc/dlg_InsertDataLabel.hxx
index a5cd5e2be4ce..1cbed9f9a9c0 100644
--- a/chart2/source/controller/inc/dlg_InsertDataLabel.hxx
+++ b/chart2/source/controller/inc/dlg_InsertDataLabel.hxx
@@ -43,7 +43,7 @@ private:
void Reset();
public:
- DataLabelsDialog(Window* pParent, const SfxItemSet& rInAttrs, SvNumberFormatter* pFormatter);
+ DataLabelsDialog(vcl::Window* pParent, const SfxItemSet& rInAttrs, SvNumberFormatter* pFormatter);
virtual ~DataLabelsDialog();
void FillItemSet(SfxItemSet& rOutAttrs);
diff --git a/chart2/source/controller/inc/dlg_InsertErrorBars.hxx b/chart2/source/controller/inc/dlg_InsertErrorBars.hxx
index 39ff9750ad41..e981b718ec63 100644
--- a/chart2/source/controller/inc/dlg_InsertErrorBars.hxx
+++ b/chart2/source/controller/inc/dlg_InsertErrorBars.hxx
@@ -32,7 +32,7 @@ namespace chart
class InsertErrorBarsDialog : public ModalDialog
{
public:
- InsertErrorBarsDialog( Window* pParent, const SfxItemSet& rMyAttrs,
+ InsertErrorBarsDialog( vcl::Window* pParent, const SfxItemSet& rMyAttrs,
const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XChartDocument > & xChartDocument,
ErrorBarResources::tErrorBarType eType );
diff --git a/chart2/source/controller/inc/dlg_InsertLegend.hxx b/chart2/source/controller/inc/dlg_InsertLegend.hxx
index eee9c243e249..acfc45344e68 100644
--- a/chart2/source/controller/inc/dlg_InsertLegend.hxx
+++ b/chart2/source/controller/inc/dlg_InsertLegend.hxx
@@ -37,7 +37,7 @@ private:
boost::scoped_ptr < LegendPositionResources > m_xLegendPositionResources;
public:
- SchLegendDlg( Window* pParent, const ::com::sun::star::uno::Reference<
+ SchLegendDlg( vcl::Window* pParent, const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext>& xCC );
void init( const ::com::sun::star::uno::Reference<
diff --git a/chart2/source/controller/inc/dlg_InsertTitle.hxx b/chart2/source/controller/inc/dlg_InsertTitle.hxx
index b992606512d6..510b35563676 100644
--- a/chart2/source/controller/inc/dlg_InsertTitle.hxx
+++ b/chart2/source/controller/inc/dlg_InsertTitle.hxx
@@ -32,7 +32,7 @@ private:
boost::scoped_ptr< TitleResources > m_xTitleResources;
public:
- SchTitleDlg( Window* pParent, const TitleDialogData& rInput );
+ SchTitleDlg( vcl::Window* pParent, const TitleDialogData& rInput );
void getResult( TitleDialogData& rOutput );
};
diff --git a/chart2/source/controller/inc/dlg_ObjectProperties.hxx b/chart2/source/controller/inc/dlg_ObjectProperties.hxx
index 33013c3004f0..19b1bf2539c2 100644
--- a/chart2/source/controller/inc/dlg_ObjectProperties.hxx
+++ b/chart2/source/controller/inc/dlg_ObjectProperties.hxx
@@ -126,7 +126,7 @@ private:
DECL_LINK( OKPressed, void * );
public:
- SchAttribTabDlg(Window* pParent, const SfxItemSet* pAttr,
+ SchAttribTabDlg(vcl::Window* pParent, const SfxItemSet* pAttr,
const ObjectPropertiesDialogParameter* pDialogParameter,
const ViewElementListProvider* pViewElementListProvider,
const ::com::sun::star::uno::Reference<
diff --git a/chart2/source/controller/inc/dlg_ShapeFont.hxx b/chart2/source/controller/inc/dlg_ShapeFont.hxx
index 7a6aefbf7fc9..d9d082eb5399 100644
--- a/chart2/source/controller/inc/dlg_ShapeFont.hxx
+++ b/chart2/source/controller/inc/dlg_ShapeFont.hxx
@@ -31,7 +31,7 @@ class ViewElementListProvider;
class ShapeFontDialog : public SfxTabDialog
{
public:
- ShapeFontDialog(Window* pParent, const SfxItemSet* pAttr,
+ ShapeFontDialog(vcl::Window* pParent, const SfxItemSet* pAttr,
const ViewElementListProvider* pViewElementListProvider);
private:
virtual void PageCreated(sal_uInt16 nId, SfxTabPage& rPage) SAL_OVERRIDE;
diff --git a/chart2/source/controller/inc/dlg_ShapeParagraph.hxx b/chart2/source/controller/inc/dlg_ShapeParagraph.hxx
index e3b4bab64c16..8976daad1ec3 100644
--- a/chart2/source/controller/inc/dlg_ShapeParagraph.hxx
+++ b/chart2/source/controller/inc/dlg_ShapeParagraph.hxx
@@ -29,7 +29,7 @@ namespace chart
class ShapeParagraphDialog : public SfxTabDialog
{
public:
- ShapeParagraphDialog(Window* pParent, const SfxItemSet* pAttr);
+ ShapeParagraphDialog(vcl::Window* pParent, const SfxItemSet* pAttr);
private:
virtual void PageCreated(sal_uInt16 nId, SfxTabPage& rPage) SAL_OVERRIDE;
sal_uInt16 m_nTabPageId;
diff --git a/chart2/source/controller/inc/dlg_View3D.hxx b/chart2/source/controller/inc/dlg_View3D.hxx
index 6cc64087df78..fdfb35463625 100644
--- a/chart2/source/controller/inc/dlg_View3D.hxx
+++ b/chart2/source/controller/inc/dlg_View3D.hxx
@@ -37,7 +37,7 @@ class ThreeD_SceneIllumination_TabPage;
class View3DDialog : public TabDialog
{
public:
- View3DDialog( Window* pWindow,
+ View3DDialog( vcl::Window* pWindow,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & xChartModel,
const XColorListRef &pColorTable );
virtual ~View3DDialog();
diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx
index f1679922a07e..717c98b1920a 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -344,7 +344,7 @@ void SAL_CALL ChartController::attachFrame(
//create view @todo is this the correct place here??
- Window* pParent = NULL;
+ vcl::Window* pParent = NULL;
//get the window parent from the frame to use as parent for our new window
if(xFrame.is())
{
@@ -1427,7 +1427,7 @@ void ChartController::impl_initializeAccessible( const uno::Reference< lang::XIn
SolarMutexGuard aGuard;
if( m_pChartWindow )
{
- Window* pParentWin( m_pChartWindow->GetAccessibleParentWindow());
+ vcl::Window* pParentWin( m_pChartWindow->GetAccessibleParentWindow());
if( pParentWin )
xParent.set( pParentWin->GetAccessible());
}
diff --git a/chart2/source/controller/main/ChartController_EditData.cxx b/chart2/source/controller/main/ChartController_EditData.cxx
index 726ba03266fc..aebf313603cc 100644
--- a/chart2/source/controller/main/ChartController_EditData.cxx
+++ b/chart2/source/controller/main/ChartController_EditData.cxx
@@ -46,7 +46,7 @@ void ChartController::executeDispatch_EditData()
Reference< chart2::XChartDocument > xChartDoc( getModel(), uno::UNO_QUERY );
if( xChartDoc.is())
{
- Window* pParent( NULL );
+ vcl::Window* pParent( NULL );
Reference< ::com::sun::star::chart2::data::XDataProvider > xDataProvider( xChartDoc->getDataProvider());
diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx
index d4f60ea97a81..71a233a79527 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -545,7 +545,7 @@ IMPL_LINK_NOARG(ChartController, DoubleClickWaitingHdl)
SolarMutexGuard aGuard;
if( m_pChartWindow )
{
- Window::PointerState aPointerState( m_pChartWindow->GetPointerState() );
+ vcl::Window::PointerState aPointerState( m_pChartWindow->GetPointerState() );
MouseEvent aMouseEvent(
aPointerState.maPos,
1/*nClicks*/,
diff --git a/chart2/source/controller/main/ChartWindow.cxx b/chart2/source/controller/main/ChartWindow.cxx
index 4b7ea3a43a5f..93712142427c 100644
--- a/chart2/source/controller/main/ChartWindow.cxx
+++ b/chart2/source/controller/main/ChartWindow.cxx
@@ -45,7 +45,7 @@ namespace
namespace chart
{
-ChartWindow::ChartWindow( ChartController* pController, Window* pParent, WinBits nStyle )
+ChartWindow::ChartWindow( ChartController* pController, vcl::Window* pParent, WinBits nStyle )
: Window(pParent, nStyle)
, m_pWindowController( pController )
, m_bInPaint(false)
@@ -215,7 +215,7 @@ uno::Reference< css::accessibility::XAccessible > ChartWindow::CreateAccessible(
void ChartWindow::DataChanged( const DataChangedEvent& rDCEvt )
{
- ::Window::DataChanged( rDCEvt );
+ vcl::Window::DataChanged( rDCEvt );
if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) &&
(rDCEvt.GetFlags() & SETTINGS_STYLE) )
@@ -249,7 +249,7 @@ void ChartWindow::RequestHelp( const HelpEvent& rHEvt )
}
if( !bHelpHandled )
- ::Window::RequestHelp( rHEvt );
+ vcl::Window::RequestHelp( rHEvt );
}
void ChartWindow::adjustHighContrastMode()
@@ -264,7 +264,7 @@ void ChartWindow::adjustHighContrastMode()
void ChartWindow::ForceInvalidate()
{
- ::Window::Invalidate();
+ vcl::Window::Invalidate();
if(m_pOpenGLWindow)
{
m_pOpenGLWindow->Invalidate();
@@ -274,7 +274,7 @@ void ChartWindow::Invalidate( sal_uInt16 nFlags )
{
if( m_bInPaint ) // #i101928# superfluous paint calls while entering and editing charts"
return;
- ::Window::Invalidate( nFlags );
+ vcl::Window::Invalidate( nFlags );
if(m_pOpenGLWindow)
{
m_pOpenGLWindow->Invalidate( nFlags );
@@ -284,7 +284,7 @@ void ChartWindow::Invalidate( const Rectangle& rRect, sal_uInt16 nFlags )
{
if( m_bInPaint ) // #i101928# superfluous paint calls while entering and editing charts"
return;
- ::Window::Invalidate( rRect, nFlags );
+ vcl::Window::Invalidate( rRect, nFlags );
if(m_pOpenGLWindow)
{
m_pOpenGLWindow->Invalidate( rRect, nFlags );
@@ -294,7 +294,7 @@ void ChartWindow::Invalidate( const Region& rRegion, sal_uInt16 nFlags )
{
if( m_bInPaint ) // #i101928# superfluous paint calls while entering and editing charts"
return;
- ::Window::Invalidate( rRegion, nFlags );
+ vcl::Window::Invalidate( rRegion, nFlags );
if(m_pOpenGLWindow)
{
m_pOpenGLWindow->Invalidate( rRegion, nFlags );
diff --git a/chart2/source/controller/main/ChartWindow.hxx b/chart2/source/controller/main/ChartWindow.hxx
index ee5884f013e5..9dee31b22219 100644
--- a/chart2/source/controller/main/ChartWindow.hxx
+++ b/chart2/source/controller/main/ChartWindow.hxx
@@ -32,10 +32,10 @@ class ChartController;
thus the controller can perform appropriate actions
*/
-class ChartWindow : public Window
+class ChartWindow : public vcl::Window
{
public:
- ChartWindow( ChartController* pController, Window* pParent, WinBits nStyle );
+ ChartWindow( ChartController* pController, vcl::Window* pParent, WinBits nStyle );
virtual ~ChartWindow();
void clear();
diff --git a/chart2/source/controller/main/ElementSelector.cxx b/chart2/source/controller/main/ElementSelector.cxx
index dbfecd47f887..76657d5b05a8 100644
--- a/chart2/source/controller/main/ElementSelector.cxx
+++ b/chart2/source/controller/main/ElementSelector.cxx
@@ -50,7 +50,7 @@ namespace
static const OUString lcl_aServiceName( "com.sun.star.comp.chart.ElementSelectorToolbarController" );
}
-SelectorListBox::SelectorListBox( Window* pParent, WinBits nStyle )
+SelectorListBox::SelectorListBox( vcl::Window* pParent, WinBits nStyle )
: ListBox( pParent, nStyle )
, m_bReleaseFocus( true )
{
@@ -301,7 +301,7 @@ uno::Reference< awt::XWindow > SAL_CALL ElementSelectorToolbarController::create
uno::Reference< awt::XWindow > xItemWindow;
if( !m_apSelectorListBox.get() )
{
- Window* pParent = VCLUnoHelper::GetWindow( xParent );
+ vcl::Window* pParent = VCLUnoHelper::GetWindow( xParent );
if( pParent )
{
m_apSelectorListBox.reset( new SelectorListBox( pParent, WB_DROPDOWN|WB_AUTOHSCROLL|WB_BORDER ) );
diff --git a/chart2/source/controller/main/ElementSelector.hxx b/chart2/source/controller/main/ElementSelector.hxx
index 26d842880528..0b0d2b0409a1 100644
--- a/chart2/source/controller/main/ElementSelector.hxx
+++ b/chart2/source/controller/main/ElementSelector.hxx
@@ -47,7 +47,7 @@ struct ListBoxEntryData
class SelectorListBox : public ListBox
{
public:
- SelectorListBox( Window* pParent, WinBits nStyle );
+ SelectorListBox( vcl::Window* pParent, WinBits nStyle );
virtual ~SelectorListBox();
virtual void Select() SAL_OVERRIDE;
diff --git a/chart2/source/controller/main/ShapeController.cxx b/chart2/source/controller/main/ShapeController.cxx
index dea277159f20..52b5f1f6d4e4 100644
--- a/chart2/source/controller/main/ShapeController.cxx
+++ b/chart2/source/controller/main/ShapeController.cxx
@@ -252,7 +252,7 @@ void ShapeController::executeDispatch_FormatLine()
SolarMutexGuard aGuard;
if ( m_pChartController )
{
- Window* pParent = dynamic_cast< Window* >( m_pChartController->m_pChartWindow );
+ vcl::Window* pParent = dynamic_cast< vcl::Window* >( m_pChartController->m_pChartWindow );
DrawModelWrapper* pDrawModelWrapper = m_pChartController->GetDrawModelWrapper();
DrawViewWrapper* pDrawViewWrapper = m_pChartController->GetDrawViewWrapper();
if ( pParent && pDrawModelWrapper && pDrawViewWrapper )
@@ -292,7 +292,7 @@ void ShapeController::executeDispatch_FormatArea()
SolarMutexGuard aGuard;
if ( m_pChartController )
{
- Window* pParent = dynamic_cast< Window* >( m_pChartController->m_pChartWindow );
+ vcl::Window* pParent = dynamic_cast< vcl::Window* >( m_pChartController->m_pChartWindow );
DrawModelWrapper* pDrawModelWrapper = m_pChartController->GetDrawModelWrapper();
DrawViewWrapper* pDrawViewWrapper = m_pChartController->GetDrawViewWrapper();
if ( pParent && pDrawModelWrapper && pDrawViewWrapper )
@@ -335,7 +335,7 @@ void ShapeController::executeDispatch_TextAttributes()
SolarMutexGuard aGuard;
if ( m_pChartController )
{
- Window* pParent = dynamic_cast< Window* >( m_pChartController->m_pChartWindow );
+ vcl::Window* pParent = dynamic_cast< vcl::Window* >( m_pChartController->m_pChartWindow );
DrawViewWrapper* pDrawViewWrapper = m_pChartController->GetDrawViewWrapper();
if ( pParent && pDrawViewWrapper )
{
@@ -372,7 +372,7 @@ void ShapeController::executeDispatch_TransformDialog()
SolarMutexGuard aGuard;
if ( m_pChartController )
{
- Window* pParent = dynamic_cast< Window* >( m_pChartController->m_pChartWindow );
+ vcl::Window* pParent = dynamic_cast< vcl::Window* >( m_pChartController->m_pChartWindow );
DrawViewWrapper* pDrawViewWrapper = m_pChartController->GetDrawViewWrapper();
if ( pParent && pDrawViewWrapper )
{
@@ -541,7 +541,7 @@ void ShapeController::executeDispatch_FontDialog()
SolarMutexGuard aGuard;
if ( m_pChartController )
{
- Window* pParent = dynamic_cast< Window* >( m_pChartController->m_pChartWindow );
+ vcl::Window* pParent = dynamic_cast< vcl::Window* >( m_pChartController->m_pChartWindow );
DrawModelWrapper* pDrawModelWrapper = m_pChartController->GetDrawModelWrapper();
DrawViewWrapper* pDrawViewWrapper = m_pChartController->GetDrawViewWrapper();
if ( pParent && pDrawModelWrapper && pDrawViewWrapper )
@@ -564,7 +564,7 @@ void ShapeController::executeDispatch_ParagraphDialog()
SolarMutexGuard aGuard;
if ( m_pChartController )
{
- Window* pParent = dynamic_cast< Window* >( m_pChartController->m_pChartWindow );
+ vcl::Window* pParent = dynamic_cast< vcl::Window* >( m_pChartController->m_pChartWindow );
DrawViewWrapper* pDrawViewWrapper = m_pChartController->GetDrawViewWrapper();
if ( pParent && pDrawViewWrapper )
{
diff --git a/compilerplugins/clang/returnbyref.cxx b/compilerplugins/clang/returnbyref.cxx
index 59bee67f9531..b3044f37f9a5 100644
--- a/compilerplugins/clang/returnbyref.cxx
+++ b/compilerplugins/clang/returnbyref.cxx
@@ -59,7 +59,7 @@ bool ReturnByRef::VisitCXXMethodDecl(const CXXMethodDecl * functionDecl) {
return true;
}
// Ignore stuff like:
- // operator Window *(){ return &m_rWindow; }
+ // operator vcl::Window *(){ return &m_rWindow; }
if (dyn_cast< CXXConversionDecl >( functionDecl ) != nullptr) {
return true;
}
diff --git a/cppcanvas/qa/unit/test.cxx b/cppcanvas/qa/unit/test.cxx
index 06d8d6ea81aa..02a361692f76 100644
--- a/cppcanvas/qa/unit/test.cxx
+++ b/cppcanvas/qa/unit/test.cxx
@@ -43,7 +43,7 @@ public:
void CanvasTest::testComposite()
{
#ifdef LINUX
- boost::scoped_ptr<Window> pWin(new WorkWindow( (Window *)NULL ));
+ boost::scoped_ptr<vcl::Window> pWin(new WorkWindow( (vcl::Window *)NULL ));
uno::Reference<rendering::XCanvas> xCanvas = pWin->GetCanvas ();
if( !xCanvas.is() )
diff --git a/cppcanvas/source/wrapper/vclfactory.cxx b/cppcanvas/source/wrapper/vclfactory.cxx
index d27afa18099d..0b5f7c33fd80 100644
--- a/cppcanvas/source/wrapper/vclfactory.cxx
+++ b/cppcanvas/source/wrapper/vclfactory.cxx
@@ -71,7 +71,7 @@ namespace cppcanvas
new internal::ImplBitmapCanvas( xCanvas ) );
}
- SpriteCanvasSharedPtr VCLFactory::createSpriteCanvas( const ::Window& rVCLWindow ) const
+ SpriteCanvasSharedPtr VCLFactory::createSpriteCanvas( const vcl::Window& rVCLWindow ) const
{
return SpriteCanvasSharedPtr(
new internal::ImplSpriteCanvas(
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index cedfccc00331..bb7dd750e78d 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -661,7 +661,7 @@ void SfxAccCfgLBoxString_Impl::Paint(
}
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSfxAccCfgTabListBox(Window *pParent, VclBuilder::stringmap &rMap)
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSfxAccCfgTabListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap)
{
WinBits nWinBits = WB_TABSTOP;
@@ -729,7 +729,7 @@ void SfxAccCfgTabListBox_Impl::KeyInput(const KeyEvent& aKey)
}
-SfxAcceleratorConfigPage::SfxAcceleratorConfigPage( Window* pParent, const SfxItemSet& aSet )
+SfxAcceleratorConfigPage::SfxAcceleratorConfigPage( vcl::Window* pParent, const SfxItemSet& aSet )
: SfxTabPage(pParent, "AccelConfigPage", "cui/ui/accelconfigpage.ui", &aSet)
, m_pMacroInfoItem()
, m_pStringItem()
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 56d4bff2c6b0..30a7b8a26cf9 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -735,22 +735,22 @@ ConvertToolbarEntry(
return aPropSeq;
}
-SfxTabPage *CreateSvxMenuConfigPage( Window *pParent, const SfxItemSet* rSet )
+SfxTabPage *CreateSvxMenuConfigPage( vcl::Window *pParent, const SfxItemSet* rSet )
{
return new SvxMenuConfigPage( pParent, *rSet );
}
-SfxTabPage *CreateKeyboardConfigPage( Window *pParent, const SfxItemSet* rSet )
+SfxTabPage *CreateKeyboardConfigPage( vcl::Window *pParent, const SfxItemSet* rSet )
{
return new SfxAcceleratorConfigPage( pParent, *rSet );
}
-SfxTabPage *CreateSvxToolbarConfigPage( Window *pParent, const SfxItemSet* rSet )
+SfxTabPage *CreateSvxToolbarConfigPage( vcl::Window *pParent, const SfxItemSet* rSet )
{
return new SvxToolbarConfigPage( pParent, *rSet );
}
-SfxTabPage *CreateSvxEventConfigPage( Window *pParent, const SfxItemSet* rSet )
+SfxTabPage *CreateSvxEventConfigPage( vcl::Window *pParent, const SfxItemSet* rSet )
{
return new SvxEventConfigPage( pParent, *rSet, SvxEventConfigPage::EarlyInit() );
}
@@ -780,7 +780,7 @@ bool showKeyConfigTabPage( const css::uno::Reference< css::frame::XFrame >& xFra
* key bindings.
*
*****************************************************************************/
-SvxConfigDialog::SvxConfigDialog(Window * pParent, const SfxItemSet* pInSet)
+SvxConfigDialog::SvxConfigDialog(vcl::Window * pParent, const SfxItemSet* pInSet)
: SfxTabDialog(pParent, "CustomizeDialog",
"cui/ui/customizedialog.ui", pInSet)
, m_nMenusPageId(0)
@@ -1378,7 +1378,7 @@ public:
* listbox
*
*****************************************************************************/
-SvxMenuEntriesListBox::SvxMenuEntriesListBox(Window* pParent, SvxConfigPage* pPg)
+SvxMenuEntriesListBox::SvxMenuEntriesListBox(vcl::Window* pParent, SvxConfigPage* pPg)
: SvTreeListBox(pParent, WB_TABSTOP|WB_CLIPCHILDREN|WB_HIDESELECTION|WB_BORDER)
, pPage(pPg)
, m_bIsInternalDrag( false )
@@ -1517,7 +1517,7 @@ void SvxMenuEntriesListBox::KeyInput( const KeyEvent& rKeyEvent )
* both tabpages to add, delete, move and rename items etc.
*
*****************************************************************************/
-SvxConfigPage::SvxConfigPage(Window *pParent, const SfxItemSet& rSet)
+SvxConfigPage::SvxConfigPage(vcl::Window *pParent, const SfxItemSet& rSet)
: SfxTabPage(pParent, "MenuAssignPage", "cui/ui/menuassignpage.ui", &rSet)
, bInitialised(false)
, pCurrentSaveInData(0)
@@ -2172,7 +2172,7 @@ bool SvxConfigPage::MoveEntryData(
return false;
}
-SvxMenuConfigPage::SvxMenuConfigPage(Window *pParent, const SfxItemSet& rSet)
+SvxMenuConfigPage::SvxMenuConfigPage(vcl::Window *pParent, const SfxItemSet& rSet)
: SvxConfigPage(pParent, rSet)
{
m_pContentsListBox = new SvxMenuEntriesListBox(m_pEntries, this);
@@ -2576,7 +2576,7 @@ SaveInData* SvxMenuConfigPage::CreateSaveInData(
}
SvxMainMenuOrganizerDialog::SvxMainMenuOrganizerDialog(
- Window* pParent, SvxEntries* entries,
+ vcl::Window* pParent, SvxEntries* entries,
SvxConfigEntry* selection, bool bCreateMenu )
: ModalDialog(pParent, "MoveMenuDialog", "cui/ui/movemenu.ui")
, bModified(false)
@@ -2835,7 +2835,7 @@ bool SvxConfigEntry::IsRenamable()
return true;
}
-SvxToolbarConfigPage::SvxToolbarConfigPage(Window *pParent, const SfxItemSet& rSet)
+SvxToolbarConfigPage::SvxToolbarConfigPage(vcl::Window *pParent, const SfxItemSet& rSet)
: SvxConfigPage(pParent, rSet)
{
SetHelpId( HID_SVX_CONFIG_TOOLBAR );
@@ -3476,7 +3476,7 @@ void ToolbarSaveInData::SetSystemStyle(
// this code is a temporary hack as the UI is not updating after
// changing the toolbar style via the API
uno::Reference< css::frame::XLayoutManager > xLayoutManager;
- Window *window = NULL;
+ vcl::Window *window = NULL;
uno::Reference< beans::XPropertySet > xPropSet( xFrame, uno::UNO_QUERY );
if ( xPropSet.is() )
@@ -4515,7 +4515,7 @@ SvTreeListEntry* SvxToolbarConfigPage::AddFunction(
return pNewLBEntry;
}
-SvxToolbarEntriesListBox::SvxToolbarEntriesListBox(Window* pParent, SvxToolbarConfigPage* pPg)
+SvxToolbarEntriesListBox::SvxToolbarEntriesListBox(vcl::Window* pParent, SvxToolbarConfigPage* pPg)
: SvxMenuEntriesListBox(pParent, pPg)
, pPage(pPg)
{
@@ -4697,7 +4697,7 @@ TriState SvxToolbarEntriesListBox::NotifyCopying(
return TRISTATE_FALSE;
}
-SvxNewToolbarDialog::SvxNewToolbarDialog(Window* pWindow, const OUString& rName)
+SvxNewToolbarDialog::SvxNewToolbarDialog(vcl::Window* pWindow, const OUString& rName)
: ModalDialog(pWindow, "NewToolbarDialog", "cui/ui/newtoolbardialog.ui")
{
get(m_pEdtName, "edit");
@@ -4724,7 +4724,7 @@ IMPL_LINK(SvxNewToolbarDialog, ModifyHdl, Edit*, pEdit)
* The SvxIconSelectorDialog class
*
*******************************************************************************/
-SvxIconSelectorDialog::SvxIconSelectorDialog( Window *pWindow,
+SvxIconSelectorDialog::SvxIconSelectorDialog( vcl::Window *pWindow,
const uno::Reference< css::ui::XImageManager >& rXImageManager,
const uno::Reference< css::ui::XImageManager >& rXParentImageManager )
:
@@ -5302,7 +5302,7 @@ bool SvxIconSelectorDialog::ImportGraphic( const OUString& aURL )
*
*******************************************************************************/
SvxIconReplacementDialog :: SvxIconReplacementDialog(
- Window *pWindow, const OUString& aMessage, bool /*bYestoAll*/ )
+ vcl::Window *pWindow, const OUString& aMessage, bool /*bYestoAll*/ )
:
MessBox( pWindow, WB_DEF_YES, CUI_RES( RID_SVXSTR_REPLACE_ICON_CONFIRM ), CUI_RES( RID_SVXSTR_REPLACE_ICON_WARNING ) )
@@ -5317,7 +5317,7 @@ MessBox( pWindow, WB_DEF_YES, CUI_RES( RID_SVXSTR_REPLACE_ICON_CONFIRM ), CUI_R
}
SvxIconReplacementDialog :: SvxIconReplacementDialog(
- Window *pWindow, const OUString& aMessage )
+ vcl::Window *pWindow, const OUString& aMessage )
:
MessBox( pWindow, WB_YES_NO_CANCEL, CUI_RES( RID_SVXSTR_REPLACE_ICON_CONFIRM ), CUI_RES( RID_SVXSTR_REPLACE_ICON_WARNING ) )
{
@@ -5350,7 +5350,7 @@ sal_uInt16 SvxIconReplacementDialog :: ShowDialog()
*
*******************************************************************************/
SvxIconChangeDialog::SvxIconChangeDialog(
- Window *pWindow, const OUString& aMessage)
+ vcl::Window *pWindow, const OUString& aMessage)
:ModalDialog(pWindow, "IconChange", "cui/ui/iconchangedialog.ui")
{
get(pFImageInfo, "infoImage");
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index 787534a27a60..641f3b46496f 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -249,7 +249,7 @@ void SfxStylesInfo_Impl::getLabel4Style(SfxStyleInfo_Impl& aStyle)
return lStyles;
}
-SfxConfigFunctionListBox::SfxConfigFunctionListBox(Window* pParent, WinBits nStyle)
+SfxConfigFunctionListBox::SfxConfigFunctionListBox(vcl::Window* pParent, WinBits nStyle)
: SvTreeListBox( pParent, nStyle )
, pCurEntry( 0 )
, pStylesInfo( 0 )
@@ -263,7 +263,7 @@ SfxConfigFunctionListBox::SfxConfigFunctionListBox(Window* pParent, WinBits nSty
LINK( this, SfxConfigFunctionListBox, TimerHdl ) );
}
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSfxConfigFunctionListBox(Window *pParent, VclBuilder::stringmap &rMap)
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSfxConfigFunctionListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap)
{
WinBits nWinBits = WB_TABSTOP;
@@ -410,7 +410,7 @@ SvxConfigGroupBoxResource_Impl::SvxConfigGroupBoxResource_Impl() :
FreeResource();
}
-SfxConfigGroupListBox::SfxConfigGroupListBox(Window* pParent, WinBits nStyle)
+SfxConfigGroupListBox::SfxConfigGroupListBox(vcl::Window* pParent, WinBits nStyle)
: SvTreeListBox(pParent, nStyle)
, pImp(new SvxConfigGroupBoxResource_Impl()), pFunctionListBox(0), pStylesInfo(0)
{
@@ -418,7 +418,7 @@ SfxConfigGroupListBox::SfxConfigGroupListBox(Window* pParent, WinBits nStyle)
SetNodeBitmaps( pImp->m_collapsedImage, pImp->m_expandedImage );
}
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSfxConfigGroupListBox(Window *pParent, VclBuilder::stringmap &rMap)
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSfxConfigGroupListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap)
{
WinBits nWinBits = WB_TABSTOP;
diff --git a/cui/source/customize/eventdlg.cxx b/cui/source/customize/eventdlg.cxx
index 92238045faf3..bee41ccf336d 100644
--- a/cui/source/customize/eventdlg.cxx
+++ b/cui/source/customize/eventdlg.cxx
@@ -54,7 +54,7 @@
using namespace ::com::sun::star;
-SvxEventConfigPage::SvxEventConfigPage(Window *pParent, const SfxItemSet& rSet,
+SvxEventConfigPage::SvxEventConfigPage(vcl::Window *pParent, const SfxItemSet& rSet,
SvxEventConfigPage::EarlyInit)
: _SvxMacroTabPage(pParent, "EventsConfigPage",
"cui/ui/eventsconfigpage.ui", rSet)
diff --git a/cui/source/customize/eventdlg.hxx b/cui/source/customize/eventdlg.hxx
index b883ab200f06..b6b6c61fdcb2 100644
--- a/cui/source/customize/eventdlg.hxx
+++ b/cui/source/customize/eventdlg.hxx
@@ -47,7 +47,7 @@ public:
/// this is only to let callers know that there is a LateInit which *must* be called
struct EarlyInit { };
- SvxEventConfigPage( Window *pParent, const SfxItemSet& rSet, EarlyInit );
+ SvxEventConfigPage( vcl::Window *pParent, const SfxItemSet& rSet, EarlyInit );
virtual ~SvxEventConfigPage();
void LateInit( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame );
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index f8398a924a57..336277272d07 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -129,7 +129,7 @@ bool MacroEventListBox::Notify( NotifyEvent& rNEvt )
return nRet;
}
-MacroEventListBox::MacroEventListBox( Window* pParent, WinBits nStyle )
+MacroEventListBox::MacroEventListBox( vcl::Window* pParent, WinBits nStyle )
: Control( pParent, nStyle )
, maHeaderBar( this, WB_BUTTONSTYLE | WB_BOTTOMBORDER )
, maListBox( this, WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP )
@@ -140,7 +140,7 @@ MacroEventListBox::MacroEventListBox( Window* pParent, WinBits nStyle )
maListBox.EnableCellFocus();
}
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeMacroEventListBox(Window *pParent, VclBuilder::stringmap &rMap)
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeMacroEventListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap)
{
WinBits nWinBits = WB_TABSTOP;
@@ -212,7 +212,7 @@ void _SvxMacroTabPage::EnableButtons()
}
}
-_SvxMacroTabPage::_SvxMacroTabPage(Window* pParent, const OString& rID,
+_SvxMacroTabPage::_SvxMacroTabPage(vcl::Window* pParent, const OString& rID,
const OUString& rUIXMLDescription, const SfxItemSet& rAttrSet)
: SfxTabPage( pParent, rID, rUIXMLDescription, &rAttrSet ),
m_xAppEvents(0),
@@ -801,7 +801,7 @@ Any _SvxMacroTabPage::GetPropsByName( const OUString& eventName, EventsHash& eve
return ::std::make_pair( type, url );
}
-SvxMacroTabPage::SvxMacroTabPage(Window* pParent,
+SvxMacroTabPage::SvxMacroTabPage(vcl::Window* pParent,
const Reference< frame::XFrame >& _rxDocumentFrame,
const SfxItemSet& rSet,
Reference< container::XNameReplace > xNameReplace,
@@ -835,7 +835,7 @@ SvxMacroTabPage::SvxMacroTabPage(Window* pParent,
rListBox.Select(pE);
}
-SvxMacroAssignDlg::SvxMacroAssignDlg( Window* pParent, const Reference< frame::XFrame >& _rxDocumentFrame, const SfxItemSet& rSet,
+SvxMacroAssignDlg::SvxMacroAssignDlg( vcl::Window* pParent, const Reference< frame::XFrame >& _rxDocumentFrame, const SfxItemSet& rSet,
const Reference< container::XNameReplace >& xNameReplace, sal_uInt16 nSelectedIndex )
: SvxMacroAssignSingleTabDialog(pParent, rSet)
{
@@ -857,7 +857,7 @@ IMPL_LINK_NOARG(AssignComponentDialog, ButtonHandler)
return 0;
}
-AssignComponentDialog::AssignComponentDialog( Window * pParent, const OUString& rURL )
+AssignComponentDialog::AssignComponentDialog( vcl::Window * pParent, const OUString& rURL )
: ModalDialog( pParent, "AssignComponent", "cui/ui/assigncomponentdialog.ui" )
, maURL( rURL )
{
@@ -890,7 +890,7 @@ IMPL_LINK( SvxMacroAssignSingleTabDialog, OKHdl_Impl, Button *, pButton )
-SvxMacroAssignSingleTabDialog::SvxMacroAssignSingleTabDialog(Window *pParent,
+SvxMacroAssignSingleTabDialog::SvxMacroAssignSingleTabDialog(vcl::Window *pParent,
const SfxItemSet& rSet)
: SfxSingleTabDialog(pParent, rSet, "MacroAssignDialog", "cui/ui/macroassigndialog.ui")
{
diff --git a/cui/source/customize/macropg_impl.hxx b/cui/source/customize/macropg_impl.hxx
index 4f8e824db0b3..7babc45611a5 100644
--- a/cui/source/customize/macropg_impl.hxx
+++ b/cui/source/customize/macropg_impl.hxx
@@ -48,7 +48,7 @@ private:
DECL_LINK(ButtonHandler, void *);
public:
- AssignComponentDialog( Window * pParent, const OUString& rURL );
+ AssignComponentDialog( vcl::Window * pParent, const OUString& rURL );
virtual ~AssignComponentDialog();
OUString getURL( void ) const
diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx
index 2b3b995f19ee..5541697f4380 100644
--- a/cui/source/customize/selector.cxx
+++ b/cui/source/customize/selector.cxx
@@ -73,7 +73,7 @@ using namespace ::com::sun::star::container;
* The implementations of SvxConfigFunctionListBox and
* SvxConfigGroupListBox are copied from sfx2/source/dialog/cfg.cxx
*/
-SvxConfigFunctionListBox::SvxConfigFunctionListBox(Window* pParent, WinBits nStyle)
+SvxConfigFunctionListBox::SvxConfigFunctionListBox(vcl::Window* pParent, WinBits nStyle)
: SvTreeListBox(pParent, nStyle | WB_CLIPCHILDREN | WB_HSCROLL | WB_SORT | WB_TABSTOP)
, pCurEntry(0)
, m_pDraggingEntry(0)
@@ -86,7 +86,7 @@ SvxConfigFunctionListBox::SvxConfigFunctionListBox(Window* pParent, WinBits nSty
LINK( this, SvxConfigFunctionListBox, TimerHdl ) );
}
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxConfigFunctionListBox(Window *pParent, VclBuilder::stringmap &rMap)
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxConfigFunctionListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap)
{
WinBits nWinBits = WB_TABSTOP;
@@ -193,7 +193,7 @@ SvxConfigFunctionListBox::AcceptDrop( const AcceptDropEvent& /*rEvt*/ )
return DND_ACTION_NONE;
}
-SvxConfigGroupListBox::SvxConfigGroupListBox(Window* pParent, WinBits nStyle)
+SvxConfigGroupListBox::SvxConfigGroupListBox(vcl::Window* pParent, WinBits nStyle)
: SvTreeListBox(pParent, nStyle |
WB_CLIPCHILDREN | WB_HSCROLL | WB_HASBUTTONS | WB_HASLINES | WB_HASLINESATROOT | WB_HASBUTTONSATROOT | WB_TABSTOP)
, m_bShowSlots(false)
@@ -214,7 +214,7 @@ SvxConfigGroupListBox::SvxConfigGroupListBox(Window* pParent, WinBits nStyle)
);
}
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxConfigGroupListBox(Window *pParent, VclBuilder::stringmap &rMap)
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxConfigGroupListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap)
{
WinBits nWinBits = WB_TABSTOP;
@@ -858,7 +858,7 @@ void SvxConfigGroupListBox::RequestingChildren( SvTreeListEntry *pEntry )
*/
SvxScriptSelectorDialog::SvxScriptSelectorDialog(
- Window* pParent, bool bShowSlots, const Reference< frame::XFrame >& xFrame)
+ vcl::Window* pParent, bool bShowSlots, const Reference< frame::XFrame >& xFrame)
: ModelessDialog(pParent, "MacroSelectorDialog", "cui/ui/macroselectordialog.ui")
, m_bShowSlots(bShowSlots)
{
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index df7500531e31..a6440fce4afc 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -175,7 +175,7 @@ sal_uInt16 SpellUndoAction_Impl::GetId()const
// class SvxSpellCheckDialog ---------------------------------------------
SpellDialog::SpellDialog(SpellDialogChildWindow* pChildWindow,
- Window * pParent, SfxBindings* _pBindings)
+ vcl::Window * pParent, SfxBindings* _pBindings)
: SfxModelessDialog (_pBindings, pChildWindow,
pParent, "SpellingDialog", "cui/ui/spellingdialog.ui")
, aDialogUndoLink(LINK (this, SpellDialog, DialogUndoHdl))
@@ -1009,7 +1009,7 @@ void SpellDialog::InvalidateDialog()
if( bFocusLocked )
return;
m_pIgnorePB->SetText(m_sResumeST);
- Window* aDisableArr[] =
+ vcl::Window* aDisableArr[] =
{
m_pNotInDictFT,
m_pSentenceED,
@@ -1179,7 +1179,7 @@ bool SpellDialog::ApplyChangeAllList_Impl(SpellPortions& rSentence, bool &bHasRe
}
-SentenceEditWindow_Impl::SentenceEditWindow_Impl(Window * pParent, WinBits nBits)
+SentenceEditWindow_Impl::SentenceEditWindow_Impl(vcl::Window * pParent, WinBits nBits)
: VclMultiLineEdit(pParent, nBits)
, m_nErrorStart(0)
, m_nErrorEnd(0)
@@ -1188,7 +1188,7 @@ SentenceEditWindow_Impl::SentenceEditWindow_Impl(Window * pParent, WinBits nBits
DisableSelectionOnFocus();
}
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSentenceEditWindow(Window *pParent,
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSentenceEditWindow(vcl::Window *pParent,
VclBuilder::stringmap &)
{
return new SentenceEditWindow_Impl(pParent, WB_BORDER|WB_VSCROLL|WB_IGNORETAB);
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index 8236ebacc06a..0ac795a618b1 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -61,7 +61,7 @@ enum AboutDialogButton
WEBSITE_BUTTON
};
-AboutDialog::AboutDialog(Window* pParent)
+AboutDialog::AboutDialog(vcl::Window* pParent)
: SfxModalDialog(pParent, "AboutDialog", "cui/ui/aboutdialog.ui")
{
get(m_pLogoReplacement, "logoreplacement");
diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx
index d972c2c02341..3b31d409499f 100644
--- a/cui/source/dialogs/colorpicker.cxx
+++ b/cui/source/dialogs/colorpicker.cxx
@@ -133,7 +133,7 @@ static void RGBtoCMYK( double dR, double dG, double dB, double& fCyan, double& f
class HexColorControl : public Edit
{
public:
- HexColorControl( Window* pParent, const WinBits& nStyle );
+ HexColorControl( vcl::Window* pParent, const WinBits& nStyle );
virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
virtual void Paste() SAL_OVERRIDE;
@@ -145,13 +145,13 @@ private:
bool ImplProcessKeyInput( const KeyEvent& rKEv );
};
-HexColorControl::HexColorControl( Window* pParent, const WinBits& nStyle )
+HexColorControl::HexColorControl( vcl::Window* pParent, const WinBits& nStyle )
: Edit( pParent, nStyle )
{
SetMaxTextLen( 6 );
}
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeHexColorControl(Window *pParent, VclBuilder::stringmap &)
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeHexColorControl(vcl::Window *pParent, VclBuilder::stringmap &)
{
return new HexColorControl(pParent, WB_BORDER);
}
@@ -261,7 +261,7 @@ bool HexColorControl::ImplProcessKeyInput( const KeyEvent& rKEv )
class ColorPreviewControl : public Control
{
public:
- ColorPreviewControl( Window* pParent, const WinBits& nStyle );
+ ColorPreviewControl( vcl::Window* pParent, const WinBits& nStyle );
virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE;
@@ -270,14 +270,14 @@ private:
Color maColor;
};
-ColorPreviewControl::ColorPreviewControl( Window* pParent, const WinBits& nStyle )
+ColorPreviewControl::ColorPreviewControl( vcl::Window* pParent, const WinBits& nStyle )
: Control( pParent, nStyle )
{
SetFillColor( maColor );
SetLineColor( maColor );
}
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeColorPreviewControl(Window *pParent, VclBuilder::stringmap &rMap)
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeColorPreviewControl(vcl::Window *pParent, VclBuilder::stringmap &rMap)
{
WinBits nBits = 0;
@@ -310,7 +310,7 @@ const ColorMode DefaultMode = HUE;
class ColorFieldControl : public Control
{
public:
- ColorFieldControl( Window* pParent, const WinBits& nStyle );
+ ColorFieldControl( vcl::Window* pParent, const WinBits& nStyle );
virtual ~ColorFieldControl();
virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE;
@@ -350,7 +350,7 @@ private:
std::vector< sal_uInt16 > maPercent_Vert;
};
-ColorFieldControl::ColorFieldControl( Window* pParent, const WinBits& nStyle )
+ColorFieldControl::ColorFieldControl( vcl::Window* pParent, const WinBits& nStyle )
: Control( pParent, nStyle )
, meMode( DefaultMode )
, mdX( -1.0 )
@@ -365,7 +365,7 @@ ColorFieldControl::~ColorFieldControl()
delete mpBitmap;
}
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeColorFieldControl(Window *pParent, VclBuilder::stringmap &rMap)
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeColorFieldControl(vcl::Window *pParent, VclBuilder::stringmap &rMap)
{
WinBits nBits = 0;
@@ -702,7 +702,7 @@ void ColorFieldControl::UpdatePosition()
class ColorSliderControl : public Control
{
public:
- ColorSliderControl( Window* pParent, const WinBits& nStyle );
+ ColorSliderControl( vcl::Window* pParent, const WinBits& nStyle );
virtual ~ColorSliderControl();
virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE;
@@ -734,7 +734,7 @@ private:
double mdValue;
};
-ColorSliderControl::ColorSliderControl( Window* pParent, const WinBits& nStyle )
+ColorSliderControl::ColorSliderControl( vcl::Window* pParent, const WinBits& nStyle )
: Control( pParent, nStyle )
, meMode( DefaultMode )
, mpBitmap( 0 )
@@ -749,7 +749,7 @@ ColorSliderControl::~ColorSliderControl()
delete mpBitmap;
}
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeColorSliderControl(Window *pParent, VclBuilder::stringmap &rMap)
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeColorSliderControl(vcl::Window *pParent, VclBuilder::stringmap &rMap)
{
WinBits nBits = 0;
@@ -958,7 +958,7 @@ const sal_uInt16 UPDATE_ALL = 0xff;
class ColorPickerDialog : public ModalDialog
{
public:
- ColorPickerDialog( Window* pParent, sal_Int32 nColor, sal_Int16 nMode );
+ ColorPickerDialog( vcl::Window* pParent, sal_Int32 nColor, sal_Int16 nMode );
void update_color( sal_uInt16 n = UPDATE_ALL );
@@ -1010,7 +1010,7 @@ private:
MetricField* mpMFKey;
};
-ColorPickerDialog::ColorPickerDialog( Window* pParent, sal_Int32 nColor, sal_Int16 nMode )
+ColorPickerDialog::ColorPickerDialog( vcl::Window* pParent, sal_Int32 nColor, sal_Int16 nMode )
: ModalDialog( pParent, "ColorPicker", "cui/ui/colorpickerdialog.ui" )
, maPreviousColor( nColor )
, mnDialogMode( nMode )
diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx
index 81ad04832245..ca9ca03a15c4 100644
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -43,7 +43,7 @@
// class SvxCharacterMap =================================================
-SvxCharacterMap::SvxCharacterMap( Window* pParent, bool bOne_, const SfxItemSet* pSet )
+SvxCharacterMap::SvxCharacterMap( vcl::Window* pParent, bool bOne_, const SfxItemSet* pSet )
: SfxModalDialog(pParent, "SpecialCharactersDialog", "cui/ui/specialcharacters.ui")
, bOne( bOne_ )
, pSubsetMap( NULL )
@@ -166,13 +166,13 @@ short SvxCharacterMap::Execute()
// class SvxShowText =====================================================
-SvxShowText::SvxShowText(Window* pParent, bool bCenter)
+SvxShowText::SvxShowText(vcl::Window* pParent, bool bCenter)
: Control(pParent)
, mnY(0)
, mbCenter(bCenter)
{}
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxShowText(Window *pParent, VclBuilder::stringmap &)
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxShowText(vcl::Window *pParent, VclBuilder::stringmap &)
{
return new SvxShowText(pParent);
}
diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx
index 393567a098e4..d1856f453deb 100644
--- a/cui/source/dialogs/cuifmsearch.cxx
+++ b/cui/source/dialogs/cuifmsearch.cxx
@@ -74,7 +74,7 @@ void FmSearchDialog::initCommon( const Reference< XResultSet >& _rxCursor )
m_pbClose->SetHelpText(OUString());
}
-FmSearchDialog::FmSearchDialog(Window* pParent, const OUString& sInitialText, const ::std::vector< OUString >& _rContexts, sal_Int16 nInitialContext,
+FmSearchDialog::FmSearchDialog(vcl::Window* pParent, const OUString& sInitialText, const ::std::vector< OUString >& _rContexts, sal_Int16 nInitialContext,
const Link& lnkContextSupplier)
:ModalDialog(pParent, "RecordSearchDialog", "cui/ui/fmsearchdialog.ui")
,m_sCancel ( Button::GetStandardText( BUTTON_CANCEL ) )
@@ -559,7 +559,7 @@ void FmSearchDialog::EnableSearchUI(bool bEnable)
if ( !bEnable )
{
// if one of my children has the focus, remember it
- Window* pFocusWindow = Application::GetFocusWindow( );
+ vcl::Window* pFocusWindow = Application::GetFocusWindow( );
if ( pFocusWindow && IsChild( pFocusWindow ) )
m_pPreSearchFocus = pFocusWindow;
else
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index 0dbe89c2fb2d..eb811fee61fe 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -204,7 +204,7 @@ void SearchThread::ImplSearch( const INetURLObject& rStartURL,
// - SearchProgress -
-SearchProgress::SearchProgress( Window* pParent, const INetURLObject& rStartURL )
+SearchProgress::SearchProgress( vcl::Window* pParent, const INetURLObject& rStartURL )
: ModalDialog(pParent, "GallerySearchProgress", "cui/ui/gallerysearchprogress.ui")
, parent_(pParent)
, startUrl_(rStartURL)
@@ -335,7 +335,7 @@ void TakeThread::execute()
}
// - TakeProgress -
-TakeProgress::TakeProgress(Window* pWindow)
+TakeProgress::TakeProgress(vcl::Window* pWindow)
: ModalDialog(pWindow, "GalleryApplyProgress",
"cui/ui/galleryapplyprogress.ui")
, window_(pWindow)
@@ -433,7 +433,7 @@ void TakeProgress::StartExecuteModal( const Link& rEndDialogHdl )
// - ActualizeProgress -
-ActualizeProgress::ActualizeProgress(Window* pWindow, GalleryTheme* pThm)
+ActualizeProgress::ActualizeProgress(vcl::Window* pWindow, GalleryTheme* pThm)
: ModalDialog(pWindow, "GalleryUpdateProgress",
"cui/ui/galleryupdateprogress.ui")
, pTimer(NULL)
@@ -508,7 +508,7 @@ IMPL_LINK( ActualizeProgress, ActualizeHdl, INetURLObject*, pURL )
return 0;
}
-TitleDialog::TitleDialog(Window* pParent, const OUString& rOldTitle)
+TitleDialog::TitleDialog(vcl::Window* pParent, const OUString& rOldTitle)
: ModalDialog(pParent, "GalleryTitleDialog", "cui/ui/gallerytitledialog.ui")
{
get(m_pEdit, "entry");
@@ -520,7 +520,7 @@ TitleDialog::TitleDialog(Window* pParent, const OUString& rOldTitle)
// - GalleryIdDialog -
-GalleryIdDialog::GalleryIdDialog( Window* pParent, GalleryTheme* _pThm )
+GalleryIdDialog::GalleryIdDialog( vcl::Window* pParent, GalleryTheme* _pThm )
: ModalDialog(pParent, "GalleryThemeIDDialog", "cui/ui/gallerythemeiddialog.ui")
, pThm(_pThm )
{
@@ -575,7 +575,7 @@ IMPL_LINK_NOARG(GalleryIdDialog, ClickOkHdl)
// - GalleryThemeProperties -
-GalleryThemeProperties::GalleryThemeProperties(Window* pParent,
+GalleryThemeProperties::GalleryThemeProperties(vcl::Window* pParent,
ExchangeData* _pData, SfxItemSet* pItemSet)
: SfxTabDialog( pParent, "GalleryThemeDialog",
"cui/ui/gallerythemedialog.ui", pItemSet)
@@ -608,7 +608,7 @@ void GalleryThemeProperties::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
}
// - TPGalleryThemeGeneral -
-TPGalleryThemeGeneral::TPGalleryThemeGeneral(Window* pParent, const SfxItemSet& rSet)
+TPGalleryThemeGeneral::TPGalleryThemeGeneral(vcl::Window* pParent, const SfxItemSet& rSet)
: SfxTabPage(pParent, "GalleryGeneralPage",
"cui/ui/gallerygeneralpage.ui", &rSet)
, pData(NULL)
@@ -687,13 +687,13 @@ bool TPGalleryThemeGeneral::FillItemSet( SfxItemSet* /*rSet*/ )
-SfxTabPage* TPGalleryThemeGeneral::Create( Window* pParent, const SfxItemSet* rSet )
+SfxTabPage* TPGalleryThemeGeneral::Create( vcl::Window* pParent, const SfxItemSet* rSet )
{
return new TPGalleryThemeGeneral( pParent, *rSet );
}
// - TPGalleryThemeProperties -
-TPGalleryThemeProperties::TPGalleryThemeProperties( Window* pWindow, const SfxItemSet& rSet )
+TPGalleryThemeProperties::TPGalleryThemeProperties( vcl::Window* pWindow, const SfxItemSet& rSet )
: SfxTabPage(pWindow, "GalleryFilesPage", "cui/ui/galleryfilespage.ui", &rSet)
, pData(NULL)
, nCurFilterPos(0)
@@ -771,7 +771,7 @@ TPGalleryThemeProperties::~TPGalleryThemeProperties()
-SfxTabPage* TPGalleryThemeProperties::Create( Window* pParent, const SfxItemSet* rSet )
+SfxTabPage* TPGalleryThemeProperties::Create( vcl::Window* pParent, const SfxItemSet* rSet )
{
return new TPGalleryThemeProperties( pParent, *rSet );
}
diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx
index cb26be4b4251..57a853c7f74a 100644
--- a/cui/source/dialogs/cuigrfflt.cxx
+++ b/cui/source/dialogs/cuigrfflt.cxx
@@ -28,7 +28,7 @@
#include <cuires.hrc>
#include <svx/dialogs.hrc>
-GraphicPreviewWindow::GraphicPreviewWindow(Window* pParent,
+GraphicPreviewWindow::GraphicPreviewWindow(vcl::Window* pParent,
const WinBits nStyle)
: Control(pParent, nStyle)
, mpOrigGraphic(NULL)
@@ -37,7 +37,7 @@ GraphicPreviewWindow::GraphicPreviewWindow(Window* pParent,
{
}
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeGraphicPreviewWindow(Window *pParent, VclBuilder::stringmap &rMap)
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeGraphicPreviewWindow(vcl::Window *pParent, VclBuilder::stringmap &rMap)
{
WinBits nWinBits = WB_TABSTOP;
@@ -136,7 +136,7 @@ void GraphicPreviewWindow::Resize()
ScaleImageToFit();
}
-GraphicFilterDialog::GraphicFilterDialog(Window* pParent,
+GraphicFilterDialog::GraphicFilterDialog(vcl::Window* pParent,
const OString& rID, const OUString& rUIXMLDescription,
const Graphic& rGraphic)
: ModalDialog(pParent, rID, rUIXMLDescription)
@@ -181,7 +181,7 @@ IMPL_LINK_NOARG(GraphicFilterDialog, ImplModifyHdl)
// - FilterMosaic -
-GraphicFilterMosaic::GraphicFilterMosaic( Window* pParent, const Graphic& rGraphic,
+GraphicFilterMosaic::GraphicFilterMosaic( vcl::Window* pParent, const Graphic& rGraphic,
sal_uInt16 nTileWidth, sal_uInt16 nTileHeight, bool bEnhanceEdges )
: GraphicFilterDialog(pParent, "MosaicDialog",
"cui/ui/mosaicdialog.ui", rGraphic)
@@ -246,7 +246,7 @@ Graphic GraphicFilterMosaic::GetFilteredGraphic( const Graphic& rGraphic,
// - GraphicFilterSmooth -
-GraphicFilterSmooth::GraphicFilterSmooth( Window* pParent, const Graphic& rGraphic, double nRadius)
+GraphicFilterSmooth::GraphicFilterSmooth( vcl::Window* pParent, const Graphic& rGraphic, double nRadius)
: GraphicFilterDialog(pParent, "SmoothDialog",
"cui/ui/smoothdialog.ui", rGraphic)
{
@@ -290,7 +290,7 @@ Graphic GraphicFilterSmooth::GetFilteredGraphic( const Graphic& rGraphic, double
// - GraphicFilterSolarize -
-GraphicFilterSolarize::GraphicFilterSolarize( Window* pParent, const Graphic& rGraphic,
+GraphicFilterSolarize::GraphicFilterSolarize( vcl::Window* pParent, const Graphic& rGraphic,
sal_uInt8 cGreyThreshold, bool bInvert )
: GraphicFilterDialog(pParent, "SolarizeDialog",
"cui/ui/solarizedialog.ui", rGraphic)
@@ -345,7 +345,7 @@ Graphic GraphicFilterSolarize::GetFilteredGraphic( const Graphic& rGraphic,
// - GraphicFilterSepia -
-GraphicFilterSepia::GraphicFilterSepia( Window* pParent, const Graphic& rGraphic,
+GraphicFilterSepia::GraphicFilterSepia( vcl::Window* pParent, const Graphic& rGraphic,
sal_uInt16 nSepiaPercent )
: GraphicFilterDialog(pParent, "AgingDialog",
"cui/ui/agingdialog.ui", rGraphic)
@@ -386,7 +386,7 @@ Graphic GraphicFilterSepia::GetFilteredGraphic( const Graphic& rGraphic,
// - GraphicFilterPoster -
-GraphicFilterPoster::GraphicFilterPoster(Window* pParent, const Graphic& rGraphic,
+GraphicFilterPoster::GraphicFilterPoster(vcl::Window* pParent, const Graphic& rGraphic,
sal_uInt16 nPosterCount)
: GraphicFilterDialog(pParent, "PosterDialog",
"cui/ui/posterdialog.ui", rGraphic)
@@ -444,14 +444,14 @@ Size EmbossControl::GetOptimalSize() const
return LogicToPixel(Size(77, 60), MAP_APPFONT);
}
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeEmbossControl(Window *pParent, VclBuilder::stringmap &)
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeEmbossControl(vcl::Window *pParent, VclBuilder::stringmap &)
{
return new EmbossControl(pParent);
}
-GraphicFilterEmboss::GraphicFilterEmboss(Window* pParent,
+GraphicFilterEmboss::GraphicFilterEmboss(vcl::Window* pParent,
const Graphic& rGraphic, RECT_POINT eLightSource)
: GraphicFilterDialog (pParent, "EmbossDialog",
"cui/ui/embossdialog.ui", rGraphic)
diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx
index ae8cf489d18d..7224ed36c8da 100644
--- a/cui/source/dialogs/cuihyperdlg.cxx
+++ b/cui/source/dialogs/cuihyperdlg.cxx
@@ -81,7 +81,7 @@ void SvxHlinkCtrl::StateChanged( sal_uInt16 nSID, SfxItemState eState,
|*
|************************************************************************/
-SvxHpLinkDlg::SvxHpLinkDlg (Window* pParent, SfxBindings* pBindings)
+SvxHpLinkDlg::SvxHpLinkDlg (vcl::Window* pParent, SfxBindings* pBindings)
: IconChoiceDialog( pParent, "HyperlinkDialog", "cui/ui/hyperlinkdialog.ui" ),
maCtrl ( SID_HYPERLINK_GETLINK, *pBindings, this ),
mpBindings ( pBindings ),
diff --git a/cui/source/dialogs/cuiimapwnd.cxx b/cui/source/dialogs/cuiimapwnd.cxx
index 2eeacbdaa459..118da3fc5c50 100644
--- a/cui/source/dialogs/cuiimapwnd.cxx
+++ b/cui/source/dialogs/cuiimapwnd.cxx
@@ -48,7 +48,7 @@
|*
\************************************************************************/
-URLDlg::URLDlg( Window* pWindow, const OUString& rURL, const OUString& rAlternativeText, const OUString& rDescription, const OUString& rTarget, const OUString& rName, TargetList& rTargetList )
+URLDlg::URLDlg( vcl::Window* pWindow, const OUString& rURL, const OUString& rAlternativeText, const OUString& rDescription, const OUString& rTarget, const OUString& rName, TargetList& rTargetList )
: ModalDialog(pWindow, "IMapDialog", "cui/ui/cuiimapdlg.ui")
{
get(m_pEdtURL, "urlentry");
diff --git a/cui/source/dialogs/cuitbxform.cxx b/cui/source/dialogs/cuitbxform.cxx
index 134712df14a9..46ae5b5e78d6 100644
--- a/cui/source/dialogs/cuitbxform.cxx
+++ b/cui/source/dialogs/cuitbxform.cxx
@@ -30,7 +30,7 @@
#include <sfx2/viewfrm.hxx>
#include <sfx2/viewsh.hxx>
-FmInputRecordNoDialog::FmInputRecordNoDialog(Window * pParent)
+FmInputRecordNoDialog::FmInputRecordNoDialog(vcl::Window * pParent)
: ModalDialog( pParent, "RecordNumberDialog", "cui/ui/recordnumberdialog.ui")
{
get(m_pRecordNo, "entry-nospin");
diff --git a/cui/source/dialogs/dlgname.cxx b/cui/source/dialogs/dlgname.cxx
index f032a59391b7..83ee94c07fce 100644
--- a/cui/source/dialogs/dlgname.cxx
+++ b/cui/source/dialogs/dlgname.cxx
@@ -31,7 +31,7 @@
|*
\************************************************************************/
-SvxNameDialog::SvxNameDialog( Window* pWindow, const OUString& rName, const OUString& rDesc ) :
+SvxNameDialog::SvxNameDialog( vcl::Window* pWindow, const OUString& rName, const OUString& rDesc ) :
ModalDialog ( pWindow, "NameDialog", "cui/ui/namedialog.ui" )
{
get(pBtnOK, "ok");
@@ -58,7 +58,7 @@ IMPL_LINK_NOARG(SvxNameDialog, ModifyHdl)
// plus uniqueness-callback-linkHandler
SvxObjectNameDialog::SvxObjectNameDialog(
- Window* pWindow,
+ vcl::Window* pWindow,
const OUString& rName) :
ModalDialog ( pWindow, "ObjectNameDialog", "cui/ui/objectnamedialog.ui" )
{
@@ -88,7 +88,7 @@ IMPL_LINK_NOARG(SvxObjectNameDialog, ModifyHdl)
// Dialog for editing Object Title and Description
SvxObjectTitleDescDialog::SvxObjectTitleDescDialog(
- Window* pWindow,
+ vcl::Window* pWindow,
const OUString& rTitle,
const OUString& rDescription) :
ModalDialog ( pWindow, "ObjectTitleDescDialog", "cui/ui/objecttitledescdialog.ui" )
@@ -113,7 +113,7 @@ SvxObjectTitleDescDialog::SvxObjectTitleDescDialog(
|*
\************************************************************************/
-SvxMessDialog::SvxMessDialog( Window* pWindow, const OUString& rText, const OUString& rDesc, Image* pImg )
+SvxMessDialog::SvxMessDialog( vcl::Window* pWindow, const OUString& rText, const OUString& rDesc, Image* pImg )
: ModalDialog(pWindow, "MessBox", "cui/ui/messbox.ui")
, pImage(NULL)
{
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx
index 791bb7d340de..4ff53ba2457a 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -212,7 +212,7 @@ namespace svx
{
public:
- RubyRadioButton( Window* _pParent, WinBits nBits );
+ RubyRadioButton( vcl::Window* _pParent, WinBits nBits );
void init( const OUString& rPrimaryText, const OUString& rSecondaryText, const PseudoRubyText::RubyPosition& rPosition );
virtual Size GetOptimalSize() const SAL_OVERRIDE;
@@ -223,7 +223,7 @@ namespace svx
PseudoRubyText m_aRubyText;
};
- RubyRadioButton::RubyRadioButton( Window* _pParent, WinBits nBits )
+ RubyRadioButton::RubyRadioButton( vcl::Window* _pParent, WinBits nBits )
:RadioButton( _pParent, nBits )
{
}
@@ -322,7 +322,7 @@ namespace svx
return minimumSize;
}
- extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeRubyRadioButton( Window *pParent, VclBuilder::stringmap & )
+ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeRubyRadioButton( vcl::Window *pParent, VclBuilder::stringmap & )
{
return new RubyRadioButton( pParent, WB_LEFT|WB_VCENTER );
}
@@ -330,7 +330,7 @@ namespace svx
//= SuggestionSet
- SuggestionSet::SuggestionSet( Window* pParent )
+ SuggestionSet::SuggestionSet( vcl::Window* pParent )
: ValueSet( pParent, pParent->GetStyle() | WB_BORDER )
{
@@ -363,7 +363,7 @@ namespace svx
//= SuggestionDisplay
- SuggestionDisplay::SuggestionDisplay( Window* pParent, WinBits nBits )
+ SuggestionDisplay::SuggestionDisplay( vcl::Window* pParent, WinBits nBits )
: Control( pParent, nBits )
, m_bDisplayListBox( true )
, m_aValueSet( this )
@@ -522,7 +522,7 @@ namespace svx
m_aListBox.SetHelpId( HID_HANGULDLG_SUGGESTIONS_LIST );
}
- extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSuggestionDisplay( Window *pParent, VclBuilder::stringmap & )
+ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSuggestionDisplay( vcl::Window *pParent, VclBuilder::stringmap & )
{
return new SuggestionDisplay( pParent, WB_ITEMBORDER | WB_FLATVALUESET | WB_VSCROLL );
}
@@ -530,7 +530,7 @@ namespace svx
//= HangulHanjaConversionDialog
- HangulHanjaConversionDialog::HangulHanjaConversionDialog( Window* _pParent, HHC::ConversionDirection _ePrimaryDirection )
+ HangulHanjaConversionDialog::HangulHanjaConversionDialog( vcl::Window* _pParent, HHC::ConversionDirection _ePrimaryDirection )
:ModalDialog( _pParent, "HangulHanjaConversionDialog", "cui/ui/hangulhanjaconversiondialog.ui" )
,m_pIgnoreNonPrimary( NULL )
,m_bDocumentMode( true )
@@ -744,7 +744,7 @@ namespace svx
namespace
{
- void lcl_modifyWindowStyle( Window* _pWin, WinBits _nSet, WinBits _nReset )
+ void lcl_modifyWindowStyle( vcl::Window* _pWin, WinBits _nSet, WinBits _nReset )
{
DBG_ASSERT( 0 == ( _nSet & _nReset ), "lcl_modifyWindowStyle: set _and_ reset the same bit?" );
if ( _pWin )
@@ -767,8 +767,8 @@ namespace svx
// switch the def button depending if we're working for document text
if ( bOldDocumentMode != m_bDocumentMode )
{
- Window* pOldDefButton = NULL;
- Window* pNewDefButton = NULL;
+ vcl::Window* pOldDefButton = NULL;
+ vcl::Window* pNewDefButton = NULL;
if ( m_bDocumentMode )
{
pOldDefButton = m_pFind;
@@ -1077,7 +1077,7 @@ namespace svx
return 0L;
}
- HangulHanjaOptionsDialog::HangulHanjaOptionsDialog(Window* _pParent)
+ HangulHanjaOptionsDialog::HangulHanjaOptionsDialog(vcl::Window* _pParent)
: ModalDialog( _pParent, "HangulHanjaOptDialog",
"cui/ui/hangulhanjaoptdialog.ui" )
, m_pCheckButtonData(NULL)
@@ -1172,7 +1172,7 @@ namespace svx
return 0;
}
- HangulHanjaNewDictDialog::HangulHanjaNewDictDialog(Window* pParent)
+ HangulHanjaNewDictDialog::HangulHanjaNewDictDialog(vcl::Window* pParent)
: ModalDialog(pParent, "HangulHanjaAddDialog", "cui/ui/hangulhanjaadddialog.ui")
, m_bEntered(false)
{
@@ -1350,7 +1350,7 @@ namespace svx
( static_cast< HangulHanjaEditDictDialog* >( GetParentDialog() ) )->UpdateScrollbar();
}
- SuggestionEdit::SuggestionEdit( Window* pParent, WinBits nBits )
+ SuggestionEdit::SuggestionEdit( vcl::Window* pParent, WinBits nBits )
: Edit(pParent, nBits)
, m_pPrev(NULL)
, m_pNext(NULL)
@@ -1418,7 +1418,7 @@ namespace svx
m_pNext = pNext;
}
- extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSuggestionEdit( Window *pParent, VclBuilder::stringmap & )
+ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSuggestionEdit( vcl::Window *pParent, VclBuilder::stringmap & )
{
return new SuggestionEdit( pParent, WB_LEFT|WB_VCENTER|WB_BORDER );
}
@@ -1703,7 +1703,7 @@ namespace svx
UpdateButtonStates();
}
- HangulHanjaEditDictDialog::HangulHanjaEditDictDialog( Window* _pParent, HHDictList& _rDictList, sal_uInt32 _nSelDict )
+ HangulHanjaEditDictDialog::HangulHanjaEditDictDialog( vcl::Window* _pParent, HHDictList& _rDictList, sal_uInt32 _nSelDict )
:ModalDialog ( _pParent, "HangulHanjaEditDictDialog", "cui/ui/hangulhanjaeditdictdialog.ui" )
,m_aEditHintText ( CUI_RESSTR(RID_SVXSTR_EDITHINT) )
,m_rDictList ( _rDictList )
diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx
index b9ed4cad71d4..97ea77ddd274 100644
--- a/cui/source/dialogs/hldocntp.cxx
+++ b/cui/source/dialogs/hldocntp.cxx
@@ -98,7 +98,7 @@ bool SvxHyperlinkNewDocTp::ImplGetURLObject( const OUString& rPath, const OUStri
|*
|************************************************************************/
-SvxHyperlinkNewDocTp::SvxHyperlinkNewDocTp ( Window *pParent, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet)
+SvxHyperlinkNewDocTp::SvxHyperlinkNewDocTp ( vcl::Window *pParent, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet)
: SvxHyperlinkTabPageBase ( pParent, pDlg, "HyperlinkNewDocPage", "cui/ui/hyperlinknewdocpage.ui", rItemSet )
{
get(m_pRbtEditNow, "editnow");
@@ -233,7 +233,7 @@ void SvxHyperlinkNewDocTp::GetCurentItemData ( OUString& rStrURL, OUString& aStr
|*
|************************************************************************/
-IconChoicePage* SvxHyperlinkNewDocTp::Create( Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet )
+IconChoicePage* SvxHyperlinkNewDocTp::Create( vcl::Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet )
{
return( new SvxHyperlinkNewDocTp( pWindow, pDlg, rItemSet ) );
}
diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx
index 2a8308168d96..3764ddc52d0d 100644
--- a/cui/source/dialogs/hldoctp.cxx
+++ b/cui/source/dialogs/hldoctp.cxx
@@ -34,7 +34,7 @@ sal_Char const sFileScheme[] = INET_FILE_SCHEME;
|*
|************************************************************************/
-SvxHyperlinkDocTp::SvxHyperlinkDocTp ( Window *pParent, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet)
+SvxHyperlinkDocTp::SvxHyperlinkDocTp ( vcl::Window *pParent, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet)
: SvxHyperlinkTabPageBase ( pParent, pDlg, "HyperlinkDocPage", "cui/ui/hyperlinkdocpage.ui", rItemSet ),
mbMarkWndOpen ( false )
{
@@ -157,7 +157,7 @@ void SvxHyperlinkDocTp::GetCurentItemData ( OUString& rStrURL, OUString& aStrNam
|*
|************************************************************************/
-IconChoicePage* SvxHyperlinkDocTp::Create( Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet )
+IconChoicePage* SvxHyperlinkDocTp::Create( vcl::Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet )
{
return( new SvxHyperlinkDocTp( pWindow, pDlg, rItemSet ) );
}
diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx
index 832f3c4dec9d..433d06f08978 100644
--- a/cui/source/dialogs/hlinettp.cxx
+++ b/cui/source/dialogs/hlinettp.cxx
@@ -34,7 +34,7 @@ sal_Char const sFTPScheme[] = INET_FTP_SCHEME;
|*
|************************************************************************/
-SvxHyperlinkInternetTp::SvxHyperlinkInternetTp ( Window *pParent,
+SvxHyperlinkInternetTp::SvxHyperlinkInternetTp ( vcl::Window *pParent,
IconChoiceDialog* pDlg,
const SfxItemSet& rItemSet)
: SvxHyperlinkTabPageBase ( pParent, pDlg, "HyperlinkInternetPage", "cui/ui/hyperlinkinternetpage.ui",
@@ -187,7 +187,7 @@ OUString SvxHyperlinkInternetTp::CreateAbsoluteURL() const
|*
|************************************************************************/
-IconChoicePage* SvxHyperlinkInternetTp::Create( Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet )
+IconChoicePage* SvxHyperlinkInternetTp::Create( vcl::Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet )
{
return( new SvxHyperlinkInternetTp( pWindow, pDlg, rItemSet ) );
}
diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx
index daaec31ed649..00f8c97131d4 100644
--- a/cui/source/dialogs/hlmailtp.cxx
+++ b/cui/source/dialogs/hlmailtp.cxx
@@ -38,7 +38,7 @@ using namespace ::com::sun::star;
|*
|************************************************************************/
-SvxHyperlinkMailTp::SvxHyperlinkMailTp ( Window *pParent, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet)
+SvxHyperlinkMailTp::SvxHyperlinkMailTp ( vcl::Window *pParent, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet)
: SvxHyperlinkTabPageBase ( pParent, pDlg, "HyperlinkMailPage", "cui/ui/hyperlinkmailpage.ui",
rItemSet )
{
@@ -169,7 +169,7 @@ OUString SvxHyperlinkMailTp::CreateAbsoluteURL() const
|*
|************************************************************************/
-IconChoicePage* SvxHyperlinkMailTp::Create( Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet )
+IconChoicePage* SvxHyperlinkMailTp::Create( vcl::Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet )
{
return( new SvxHyperlinkMailTp( pWindow, pDlg, rItemSet ) );
}
diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx
index 0f45021c63fc..77ea1b8e17d7 100644
--- a/cui/source/dialogs/hlmarkwn.cxx
+++ b/cui/source/dialogs/hlmarkwn.cxx
@@ -66,14 +66,14 @@ struct TargetData
//# #
//# Tree-Window #
//# #
-SvxHlmarkTreeLBox::SvxHlmarkTreeLBox(Window* pParent, WinBits nStyle)
+SvxHlmarkTreeLBox::SvxHlmarkTreeLBox(vcl::Window* pParent, WinBits nStyle)
: SvTreeListBox(pParent, nStyle)
, mpParentWnd(NULL)
{
SetNodeDefaultImages();
}
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxHlmarkTreeLBox(Window *pParent, VclBuilder::stringmap &rMap)
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxHlmarkTreeLBox(vcl::Window *pParent, VclBuilder::stringmap &rMap)
{
WinBits nWinStyle = WB_TABSTOP;
OString sBorder = VclBuilder::extractCustomProperty(rMap);
diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx
index 7719ffb1dbda..369f4ee7b8ba 100644
--- a/cui/source/dialogs/hltpbase.cxx
+++ b/cui/source/dialogs/hltpbase.cxx
@@ -35,13 +35,13 @@ using namespace ::ucbhelper;
//# ComboBox-Control for URL's with History and Autocompletion #
-SvxHyperURLBox::SvxHyperURLBox( Window* pParent, INetProtocol eSmart )
+SvxHyperURLBox::SvxHyperURLBox( vcl::Window* pParent, INetProtocol eSmart )
: SvtURLBox ( pParent, eSmart ),
DropTargetHelper ( this )
{
}
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxHyperURLBox(Window *pParent, VclBuilder::stringmap &)
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxHyperURLBox(vcl::Window *pParent, VclBuilder::stringmap &)
{
return new SvxHyperURLBox(pParent, INET_PROT_HTTP);
}
@@ -85,7 +85,7 @@ bool SvxHyperURLBox::PreNotify( NotifyEvent& rNEvt )
//# Hyperlink-Dialog: Tabpages-Baseclass #
-SvxHyperlinkTabPageBase::SvxHyperlinkTabPageBase ( Window *pParent,
+SvxHyperlinkTabPageBase::SvxHyperlinkTabPageBase ( vcl::Window *pParent,
IconChoiceDialog* pDlg,
const OString& rID,
const OUString& rUIXMLDescription,
@@ -178,7 +178,7 @@ bool SvxHyperlinkTabPageBase::MoveToExtraWnd( Point aNewPos, bool bDisConnectDlg
// Show Extra-Window
void SvxHyperlinkTabPageBase::ShowMarkWnd ()
{
- ( ( Window* ) mpMarkWnd )->Show();
+ ( ( vcl::Window* ) mpMarkWnd )->Show();
// Size of dialog-window in screen pixels
Rectangle aDlgRect( mpDialog->GetWindowExtentsRelative( NULL ) );
diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx
index 383c45423fdd..4fd8aab64a4e 100644
--- a/cui/source/dialogs/hyphen.cxx
+++ b/cui/source/dialogs/hyphen.cxx
@@ -36,12 +36,12 @@
using namespace css;
-HyphenEdit::HyphenEdit(Window* pParent)
+HyphenEdit::HyphenEdit(vcl::Window* pParent)
: Edit(pParent, WB_LEFT|WB_VCENTER|WB_BORDER|WB_3DLOOK|WB_TABSTOP)
{
}
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeHyphenEdit(Window *pParent, VclBuilder::stringmap &)
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeHyphenEdit(vcl::Window *pParent, VclBuilder::stringmap &)
{
return new HyphenEdit(pParent);
}
@@ -454,7 +454,7 @@ IMPL_LINK_NOARG(SvxHyphenWordDialog, GetFocusHdl_Impl)
SvxHyphenWordDialog::SvxHyphenWordDialog(
const OUString &rWord, LanguageType nLang,
- Window* pParent,
+ vcl::Window* pParent,
uno::Reference< linguistic2::XHyphenator > &xHyphen,
SvxSpellWrapper* pWrapper)
: SfxModalDialog(pParent, "HyphenateDialog", "cui/ui/hyphenate.ui")
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx
index 4b1e48062e32..122a339c34ce 100644
--- a/cui/source/dialogs/iconcdlg.cxx
+++ b/cui/source/dialogs/iconcdlg.cxx
@@ -40,7 +40,7 @@ using ::std::vector;
|
\**********************************************************************/
-IconChoicePage::IconChoicePage( Window *pParent, const OString& rID,
+IconChoicePage::IconChoicePage( vcl::Window *pParent, const OString& rID,
const OUString& rUIXMLDescription,
const SfxItemSet &rAttrSet )
: TabPage ( pParent, rID, rUIXMLDescription ),
@@ -106,7 +106,7 @@ bool IconChoicePage::QueryClose()
void IconChoicePage::ImplInitSettings()
{
- Window* pParent = GetParent();
+ vcl::Window* pParent = GetParent();
if ( pParent->IsChildTransparentModeEnabled() && !IsControlBackground() )
{
EnableChildTransparentMode( true );
@@ -166,14 +166,14 @@ void IconChoicePage::DataChanged( const DataChangedEvent& rDCEvt )
|
\**********************************************************************/
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvtIconChoiceCtrl(Window *pParent, VclBuilder::stringmap &)
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvtIconChoiceCtrl(vcl::Window *pParent, VclBuilder::stringmap &)
{
return new SvtIconChoiceCtrl(pParent, WB_3DLOOK | WB_ICON | WB_BORDER |
WB_NOCOLUMNHEADER | WB_HIGHLIGHTFRAME |
WB_NODRAGSELECTION | WB_TABSTOP);
}
-IconChoiceDialog::IconChoiceDialog ( Window* pParent, const OString& rID,
+IconChoiceDialog::IconChoiceDialog ( vcl::Window* pParent, const OString& rID,
const OUString& rUIXMLDescription,
const SfxItemSet *pItemSet )
: ModalDialog ( pParent, rID, rUIXMLDescription ),
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index 6a092a64bda1..cf22d8d858a7 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -91,7 +91,7 @@ uno::Reference< io::XInputStream > InsertObjectDialog_Impl::GetIconIfIconified(
return uno::Reference< io::XInputStream >();
}
-InsertObjectDialog_Impl::InsertObjectDialog_Impl(Window * pParent, const OString& rID,
+InsertObjectDialog_Impl::InsertObjectDialog_Impl(vcl::Window * pParent, const OString& rID,
const OUString& rUIXMLDescription,
const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage)
: ModalDialog(pParent, rID, rUIXMLDescription)
@@ -167,7 +167,7 @@ void SvInsertOleDlg::SelectDefault()
SvInsertOleDlg::SvInsertOleDlg
(
- Window* pParent,
+ vcl::Window* pParent,
const Reference < embed::XStorage >& xStorage,
const SvObjectServerList* pServers
)
@@ -383,7 +383,7 @@ IMPL_LINK_NOARG(SvInsertPlugInDialog, BrowseHdl)
-SvInsertPlugInDialog::SvInsertPlugInDialog(Window* pParent,
+SvInsertPlugInDialog::SvInsertPlugInDialog(vcl::Window* pParent,
const uno::Reference < embed::XStorage >& xStorage)
: InsertObjectDialog_Impl(pParent, "InsertPluginDialog", "cui/ui/insertplugin.ui", xStorage)
, m_pURL(0)
@@ -472,7 +472,7 @@ short SvInsertPlugInDialog::Execute()
return nRet;
}
-SfxInsertFloatingFrameDialog::SfxInsertFloatingFrameDialog( Window *pParent,
+SfxInsertFloatingFrameDialog::SfxInsertFloatingFrameDialog( vcl::Window *pParent,
const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage )
: InsertObjectDialog_Impl( pParent, "InsertFloatingFrameDialog", "cui/ui/insertfloatingframe.ui",
xStorage )
@@ -480,7 +480,7 @@ SfxInsertFloatingFrameDialog::SfxInsertFloatingFrameDialog( Window *pParent,
Init();
}
-SfxInsertFloatingFrameDialog::SfxInsertFloatingFrameDialog( Window *pParent,
+SfxInsertFloatingFrameDialog::SfxInsertFloatingFrameDialog( vcl::Window *pParent,
const uno::Reference < embed::XEmbeddedObject >& xObj )
: InsertObjectDialog_Impl( pParent, "InsertFloatingFrameDialog", "cui/ui/insertfloatingframe.ui",
uno::Reference < embed::XStorage >() )
@@ -718,7 +718,7 @@ IMPL_STATIC_LINK( SfxInsertFloatingFrameDialog, CheckHdl, CheckBox*, pCB )
IMPL_STATIC_LINK( SfxInsertFloatingFrameDialog, OpenHdl, PushButton*, EMPTYARG )
{
- Window* pOldParent = Application::GetDefDialogParent();
+ vcl::Window* pOldParent = Application::GetDefDialogParent();
Application::SetDefDialogParent( pThis );
// create the file dialog
diff --git a/cui/source/dialogs/insrc.cxx b/cui/source/dialogs/insrc.cxx
index cf6319cc1cfe..c3c167cca62d 100644
--- a/cui/source/dialogs/insrc.cxx
+++ b/cui/source/dialogs/insrc.cxx
@@ -32,7 +32,7 @@ sal_uInt16 SvxInsRowColDlg::getInsertCount() const
return static_cast< sal_uInt16 >( m_pCountEdit->GetValue() );
}
-SvxInsRowColDlg::SvxInsRowColDlg(Window* pParent, bool bCol, const OString& sHelpId )
+SvxInsRowColDlg::SvxInsRowColDlg(vcl::Window* pParent, bool bCol, const OString& sHelpId )
: ModalDialog(pParent, "InsertRowColumnDialog", "cui/ui/insertrowcolumn.ui")
, aRow(CUI_RESSTR(RID_SVXSTR_ROW))
, aCol(CUI_RESSTR(RID_SVXSTR_COL))
diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx
index 45c5801fe6a6..ce2078554c29 100644
--- a/cui/source/dialogs/linkdlg.cxx
+++ b/cui/source/dialogs/linkdlg.cxx
@@ -85,7 +85,7 @@ static long nTabs[] =
};
-SvBaseLinksDlg::SvBaseLinksDlg( Window * pParent, LinkManager* pMgr, bool bHtml )
+SvBaseLinksDlg::SvBaseLinksDlg( vcl::Window * pParent, LinkManager* pMgr, bool bHtml )
: ModalDialog( pParent, "BaseLinksDialog", "cui/ui/baselinksdialog.ui"),
aStrAutolink( CUI_RES( STR_AUTOLINK ) ),
aStrManuallink( CUI_RES( STR_MANUALLINK ) ),
diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx
index b353e2dfe747..1685afb527e7 100644
--- a/cui/source/dialogs/multipat.cxx
+++ b/cui/source/dialogs/multipat.cxx
@@ -176,7 +176,7 @@ IMPL_LINK_NOARG(SvxPathSelectDialog, DelHdl_Impl)
return 0;
}
-SvxMultiPathDialog::SvxMultiPathDialog(Window* pParent)
+SvxMultiPathDialog::SvxMultiPathDialog(vcl::Window* pParent)
: ModalDialog(pParent, "MultiPathDialog", "cui/ui/multipathdialog.ui")
{
get(m_pAddBtn, "add");
@@ -205,7 +205,7 @@ SvxMultiPathDialog::SvxMultiPathDialog(Window* pParent)
m_pRadioLB->ShowTable();
}
-SvxPathSelectDialog::SvxPathSelectDialog(Window* pParent)
+SvxPathSelectDialog::SvxPathSelectDialog(vcl::Window* pParent)
: ModalDialog(pParent, "SelectPathDialog", "cui/ui/selectpathdialog.ui")
{
get(m_pAddBtn, "add");
diff --git a/cui/source/dialogs/newtabledlg.cxx b/cui/source/dialogs/newtabledlg.cxx
index d9a1844e1d8c..1fcf49d2ee04 100644
--- a/cui/source/dialogs/newtabledlg.cxx
+++ b/cui/source/dialogs/newtabledlg.cxx
@@ -21,7 +21,7 @@
#include "dialmgr.hxx"
#include "newtabledlg.hxx"
-SvxNewTableDialog::SvxNewTableDialog( Window* pParent )
+SvxNewTableDialog::SvxNewTableDialog( vcl::Window* pParent )
: ModalDialog( pParent, "NewTableDialog", "cui/ui/newtabledialog.ui" )
{
get(mpNumRows, "rows");
diff --git a/cui/source/dialogs/passwdomdlg.cxx b/cui/source/dialogs/passwdomdlg.cxx
index cf9faf80336f..bca8cd9c211e 100644
--- a/cui/source/dialogs/passwdomdlg.cxx
+++ b/cui/source/dialogs/passwdomdlg.cxx
@@ -142,7 +142,7 @@ IMPL_LINK( PasswordToOpenModifyDialog_Impl, OkBtnClickHdl, OKButton *, EMPTYARG
}
PasswordToOpenModifyDialog::PasswordToOpenModifyDialog(
- Window * pParent, sal_uInt16 nMinPasswdLen,
+ vcl::Window * pParent, sal_uInt16 nMinPasswdLen,
sal_uInt16 nMaxPasswdLen, bool bIsPasswordToModify)
: SfxModalDialog( pParent, "PasswordDialog", "cui/ui/password.ui" )
{
diff --git a/cui/source/dialogs/pastedlg.cxx b/cui/source/dialogs/pastedlg.cxx
index e1e984d8105e..d8bff176376c 100644
--- a/cui/source/dialogs/pastedlg.cxx
+++ b/cui/source/dialogs/pastedlg.cxx
@@ -37,7 +37,7 @@
#include <dialmgr.hxx>
#include <boost/scoped_ptr.hpp>
-SvPasteObjectDialog::SvPasteObjectDialog( Window* pParent )
+SvPasteObjectDialog::SvPasteObjectDialog( vcl::Window* pParent )
: ModalDialog(pParent, "PasteSpecialDialog", "cui/ui/pastespecial.ui")
{
get(m_pFtObjectSource, "source");
diff --git a/cui/source/dialogs/postdlg.cxx b/cui/source/dialogs/postdlg.cxx
index bf2d6a33f3bd..3bec42caa6ad 100644
--- a/cui/source/dialogs/postdlg.cxx
+++ b/cui/source/dialogs/postdlg.cxx
@@ -38,7 +38,7 @@
// class SvxPostItDialog -------------------------------------------------
-SvxPostItDialog::SvxPostItDialog(Window* pParent, const SfxItemSet& rCoreSet,
+SvxPostItDialog::SvxPostItDialog(vcl::Window* pParent, const SfxItemSet& rCoreSet,
bool bPrevNext)
: SfxModalDialog(pParent, "CommentDialog", "cui/ui/comment.ui")
, rSet(rCoreSet)
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index 358e5d540605..23d46bf10627 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -74,7 +74,7 @@ void ShowErrorDialog( const Any& aException )
pDlg->Execute();
}
-SFTreeListBox::SFTreeListBox(Window* pParent)
+SFTreeListBox::SFTreeListBox(vcl::Window* pParent)
: SvTreeListBox(pParent)
, m_hdImage(CUI_RES(RID_CUIIMG_HARDDISK))
, m_libImage(CUI_RES(RID_CUIIMG_LIB))
@@ -93,7 +93,7 @@ SFTreeListBox::SFTreeListBox(Window* pParent)
nMode = 0xFF; // everything
}
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSFTreeListBox(Window *pParent, VclBuilder::stringmap &)
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSFTreeListBox(vcl::Window *pParent, VclBuilder::stringmap &)
{
return new SFTreeListBox(pParent);
}
@@ -425,7 +425,7 @@ void SFTreeListBox::ExpandedHdl()
// CuiInputDialog ------------------------------------------------------------
-CuiInputDialog::CuiInputDialog(Window * pParent, sal_uInt16 nMode )
+CuiInputDialog::CuiInputDialog(vcl::Window * pParent, sal_uInt16 nMode )
: ModalDialog(pParent, "NewLibDialog",
"cui/ui/newlibdialog.ui")
{
@@ -453,7 +453,7 @@ CuiInputDialog::CuiInputDialog(Window * pParent, sal_uInt16 nMode )
// ScriptOrgDialog ------------------------------------------------------------
-SvxScriptOrgDialog::SvxScriptOrgDialog( Window* pParent, const OUString& language )
+SvxScriptOrgDialog::SvxScriptOrgDialog( vcl::Window* pParent, const OUString& language )
: SfxModalDialog(pParent, "ScriptOrganizerDialog",
"cui/ui/scriptorganizer.ui")
, m_sLanguage(language)
@@ -525,7 +525,7 @@ short SvxScriptOrgDialog::Execute()
}
m_pScriptsBox->ExpandAllTrees();
- Window* pPrevDlgParent = Application::GetDefDialogParent();
+ vcl::Window* pPrevDlgParent = Application::GetDefDialogParent();
Application::SetDefDialogParent( this );
short nRet = ModalDialog::Execute();
Application::SetDefDialogParent( pPrevDlgParent );
@@ -890,7 +890,7 @@ void SvxScriptOrgDialog::createEntry( SvTreeListEntry* pEntry )
}
}
- boost::scoped_ptr< CuiInputDialog > xNewDlg( new CuiInputDialog( static_cast<Window*>(this), nMode ) );
+ boost::scoped_ptr< CuiInputDialog > xNewDlg( new CuiInputDialog( static_cast<vcl::Window*>(this), nMode ) );
xNewDlg->SetObjectName( aNewName );
do
@@ -906,7 +906,7 @@ void SvxScriptOrgDialog::createEntry( SvTreeListEntry* pEntry )
bValid = false;
OUString aError( m_createErrStr );
aError += m_createDupStr;
- MessageDialog aErrorBox(static_cast<Window*>(this), aError);
+ MessageDialog aErrorBox(static_cast<vcl::Window*>(this), aError);
aErrorBox.SetText( m_createErrTitleStr );
aErrorBox.Execute();
xNewDlg->SetObjectName( aNewName );
@@ -993,7 +993,7 @@ void SvxScriptOrgDialog::createEntry( SvTreeListEntry* pEntry )
{
//ISSUE L10N & message from exception?
OUString aError( m_createErrStr );
- MessageDialog aErrorBox(static_cast<Window*>(this), aError);
+ MessageDialog aErrorBox(static_cast<vcl::Window*>(this), aError);
aErrorBox.SetText( m_createErrTitleStr );
aErrorBox.Execute();
}
@@ -1018,7 +1018,7 @@ void SvxScriptOrgDialog::renameEntry( SvTreeListEntry* pEntry )
}
sal_uInt16 nMode = INPUTMODE_RENAME;
- boost::scoped_ptr< CuiInputDialog > xNewDlg( new CuiInputDialog( static_cast<Window*>(this), nMode ) );
+ boost::scoped_ptr< CuiInputDialog > xNewDlg( new CuiInputDialog( static_cast<vcl::Window*>(this), nMode ) );
xNewDlg->SetObjectName( aNewName );
bool bValid;
@@ -1069,7 +1069,7 @@ void SvxScriptOrgDialog::renameEntry( SvTreeListEntry* pEntry )
{
//ISSUE L10N & message from exception?
OUString aError( m_renameErrStr );
- MessageDialog aErrorBox(static_cast<Window*>(this), aError);
+ MessageDialog aErrorBox(static_cast<vcl::Window*>(this), aError);
aErrorBox.SetText( m_renameErrTitleStr );
aErrorBox.Execute();
}
@@ -1080,7 +1080,7 @@ void SvxScriptOrgDialog::deleteEntry( SvTreeListEntry* pEntry )
Reference< browse::XBrowseNode > node = getBrowseNode( pEntry );
// ISSUE L10N string & can we centre list?
OUString aQuery = m_delQueryStr + getListOfChildren( node, 0 );
- MessageDialog aQueryBox(static_cast<Window*>(this), aQuery, VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO);
+ MessageDialog aQueryBox(static_cast<vcl::Window*>(this), aQuery, VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO);
aQueryBox.SetText( m_delQueryTitleStr );
if ( aQueryBox.Execute() == RET_NO )
{
@@ -1115,7 +1115,7 @@ void SvxScriptOrgDialog::deleteEntry( SvTreeListEntry* pEntry )
else
{
//ISSUE L10N & message from exception?
- MessageDialog aErrorBox(static_cast<Window*>(this), m_delErrStr);
+ MessageDialog aErrorBox(static_cast<vcl::Window*>(this), m_delErrStr);
aErrorBox.SetText( m_delErrTitleStr );
aErrorBox.Execute();
}
@@ -1450,7 +1450,7 @@ OUString GetErrorMessage( const com::sun::star::uno::Any& aException )
}
SvxScriptErrorDialog::SvxScriptErrorDialog(
- Window* , ::com::sun::star::uno::Any aException )
+ vcl::Window* , ::com::sun::star::uno::Any aException )
: m_sMessage()
{
SolarMutexGuard aGuard;
diff --git a/cui/source/dialogs/sdrcelldlg.cxx b/cui/source/dialogs/sdrcelldlg.cxx
index 400e9a834021..b8848e54f129 100644
--- a/cui/source/dialogs/sdrcelldlg.cxx
+++ b/cui/source/dialogs/sdrcelldlg.cxx
@@ -27,7 +27,7 @@
#include "border.hxx"
#include <svx/dialogs.hrc>
-SvxFormatCellsDialog::SvxFormatCellsDialog( Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel )
+SvxFormatCellsDialog::SvxFormatCellsDialog( vcl::Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel )
: SfxTabDialog(pParent, "FormatCellsDialog", "cui/ui/formatcellsdialog.ui", pAttr)
, mrOutAttrs(*pAttr)
, mpColorTab(pModel->GetColorList())
diff --git a/cui/source/dialogs/showcols.cxx b/cui/source/dialogs/showcols.cxx
index 45c5cf8fd6ee..1c87ff9609f5 100644
--- a/cui/source/dialogs/showcols.cxx
+++ b/cui/source/dialogs/showcols.cxx
@@ -28,7 +28,7 @@
#define CUIFM_PROP_HIDDEN "Hidden"
#define CUIFM_PROP_LABEL "Label"
-FmShowColsDialog::FmShowColsDialog(Window* pParent)
+FmShowColsDialog::FmShowColsDialog(vcl::Window* pParent)
: ModalDialog(pParent, "ShowColDialog", "cui/ui/showcoldialog.ui")
{
get(m_pOK, "ok");
diff --git a/cui/source/dialogs/splitcelldlg.cxx b/cui/source/dialogs/splitcelldlg.cxx
index 8c809e93d3bd..e3b6d18c58a3 100644
--- a/cui/source/dialogs/splitcelldlg.cxx
+++ b/cui/source/dialogs/splitcelldlg.cxx
@@ -24,7 +24,7 @@
#include "splitcelldlg.hxx"
#include "cuires.hrc"
-SvxSplitTableDlg::SvxSplitTableDlg( Window *pParent, bool bIsTableVertical,
+SvxSplitTableDlg::SvxSplitTableDlg( vcl::Window *pParent, bool bIsTableVertical,
long nMaxVertical, long nMaxHorizontal )
: SvxStandardDialog(pParent, "SplitCellsDialog", "cui/ui/splitcellsdialog.ui")
, mnMaxVertical(nMaxVertical)
diff --git a/cui/source/dialogs/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx
index cdaf0090595c..fe23c29bf210 100644
--- a/cui/source/dialogs/srchxtra.cxx
+++ b/cui/source/dialogs/srchxtra.cxx
@@ -36,7 +36,7 @@
#include <rtl/strbuf.hxx>
#include "svtools/treelistentry.hxx"
-SvxSearchFormatDialog::SvxSearchFormatDialog(Window* pParent, const SfxItemSet& rSet)
+SvxSearchFormatDialog::SvxSearchFormatDialog(vcl::Window* pParent, const SfxItemSet& rSet)
: SfxTabDialog(pParent, "SearchFormatDialog", "cui/ui/searchformatdialog.ui", &rSet)
, m_pFontList(NULL)
, m_nNamePageId(0)
@@ -110,7 +110,7 @@ void SvxSearchFormatDialog::PageCreated( sal_uInt16 nId, SfxTabPage& rPage )
}
}
-SvxSearchAttributeDialog::SvxSearchAttributeDialog(Window* pParent,
+SvxSearchAttributeDialog::SvxSearchAttributeDialog(vcl::Window* pParent,
SearchAttrItemList& rLst, const sal_uInt16* pWhRanges)
: ModalDialog(pParent, "SearchAttrDialog", "cui/ui/searchattrdialog.ui")
, rList(rLst)
@@ -222,7 +222,7 @@ IMPL_LINK_NOARG(SvxSearchAttributeDialog, OKHdl)
SvxSearchSimilarityDialog::SvxSearchSimilarityDialog
(
- Window* pParent,
+ vcl::Window* pParent,
bool bRelax,
sal_uInt16 nOther,
sal_uInt16 nShorter,
diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx
index abd225bb3f7b..a9d30d66b74a 100644
--- a/cui/source/dialogs/thesdlg.cxx
+++ b/cui/source/dialogs/thesdlg.cxx
@@ -55,7 +55,7 @@ using namespace ::com::sun::star;
// class LookUpComboBox --------------------------------------------------
-LookUpComboBox::LookUpComboBox(Window *pParent)
+LookUpComboBox::LookUpComboBox(vcl::Window *pParent)
: ComboBox(pParent, WB_LEFT|WB_DROPDOWN|WB_VCENTER|WB_3DLOOK|WB_TABSTOP)
, m_pDialog(NULL)
{
@@ -67,7 +67,7 @@ LookUpComboBox::LookUpComboBox(Window *pParent)
EnableAutocomplete( false );
}
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeLookUpComboBox(Window *pParent, VclBuilder::stringmap &)
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeLookUpComboBox(vcl::Window *pParent, VclBuilder::stringmap &)
{
return new LookUpComboBox(pParent);
}
@@ -95,13 +95,13 @@ IMPL_LINK( LookUpComboBox, ModifyTimer_Hdl, Timer *, EMPTYARG /*pTimer*/ )
// class ReplaceEdit --------------------------------------------------
-ReplaceEdit::ReplaceEdit(Window *pParent)
+ReplaceEdit::ReplaceEdit(vcl::Window *pParent)
: Edit(pParent, WB_BORDER | WB_TABSTOP)
, m_pBtn(NULL)
{
}
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeReplaceEdit(Window *pParent, VclBuilder::stringmap &)
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeReplaceEdit(vcl::Window *pParent, VclBuilder::stringmap &)
{
return new ReplaceEdit(pParent);
}
@@ -159,7 +159,7 @@ void AlternativesString::Paint(
rDev.SetFont( aOldFont );
}
-ThesaurusAlternativesCtrl::ThesaurusAlternativesCtrl(Window* pParent)
+ThesaurusAlternativesCtrl::ThesaurusAlternativesCtrl(vcl::Window* pParent)
: SvxCheckListBox(pParent)
, m_pDialog(NULL)
{
@@ -167,7 +167,7 @@ ThesaurusAlternativesCtrl::ThesaurusAlternativesCtrl(Window* pParent)
SetHighlightRange();
}
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeThesaurusAlternativesCtrl(Window *pParent, VclBuilder::stringmap &)
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeThesaurusAlternativesCtrl(vcl::Window *pParent, VclBuilder::stringmap &)
{
return new ThesaurusAlternativesCtrl(pParent);
}
@@ -437,7 +437,7 @@ IMPL_STATIC_LINK( SvxThesaurusDialog, SelectFirstHdl_Impl, SvxCheckListBox *, pB
// class SvxThesaurusDialog ----------------------------------------------
SvxThesaurusDialog::SvxThesaurusDialog(
- Window* pParent,
+ vcl::Window* pParent,
uno::Reference< linguistic2::XThesaurus > xThes,
const OUString &rWord,
LanguageType nLanguage)
diff --git a/cui/source/dialogs/zoom.cxx b/cui/source/dialogs/zoom.cxx
index c25377390c7c..e4a5040084d8 100644
--- a/cui/source/dialogs/zoom.cxx
+++ b/cui/source/dialogs/zoom.cxx
@@ -126,7 +126,7 @@ void SvxZoomDialog::SetLimits( sal_uInt16 nMin, sal_uInt16 nMax )
-SvxZoomDialog::SvxZoomDialog( Window* pParent, const SfxItemSet& rCoreSet )
+SvxZoomDialog::SvxZoomDialog( vcl::Window* pParent, const SfxItemSet& rCoreSet )
: SfxModalDialog(pParent, "ZoomDialog", "cui/ui/zoomdialog.ui")
, rSet(rCoreSet)
, pOutSet(NULL)
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 523c6414ddb4..5dc045dbabb0 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -356,7 +356,7 @@ sal_uInt16 AbstractThesaurusDialog_Impl::GetLanguage() const
return pDlg->GetLanguage();
};
-Window* AbstractThesaurusDialog_Impl::GetWindow()
+vcl::Window* AbstractThesaurusDialog_Impl::GetWindow()
{
return pDlg;
}
@@ -371,7 +371,7 @@ void AbstractHyphenWordDialog_Impl::SelRight()
pDlg->SelRight();
}
-Window* AbstractHyphenWordDialog_Impl::GetWindow()
+vcl::Window* AbstractHyphenWordDialog_Impl::GetWindow()
{
return pDlg;
}
@@ -443,7 +443,7 @@ void AbstractSpellDialog_Impl::Invalidate()
pDlg->InvalidateDialog();
}
-Window* AbstractSpellDialog_Impl::GetWindow()
+vcl::Window* AbstractSpellDialog_Impl::GetWindow()
{
return pDlg;
}
@@ -544,7 +544,7 @@ OUString AbstractURLDlg_Impl::GetName() const
void AbstractSvxHlinkDlgMarkWnd_Impl::Hide()
{
- ((Window*)pDlg)->Hide();
+ ((vcl::Window*)pDlg)->Hide();
}
void AbstractSvxHlinkDlgMarkWnd_Impl::SetSizePixel( const Size& rNewSize )
@@ -559,12 +559,12 @@ Size AbstractSvxHlinkDlgMarkWnd_Impl::GetSizePixel() const
bool AbstractSvxHlinkDlgMarkWnd_Impl::IsVisible( ) const
{
- return (( Window* )pDlg)->IsVisible();
+ return (( vcl::Window* )pDlg)->IsVisible();
}
void AbstractSvxHlinkDlgMarkWnd_Impl::Invalidate( sal_uInt16 nFlags )
{
- (( Window* )pDlg)->Invalidate(nFlags);
+ (( vcl::Window* )pDlg)->Invalidate(nFlags);
}
bool AbstractSvxHlinkDlgMarkWnd_Impl::MoveTo( Point aNewPos )const
@@ -817,9 +817,9 @@ void AbstractSvxPathSelectDialog_Impl::SetTitle( const OUString& rNewTitle )
pDlg->SetText( rNewTitle );
}
-Window * AbstractSvxHpLinkDlg_Impl::GetWindow()
+vcl::Window * AbstractSvxHpLinkDlg_Impl::GetWindow()
{
- return (Window *)pDlg;
+ return (vcl::Window *)pDlg;
}
bool AbstractSvxHpLinkDlg_Impl::QueryClose()
@@ -949,9 +949,9 @@ IMPL_LINK_NOARG(AbstractSvxPostItDialog_Impl, PrevHdl)
aPrevHdl.Call(this);
return 0;
}
-Window * AbstractSvxPostItDialog_Impl::GetWindow()
+vcl::Window * AbstractSvxPostItDialog_Impl::GetWindow()
{
- return (Window *)pDlg;
+ return (vcl::Window *)pDlg;
}
OUString AbstractPasswordToOpenModifyDialog_Impl::GetPasswordToOpen() const
@@ -968,7 +968,7 @@ bool AbstractPasswordToOpenModifyDialog_Impl::IsRecommendToOpenReadonly() const
}
// Create dialogs with simplest interface
-VclAbstractDialog* AbstractDialogFactory_Impl::CreateVclDialog( Window* pParent, sal_uInt32 nResId )
+VclAbstractDialog* AbstractDialogFactory_Impl::CreateVclDialog( vcl::Window* pParent, sal_uInt32 nResId )
{
Dialog* pDlg=NULL;
switch ( nResId )
@@ -1009,13 +1009,13 @@ VclAbstractDialog* AbstractDialogFactory_Impl::CreateVclDialog( Window* pParent,
}
// dialogs that use SfxBindings
-VclAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( Window* /*pParent*/, const SfxBindings&, sal_uInt32 )
+VclAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( vcl::Window* /*pParent*/, const SfxBindings&, sal_uInt32 )
{
return 0;
}
VclAbstractDialog* AbstractDialogFactory_Impl::CreateFrameDialog(
- Window* pParent, const Reference< frame::XFrame >& rxFrame,
+ vcl::Window* pParent, const Reference< frame::XFrame >& rxFrame,
sal_uInt32 nResId, const OUString& rParameter )
{
Dialog* pDlg = NULL;
@@ -1039,7 +1039,7 @@ VclAbstractDialog* AbstractDialogFactory_Impl::CreateFrameDialog(
// TabDialog outside the drawing layer
SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateTabDialog( sal_uInt32 nResId,
- Window* pParent,
+ vcl::Window* pParent,
const SfxItemSet* pAttrSet,
SfxViewFrame* ,
bool /*bEditFmt*/,
@@ -1064,7 +1064,7 @@ SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateTabDialog( sal_uInt32 nR
}
SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateTabDialog( sal_uInt32 nResId,
- Window* pParent,
+ vcl::Window* pParent,
const SfxItemSet* pAttrSet,
const Reference< frame::XFrame >& xViewFrame,
bool /*bEditFmt*/,
@@ -1093,7 +1093,7 @@ SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateTabDialog( sal_uInt32 nR
}
// TabDialog that use functionality of the drawing layer
-SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateTextTabDialog( Window* pParent,
+SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateTextTabDialog( vcl::Window* pParent,
const SfxItemSet* pAttrSet,
SdrView* pView,
SdrModel* )
@@ -1103,7 +1103,7 @@ SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateTextTabDialog( Window* p
}
// TabDialog that use functionality of the drawing layer and add AnchorTypes -- for SvxCaptionTabDialog
-AbstractSvxCaptionDialog* AbstractDialogFactory_Impl::CreateCaptionDialog( Window* pParent,
+AbstractSvxCaptionDialog* AbstractDialogFactory_Impl::CreateCaptionDialog( vcl::Window* pParent,
const SdrView* pView,
sal_uInt16 nAnchorTypes )
{
@@ -1111,7 +1111,7 @@ AbstractSvxCaptionDialog* AbstractDialogFactory_Impl::CreateCaptionDialog(
return new AbstractSvxCaptionDialog_Impl( pDlg );
}
-AbstractSvxDistributeDialog* AbstractDialogFactory_Impl::CreateSvxDistributeDialog(Window* pParent,
+AbstractSvxDistributeDialog* AbstractDialogFactory_Impl::CreateSvxDistributeDialog(vcl::Window* pParent,
const SfxItemSet& rAttr,
SvxDistributeHorizontal eHor ,
SvxDistributeVertical eVer)
@@ -1120,14 +1120,14 @@ AbstractSvxDistributeDialog* AbstractDialogFactory_Impl::CreateSvxDistributeD
return new AbstractSvxDistributeDialog_Impl( pDlg );
}
-AbstractHangulHanjaConversionDialog* AbstractDialogFactory_Impl::CreateHangulHanjaConversionDialog(Window* pParent,
+AbstractHangulHanjaConversionDialog* AbstractDialogFactory_Impl::CreateHangulHanjaConversionDialog(vcl::Window* pParent,
editeng::HangulHanjaConversion::ConversionDirection _ePrimaryDirection )
{
HangulHanjaConversionDialog* pDlg = new HangulHanjaConversionDialog( pParent, _ePrimaryDirection);
return new AbstractHangulHanjaConversionDialog_Impl( pDlg );
}
-AbstractThesaurusDialog* AbstractDialogFactory_Impl::CreateThesaurusDialog( Window* pParent,
+AbstractThesaurusDialog* AbstractDialogFactory_Impl::CreateThesaurusDialog( vcl::Window* pParent,
css::uno::Reference< css::linguistic2::XThesaurus > xThesaurus,
const OUString &rWord, sal_Int16 nLanguage )
{
@@ -1135,7 +1135,7 @@ AbstractThesaurusDialog* AbstractDialogFactory_Impl::CreateThesaurusDialog( Wind
return new AbstractThesaurusDialog_Impl( pDlg );
}
-AbstractHyphenWordDialog* AbstractDialogFactory_Impl::CreateHyphenWordDialog( Window* pParent,
+AbstractHyphenWordDialog* AbstractDialogFactory_Impl::CreateHyphenWordDialog( vcl::Window* pParent,
const OUString &rWord, LanguageType nLang,
::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenator > &xHyphen,
SvxSpellWrapper* pWrapper )
@@ -1144,12 +1144,12 @@ AbstractHyphenWordDialog* AbstractDialogFactory_Impl::CreateHyphenWordDialog( Wi
return new AbstractHyphenWordDialog_Impl( pDlg );
}
-AbstractFmShowColsDialog * AbstractDialogFactory_Impl::CreateFmShowColsDialog( Window* pParent )
+AbstractFmShowColsDialog * AbstractDialogFactory_Impl::CreateFmShowColsDialog( vcl::Window* pParent )
{
FmShowColsDialog* pDlg = new FmShowColsDialog( pParent);
return new AbstractFmShowColsDialog_Impl( pDlg );
}
-AbstractSvxZoomDialog * AbstractDialogFactory_Impl::CreateSvxZoomDialog( Window* pParent,
+AbstractSvxZoomDialog * AbstractDialogFactory_Impl::CreateSvxZoomDialog( vcl::Window* pParent,
const SfxItemSet& rCoreSet)
{
SvxZoomDialog* pDlg = new SvxZoomDialog( pParent, rCoreSet);
@@ -1157,7 +1157,7 @@ AbstractSvxZoomDialog * AbstractDialogFactory_Impl::CreateSvxZoomDialog( Window*
}
AbstractSpellDialog * AbstractDialogFactory_Impl::CreateSvxSpellDialog(
- Window* pParent,
+ vcl::Window* pParent,
SfxBindings* pBindings,
svx::SpellDialogChildWindow* pSpellChildWindow )
{
@@ -1165,20 +1165,20 @@ AbstractSpellDialog * AbstractDialogFactory_Impl::CreateSvxSpellDialog(
return new AbstractSpellDialog_Impl(pDlg);
}
-VclAbstractRefreshableDialog * AbstractDialogFactory_Impl::CreateActualizeProgressDialog( Window* pParent, GalleryTheme* pThm )
+VclAbstractRefreshableDialog * AbstractDialogFactory_Impl::CreateActualizeProgressDialog( vcl::Window* pParent, GalleryTheme* pThm )
{
Dialog* pDlg = new ActualizeProgress( pParent, pThm);
return new VclAbstractRefreshableDialog_Impl( pDlg );
}
-AbstractSearchProgress * AbstractDialogFactory_Impl::CreateSearchProgressDialog( Window* pParent,
+AbstractSearchProgress * AbstractDialogFactory_Impl::CreateSearchProgressDialog( vcl::Window* pParent,
const INetURLObject& rStartURL )
{
SearchProgress* pDlg = new SearchProgress( pParent, rStartURL);
return new AbstractSearchProgress_Impl( pDlg );
}
-AbstractTakeProgress * AbstractDialogFactory_Impl::CreateTakeProgressDialog( Window* pParent )
+AbstractTakeProgress * AbstractDialogFactory_Impl::CreateTakeProgressDialog( vcl::Window* pParent )
{
TakeProgress* pDlg = new TakeProgress( pParent );
return new AbstractTakeProgress_Impl( pDlg );
@@ -1186,14 +1186,14 @@ AbstractTakeProgress * AbstractDialogFactory_Impl::CreateTakeProgressDialog( Win
VclAbstractDialog*
AbstractDialogFactory_Impl::CreateScriptErrorDialog(
- Window* pParent, ::com::sun::star::uno::Any aException )
+ vcl::Window* pParent, ::com::sun::star::uno::Any aException )
{
return new SvxScriptErrorDialog( pParent, aException );
}
AbstractScriptSelectorDialog*
AbstractDialogFactory_Impl::CreateScriptSelectorDialog(
- Window* pParent, bool bShowSlots, const Reference< frame::XFrame >& _rxFrame )
+ vcl::Window* pParent, bool bShowSlots, const Reference< frame::XFrame >& _rxFrame )
{
SvxScriptSelectorDialog* pDlg = new SvxScriptSelectorDialog(pParent, bShowSlots, _rxFrame);
return new AbstractScriptSelectorDialog_Impl(pDlg);
@@ -1213,7 +1213,7 @@ void AbstractScriptSelectorDialog_Impl::SetRunLabel()
return;
}
-VclAbstractDialog * AbstractDialogFactory_Impl::CreateSvxScriptOrgDialog( Window* pParent,
+VclAbstractDialog * AbstractDialogFactory_Impl::CreateSvxScriptOrgDialog( vcl::Window* pParent,
const OUString& rLanguage)
{
Dialog* pDlg=NULL;
@@ -1225,21 +1225,21 @@ VclAbstractDialog * AbstractDialogFactory_Impl::CreateSvxScriptOrgDialog( Window
return 0;
}
-AbstractTitleDialog * AbstractDialogFactory_Impl::CreateTitleDialog( Window* pParent,
+AbstractTitleDialog * AbstractDialogFactory_Impl::CreateTitleDialog( vcl::Window* pParent,
const OUString& rOldText)
{
TitleDialog* pDlg = new TitleDialog( pParent, rOldText);
return new AbstractTitleDialog_Impl( pDlg );
}
-AbstractGalleryIdDialog * AbstractDialogFactory_Impl::CreateGalleryIdDialog( Window* pParent,
+AbstractGalleryIdDialog * AbstractDialogFactory_Impl::CreateGalleryIdDialog( vcl::Window* pParent,
GalleryTheme* pThm )
{
GalleryIdDialog* pDlg = new GalleryIdDialog( pParent, pThm);
return new AbstractGalleryIdDialog_Impl( pDlg );
}
-VclAbstractDialog2 * AbstractDialogFactory_Impl::CreateGalleryThemePropertiesDialog( Window* pParent,
+VclAbstractDialog2 * AbstractDialogFactory_Impl::CreateGalleryThemePropertiesDialog( vcl::Window* pParent,
ExchangeData* pData,
SfxItemSet* pItemSet)
{
@@ -1247,7 +1247,7 @@ VclAbstractDialog2 * AbstractDialogFactory_Impl::CreateGalleryThemePropertiesDia
return new VclAbstractDialog2_Impl( pDlg );
}
-AbstractURLDlg * AbstractDialogFactory_Impl::CreateURLDialog( Window* pParent,
+AbstractURLDlg * AbstractDialogFactory_Impl::CreateURLDialog( vcl::Window* pParent,
const OUString& rURL, const OUString& rAltText, const OUString& rDescription,
const OUString& rTarget, const OUString& rName,
TargetList& rTargetList )
@@ -1274,7 +1274,7 @@ AbstractSvxHlinkDlgMarkWnd* AbstractDialogFactory_Impl::CreateSvxHlinkDlgMarkWnd
}
SfxAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( sal_uInt32,
- Window* pParent,
+ vcl::Window* pParent,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& ,
const SfxItemSet* pAttrSet )
{
@@ -1282,14 +1282,14 @@ SfxAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( sal_uInt32,
return new CuiAbstractSfxDialog_Impl( pDlg );
}
-SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateTabItemDialog(Window* pParent,
+SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateTabItemDialog(vcl::Window* pParent,
const SfxItemSet& rSet)
{
SfxTabDialog* pDlg = new SvxSearchFormatDialog(pParent, rSet);
return new CuiAbstractTabDialog_Impl(pDlg);
}
-VclAbstractDialog* AbstractDialogFactory_Impl::CreateSvxSearchAttributeDialog( Window* pParent,
+VclAbstractDialog* AbstractDialogFactory_Impl::CreateSvxSearchAttributeDialog( vcl::Window* pParent,
SearchAttrItemList& rLst,
const sal_uInt16* pWhRanges )
{
@@ -1297,7 +1297,7 @@ VclAbstractDialog* AbstractDialogFactory_Impl::CreateSvxSearchAttributeDial
return new CuiVclAbstractDialog_Impl( pDlg );
}
-AbstractSvxSearchSimilarityDialog * AbstractDialogFactory_Impl::CreateSvxSearchSimilarityDialog( Window* pParent,
+AbstractSvxSearchSimilarityDialog * AbstractDialogFactory_Impl::CreateSvxSearchSimilarityDialog( vcl::Window* pParent,
bool bRelax,
sal_uInt16 nOther,
sal_uInt16 nShorter,
@@ -1311,7 +1311,7 @@ AbstractSvxSearchSimilarityDialog * AbstractDialogFactory_Impl::CreateSvxSearchS
//UUUU
SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateSvxBorderBackgroundDlg(
- Window* pParent,
+ vcl::Window* pParent,
const SfxItemSet& rCoreSet,
bool bEnableSelector,
bool bEnableDrawingLayerFillStyles)
@@ -1325,7 +1325,7 @@ SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateSvxBorderBackgroundDlg(
return new CuiAbstractTabDialog_Impl(pDlg);
}
-AbstractSvxTransformTabDialog* AbstractDialogFactory_Impl::CreateSvxTransformTabDialog( Window* pParent,
+AbstractSvxTransformTabDialog* AbstractDialogFactory_Impl::CreateSvxTransformTabDialog( vcl::Window* pParent,
const SfxItemSet* pAttr,
const SdrView* pView,
sal_uInt16 nAnchorTypes )
@@ -1334,7 +1334,7 @@ AbstractSvxTransformTabDialog* AbstractDialogFactory_Impl::CreateSvxTransformTab
return new AbstractSvxTransformTabDialog_Impl( pDlg );
}
-SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateSchTransformTabDialog( Window* pParent,
+SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateSchTransformTabDialog( vcl::Window* pParent,
const SfxItemSet* pAttr,
const SdrView* pSdrView,
sal_uInt32 nResId,
@@ -1366,7 +1366,7 @@ SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateSchTransformTabDialog( W
return 0;
}
-AbstractSvxJSearchOptionsDialog * AbstractDialogFactory_Impl::CreateSvxJSearchOptionsDialog( Window* pParent,
+AbstractSvxJSearchOptionsDialog * AbstractDialogFactory_Impl::CreateSvxJSearchOptionsDialog( vcl::Window* pParent,
const SfxItemSet& rOptionsSet,
sal_Int32 nInitialFlags)
{
@@ -1374,20 +1374,20 @@ AbstractSvxJSearchOptionsDialog * AbstractDialogFactory_Impl::CreateSvxJSearchOp
return new AbstractSvxJSearchOptionsDialog_Impl( pDlg );
}
-AbstractFmInputRecordNoDialog * AbstractDialogFactory_Impl::CreateFmInputRecordNoDialog( Window* pParent )
+AbstractFmInputRecordNoDialog * AbstractDialogFactory_Impl::CreateFmInputRecordNoDialog( vcl::Window* pParent )
{
FmInputRecordNoDialog* pDlg = new FmInputRecordNoDialog( pParent );
return new AbstractFmInputRecordNoDialog_Impl( pDlg );
}
-AbstractSvxNewDictionaryDialog * AbstractDialogFactory_Impl::CreateSvxNewDictionaryDialog( Window* pParent,
+AbstractSvxNewDictionaryDialog * AbstractDialogFactory_Impl::CreateSvxNewDictionaryDialog( vcl::Window* pParent,
::Reference< ::com::sun::star::linguistic2::XSpellChecker1 > &xSpl )
{
SvxNewDictionaryDialog* pDlg = new SvxNewDictionaryDialog( pParent, xSpl );
return new AbstractSvxNewDictionaryDialog_Impl( pDlg );
}
-VclAbstractDialog* AbstractDialogFactory_Impl::CreateSvxEditDictionaryDialog( Window* pParent,
+VclAbstractDialog* AbstractDialogFactory_Impl::CreateSvxEditDictionaryDialog( vcl::Window* pParent,
const OUString& rName,
::Reference< ::com::sun::star::linguistic2::XSpellChecker1> &xSpl,
sal_uInt32 nResId )
@@ -1407,43 +1407,43 @@ VclAbstractDialog* AbstractDialogFactory_Impl::CreateSvxEditDictionaryDialo
return 0;
}
-AbstractSvxNameDialog * AbstractDialogFactory_Impl::CreateSvxNameDialog( Window* pParent,
+AbstractSvxNameDialog * AbstractDialogFactory_Impl::CreateSvxNameDialog( vcl::Window* pParent,
const OUString& rName, const OUString& rDesc )
{
SvxNameDialog* pDlg = new SvxNameDialog( pParent, rName, rDesc );
return new AbstractSvxNameDialog_Impl( pDlg );
}
-AbstractSvxObjectNameDialog* AbstractDialogFactory_Impl::CreateSvxObjectNameDialog(Window* pParent, const OUString& rName )
+AbstractSvxObjectNameDialog* AbstractDialogFactory_Impl::CreateSvxObjectNameDialog(vcl::Window* pParent, const OUString& rName )
{
return new AbstractSvxObjectNameDialog_Impl(new SvxObjectNameDialog(pParent, rName));
}
-AbstractSvxObjectTitleDescDialog* AbstractDialogFactory_Impl::CreateSvxObjectTitleDescDialog(Window* pParent, const OUString& rTitle, const OUString& rDescription)
+AbstractSvxObjectTitleDescDialog* AbstractDialogFactory_Impl::CreateSvxObjectTitleDescDialog(vcl::Window* pParent, const OUString& rTitle, const OUString& rDescription)
{
return new AbstractSvxObjectTitleDescDialog_Impl(new SvxObjectTitleDescDialog(pParent, rTitle, rDescription));
}
-AbstractSvxMessDialog * AbstractDialogFactory_Impl::CreateSvxMessDialog( Window* pParent, sal_uInt32,
+AbstractSvxMessDialog * AbstractDialogFactory_Impl::CreateSvxMessDialog( vcl::Window* pParent, sal_uInt32,
const OUString& rText, const OUString& rDesc, Image* pImg )
{
SvxMessDialog* pDlg = new SvxMessDialog( pParent, rText, rDesc, pImg );
return new AbstractSvxMessDialog_Impl( pDlg );
}
-AbstractSvxMultiPathDialog * AbstractDialogFactory_Impl::CreateSvxMultiPathDialog(Window* pParent)
+AbstractSvxMultiPathDialog * AbstractDialogFactory_Impl::CreateSvxMultiPathDialog(vcl::Window* pParent)
{
SvxMultiPathDialog* pDlg = new SvxMultiPathDialog(pParent);
return new AbstractSvxMultiPathDialog_Impl( pDlg );
}
-AbstractSvxMultiPathDialog * AbstractDialogFactory_Impl::CreateSvxPathSelectDialog(Window* pParent)
+AbstractSvxMultiPathDialog * AbstractDialogFactory_Impl::CreateSvxPathSelectDialog(vcl::Window* pParent)
{
SvxPathSelectDialog* pDlg = new SvxPathSelectDialog(pParent);
return new AbstractSvxPathSelectDialog_Impl( pDlg );
}
-AbstractSvxHpLinkDlg * AbstractDialogFactory_Impl::CreateSvxHpLinkDlg (Window* pParent,
+AbstractSvxHpLinkDlg * AbstractDialogFactory_Impl::CreateSvxHpLinkDlg (vcl::Window* pParent,
SfxBindings* pBindings,
sal_uInt32 nResId)
{
@@ -1462,7 +1462,7 @@ AbstractSvxHpLinkDlg * AbstractDialogFactory_Impl::CreateSvxHpLinkDlg (Window* p
return 0;
}
-AbstractFmSearchDialog* AbstractDialogFactory_Impl::CreateFmSearchDialog(Window* pParent,
+AbstractFmSearchDialog* AbstractDialogFactory_Impl::CreateFmSearchDialog(vcl::Window* pParent,
const OUString& strInitialText,
const ::std::vector< OUString >& _rContexts,
sal_Int16 nInitialContext,
@@ -1474,7 +1474,7 @@ AbstractFmSearchDialog* AbstractDialogFactory_Impl::CreateFmSearchDialog(Window
return 0;
}
-AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterEmboss (Window* pParent,
+AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterEmboss (vcl::Window* pParent,
const Graphic& rGraphic,
RECT_POINT eLightSource)
{
@@ -1482,7 +1482,7 @@ AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterEmb
return new AbstractGraphicFilterDialog_Impl( pDlg );
}
-AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterPoster(Window* pParent,
+AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterPoster(vcl::Window* pParent,
const Graphic& rGraphic,
sal_uInt16 nCount)
{
@@ -1490,7 +1490,7 @@ AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterPos
return new AbstractGraphicFilterDialog_Impl( pDlg );
}
-AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterSepia (Window* pParent,
+AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterSepia (vcl::Window* pParent,
const Graphic& rGraphic,
sal_uInt16 nCount)
{
@@ -1498,21 +1498,21 @@ AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterSep
return new AbstractGraphicFilterDialog_Impl( pDlg );
}
-AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterSmooth(Window* pParent,
+AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterSmooth(vcl::Window* pParent,
const Graphic& rGraphic, double nRadius)
{
GraphicFilterDialog* pDlg = new GraphicFilterSmooth( pParent, rGraphic, nRadius );
return new AbstractGraphicFilterDialog_Impl( pDlg );
}
-AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterSolarize (Window* pParent,
+AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterSolarize (vcl::Window* pParent,
const Graphic& rGraphic, sal_uInt8 nGreyThreshold, bool bInvert)
{
GraphicFilterDialog* pDlg = new GraphicFilterSolarize( pParent, rGraphic, nGreyThreshold, bInvert );
return new AbstractGraphicFilterDialog_Impl( pDlg );
}
-AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterMosaic (Window* pParent,
+AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterMosaic (vcl::Window* pParent,
const Graphic& rGraphic, sal_uInt16 nTileWidth, sal_uInt16 nTileHeight,
bool bEnhanceEdges)
{
@@ -1520,7 +1520,7 @@ AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterMos
return new AbstractGraphicFilterDialog_Impl( pDlg );
}
-AbstractSvxAreaTabDialog* AbstractDialogFactory_Impl::CreateSvxAreaTabDialog( Window* pParent,
+AbstractSvxAreaTabDialog* AbstractDialogFactory_Impl::CreateSvxAreaTabDialog( vcl::Window* pParent,
const SfxItemSet* pAttr,
SdrModel* pModel,
bool bShadow)
@@ -1529,7 +1529,7 @@ AbstractSvxAreaTabDialog* AbstractDialogFactory_Impl::CreateSvxAreaTabDialog( Wi
return new AbstractSvxAreaTabDialog_Impl( pDlg );
}
-SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateSvxLineTabDialog( Window* pParent, const SfxItemSet* pAttr, //add forSvxLineTabDialog
+SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateSvxLineTabDialog( vcl::Window* pParent, const SfxItemSet* pAttr, //add forSvxLineTabDialog
SdrModel* pModel,
const SdrObject* pObj ,
bool bHasObj)
@@ -1538,7 +1538,7 @@ SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateSvxLineTabDialog( Window
return new CuiAbstractTabDialog_Impl( pDlg );
}
-SfxAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( Window* pParent,
+SfxAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( vcl::Window* pParent,
const SfxItemSet& rAttr,
const Reference< XFrame >& _rxDocumentFrame,
sal_uInt32 nResId
@@ -1562,7 +1562,7 @@ SfxAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( Window* pParent,
return 0;
}
-SfxAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( Window* pParent,
+SfxAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( vcl::Window* pParent,
const SfxItemSet& rAttr,
const SdrView* pView,
sal_uInt32 nResId
@@ -1591,7 +1591,7 @@ SfxAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( Window* pParent,
return 0;
}
-AbstractSvxPostItDialog* AbstractDialogFactory_Impl::CreateSvxPostItDialog( Window* pParent,
+AbstractSvxPostItDialog* AbstractDialogFactory_Impl::CreateSvxPostItDialog( vcl::Window* pParent,
const SfxItemSet& rCoreSet,
bool bPrevNext )
{
@@ -1602,7 +1602,7 @@ AbstractSvxPostItDialog* AbstractDialogFactory_Impl::CreateSvxPostItDialog( Wind
class SvxMacroAssignDialog : public VclAbstractDialog
{
public:
- SvxMacroAssignDialog( Window* _pParent, const Reference< XFrame >& _rxDocumentFrame, const bool _bUnoDialogMode,
+ SvxMacroAssignDialog( vcl::Window* _pParent, const Reference< XFrame >& _rxDocumentFrame, const bool _bUnoDialogMode,
const Reference< XNameReplace >& _rxEvents, const sal_uInt16 _nInitiallySelectedEvent )
:m_aItems( SfxGetpApp()->GetPool(), SID_ATTR_MACROITEM, SID_ATTR_MACROITEM )
{
@@ -1628,7 +1628,7 @@ SvxMacroAssignDialog::~SvxMacroAssignDialog()
}
VclAbstractDialog * AbstractDialogFactory_Impl::CreateSvxMacroAssignDlg(
- Window* _pParent, const Reference< XFrame >& _rxDocumentFrame, const bool _bUnoDialogMode,
+ vcl::Window* _pParent, const Reference< XFrame >& _rxDocumentFrame, const bool _bUnoDialogMode,
const Reference< XNameReplace >& _rxEvents, const sal_uInt16 _nInitiallySelectedEvent )
{
return new SvxMacroAssignDialog( _pParent, _rxDocumentFrame, _bUnoDialogMode, _rxEvents, _nInitiallySelectedEvent );
@@ -1777,7 +1777,7 @@ GetTabPageRanges AbstractDialogFactory_Impl::GetTabPageRangesFunc( sal_uInt16 nI
return 0;
}
-SfxAbstractInsertObjectDialog* AbstractDialogFactory_Impl::CreateInsertObjectDialog( Window* pParent, const OUString& rCommand,
+SfxAbstractInsertObjectDialog* AbstractDialogFactory_Impl::CreateInsertObjectDialog( vcl::Window* pParent, const OUString& rCommand,
const Reference < com::sun::star::embed::XStorage >& xStor,
const SvObjectServerList* pList )
{
@@ -1797,7 +1797,7 @@ SfxAbstractInsertObjectDialog* AbstractDialogFactory_Impl::CreateInsertObjectDia
return 0;
}
-VclAbstractDialog* AbstractDialogFactory_Impl::CreateEditObjectDialog( Window* pParent, const OUString& rCommand,
+VclAbstractDialog* AbstractDialogFactory_Impl::CreateEditObjectDialog( vcl::Window* pParent, const OUString& rCommand,
const Reference < com::sun::star::embed::XEmbeddedObject >& xObj )
{
InsertObjectDialog_Impl* pDlg=0;
@@ -1812,12 +1812,12 @@ VclAbstractDialog* AbstractDialogFactory_Impl::CreateEditObjectDialog( Window* p
-SfxAbstractPasteDialog* AbstractDialogFactory_Impl::CreatePasteDialog( Window* pParent )
+SfxAbstractPasteDialog* AbstractDialogFactory_Impl::CreatePasteDialog( vcl::Window* pParent )
{
return new AbstractPasteDialog_Impl( new SvPasteObjectDialog( pParent ) );
}
-SfxAbstractLinksDialog* AbstractDialogFactory_Impl::CreateLinksDialog( Window* pParent, sfx2::LinkManager* pMgr, bool bHTML, sfx2::SvBaseLink* p)
+SfxAbstractLinksDialog* AbstractDialogFactory_Impl::CreateLinksDialog( vcl::Window* pParent, sfx2::LinkManager* pMgr, bool bHTML, sfx2::SvBaseLink* p)
{
SvBaseLinksDlg* pLinkDlg = new SvBaseLinksDlg( pParent, pMgr, bHTML );
if ( p )
@@ -1825,34 +1825,34 @@ SfxAbstractLinksDialog* AbstractDialogFactory_Impl::CreateLinksDialog( Window* p
return new AbstractLinksDialog_Impl( pLinkDlg );
}
-SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateSvxFormatCellsDialog( Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel, const SdrObject* /*pObj*/ )
+SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateSvxFormatCellsDialog( vcl::Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel, const SdrObject* /*pObj*/ )
{
return new CuiAbstractTabDialog_Impl( new SvxFormatCellsDialog( pParent, pAttr, pModel ) );
}
-SvxAbstractSplittTableDialog* AbstractDialogFactory_Impl::CreateSvxSplittTableDialog( Window* pParent, bool bIsTableVertical, long nMaxVertical, long nMaxHorizontal )
+SvxAbstractSplittTableDialog* AbstractDialogFactory_Impl::CreateSvxSplittTableDialog( vcl::Window* pParent, bool bIsTableVertical, long nMaxVertical, long nMaxHorizontal )
{
return new SvxSplitTableDlg( pParent, bIsTableVertical, nMaxVertical, nMaxHorizontal );
}
-SvxAbstractNewTableDialog* AbstractDialogFactory_Impl::CreateSvxNewTableDialog( Window* pParent )
+SvxAbstractNewTableDialog* AbstractDialogFactory_Impl::CreateSvxNewTableDialog( vcl::Window* pParent )
{
return new SvxNewTableDialog( pParent );
}
VclAbstractDialog* AbstractDialogFactory_Impl::CreateOptionsDialog(
- Window* pParent, const OUString& rExtensionId, const OUString& /*rApplicationContext*/ )
+ vcl::Window* pParent, const OUString& rExtensionId, const OUString& /*rApplicationContext*/ )
{
return new CuiVclAbstractDialog_Impl( new OfaTreeOptionsDialog( pParent, rExtensionId ) );
}
-SvxAbstractInsRowColDlg* AbstractDialogFactory_Impl::CreateSvxInsRowColDlg( Window* pParent, bool bCol, const OString& sHelpId )
+SvxAbstractInsRowColDlg* AbstractDialogFactory_Impl::CreateSvxInsRowColDlg( vcl::Window* pParent, bool bCol, const OString& sHelpId )
{
return new SvxInsRowColDlg( pParent, bCol, sHelpId );
}
AbstractPasswordToOpenModifyDialog * AbstractDialogFactory_Impl::CreatePasswordToOpenModifyDialog(
- Window * pParent,
+ vcl::Window * pParent,
sal_uInt16 nMinPasswdLen, sal_uInt16 nMaxPasswdLen, bool bIsPasswordToModify )
{
PasswordToOpenModifyDialog * pDlg = new PasswordToOpenModifyDialog( pParent, nMinPasswdLen, nMaxPasswdLen, bIsPasswordToModify );
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index df9a0870ff6f..081a7373c3d0 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -172,7 +172,7 @@ class AbstractThesaurusDialog_Impl : public AbstractThesaurusDialog
DECL_ABSTDLG_BASE(AbstractThesaurusDialog_Impl,SvxThesaurusDialog)
virtual OUString GetWord() SAL_OVERRIDE;
virtual sal_uInt16 GetLanguage() const SAL_OVERRIDE;
- virtual Window* GetWindow() SAL_OVERRIDE;
+ virtual vcl::Window* GetWindow() SAL_OVERRIDE;
};
class AbstractHyphenWordDialog_Impl: public AbstractHyphenWordDialog
@@ -180,7 +180,7 @@ class AbstractHyphenWordDialog_Impl: public AbstractHyphenWordDialog
DECL_ABSTDLG_BASE(AbstractHyphenWordDialog_Impl,SvxHyphenWordDialog)
virtual void SelLeft() SAL_OVERRIDE;
virtual void SelRight() SAL_OVERRIDE;
- virtual Window* GetWindow() SAL_OVERRIDE;
+ virtual vcl::Window* GetWindow() SAL_OVERRIDE;
};
class FmShowColsDialog;
@@ -208,7 +208,7 @@ class AbstractSpellDialog_Impl : public AbstractSpellDialog
virtual void SetLanguage( sal_uInt16 nLang ) SAL_OVERRIDE;
virtual bool Close() SAL_OVERRIDE;
virtual void Invalidate() SAL_OVERRIDE;
- virtual Window* GetWindow() SAL_OVERRIDE;
+ virtual vcl::Window* GetWindow() SAL_OVERRIDE;
virtual SfxBindings& GetBindings() SAL_OVERRIDE;
};
@@ -413,7 +413,7 @@ class SvxHpLinkDlg;
class AbstractSvxHpLinkDlg_Impl :public AbstractSvxHpLinkDlg
{
DECL_ABSTDLG_BASE(AbstractSvxHpLinkDlg_Impl,SvxHpLinkDlg)
- virtual Window* GetWindow() SAL_OVERRIDE;
+ virtual vcl::Window* GetWindow() SAL_OVERRIDE;
virtual bool QueryClose() SAL_OVERRIDE;
};
@@ -487,7 +487,7 @@ class AbstractSvxPostItDialog_Impl :public AbstractSvxPostItDialog
virtual void HideAuthor() SAL_OVERRIDE ;
virtual void SetReadonlyPostIt(bool bDisable) SAL_OVERRIDE ;
virtual bool IsOkEnabled() const SAL_OVERRIDE;
- virtual Window * GetWindow() SAL_OVERRIDE;
+ virtual vcl::Window * GetWindow() SAL_OVERRIDE;
private:
Link aNextHdl;
Link aPrevHdl;
@@ -509,167 +509,167 @@ class AbstractPasswordToOpenModifyDialog_Impl : public AbstractPasswordToOpenMod
class AbstractDialogFactory_Impl : public SvxAbstractDialogFactory
{
public:
- virtual VclAbstractDialog* CreateVclDialog( Window* pParent, sal_uInt32 nResId ) SAL_OVERRIDE;
- virtual VclAbstractDialog* CreateSfxDialog( Window* pParent, const SfxBindings& rBindings, sal_uInt32 nResId ) SAL_OVERRIDE;
+ virtual VclAbstractDialog* CreateVclDialog( vcl::Window* pParent, sal_uInt32 nResId ) SAL_OVERRIDE;
+ virtual VclAbstractDialog* CreateSfxDialog( vcl::Window* pParent, const SfxBindings& rBindings, sal_uInt32 nResId ) SAL_OVERRIDE;
virtual SfxAbstractDialog* CreateSfxDialog( sal_uInt32 nResId,
- Window* pParent,
+ vcl::Window* pParent,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xViewFrame,
const SfxItemSet* pAttrSet=0 );
- virtual SfxAbstractDialog* CreateSfxDialog( Window* pParent,
+ virtual SfxAbstractDialog* CreateSfxDialog( vcl::Window* pParent,
const SfxItemSet& rAttr,
const SdrView* pView,
sal_uInt32 nResId ) SAL_OVERRIDE;
- virtual SfxAbstractDialog* CreateSfxDialog( Window* pParent,
+ virtual SfxAbstractDialog* CreateSfxDialog( vcl::Window* pParent,
const SfxItemSet& rAttr,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame,
sal_uInt32 nResId
) SAL_OVERRIDE;
- virtual VclAbstractDialog* CreateFrameDialog( Window* pParent, const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rxFrame, sal_uInt32 nResId, const OUString& rParameter ) SAL_OVERRIDE;
+ virtual VclAbstractDialog* CreateFrameDialog( vcl::Window* pParent, const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rxFrame, sal_uInt32 nResId, const OUString& rParameter ) SAL_OVERRIDE;
virtual SfxAbstractTabDialog* CreateTabDialog( sal_uInt32 nResId,
- Window* pParent,
+ vcl::Window* pParent,
const SfxItemSet* pAttrSet,
SfxViewFrame* pViewFrame,
bool bEditFmt=false,
const OUString *pUserButtonText=0 ) SAL_OVERRIDE;
virtual SfxAbstractTabDialog* CreateTabDialog( sal_uInt32 nResId,
- Window* pParent,
+ vcl::Window* pParent,
const SfxItemSet* pAttrSet,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xViewFrame,
bool bEditFmt=false,
const OUString *pUserButtonText=0 ) SAL_OVERRIDE;
- virtual SfxAbstractTabDialog* CreateTextTabDialog( Window* pParent,
+ virtual SfxAbstractTabDialog* CreateTextTabDialog( vcl::Window* pParent,
const SfxItemSet* pAttrSet,
SdrView* pView,
SdrModel* pModel=0 ) SAL_OVERRIDE;
- virtual SfxAbstractTabDialog* CreateTabItemDialog(Window* pParent,
+ virtual SfxAbstractTabDialog* CreateTabItemDialog(vcl::Window* pParent,
const SfxItemSet& rSet) SAL_OVERRIDE;
- virtual AbstractSvxCaptionDialog* CreateCaptionDialog( Window* pParent,
+ virtual AbstractSvxCaptionDialog* CreateCaptionDialog( vcl::Window* pParent,
const SdrView* pView,
sal_uInt16 nAnchorTypes = 0 ) SAL_OVERRIDE;
- virtual AbstractSvxDistributeDialog* CreateSvxDistributeDialog(Window* pParent,
+ virtual AbstractSvxDistributeDialog* CreateSvxDistributeDialog(vcl::Window* pParent,
const SfxItemSet& rAttr,
SvxDistributeHorizontal eHor = SvxDistributeHorizontalNone,
SvxDistributeVertical eVer = SvxDistributeVerticalNone) SAL_OVERRIDE;
- virtual SfxAbstractInsertObjectDialog* CreateInsertObjectDialog( Window* pParent, const OUString& rCommmand,
+ virtual SfxAbstractInsertObjectDialog* CreateInsertObjectDialog( vcl::Window* pParent, const OUString& rCommmand,
const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStor,
const SvObjectServerList* pList = 0 ) SAL_OVERRIDE;
- virtual VclAbstractDialog* CreateEditObjectDialog( Window* pParent, const OUString& rCommmand,
+ virtual VclAbstractDialog* CreateEditObjectDialog( vcl::Window* pParent, const OUString& rCommmand,
const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >& xObj ) SAL_OVERRIDE;
- virtual SfxAbstractPasteDialog* CreatePasteDialog( Window* pParent ) SAL_OVERRIDE;
- virtual SfxAbstractLinksDialog* CreateLinksDialog( Window* pParent, sfx2::LinkManager* pMgr, bool bHTML, sfx2::SvBaseLink* p=0 ) SAL_OVERRIDE;
+ virtual SfxAbstractPasteDialog* CreatePasteDialog( vcl::Window* pParent ) SAL_OVERRIDE;
+ virtual SfxAbstractLinksDialog* CreateLinksDialog( vcl::Window* pParent, sfx2::LinkManager* pMgr, bool bHTML, sfx2::SvBaseLink* p=0 ) SAL_OVERRIDE;
- virtual AbstractHangulHanjaConversionDialog * CreateHangulHanjaConversionDialog( Window* _pParent,
+ virtual AbstractHangulHanjaConversionDialog * CreateHangulHanjaConversionDialog( vcl::Window* _pParent,
editeng::HangulHanjaConversion::ConversionDirection _ePrimaryDirection ) SAL_OVERRIDE;
- virtual AbstractThesaurusDialog* CreateThesaurusDialog( Window*, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XThesaurus > xThesaurus,
+ virtual AbstractThesaurusDialog* CreateThesaurusDialog( vcl::Window*, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XThesaurus > xThesaurus,
const OUString &rWord, sal_Int16 nLanguage ) SAL_OVERRIDE;
- virtual AbstractHyphenWordDialog* CreateHyphenWordDialog( Window*,
+ virtual AbstractHyphenWordDialog* CreateHyphenWordDialog( vcl::Window*,
const OUString &rWord, LanguageType nLang,
::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenator > &xHyphen,
SvxSpellWrapper* pWrapper ) SAL_OVERRIDE;
- virtual AbstractFmShowColsDialog * CreateFmShowColsDialog( Window* pParent ) SAL_OVERRIDE;
- virtual AbstractSvxZoomDialog * CreateSvxZoomDialog( Window* pParent,
+ virtual AbstractFmShowColsDialog * CreateFmShowColsDialog( vcl::Window* pParent ) SAL_OVERRIDE;
+ virtual AbstractSvxZoomDialog * CreateSvxZoomDialog( vcl::Window* pParent,
const SfxItemSet& rCoreSet) SAL_OVERRIDE;
//UUUU add for SvxBorderBackgroundDlg
virtual SfxAbstractTabDialog* CreateSvxBorderBackgroundDlg(
- Window* pParent,
+ vcl::Window* pParent,
const SfxItemSet& rCoreSet,
bool bEnableSelector = false,
bool bEnableDrawingLayerFillStyles = false) SAL_OVERRIDE;
- virtual AbstractSvxTransformTabDialog* CreateSvxTransformTabDialog( Window* pParent,
+ virtual AbstractSvxTransformTabDialog* CreateSvxTransformTabDialog( vcl::Window* pParent,
const SfxItemSet* pAttr,
const SdrView* pView,
sal_uInt16 nAnchorTypes = 0) SAL_OVERRIDE ;
- virtual SfxAbstractTabDialog* CreateSchTransformTabDialog( Window* pParent,
+ virtual SfxAbstractTabDialog* CreateSchTransformTabDialog( vcl::Window* pParent,
const SfxItemSet* pAttr,
const SdrView* pSdrView,
sal_uInt32 nResId,
bool bSizeTabPage = false
) SAL_OVERRIDE;
virtual AbstractSpellDialog * CreateSvxSpellDialog(
- Window* pParent,
+ vcl::Window* pParent,
SfxBindings* pBindings,
svx::SpellDialogChildWindow* pSpellChildWindow ) SAL_OVERRIDE;
- virtual VclAbstractRefreshableDialog * CreateActualizeProgressDialog( Window* pParent, GalleryTheme* pThm ) SAL_OVERRIDE;
- virtual AbstractSearchProgress * CreateSearchProgressDialog( Window* pParent,
+ virtual VclAbstractRefreshableDialog * CreateActualizeProgressDialog( vcl::Window* pParent, GalleryTheme* pThm ) SAL_OVERRIDE;
+ virtual AbstractSearchProgress * CreateSearchProgressDialog( vcl::Window* pParent,
const INetURLObject& rStartURL) SAL_OVERRIDE;
- virtual AbstractTakeProgress * CreateTakeProgressDialog( Window* pParent ) SAL_OVERRIDE;
- virtual AbstractTitleDialog * CreateTitleDialog( Window* pParent,
+ virtual AbstractTakeProgress * CreateTakeProgressDialog( vcl::Window* pParent ) SAL_OVERRIDE;
+ virtual AbstractTitleDialog * CreateTitleDialog( vcl::Window* pParent,
const OUString& rOldText) SAL_OVERRIDE;
- virtual AbstractGalleryIdDialog * CreateGalleryIdDialog( Window* pParent,
+ virtual AbstractGalleryIdDialog * CreateGalleryIdDialog( vcl::Window* pParent,
GalleryTheme* pThm) SAL_OVERRIDE;
- virtual VclAbstractDialog2 * CreateGalleryThemePropertiesDialog( Window* pParent,
+ virtual VclAbstractDialog2 * CreateGalleryThemePropertiesDialog( vcl::Window* pParent,
ExchangeData* pData,
SfxItemSet* pItemSet) SAL_OVERRIDE;
- virtual AbstractURLDlg * CreateURLDialog( Window* pParent,
+ virtual AbstractURLDlg * CreateURLDialog( vcl::Window* pParent,
const OUString& rURL, const OUString& rAltText, const OUString& rDescription,
const OUString& rTarget, const OUString& rName,
TargetList& rTargetList ) SAL_OVERRIDE;
virtual AbstractSvxHlinkDlgMarkWnd* CreateSvxHlinkDlgMarkWndDialog( SvxHyperlinkTabPageBase* pParent, sal_uInt32 nResId ) SAL_OVERRIDE;
- virtual VclAbstractDialog* CreateSvxSearchAttributeDialog( Window* pParent,
+ virtual VclAbstractDialog* CreateSvxSearchAttributeDialog( vcl::Window* pParent,
SearchAttrItemList& rLst,
const sal_uInt16* pWhRanges) SAL_OVERRIDE;
- virtual AbstractSvxSearchSimilarityDialog * CreateSvxSearchSimilarityDialog( Window* pParent,
+ virtual AbstractSvxSearchSimilarityDialog * CreateSvxSearchSimilarityDialog( vcl::Window* pParent,
bool bRelax,
sal_uInt16 nOther,
sal_uInt16 nShorter,
sal_uInt16 nLonger) SAL_OVERRIDE;
- virtual AbstractSvxJSearchOptionsDialog * CreateSvxJSearchOptionsDialog( Window* pParent,
+ virtual AbstractSvxJSearchOptionsDialog * CreateSvxJSearchOptionsDialog( vcl::Window* pParent,
const SfxItemSet& rOptionsSet,
sal_Int32 nInitialFlags) SAL_OVERRIDE;
- virtual AbstractFmInputRecordNoDialog * CreateFmInputRecordNoDialog( Window* pParent ) SAL_OVERRIDE;
- virtual AbstractSvxNewDictionaryDialog* CreateSvxNewDictionaryDialog( Window* pParent,
+ virtual AbstractFmInputRecordNoDialog * CreateFmInputRecordNoDialog( vcl::Window* pParent ) SAL_OVERRIDE;
+ virtual AbstractSvxNewDictionaryDialog* CreateSvxNewDictionaryDialog( vcl::Window* pParent,
::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1 > &xSpl ) SAL_OVERRIDE;
- virtual VclAbstractDialog * CreateSvxEditDictionaryDialog( Window* pParent,
+ virtual VclAbstractDialog * CreateSvxEditDictionaryDialog( vcl::Window* pParent,
const OUString& rName,
::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1> &xSpl,
sal_uInt32 nResId) SAL_OVERRIDE;
- virtual AbstractSvxNameDialog * CreateSvxNameDialog( Window* pParent,
+ virtual AbstractSvxNameDialog * CreateSvxNameDialog( vcl::Window* pParent,
const OUString& rName, const OUString& rDesc ) SAL_OVERRIDE;
// #i68101#
- virtual AbstractSvxObjectNameDialog* CreateSvxObjectNameDialog(Window* pParent, const OUString& rName ) SAL_OVERRIDE;
- virtual AbstractSvxObjectTitleDescDialog* CreateSvxObjectTitleDescDialog(Window* pParent, const OUString& rTitle, const OUString& rDescription) SAL_OVERRIDE;
+ virtual AbstractSvxObjectNameDialog* CreateSvxObjectNameDialog(vcl::Window* pParent, const OUString& rName ) SAL_OVERRIDE;
+ virtual AbstractSvxObjectTitleDescDialog* CreateSvxObjectTitleDescDialog(vcl::Window* pParent, const OUString& rTitle, const OUString& rDescription) SAL_OVERRIDE;
- virtual AbstractSvxMessDialog * CreateSvxMessDialog( Window* pParent, sal_uInt32 nResId,
+ virtual AbstractSvxMessDialog * CreateSvxMessDialog( vcl::Window* pParent, sal_uInt32 nResId,
const OUString& rText, const OUString& rDesc,
Image* pImg = NULL ) SAL_OVERRIDE;
- virtual AbstractSvxMultiPathDialog * CreateSvxMultiPathDialog(Window* pParent) SAL_OVERRIDE;
- virtual AbstractSvxMultiPathDialog * CreateSvxPathSelectDialog(Window* pParent) SAL_OVERRIDE;
- virtual AbstractSvxHpLinkDlg * CreateSvxHpLinkDlg (Window* pParent,
+ virtual AbstractSvxMultiPathDialog * CreateSvxMultiPathDialog(vcl::Window* pParent) SAL_OVERRIDE;
+ virtual AbstractSvxMultiPathDialog * CreateSvxPathSelectDialog(vcl::Window* pParent) SAL_OVERRIDE;
+ virtual AbstractSvxHpLinkDlg * CreateSvxHpLinkDlg (vcl::Window* pParent,
SfxBindings* pBindings,
sal_uInt32 nResId) SAL_OVERRIDE;
- virtual AbstractFmSearchDialog* CreateFmSearchDialog(Window* pParent,
+ virtual AbstractFmSearchDialog* CreateFmSearchDialog(vcl::Window* pParent,
const OUString& strInitialText,
const ::std::vector< OUString >& _rContexts,
sal_Int16 nInitialContext,
const Link& lnkContextSupplier) SAL_OVERRIDE;
- virtual AbstractGraphicFilterDialog * CreateGraphicFilterEmboss(Window* pParent,
+ virtual AbstractGraphicFilterDialog * CreateGraphicFilterEmboss(vcl::Window* pParent,
const Graphic& rGraphic, RECT_POINT eLightSource) SAL_OVERRIDE;
- virtual AbstractGraphicFilterDialog * CreateGraphicFilterPoster(Window* pParent,
+ virtual AbstractGraphicFilterDialog * CreateGraphicFilterPoster(vcl::Window* pParent,
const Graphic& rGraphic, sal_uInt16 nCount) SAL_OVERRIDE;
- virtual AbstractGraphicFilterDialog * CreateGraphicFilterSepia (Window* pParent,
+ virtual AbstractGraphicFilterDialog * CreateGraphicFilterSepia (vcl::Window* pParent,
const Graphic& rGraphic, sal_uInt16 nCount) SAL_OVERRIDE;
- virtual AbstractGraphicFilterDialog * CreateGraphicFilterSmooth (Window* pParent,
+ virtual AbstractGraphicFilterDialog * CreateGraphicFilterSmooth (vcl::Window* pParent,
const Graphic& rGraphic, double nRadius) SAL_OVERRIDE;
- virtual AbstractGraphicFilterDialog * CreateGraphicFilterSolarize (Window* pParent,
+ virtual AbstractGraphicFilterDialog * CreateGraphicFilterSolarize (vcl::Window* pParent,
const Graphic& rGraphic, sal_uInt8 nGreyThreshold,
bool bInvert) SAL_OVERRIDE;
- virtual AbstractGraphicFilterDialog * CreateGraphicFilterMosaic (Window* pParent,
+ virtual AbstractGraphicFilterDialog * CreateGraphicFilterMosaic (vcl::Window* pParent,
const Graphic& rGraphic, sal_uInt16 nTileWidth, sal_uInt16 nTileHeight,
bool bEnhanceEdges) SAL_OVERRIDE;
- virtual AbstractSvxAreaTabDialog* CreateSvxAreaTabDialog( Window* pParent,
+ virtual AbstractSvxAreaTabDialog* CreateSvxAreaTabDialog( vcl::Window* pParent,
const SfxItemSet* pAttr,
SdrModel* pModel,
bool bShadow ) SAL_OVERRIDE;
- virtual SfxAbstractTabDialog* CreateSvxLineTabDialog( Window* pParent, const SfxItemSet* pAttr,
+ virtual SfxAbstractTabDialog* CreateSvxLineTabDialog( vcl::Window* pParent, const SfxItemSet* pAttr,
SdrModel* pModel,
const SdrObject* pObj = NULL,
bool bHasObj = true ) SAL_OVERRIDE;
- virtual AbstractSvxPostItDialog* CreateSvxPostItDialog( Window* pParent,
+ virtual AbstractSvxPostItDialog* CreateSvxPostItDialog( vcl::Window* pParent,
const SfxItemSet& rCoreSet,
bool bPrevNext = false ) SAL_OVERRIDE;
@@ -679,38 +679,38 @@ public:
virtual GetTabPageRanges GetTabPageRangesFunc( sal_uInt16 nId ) SAL_OVERRIDE;
virtual DialogGetRanges GetDialogGetRangesFunc() SAL_OVERRIDE;
- virtual VclAbstractDialog* CreateSvxScriptOrgDialog( Window* pParent, const OUString& rLanguage ) SAL_OVERRIDE;
+ virtual VclAbstractDialog* CreateSvxScriptOrgDialog( vcl::Window* pParent, const OUString& rLanguage ) SAL_OVERRIDE;
virtual AbstractScriptSelectorDialog*
CreateScriptSelectorDialog(
- Window* pParent,
+ vcl::Window* pParent,
bool bShowSlots,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame
) SAL_OVERRIDE;
virtual VclAbstractDialog* CreateScriptErrorDialog(
- Window* pParent, ::com::sun::star::uno::Any aException) SAL_OVERRIDE;
+ vcl::Window* pParent, ::com::sun::star::uno::Any aException) SAL_OVERRIDE;
virtual VclAbstractDialog* CreateSvxMacroAssignDlg(
- Window* _pParent,
+ vcl::Window* _pParent,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxDocumentFrame,
const bool _bUnoDialogMode,
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace >& _rxEvents,
const sal_uInt16 _nInitiallySelectedEvent
) SAL_OVERRIDE;
- virtual SfxAbstractTabDialog* CreateSvxFormatCellsDialog( Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel, const SdrObject* pObj = NULL ) SAL_OVERRIDE;
+ virtual SfxAbstractTabDialog* CreateSvxFormatCellsDialog( vcl::Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel, const SdrObject* pObj = NULL ) SAL_OVERRIDE;
- virtual SvxAbstractSplittTableDialog* CreateSvxSplittTableDialog( Window* pParent, bool bIsTableVertical, long nMaxVertical, long nMaxHorizontal ) SAL_OVERRIDE;
+ virtual SvxAbstractSplittTableDialog* CreateSvxSplittTableDialog( vcl::Window* pParent, bool bIsTableVertical, long nMaxVertical, long nMaxHorizontal ) SAL_OVERRIDE;
- virtual SvxAbstractNewTableDialog* CreateSvxNewTableDialog( Window* pParent ) SAL_OVERRIDE ;
+ virtual SvxAbstractNewTableDialog* CreateSvxNewTableDialog( vcl::Window* pParent ) SAL_OVERRIDE ;
virtual VclAbstractDialog* CreateOptionsDialog(
- Window* pParent, const OUString& rExtensionId, const OUString& rApplicationContext ) SAL_OVERRIDE;
+ vcl::Window* pParent, const OUString& rExtensionId, const OUString& rApplicationContext ) SAL_OVERRIDE;
- virtual SvxAbstractInsRowColDlg* CreateSvxInsRowColDlg( Window* pParent, bool bCol, const OString& sHelpId ) SAL_OVERRIDE;
+ virtual SvxAbstractInsRowColDlg* CreateSvxInsRowColDlg( vcl::Window* pParent, bool bCol, const OString& sHelpId ) SAL_OVERRIDE;
- virtual AbstractPasswordToOpenModifyDialog * CreatePasswordToOpenModifyDialog( Window * pParent, sal_uInt16 nMinPasswdLen, sal_uInt16 nMaxPasswdLen, bool bIsPasswordToModify ) SAL_OVERRIDE;
+ virtual AbstractPasswordToOpenModifyDialog * CreatePasswordToOpenModifyDialog( vcl::Window * pParent, sal_uInt16 nMinPasswdLen, sal_uInt16 nMaxPasswdLen, bool bIsPasswordToModify ) SAL_OVERRIDE;
};
#endif
diff --git a/cui/source/factory/init.cxx b/cui/source/factory/init.cxx
index cff22986fc77..eb24820e3351 100644
--- a/cui/source/factory/init.cxx
+++ b/cui/source/factory/init.cxx
@@ -25,7 +25,7 @@
// caution: needs C-Linkage since dynamically loaded via symbol name
extern "C"
{
-SAL_DLLPUBLIC_EXPORT bool GetSpecialCharsForEdit(Window* i_pParent, const vcl::Font& i_rFont, OUString& o_rResult)
+SAL_DLLPUBLIC_EXPORT bool GetSpecialCharsForEdit(vcl::Window* i_pParent, const vcl::Font& i_rFont, OUString& o_rResult)
{
bool bRet = false;
boost::scoped_ptr<SvxCharacterMap> aDlg(new SvxCharacterMap( i_pParent ));
diff --git a/cui/source/inc/ControlFocusHelper.hxx b/cui/source/inc/ControlFocusHelper.hxx
index ed1357658df2..b984838fa09c 100644
--- a/cui/source/inc/ControlFocusHelper.hxx
+++ b/cui/source/inc/ControlFocusHelper.hxx
@@ -29,7 +29,7 @@ private:
Control* m_pFocusCtrl;
public:
- SvxControlFocusHelper( Window* pParent, const ResId& rId ) :
+ SvxControlFocusHelper( vcl::Window* pParent, const ResId& rId ) :
Control( pParent, rId ), m_pFocusCtrl( NULL ) {}
void SetFocusControl( Control* pCtrl ) { m_pFocusCtrl = pCtrl; }
diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx
index cd0179b88b79..5bbe67ab91de 100644
--- a/cui/source/inc/SpellDialog.hxx
+++ b/cui/source/inc/SpellDialog.hxx
@@ -75,7 +75,7 @@ protected:
virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
public:
- SentenceEditWindow_Impl(Window* pParent, WinBits nBits);
+ SentenceEditWindow_Impl(vcl::Window* pParent, WinBits nBits);
virtual ~SentenceEditWindow_Impl();
void SetModifyHdl(const Link& rLink) SAL_OVERRIDE { m_aModifyLink = rLink;}
@@ -217,7 +217,7 @@ protected:
public:
SpellDialog(
svx::SpellDialogChildWindow* pChildWindow,
- Window * pParent,
+ vcl::Window * pParent,
SfxBindings* pBindings);
virtual ~SpellDialog();
diff --git a/cui/source/inc/about.hxx b/cui/source/inc/about.hxx
index dd275a06dc96..72c45c2bc728 100644
--- a/cui/source/inc/about.hxx
+++ b/cui/source/inc/about.hxx
@@ -64,7 +64,7 @@ protected:
virtual void Resize() SAL_OVERRIDE;
public:
- AboutDialog(Window* pParent);
+ AboutDialog(vcl::Window* pParent);
DECL_LINK( HandleClick, PushButton* );
};
diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx
index 7ece823d5b88..88d096f8425f 100644
--- a/cui/source/inc/acccfg.hxx
+++ b/cui/source/inc/acccfg.hxx
@@ -62,7 +62,7 @@ protected:
const Image&, SvLBoxButtonKind eButtonKind) SAL_OVERRIDE;
public:
- SfxAccCfgTabListBox_Impl(Window *pParent, WinBits nStyle)
+ SfxAccCfgTabListBox_Impl(vcl::Window *pParent, WinBits nStyle)
: SvTabListBox(pParent, nStyle)
, m_pAccelConfigPage(NULL)
{
@@ -170,7 +170,7 @@ private:
void CreateCustomItems( SvTreeListEntry* pEntry, const OUString& aCol1, const OUString& aCol2 );
public:
- SfxAcceleratorConfigPage( Window *pParent, const SfxItemSet& rItemSet );
+ SfxAcceleratorConfigPage( vcl::Window *pParent, const SfxItemSet& rItemSet );
virtual ~SfxAcceleratorConfigPage();
virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
diff --git a/cui/source/inc/align.hxx b/cui/source/inc/align.hxx
index 3aa641cbe318..bb249b5822ce 100644
--- a/cui/source/inc/align.hxx
+++ b/cui/source/inc/align.hxx
@@ -59,7 +59,7 @@ class AlignmentTabPage : public SfxTabPage
public:
virtual ~AlignmentTabPage();
- static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet );
+ static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet );
static const sal_uInt16* GetRanges();
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
@@ -68,7 +68,7 @@ public:
virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
private:
- explicit AlignmentTabPage( Window* pParent, const SfxItemSet& rCoreSet );
+ explicit AlignmentTabPage( vcl::Window* pParent, const SfxItemSet& rCoreSet );
void InitVsRefEgde();
void UpdateEnableControls();
diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx
index 5d70cc9d9fea..2ca4b4c440c7 100644
--- a/cui/source/inc/autocdlg.hxx
+++ b/cui/source/inc/autocdlg.hxx
@@ -52,7 +52,7 @@ class OfaAutoCorrDlg : public SfxTabDialog
DECL_LINK(SelectLanguageHdl, ListBox*);
public:
- OfaAutoCorrDlg(Window* pParent, const SfxItemSet *pSet);
+ OfaAutoCorrDlg(vcl::Window* pParent, const SfxItemSet *pSet);
void EnableLanguage(bool bEnable);
};
@@ -108,9 +108,9 @@ private:
OUString m_sAccidentalCaps;
public:
- OfaAutocorrOptionsPage(Window* pParent, const SfxItemSet& rSet);
+ OfaAutocorrOptionsPage(vcl::Window* pParent, const SfxItemSet& rSet);
- static SfxTabPage* Create( Window* pParent,
+ static SfxTabPage* Create( vcl::Window* pParent,
const SfxItemSet* rAttrSet);
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
@@ -165,12 +165,12 @@ class OfaSwAutoFmtOptionsPage : public SfxTabPage
SvTreeListEntry* CreateEntry(OUString& rTxt, sal_uInt16 nCol);
- OfaSwAutoFmtOptionsPage( Window* pParent,
+ OfaSwAutoFmtOptionsPage( vcl::Window* pParent,
const SfxItemSet& rSet );
virtual ~OfaSwAutoFmtOptionsPage();
public:
- static SfxTabPage* Create( Window* pParent,
+ static SfxTabPage* Create( vcl::Window* pParent,
const SfxItemSet* rAttrSet);
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
@@ -185,9 +185,9 @@ class AutoCorrEdit : public Edit
bool bSpaces;
public:
- AutoCorrEdit(Window* pParent, const ResId& rResId) :
+ AutoCorrEdit(vcl::Window* pParent, const ResId& rResId) :
Edit(pParent, rResId), bSpaces(false){}
- AutoCorrEdit(Window* pParent) :
+ AutoCorrEdit(vcl::Window* pParent) :
Edit(pParent), bSpaces(false){}
void SetActionHdl( const Link& rLink )
@@ -260,10 +260,10 @@ private:
void setTabs();
public:
- OfaAutocorrReplacePage( Window* pParent, const SfxItemSet& rSet );
+ OfaAutocorrReplacePage( vcl::Window* pParent, const SfxItemSet& rSet );
virtual ~OfaAutocorrReplacePage();
- static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet);
+ static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet);
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
@@ -318,10 +318,10 @@ private:
LanguageType eOldLanguage,
LanguageType eNewLanguage);
public:
- OfaAutocorrExceptPage( Window* pParent, const SfxItemSet& rSet );
+ OfaAutocorrExceptPage( vcl::Window* pParent, const SfxItemSet& rSet );
virtual ~OfaAutocorrExceptPage();
- static SfxTabPage* Create( Window* pParent,
+ static SfxTabPage* Create( vcl::Window* pParent,
const SfxItemSet* rAttrSet);
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
@@ -383,11 +383,11 @@ private:
SvTreeListEntry* CreateEntry(OUString& rTxt, sal_uInt16 nCol);
- OfaQuoteTabPage( Window* pParent, const SfxItemSet& rSet );
+ OfaQuoteTabPage( vcl::Window* pParent, const SfxItemSet& rSet );
public:
virtual ~OfaQuoteTabPage();
- static SfxTabPage* Create( Window* pParent,
+ static SfxTabPage* Create( vcl::Window* pParent,
const SfxItemSet* rAttrSet);
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
@@ -404,7 +404,7 @@ public:
{
OfaAutoCompleteTabPage* m_pPage;
public:
- AutoCompleteMultiListBox(Window *pParent, WinBits nBits)
+ AutoCompleteMultiListBox(vcl::Window *pParent, WinBits nBits)
: MultiListBox(pParent, nBits)
, m_pPage(NULL)
{
@@ -432,12 +432,12 @@ private:
DECL_LINK( CheckHdl, CheckBox* );
- OfaAutoCompleteTabPage( Window* pParent,
+ OfaAutoCompleteTabPage( vcl::Window* pParent,
const SfxItemSet& rSet );
public:
virtual ~OfaAutoCompleteTabPage();
- static SfxTabPage* Create( Window* pParent,
+ static SfxTabPage* Create( vcl::Window* pParent,
const SfxItemSet* rAttrSet);
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
@@ -466,7 +466,7 @@ private:
PushButton* m_pPropertiesPB;
/// construction via Create()
- OfaSmartTagOptionsTabPage( Window* pParent, const SfxItemSet& rSet );
+ OfaSmartTagOptionsTabPage( vcl::Window* pParent, const SfxItemSet& rSet );
/** Inserts items into m_aSmartTagTypesLB
@@ -504,7 +504,7 @@ public:
virtual ~OfaSmartTagOptionsTabPage();
- static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet);
+ static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet);
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx
index 0402ecb85c0d..ab4145fcece1 100644
--- a/cui/source/inc/backgrnd.hxx
+++ b/cui/source/inc/backgrnd.hxx
@@ -46,13 +46,13 @@ class SvxBackgroundTabPage : public SvxTabPage
{
using TabPage::DeactivatePage;
public:
- static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet );
+ static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet );
static const sal_uInt16* GetRanges();
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void FillUserData() SAL_OVERRIDE;
- virtual void PointChanged( Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE;
+ virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE;
/// Shift-ListBox activation
void ShowSelector();
@@ -67,7 +67,7 @@ protected:
virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
private:
- SvxBackgroundTabPage( Window* pParent, const SfxItemSet& rCoreSet );
+ SvxBackgroundTabPage( vcl::Window* pParent, const SfxItemSet& rCoreSet );
virtual ~SvxBackgroundTabPage();
VclContainer* m_pAsGrid;
diff --git a/cui/source/inc/bbdlg.hxx b/cui/source/inc/bbdlg.hxx
index f5fc9d242f88..ca5d43550925 100644
--- a/cui/source/inc/bbdlg.hxx
+++ b/cui/source/inc/bbdlg.hxx
@@ -28,7 +28,7 @@
class SvxBorderBackgroundDlg: public SfxTabDialog
{
public:
- SvxBorderBackgroundDlg(Window *pParent,
+ SvxBorderBackgroundDlg(vcl::Window *pParent,
const SfxItemSet& rCoreSet,
bool bEnableSelector = false,
bool bEnableDrawingLayerFillStyles = false);
diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx
index e3e352b72af9..0a5aea5504b6 100644
--- a/cui/source/inc/border.hxx
+++ b/cui/source/inc/border.hxx
@@ -43,7 +43,7 @@ class SvxBorderTabPage : public SfxTabPage
using TabPage::DeactivatePage;
public:
- static SfxTabPage* Create( Window* pParent,
+ static SfxTabPage* Create( vcl::Window* pParent,
const SfxItemSet* rAttrSet);
static const sal_uInt16* GetRanges();
@@ -58,7 +58,7 @@ protected:
virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
private:
- SvxBorderTabPage( Window* pParent, const SfxItemSet& rCoreAttrs );
+ SvxBorderTabPage( vcl::Window* pParent, const SfxItemSet& rCoreAttrs );
virtual ~SvxBorderTabPage();
// Controls
diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx
index 6d786a227c35..ebbff4af7b1f 100644
--- a/cui/source/inc/cfg.hxx
+++ b/cui/source/inc/cfg.hxx
@@ -64,7 +64,7 @@ private:
sal_uInt16 m_nEventsPageId;
public:
- SvxConfigDialog( Window*, const SfxItemSet* );
+ SvxConfigDialog( vcl::Window*, const SfxItemSet* );
virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE;
void SetFrame(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame);
@@ -321,7 +321,7 @@ protected:
bool m_bIsInternalDrag;
public:
- SvxMenuEntriesListBox(Window*, SvxConfigPage*);
+ SvxMenuEntriesListBox(vcl::Window*, SvxConfigPage*);
virtual ~SvxMenuEntriesListBox();
virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE;
@@ -390,7 +390,7 @@ protected:
::com::sun::star::uno::Reference
< ::com::sun::star::frame::XFrame > m_xFrame;
- SvxConfigPage( Window*, const SfxItemSet& );
+ SvxConfigPage( vcl::Window*, const SfxItemSet& );
DECL_LINK( MoveHdl, Button * );
@@ -481,7 +481,7 @@ private:
void DeleteSelectedTopLevel() SAL_OVERRIDE;
public:
- SvxMenuConfigPage( Window *pParent, const SfxItemSet& rItemSet );
+ SvxMenuConfigPage( vcl::Window *pParent, const SfxItemSet& rItemSet );
virtual ~SvxMenuConfigPage();
SaveInData* CreateSaveInData(
@@ -513,7 +513,7 @@ class SvxMainMenuOrganizerDialog : public ModalDialog
public:
SvxMainMenuOrganizerDialog (
- Window*, SvxEntries*,
+ vcl::Window*, SvxEntries*,
SvxConfigEntry*, bool bCreateMenu = false );
virtual ~SvxMainMenuOrganizerDialog ();
@@ -542,7 +542,7 @@ protected:
public:
- SvxToolbarEntriesListBox(Window* pParent, SvxToolbarConfigPage* pPg);
+ SvxToolbarEntriesListBox(vcl::Window* pParent, SvxToolbarConfigPage* pPg);
virtual ~SvxToolbarEntriesListBox();
void SetChangedListener( const Link& aChangedListener )
@@ -582,7 +582,7 @@ private:
void DeleteSelectedTopLevel() SAL_OVERRIDE;
public:
- SvxToolbarConfigPage( Window *pParent, const SfxItemSet& rItemSet );
+ SvxToolbarConfigPage( vcl::Window *pParent, const SfxItemSet& rItemSet );
virtual ~SvxToolbarConfigPage();
SvTreeListEntry* AddFunction( SvTreeListEntry* pTarget = NULL,
@@ -670,7 +670,7 @@ private:
DECL_LINK(ModifyHdl, Edit*);
public:
- SvxNewToolbarDialog(Window* pWindow, const OUString& rName);
+ SvxNewToolbarDialog(vcl::Window* pWindow, const OUString& rName);
ListBox* m_pSaveInListBox;
@@ -733,7 +733,7 @@ private:
public:
SvxIconSelectorDialog(
- Window *pWindow,
+ vcl::Window *pWindow,
const ::com::sun::star::uno::Reference<
::com::sun::star::ui::XImageManager >& rXImageManager,
const ::com::sun::star::uno::Reference<
@@ -754,12 +754,12 @@ class SvxIconReplacementDialog : public MessBox
{
public:
SvxIconReplacementDialog(
- Window *pWindow,
+ vcl::Window *pWindow,
const OUString& aMessage,
bool aYestoAll);
SvxIconReplacementDialog(
- Window *pWindow,
+ vcl::Window *pWindow,
const OUString& aMessage );
OUString ReplaceIconName( const OUString& );
@@ -772,7 +772,7 @@ private:
FixedImage* pFImageInfo;
VclMultiLineEdit* pLineEditDescription;
public:
- SvxIconChangeDialog(Window *pWindow, const OUString& aMessage);
+ SvxIconChangeDialog(vcl::Window *pWindow, const OUString& aMessage);
};
#endif // INCLUDED_CUI_SOURCE_INC_CFG_HXX
diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx
index f14200363424..c2c124298101 100644
--- a/cui/source/inc/cfgutil.hxx
+++ b/cui/source/inc/cfgutil.hxx
@@ -111,7 +111,7 @@ class SfxConfigFunctionListBox : public SvTreeListBox
virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE;
public:
- SfxConfigFunctionListBox(Window*, WinBits nStyle);
+ SfxConfigFunctionListBox(vcl::Window*, WinBits nStyle);
virtual ~SfxConfigFunctionListBox();
void ClearAll();
@@ -163,7 +163,7 @@ protected:
virtual bool Expand( SvTreeListEntry* pParent ) SAL_OVERRIDE;
public:
- SfxConfigGroupListBox(Window* pParent, WinBits nStyle);
+ SfxConfigGroupListBox(vcl::Window* pParent, WinBits nStyle);
virtual ~SfxConfigGroupListBox();
void ClearAll();
diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx
index ab2841623eba..424a976b4df0 100644
--- a/cui/source/inc/chardlg.hxx
+++ b/cui/source/inc/chardlg.hxx
@@ -51,7 +51,7 @@ protected:
bool m_bPreviewBackgroundToCharacter;
- SvxCharBasePage(Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet& rItemset);
+ SvxCharBasePage(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet& rItemset);
virtual ~SvxCharBasePage();
@@ -113,7 +113,7 @@ private:
SvxCharNamePage_Impl* m_pImpl;
- SvxCharNamePage( Window* pParent, const SfxItemSet& rSet );
+ SvxCharNamePage( vcl::Window* pParent, const SfxItemSet& rSet );
void Initialize();
const FontList* GetFontList() const;
@@ -152,7 +152,7 @@ public:
public:
virtual ~SvxCharNamePage();
- static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet );
+ static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet );
static const sal_uInt16* GetRanges();
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
@@ -210,7 +210,7 @@ private:
OUString m_aTransparentColorName;
- SvxCharEffectsPage( Window* pParent, const SfxItemSet& rSet );
+ SvxCharEffectsPage( vcl::Window* pParent, const SfxItemSet& rSet );
virtual ~SvxCharEffectsPage();
void Initialize();
@@ -231,7 +231,7 @@ public:
virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
public:
- static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet );
+ static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet );
static const sal_uInt16* GetRanges();
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
@@ -284,7 +284,7 @@ private:
sal_uInt8 m_nSuperProp;
sal_uInt8 m_nSubProp;
- SvxCharPositionPage( Window* pParent, const SfxItemSet& rSet );
+ SvxCharPositionPage( vcl::Window* pParent, const SfxItemSet& rSet );
virtual ~SvxCharPositionPage();
void Initialize();
@@ -310,7 +310,7 @@ public:
virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
public:
- static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet );
+ static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet );
static const sal_uInt16* GetRanges();
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
@@ -334,7 +334,7 @@ private:
sal_uInt16 m_nStartBracketPosition;
sal_uInt16 m_nEndBracketPosition;
- SvxCharTwoLinesPage(Window* pParent, const SfxItemSet& rSet);
+ SvxCharTwoLinesPage(vcl::Window* pParent, const SfxItemSet& rSet);
virtual ~SvxCharTwoLinesPage();
void UpdatePreview_Impl();
@@ -353,7 +353,7 @@ public:
virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
public:
- static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet );
+ static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet );
static const sal_uInt16* GetRanges();
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
diff --git a/cui/source/inc/connect.hxx b/cui/source/inc/connect.hxx
index b0e034ea16f3..e66fcd65f9f2 100644
--- a/cui/source/inc/connect.hxx
+++ b/cui/source/inc/connect.hxx
@@ -60,10 +60,10 @@ private:
public:
- SvxConnectionPage( Window* pWindow, const SfxItemSet& rInAttrs );
+ SvxConnectionPage( vcl::Window* pWindow, const SfxItemSet& rInAttrs );
virtual ~SvxConnectionPage();
- static SfxTabPage* Create( Window*, const SfxItemSet* );
+ static SfxTabPage* Create( vcl::Window*, const SfxItemSet* );
static const sal_uInt16* GetRanges();
virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
@@ -79,7 +79,7 @@ public:
class SvxConnectionDialog : public SfxSingleTabDialog
{
public:
- SvxConnectionDialog( Window* pParent, const SfxItemSet& rAttr,
+ SvxConnectionDialog( vcl::Window* pParent, const SfxItemSet& rAttr,
const SdrView* pView );
virtual ~SvxConnectionDialog();
};
diff --git a/cui/source/inc/cuicharmap.hxx b/cui/source/inc/cuicharmap.hxx
index 0c982672ce74..a4d95279c2ac 100644
--- a/cui/source/inc/cuicharmap.hxx
+++ b/cui/source/inc/cuicharmap.hxx
@@ -39,7 +39,7 @@ namespace svx
class SvxShowText : public Control
{
public:
- SvxShowText( Window* pParent,
+ SvxShowText( vcl::Window* pParent,
bool bCenter = false );
virtual ~SvxShowText();
@@ -97,7 +97,7 @@ private:
void fillAllSubsets(ListBox &rListBox);
public:
- SvxCharacterMap( Window* pParent, bool bOne=true, const SfxItemSet* pSet=0 );
+ SvxCharacterMap( vcl::Window* pParent, bool bOne=true, const SfxItemSet* pSet=0 );
virtual ~SvxCharacterMap();
void DisableFontSelection();
diff --git a/cui/source/inc/cuifmsearch.hxx b/cui/source/inc/cuifmsearch.hxx
index 84fabd0d5eeb..d163b3d44b6f 100644
--- a/cui/source/inc/cuifmsearch.hxx
+++ b/cui/source/inc/cuifmsearch.hxx
@@ -76,7 +76,7 @@ class FmSearchDialog : public ModalDialog
OUString m_sSearch;
OUString m_sCancel;
- Window* m_pPreSearchFocus;
+ vcl::Window* m_pPreSearchFocus;
Link m_lnkFoundHandler; ///< Handler for "found"
Link m_lnkCanceledNotFoundHdl; ///< Handler for Positioning the Cursors
@@ -107,7 +107,7 @@ public:
(of course needed : the string number i in strUsedFields of a context must correspond with the interface number i in the
arrFields of the context)
*/
- FmSearchDialog(Window* pParent, const OUString& strInitialText, const ::std::vector< OUString >& _rContexts, sal_Int16 nInitialContext,
+ FmSearchDialog(vcl::Window* pParent, const OUString& strInitialText, const ::std::vector< OUString >& _rContexts, sal_Int16 nInitialContext,
const Link& lnkContextSupplier);
virtual ~FmSearchDialog();
diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx
index 8106bc725973..83f234f9724c 100644
--- a/cui/source/inc/cuigaldlg.hxx
+++ b/cui/source/inc/cuigaldlg.hxx
@@ -83,7 +83,7 @@ private:
FixedText* m_pFtSearchDir;
FixedText* m_pFtSearchType;
CancelButton* m_pBtnCancel;
- Window * parent_;
+ vcl::Window * parent_;
INetURLObject startUrl_;
rtl::Reference< SearchThread > maSearchThread;
@@ -91,7 +91,7 @@ private:
void Terminate();
public:
- SearchProgress( Window* pParent, const INetURLObject& rStartURL );
+ SearchProgress( vcl::Window* pParent, const INetURLObject& rStartURL );
virtual ~SearchProgress() {};
DECL_LINK( CleanUpHdl, void* );
@@ -127,7 +127,7 @@ class TakeProgress : public ModalDialog
private:
FixedText* m_pFtTakeFile;
CancelButton* m_pBtnCancel;
- Window * window_;
+ vcl::Window * window_;
rtl::Reference< TakeThread > maTakeThread;
TokenList_impl maTakenList;
@@ -136,7 +136,7 @@ private:
public:
- TakeProgress( Window* pWindow );
+ TakeProgress( vcl::Window* pWindow );
DECL_LINK( CleanUpHdl, void* );
@@ -159,7 +159,7 @@ private:
DECL_LINK( ActualizeHdl, INetURLObject* pURL );
public:
- ActualizeProgress( Window* pWindow, GalleryTheme* pThm );
+ ActualizeProgress( vcl::Window* pWindow, GalleryTheme* pThm );
virtual ~ActualizeProgress() {};
virtual short Execute() SAL_OVERRIDE;
@@ -170,7 +170,7 @@ class TitleDialog : public ModalDialog
private:
Edit* m_pEdit;
public:
- TitleDialog(Window* pParent, const OUString& rOldText);
+ TitleDialog(vcl::Window* pParent, const OUString& rOldText);
OUString GetTitle() const { return m_pEdit->GetText(); }
};
@@ -184,7 +184,7 @@ private:
DECL_LINK( ClickOkHdl, void* );
DECL_LINK( ClickResNameHdl, void* );
public:
- GalleryIdDialog( Window* pParent, GalleryTheme* pThm );
+ GalleryIdDialog( vcl::Window* pParent, GalleryTheme* pThm );
sal_uLong GetId() const { return m_pLbResName->GetSelectEntryPos(); }
};
@@ -198,7 +198,7 @@ class GalleryThemeProperties : public SfxTabDialog
virtual void PageCreated(sal_uInt16 nId, SfxTabPage &rPage) SAL_OVERRIDE;
public:
- GalleryThemeProperties(Window* pParent, ExchangeData* pData, SfxItemSet* pItemSet);
+ GalleryThemeProperties(vcl::Window* pParent, ExchangeData* pData, SfxItemSet* pItemSet);
};
class TPGalleryThemeGeneral : public SfxTabPage
@@ -219,13 +219,13 @@ private:
public:
- TPGalleryThemeGeneral( Window* pParent, const SfxItemSet& rSet );
+ TPGalleryThemeGeneral( vcl::Window* pParent, const SfxItemSet& rSet );
virtual ~TPGalleryThemeGeneral() {}
void SetXChgData( ExchangeData* pData );
const ExchangeData* GetXChgData() const { return pData; }
- static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet );
+ static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet );
};
typedef ::std::vector< FilterEntry* > FilterEntryList_impl;
@@ -284,7 +284,7 @@ class TPGalleryThemeProperties : public SfxTabPage
DECL_LINK( DialogClosedHdl, ::com::sun::star::ui::dialogs::DialogClosedEvent* );
public:
- TPGalleryThemeProperties( Window* pWindow, const SfxItemSet& rSet );
+ TPGalleryThemeProperties( vcl::Window* pWindow, const SfxItemSet& rSet );
virtual ~TPGalleryThemeProperties();
void SetXChgData( ExchangeData* pData );
@@ -292,7 +292,7 @@ public:
void StartSearchFiles( const OUString& _rFolderURL, short _nDlgResult );
- static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet );
+ static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet );
};
#endif // INCLUDED_CUI_SOURCE_INC_CUIGALDLG_HXX
diff --git a/cui/source/inc/cuigrfflt.hxx b/cui/source/inc/cuigrfflt.hxx
index f501472c7560..f4faabb50960 100644
--- a/cui/source/inc/cuigrfflt.hxx
+++ b/cui/source/inc/cuigrfflt.hxx
@@ -50,7 +50,7 @@ private:
public:
- GraphicPreviewWindow(Window* pParent, WinBits nStyle);
+ GraphicPreviewWindow(vcl::Window* pParent, WinBits nStyle);
void init(const Graphic* pOrigGraphic, const Link& rLink)
{
mpOrigGraphic = pOrigGraphic;
@@ -84,7 +84,7 @@ protected:
public:
- GraphicFilterDialog(Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const Graphic& rGraphic);
+ GraphicFilterDialog(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const Graphic& rGraphic);
virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) = 0;
};
@@ -101,7 +101,7 @@ private:
public:
- GraphicFilterSmooth( Window* pParent, const Graphic& rGraphic, double nRadius);
+ GraphicFilterSmooth( vcl::Window* pParent, const Graphic& rGraphic, double nRadius);
virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) SAL_OVERRIDE;
double GetRadius() const { return mpMtrRadius->GetValue() / 10.0; }
@@ -120,7 +120,7 @@ private:
public:
- GraphicFilterMosaic(Window* pParent, const Graphic& rGraphic,
+ GraphicFilterMosaic(vcl::Window* pParent, const Graphic& rGraphic,
sal_uInt16 nTileWidth, sal_uInt16 nTileHeight, bool bEnhanceEdges);
virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) SAL_OVERRIDE;
@@ -141,7 +141,7 @@ private:
public:
- GraphicFilterSolarize( Window* pParent, const Graphic& rGraphic,
+ GraphicFilterSolarize( vcl::Window* pParent, const Graphic& rGraphic,
sal_uInt8 nGreyThreshold, bool bInvert );
virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) SAL_OVERRIDE;
@@ -158,7 +158,7 @@ class GraphicFilterSepia : public GraphicFilterDialog
private:
MetricField* mpMtrSepia;
public:
- GraphicFilterSepia( Window* pParent, const Graphic& rGraphic,
+ GraphicFilterSepia( vcl::Window* pParent, const Graphic& rGraphic,
sal_uInt16 nSepiaPercent );
virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) SAL_OVERRIDE;
sal_uInt16 GetSepiaPercent() const
@@ -176,7 +176,7 @@ class GraphicFilterPoster : public GraphicFilterDialog
private:
NumericField* mpNumPoster;
public:
- GraphicFilterPoster( Window* pParent, const Graphic& rGraphic,
+ GraphicFilterPoster( vcl::Window* pParent, const Graphic& rGraphic,
sal_uInt16 nPosterColorCount );
virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) SAL_OVERRIDE;
@@ -194,7 +194,7 @@ private:
virtual void MouseButtonDown( const MouseEvent& rEvt ) SAL_OVERRIDE;
virtual Size GetOptimalSize() const SAL_OVERRIDE;
public:
- EmbossControl(Window* pParent)
+ EmbossControl(vcl::Window* pParent)
: SvxRectCtl(pParent) {}
void SetModifyHdl( const Link& rHdl ) { maModifyHdl = rHdl; }
@@ -205,7 +205,7 @@ class GraphicFilterEmboss : public GraphicFilterDialog
private:
EmbossControl* mpCtlLight;
public:
- GraphicFilterEmboss( Window* pParent, const Graphic& rGraphic,
+ GraphicFilterEmboss( vcl::Window* pParent, const Graphic& rGraphic,
RECT_POINT eLightSource );
virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) SAL_OVERRIDE;
diff --git a/cui/source/inc/cuihyperdlg.hxx b/cui/source/inc/cuihyperdlg.hxx
index 244c195ce817..8ef2930ae952 100644
--- a/cui/source/inc/cuihyperdlg.hxx
+++ b/cui/source/inc/cuihyperdlg.hxx
@@ -78,7 +78,7 @@ protected:
void Apply();
public:
- SvxHpLinkDlg (Window* pParent, SfxBindings* pBindings );
+ SvxHpLinkDlg (vcl::Window* pParent, SfxBindings* pBindings );
virtual ~SvxHpLinkDlg ();
virtual void PageCreated( sal_uInt16 nId, IconChoicePage& rPage ) SAL_OVERRIDE;
diff --git a/cui/source/inc/cuiimapwnd.hxx b/cui/source/inc/cuiimapwnd.hxx
index 2a22bc5b3312..3266a2a3449c 100644
--- a/cui/source/inc/cuiimapwnd.hxx
+++ b/cui/source/inc/cuiimapwnd.hxx
@@ -41,7 +41,7 @@ class URLDlg : public ModalDialog
public:
- URLDlg( Window* pWindow,
+ URLDlg( vcl::Window* pWindow,
const OUString& rURL, const OUString& rAlternativeText, const OUString& rDescription,
const OUString& rTarget, const OUString& rName,
TargetList& rTargetList );
diff --git a/cui/source/inc/cuioptgenrl.hxx b/cui/source/inc/cuioptgenrl.hxx
index 49a3f0637016..86190a8c0ce3 100644
--- a/cui/source/inc/cuioptgenrl.hxx
+++ b/cui/source/inc/cuioptgenrl.hxx
@@ -64,10 +64,10 @@ protected:
virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE;
public:
- SvxGeneralTabPage( Window* pParent, const SfxItemSet& rSet );
+ SvxGeneralTabPage( vcl::Window* pParent, const SfxItemSet& rSet );
virtual ~SvxGeneralTabPage ();
- static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet );
+ static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet );
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
diff --git a/cui/source/inc/cuisrchdlg.hxx b/cui/source/inc/cuisrchdlg.hxx
index 660e3c79eb9a..10b3b5bccd11 100644
--- a/cui/source/inc/cuisrchdlg.hxx
+++ b/cui/source/inc/cuisrchdlg.hxx
@@ -44,7 +44,7 @@ class SvxJSearchOptionsDialog : public SfxSingleTabDialog
SvxJSearchOptionsDialog & operator == ( const SvxJSearchOptionsDialog & );
public:
- SvxJSearchOptionsDialog(Window *pParent,
+ SvxJSearchOptionsDialog(vcl::Window *pParent,
const SfxItemSet& rOptionsSet, sal_Int32 nInitialFlags);
// Window
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index adc998ad08cc..5bfbe3cc0044 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -75,7 +75,7 @@ protected:
void SavePalettes();
public:
- SvxAreaTabDialog( Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel, bool bShadow );
+ SvxAreaTabDialog( vcl::Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel, bool bShadow );
virtual ~SvxAreaTabDialog();
void SetNewColorList( XColorListRef pColTab )
@@ -159,17 +159,17 @@ class SvxTransparenceTabPage : public SvxTabPage
void InvalidatePreview (bool bEnable = true );
public:
- SvxTransparenceTabPage(Window* pParent, const SfxItemSet& rInAttrs);
+ SvxTransparenceTabPage(vcl::Window* pParent, const SfxItemSet& rInAttrs);
void Construct();
- static SfxTabPage* Create(Window*, const SfxItemSet*);
+ static SfxTabPage* Create(vcl::Window*, const SfxItemSet*);
static const sal_uInt16* GetRanges();
virtual bool FillItemSet(SfxItemSet*) SAL_OVERRIDE;
virtual void Reset(const SfxItemSet*) SAL_OVERRIDE;
virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE;
virtual int DeactivatePage(SfxItemSet* pSet) SAL_OVERRIDE;
- virtual void PointChanged(Window* pWindow, RECT_POINT eRP) SAL_OVERRIDE;
+ virtual void PointChanged(vcl::Window* pWindow, RECT_POINT eRP) SAL_OVERRIDE;
void SetPageType(sal_uInt16 nInType) { nPageType = nInType; }
void SetDlgType(sal_uInt16 nInType) { nDlgType = nInType; }
@@ -288,18 +288,18 @@ private:
void ClickBitmapHdl_Impl();
public:
- SvxAreaTabPage( Window* pParent, const SfxItemSet& rInAttrs );
+ SvxAreaTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs );
void Construct();
- static SfxTabPage* Create( Window*, const SfxItemSet* );
+ static SfxTabPage* Create( vcl::Window*, const SfxItemSet* );
static const sal_uInt16* GetRanges();
virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE;
virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE;
- virtual void PointChanged( Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE;
+ virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE;
void SetColorList( XColorListRef pColTab ) { pColorList = pColTab; }
void SetGradientList( XGradientListRef pGrdLst)
@@ -354,17 +354,17 @@ private:
DECL_LINK( ModifyShadowHdl_Impl, void * );
public:
- SvxShadowTabPage( Window* pParent, const SfxItemSet& rInAttrs );
+ SvxShadowTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs );
void Construct();
- static SfxTabPage* Create( Window*, const SfxItemSet* );
+ static SfxTabPage* Create( vcl::Window*, const SfxItemSet* );
static const sal_uInt16* GetRanges();
virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE;
virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE;
- virtual void PointChanged( Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE;
+ virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE;
void SetColorList( XColorListRef pColTab ) { pColorList = pColTab; }
void SetPageType( sal_uInt16 nInType ) { nPageType = nInType; }
@@ -433,11 +433,11 @@ private:
void SetControlState_Impl( XGradientStyle eXGS );
public:
- SvxGradientTabPage( Window* pParent, const SfxItemSet& rInAttrs );
+ SvxGradientTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs );
void Construct();
- static SfxTabPage* Create( Window*, const SfxItemSet* );
+ static SfxTabPage* Create( vcl::Window*, const SfxItemSet* );
virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE;
@@ -509,18 +509,18 @@ private:
long CheckChanges_Impl();
public:
- SvxHatchTabPage( Window* pParent, const SfxItemSet& rInAttrs );
+ SvxHatchTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs );
void Construct();
- static SfxTabPage* Create( Window*, const SfxItemSet* );
+ static SfxTabPage* Create( vcl::Window*, const SfxItemSet* );
virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE;
virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE;
- virtual void PointChanged( Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE;
+ virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE;
void SetColorList( XColorListRef pColTab ) { pColorList = pColTab; }
void SetHatchingList( XHatchListRef pHtchLst)
@@ -594,19 +594,19 @@ private:
long CheckChanges_Impl();
public:
- SvxBitmapTabPage( Window* pParent, const SfxItemSet& rInAttrs );
+ SvxBitmapTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs );
virtual ~SvxBitmapTabPage();
void Construct();
- static SfxTabPage* Create( Window*, const SfxItemSet* );
+ static SfxTabPage* Create( vcl::Window*, const SfxItemSet* );
virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE;
virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE;
- virtual void PointChanged( Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE;
+ virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE;
void SetColorList( XColorListRef pColTab ) { pColorList = pColTab; }
void SetBitmapList( XBitmapListRef pBmpLst) { pBitmapList = pBmpLst; }
@@ -627,7 +627,7 @@ public:
Return a label control that provides a name for the specified
control.
*/
- virtual Window* GetParentLabeledBy( const Window* pLabeled ) const SAL_OVERRIDE;
+ virtual vcl::Window* GetParentLabeledBy( const vcl::Window* pLabeled ) const SAL_OVERRIDE;
};
/************************************************************************/
@@ -729,12 +729,12 @@ private:
void UpdateModified();
public:
- SvxColorTabPage( Window* pParent, const SfxItemSet& rInAttrs );
+ SvxColorTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs );
virtual ~SvxColorTabPage();
void Construct();
- static SfxTabPage* Create( Window*, const SfxItemSet* );
+ static SfxTabPage* Create( vcl::Window*, const SfxItemSet* );
virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE;
diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx
index 83aac99004f3..bc4fffcd48bf 100644
--- a/cui/source/inc/cuitabline.hxx
+++ b/cui/source/inc/cuitabline.hxx
@@ -61,7 +61,7 @@ protected:
void SavePalettes();
public:
- SvxLineTabDialog( Window* pParent, const SfxItemSet* pAttr,
+ SvxLineTabDialog( vcl::Window* pParent, const SfxItemSet* pAttr,
SdrModel* pModel, const SdrObject* pObj = NULL,
bool bHasObj = true );
virtual ~SvxLineTabDialog();
@@ -202,12 +202,12 @@ public:
void ShowSymbolControls(bool bOn);
- SvxLineTabPage( Window* pParent, const SfxItemSet& rInAttrs );
+ SvxLineTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs );
virtual ~SvxLineTabPage();
void Construct();
- static SfxTabPage* Create( Window*, const SfxItemSet* );
+ static SfxTabPage* Create( vcl::Window*, const SfxItemSet* );
static const sal_uInt16* GetRanges();
virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
@@ -216,7 +216,7 @@ public:
virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE;
- virtual void PointChanged( Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE;
+ virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE;
virtual void FillUserData() SAL_OVERRIDE;
@@ -301,11 +301,11 @@ private:
void CheckChanges_Impl();
public:
- SvxLineDefTabPage( Window* pParent, const SfxItemSet& rInAttrs );
+ SvxLineDefTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs );
void Construct();
- static SfxTabPage* Create( Window*, const SfxItemSet* );
+ static SfxTabPage* Create( vcl::Window*, const SfxItemSet* );
virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE;
@@ -370,12 +370,12 @@ private:
void CheckChanges_Impl();
public:
- SvxLineEndDefTabPage( Window* pParent, const SfxItemSet& rInAttrs );
+ SvxLineEndDefTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs );
virtual ~SvxLineEndDefTabPage();
void Construct();
- static SfxTabPage* Create( Window*, const SfxItemSet* );
+ static SfxTabPage* Create( vcl::Window*, const SfxItemSet* );
virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE;
diff --git a/cui/source/inc/cuitbxform.hxx b/cui/source/inc/cuitbxform.hxx
index 42e905ee73f3..1f2b34d616db 100644
--- a/cui/source/inc/cuitbxform.hxx
+++ b/cui/source/inc/cuitbxform.hxx
@@ -32,7 +32,7 @@ public:
NumericField* m_pRecordNo;
public:
- FmInputRecordNoDialog(Window * pParent);
+ FmInputRecordNoDialog(vcl::Window * pParent);
void SetValue(long dNew) { m_pRecordNo->SetValue(dNew); }
long GetValue() const { return static_cast<long>(m_pRecordNo->GetValue()); }
diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx
index 37cf8b5e8c3b..f35f2adb57c8 100644
--- a/cui/source/inc/dbregister.hxx
+++ b/cui/source/inc/dbregister.hxx
@@ -89,10 +89,10 @@ namespace svx
#endif
public:
- DbRegistrationOptionsPage( Window* pParent, const SfxItemSet& rSet );
+ DbRegistrationOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet );
virtual ~DbRegistrationOptionsPage();
- static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet );
+ static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet );
static const sal_uInt16* GetRanges();
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
@@ -128,7 +128,7 @@ namespace svx
,public SfxSingleTabDialog
{
public:
- DatabaseRegistrationDialog( Window* pParent, const SfxItemSet& rAttr );
+ DatabaseRegistrationDialog( vcl::Window* pParent, const SfxItemSet& rAttr );
virtual ~DatabaseRegistrationDialog();
virtual short Execute() SAL_OVERRIDE;
diff --git a/cui/source/inc/dlgname.hxx b/cui/source/inc/dlgname.hxx
index a4a306f564f1..e6d9ea26c9fd 100644
--- a/cui/source/inc/dlgname.hxx
+++ b/cui/source/inc/dlgname.hxx
@@ -39,7 +39,7 @@ private:
DECL_LINK(ModifyHdl, void *);
public:
- SvxNameDialog( Window* pWindow, const OUString& rName, const OUString& rDesc );
+ SvxNameDialog( vcl::Window* pWindow, const OUString& rName, const OUString& rDesc );
void GetName( OUString& rName ){rName = pEdtName->GetText();}
@@ -87,7 +87,7 @@ private:
public:
// constructor
- SvxObjectNameDialog(Window* pWindow, const OUString& rName);
+ SvxObjectNameDialog(vcl::Window* pWindow, const OUString& rName);
// data access
void GetName(OUString& rName) {rName = pEdtName->GetText(); }
@@ -117,7 +117,7 @@ private:
public:
// constructor
- SvxObjectTitleDescDialog(Window* pWindow, const OUString& rTitle, const OUString& rDesc);
+ SvxObjectTitleDescDialog(vcl::Window* pWindow, const OUString& rTitle, const OUString& rDesc);
// data access
void GetTitle(OUString& rTitle) {rTitle = pEdtTitle->GetText(); }
@@ -138,7 +138,7 @@ private:
DECL_LINK(Button2Hdl, void *);
public:
- SvxMessDialog( Window* pWindow, const OUString& rText, const OUString& rDesc, Image* pImg = NULL );
+ SvxMessDialog( vcl::Window* pWindow, const OUString& rText, const OUString& rDesc, Image* pImg = NULL );
virtual ~SvxMessDialog();
void SetButtonText( sal_uInt16 nBtnId, const OUString& rNewTxt );
diff --git a/cui/source/inc/dstribut.hxx b/cui/source/inc/dstribut.hxx
index ad54f935ff4d..e0be5f3dd87e 100644
--- a/cui/source/inc/dstribut.hxx
+++ b/cui/source/inc/dstribut.hxx
@@ -41,15 +41,15 @@ class SvxDistributePage : public SvxTabPage
RadioButton* m_pBtnVerBottom;
public:
- SvxDistributePage(Window* pWindow, const SfxItemSet& rInAttrs,
+ SvxDistributePage(vcl::Window* pWindow, const SfxItemSet& rInAttrs,
SvxDistributeHorizontal eHor = SvxDistributeHorizontalNone,
SvxDistributeVertical eVer = SvxDistributeVerticalNone);
- static SfxTabPage* Create(Window*, const SfxItemSet&,
+ static SfxTabPage* Create(vcl::Window*, const SfxItemSet&,
SvxDistributeHorizontal eHor, SvxDistributeVertical eVer);
virtual bool FillItemSet(SfxItemSet*) SAL_OVERRIDE;
virtual void Reset(const SfxItemSet*) SAL_OVERRIDE;
- virtual void PointChanged(Window* pWindow, RECT_POINT eRP) SAL_OVERRIDE;
+ virtual void PointChanged(vcl::Window* pWindow, RECT_POINT eRP) SAL_OVERRIDE;
SvxDistributeHorizontal GetDistributeHor() const { return m_eDistributeHor; }
SvxDistributeVertical GetDistributeVer() const { return m_eDistributeVer; }
@@ -60,7 +60,7 @@ class SvxDistributeDialog : public SfxSingleTabDialog
SvxDistributePage* mpPage;
public:
- SvxDistributeDialog(Window* pParent, const SfxItemSet& rAttr,
+ SvxDistributeDialog(vcl::Window* pParent, const SfxItemSet& rAttr,
SvxDistributeHorizontal eHor = SvxDistributeHorizontalNone,
SvxDistributeVertical eVer = SvxDistributeVerticalNone);
diff --git a/cui/source/inc/grfpage.hxx b/cui/source/inc/grfpage.hxx
index e10d09bfedf0..8d7392ac26ac 100644
--- a/cui/source/inc/grfpage.hxx
+++ b/cui/source/inc/grfpage.hxx
@@ -26,14 +26,14 @@
#include <vcl/graph.hxx>
#include <sfx2/tabdlg.hxx>
-class SvxCropExample : public Window
+class SvxCropExample : public vcl::Window
{
Size aFrameSize;
Point aTopLeft, aBottomRight;
Graphic aGrf;
public:
- SvxCropExample( Window* pPar, WinBits nStyle );
+ SvxCropExample( vcl::Window* pPar, WinBits nStyle );
virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE;
virtual void Resize() SAL_OVERRIDE;
@@ -93,7 +93,7 @@ class SvxGrfCropPage : public SfxTabPage
bool bSetOrigSize;
- SvxGrfCropPage( Window *pParent, const SfxItemSet &rSet );
+ SvxGrfCropPage( vcl::Window *pParent, const SfxItemSet &rSet );
virtual ~SvxGrfCropPage();
DECL_LINK( ZoomHdl, MetricField * );
@@ -111,7 +111,7 @@ class SvxGrfCropPage : public SfxTabPage
Size GetGrfOrigSize( const Graphic& ) const;
public:
- static SfxTabPage *Create( Window *pParent, const SfxItemSet *rSet );
+ static SfxTabPage *Create( vcl::Window *pParent, const SfxItemSet *rSet );
virtual bool FillItemSet( SfxItemSet *rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet *rSet ) SAL_OVERRIDE;
diff --git a/cui/source/inc/hangulhanjadlg.hxx b/cui/source/inc/hangulhanjadlg.hxx
index cbee8ef6b0d7..4cea2af82cd2 100644
--- a/cui/source/inc/hangulhanjadlg.hxx
+++ b/cui/source/inc/hangulhanjadlg.hxx
@@ -41,7 +41,7 @@ namespace svx
class SuggestionSet : public ValueSet
{
public:
- SuggestionSet( Window* pParent );
+ SuggestionSet( vcl::Window* pParent );
virtual ~SuggestionSet();
virtual void UserDraw( const UserDrawEvent& rUDEvt ) SAL_OVERRIDE;
@@ -51,7 +51,7 @@ namespace svx
class SuggestionDisplay : public Control
{
public:
- SuggestionDisplay( Window* pParent, WinBits nBits );
+ SuggestionDisplay( vcl::Window* pParent, WinBits nBits );
virtual ~SuggestionDisplay();
void DisplayListBox( bool bDisplayListBox );
@@ -134,7 +134,7 @@ namespace svx
public:
HangulHanjaConversionDialog(
- Window* _pParent,
+ vcl::Window* _pParent,
editeng::HangulHanjaConversion::ConversionDirection _ePrimaryDirection );
virtual ~HangulHanjaConversionDialog( );
@@ -220,7 +220,7 @@ namespace svx
void Init( void ); ///< reads settings from core and init controls
public:
- HangulHanjaOptionsDialog( Window* _pParent );
+ HangulHanjaOptionsDialog( vcl::Window* _pParent );
virtual ~HangulHanjaOptionsDialog();
void AddDict( const OUString& _rName, bool _bChecked );
@@ -238,7 +238,7 @@ namespace svx
DECL_LINK( OKHdl, void* );
DECL_LINK( ModifyHdl, void* );
public:
- HangulHanjaNewDictDialog( Window* _pParent );
+ HangulHanjaNewDictDialog( vcl::Window* _pParent );
bool GetName( OUString& _rRetName ) const;
};
@@ -256,7 +256,7 @@ namespace svx
bool ShouldScroll( bool _bUp ) const;
void DoJump( bool _bUp );
public:
- SuggestionEdit( Window* pParent, WinBits nBits );
+ SuggestionEdit( vcl::Window* pParent, WinBits nBits );
virtual ~SuggestionEdit();
virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
void init( ScrollBar* pScrollBar, SuggestionEdit* pPrev, SuggestionEdit* pNext);
@@ -310,7 +310,7 @@ namespace svx
bool DeleteEntryFromDictionary( const OUString& rEntry, const ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XConversionDictionary >& xDict );
public:
- HangulHanjaEditDictDialog( Window* _pParent, HHDictList& _rDictList, sal_uInt32 _nSelDict );
+ HangulHanjaEditDictDialog( vcl::Window* _pParent, HHDictList& _rDictList, sal_uInt32 _nSelDict );
virtual ~HangulHanjaEditDictDialog();
void UpdateScrollbar( void );
diff --git a/cui/source/inc/headertablistbox.hxx b/cui/source/inc/headertablistbox.hxx
index 18b22a252c18..f536a1d77b57 100644
--- a/cui/source/inc/headertablistbox.hxx
+++ b/cui/source/inc/headertablistbox.hxx
@@ -33,7 +33,7 @@ protected:
DECL_LINK( HeaderEndDrag_Impl, HeaderBar* );
virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
public:
- MacroEventListBox( Window* pParent, WinBits nStyle );
+ MacroEventListBox( vcl::Window* pParent, WinBits nStyle );
virtual void Resize() SAL_OVERRIDE;
virtual Size GetOptimalSize() const SAL_OVERRIDE;
diff --git a/cui/source/inc/hldocntp.hxx b/cui/source/inc/hldocntp.hxx
index 04159107b07b..98731d7e6172 100644
--- a/cui/source/inc/hldocntp.hxx
+++ b/cui/source/inc/hldocntp.hxx
@@ -50,10 +50,10 @@ protected:
SvxLinkInsertMode& eMode ) SAL_OVERRIDE;
public:
- SvxHyperlinkNewDocTp ( Window *pParent, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet);
+ SvxHyperlinkNewDocTp ( vcl::Window *pParent, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet);
virtual ~SvxHyperlinkNewDocTp ();
- static IconChoicePage* Create( Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet );
+ static IconChoicePage* Create( vcl::Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet );
virtual bool AskApply () SAL_OVERRIDE;
virtual void DoApply () SAL_OVERRIDE;
diff --git a/cui/source/inc/hldoctp.hxx b/cui/source/inc/hldoctp.hxx
index ea69d978a6e7..1b7e3525840d 100644
--- a/cui/source/inc/hldoctp.hxx
+++ b/cui/source/inc/hldoctp.hxx
@@ -66,10 +66,10 @@ protected:
OUString GetCurrentURL ();
public:
- SvxHyperlinkDocTp ( Window *pParent, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet);
+ SvxHyperlinkDocTp ( vcl::Window *pParent, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet);
virtual ~SvxHyperlinkDocTp ();
- static IconChoicePage* Create( Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet );
+ static IconChoicePage* Create( vcl::Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet );
virtual void SetMarkStr ( const OUString& aStrMark ) SAL_OVERRIDE;
diff --git a/cui/source/inc/hlinettp.hxx b/cui/source/inc/hlinettp.hxx
index 11f1eb8d4c30..e11b74456b32 100644
--- a/cui/source/inc/hlinettp.hxx
+++ b/cui/source/inc/hlinettp.hxx
@@ -77,10 +77,10 @@ protected:
virtual void SetMarkWndShouldOpen (bool bOpen) SAL_OVERRIDE {mbMarkWndOpen=bOpen;}
public:
- SvxHyperlinkInternetTp ( Window *pParent, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet);
+ SvxHyperlinkInternetTp ( vcl::Window *pParent, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet);
virtual ~SvxHyperlinkInternetTp ();
- static IconChoicePage* Create( Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet );
+ static IconChoicePage* Create( vcl::Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet );
virtual void SetMarkStr ( const OUString& aStrMark ) SAL_OVERRIDE;
diff --git a/cui/source/inc/hlmailtp.hxx b/cui/source/inc/hlmailtp.hxx
index 9a366bc10684..44aacc78453d 100644
--- a/cui/source/inc/hlmailtp.hxx
+++ b/cui/source/inc/hlmailtp.hxx
@@ -55,10 +55,10 @@ protected:
SvxLinkInsertMode& eMode ) SAL_OVERRIDE;
public:
- SvxHyperlinkMailTp ( Window *pParent, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet);
+ SvxHyperlinkMailTp ( vcl::Window *pParent, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet);
virtual ~SvxHyperlinkMailTp ();
- static IconChoicePage* Create( Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet );
+ static IconChoicePage* Create( vcl::Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet );
virtual void SetInitFocus() SAL_OVERRIDE;
};
diff --git a/cui/source/inc/hlmarkwn.hxx b/cui/source/inc/hlmarkwn.hxx
index b858f51f54d9..2108beb587b4 100644
--- a/cui/source/inc/hlmarkwn.hxx
+++ b/cui/source/inc/hlmarkwn.hxx
@@ -42,7 +42,7 @@ private:
SvxHlinkDlgMarkWnd* mpParentWnd;
public:
- SvxHlmarkTreeLBox(Window* pParent, WinBits nStyle);
+ SvxHlmarkTreeLBox(vcl::Window* pParent, WinBits nStyle);
void SetParentWnd(SvxHlinkDlgMarkWnd* pParent)
{
diff --git a/cui/source/inc/hltpbase.hxx b/cui/source/inc/hltpbase.hxx
index d63bd1c563ca..02e42c5e7e71 100644
--- a/cui/source/inc/hltpbase.hxx
+++ b/cui/source/inc/hltpbase.hxx
@@ -59,7 +59,7 @@ protected:
virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
public:
- SvxHyperURLBox( Window* pParent, INetProtocol eSmart = INET_PROT_FILE );
+ SvxHyperURLBox( vcl::Window* pParent, INetProtocol eSmart = INET_PROT_FILE );
};
@@ -79,7 +79,7 @@ private:
mxDocumentFrame;
protected:
- Window* mpDialog;
+ vcl::Window* mpDialog;
bool mbStdControlsInit;
@@ -111,7 +111,7 @@ protected:
public:
SvxHyperlinkTabPageBase (
- Window *pParent,
+ vcl::Window *pParent,
IconChoiceDialog* pDlg,
const OString& rID,
const OUString& rUIXMLDescription,
@@ -134,7 +134,7 @@ public:
virtual void ActivatePage( const SfxItemSet& rItemSet ) SAL_OVERRIDE;
virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
- bool IsMarkWndVisible () { return ((Window*)mpMarkWnd)->IsVisible(); }
+ bool IsMarkWndVisible () { return ((vcl::Window*)mpMarkWnd)->IsVisible(); }
Size GetSizeExtraWnd () { return ( mpMarkWnd->GetSizePixel() ); }
bool MoveToExtraWnd ( Point aNewPos, bool bDisConnectDlg = false );
@@ -147,8 +147,8 @@ protected:
virtual void SetMarkWndShouldOpen(bool bOpen);
void ShowMarkWnd ();
- void HideMarkWnd () { ( ( Window* ) mpMarkWnd )->Hide(); }
- void InvalidateMarkWnd () { ( ( Window* ) mpMarkWnd )->Invalidate(); }
+ void HideMarkWnd () { ( ( vcl::Window* ) mpMarkWnd )->Hide(); }
+ void InvalidateMarkWnd () { ( ( vcl::Window* ) mpMarkWnd )->Invalidate(); }
SfxDispatcher* GetDispatcher() const;
diff --git a/cui/source/inc/hyphen.hxx b/cui/source/inc/hyphen.hxx
index f4e4293ad958..4d0b7ba7c489 100644
--- a/cui/source/inc/hyphen.hxx
+++ b/cui/source/inc/hyphen.hxx
@@ -34,7 +34,7 @@ class SvxSpellWrapper;
class HyphenEdit : public Edit
{
public:
- HyphenEdit(Window* pParent);
+ HyphenEdit(vcl::Window* pParent);
protected:
virtual void KeyInput(const KeyEvent &rKEvt) SAL_OVERRIDE;
@@ -82,7 +82,7 @@ class SvxHyphenWordDialog : public SfxModalDialog
public:
SvxHyphenWordDialog( const OUString &rWord, LanguageType nLang,
- Window* pParent,
+ vcl::Window* pParent,
css::uno::Reference< css::linguistic2::XHyphenator > &xHyphen,
SvxSpellWrapper* pWrapper );
virtual ~SvxHyphenWordDialog();
diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx
index 8248a720c5ff..269e61d3e006 100644
--- a/cui/source/inc/iconcdlg.hxx
+++ b/cui/source/inc/iconcdlg.hxx
@@ -41,7 +41,7 @@ class IconChoiceDialog;
class IconChoicePage;
// Create-Function
-typedef IconChoicePage* (*CreatePage)(Window *pParent, IconChoiceDialog* pDlg, const SfxItemSet &rAttrSet);
+typedef IconChoicePage* (*CreatePage)(vcl::Window *pParent, IconChoiceDialog* pDlg, const SfxItemSet &rAttrSet);
typedef const sal_uInt16* (*GetPageRanges)(); // gives international Which-value
/// Data-structure for pages in dialog
@@ -84,7 +84,7 @@ private :
void ImplInitSettings();
protected :
- IconChoicePage( Window *pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet &rAttrSet );
+ IconChoicePage( vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet &rAttrSet );
sal_uInt16 GetSlot( sal_uInt16 nWhich ) const { return pSet->GetPool()->GetSlotId( nWhich ); }
sal_uInt16 GetWhich( sal_uInt16 nSlot ) const { return pSet->GetPool()->GetWhich( nSlot ); }
@@ -182,7 +182,7 @@ protected :
public :
// the IconChoiceCtrl's could also be set in the Ctor
- IconChoiceDialog ( Window* pParent, const OString& rID, const OUString& rUIXMLDescription,
+ IconChoiceDialog ( vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription,
const SfxItemSet * pItemSet = 0 );
virtual ~IconChoiceDialog ();
diff --git a/cui/source/inc/insdlg.hxx b/cui/source/inc/insdlg.hxx
index bd793a7b0ece..f845ea80289a 100644
--- a/cui/source/inc/insdlg.hxx
+++ b/cui/source/inc/insdlg.hxx
@@ -44,7 +44,7 @@ protected:
const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& m_xStorage;
comphelper::EmbeddedObjectContainer aCnt;
- InsertObjectDialog_Impl(Window * pParent, const OString& rID,
+ InsertObjectDialog_Impl(vcl::Window * pParent, const OString& rID,
const OUString& rUIXMLDescription,
const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage);
public:
@@ -83,7 +83,7 @@ class SvInsertOleDlg : public InsertObjectDialog_Impl
{ return m_pRbNewObject->IsChecked(); }
public:
- SvInsertOleDlg( Window* pParent,
+ SvInsertOleDlg( vcl::Window* pParent,
const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage,
const SvObjectServerList* pServers = NULL );
virtual short Execute() SAL_OVERRIDE;
@@ -106,7 +106,7 @@ private:
OUString GetPlugInOptions() const { return m_pEdPluginsOptions->GetText(); }
public:
- SvInsertPlugInDialog(Window* pParent,
+ SvInsertPlugInDialog(vcl::Window* pParent,
const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage);
virtual ~SvInsertPlugInDialog();
virtual short Execute() SAL_OVERRIDE;
@@ -139,9 +139,9 @@ private:
void Init();
public:
- SfxInsertFloatingFrameDialog(Window *pParent,
+ SfxInsertFloatingFrameDialog(vcl::Window *pParent,
const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage );
- SfxInsertFloatingFrameDialog( Window* pParent,
+ SfxInsertFloatingFrameDialog( vcl::Window* pParent,
const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >& xObj );
virtual short Execute() SAL_OVERRIDE;
};
diff --git a/cui/source/inc/insrc.hxx b/cui/source/inc/insrc.hxx
index 65932047dc04..012916b89423 100644
--- a/cui/source/inc/insrc.hxx
+++ b/cui/source/inc/insrc.hxx
@@ -42,7 +42,7 @@ class SvxInsRowColDlg : public SvxAbstractInsRowColDlg, public ModalDialog
bool bColumn;
public:
- SvxInsRowColDlg( Window* pParent, bool bCol, const OString& sHelpId );
+ SvxInsRowColDlg( vcl::Window* pParent, bool bCol, const OString& sHelpId );
virtual short Execute(void) SAL_OVERRIDE;
diff --git a/cui/source/inc/labdlg.hxx b/cui/source/inc/labdlg.hxx
index 1b73b594c2eb..743ba930f0eb 100644
--- a/cui/source/inc/labdlg.hxx
+++ b/cui/source/inc/labdlg.hxx
@@ -73,9 +73,9 @@ private:
const SdrView* pView;
public:
- SvxCaptionTabPage( Window* pParent, const SfxItemSet& rInAttrs );
+ SvxCaptionTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs );
- static SfxTabPage* Create( Window*, const SfxItemSet* );
+ static SfxTabPage* Create( vcl::Window*, const SfxItemSet* );
static const sal_uInt16* GetRanges();
virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
@@ -104,7 +104,7 @@ private:
virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE;
public:
- SvxCaptionTabDialog(Window* pParent, const SdrView* pView,
+ SvxCaptionTabDialog(vcl::Window* pParent, const SdrView* pView,
sal_uInt16 nAnchorTypes = 0);
/// link for the Writer to validate positions
diff --git a/cui/source/inc/linkdlg.hxx b/cui/source/inc/linkdlg.hxx
index f42889593a31..d5440bda7a1b 100644
--- a/cui/source/inc/linkdlg.hxx
+++ b/cui/source/inc/linkdlg.hxx
@@ -91,7 +91,7 @@ class SvBaseLinksDlg : public ModalDialog
void SetManager( sfx2::LinkManager* );
public:
- SvBaseLinksDlg( Window * pParent, sfx2::LinkManager*, bool bHtml = false );
+ SvBaseLinksDlg( vcl::Window * pParent, sfx2::LinkManager*, bool bHtml = false );
virtual ~SvBaseLinksDlg();
void SetActLink( sfx2::SvBaseLink * pLink );
};
diff --git a/cui/source/inc/macroass.hxx b/cui/source/inc/macroass.hxx
index 988ff02abd9e..bdcd93c6f724 100644
--- a/cui/source/inc/macroass.hxx
+++ b/cui/source/inc/macroass.hxx
@@ -47,7 +47,7 @@ class _SfxMacroTabPage : public SfxTabPage
protected:
_SfxMacroTabPage_Impl* mpImpl;
- _SfxMacroTabPage( Window* pParent, const SfxItemSet& rItemSet );
+ _SfxMacroTabPage( vcl::Window* pParent, const SfxItemSet& rItemSet );
void InitAndSetHandler();
void FillEvents();
@@ -90,20 +90,20 @@ class SfxMacroTabPage : public _SfxMacroTabPage
{
public:
SfxMacroTabPage(
- Window* pParent,
+ vcl::Window* pParent,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxDocumentFrame,
const SfxItemSet& rSet
);
// --------- inherit from the base -------------
- static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet );
+ static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet );
};
class SfxMacroAssignDlg : public SfxSingleTabDialog
{
public:
SfxMacroAssignDlg(
- Window* pParent,
+ vcl::Window* pParent,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxDocumentFrame,
const SfxItemSet& rSet );
};
diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx
index 19ee9d2459f1..f151c36ba6e7 100644
--- a/cui/source/inc/macropg.hxx
+++ b/cui/source/inc/macropg.hxx
@@ -72,7 +72,7 @@ protected:
bool bReadOnly, bDocModified, bAppEvents, bInitialized;
EventDisplayNames aDisplayNames;
- _SvxMacroTabPage( Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet& rItemSet );
+ _SvxMacroTabPage( vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet& rItemSet );
void EnableButtons();
::com::sun::star::uno::Any GetPropsByName( const OUString& eventName, EventsHash& eventsHash );
@@ -97,7 +97,7 @@ class SvxMacroTabPage : public _SvxMacroTabPage
{
public:
SvxMacroTabPage(
- Window* pParent,
+ vcl::Window* pParent,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxDocumentFrame,
const SfxItemSet& rSet,
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > xNameReplace,
@@ -112,7 +112,7 @@ typedef const sal_uInt16* (*GetTabPageRanges)(); // gives international Which-va
class SvxMacroAssignSingleTabDialog : public SfxSingleTabDialog
{
public:
- SvxMacroAssignSingleTabDialog(Window* pParent, const SfxItemSet& rOptionsSet);
+ SvxMacroAssignSingleTabDialog(vcl::Window* pParent, const SfxItemSet& rOptionsSet);
private:
DECL_DLLPRIVATE_LINK( OKHdl_Impl, Button * );
@@ -123,7 +123,7 @@ class SvxMacroAssignDlg : public SvxMacroAssignSingleTabDialog
{
public:
SvxMacroAssignDlg(
- Window* pParent,
+ vcl::Window* pParent,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxDocumentFrame,
const SfxItemSet& rSet,
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace >& xNameReplace,
diff --git a/cui/source/inc/measure.hxx b/cui/source/inc/measure.hxx
index 260937710207..a42ea5e7c4e4 100644
--- a/cui/source/inc/measure.hxx
+++ b/cui/source/inc/measure.hxx
@@ -64,16 +64,16 @@ private:
public:
- SvxMeasurePage( Window* pWindow, const SfxItemSet& rInAttrs );
+ SvxMeasurePage( vcl::Window* pWindow, const SfxItemSet& rInAttrs );
virtual ~SvxMeasurePage();
- static SfxTabPage* Create( Window*, const SfxItemSet* );
+ static SfxTabPage* Create( vcl::Window*, const SfxItemSet* );
static const sal_uInt16* GetRanges();
virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE;
- virtual void PointChanged( Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE;
+ virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE;
void Construct();
void SetView( const SdrView* pSdrView ) { pView = pSdrView; }
@@ -86,7 +86,7 @@ public:
class SvxMeasureDialog : public SfxSingleTabDialog
{
public:
- SvxMeasureDialog(Window* pParent, const SfxItemSet& rAttr,
+ SvxMeasureDialog(vcl::Window* pParent, const SfxItemSet& rAttr,
const SdrView* pView);
};
diff --git a/cui/source/inc/multipat.hxx b/cui/source/inc/multipat.hxx
index 095ce1ad3fe5..0508ff40aba1 100644
--- a/cui/source/inc/multipat.hxx
+++ b/cui/source/inc/multipat.hxx
@@ -49,7 +49,7 @@ private:
DECL_LINK(CheckHdl_Impl, svx::SvxRadioButtonListBox*);
public:
- SvxMultiPathDialog(Window* pParent);
+ SvxMultiPathDialog(vcl::Window* pParent);
virtual ~SvxMultiPathDialog();
OUString GetPath() const;
@@ -68,7 +68,7 @@ private:
DECL_LINK(SelectHdl_Impl, void *);
public:
- SvxPathSelectDialog(Window* pParent);
+ SvxPathSelectDialog(vcl::Window* pParent);
virtual ~SvxPathSelectDialog();
OUString GetPath() const;
diff --git a/cui/source/inc/newtabledlg.hxx b/cui/source/inc/newtabledlg.hxx
index 37d1ce46bd28..63ed48b9943b 100644
--- a/cui/source/inc/newtabledlg.hxx
+++ b/cui/source/inc/newtabledlg.hxx
@@ -33,7 +33,7 @@ private:
NumericField* mpNumRows;
public:
- SvxNewTableDialog( Window* pWindow );
+ SvxNewTableDialog( vcl::Window* pWindow );
virtual short Execute(void) SAL_OVERRIDE;
virtual void Apply(void);
diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx
index 10c311c2c8d5..0bbec43c9fe4 100644
--- a/cui/source/inc/numfmt.hxx
+++ b/cui/source/inc/numfmt.hxx
@@ -41,7 +41,7 @@ class vector;
-class SvxNumberPreview : public Window
+class SvxNumberPreview : public vcl::Window
{
private:
OUString aPrevStr;
@@ -56,7 +56,7 @@ protected:
virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
public:
- SvxNumberPreview(Window* pParent, WinBits nStyle = WB_BORDER);
+ SvxNumberPreview(vcl::Window* pParent, WinBits nStyle = WB_BORDER);
void NotifyChange( const OUString& rPrevStr, const Color* pColor = NULL );
};
@@ -70,7 +70,7 @@ class SvxNumberFormatTabPage : public SfxTabPage
public:
virtual ~SvxNumberFormatTabPage();
- static SfxTabPage* Create( Window* pParent,
+ static SfxTabPage* Create( vcl::Window* pParent,
const SfxItemSet* rAttrSet );
static const sal_uInt16* GetRanges();
@@ -87,7 +87,7 @@ public:
virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
virtual void PageCreated(const SfxAllItemSet& aSet) SAL_OVERRIDE;
private:
- SvxNumberFormatTabPage( Window* pParent,
+ SvxNumberFormatTabPage( vcl::Window* pParent,
const SfxItemSet& rCoreAttrs );
FixedText* m_pFtCategory;
ListBox* m_pLbCategory;
@@ -128,7 +128,7 @@ private:
OUString sAutomaticEntry;
- Window* pLastActivWindow;
+ vcl::Window* pLastActivWindow;
void Init_Impl();
void FillCurrencyBox();
diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx
index 5ead54c2c0bc..83987766ba73 100644
--- a/cui/source/inc/numpages.hxx
+++ b/cui/source/inc/numpages.hxx
@@ -38,7 +38,7 @@ class SvxBmpNumValueSet;
class SvxNumValueSet;
class SvxBrushItem;
-class SvxNumberingPreview : public Window
+class SvxNumberingPreview : public vcl::Window
{
const SvxNumRule* pActNum;
vcl::Font aStdFont;
@@ -51,7 +51,7 @@ class SvxNumberingPreview : public Window
virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE;
public:
- SvxNumberingPreview(Window* pParent, WinBits nWinBits = WB_BORDER);
+ SvxNumberingPreview(vcl::Window* pParent, WinBits nWinBits = WB_BORDER);
void SetNumRule(const SvxNumRule* pNum)
{pActNum = pNum; Invalidate();};
@@ -106,11 +106,11 @@ class SvxSingleNumPickTabPage : public SfxTabPage
DECL_LINK(DoubleClickHdl_Impl, void *);
public:
- SvxSingleNumPickTabPage(Window* pParent,
+ SvxSingleNumPickTabPage(vcl::Window* pParent,
const SfxItemSet& rSet);
virtual ~SvxSingleNumPickTabPage();
- static SfxTabPage* Create( Window* pParent,
+ static SfxTabPage* Create( vcl::Window* pParent,
const SfxItemSet* rAttrSet);
virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE;
@@ -142,11 +142,11 @@ class SvxBulletPickTabPage : public SfxTabPage
DECL_LINK(NumSelectHdl_Impl, void *);
DECL_LINK(DoubleClickHdl_Impl, void *);
public:
- SvxBulletPickTabPage(Window* pParent,
+ SvxBulletPickTabPage(vcl::Window* pParent,
const SfxItemSet& rSet);
virtual ~SvxBulletPickTabPage();
- static SfxTabPage* Create( Window* pParent,
+ static SfxTabPage* Create( vcl::Window* pParent,
const SfxItemSet* rAttrSet);
virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE;
@@ -185,11 +185,11 @@ class SvxNumPickTabPage : public SfxTabPage
DECL_LINK(DoubleClickHdl_Impl, void *);
public:
- SvxNumPickTabPage(Window* pParent,
+ SvxNumPickTabPage(vcl::Window* pParent,
const SfxItemSet& rSet);
virtual ~SvxNumPickTabPage();
- static SfxTabPage* Create( Window* pParent,
+ static SfxTabPage* Create( vcl::Window* pParent,
const SfxItemSet* rAttrSet);
virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE;
@@ -230,11 +230,11 @@ class SvxBitmapPickTabPage : public SfxTabPage
DECL_LINK(LinkBmpHdl_Impl, void *);
public:
- SvxBitmapPickTabPage(Window* pParent,
+ SvxBitmapPickTabPage(vcl::Window* pParent,
const SfxItemSet& rSet);
virtual ~SvxBitmapPickTabPage();
- static SfxTabPage* Create( Window* pParent,
+ static SfxTabPage* Create( vcl::Window* pParent,
const SfxItemSet* rAttrSet);
virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE;
@@ -342,11 +342,11 @@ class SvxNumOptionsTabPage : public SfxTabPage
DECL_STATIC_LINK( SvxNumOptionsTabPage, GraphicArrivedHdl_Impl, SvxBrushItem* );
public:
- SvxNumOptionsTabPage(Window* pParent,
+ SvxNumOptionsTabPage(vcl::Window* pParent,
const SfxItemSet& rSet);
virtual ~SvxNumOptionsTabPage();
- static SfxTabPage* Create( Window* pParent,
+ static SfxTabPage* Create( vcl::Window* pParent,
const SfxItemSet* rAttrSet);
virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE;
@@ -445,7 +445,7 @@ class SvxNumPositionTabPage : public SfxTabPage
DECL_LINK( IndentAtHdl_Impl, MetricField* );
public:
- SvxNumPositionTabPage(Window* pParent,
+ SvxNumPositionTabPage(vcl::Window* pParent,
const SfxItemSet& rSet);
virtual ~SvxNumPositionTabPage();
@@ -454,7 +454,7 @@ public:
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
- static SfxTabPage* Create( Window* pParent,
+ static SfxTabPage* Create( vcl::Window* pParent,
const SfxItemSet* rAttrSet);
void SetMetric(FieldUnit eSet);
diff --git a/cui/source/inc/optasian.hxx b/cui/source/inc/optasian.hxx
index be965554cfcc..d2d182420783 100644
--- a/cui/source/inc/optasian.hxx
+++ b/cui/source/inc/optasian.hxx
@@ -52,12 +52,12 @@ class SvxAsianLayoutPage : public SfxTabPage
DECL_LINK(ChangeStandardHdl, CheckBox*);
DECL_LINK(ModifyHdl, Edit*);
- SvxAsianLayoutPage( Window* pParent, const SfxItemSet& rSet );
+ SvxAsianLayoutPage( vcl::Window* pParent, const SfxItemSet& rSet );
public:
virtual ~SvxAsianLayoutPage();
- static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet );
+ static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet );
static const sal_uInt16* GetRanges();
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
diff --git a/cui/source/inc/optdict.hxx b/cui/source/inc/optdict.hxx
index 4e0a5779b2da..e26a4b37f253 100644
--- a/cui/source/inc/optdict.hxx
+++ b/cui/source/inc/optdict.hxx
@@ -63,7 +63,7 @@ private:
DECL_LINK(ModifyHdl_Impl, void *);
public:
- SvxNewDictionaryDialog( Window* pParent,
+ SvxNewDictionaryDialog( vcl::Window* pParent,
::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XSpellChecker1 > &xSpl );
@@ -80,9 +80,9 @@ class SvxDictEdit : public Edit
bool bSpaces;
public:
- SvxDictEdit(Window* pParent, const ResId& rResId) :
+ SvxDictEdit(vcl::Window* pParent, const ResId& rResId) :
Edit(pParent, rResId), bSpaces(false){}
- SvxDictEdit(Window* pParent, WinBits aWB) :
+ SvxDictEdit(vcl::Window* pParent, WinBits aWB) :
Edit(pParent, aWB), bSpaces(false){}
void SetActionHdl( const Link& rLink )
@@ -148,7 +148,7 @@ protected:
// virtual void Paint( const Rectangle& rRect );
public:
- SvxEditDictionaryDialog( Window* pParent,
+ SvxEditDictionaryDialog( vcl::Window* pParent,
const OUString& rName,
::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XSpellChecker1> &xSpl );
diff --git a/cui/source/inc/optlingu.hxx b/cui/source/inc/optlingu.hxx
index 8d31b7b3fb18..0a914642a354 100644
--- a/cui/source/inc/optlingu.hxx
+++ b/cui/source/inc/optlingu.hxx
@@ -84,7 +84,7 @@ class SvxEditModulesDlg : public ModalDialog
DECL_LINK(OpenURLHdl_Impl, void *);
public:
- SvxEditModulesDlg(Window* pParent, SvxLinguData_Impl& rData);
+ SvxEditModulesDlg(vcl::Window* pParent, SvxLinguData_Impl& rData);
virtual ~SvxEditModulesDlg();
};
@@ -130,7 +130,7 @@ private:
SvxLinguData_Impl* pLinguData;
- SvxLinguTabPage( Window* pParent, const SfxItemSet& rCoreSet );
+ SvxLinguTabPage( vcl::Window* pParent, const SfxItemSet& rCoreSet );
SvTreeListEntry* CreateEntry(OUString& rTxt, sal_uInt16 nCol);
void AddDicBoxEntry( const com::sun::star::uno::Reference< com::sun::star::linguistic2::XDictionary > &rxDic, sal_uInt16 nIdx );
@@ -148,7 +148,7 @@ private:
public:
virtual ~SvxLinguTabPage();
- static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet );
+ static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet );
static const sal_uInt16* GetRanges();
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
diff --git a/cui/source/inc/optpath.hxx b/cui/source/inc/optpath.hxx
index 0d4de78e4e61..8db65294ce6d 100644
--- a/cui/source/inc/optpath.hxx
+++ b/cui/source/inc/optpath.hxx
@@ -69,10 +69,10 @@ private:
const OUString& _rUserPath, const OUString& _rWritablePath );
public:
- SvxPathTabPage( Window* pParent, const SfxItemSet& rSet );
+ SvxPathTabPage( vcl::Window* pParent, const SfxItemSet& rSet );
virtual ~SvxPathTabPage();
- static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet );
+ static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet );
static const sal_uInt16* GetRanges();
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx
index dcbdc212807f..d95220e13a15 100644
--- a/cui/source/inc/page.hxx
+++ b/cui/source/inc/page.hxx
@@ -178,7 +178,7 @@ private:
void CheckMarginEdits( bool _bClear );
bool IsMarginOutOfRange();
- SvxPageDescPage( Window* pParent, const SfxItemSet& rSet );
+ SvxPageDescPage( vcl::Window* pParent, const SfxItemSet& rSet );
//UUUU
void EnableDrawingLayerFillStyles(bool bNew) { mbEnableDrawingLayerFillStyles = bNew; }
@@ -188,7 +188,7 @@ protected:
virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
public:
- static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet );
+ static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet );
static const sal_uInt16* GetRanges();
virtual bool FillItemSet( SfxItemSet* rOutSet ) SAL_OVERRIDE;
diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx
index 08a370acd4ef..4209e04339a6 100644
--- a/cui/source/inc/paragrph.hxx
+++ b/cui/source/inc/paragrph.hxx
@@ -48,7 +48,7 @@ class SvxStdParagraphTabPage: public SfxTabPage
using TabPage::DeactivatePage;
private:
- SvxStdParagraphTabPage( Window* pParent, const SfxItemSet& rSet );
+ SvxStdParagraphTabPage( vcl::Window* pParent, const SfxItemSet& rSet );
// indention
SvxRelativeField* m_pLeftIndent;
@@ -99,7 +99,7 @@ protected:
public:
DECL_LINK(ELRLoseFocusHdl, void *);
- static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet );
+ static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet );
static const sal_uInt16* GetRanges();
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
@@ -153,14 +153,14 @@ class SvxParaAlignTabPage : public SfxTabPage
void UpdateExample_Impl( bool bAll = false );
- SvxParaAlignTabPage( Window* pParent, const SfxItemSet& rSet );
+ SvxParaAlignTabPage( vcl::Window* pParent, const SfxItemSet& rSet );
virtual ~SvxParaAlignTabPage();
protected:
virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
public:
- static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet );
+ static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet );
static const sal_uInt16* GetRanges();
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
@@ -191,7 +191,7 @@ class SvxExtParagraphTabPage: public SfxTabPage
public:
virtual ~SvxExtParagraphTabPage();
- static SfxTabPage* Create( Window* pParent,
+ static SfxTabPage* Create( vcl::Window* pParent,
const SfxItemSet* rSet );
static const sal_uInt16* GetRanges();
@@ -204,7 +204,7 @@ protected:
virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
private:
- SvxExtParagraphTabPage( Window* pParent, const SfxItemSet& rSet );
+ SvxExtParagraphTabPage( vcl::Window* pParent, const SfxItemSet& rSet );
// hyphenation
TriStateBox* m_pHyphenBox;
@@ -263,7 +263,7 @@ class SvxAsianTabPage : public SfxTabPage
CheckBox* m_pHangingPunctCB;
CheckBox* m_pScriptSpaceCB;
- SvxAsianTabPage( Window* pParent, const SfxItemSet& rSet );
+ SvxAsianTabPage( vcl::Window* pParent, const SfxItemSet& rSet );
DECL_LINK( ClickHdl_Impl, CheckBox* );
@@ -271,7 +271,7 @@ public:
virtual ~SvxAsianTabPage();
- static SfxTabPage* Create( Window* pParent,
+ static SfxTabPage* Create( vcl::Window* pParent,
const SfxItemSet* rSet );
static const sal_uInt16* GetRanges();
diff --git a/cui/source/inc/passwdomdlg.hxx b/cui/source/inc/passwdomdlg.hxx
index c201c5f8f55a..1fe8c58551f8 100644
--- a/cui/source/inc/passwdomdlg.hxx
+++ b/cui/source/inc/passwdomdlg.hxx
@@ -37,7 +37,7 @@ class PasswordToOpenModifyDialog : public SfxModalDialog
PasswordToOpenModifyDialog & operator = ( const PasswordToOpenModifyDialog & );
public:
- PasswordToOpenModifyDialog( Window * pParent, sal_uInt16 nMinPasswdLen,
+ PasswordToOpenModifyDialog( vcl::Window * pParent, sal_uInt16 nMinPasswdLen,
sal_uInt16 nMaxPasswdLen /* 0 -> no max len enforced */,
bool bIsPasswordToModify );
virtual ~PasswordToOpenModifyDialog();
diff --git a/cui/source/inc/pastedlg.hxx b/cui/source/inc/pastedlg.hxx
index a667ae5c914a..c7b815f764cb 100644
--- a/cui/source/inc/pastedlg.hxx
+++ b/cui/source/inc/pastedlg.hxx
@@ -54,7 +54,7 @@ class SvPasteObjectDialog : public ModalDialog
DECL_LINK( DoubleClickHdl, ListBox * );
public:
- SvPasteObjectDialog( Window* pParent );
+ SvPasteObjectDialog( vcl::Window* pParent );
virtual ~SvPasteObjectDialog();
void Insert( SotFormatStringId nFormat, const OUString & rFormatName );
diff --git a/cui/source/inc/postdlg.hxx b/cui/source/inc/postdlg.hxx
index 1f0f200cdfe2..624649689e6a 100644
--- a/cui/source/inc/postdlg.hxx
+++ b/cui/source/inc/postdlg.hxx
@@ -43,7 +43,7 @@
class SvxPostItDialog : public SfxModalDialog
{
public:
- SvxPostItDialog(Window* pParent, const SfxItemSet& rCoreSet,
+ SvxPostItDialog(vcl::Window* pParent, const SfxItemSet& rCoreSet,
bool bPrevNext = false);
virtual ~SvxPostItDialog();
diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx
index f51c2f6dd365..3b7240675e13 100644
--- a/cui/source/inc/scriptdlg.hxx
+++ b/cui/source/inc/scriptdlg.hxx
@@ -75,7 +75,7 @@ public:
void Init( const OUString& language );
void RequestSubEntries( SvTreeListEntry* pRootEntry, ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& node,
::com::sun::star::uno::Reference< com::sun::star::frame::XModel>& model );
- SFTreeListBox(Window* pParent);
+ SFTreeListBox(vcl::Window* pParent);
virtual ~SFTreeListBox();
void ExpandAllTrees();
@@ -100,7 +100,7 @@ class CuiInputDialog : public ModalDialog
private:
Edit* m_pEdit;
public:
- CuiInputDialog(Window * pParent, sal_uInt16 nMode);
+ CuiInputDialog(vcl::Window * pParent, sal_uInt16 nMode);
OUString GetObjectName() const { return m_pEdit->GetText(); }
void SetObjectName(const OUString& rName)
@@ -177,7 +177,7 @@ protected:
public:
// prob need another arg in the ctor
// to specify the language or provider
- SvxScriptOrgDialog( Window* pParent, const OUString& language );
+ SvxScriptOrgDialog( vcl::Window* pParent, const OUString& language );
virtual ~SvxScriptOrgDialog();
virtual short Execute() SAL_OVERRIDE;
@@ -195,7 +195,7 @@ private:
public:
SvxScriptErrorDialog(
- Window* parent, ::com::sun::star::uno::Any aException );
+ vcl::Window* parent, ::com::sun::star::uno::Any aException );
virtual ~SvxScriptErrorDialog();
diff --git a/cui/source/inc/sdrcelldlg.hxx b/cui/source/inc/sdrcelldlg.hxx
index bcae0d840c38..66080975ca5d 100644
--- a/cui/source/inc/sdrcelldlg.hxx
+++ b/cui/source/inc/sdrcelldlg.hxx
@@ -42,7 +42,7 @@ protected:
virtual void Apply();
public:
- SvxFormatCellsDialog( Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel );
+ SvxFormatCellsDialog( vcl::Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel );
virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE;
diff --git a/cui/source/inc/selector.hxx b/cui/source/inc/selector.hxx
index 3f4c1f211a2d..b22b85e30f30 100644
--- a/cui/source/inc/selector.hxx
+++ b/cui/source/inc/selector.hxx
@@ -100,7 +100,7 @@ friend class SvxConfigGroupListBox;
virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE;
public:
- SvxConfigFunctionListBox(Window* pParent, WinBits nStyle);
+ SvxConfigFunctionListBox(vcl::Window* pParent, WinBits nStyle);
virtual ~SvxConfigFunctionListBox();
void ClearAll();
OUString GetHelpText( SvTreeListEntry *pEntry );
@@ -160,7 +160,7 @@ protected:
virtual bool Expand( SvTreeListEntry* pParent ) SAL_OVERRIDE;
public:
- SvxConfigGroupListBox(Window* pParent, WinBits nStyle);
+ SvxConfigGroupListBox(vcl::Window* pParent, WinBits nStyle);
virtual ~SvxConfigGroupListBox();
void Init(bool bShowSlots, const ::com::sun::star::uno::Reference
@@ -198,7 +198,7 @@ class SvxScriptSelectorDialog : public ModelessDialog
public:
SvxScriptSelectorDialog (
- Window* pParent = NULL,
+ vcl::Window* pParent = NULL,
bool bShowSlots = false,
const ::com::sun::star::uno::Reference
< ::com::sun::star::frame::XFrame >& xFrame = 0
diff --git a/cui/source/inc/showcols.hxx b/cui/source/inc/showcols.hxx
index d43868a4f5da..dceddb7e3a00 100644
--- a/cui/source/inc/showcols.hxx
+++ b/cui/source/inc/showcols.hxx
@@ -41,7 +41,7 @@ class FmShowColsDialog : public ModalDialog
::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > m_xColumns;
public:
- FmShowColsDialog(Window* pParent);
+ FmShowColsDialog(vcl::Window* pParent);
void SetColumns(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer>& xCols);
diff --git a/cui/source/inc/splitcelldlg.hxx b/cui/source/inc/splitcelldlg.hxx
index 94c3b983f985..212559f32968 100644
--- a/cui/source/inc/splitcelldlg.hxx
+++ b/cui/source/inc/splitcelldlg.hxx
@@ -39,7 +39,7 @@ protected:
virtual void Apply() SAL_OVERRIDE;
public:
- SvxSplitTableDlg(Window *pParent, bool bIsTableVertical, long nMaxVertical, long nMaxHorizontal );
+ SvxSplitTableDlg(vcl::Window *pParent, bool bIsTableVertical, long nMaxVertical, long nMaxHorizontal );
virtual ~SvxSplitTableDlg();
DECL_LINK( ClickHdl, Button * );
diff --git a/cui/source/inc/srchxtra.hxx b/cui/source/inc/srchxtra.hxx
index c81a79d86003..0965484c9c45 100644
--- a/cui/source/inc/srchxtra.hxx
+++ b/cui/source/inc/srchxtra.hxx
@@ -29,7 +29,7 @@
class SvxSearchFormatDialog : public SfxTabDialog
{
public:
- SvxSearchFormatDialog( Window* pParent, const SfxItemSet& rSet );
+ SvxSearchFormatDialog( vcl::Window* pParent, const SfxItemSet& rSet );
virtual ~SvxSearchFormatDialog();
protected:
@@ -48,7 +48,7 @@ private:
class SvxSearchAttributeDialog : public ModalDialog
{
public:
- SvxSearchAttributeDialog( Window* pParent, SearchAttrItemList& rLst,
+ SvxSearchAttributeDialog( vcl::Window* pParent, SearchAttrItemList& rLst,
const sal_uInt16* pWhRanges );
private:
@@ -71,7 +71,7 @@ private:
CheckBox* m_pRelaxBox;
public:
- SvxSearchSimilarityDialog( Window* pParent,
+ SvxSearchSimilarityDialog( vcl::Window* pParent,
bool bRelax,
sal_uInt16 nOther,
sal_uInt16 nShorter,
diff --git a/cui/source/inc/swpossizetabpage.hxx b/cui/source/inc/swpossizetabpage.hxx
index 315fb57654a4..94f34aa489ac 100644
--- a/cui/source/inc/swpossizetabpage.hxx
+++ b/cui/source/inc/swpossizetabpage.hxx
@@ -122,10 +122,10 @@ class SvxSwPosSizeTabPage : public SfxTabPage
void setOptimalRelWidth();
public:
- SvxSwPosSizeTabPage( Window* pParent, const SfxItemSet& rInAttrs );
+ SvxSwPosSizeTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs );
virtual ~SvxSwPosSizeTabPage();
- static SfxTabPage* Create( Window*, const SfxItemSet* );
+ static SfxTabPage* Create( vcl::Window*, const SfxItemSet* );
static const sal_uInt16* GetRanges();
virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
diff --git a/cui/source/inc/tabstpge.hxx b/cui/source/inc/tabstpge.hxx
index e5b64a687335..c5bf5475bdf8 100644
--- a/cui/source/inc/tabstpge.hxx
+++ b/cui/source/inc/tabstpge.hxx
@@ -50,7 +50,7 @@ class SvxTabulatorTabPage : public SfxTabPage
public:
virtual ~SvxTabulatorTabPage();
- static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet );
+ static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet );
static const sal_uInt16* GetRanges();
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
@@ -62,7 +62,7 @@ protected:
virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
private:
- SvxTabulatorTabPage( Window* pParent, const SfxItemSet& rSet );
+ SvxTabulatorTabPage( vcl::Window* pParent, const SfxItemSet& rSet );
// tabulators and positions
MetricBox* m_pTabBox;
diff --git a/cui/source/inc/textanim.hxx b/cui/source/inc/textanim.hxx
index f043b8583c97..2981c4ae8005 100644
--- a/cui/source/inc/textanim.hxx
+++ b/cui/source/inc/textanim.hxx
@@ -73,10 +73,10 @@ private:
sal_uInt16 GetSelectedDirection();
public:
- SvxTextAnimationPage( Window* pWindow, const SfxItemSet& rInAttrs );
+ SvxTextAnimationPage( vcl::Window* pWindow, const SfxItemSet& rInAttrs );
virtual ~SvxTextAnimationPage();
- static SfxTabPage* Create( Window*, const SfxItemSet* );
+ static SfxTabPage* Create( vcl::Window*, const SfxItemSet* );
static const sal_uInt16* GetRanges();
virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
@@ -101,7 +101,7 @@ private:
public:
- SvxTextTabDialog( Window* pParent, const SfxItemSet* pAttr,
+ SvxTextTabDialog( vcl::Window* pParent, const SfxItemSet* pAttr,
const SdrView* pView );
virtual ~SvxTextTabDialog() {};
};
diff --git a/cui/source/inc/textattr.hxx b/cui/source/inc/textattr.hxx
index 1cac8d762b6a..4f67dbfb902f 100644
--- a/cui/source/inc/textattr.hxx
+++ b/cui/source/inc/textattr.hxx
@@ -74,16 +74,16 @@ private:
public:
- SvxTextAttrPage( Window* pWindow, const SfxItemSet& rInAttrs );
+ SvxTextAttrPage( vcl::Window* pWindow, const SfxItemSet& rInAttrs );
virtual ~SvxTextAttrPage();
- static SfxTabPage* Create( Window*, const SfxItemSet* );
+ static SfxTabPage* Create( vcl::Window*, const SfxItemSet* );
static const sal_uInt16* GetRanges();
virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE;
- virtual void PointChanged( Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE;
+ virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE;
void Construct();
void SetView( const SdrView* pSdrView ) { pView = pSdrView; }
diff --git a/cui/source/inc/thesdlg.hxx b/cui/source/inc/thesdlg.hxx
index 4ab94e7c2bd6..95e712c2af6e 100644
--- a/cui/source/inc/thesdlg.hxx
+++ b/cui/source/inc/thesdlg.hxx
@@ -42,7 +42,7 @@ class LookUpComboBox : public ComboBox
LookUpComboBox& operator = ( const LookUpComboBox & );
public:
- LookUpComboBox(Window *pParent);
+ LookUpComboBox(vcl::Window *pParent);
virtual ~LookUpComboBox();
DECL_LINK( ModifyTimer_Hdl, Timer * );
@@ -83,7 +83,7 @@ class ThesaurusAlternativesCtrl
ThesaurusAlternativesCtrl & operator = ( const ThesaurusAlternativesCtrl & );
public:
- ThesaurusAlternativesCtrl(Window* pParent);
+ ThesaurusAlternativesCtrl(vcl::Window* pParent);
void init(SvxThesaurusDialog *pDialog);
virtual ~ThesaurusAlternativesCtrl();
@@ -108,7 +108,7 @@ class ReplaceEdit : public Edit
ReplaceEdit & operator = ( const ReplaceEdit & );
public:
- ReplaceEdit(Window *pParent);
+ ReplaceEdit(vcl::Window *pParent);
virtual ~ReplaceEdit();
void init(Button *pBtn) { m_pBtn = pBtn; }
@@ -159,7 +159,7 @@ public:
virtual void Apply() SAL_OVERRIDE;
public:
- SvxThesaurusDialog( Window* pParent,
+ SvxThesaurusDialog( vcl::Window* pParent,
css::uno::Reference< css::linguistic2::XThesaurus > xThesaurus,
const OUString &rWord, LanguageType nLanguage );
virtual ~SvxThesaurusDialog();
diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx
index 6e388159673a..f4f692593fe1 100644
--- a/cui/source/inc/transfrm.hxx
+++ b/cui/source/inc/transfrm.hxx
@@ -59,7 +59,7 @@ private:
public:
- SvxTransformTabDialog( Window* pParent, const SfxItemSet* pAttr,
+ SvxTransformTabDialog( vcl::Window* pParent, const SfxItemSet* pAttr,
const SdrView* pView,
sal_uInt16 nAnchorTypes = 0);
virtual ~SvxTransformTabDialog();
@@ -145,9 +145,9 @@ private:
void SetMaxSize( Rectangle aRect );
public:
- SvxPositionSizeTabPage( Window* pParent, const SfxItemSet& rInAttrs );
+ SvxPositionSizeTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs );
- static SfxTabPage* Create( Window*, const SfxItemSet* );
+ static SfxTabPage* Create( vcl::Window*, const SfxItemSet* );
static const sal_uInt16* GetRanges();
virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
@@ -156,7 +156,7 @@ public:
virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE;
- virtual void PointChanged( Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE;
+ virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE;
void Construct();
void SetView( const SdrView* pSdrView ) { mpView = pSdrView; }
@@ -200,9 +200,9 @@ private:
FieldUnit eDlgUnit;
public:
- SvxAngleTabPage( Window* pParent, const SfxItemSet& rInAttrs );
+ SvxAngleTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs );
- static SfxTabPage* Create( Window*, const SfxItemSet* );
+ static SfxTabPage* Create( vcl::Window*, const SfxItemSet* );
static const sal_uInt16* GetRanges();
virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
@@ -211,7 +211,7 @@ public:
virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE;
- virtual void PointChanged( Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE;
+ virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE;
void Construct();
void SetView( const SdrView* pSdrView ) { pView = pSdrView; }
@@ -244,9 +244,9 @@ private:
FieldUnit eDlgUnit;
public:
- SvxSlantTabPage( Window* pParent, const SfxItemSet& rInAttrs );
+ SvxSlantTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs );
- static SfxTabPage* Create( Window*, const SfxItemSet* );
+ static SfxTabPage* Create( vcl::Window*, const SfxItemSet* );
static const sal_uInt16* GetRanges();
virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
@@ -255,7 +255,7 @@ public:
virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE;
- virtual void PointChanged( Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE;
+ virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE;
void Construct();
void SetView( const SdrView* pSdrView ) { pView = pSdrView; }
diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx
index 447723d3ebb5..ac2d360734e6 100644
--- a/cui/source/inc/treeopt.hxx
+++ b/cui/source/inc/treeopt.hxx
@@ -196,10 +196,10 @@ protected:
virtual short Execute() SAL_OVERRIDE;
public:
- OfaTreeOptionsDialog( Window* pParent,
+ OfaTreeOptionsDialog( vcl::Window* pParent,
const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& _xFrame,
bool bActivateLastSelection = true );
- OfaTreeOptionsDialog( Window* pParent, const OUString& rExtensionId );
+ OfaTreeOptionsDialog( vcl::Window* pParent, const OUString& rExtensionId );
virtual ~OfaTreeOptionsDialog();
OptionsPageInfo* AddTabPage( sal_uInt16 nId, const OUString& rPageName, sal_uInt16 nGroup );
@@ -272,7 +272,7 @@ private:
public:
ExtensionsTabPage(
- Window* pParent, WinBits nStyle,
+ vcl::Window* pParent, WinBits nStyle,
const OUString& rPageURL, const OUString& rEvtHdl,
const com::sun::star::uno::Reference<
com::sun::star::awt::XContainerWindowProvider >& rProvider );
diff --git a/cui/source/inc/zoom.hxx b/cui/source/inc/zoom.hxx
index 64c46b53ac42..a8b3176ddb56 100644
--- a/cui/source/inc/zoom.hxx
+++ b/cui/source/inc/zoom.hxx
@@ -55,7 +55,7 @@ private:
DECL_LINK( OKHdl, Button* );
public:
- SvxZoomDialog( Window* pParent, const SfxItemSet& rCoreSet );
+ SvxZoomDialog( vcl::Window* pParent, const SfxItemSet& rCoreSet );
virtual ~SvxZoomDialog();
const SfxItemSet* GetOutputItemSet() const { return pOutSet; }
diff --git a/cui/source/options/certpath.cxx b/cui/source/options/certpath.cxx
index 2d55e4ed9bc5..a31c25211a50 100644
--- a/cui/source/options/certpath.cxx
+++ b/cui/source/options/certpath.cxx
@@ -25,7 +25,7 @@
using namespace ::com::sun::star;
-CertPathDialog::CertPathDialog(Window* pParent)
+CertPathDialog::CertPathDialog(vcl::Window* pParent)
: ModalDialog(pParent, "CertDialog", "cui/ui/certdialog.ui")
{
get(m_pOKBtn, "ok");
diff --git a/cui/source/options/certpath.hxx b/cui/source/options/certpath.hxx
index aa2128e29738..bdc083c987d8 100644
--- a/cui/source/options/certpath.hxx
+++ b/cui/source/options/certpath.hxx
@@ -33,7 +33,7 @@ private:
void HandleCheckEntry(SvTreeListEntry* _pEntry);
void AddCertPath(const OUString &rProfile, const OUString &rPath);
public:
- CertPathDialog(Window* pParent);
+ CertPathDialog(vcl::Window* pParent);
virtual ~CertPathDialog();
OUString getDirectory() const;
diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx
index 9adf2b546413..dd73fb46be9f 100644
--- a/cui/source/options/connpooloptions.cxx
+++ b/cui/source/options/connpooloptions.cxx
@@ -45,7 +45,7 @@ namespace offapp
Link m_aRowChangeHandler;
public:
- DriverListControl(Window* _pParent);
+ DriverListControl(vcl::Window* _pParent);
virtual void Init() SAL_OVERRIDE;
void Update(const DriverPoolingSettings& _rSettings);
@@ -87,7 +87,7 @@ namespace offapp
};
- DriverListControl::DriverListControl(Window* _pParent)
+ DriverListControl::DriverListControl(vcl::Window* _pParent)
:EditBrowseBox(_pParent, EBBF_NOROWPICTURE, BROWSER_AUTO_VSCROLL | BROWSER_AUTO_HSCROLL | BROWSER_HIDECURSOR | BROWSER_AUTOSIZE_LASTCOL | WB_BORDER)
,m_aSeekRow(m_aSettings.end())
,m_sYes(CUI_RES(RID_SVXSTR_YES))
@@ -98,7 +98,7 @@ namespace offapp
SetUniqueId(UID_OFA_CONNPOOL_DRIVERLIST_BACK);
}
- extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeDriverListControl(Window *pParent, VclBuilder::stringmap &)
+ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeDriverListControl(vcl::Window *pParent, VclBuilder::stringmap &)
{
return new DriverListControl(pParent);
}
@@ -300,7 +300,7 @@ namespace offapp
//= ConnectionPoolOptionsPage
- ConnectionPoolOptionsPage::ConnectionPoolOptionsPage(Window* _pParent, const SfxItemSet& _rAttrSet)
+ ConnectionPoolOptionsPage::ConnectionPoolOptionsPage(vcl::Window* _pParent, const SfxItemSet& _rAttrSet)
: SfxTabPage(_pParent, "ConnPoolPage", "cui/ui/connpooloptions.ui", &_rAttrSet)
{
get(m_pEnablePooling, "connectionpooling");
@@ -326,7 +326,7 @@ namespace offapp
}
- SfxTabPage* ConnectionPoolOptionsPage::Create(Window* _pParent, const SfxItemSet* _rAttrSet)
+ SfxTabPage* ConnectionPoolOptionsPage::Create(vcl::Window* _pParent, const SfxItemSet* _rAttrSet)
{
return new ConnectionPoolOptionsPage(_pParent, *_rAttrSet);
}
diff --git a/cui/source/options/connpooloptions.hxx b/cui/source/options/connpooloptions.hxx
index f865438cf50b..868c42702a16 100644
--- a/cui/source/options/connpooloptions.hxx
+++ b/cui/source/options/connpooloptions.hxx
@@ -48,10 +48,10 @@ namespace offapp
NumericField* m_pTimeout;
protected:
- ConnectionPoolOptionsPage(Window* _pParent, const SfxItemSet& _rAttrSet);
+ ConnectionPoolOptionsPage(vcl::Window* _pParent, const SfxItemSet& _rAttrSet);
public:
- static SfxTabPage* Create(Window* _pParent, const SfxItemSet* _rAttrSet);
+ static SfxTabPage* Create(vcl::Window* _pParent, const SfxItemSet* _rAttrSet);
protected:
virtual bool Notify( NotifyEvent& _rNEvt ) SAL_OVERRIDE;
diff --git a/cui/source/options/cuisrchdlg.cxx b/cui/source/options/cuisrchdlg.cxx
index eb552d63ef9a..ef45114ddc09 100644
--- a/cui/source/options/cuisrchdlg.cxx
+++ b/cui/source/options/cuisrchdlg.cxx
@@ -47,7 +47,7 @@
// class SvxJSearchOptionsDialog -----------------------------------------
-SvxJSearchOptionsDialog::SvxJSearchOptionsDialog(Window *pParent,
+SvxJSearchOptionsDialog::SvxJSearchOptionsDialog(vcl::Window *pParent,
const SfxItemSet& rOptionsSet, sal_Int32 nInitialFlags)
: SfxSingleTabDialog(pParent, rOptionsSet)
, nInitialTlFlags( nInitialFlags )
diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx
index 303a7b570183..0258322d67fe 100644
--- a/cui/source/options/dbregister.cxx
+++ b/cui/source/options/dbregister.cxx
@@ -74,7 +74,7 @@ RegistrationItemSetHolder::~RegistrationItemSetHolder()
// class DatabaseRegistrationDialog ------------------------------------------------
-DatabaseRegistrationDialog::DatabaseRegistrationDialog( Window* pParent, const SfxItemSet& rInAttrs )
+DatabaseRegistrationDialog::DatabaseRegistrationDialog( vcl::Window* pParent, const SfxItemSet& rInAttrs )
: RegistrationItemSetHolder(rInAttrs)
, SfxSingleTabDialog(pParent, getRegistrationItems())
{
@@ -101,7 +101,7 @@ short DatabaseRegistrationDialog::Execute()
// class DbRegistrationOptionsPage --------------------------------------------------
-DbRegistrationOptionsPage::DbRegistrationOptionsPage( Window* pParent, const SfxItemSet& rSet ) :
+DbRegistrationOptionsPage::DbRegistrationOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet ) :
SfxTabPage( pParent, "DbRegisterPage", "cui/ui/dbregisterpage.ui", &rSet ),
@@ -174,7 +174,7 @@ DbRegistrationOptionsPage::~DbRegistrationOptionsPage()
-SfxTabPage* DbRegistrationOptionsPage::Create( Window* pParent,
+SfxTabPage* DbRegistrationOptionsPage::Create( vcl::Window* pParent,
const SfxItemSet* rAttrSet )
{
return ( new DbRegistrationOptionsPage( pParent, *rAttrSet ) );
diff --git a/cui/source/options/doclinkdialog.cxx b/cui/source/options/doclinkdialog.cxx
index ad1ba1fd97c3..068f361ce61d 100644
--- a/cui/source/options/doclinkdialog.cxx
+++ b/cui/source/options/doclinkdialog.cxx
@@ -43,7 +43,7 @@ namespace svx
//= ODocumentLinkDialog
- ODocumentLinkDialog::ODocumentLinkDialog( Window* _pParent, bool _bCreateNew )
+ ODocumentLinkDialog::ODocumentLinkDialog( vcl::Window* _pParent, bool _bCreateNew )
: ModalDialog(_pParent, "DatabaseLinkDialog",
"cui/ui/databaselinkdialog.ui")
,m_bCreatingNew(_bCreateNew)
diff --git a/cui/source/options/doclinkdialog.hxx b/cui/source/options/doclinkdialog.hxx
index d14566902e3c..0584734b761d 100644
--- a/cui/source/options/doclinkdialog.hxx
+++ b/cui/source/options/doclinkdialog.hxx
@@ -50,7 +50,7 @@ namespace svx
Link m_aNameValidator;
public:
- ODocumentLinkDialog( Window* _pParent, bool _bCreateNew );
+ ODocumentLinkDialog( vcl::Window* _pParent, bool _bCreateNew );
// name validation has to be done by an external instance
// the validator link gets a pointer to a String, and should return 0 if the string is not
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index 96014db525ea..4668b48f1508 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -36,7 +36,7 @@
/* */
/*********************************************************************/
-SvxFontSubstTabPage::SvxFontSubstTabPage( Window* pParent,
+SvxFontSubstTabPage::SvxFontSubstTabPage( vcl::Window* pParent,
const SfxItemSet& rSet )
: SfxTabPage(pParent, "OptFontsPage", "cui/ui/optfontspage.ui", &rSet)
, pConfig(new SvtFontSubstConfig)
@@ -143,7 +143,7 @@ SvxFontSubstTabPage::~SvxFontSubstTabPage()
delete m_pCheckLB;
}
-SfxTabPage* SvxFontSubstTabPage::Create( Window* pParent,
+SfxTabPage* SvxFontSubstTabPage::Create( vcl::Window* pParent,
const SfxItemSet* rAttrSet)
{
return new SvxFontSubstTabPage(pParent, *rAttrSet);
@@ -238,7 +238,7 @@ void SvxFontSubstTabPage::Reset( const SfxItemSet* )
m_pFontHeightLB->SaveValue();
}
-IMPL_LINK(SvxFontSubstTabPage, SelectHdl, Window*, pWin)
+IMPL_LINK(SvxFontSubstTabPage, SelectHdl, vcl::Window*, pWin)
{
if (pWin == m_pApply || pWin == m_pDelete)
{
diff --git a/cui/source/options/fontsubs.hxx b/cui/source/options/fontsubs.hxx
index 91f87d74e9cd..d73e2b0f9926 100644
--- a/cui/source/options/fontsubs.hxx
+++ b/cui/source/options/fontsubs.hxx
@@ -84,18 +84,18 @@ class SvxFontSubstTabPage : public SfxTabPage
SvLBoxButtonData* pCheckButtonData;
- DECL_LINK(SelectHdl, Window *pWin = 0);
+ DECL_LINK(SelectHdl, vcl::Window *pWin = 0);
DECL_LINK(NonPropFontsHdl, CheckBox* pBox);
SvTreeListEntry* CreateEntry(OUString& rFont1, OUString& rFont2);
void CheckEnable();
- SvxFontSubstTabPage( Window* pParent, const SfxItemSet& rSet );
+ SvxFontSubstTabPage( vcl::Window* pParent, const SfxItemSet& rSet );
virtual ~SvxFontSubstTabPage();
public:
- static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet);
+ static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet);
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
};
diff --git a/cui/source/options/optaboutconfig.cxx b/cui/source/options/optaboutconfig.cxx
index 2baf4f9e6a7d..d16723e130b8 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -56,7 +56,7 @@ struct Prop_Impl
{}
};
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeCuiCustomMultilineEdit(Window *pParent, VclBuilder::stringmap &)
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeCuiCustomMultilineEdit(vcl::Window *pParent, VclBuilder::stringmap &)
{
return new CuiCustomMultilineEdit(pParent, WB_LEFT|WB_VCENTER|WB_BORDER|WB_3DLOOK);
}
@@ -124,7 +124,7 @@ Size CuiCustomMultilineEdit::GetOptimalSize() const
return LogicToPixel(Size(150, GetTextHeight()), MAP_APPFONT);
}
-CuiAboutConfigTabPage::CuiAboutConfigTabPage( Window* pParent/*, const SfxItemSet& rItemSet*/ ) :
+CuiAboutConfigTabPage::CuiAboutConfigTabPage( vcl::Window* pParent/*, const SfxItemSet& rItemSet*/ ) :
ModelessDialog( pParent, "AboutConfig", "cui/ui/aboutconfigdialog.ui"),
m_pPrefCtrl( get<SvSimpleTableContainer>("preferences") ),
m_pResetBtn( get<PushButton>("reset") ),
@@ -456,7 +456,7 @@ std::vector< OUString > CuiAboutConfigTabPage::commaStringToSequence( const OUSt
return tempVector;
}
-CuiAboutConfigValueDialog::CuiAboutConfigValueDialog( Window* pWindow,
+CuiAboutConfigValueDialog::CuiAboutConfigValueDialog( vcl::Window* pWindow,
const OUString& rValue,
int limit ) :
ModalDialog( pWindow, "AboutConfigValueDialog", "cui/ui/aboutconfigvaluedialog.ui" ),
diff --git a/cui/source/options/optaboutconfig.hxx b/cui/source/options/optaboutconfig.hxx
index e848cc427bff..4714cb2e01e5 100644
--- a/cui/source/options/optaboutconfig.hxx
+++ b/cui/source/options/optaboutconfig.hxx
@@ -30,7 +30,7 @@ class CuiCustomMultilineEdit : public Edit
{
public:
bool bNumericOnly;
- CuiCustomMultilineEdit( Window* pParent, WinBits nStyle )
+ CuiCustomMultilineEdit( vcl::Window* pParent, WinBits nStyle )
: Edit( pParent, nStyle )
, bNumericOnly(false)
{}
@@ -56,7 +56,7 @@ private:
DECL_LINK( ResetBtnHdl_Impl, void * );
public:
- CuiAboutConfigTabPage(Window* pParent);
+ CuiAboutConfigTabPage(vcl::Window* pParent);
void InsertEntry(const OUString& rProp, const OUString& rStatus, const OUString& rType, const OUString& rValue);
void Reset();
void FillItems(const com::sun::star::uno::Reference<com::sun::star::container::XNameAccess>& xNameAccess);
@@ -70,7 +70,7 @@ private:
CuiCustomMultilineEdit* m_pEDValue;
public:
- CuiAboutConfigValueDialog( Window* pWindow, const OUString& rValue , int limit = 0);
+ CuiAboutConfigValueDialog( vcl::Window* pWindow, const OUString& rValue , int limit = 0);
OUString getValue()
{
diff --git a/cui/source/options/optaccessibility.cxx b/cui/source/options/optaccessibility.cxx
index f63e7aee11b0..ea94d53b95d6 100644
--- a/cui/source/options/optaccessibility.cxx
+++ b/cui/source/options/optaccessibility.cxx
@@ -31,7 +31,7 @@ struct SvxAccessibilityOptionsTabPage_Impl
: m_aConfig(){}
};
-SvxAccessibilityOptionsTabPage::SvxAccessibilityOptionsTabPage(Window* pParent,
+SvxAccessibilityOptionsTabPage::SvxAccessibilityOptionsTabPage(vcl::Window* pParent,
const SfxItemSet& rSet)
: SfxTabPage(pParent, "OptAccessibilityPage",
"cui/ui/optaccessibilitypage.ui", &rSet)
@@ -61,7 +61,7 @@ SvxAccessibilityOptionsTabPage::~SvxAccessibilityOptionsTabPage()
delete m_pImpl;
}
-SfxTabPage* SvxAccessibilityOptionsTabPage::Create( Window* pParent, const SfxItemSet* rAttrSet )
+SfxTabPage* SvxAccessibilityOptionsTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet )
{
return new SvxAccessibilityOptionsTabPage(pParent, *rAttrSet);
}
diff --git a/cui/source/options/optaccessibility.hxx b/cui/source/options/optaccessibility.hxx
index c25316008654..c63c37dac682 100644
--- a/cui/source/options/optaccessibility.hxx
+++ b/cui/source/options/optaccessibility.hxx
@@ -40,12 +40,12 @@ class SvxAccessibilityOptionsTabPage : public SfxTabPage
SvxAccessibilityOptionsTabPage_Impl* m_pImpl;
- SvxAccessibilityOptionsTabPage( Window* pParent, const SfxItemSet& rSet );
+ SvxAccessibilityOptionsTabPage( vcl::Window* pParent, const SfxItemSet& rSet );
public:
virtual ~SvxAccessibilityOptionsTabPage();
- static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet );
+ static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet );
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
};
diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx
index 9877760e70d0..2a2336afd9d1 100644
--- a/cui/source/options/optasian.cxx
+++ b/cui/source/options/optasian.cxx
@@ -121,7 +121,7 @@ void SvxAsianLayoutPage_Impl::addForbiddenCharacters(
static LanguageType eLastUsedLanguageTypeForForbiddenCharacters = USHRT_MAX;
-SvxAsianLayoutPage::SvxAsianLayoutPage( Window* pParent, const SfxItemSet& rSet ) :
+SvxAsianLayoutPage::SvxAsianLayoutPage( vcl::Window* pParent, const SfxItemSet& rSet ) :
SfxTabPage(pParent, "OptAsianPage", "cui/ui/optasianpage.ui", &rSet),
pImpl(new SvxAsianLayoutPage_Impl)
{
@@ -154,7 +154,7 @@ SvxAsianLayoutPage::~SvxAsianLayoutPage()
delete pImpl;
}
-SfxTabPage* SvxAsianLayoutPage::Create( Window* pParent, const SfxItemSet* rAttrSet )
+SfxTabPage* SvxAsianLayoutPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet )
{
return new SvxAsianLayoutPage(pParent, *rAttrSet);
}
diff --git a/cui/source/options/optbasic.cxx b/cui/source/options/optbasic.cxx
index 826ac04c4706..db24702e6124 100644
--- a/cui/source/options/optbasic.cxx
+++ b/cui/source/options/optbasic.cxx
@@ -25,7 +25,7 @@
#include <boost/shared_ptr.hpp>
#include <cuires.hrc>
-SvxBasicIDEOptionsPage::SvxBasicIDEOptionsPage( Window* pParent, const SfxItemSet& rSet )
+SvxBasicIDEOptionsPage::SvxBasicIDEOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet )
: SfxTabPage(pParent, "OptBasicIDEPage", "cui/ui/optbasicidepage.ui", &rSet)
{
SvtMiscOptions aMiscOpt;
@@ -136,7 +136,7 @@ void SvxBasicIDEOptionsPage::Reset( const SfxItemSet* /*rSet*/ )
pUseExtendedTypesChk->SaveValue();
}
-SfxTabPage* SvxBasicIDEOptionsPage::Create( Window* pParent, const SfxItemSet* rAttrSet )
+SfxTabPage* SvxBasicIDEOptionsPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet )
{
return ( new SvxBasicIDEOptionsPage( pParent, *rAttrSet ) );
}
diff --git a/cui/source/options/optbasic.hxx b/cui/source/options/optbasic.hxx
index a843a4eb4925..5b1959d9f5a6 100644
--- a/cui/source/options/optbasic.hxx
+++ b/cui/source/options/optbasic.hxx
@@ -37,10 +37,10 @@ private:
void LoadConfig();
public:
- SvxBasicIDEOptionsPage( Window* pParent, const SfxItemSet& rSet );
+ SvxBasicIDEOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet );
virtual ~SvxBasicIDEOptionsPage();
- static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet );
+ static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet );
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void FillUserData() SAL_OVERRIDE;
diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx
index ac3d5a2df736..c8bbffd2f621 100644
--- a/cui/source/options/optchart.cxx
+++ b/cui/source/options/optchart.cxx
@@ -39,7 +39,7 @@ namespace
}
}
-SvxDefaultColorOptPage::SvxDefaultColorOptPage(Window* pParent, const SfxItemSet& rInAttrs)
+SvxDefaultColorOptPage::SvxDefaultColorOptPage(vcl::Window* pParent, const SfxItemSet& rInAttrs)
: SfxTabPage(pParent, "OptChartColorsPage","cui/ui/optchartcolorspage.ui", &rInAttrs)
{
get(m_pPBRemove, "delete");
@@ -103,7 +103,7 @@ void SvxDefaultColorOptPage::Construct()
}
-SfxTabPage* SvxDefaultColorOptPage::Create( Window* pParent, const SfxItemSet* rAttrs )
+SfxTabPage* SvxDefaultColorOptPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrs )
{
return new SvxDefaultColorOptPage( pParent, *rAttrs );
}
diff --git a/cui/source/options/optchart.hxx b/cui/source/options/optchart.hxx
index 610e29743208..0f210e1ccd15 100644
--- a/cui/source/options/optchart.hxx
+++ b/cui/source/options/optchart.hxx
@@ -53,12 +53,12 @@ private:
long GetColorIndex( const Color& rCol );
public:
- SvxDefaultColorOptPage( Window* pParent, const SfxItemSet& rInAttrs );
+ SvxDefaultColorOptPage( vcl::Window* pParent, const SfxItemSet& rInAttrs );
virtual ~SvxDefaultColorOptPage();
void Construct();
- static SfxTabPage* Create( Window* pParent, const SfxItemSet* rInAttrs );
+ static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rInAttrs );
virtual bool FillItemSet( SfxItemSet* rOutAttrs ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rInAttrs ) SAL_OVERRIDE;
};
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index 2bf8b38bd8fb..cf749f635df4 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -173,7 +173,7 @@ class ColorConfigWindow_Impl
, public VclBuilderContainer
{
public:
- ColorConfigWindow_Impl(Window* pParent);
+ ColorConfigWindow_Impl(vcl::Window* pParent);
virtual ~ColorConfigWindow_Impl();
public:
@@ -196,7 +196,7 @@ private:
FixedText *m_pText;
public:
Chapter(FixedText *pText, bool bShow);
- Chapter(Window *pGrid, unsigned nYPos, const OUString& sDisplayName);
+ Chapter(vcl::Window *pGrid, unsigned nYPos, const OUString& sDisplayName);
~Chapter();
public:
void SetBackground(const Wallpaper& W) { m_pText->SetBackground(W); }
@@ -210,7 +210,7 @@ private:
{
public:
Entry(ColorConfigWindow_Impl& rParent, unsigned iEntry, long nCheckBoxLabelOffset, bool bShow);
- Entry(Window* pGrid, unsigned nYPos, const ExtendedColorConfigValue& aColorEntry,
+ Entry(vcl::Window* pGrid, unsigned nYPos, const ExtendedColorConfigValue& aColorEntry,
long nCheckBoxLabelOffset);
~Entry();
public:
@@ -238,7 +238,7 @@ private:
// color list box
ColorListBox* m_pColorList;
// color preview box
- Window* m_pPreview;
+ vcl::Window* m_pPreview;
// default color
Color m_aDefaultColor;
private:
@@ -290,7 +290,7 @@ ColorConfigWindow_Impl::Chapter::Chapter(FixedText* pText, bool bShow)
}
// ctor for extended groups
-ColorConfigWindow_Impl::Chapter::Chapter(Window *pGrid,
+ColorConfigWindow_Impl::Chapter::Chapter(vcl::Window *pGrid,
unsigned nYPos, const OUString& rDisplayName)
: m_bOwnsWidget(true)
{
@@ -343,7 +343,7 @@ ColorConfigWindow_Impl::Entry::Entry(ColorConfigWindow_Impl& rParent, unsigned i
}
// ctor for extended entries
-ColorConfigWindow_Impl::Entry::Entry( Window *pGrid, unsigned nYPos,
+ColorConfigWindow_Impl::Entry::Entry( vcl::Window *pGrid, unsigned nYPos,
ExtendedColorConfigValue const& rColorEntry, long nCheckBoxLabelOffset)
: m_bOwnsWidgets(true)
, m_aDefaultColor(rColorEntry.getDefaultColor())
@@ -360,7 +360,7 @@ ColorConfigWindow_Impl::Entry::Entry( Window *pGrid, unsigned nYPos,
m_pColorList->set_grid_left_attach(1);
m_pColorList->set_grid_top_attach(nYPos);
- m_pPreview = new Window(pGrid, WB_BORDER);
+ m_pPreview = new vcl::Window(pGrid, WB_BORDER);
m_pPreview->set_grid_left_attach(2);
m_pPreview->set_grid_top_attach(nYPos);
m_pPreview->set_margin_right(6);
@@ -500,7 +500,7 @@ void ColorConfigWindow_Impl::Entry::SetColor (Color aColor)
// ColorConfigWindow_Impl
-ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent)
+ColorConfigWindow_Impl::ColorConfigWindow_Impl(vcl::Window* pParent)
: VclContainer(pParent)
{
m_pUIBuilder = new VclBuilder(this, getUIRootDir(), "cui/ui/colorconfigwin.ui");
@@ -646,9 +646,9 @@ void ColorConfigWindow_Impl::AdjustHeaderBar()
{
// horizontal positions
unsigned const nX0 = 0;
- unsigned const nX1 = get<Window>("doccolor")->GetPosPixel().X();
- unsigned const nX2 = get<Window>("doccolor_lb")->GetPosPixel().X();
- unsigned const nX3 = get<Window>("doccolor_wn")->GetPosPixel().X();
+ unsigned const nX1 = get<vcl::Window>("doccolor")->GetPosPixel().X();
+ unsigned const nX2 = get<vcl::Window>("doccolor_lb")->GetPosPixel().X();
+ unsigned const nX3 = get<vcl::Window>("doccolor_wn")->GetPosPixel().X();
unsigned const nX4 = m_pHeaderHB->GetSizePixel().Width();
m_pHeaderHB->SetItemSize(1, nX1 - nX0);
m_pHeaderHB->SetItemSize(2, nX2 - nX1);
@@ -840,7 +840,7 @@ class ColorConfigCtrl_Impl : public VclVBox
virtual void Command (CommandEvent const& rCEvt) SAL_OVERRIDE;
virtual void DataChanged (DataChangedEvent const& rDCEvt) SAL_OVERRIDE;
public:
- ColorConfigCtrl_Impl(Window* pParent);
+ ColorConfigCtrl_Impl(vcl::Window* pParent);
virtual ~ColorConfigCtrl_Impl();
void InitHeaderBar(const OUString &rOn, const OUString &rUIElems,
@@ -859,7 +859,7 @@ public:
}
};
-ColorConfigCtrl_Impl::ColorConfigCtrl_Impl(Window* pParent)
+ColorConfigCtrl_Impl::ColorConfigCtrl_Impl(vcl::Window* pParent)
: VclVBox(pParent)
, pColorConfig(0)
, pExtColorConfig(0)
@@ -916,7 +916,7 @@ ColorConfigCtrl_Impl::~ColorConfigCtrl_Impl()
delete m_pHeaderHB;
}
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeColorConfigCtrl(Window *pParent, VclBuilder::stringmap &)
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeColorConfigCtrl(vcl::Window *pParent, VclBuilder::stringmap &)
{
return new ColorConfigCtrl_Impl(pParent);
}
@@ -1030,7 +1030,7 @@ IMPL_LINK(ColorConfigCtrl_Impl, ControlFocusHdl, Control*, pCtrl)
SvxColorOptionsTabPage::SvxColorOptionsTabPage(
- Window* pParent, const SfxItemSet& rCoreSet)
+ vcl::Window* pParent, const SfxItemSet& rCoreSet)
: SfxTabPage(pParent, "OptAppearancePage", "cui/ui/optappearancepage.ui", &rCoreSet)
, bFillItemSetCalled(false)
, pColorConfig(0)
@@ -1043,10 +1043,10 @@ SvxColorOptionsTabPage::SvxColorOptionsTabPage(
get(m_pColorConfigCT, "colorconfig");
m_pColorConfigCT->InitHeaderBar(
- get<Window>("on")->GetText(),
- get<Window>("uielements")->GetText(),
- get<Window>("colorsetting")->GetText(),
- get<Window>("preview")->GetText());
+ get<vcl::Window>("on")->GetText(),
+ get<vcl::Window>("uielements")->GetText(),
+ get<vcl::Window>("colorsetting")->GetText(),
+ get<vcl::Window>("preview")->GetText());
m_pColorSchemeLB->SetSelectHdl(LINK(this, SvxColorOptionsTabPage, SchemeChangedHdl_Impl));
Link aLk = LINK(this, SvxColorOptionsTabPage, SaveDeleteHdl_Impl );
@@ -1075,7 +1075,7 @@ SvxColorOptionsTabPage::~SvxColorOptionsTabPage()
delete pExtColorConfig;
}
-SfxTabPage* SvxColorOptionsTabPage::Create( Window* pParent, const SfxItemSet* rAttrSet )
+SfxTabPage* SvxColorOptionsTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet )
{
return ( new SvxColorOptionsTabPage( pParent, *rAttrSet ) );
}
diff --git a/cui/source/options/optcolor.hxx b/cui/source/options/optcolor.hxx
index d19c6c628875..509d9f13ab7a 100644
--- a/cui/source/options/optcolor.hxx
+++ b/cui/source/options/optcolor.hxx
@@ -47,10 +47,10 @@ class SvxColorOptionsTabPage : public SfxTabPage
void UpdateColorConfig();
public:
- SvxColorOptionsTabPage( Window* pParent, const SfxItemSet& rSet );
+ SvxColorOptionsTabPage( vcl::Window* pParent, const SfxItemSet& rSet );
virtual ~SvxColorOptionsTabPage( );
- static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet );
+ static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet );
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
diff --git a/cui/source/options/optctl.cxx b/cui/source/options/optctl.cxx
index 92ff2a7b81e6..45430195bc94 100644
--- a/cui/source/options/optctl.cxx
+++ b/cui/source/options/optctl.cxx
@@ -38,7 +38,7 @@ IMPL_LINK_NOARG(SvxCTLOptionsPage, SequenceCheckingCB_Hdl)
return 0;
}
-SvxCTLOptionsPage::SvxCTLOptionsPage( Window* pParent, const SfxItemSet& rSet ) :
+SvxCTLOptionsPage::SvxCTLOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet ) :
SfxTabPage( pParent, "OptCTLPage", "cui/ui/optctlpage.ui", &rSet )
@@ -61,7 +61,7 @@ SvxCTLOptionsPage::~SvxCTLOptionsPage()
{
}
-SfxTabPage* SvxCTLOptionsPage::Create( Window* pParent, const SfxItemSet* rAttrSet )
+SfxTabPage* SvxCTLOptionsPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet )
{
return new SvxCTLOptionsPage( pParent, *rAttrSet );
}
diff --git a/cui/source/options/optctl.hxx b/cui/source/options/optctl.hxx
index b61cf56bc3c9..3ab62ad2c09d 100644
--- a/cui/source/options/optctl.hxx
+++ b/cui/source/options/optctl.hxx
@@ -41,13 +41,13 @@ private:
DECL_LINK( SequenceCheckingCB_Hdl, void* );
- SvxCTLOptionsPage( Window* pParent, const SfxItemSet& rSet );
+ SvxCTLOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet );
public:
virtual ~SvxCTLOptionsPage();
- static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet );
+ static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet );
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
};
diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx
index f7ca6510f43f..a214b5952507 100644
--- a/cui/source/options/optdict.cxx
+++ b/cui/source/options/optdict.cxx
@@ -95,7 +95,7 @@ static CDE_RESULT cmpDicEntry_Impl( const OUString &rText1, const OUString &rTex
// class SvxNewDictionaryDialog -------------------------------------------
-SvxNewDictionaryDialog::SvxNewDictionaryDialog( Window* pParent,
+SvxNewDictionaryDialog::SvxNewDictionaryDialog( vcl::Window* pParent,
Reference< XSpellChecker1 > &xSpl ) :
ModalDialog( pParent, "OptNewDictionaryDialog" , "cui/ui/optnewdictionarydialog.ui" ),
@@ -208,7 +208,7 @@ IMPL_LINK_NOARG_INLINE_END(SvxNewDictionaryDialog, ModifyHdl_Impl)
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxDictEdit(Window *pParent, VclBuilder::stringmap&)
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxDictEdit(vcl::Window *pParent, VclBuilder::stringmap&)
{
WinBits nWinStyle = WB_LEFT|WB_VCENTER|WB_BORDER|WB_3DLOOK;
SvxDictEdit *pEdit = new SvxDictEdit(pParent, nWinStyle);
@@ -216,7 +216,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxDictEdit(Window *pParent
};
SvxEditDictionaryDialog::SvxEditDictionaryDialog(
- Window* pParent,
+ vcl::Window* pParent,
const OUString& rName,
Reference< XSpellChecker1 > &xSpl ) :
diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx
index 1749c0ae84e0..7170a7cfd926 100644
--- a/cui/source/options/optfltr.cxx
+++ b/cui/source/options/optfltr.cxx
@@ -38,7 +38,7 @@ enum MSFltrPg2_CheckBoxEntries {
-OfaMSFilterTabPage::OfaMSFilterTabPage(Window* pParent, const SfxItemSet& rSet)
+OfaMSFilterTabPage::OfaMSFilterTabPage(vcl::Window* pParent, const SfxItemSet& rSet)
: SfxTabPage( pParent, "OptFltrPage", "cui/ui/optfltrpage.ui", &rSet )
{
get( aWBasicCodeCB , "wo_basic" );
@@ -70,7 +70,7 @@ IMPL_LINK_NOARG(OfaMSFilterTabPage, LoadExcelBasicCheckHdl_Impl)
return 0;
}
-SfxTabPage* OfaMSFilterTabPage::Create( Window* pParent,
+SfxTabPage* OfaMSFilterTabPage::Create( vcl::Window* pParent,
const SfxItemSet* rAttrSet )
{
return new OfaMSFilterTabPage( pParent, *rAttrSet );
@@ -128,7 +128,7 @@ void OfaMSFilterTabPage::Reset( const SfxItemSet* )
aPBasicStgCB->SaveValue();
}
-OfaMSFilterTabPage2::OfaMSFilterTabPage2( Window* pParent, const SfxItemSet& rSet ) :
+OfaMSFilterTabPage2::OfaMSFilterTabPage2( vcl::Window* pParent, const SfxItemSet& rSet ) :
SfxTabPage( pParent, "OptFilterPage", "cui/ui/optfltrembedpage.ui", &rSet ),
sHeader1(CUI_RES(RID_SVXSTR_HEADER1)),
sHeader2(CUI_RES(RID_SVXSTR_HEADER2)),
@@ -163,7 +163,7 @@ OfaMSFilterTabPage2::~OfaMSFilterTabPage2()
delete m_pCheckLB;
}
-SfxTabPage* OfaMSFilterTabPage2::Create( Window* pParent,
+SfxTabPage* OfaMSFilterTabPage2::Create( vcl::Window* pParent,
const SfxItemSet* rAttrSet )
{
return new OfaMSFilterTabPage2( pParent, *rAttrSet );
diff --git a/cui/source/options/optfltr.hxx b/cui/source/options/optfltr.hxx
index 0f4ed12634c1..d5e43d323ec0 100644
--- a/cui/source/options/optfltr.hxx
+++ b/cui/source/options/optfltr.hxx
@@ -36,14 +36,14 @@ class OfaMSFilterTabPage : public SfxTabPage
CheckBox* aPBasicCodeCB;
CheckBox* aPBasicStgCB;
- OfaMSFilterTabPage( Window* pParent, const SfxItemSet& rSet );
+ OfaMSFilterTabPage( vcl::Window* pParent, const SfxItemSet& rSet );
virtual ~OfaMSFilterTabPage();
DECL_LINK(LoadWordBasicCheckHdl_Impl, void *);
DECL_LINK(LoadExcelBasicCheckHdl_Impl, void *);
public:
- static SfxTabPage* Create( Window* pParent,
+ static SfxTabPage* Create( vcl::Window* pParent,
const SfxItemSet* rAttrSet );
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
@@ -83,7 +83,7 @@ class OfaMSFilterTabPage2 : public SfxTabPage
sChgToFromSmartArt;
SvLBoxButtonData* pCheckButtonData;
- OfaMSFilterTabPage2( Window* pParent, const SfxItemSet& rSet );
+ OfaMSFilterTabPage2( vcl::Window* pParent, const SfxItemSet& rSet );
virtual ~OfaMSFilterTabPage2();
void InsertEntry( const OUString& _rTxt, sal_IntPtr _nType );
@@ -93,7 +93,7 @@ class OfaMSFilterTabPage2 : public SfxTabPage
public:
- static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet );
+ static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet );
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index e6d07105012a..f45b4a4dca44 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -183,7 +183,7 @@ namespace
-OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const SfxItemSet& rSet)
+OfaMiscTabPage::OfaMiscTabPage(vcl::Window* pParent, const SfxItemSet& rSet)
: SfxTabPage(pParent, "OptGeneralPage", "cui/ui/optgeneralpage.ui", &rSet)
{
get(m_pToolTipsCB, "tooltips");
@@ -236,7 +236,7 @@ OfaMiscTabPage::~OfaMiscTabPage()
-SfxTabPage* OfaMiscTabPage::Create( Window* pParent, const SfxItemSet* rAttrSet )
+SfxTabPage* OfaMiscTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet )
{
return new OfaMiscTabPage( pParent, *rAttrSet );
}
@@ -535,7 +535,7 @@ void CanvasSettings::EnabledHardwareAcceleration( bool _bEnabled ) const
// class OfaViewTabPage --------------------------------------------------
-OfaViewTabPage::OfaViewTabPage(Window* pParent, const SfxItemSet& rSet)
+OfaViewTabPage::OfaViewTabPage(vcl::Window* pParent, const SfxItemSet& rSet)
: SfxTabPage(pParent, "OptViewPage", "cui/ui/optviewpage.ui", &rSet)
, nSizeLB_InitialSelection(0)
, nStyleLB_InitialSelection(0)
@@ -647,7 +647,7 @@ IMPL_LINK( OfaViewTabPage, OnSelectionToggled, void*, NOTINTERESTEDIN )
return 0;
}
-SfxTabPage* OfaViewTabPage::Create( Window* pParent, const SfxItemSet* rAttrSet )
+SfxTabPage* OfaViewTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet )
{
return new OfaViewTabPage(pParent, *rAttrSet);
}
@@ -839,7 +839,7 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet* )
if(bRepaintWindows)
{
- Window* pAppWindow = Application::GetFirstTopLevelWindow();
+ vcl::Window* pAppWindow = Application::GetFirstTopLevelWindow();
while(pAppWindow)
{
@@ -997,7 +997,7 @@ static OUString lcl_getDatePatternsConfigString( const LocaleDataWrapper& rLocal
return aBuf.makeStringAndClear();
}
-OfaLanguagesTabPage::OfaLanguagesTabPage( Window* pParent, const SfxItemSet& rSet ) :
+OfaLanguagesTabPage::OfaLanguagesTabPage( vcl::Window* pParent, const SfxItemSet& rSet ) :
SfxTabPage( pParent,"OptLanguagesPage","cui/ui/optlanguagespage.ui", &rSet ),
pLangConfig(new LanguageConfig_Impl)
{
@@ -1149,7 +1149,7 @@ OfaLanguagesTabPage::~OfaLanguagesTabPage()
delete pLangConfig;
}
-SfxTabPage* OfaLanguagesTabPage::Create( Window* pParent, const SfxItemSet* rAttrSet )
+SfxTabPage* OfaLanguagesTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet )
{
return new OfaLanguagesTabPage(pParent, *rAttrSet);
}
diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx
index 9610eff0e89a..f559a0c00a03 100644
--- a/cui/source/options/optgdlg.hxx
+++ b/cui/source/options/optgdlg.hxx
@@ -65,10 +65,10 @@ protected:
virtual int DeactivatePage( SfxItemSet* pSet = NULL ) SAL_OVERRIDE;
public:
- OfaMiscTabPage( Window* pParent, const SfxItemSet& rSet );
+ OfaMiscTabPage( vcl::Window* pParent, const SfxItemSet& rSet );
virtual ~OfaMiscTabPage();
- static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet );
+ static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet );
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
@@ -120,10 +120,10 @@ private:
DECL_LINK( OnSelectionToggled, void* );
public:
- OfaViewTabPage( Window* pParent, const SfxItemSet& rSet );
+ OfaViewTabPage( vcl::Window* pParent, const SfxItemSet& rSet );
virtual ~OfaViewTabPage();
- static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet );
+ static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet );
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
@@ -164,10 +164,10 @@ class OfaLanguagesTabPage : public SfxTabPage
DECL_LINK( DatePatternsHdl, Edit* ) ;
public:
- OfaLanguagesTabPage( Window* pParent, const SfxItemSet& rSet );
+ OfaLanguagesTabPage( vcl::Window* pParent, const SfxItemSet& rSet );
virtual ~OfaLanguagesTabPage();
- static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet );
+ static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet );
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx
index 20303de88311..1408274a7643 100644
--- a/cui/source/options/optgenrl.cxx
+++ b/cui/source/options/optgenrl.cxx
@@ -209,7 +209,7 @@ public:
-SvxGeneralTabPage::SvxGeneralTabPage(Window* pParent, const SfxItemSet& rCoreSet)
+SvxGeneralTabPage::SvxGeneralTabPage(vcl::Window* pParent, const SfxItemSet& rCoreSet)
: SfxTabPage(pParent, "OptUserPage", "cui/ui/optuserpage.ui", &rCoreSet)
{
@@ -296,7 +296,7 @@ void SvxGeneralTabPage::SetLinks ()
-SfxTabPage* SvxGeneralTabPage::Create( Window* pParent, const SfxItemSet* rAttrSet )
+SfxTabPage* SvxGeneralTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet )
{
return ( new SvxGeneralTabPage( pParent, *rAttrSet ) );
}
diff --git a/cui/source/options/opthtml.cxx b/cui/source/options/opthtml.cxx
index 0f3d5125dc03..b95873784cd0 100644
--- a/cui/source/options/opthtml.cxx
+++ b/cui/source/options/opthtml.cxx
@@ -42,7 +42,7 @@ const sal_uInt16 aExportToPosArr[] =
};
-OfaHtmlTabPage::OfaHtmlTabPage(Window* pParent, const SfxItemSet& rSet) :
+OfaHtmlTabPage::OfaHtmlTabPage(vcl::Window* pParent, const SfxItemSet& rSet) :
SfxTabPage( pParent, "OptHtmlPage" , "cui/ui/opthtmlpage.ui", &rSet )
{
get(aSize1NF,"size1");
@@ -88,7 +88,7 @@ OfaHtmlTabPage::~OfaHtmlTabPage()
{
}
-SfxTabPage* OfaHtmlTabPage::Create( Window* pParent,
+SfxTabPage* OfaHtmlTabPage::Create( vcl::Window* pParent,
const SfxItemSet* rAttrSet )
{
return new OfaHtmlTabPage(pParent, *rAttrSet);
diff --git a/cui/source/options/opthtml.hxx b/cui/source/options/opthtml.hxx
index 14052496703f..c79e2393e831 100644
--- a/cui/source/options/opthtml.hxx
+++ b/cui/source/options/opthtml.hxx
@@ -52,11 +52,11 @@ class OfaHtmlTabPage : public SfxTabPage
DECL_LINK(ExportHdl_Impl, ListBox*);
DECL_LINK(CheckBoxHdl_Impl, CheckBox*);
- OfaHtmlTabPage(Window* pParent, const SfxItemSet& rSet);
+ OfaHtmlTabPage(vcl::Window* pParent, const SfxItemSet& rSet);
virtual ~OfaHtmlTabPage();
public:
- static SfxTabPage* Create( Window* pParent,
+ static SfxTabPage* Create( vcl::Window* pParent,
const SfxItemSet* rAttrSet );
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index 760d1ceb94a6..49e6ff064f51 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -96,7 +96,7 @@ using namespace ::sfx2;
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxNoSpaceEdit(Window *pParent, VclBuilder::stringmap &)
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxNoSpaceEdit(vcl::Window *pParent, VclBuilder::stringmap &)
{
return new SvxNoSpaceEdit(pParent, WB_LEFT|WB_VCENTER|WB_BORDER|WB_3DLOOK);
}
@@ -152,7 +152,7 @@ bool SvxNoSpaceEdit::set_property(const OString &rKey, const OString &rValue)
/* */
/********************************************************************/
-SvxProxyTabPage::SvxProxyTabPage(Window* pParent, const SfxItemSet& rSet)
+SvxProxyTabPage::SvxProxyTabPage(vcl::Window* pParent, const SfxItemSet& rSet)
: SfxTabPage(pParent, "OptProxyPage","cui/ui/optproxypage.ui", &rSet)
, aProxyModePN("ooInetProxyType")
, aHttpProxyPN("ooInetHTTPProxyName")
@@ -214,7 +214,7 @@ SvxProxyTabPage::~SvxProxyTabPage()
{
}
-SfxTabPage* SvxProxyTabPage::Create(Window* pParent, const SfxItemSet* rAttrSet )
+SfxTabPage* SvxProxyTabPage::Create(vcl::Window* pParent, const SfxItemSet* rAttrSet )
{
return new SvxProxyTabPage(pParent, *rAttrSet);
}
@@ -574,7 +574,7 @@ void SvxScriptExecListBox::RequestHelp( const HelpEvent& rHEvt )
/* */
/********************************************************************/
-SvxSecurityTabPage::SvxSecurityTabPage(Window* pParent, const SfxItemSet& rSet)
+SvxSecurityTabPage::SvxSecurityTabPage(vcl::Window* pParent, const SfxItemSet& rSet)
: SfxTabPage(pParent, "OptSecurityPage", "cui/ui/optsecuritypage.ui", &rSet)
, mpSecOptions(new SvtSecurityOptions)
, mpSecOptDlg(NULL)
@@ -853,7 +853,7 @@ void SvxSecurityTabPage::InitControls()
}
}
-SfxTabPage* SvxSecurityTabPage::Create(Window* pParent, const SfxItemSet* rAttrSet )
+SfxTabPage* SvxSecurityTabPage::Create(vcl::Window* pParent, const SfxItemSet* rAttrSet )
{
return new SvxSecurityTabPage(pParent, *rAttrSet);
}
@@ -1018,7 +1018,7 @@ struct SvxEMailTabPage_Impl
MailerProgramCfg_Impl aMailConfig;
};
-SvxEMailTabPage::SvxEMailTabPage(Window* pParent, const SfxItemSet& rSet)
+SvxEMailTabPage::SvxEMailTabPage(vcl::Window* pParent, const SfxItemSet& rSet)
: SfxTabPage( pParent, "OptEmailPage", "cui/ui/optemailpage.ui", &rSet)
, pImpl(new SvxEMailTabPage_Impl)
{
@@ -1039,7 +1039,7 @@ SvxEMailTabPage::~SvxEMailTabPage()
/* -------------------------------------------------------------------------*/
-SfxTabPage* SvxEMailTabPage::Create( Window* pParent, const SfxItemSet* rAttrSet )
+SfxTabPage* SvxEMailTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet )
{
return new SvxEMailTabPage(pParent, *rAttrSet);
}
diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx
index 4182f76efd02..c7d81b756f12 100644
--- a/cui/source/options/optinet2.hxx
+++ b/cui/source/options/optinet2.hxx
@@ -43,7 +43,7 @@ class SvxNoSpaceEdit : public Edit
private:
bool bOnlyNumeric;
public:
- SvxNoSpaceEdit(Window* pParent, WinBits nStyle)
+ SvxNoSpaceEdit(vcl::Window* pParent, WinBits nStyle)
: Edit(pParent, nStyle)
, bOnlyNumeric(false)
{}
@@ -98,11 +98,11 @@ private:
DECL_LINK( ProxyHdl_Impl, ListBox * );
DECL_LINK( LoseFocusHdl_Impl, Edit * );
- SvxProxyTabPage( Window* pParent, const SfxItemSet& rSet );
+ SvxProxyTabPage( vcl::Window* pParent, const SfxItemSet& rSet );
virtual ~SvxProxyTabPage();
public:
- static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet );
+ static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet );
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
};
@@ -111,9 +111,9 @@ public:
class SvxScriptExecListBox : public ListBox
{ // for adding tooltips to ListBox
public:
- SvxScriptExecListBox( Window* pParent, WinBits nStyle = WB_BORDER )
+ SvxScriptExecListBox( vcl::Window* pParent, WinBits nStyle = WB_BORDER )
:ListBox(pParent, nStyle) {}
- SvxScriptExecListBox( Window* pParent, const ResId& rResId )
+ SvxScriptExecListBox( vcl::Window* pParent, const ResId& rResId )
:ListBox(pParent, rResId) {}
protected:
@@ -164,7 +164,7 @@ private:
void InitControls();
- SvxSecurityTabPage( Window* pParent, const SfxItemSet& rSet );
+ SvxSecurityTabPage( vcl::Window* pParent, const SfxItemSet& rSet );
virtual ~SvxSecurityTabPage();
protected:
@@ -172,7 +172,7 @@ protected:
virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
public:
- static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet );
+ static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet );
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
};
@@ -192,10 +192,10 @@ class SvxEMailTabPage : public SfxTabPage
DECL_LINK( FileDialogHdl_Impl, PushButton* ) ;
public:
- SvxEMailTabPage( Window* pParent, const SfxItemSet& rSet );
+ SvxEMailTabPage( vcl::Window* pParent, const SfxItemSet& rSet );
virtual ~SvxEMailTabPage();
- static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet );
+ static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet );
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 533bd97e1fca..4f9a7963a5db 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -131,7 +131,7 @@ public:
// class SvxJavaOptionsPage ----------------------------------------------
-SvxJavaOptionsPage::SvxJavaOptionsPage( Window* pParent, const SfxItemSet& rSet )
+SvxJavaOptionsPage::SvxJavaOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet )
: SfxTabPage(pParent, "OptAdvancedPage", "cui/ui/optadvancedpage.ui", &rSet)
, m_pParamDlg(NULL)
, m_pPathDlg(NULL)
@@ -195,7 +195,7 @@ SvxJavaOptionsPage::SvxJavaOptionsPage( Window* pParent, const SfxItemSet& rSet
#if HAVE_FEATURE_JAVA
jfw_lock();
#else
- get<Window>("javaframe")->Disable();
+ get<vcl::Window>("javaframe")->Disable();
#endif
}
@@ -635,7 +635,7 @@ void SvxJavaOptionsPage::AddFolder( const OUString& _rFolder )
-SfxTabPage* SvxJavaOptionsPage::Create( Window* pParent, const SfxItemSet* rAttrSet )
+SfxTabPage* SvxJavaOptionsPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet )
{
return ( new SvxJavaOptionsPage( pParent, *rAttrSet ) );
}
@@ -786,7 +786,7 @@ void SvxJavaOptionsPage::FillUserData()
// class SvxJavaParameterDlg ---------------------------------------------
-SvxJavaParameterDlg::SvxJavaParameterDlg( Window* pParent ) :
+SvxJavaParameterDlg::SvxJavaParameterDlg( vcl::Window* pParent ) :
ModalDialog( pParent, "JavaStartParameters",
"cui/ui/javastartparametersdialog.ui" )
@@ -919,7 +919,7 @@ void SvxJavaParameterDlg::SetParameters( Sequence< OUString >& rParams )
// class SvxJavaClassPathDlg ---------------------------------------------
-SvxJavaClassPathDlg::SvxJavaClassPathDlg(Window* pParent)
+SvxJavaClassPathDlg::SvxJavaClassPathDlg(vcl::Window* pParent)
: ModalDialog(pParent, "JavaClassPath", "cui/ui/javaclasspathdialog.ui")
{
get( m_pPathList, "paths");
diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx
index ab9a9376ceec..353b749f32f5 100644
--- a/cui/source/options/optjava.hxx
+++ b/cui/source/options/optjava.hxx
@@ -104,10 +104,10 @@ private:
void AddFolder( const OUString& _rFolder );
public:
- SvxJavaOptionsPage( Window* pParent, const SfxItemSet& rSet );
+ SvxJavaOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet );
virtual ~SvxJavaOptionsPage();
- static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet );
+ static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet );
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
@@ -138,7 +138,7 @@ private:
public:
- SvxJavaParameterDlg( Window* pParent );
+ SvxJavaParameterDlg( vcl::Window* pParent );
virtual ~SvxJavaParameterDlg();
virtual short Execute() SAL_OVERRIDE;
@@ -170,7 +170,7 @@ private:
m_pPathList->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND ); }
public:
- SvxJavaClassPathDlg( Window* pParent );
+ SvxJavaClassPathDlg( vcl::Window* pParent );
virtual ~SvxJavaClassPathDlg();
inline const OUString& GetOldPath() const { return m_sOldPath; }
diff --git a/cui/source/options/optjsearch.cxx b/cui/source/options/optjsearch.cxx
index 43f32220590d..96bc0146811f 100644
--- a/cui/source/options/optjsearch.cxx
+++ b/cui/source/options/optjsearch.cxx
@@ -27,7 +27,7 @@ using namespace com::sun::star::i18n;
-SvxJSearchOptionsPage::SvxJSearchOptionsPage( Window* pParent, const SfxItemSet& rSet ) :
+SvxJSearchOptionsPage::SvxJSearchOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet ) :
SfxTabPage( pParent, "OptJSearchPage", "cui/ui/optjsearchpage.ui", &rSet )
{
get( m_pMatchCase, "matchcase");
@@ -61,7 +61,7 @@ SvxJSearchOptionsPage::~SvxJSearchOptionsPage()
}
-SfxTabPage* SvxJSearchOptionsPage::Create( Window* pParent, const SfxItemSet* rSet )
+SfxTabPage* SvxJSearchOptionsPage::Create( vcl::Window* pParent, const SfxItemSet* rSet )
{
return new SvxJSearchOptionsPage( pParent, *rSet );
}
diff --git a/cui/source/options/optjsearch.hxx b/cui/source/options/optjsearch.hxx
index 8a8bf0e96110..bb5ac7a4606e 100644
--- a/cui/source/options/optjsearch.hxx
+++ b/cui/source/options/optjsearch.hxx
@@ -24,7 +24,7 @@
#include <vcl/button.hxx>
#include <sfx2/tabdlg.hxx>
-class Window;
+namespace vcl { class Window; }
class SfxItemSet;
@@ -59,12 +59,12 @@ private:
sal_Int32 GetTransliterationFlags_Impl();
protected:
- SvxJSearchOptionsPage( Window* pParent, const SfxItemSet& rSet );
+ SvxJSearchOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet );
public:
virtual ~SvxJSearchOptionsPage();
- static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet );
+ static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet );
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index bd6edfd16cc3..e59f541c7e46 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -343,7 +343,7 @@ class OptionsBreakSet : public ModalDialog
NumericField* m_pBreakNF;
public:
- OptionsBreakSet(Window* pParent, sal_uInt16 nRID)
+ OptionsBreakSet(vcl::Window* pParent, sal_uInt16 nRID)
: ModalDialog(pParent, "BreakNumberOption",
"cui/ui/breaknumberoption.ui")
, m_pBreakNF(NULL)
@@ -1031,7 +1031,7 @@ void SvxLinguData_Impl::Reconfigure( const OUString &rDisplayName, bool bEnable
// class SvxLinguTabPage -------------------------------------------------
-SvxLinguTabPage::SvxLinguTabPage( Window* pParent, const SfxItemSet& rSet ) :
+SvxLinguTabPage::SvxLinguTabPage( vcl::Window* pParent, const SfxItemSet& rSet ) :
SfxTabPage(pParent, "OptLinguPage", "cui/ui/optlingupage.ui", &rSet),
sCapitalWords (CUI_RES(RID_SVXSTR_CAPITAL_WORDS)),
@@ -1147,7 +1147,7 @@ const sal_uInt16* SvxLinguTabPage::GetRanges()
-SfxTabPage* SvxLinguTabPage::Create( Window* pParent,
+SfxTabPage* SvxLinguTabPage::Create( vcl::Window* pParent,
const SfxItemSet* rAttrSet )
{
return ( new SvxLinguTabPage( pParent, *rAttrSet ) );
@@ -1837,7 +1837,7 @@ void SvxLinguTabPage::HideGroups( sal_uInt16 nGrp )
}
}
-SvxEditModulesDlg::SvxEditModulesDlg(Window* pParent, SvxLinguData_Impl& rData)
+SvxEditModulesDlg::SvxEditModulesDlg(vcl::Window* pParent, SvxLinguData_Impl& rData)
: ModalDialog( pParent, "EditModulesDialog",
"cui/ui/editmodulesdialog.ui")
, sSpell(CUI_RES(RID_SVXSTR_SPELL))
diff --git a/cui/source/options/optmemory.cxx b/cui/source/options/optmemory.cxx
index bae13c5c5fe6..787cf6f0a7f2 100644
--- a/cui/source/options/optmemory.cxx
+++ b/cui/source/options/optmemory.cxx
@@ -111,7 +111,7 @@ int OfaMemoryOptionsPage::DeactivatePage( SfxItemSet* _pSet )
-OfaMemoryOptionsPage::OfaMemoryOptionsPage(Window* pParent, const SfxItemSet& rSet)
+OfaMemoryOptionsPage::OfaMemoryOptionsPage(vcl::Window* pParent, const SfxItemSet& rSet)
: SfxTabPage(pParent, "OptMemoryPage", "cui/ui/optmemorypage.ui", &rSet)
{
get(m_pUndoEdit, "undo");
@@ -148,7 +148,7 @@ OfaMemoryOptionsPage::~OfaMemoryOptionsPage()
-SfxTabPage* OfaMemoryOptionsPage::Create( Window* pParent, const SfxItemSet* rAttrSet )
+SfxTabPage* OfaMemoryOptionsPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet )
{
return new OfaMemoryOptionsPage( pParent, *rAttrSet );
}
diff --git a/cui/source/options/optmemory.hxx b/cui/source/options/optmemory.hxx
index b1bf5826a769..b3aaff18715d 100644
--- a/cui/source/options/optmemory.hxx
+++ b/cui/source/options/optmemory.hxx
@@ -56,10 +56,10 @@ protected:
virtual int DeactivatePage( SfxItemSet* pSet = NULL ) SAL_OVERRIDE;
public:
- OfaMemoryOptionsPage( Window* pParent, const SfxItemSet& rSet );
+ OfaMemoryOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet );
virtual ~OfaMemoryOptionsPage();
- static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet );
+ static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet );
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index eb212b30701e..d231aa10542b 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -195,7 +195,7 @@ bool IsMultiPath_Impl( const sal_uInt16 nIndex )
// class SvxPathTabPage --------------------------------------------------
-SvxPathTabPage::SvxPathTabPage(Window* pParent, const SfxItemSet& rSet)
+SvxPathTabPage::SvxPathTabPage(vcl::Window* pParent, const SfxItemSet& rSet)
:SfxTabPage( pParent, "OptPathsPage", "cui/ui/optpathspage.ui", &rSet)
, xDialogListener ( new ::svt::DialogClosedListener() )
{
@@ -255,7 +255,7 @@ SvxPathTabPage::~SvxPathTabPage()
-SfxTabPage* SvxPathTabPage::Create( Window* pParent,
+SfxTabPage* SvxPathTabPage::Create( vcl::Window* pParent,
const SfxItemSet* rAttrSet )
{
return ( new SvxPathTabPage( pParent, *rAttrSet ) );
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index abdcbbd526cc..bb0188866e7a 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -80,7 +80,7 @@ SvxSaveTabPage_Impl::~SvxSaveTabPage_Impl()
// class SvxSaveTabPage --------------------------------------------------
-SfxSaveTabPage::SfxSaveTabPage( Window* pParent, const SfxItemSet& rCoreSet ) :
+SfxSaveTabPage::SfxSaveTabPage( vcl::Window* pParent, const SfxItemSet& rCoreSet ) :
SfxTabPage( pParent, "OptSavePage", "cui/ui/optsavepage.ui", &rCoreSet ),
pImpl ( new SvxSaveTabPage_Impl )
{
@@ -204,7 +204,7 @@ SfxSaveTabPage::~SfxSaveTabPage()
-SfxTabPage* SfxSaveTabPage::Create( Window* pParent,
+SfxTabPage* SfxSaveTabPage::Create( vcl::Window* pParent,
const SfxItemSet* rAttrSet )
{
return ( new SfxSaveTabPage( pParent, *rAttrSet ) );
diff --git a/cui/source/options/optsave.hxx b/cui/source/options/optsave.hxx
index 97f49b72c310..b5fe40ad204e 100644
--- a/cui/source/options/optsave.hxx
+++ b/cui/source/options/optsave.hxx
@@ -71,10 +71,10 @@ private:
void DetectHiddenControls();
public:
- SvxSaveTabPage( Window* pParent, const SfxItemSet& rSet );
+ SvxSaveTabPage( vcl::Window* pParent, const SfxItemSet& rSet );
virtual ~SvxSaveTabPage();
- static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet );
+ static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet );
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
diff --git a/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx
index 6de31e2bb4da..702373b53009 100644
--- a/cui/source/options/optupdt.cxx
+++ b/cui/source/options/optupdt.cxx
@@ -42,7 +42,7 @@ using namespace ::com::sun::star;
// class SvxOnlineUpdateTabPage --------------------------------------------------
-SvxOnlineUpdateTabPage::SvxOnlineUpdateTabPage(Window* pParent, const SfxItemSet& rSet)
+SvxOnlineUpdateTabPage::SvxOnlineUpdateTabPage(vcl::Window* pParent, const SfxItemSet& rSet)
: SfxTabPage(pParent, "OptOnlineUpdatePage", "cui/ui/optonlineupdatepage.ui", &rSet)
{
m_aNeverChecked = get<FixedText>("neverchecked")->GetText();
@@ -149,7 +149,7 @@ void SvxOnlineUpdateTabPage::UpdateLastCheckedText()
SfxTabPage*
-SvxOnlineUpdateTabPage::Create( Window* pParent, const SfxItemSet* rAttrSet )
+SvxOnlineUpdateTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet )
{
return new SvxOnlineUpdateTabPage( pParent, *rAttrSet );
}
diff --git a/cui/source/options/optupdt.hxx b/cui/source/options/optupdt.hxx
index a9d397305c74..54bb2a3791f8 100644
--- a/cui/source/options/optupdt.hxx
+++ b/cui/source/options/optupdt.hxx
@@ -51,10 +51,10 @@ private:
void UpdateLastCheckedText();
public:
- SvxOnlineUpdateTabPage( Window* pParent, const SfxItemSet& rSet );
+ SvxOnlineUpdateTabPage( vcl::Window* pParent, const SfxItemSet& rSet );
virtual ~SvxOnlineUpdateTabPage();
- static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet );
+ static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet );
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx
index 9500026f4354..5f02689b955c 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -38,7 +38,7 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::ucb;
using namespace ::com::sun::star::beans;
-SelectPersonaDialog::SelectPersonaDialog( Window *pParent )
+SelectPersonaDialog::SelectPersonaDialog( vcl::Window *pParent )
: ModalDialog( pParent, "SelectPersonaDialog", "cui/ui/select_persona_dialog.ui" )
{
get( m_pSearchButton, "search_personas" );
@@ -258,7 +258,7 @@ void SelectPersonaDialog::ClearSearchResults()
}
}
-SvxPersonalizationTabPage::SvxPersonalizationTabPage( Window *pParent, const SfxItemSet &rSet )
+SvxPersonalizationTabPage::SvxPersonalizationTabPage( vcl::Window *pParent, const SfxItemSet &rSet )
: SfxTabPage( pParent, "PersonalizationTabPage", "cui/ui/personalization_tab.ui", &rSet )
{
// persona
@@ -295,7 +295,7 @@ SvxPersonalizationTabPage::~SvxPersonalizationTabPage()
{
}
-SfxTabPage* SvxPersonalizationTabPage::Create( Window *pParent, const SfxItemSet *rSet )
+SfxTabPage* SvxPersonalizationTabPage::Create( vcl::Window *pParent, const SfxItemSet *rSet )
{
return new SvxPersonalizationTabPage( pParent, *rSet );
}
diff --git a/cui/source/options/personalization.hxx b/cui/source/options/personalization.hxx
index 4df2a68838b4..95da0717c932 100644
--- a/cui/source/options/personalization.hxx
+++ b/cui/source/options/personalization.hxx
@@ -40,10 +40,10 @@ private:
public:
::rtl::Reference< SearchAndParseThread > m_rApplyThread;
- SvxPersonalizationTabPage( Window *pParent, const SfxItemSet &rSet );
+ SvxPersonalizationTabPage( vcl::Window *pParent, const SfxItemSet &rSet );
virtual ~SvxPersonalizationTabPage();
- static SfxTabPage* Create( Window *pParent, const SfxItemSet *rSet );
+ static SfxTabPage* Create( vcl::Window *pParent, const SfxItemSet *rSet );
/// Apply the settings ([OK] button).
virtual bool FillItemSet( SfxItemSet *rSet ) SAL_OVERRIDE;
@@ -91,7 +91,7 @@ private:
OUString m_aAppliedPersona;
public:
- SelectPersonaDialog( Window *pParent );
+ SelectPersonaDialog( vcl::Window *pParent );
::rtl::Reference< SearchAndParseThread > m_rSearchThread;
OUString GetSelectedPersona() const;
diff --git a/cui/source/options/securityoptions.cxx b/cui/source/options/securityoptions.cxx
index e779aa17a966..b046f218bbb6 100644
--- a/cui/source/options/securityoptions.cxx
+++ b/cui/source/options/securityoptions.cxx
@@ -42,7 +42,7 @@ namespace svx
{
-SecurityOptionsDialog::SecurityOptionsDialog(Window* pParent, SvtSecurityOptions* pOptions)
+SecurityOptionsDialog::SecurityOptionsDialog(vcl::Window* pParent, SvtSecurityOptions* pOptions)
: ModalDialog(pParent, "SecurityOptionsDialog", "cui/ui/securityoptionsdialog.ui")
{
DBG_ASSERT( pOptions, "SecurityOptionsDialog::SecurityOptionsDialog(): invalid SvtSecurityOptions" );
diff --git a/cui/source/options/securityoptions.hxx b/cui/source/options/securityoptions.hxx
index 0838e2b39b69..614e3f72dfa3 100644
--- a/cui/source/options/securityoptions.hxx
+++ b/cui/source/options/securityoptions.hxx
@@ -48,7 +48,7 @@ namespace svx
CheckBox* m_pBlockUntrustedRefererLinksCB;
public:
- SecurityOptionsDialog( Window* pParent, SvtSecurityOptions* pOptions );
+ SecurityOptionsDialog( vcl::Window* pParent, SvtSecurityOptions* pOptions );
virtual ~SecurityOptionsDialog();
bool IsSaveOrSendDocsChecked() const { return m_pSaveOrSendDocsCB->IsChecked(); }
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index ab9356619845..88900347d401 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -286,8 +286,8 @@ void MailMergeCfg_Impl::Notify( const com::sun::star::uno::Sequence< OUString >&
{
}
-//typedef SfxTabPage* (*FNCreateTabPage)( Window *pParent, const SfxItemSet &rAttrSet );
-SfxTabPage* CreateGeneralTabPage( sal_uInt16 nId, Window* pParent, const SfxItemSet& rSet )
+//typedef SfxTabPage* (*FNCreateTabPage)( vcl::Window *pParent, const SfxItemSet &rAttrSet );
+SfxTabPage* CreateGeneralTabPage( sal_uInt16 nId, vcl::Window* pParent, const SfxItemSet& rSet )
{
CreateTabPage fnCreate = 0;
switch(nId)
@@ -510,7 +510,7 @@ void OfaTreeOptionsDialog::InitWidgets()
// Ctor() with Frame -----------------------------------------------------
using namespace ::com::sun::star;
OfaTreeOptionsDialog::OfaTreeOptionsDialog(
- Window* pParent,
+ vcl::Window* pParent,
const Reference< XFrame >& _xFrame,
bool bActivateLastSelection ) :
@@ -529,7 +529,7 @@ OfaTreeOptionsDialog::OfaTreeOptionsDialog(
}
// Ctor() with ExtensionId -----------------------------------------------
-OfaTreeOptionsDialog::OfaTreeOptionsDialog( Window* pParent, const OUString& rExtensionId ) :
+OfaTreeOptionsDialog::OfaTreeOptionsDialog( vcl::Window* pParent, const OUString& rExtensionId ) :
SfxModalDialog( pParent, "OptionsDialog", "cui/ui/optionsdialog.ui" ),
INI_LIST()
@@ -1131,7 +1131,7 @@ void OfaTreeOptionsDialog::SelectHdl_Impl()
pNewPage = pPageInfo->m_pPage;
// restore lost focus, if necessary
- Window* pFocusWin = Application::GetFocusWindow();
+ vcl::Window* pFocusWin = Application::GetFocusWindow();
// if the focused window is not the options treebox and the old page has the focus
if ( pFocusWin && pFocusWin != pBox && pOldPage && pOldPage->HasChildPathFocus() )
// then set the focus to the new page or if we are on a group set the focus to the options treebox
@@ -1142,7 +1142,7 @@ void OfaTreeOptionsDialog::SelectHdl_Impl()
OString sHelpId(HID_OFADLG_TREELISTBOX);
if (::isLayoutEnabled(pNewPage))
{
- Window *pFirstChild = pNewPage->GetWindow(WINDOW_FIRSTCHILD);
+ vcl::Window *pFirstChild = pNewPage->GetWindow(WINDOW_FIRSTCHILD);
assert(pFirstChild);
sHelpId = pFirstChild->GetHelpId();
}
@@ -2151,7 +2151,7 @@ short OfaTreeOptionsDialog::Execute()
// class ExtensionsTabPage -----------------------------------------------
ExtensionsTabPage::ExtensionsTabPage(
- Window* pParent, WinBits nStyle, const OUString& rPageURL,
+ vcl::Window* pParent, WinBits nStyle, const OUString& rPageURL,
const OUString& rEvtHdl, const Reference< awt::XContainerWindowProvider >& rProvider ) :
TabPage( pParent, nStyle ),
@@ -2214,7 +2214,7 @@ void ExtensionsTabPage::CreateDialogWithHandler()
Reference< awt::XWindowPeer > xWinPeer( xPageControl->getPeer() );
if ( xWinPeer.is() )
{
- Window* pWindow = VCLUnoHelper::GetWindow( xWinPeer );
+ vcl::Window* pWindow = VCLUnoHelper::GetWindow( xWinPeer );
if ( pWindow )
pWindow->SetStyle( pWindow->GetStyle() | WB_DIALOGCONTROL | WB_CHILDDLGCTRL );
}
diff --git a/cui/source/options/webconninfo.cxx b/cui/source/options/webconninfo.cxx
index 427145a9e659..7d5a483cd647 100644
--- a/cui/source/options/webconninfo.cxx
+++ b/cui/source/options/webconninfo.cxx
@@ -102,7 +102,7 @@ void PasswordTable::setColWidths()
// class WebConnectionInfoDialog -----------------------------------------
-WebConnectionInfoDialog::WebConnectionInfoDialog(Window* pParent)
+WebConnectionInfoDialog::WebConnectionInfoDialog(vcl::Window* pParent)
: ModalDialog(pParent, "StoredWebConnectionDialog", "cui/ui/storedwebconnectiondialog.ui")
, m_nPos( -1 )
{
diff --git a/cui/source/options/webconninfo.hxx b/cui/source/options/webconninfo.hxx
index 0d8c278cabc4..366bcfc31283 100644
--- a/cui/source/options/webconninfo.hxx
+++ b/cui/source/options/webconninfo.hxx
@@ -62,7 +62,7 @@ namespace svx
void FillPasswordList();
public:
- WebConnectionInfoDialog( Window* pParent );
+ WebConnectionInfoDialog( vcl::Window* pParent );
virtual ~WebConnectionInfoDialog();
};
diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx
index c2f07521ab3f..7eac0ade3164 100644
--- a/cui/source/tabpages/align.cxx
+++ b/cui/source/tabpages/align.cxx
@@ -150,7 +150,7 @@ void lcl_SetJustifyMethodToItemSet(SfxItemSet& rSet, sal_uInt16 nWhichJM, const
-AlignmentTabPage::AlignmentTabPage( Window* pParent, const SfxItemSet& rCoreAttrs ) :
+AlignmentTabPage::AlignmentTabPage( vcl::Window* pParent, const SfxItemSet& rCoreAttrs ) :
SfxTabPage( pParent, "CellAlignPage","cui/ui/cellalignment.ui", &rCoreAttrs )
@@ -253,7 +253,7 @@ AlignmentTabPage::~AlignmentTabPage()
delete m_pOrientHlp;
}
-SfxTabPage* AlignmentTabPage::Create( Window* pParent, const SfxItemSet* rAttrSet )
+SfxTabPage* AlignmentTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet )
{
return new AlignmentTabPage( pParent, *rAttrSet );
}
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 498a677b341a..7475cd1af6f9 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -63,7 +63,7 @@ using namespace ::com::sun::star::util;
using namespace ::com::sun::star;
using namespace ::rtl;
-OfaAutoCorrDlg::OfaAutoCorrDlg(Window* pParent, const SfxItemSet* _pSet )
+OfaAutoCorrDlg::OfaAutoCorrDlg(vcl::Window* pParent, const SfxItemSet* _pSet )
: SfxTabDialog(pParent, "AutoCorrectDialog", "cui/ui/autocorrectdialog.ui", _pSet)
{
get(m_pLanguageBox, "langbox");
@@ -179,7 +179,7 @@ IMPL_LINK(OfaAutoCorrDlg, SelectLanguageHdl, ListBox*, pBox)
return 0;
}
-OfaAutocorrOptionsPage::OfaAutocorrOptionsPage(Window* pParent, const SfxItemSet& rSet)
+OfaAutocorrOptionsPage::OfaAutocorrOptionsPage(vcl::Window* pParent, const SfxItemSet& rSet)
: SfxTabPage(pParent, "AutocorrectOptionsPage", "cui/ui/acoroptionspage.ui", &rSet)
, m_sInput(CUI_RESSTR(RID_SVXSTR_USE_REPLACE))
, m_sDoubleCaps(CUI_RESSTR(RID_SVXSTR_CPTL_STT_WORD))
@@ -193,7 +193,7 @@ OfaAutocorrOptionsPage::OfaAutocorrOptionsPage(Window* pParent, const SfxItemSet
get(m_pCheckLB, "checklist");
}
-SfxTabPage* OfaAutocorrOptionsPage::Create( Window* pParent,
+SfxTabPage* OfaAutocorrOptionsPage::Create( vcl::Window* pParent,
const SfxItemSet* rSet)
{
return new OfaAutocorrOptionsPage(pParent, *rSet);
@@ -285,7 +285,7 @@ class OfaAutoFmtPrcntSet : public ModalDialog
{
MetricField* m_pPrcntMF;
public:
- OfaAutoFmtPrcntSet(Window* pParent)
+ OfaAutoFmtPrcntSet(vcl::Window* pParent)
: ModalDialog(pParent, "PercentDialog","cui/ui/percentdialog.ui")
{
get(m_pPrcntMF, "margin");
@@ -387,7 +387,7 @@ enum OfaAutoFmtOptions
MERGE_SINGLE_LINE_PARA
};
-OfaSwAutoFmtOptionsPage::OfaSwAutoFmtOptionsPage( Window* pParent,
+OfaSwAutoFmtOptionsPage::OfaSwAutoFmtOptionsPage( vcl::Window* pParent,
const SfxItemSet& rSet )
: SfxTabPage(pParent, "ApplyAutoFmtPage", "cui/ui/applyautofmtpage.ui", &rSet)
, sDeleteEmptyPara(CUI_RESSTR(RID_SVXSTR_DEL_EMPTY_PARA))
@@ -431,9 +431,9 @@ OfaSwAutoFmtOptionsPage::OfaSwAutoFmtOptionsPage( Window* pParent,
};
m_pCheckLB->SvSimpleTable::SetTabs(aStaticTabs);
- OUStringBuffer sHeader(get<Window>("m")->GetText());
+ OUStringBuffer sHeader(get<vcl::Window>("m")->GetText());
sHeader.append('\t');
- sHeader.append(get<Window>("t")->GetText());
+ sHeader.append(get<vcl::Window>("t")->GetText());
sHeader.append('\t');
m_pCheckLB->InsertHeaderEntry(sHeader.makeStringAndClear(), HEADERBAR_APPEND,
HIB_CENTER | HIB_VCENTER | HIB_FIXEDPOS | HIB_FIXED);
@@ -477,7 +477,7 @@ OfaSwAutoFmtOptionsPage::~OfaSwAutoFmtOptionsPage()
delete m_pCheckLB;
}
-SfxTabPage* OfaSwAutoFmtOptionsPage::Create( Window* pParent,
+SfxTabPage* OfaSwAutoFmtOptionsPage::Create( vcl::Window* pParent,
const SfxItemSet* rAttrSet)
{
return new OfaSwAutoFmtOptionsPage(pParent, *rAttrSet);
@@ -831,7 +831,7 @@ void OfaACorrCheckListBox::KeyInput( const KeyEvent& rKEvt )
SvSimpleTable::KeyInput(rKEvt);
}
-OfaAutocorrReplacePage::OfaAutocorrReplacePage( Window* pParent,
+OfaAutocorrReplacePage::OfaAutocorrReplacePage( vcl::Window* pParent,
const SfxItemSet& rSet )
: SfxTabPage(pParent, "AcorReplacePage", "cui/ui/acorreplacepage.ui", &rSet)
, eLang(eLastDialogLanguage)
@@ -905,7 +905,7 @@ OfaAutocorrReplacePage::~OfaAutocorrReplacePage()
delete pCharClass;
}
-SfxTabPage* OfaAutocorrReplacePage::Create( Window* pParent, const SfxItemSet* rSet)
+SfxTabPage* OfaAutocorrReplacePage::Create( vcl::Window* pParent, const SfxItemSet* rSet)
{
return new OfaAutocorrReplacePage(pParent, *rSet);
}
@@ -1361,7 +1361,7 @@ static bool lcl_FindInArray(std::vector<OUString>& rStrings, const OUString& rSt
return false;
}
-OfaAutocorrExceptPage::OfaAutocorrExceptPage(Window* pParent, const SfxItemSet& rSet)
+OfaAutocorrExceptPage::OfaAutocorrExceptPage(vcl::Window* pParent, const SfxItemSet& rSet)
: SfxTabPage(pParent, "AcorExceptPage", "cui/ui/acorexceptpage.ui", &rSet)
, eLang(eLastDialogLanguage)
{
@@ -1405,7 +1405,7 @@ OfaAutocorrExceptPage::~OfaAutocorrExceptPage()
delete pCompareClass;
}
-SfxTabPage* OfaAutocorrExceptPage::Create( Window* pParent,
+SfxTabPage* OfaAutocorrExceptPage::Create( vcl::Window* pParent,
const SfxItemSet* rSet)
{
return new OfaAutocorrExceptPage(pParent, *rSet);
@@ -1685,7 +1685,7 @@ IMPL_LINK(OfaAutocorrExceptPage, ModifyHdl, Edit*, pEdt)
return 0;
}
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeAutoCorrEdit(Window *pParent,
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeAutoCorrEdit(vcl::Window *pParent,
VclBuilder::stringmap &)
{
return new AutoCorrEdit(pParent);
@@ -1740,7 +1740,7 @@ SvTreeListEntry* OfaQuoteTabPage::CreateEntry(OUString& rTxt, sal_uInt16 nCol)
return pEntry;
}
-OfaQuoteTabPage::OfaQuoteTabPage(Window* pParent, const SfxItemSet& rSet)
+OfaQuoteTabPage::OfaQuoteTabPage(vcl::Window* pParent, const SfxItemSet& rSet)
: SfxTabPage(pParent, "ApplyLocalizedPage", "cui/ui/applylocalizedpage.ui", &rSet)
, sNonBrkSpace(CUI_RESSTR(RID_SVXSTR_NON_BREAK_SPACE))
, sOrdinal(CUI_RESSTR(RID_SVXSTR_ORDINAL))
@@ -1795,9 +1795,9 @@ OfaQuoteTabPage::OfaQuoteTabPage(Window* pParent, const SfxItemSet& rSet)
m_pSwCheckLB->SetStyle(m_pSwCheckLB->GetStyle() | WB_HSCROLL| WB_VSCROLL);
m_pSwCheckLB->SvSimpleTable::SetTabs(aStaticTabs);
- OUString sHeader(get<Window>("m")->GetText());
+ OUString sHeader(get<vcl::Window>("m")->GetText());
sHeader += "\t";
- sHeader += get<Window>("t")->GetText();
+ sHeader += get<vcl::Window>("t")->GetText();
sHeader += "\t";
m_pSwCheckLB->InsertHeaderEntry( sHeader, HEADERBAR_APPEND,
HIB_CENTER | HIB_VCENTER | HIB_FIXEDPOS | HIB_FIXED);
@@ -1822,7 +1822,7 @@ OfaQuoteTabPage::~OfaQuoteTabPage()
delete m_pSwCheckLB;
}
-SfxTabPage* OfaQuoteTabPage::Create( Window* pParent,
+SfxTabPage* OfaQuoteTabPage::Create( vcl::Window* pParent,
const SfxItemSet* rAttrSet)
{
return new OfaQuoteTabPage(pParent, *rAttrSet);
@@ -2085,7 +2085,7 @@ OUString OfaQuoteTabPage::ChangeStringExt_Impl( sal_UCS4 cChar )
return aOUStr;
}
-OfaAutoCompleteTabPage::OfaAutoCompleteTabPage(Window* pParent,
+OfaAutoCompleteTabPage::OfaAutoCompleteTabPage(vcl::Window* pParent,
const SfxItemSet& rSet)
: SfxTabPage(pParent, "WordCompletionPage",
"cui/ui/wordcompletionpage.ui", &rSet)
@@ -2146,7 +2146,7 @@ OfaAutoCompleteTabPage::~OfaAutoCompleteTabPage()
{
}
-SfxTabPage* OfaAutoCompleteTabPage::Create( Window* pParent,
+SfxTabPage* OfaAutoCompleteTabPage::Create( vcl::Window* pParent,
const SfxItemSet* rSet)
{
return new OfaAutoCompleteTabPage( pParent, *rSet );
@@ -2315,7 +2315,7 @@ void OfaAutoCompleteTabPage::CopyToClipboard() const
sData.append(aLineEnd);
}
pCntnr->CopyByteString( SOT_FORMAT_STRING, sData.makeStringAndClear() );
- pCntnr->CopyToClipboard( (Window*)this );
+ pCntnr->CopyToClipboard( (vcl::Window*)this );
}
}
@@ -2346,7 +2346,7 @@ bool OfaAutoCompleteTabPage::AutoCompleteMultiListBox::PreNotify(
return nHandled;
}
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeAutoCompleteMultiListBox(Window *pParent, VclBuilder::stringmap &rMap)
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeAutoCompleteMultiListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap)
{
WinBits nWinBits = WB_TABSTOP;
@@ -2359,7 +2359,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeAutoCompleteMultiListBox(Wi
// class OfaSmartTagOptionsTabPage ---------------------------------------------
-OfaSmartTagOptionsTabPage::OfaSmartTagOptionsTabPage( Window* pParent,
+OfaSmartTagOptionsTabPage::OfaSmartTagOptionsTabPage( vcl::Window* pParent,
const SfxItemSet& rSet )
: SfxTabPage(pParent, "SmartTagOptionsPage", "cui/ui/smarttagoptionspage.ui", &rSet)
{
@@ -2385,7 +2385,7 @@ OfaSmartTagOptionsTabPage::~OfaSmartTagOptionsTabPage()
}
-SfxTabPage* OfaSmartTagOptionsTabPage::Create( Window* pParent, const SfxItemSet* rSet)
+SfxTabPage* OfaSmartTagOptionsTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet)
{
return new OfaSmartTagOptionsTabPage( pParent, *rSet );
}
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index 3f48db5ccea3..9929334ee452 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -176,10 +176,10 @@ sal_uInt16 GetItemId_Impl( ValueSet& rValueSet, const Color& rCol )
preview window for brush or bitmap
*/
-class BackgroundPreviewImpl : public Window
+class BackgroundPreviewImpl : public vcl::Window
{
public:
- BackgroundPreviewImpl(Window* pParent);
+ BackgroundPreviewImpl(vcl::Window* pParent);
void setBmp(bool bBmp);
virtual ~BackgroundPreviewImpl();
@@ -203,7 +203,7 @@ private:
sal_uInt8 nTransparency;
};
-BackgroundPreviewImpl::BackgroundPreviewImpl(Window* pParent)
+BackgroundPreviewImpl::BackgroundPreviewImpl(vcl::Window* pParent)
: Window(pParent, WB_BORDER)
, bIsBmp(false)
, pBitmap(NULL)
@@ -214,7 +214,7 @@ BackgroundPreviewImpl::BackgroundPreviewImpl(Window* pParent)
Paint(aDrawRect);
}
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeBackgroundPreview(Window *pParent, VclBuilder::stringmap &)
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeBackgroundPreview(vcl::Window *pParent, VclBuilder::stringmap &)
{
return new BackgroundPreviewImpl(pParent);
}
@@ -350,7 +350,7 @@ void BackgroundPreviewImpl::DataChanged( const DataChangedEvent& rDCEvt )
#define HDL(hdl) LINK(this,SvxBackgroundTabPage,hdl)
-SvxBackgroundTabPage::SvxBackgroundTabPage(Window* pParent, const SfxItemSet& rCoreSet)
+SvxBackgroundTabPage::SvxBackgroundTabPage(vcl::Window* pParent, const SfxItemSet& rCoreSet)
: SvxTabPage(pParent, "BackgroundPage", "cui/ui/backgroundpage.ui", rCoreSet)
, nHtmlMode(0)
, bAllowShowSelector(true)
@@ -456,7 +456,7 @@ const sal_uInt16* SvxBackgroundTabPage::GetRanges()
-SfxTabPage* SvxBackgroundTabPage::Create( Window* pParent,
+SfxTabPage* SvxBackgroundTabPage::Create( vcl::Window* pParent,
const SfxItemSet* rAttrSet )
/* [Description]
@@ -1068,7 +1068,7 @@ int SvxBackgroundTabPage::DeactivatePage( SfxItemSet* _pSet )
-void SvxBackgroundTabPage::PointChanged( Window* , RECT_POINT )
+void SvxBackgroundTabPage::PointChanged( vcl::Window* , RECT_POINT )
{
// has to be implemented so that position control can work
}
@@ -1423,7 +1423,7 @@ IMPL_LINK_NOARG(SvxBackgroundTabPage, BrowseHdl_Impl)
return 0;
bool bHtml = 0 != ( nHtmlMode & HTMLMODE_ON );
- OUString aStrBrowse(get<Window>("findgraphicsft")->GetText());
+ OUString aStrBrowse(get<vcl::Window>("findgraphicsft")->GetText());
pImportDlg = new SvxOpenGraphicDialog( aStrBrowse );
if ( bHtml || bLinkOnly )
pImportDlg->EnableLink(false);
diff --git a/cui/source/tabpages/bbdlg.cxx b/cui/source/tabpages/bbdlg.cxx
index d0d7752d4fff..2116a64364be 100644
--- a/cui/source/tabpages/bbdlg.cxx
+++ b/cui/source/tabpages/bbdlg.cxx
@@ -24,7 +24,7 @@
#include "svx/svxids.hrc"
#include "cuitabarea.hxx"
-SvxBorderBackgroundDlg::SvxBorderBackgroundDlg(Window *pParent,
+SvxBorderBackgroundDlg::SvxBorderBackgroundDlg(vcl::Window *pParent,
const SfxItemSet& rCoreSet,
bool bEnableSelector,
bool bEnableDrawingLayerFillStyles)
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index 6ccba2efba01..b514300acd1a 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -85,7 +85,7 @@ static void lcl_SetDecimalDigitsTo1(MetricField& rField)
}
-SvxBorderTabPage::SvxBorderTabPage(Window* pParent, const SfxItemSet& rCoreAttrs)
+SvxBorderTabPage::SvxBorderTabPage(vcl::Window* pParent, const SfxItemSet& rCoreAttrs)
: SfxTabPage(pParent, "BorderPage", "cui/ui/borderpage.ui", &rCoreAttrs)
,
@@ -349,7 +349,7 @@ const sal_uInt16* SvxBorderTabPage::GetRanges()
-SfxTabPage* SvxBorderTabPage::Create( Window* pParent,
+SfxTabPage* SvxBorderTabPage::Create( vcl::Window* pParent,
const SfxItemSet* rAttrSet )
{
return ( new SvxBorderTabPage( pParent, *rAttrSet ) );
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 05781ce7a99a..fc59a487e6b1 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -175,7 +175,7 @@ inline SvxFont& SvxCharBasePage::GetPreviewCTLFont()
-SvxCharBasePage::SvxCharBasePage(Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet& rItemset)
+SvxCharBasePage::SvxCharBasePage(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet& rItemset)
: SfxTabPage( pParent, rID, rUIXMLDescription, &rItemset )
, m_pPreviewWin(NULL)
, m_bPreviewBackgroundToCharacter( false )
@@ -262,7 +262,7 @@ struct SvxCharNamePage_Impl
// class SvxCharNamePage -------------------------------------------------
-SvxCharNamePage::SvxCharNamePage( Window* pParent, const SfxItemSet& rInSet )
+SvxCharNamePage::SvxCharNamePage( vcl::Window* pParent, const SfxItemSet& rInSet )
: SvxCharBasePage(pParent, "CharNamePage", "cui/ui/charnamepage.ui", rInSet)
, m_pImpl(new SvxCharNamePage_Impl)
{
@@ -1180,7 +1180,7 @@ int SvxCharNamePage::DeactivatePage( SfxItemSet* _pSet )
-SfxTabPage* SvxCharNamePage::Create( Window* pParent, const SfxItemSet* rSet )
+SfxTabPage* SvxCharNamePage::Create( vcl::Window* pParent, const SfxItemSet* rSet )
{
return new SvxCharNamePage( pParent, *rSet );
}
@@ -1313,7 +1313,7 @@ void SvxCharNamePage::PageCreated(const SfxAllItemSet& aSet)
}
// class SvxCharEffectsPage ----------------------------------------------
-SvxCharEffectsPage::SvxCharEffectsPage( Window* pParent, const SfxItemSet& rInSet )
+SvxCharEffectsPage::SvxCharEffectsPage( vcl::Window* pParent, const SfxItemSet& rInSet )
: SvxCharBasePage(pParent, "EffectsPage", "cui/ui/effectspage.ui", rInSet)
, m_aTransparentColorName(CUI_RES(RID_SVXSTR_CHARNAME_TRANSPARENT))
{
@@ -1727,7 +1727,7 @@ int SvxCharEffectsPage::DeactivatePage( SfxItemSet* _pSet )
-SfxTabPage* SvxCharEffectsPage::Create( Window* pParent, const SfxItemSet* rSet )
+SfxTabPage* SvxCharEffectsPage::Create( vcl::Window* pParent, const SfxItemSet* rSet )
{
return new SvxCharEffectsPage( pParent, *rSet );
}
@@ -2564,7 +2564,7 @@ void SvxCharEffectsPage::PageCreated(const SfxAllItemSet& aSet)
// class SvxCharPositionPage ---------------------------------------------
-SvxCharPositionPage::SvxCharPositionPage( Window* pParent, const SfxItemSet& rInSet )
+SvxCharPositionPage::SvxCharPositionPage( vcl::Window* pParent, const SfxItemSet& rInSet )
: SvxCharBasePage(pParent, "PositionPage", "cui/ui/positionpage.ui", rInSet)
, m_nSuperEsc((short)DFLT_ESC_SUPER)
, m_nSubEsc((short)DFLT_ESC_SUB)
@@ -2901,7 +2901,7 @@ int SvxCharPositionPage::DeactivatePage( SfxItemSet* _pSet )
-SfxTabPage* SvxCharPositionPage::Create( Window* pParent, const SfxItemSet* rSet )
+SfxTabPage* SvxCharPositionPage::Create( vcl::Window* pParent, const SfxItemSet* rSet )
{
return new SvxCharPositionPage( pParent, *rSet );
}
@@ -3328,7 +3328,7 @@ void SvxCharPositionPage::PageCreated(const SfxAllItemSet& aSet)
}
// class SvxCharTwoLinesPage ------------------------------------------------
-SvxCharTwoLinesPage::SvxCharTwoLinesPage(Window* pParent, const SfxItemSet& rInSet)
+SvxCharTwoLinesPage::SvxCharTwoLinesPage(vcl::Window* pParent, const SfxItemSet& rInSet)
: SvxCharBasePage(pParent, "TwoLinesPage", "cui/ui/twolinespage.ui", rInSet)
, m_nStartBracketPosition( 0 )
, m_nEndBracketPosition( 0 )
@@ -3473,7 +3473,7 @@ int SvxCharTwoLinesPage::DeactivatePage( SfxItemSet* _pSet )
-SfxTabPage* SvxCharTwoLinesPage::Create( Window* pParent, const SfxItemSet* rSet )
+SfxTabPage* SvxCharTwoLinesPage::Create( vcl::Window* pParent, const SfxItemSet* rSet )
{
return new SvxCharTwoLinesPage( pParent, *rSet );
}
diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx
index 61ac6853975d..b4269d3e8145 100644
--- a/cui/source/tabpages/connect.cxx
+++ b/cui/source/tabpages/connect.cxx
@@ -50,7 +50,7 @@ static const sal_uInt16 pRanges[] =
|*
\************************************************************************/
-SvxConnectionDialog::SvxConnectionDialog( Window* pParent, const SfxItemSet& rInAttrs,
+SvxConnectionDialog::SvxConnectionDialog( vcl::Window* pParent, const SfxItemSet& rInAttrs,
const SdrView* pSdrView )
: SfxSingleTabDialog(pParent, rInAttrs)
{
@@ -79,7 +79,7 @@ SvxConnectionDialog::~SvxConnectionDialog()
|*
\************************************************************************/
-SvxConnectionPage::SvxConnectionPage( Window* pWindow, const SfxItemSet& rInAttrs )
+SvxConnectionPage::SvxConnectionPage( vcl::Window* pWindow, const SfxItemSet& rInAttrs )
: SfxTabPage(pWindow ,"ConnectorTabPage" ,"cui/ui/connectortabpage.ui"
,&rInAttrs)
, rOutAttrs(rInAttrs)
@@ -388,7 +388,7 @@ void SvxConnectionPage::Construct()
|*
\************************************************************************/
-SfxTabPage* SvxConnectionPage::Create( Window* pWindow,
+SfxTabPage* SvxConnectionPage::Create( vcl::Window* pWindow,
const SfxItemSet* rAttrs )
{
return( new SvxConnectionPage( pWindow, *rAttrs ) );
diff --git a/cui/source/tabpages/dstribut.cxx b/cui/source/tabpages/dstribut.cxx
index edfbed3dcc9e..86d23299112b 100644
--- a/cui/source/tabpages/dstribut.cxx
+++ b/cui/source/tabpages/dstribut.cxx
@@ -30,7 +30,7 @@
|*
\************************************************************************/
-SvxDistributeDialog::SvxDistributeDialog(Window* pParent,
+SvxDistributeDialog::SvxDistributeDialog(vcl::Window* pParent,
const SfxItemSet& rInAttrs, SvxDistributeHorizontal eHor,
SvxDistributeVertical eVer)
: SfxSingleTabDialog(pParent, rInAttrs, "DistributionDialog",
@@ -47,7 +47,7 @@ SvxDistributeDialog::SvxDistributeDialog(Window* pParent,
|*
\************************************************************************/
-SvxDistributePage::SvxDistributePage(Window* pWindow,
+SvxDistributePage::SvxDistributePage(vcl::Window* pWindow,
const SfxItemSet& rInAttrs, SvxDistributeHorizontal eHor,
SvxDistributeVertical eVer)
: SvxTabPage(pWindow, "DistributionPage", "cui/ui/distributionpage.ui",
@@ -74,13 +74,13 @@ SvxDistributePage::SvxDistributePage(Window* pWindow,
|*
\************************************************************************/
-SfxTabPage* SvxDistributePage::Create(Window* pWindow, const SfxItemSet& rAttrs,
+SfxTabPage* SvxDistributePage::Create(vcl::Window* pWindow, const SfxItemSet& rAttrs,
SvxDistributeHorizontal eHor, SvxDistributeVertical eVer)
{
return new SvxDistributePage(pWindow, rAttrs, eHor, eVer);
}
-void SvxDistributePage::PointChanged(Window* /*pWindow*/, RECT_POINT /*eRP*/)
+void SvxDistributePage::PointChanged(vcl::Window* /*pWindow*/, RECT_POINT /*eRP*/)
{
}
diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx
index dad147e7d54b..0fcd835987ab 100644
--- a/cui/source/tabpages/grfpage.cxx
+++ b/cui/source/tabpages/grfpage.cxx
@@ -48,7 +48,7 @@ static inline long lcl_GetValue( MetricField& rMetric, FieldUnit eUnit )
description: crop graphic
--------------------------------------------------------------------*/
-SvxGrfCropPage::SvxGrfCropPage ( Window *pParent, const SfxItemSet &rSet )
+SvxGrfCropPage::SvxGrfCropPage ( vcl::Window *pParent, const SfxItemSet &rSet )
: SfxTabPage(pParent, "CropPage", "cui/ui/croppage.ui", &rSet)
, pLastCropField(0)
, nOldWidth(0)
@@ -129,7 +129,7 @@ SvxGrfCropPage::~SvxGrfCropPage()
aTimer.Stop();
}
-SfxTabPage* SvxGrfCropPage::Create(Window *pParent, const SfxItemSet *rSet)
+SfxTabPage* SvxGrfCropPage::Create(vcl::Window *pParent, const SfxItemSet *rSet)
{
return new SvxGrfCropPage( pParent, *rSet );
}
@@ -749,7 +749,7 @@ Size SvxGrfCropPage::GetGrfOrigSize( const Graphic& rGrf ) const
/*****************************************************************/
-SvxCropExample::SvxCropExample( Window* pPar, WinBits nStyle )
+SvxCropExample::SvxCropExample( vcl::Window* pPar, WinBits nStyle )
: Window( pPar, nStyle)
, aFrameSize( OutputDevice::LogicToLogic(
Size( CM_1_TO_TWIP / 2, CM_1_TO_TWIP / 2 ),
@@ -765,7 +765,7 @@ Size SvxCropExample::GetOptimalSize() const
return LogicToPixel(Size(78, 78), MAP_APPFONT);
}
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxCropExample(Window *pParent, VclBuilder::stringmap &rMap)
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxCropExample(vcl::Window *pParent, VclBuilder::stringmap &rMap)
{
WinBits nWinStyle = 0;
OString sBorder = VclBuilder::extractCustomProperty(rMap);
diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx
index 37bfe3e0ff8d..e1dcee776491 100644
--- a/cui/source/tabpages/labdlg.cxx
+++ b/cui/source/tabpages/labdlg.cxx
@@ -70,7 +70,7 @@ static const sal_uInt16 pCaptionRanges[] =
0
};
-SvxCaptionTabPage::SvxCaptionTabPage(Window* pParent, const SfxItemSet& rInAttrs)
+SvxCaptionTabPage::SvxCaptionTabPage(vcl::Window* pParent, const SfxItemSet& rInAttrs)
: SfxTabPage(pParent, "CalloutPage", "cui/ui/calloutpage.ui", &rInAttrs)
, nCaptionType(0)
, nGap(0)
@@ -336,7 +336,7 @@ void SvxCaptionTabPage::Reset( const SfxItemSet* )
-SfxTabPage* SvxCaptionTabPage::Create( Window* pWindow,
+SfxTabPage* SvxCaptionTabPage::Create( vcl::Window* pWindow,
const SfxItemSet* rOutAttrs )
{
return( new SvxCaptionTabPage( pWindow, *rOutAttrs ) );
@@ -514,7 +514,7 @@ void SvxCaptionTabPage::FillValueSet()
-SvxCaptionTabDialog::SvxCaptionTabDialog(Window* pParent, const SdrView* pSdrView,
+SvxCaptionTabDialog::SvxCaptionTabDialog(vcl::Window* pParent, const SdrView* pSdrView,
sal_uInt16 nAnchorTypes)
: SfxTabDialog( pParent, "CalloutDialog", "cui/ui/calloutdialog.ui")
, pView(pSdrView)
diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx
index 52788fb317e2..3af840679e2b 100644
--- a/cui/source/tabpages/macroass.cxx
+++ b/cui/source/tabpages/macroass.cxx
@@ -135,7 +135,7 @@ void _SfxMacroTabPage::EnableButtons()
mpImpl->pAssignPB->Enable( false );
}
-_SfxMacroTabPage::_SfxMacroTabPage(Window* pParent, const SfxItemSet& rAttrSet)
+_SfxMacroTabPage::_SfxMacroTabPage(vcl::Window* pParent, const SfxItemSet& rAttrSet)
: SfxTabPage(pParent, "EventAssignPage", "cui/ui/eventassignpage.ui", &rAttrSet)
{
mpImpl = new _SfxMacroTabPage_Impl;
@@ -433,7 +433,7 @@ void _SfxMacroTabPage::FillEvents()
}
}
-SfxMacroTabPage::SfxMacroTabPage(Window* pParent, const Reference< XFrame >& rxDocumentFrame, const SfxItemSet& rSet )
+SfxMacroTabPage::SfxMacroTabPage(vcl::Window* pParent, const Reference< XFrame >& rxDocumentFrame, const SfxItemSet& rSet )
: _SfxMacroTabPage( pParent, rSet )
{
mpImpl->sStrEvent = get<FixedText>("eventft")->GetText();
@@ -456,18 +456,18 @@ SfxMacroTabPage::SfxMacroTabPage(Window* pParent, const Reference< XFrame >& rxD
namespace
{
- SfxMacroTabPage* CreateSfxMacroTabPage( Window* pParent, const SfxItemSet& rAttrSet )
+ SfxMacroTabPage* CreateSfxMacroTabPage( vcl::Window* pParent, const SfxItemSet& rAttrSet )
{
return new SfxMacroTabPage( pParent, NULL, rAttrSet );
}
}
-SfxTabPage* SfxMacroTabPage::Create( Window* pParent, const SfxItemSet* rAttrSet )
+SfxTabPage* SfxMacroTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet )
{
return CreateSfxMacroTabPage(pParent, *rAttrSet);
}
-SfxMacroAssignDlg::SfxMacroAssignDlg(Window* pParent,
+SfxMacroAssignDlg::SfxMacroAssignDlg(vcl::Window* pParent,
const Reference< XFrame >& rxDocumentFrame, const SfxItemSet& rSet)
: SfxSingleTabDialog(pParent, rSet, "EventAssignDialog",
"cui/ui/eventassigndialog.ui")
diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx
index 6104a2a5fdf3..dfeb8fef7cc0 100644
--- a/cui/source/tabpages/measure.cxx
+++ b/cui/source/tabpages/measure.cxx
@@ -60,7 +60,7 @@ static const sal_uInt16 pRanges[] =
|*
\************************************************************************/
-SvxMeasureDialog::SvxMeasureDialog( Window* pParent, const SfxItemSet& rInAttrs,
+SvxMeasureDialog::SvxMeasureDialog( vcl::Window* pParent, const SfxItemSet& rInAttrs,
const SdrView* pSdrView )
: SfxSingleTabDialog(pParent, rInAttrs)
{
@@ -79,7 +79,7 @@ SvxMeasureDialog::SvxMeasureDialog( Window* pParent, const SfxItemSet& rInAttrs,
|*
\************************************************************************/
-SvxMeasurePage::SvxMeasurePage( Window* pWindow, const SfxItemSet& rInAttrs ) :
+SvxMeasurePage::SvxMeasurePage( vcl::Window* pWindow, const SfxItemSet& rInAttrs ) :
SvxTabPage ( pWindow
,"DimensionLinesTabPage"
,"cui/ui/dimensionlinestabpage.ui"
@@ -593,7 +593,7 @@ void SvxMeasurePage::Construct()
|*
\************************************************************************/
-SfxTabPage* SvxMeasurePage::Create( Window* pWindow,
+SfxTabPage* SvxMeasurePage::Create( vcl::Window* pWindow,
const SfxItemSet* rAttrs )
{
return( new SvxMeasurePage( pWindow, *rAttrs ) );
@@ -604,7 +604,7 @@ const sal_uInt16* SvxMeasurePage::GetRanges()
return( pRanges );
}
-void SvxMeasurePage::PointChanged( Window* pWindow, RECT_POINT /*eRP*/ )
+void SvxMeasurePage::PointChanged( vcl::Window* pWindow, RECT_POINT /*eRP*/ )
{
ChangeAttrHdl_Impl( pWindow );
}
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index 6937e0c5cd16..19d42733f858 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -76,7 +76,7 @@ static const sal_uInt16 pRanges[] =
#*
#************************************************************************/
-SvxNumberPreview::SvxNumberPreview(Window* pParent, WinBits nStyle)
+SvxNumberPreview::SvxNumberPreview(vcl::Window* pParent, WinBits nStyle)
: Window(pParent, nStyle)
, mnPos(-1)
, mnChar(0x0)
@@ -89,7 +89,7 @@ SvxNumberPreview::SvxNumberPreview(Window* pParent, WinBits nStyle)
SetBorderStyle( WINDOW_BORDER_MONO );
}
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxNumberPreview(Window *pParent, VclBuilder::stringmap &)
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxNumberPreview(vcl::Window *pParent, VclBuilder::stringmap &)
{
return new SvxNumberPreview(pParent);
}
@@ -235,7 +235,7 @@ void SvxNumberPreview::DataChanged( const DataChangedEvent& rDCEvt )
#define HDL(hdl) LINK( this, SvxNumberFormatTabPage, hdl )
-SvxNumberFormatTabPage::SvxNumberFormatTabPage(Window* pParent,
+SvxNumberFormatTabPage::SvxNumberFormatTabPage(vcl::Window* pParent,
const SfxItemSet& rCoreAttrs)
: SfxTabPage(pParent, "NumberingFormatPage",
"cui/ui/numberingformatpage.ui", &rCoreAttrs)
@@ -375,7 +375,7 @@ const sal_uInt16* SvxNumberFormatTabPage::GetRanges()
#*
#************************************************************************/
-SfxTabPage* SvxNumberFormatTabPage::Create( Window* pParent,
+SfxTabPage* SvxNumberFormatTabPage::Create( vcl::Window* pParent,
const SfxItemSet* rAttrSet )
{
return ( new SvxNumberFormatTabPage( pParent, *rAttrSet ) );
@@ -1664,7 +1664,7 @@ bool SvxNumberFormatTabPage::PreNotify( NotifyEvent& rNEvt )
{
if(rNEvt.GetType()==EVENT_LOSEFOCUS)
{
- if ( rNEvt.GetWindow() == dynamic_cast< Window* >( m_pEdComment ) && !m_pEdComment->IsVisible() )
+ if ( rNEvt.GetWindow() == dynamic_cast< vcl::Window* >( m_pEdComment ) && !m_pEdComment->IsVisible() )
{
pLastActivWindow = NULL;
}
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 2e087739a05a..558536153a8d 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -173,7 +173,7 @@ static vcl::Font& lcl_GetDefaultBulletFont()
return aDefBulletFont;
}
-SvxSingleNumPickTabPage::SvxSingleNumPickTabPage(Window* pParent,
+SvxSingleNumPickTabPage::SvxSingleNumPickTabPage(vcl::Window* pParent,
const SfxItemSet& rSet)
: SfxTabPage(pParent, "PickNumberingPage", "cui/ui/picknumberingpage.ui", &rSet)
, pActNum(0)
@@ -223,7 +223,7 @@ SvxSingleNumPickTabPage::~SvxSingleNumPickTabPage()
delete pSaveNum;
}
-SfxTabPage* SvxSingleNumPickTabPage::Create( Window* pParent,
+SfxTabPage* SvxSingleNumPickTabPage::Create( vcl::Window* pParent,
const SfxItemSet* rAttrSet)
{
return new SvxSingleNumPickTabPage(pParent, *rAttrSet);
@@ -361,7 +361,7 @@ IMPL_LINK_NOARG(SvxSingleNumPickTabPage, DoubleClickHdl_Impl)
}
-SvxBulletPickTabPage::SvxBulletPickTabPage(Window* pParent,
+SvxBulletPickTabPage::SvxBulletPickTabPage(vcl::Window* pParent,
const SfxItemSet& rSet)
: SfxTabPage(pParent, "PickBulletPage", "cui/ui/pickbulletpage.ui", &rSet)
, pActNum(0)
@@ -384,7 +384,7 @@ SvxBulletPickTabPage::~SvxBulletPickTabPage()
delete pSaveNum;
}
-SfxTabPage* SvxBulletPickTabPage::Create( Window* pParent,
+SfxTabPage* SvxBulletPickTabPage::Create( vcl::Window* pParent,
const SfxItemSet* rAttrSet)
{
return new SvxBulletPickTabPage(pParent, *rAttrSet);
@@ -524,7 +524,7 @@ void SvxBulletPickTabPage::PageCreated(const SfxAllItemSet& aSet)
}
-SvxNumPickTabPage::SvxNumPickTabPage(Window* pParent,
+SvxNumPickTabPage::SvxNumPickTabPage(vcl::Window* pParent,
const SfxItemSet& rSet)
: SfxTabPage(pParent, "PickOutlinePage", "cui/ui/pickoutlinepage.ui", &rSet)
, pActNum(0)
@@ -581,7 +581,7 @@ SvxNumPickTabPage::~SvxNumPickTabPage()
delete pSaveNum;
}
-SfxTabPage* SvxNumPickTabPage::Create( Window* pParent,
+SfxTabPage* SvxNumPickTabPage::Create( vcl::Window* pParent,
const SfxItemSet* rAttrSet)
{
return new SvxNumPickTabPage(pParent, *rAttrSet);
@@ -772,7 +772,7 @@ void SvxNumPickTabPage::PageCreated(const SfxAllItemSet& aSet)
SetCharFmtNames( pNumCharFmt->GetValue(),pBulletCharFmt->GetValue());
}
-SvxBitmapPickTabPage::SvxBitmapPickTabPage(Window* pParent,
+SvxBitmapPickTabPage::SvxBitmapPickTabPage(vcl::Window* pParent,
const SfxItemSet& rSet)
: SfxTabPage(pParent, "PickGraphicPage", "cui/ui/pickgraphicpage.ui", &rSet)
, pActNum(0)
@@ -822,7 +822,7 @@ SvxBitmapPickTabPage::~SvxBitmapPickTabPage()
delete pSaveNum;
}
-SfxTabPage* SvxBitmapPickTabPage::Create( Window* pParent,
+SfxTabPage* SvxBitmapPickTabPage::Create( vcl::Window* pParent,
const SfxItemSet* rAttrSet)
{
return new SvxBitmapPickTabPage(pParent, *rAttrSet);
@@ -1021,7 +1021,7 @@ void SvxNumOptionsTabPage::GetI18nNumbering( ListBox& rFmtLB, sal_uInt16 nDoNotR
}
// tabpage numbering options
-SvxNumOptionsTabPage::SvxNumOptionsTabPage(Window* pParent,
+SvxNumOptionsTabPage::SvxNumOptionsTabPage(vcl::Window* pParent,
const SfxItemSet& rSet)
: SfxTabPage(pParent, "NumberingOptionsPage", "cui/ui/numberingoptionspage.ui", &rSet)
, pActNum(0)
@@ -1141,7 +1141,7 @@ void SvxNumOptionsTabPage::SetMetric(FieldUnit eMetric)
m_pHeightMF->SetUnit( eMetric );
}
-SfxTabPage* SvxNumOptionsTabPage::Create( Window* pParent,
+SfxTabPage* SvxNumOptionsTabPage::Create( vcl::Window* pParent,
const SfxItemSet* rAttrSet)
{
return new SvxNumOptionsTabPage(pParent, *rAttrSet);
@@ -2265,7 +2265,7 @@ static sal_uInt16 lcl_DrawBullet(VirtualDevice* pVDev,
return nRet;
}
-SvxNumberingPreview::SvxNumberingPreview(Window* pParent, WinBits nWinBits)
+SvxNumberingPreview::SvxNumberingPreview(vcl::Window* pParent, WinBits nWinBits)
: Window(pParent, nWinBits)
, pActNum(0)
, nPageWidth(0)
@@ -2276,7 +2276,7 @@ SvxNumberingPreview::SvxNumberingPreview(Window* pParent, WinBits nWinBits)
SetBorderStyle(WINDOW_BORDER_MONO);
}
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxNumberingPreview(Window *pParent, VclBuilder::stringmap &)
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxNumberingPreview(vcl::Window *pParent, VclBuilder::stringmap &)
{
return new SvxNumberingPreview(pParent, WB_BORDER);
}
@@ -2580,7 +2580,7 @@ void SvxNumberingPreview::Paint( const Rectangle& /*rRect*/ )
//dialog to this one, except with a different preview window impl.
//TODO, determine if SwNumPositionTabPage and SvxNumPositionTabPage can be
//merged
-SvxNumPositionTabPage::SvxNumPositionTabPage(Window* pParent,
+SvxNumPositionTabPage::SvxNumPositionTabPage(vcl::Window* pParent,
const SfxItemSet& rSet)
: SfxTabPage(pParent, "NumberingPositionPage", "cui/ui/numberingpositionpage.ui", &rSet)
, pActNum(0)
@@ -3093,7 +3093,7 @@ void SvxNumPositionTabPage::ShowControlsDependingOnPosAndSpaceMode()
m_pIndentAtMF->Show( bLabelAlignmentPosAndSpaceModeActive );
}
-SfxTabPage* SvxNumPositionTabPage::Create( Window* pParent,
+SfxTabPage* SvxNumPositionTabPage::Create( vcl::Window* pParent,
const SfxItemSet* rAttrSet)
{
return new SvxNumPositionTabPage(pParent, *rAttrSet);
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index 56877bf9dba8..97b662be8846 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -171,12 +171,12 @@ const sal_uInt16* SvxPageDescPage::GetRanges()
-SfxTabPage* SvxPageDescPage::Create( Window* pParent, const SfxItemSet* rSet )
+SfxTabPage* SvxPageDescPage::Create( vcl::Window* pParent, const SfxItemSet* rSet )
{
return new SvxPageDescPage( pParent, *rSet );
}
-SvxPageDescPage::SvxPageDescPage( Window* pParent, const SfxItemSet& rAttr ) :
+SvxPageDescPage::SvxPageDescPage( vcl::Window* pParent, const SfxItemSet& rAttr ) :
SfxTabPage( pParent, "PageFormatPage", "cui/ui/pageformatpage.ui", &rAttr ),
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index a205605d183a..cf984bedbb22 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -194,7 +194,7 @@ IMPL_LINK_NOARG(SvxStdParagraphTabPage, ELRLoseFocusHdl)
return 0;
}
-SfxTabPage* SvxStdParagraphTabPage::Create( Window* pParent, const SfxItemSet* rSet)
+SfxTabPage* SvxStdParagraphTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet)
{
return new SvxStdParagraphTabPage( pParent, *rSet );
}
@@ -618,7 +618,7 @@ int SvxStdParagraphTabPage::DeactivatePage( SfxItemSet* _pSet )
return LEAVE_PAGE;
}
-SvxStdParagraphTabPage::SvxStdParagraphTabPage( Window* pParent, const SfxItemSet& rAttr ) :
+SvxStdParagraphTabPage::SvxStdParagraphTabPage( vcl::Window* pParent, const SfxItemSet& rAttr ) :
SfxTabPage( pParent, "ParaIndentSpacing","cui/ui/paraindentspacing.ui", &rAttr ),
nAbst ( MAX_DURCH ),
@@ -964,7 +964,7 @@ void SvxStdParagraphTabPage::PageCreated(const SfxAllItemSet& aSet)
#define LASTLINECOUNT_OLD 3
#define LASTLINECOUNT_NEW 4
-SvxParaAlignTabPage::SvxParaAlignTabPage( Window* pParent, const SfxItemSet& rSet )
+SvxParaAlignTabPage::SvxParaAlignTabPage( vcl::Window* pParent, const SfxItemSet& rSet )
: SfxTabPage(pParent, "ParaAlignPage", "cui/ui/paragalignpage.ui",&rSet)
{
@@ -1046,7 +1046,7 @@ int SvxParaAlignTabPage::DeactivatePage( SfxItemSet* _pSet )
return LEAVE_PAGE;
}
-SfxTabPage* SvxParaAlignTabPage::Create( Window* pParent, const SfxItemSet* rSet )
+SfxTabPage* SvxParaAlignTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet )
{
return new SvxParaAlignTabPage(pParent, *rSet);
}
@@ -1324,7 +1324,7 @@ void SvxParaAlignTabPage::PageCreated (const SfxAllItemSet& aSet)
EnableJustifyExt();
}
-SfxTabPage* SvxExtParagraphTabPage::Create( Window* pParent,
+SfxTabPage* SvxExtParagraphTabPage::Create( vcl::Window* pParent,
const SfxItemSet* rSet )
{
return new SvxExtParagraphTabPage( pParent, *rSet );
@@ -1829,7 +1829,7 @@ void SvxExtParagraphTabPage::DisablePageBreak()
m_pPagenumEdit->Enable(false);
}
-SvxExtParagraphTabPage::SvxExtParagraphTabPage( Window* pParent, const SfxItemSet& rAttr ) :
+SvxExtParagraphTabPage::SvxExtParagraphTabPage( vcl::Window* pParent, const SfxItemSet& rAttr ) :
SfxTabPage( pParent, "TextFlowPage","cui/ui/textflowpage.ui", &rAttr ),
bPageBreak ( true ),
@@ -2119,7 +2119,7 @@ void SvxExtParagraphTabPage::PageCreated(const SfxAllItemSet& aSet)
DisablePageBreak();
}
-SvxAsianTabPage::SvxAsianTabPage( Window* pParent, const SfxItemSet& rSet ) :
+SvxAsianTabPage::SvxAsianTabPage( vcl::Window* pParent, const SfxItemSet& rSet ) :
SfxTabPage(pParent, "AsianTypography","cui/ui/asiantypography.ui", &rSet)
{
@@ -2138,7 +2138,7 @@ SvxAsianTabPage::~SvxAsianTabPage()
{
}
-SfxTabPage* SvxAsianTabPage::Create( Window* pParent, const SfxItemSet* rSet )
+SfxTabPage* SvxAsianTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet )
{
return new SvxAsianTabPage(pParent, *rSet);
}
diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx
index ca0cff406751..ffd6bd3207c2 100644
--- a/cui/source/tabpages/swpossizetabpage.cxx
+++ b/cui/source/tabpages/swpossizetabpage.cxx
@@ -502,7 +502,7 @@ static sal_uLong lcl_GetLBRelationsForStrID( const FrmMap* _pMap,
return nLBRelations;
}
-SvxSwPosSizeTabPage::SvxSwPosSizeTabPage(Window* pParent, const SfxItemSet& rInAttrs)
+SvxSwPosSizeTabPage::SvxSwPosSizeTabPage(vcl::Window* pParent, const SfxItemSet& rInAttrs)
: SfxTabPage(pParent, "SwPosSizePage", "cui/ui/swpossizepage.ui", &rInAttrs)
, m_pVMap(0)
, m_pHMap(0)
@@ -693,7 +693,7 @@ SvxSwPosSizeTabPage::~SvxSwPosSizeTabPage()
{
}
-SfxTabPage* SvxSwPosSizeTabPage::Create( Window* pParent, const SfxItemSet* rSet)
+SfxTabPage* SvxSwPosSizeTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet)
{
return new SvxSwPosSizeTabPage(pParent, *rSet);
}
diff --git a/cui/source/tabpages/tabarea.cxx b/cui/source/tabpages/tabarea.cxx
index 3d3b3f82a17b..e5ab37b6f16f 100644
--- a/cui/source/tabpages/tabarea.cxx
+++ b/cui/source/tabpages/tabarea.cxx
@@ -37,7 +37,7 @@
SvxAreaTabDialog::SvxAreaTabDialog
(
- Window* pParent,
+ vcl::Window* pParent,
const SfxItemSet* pAttr,
SdrModel* pModel,
bool bShadow
diff --git a/cui/source/tabpages/tabline.cxx b/cui/source/tabpages/tabline.cxx
index 01ac68b57cc3..c473966340ad 100644
--- a/cui/source/tabpages/tabline.cxx
+++ b/cui/source/tabpages/tabline.cxx
@@ -35,7 +35,7 @@
SvxLineTabDialog::SvxLineTabDialog
(
- Window* pParent,
+ vcl::Window* pParent,
const SfxItemSet* pAttr,
SdrModel* pModel,
const SdrObject* pSdrObj,
diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx
index 0f528e4e8a17..de67049d9e11 100644
--- a/cui/source/tabpages/tabstpge.cxx
+++ b/cui/source/tabpages/tabstpge.cxx
@@ -36,7 +36,7 @@
// class TabWin_Impl -----------------------------------------------------
-class TabWin_Impl : public Window
+class TabWin_Impl : public vcl::Window
{
SvxTabulatorTabPage* mpPage;
private:
@@ -44,7 +44,7 @@ private:
public:
- TabWin_Impl(Window* pParent, WinBits nBits)
+ TabWin_Impl(vcl::Window* pParent, WinBits nBits)
: Window(pParent, nBits)
, mpPage(0)
, nTabStyle(0)
@@ -57,7 +57,7 @@ public:
void SetTabStyle(sal_uInt16 nStyle) {nTabStyle = nStyle; }
};
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeTabWin_Impl(Window *pParent, VclBuilder::stringmap &)
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeTabWin_Impl(vcl::Window *pParent, VclBuilder::stringmap &)
{
return new TabWin_Impl(pParent, 0);
}
@@ -96,7 +96,7 @@ void TabWin_Impl::Paint( const Rectangle& )
// class SvxTabulatorTabPage ---------------------------------------------
-SvxTabulatorTabPage::SvxTabulatorTabPage( Window* pParent, const SfxItemSet& rAttr ):
+SvxTabulatorTabPage::SvxTabulatorTabPage( vcl::Window* pParent, const SfxItemSet& rAttr ):
SfxTabPage( pParent, "ParagraphTabsPage","cui/ui/paratabspage.ui", &rAttr ),
@@ -259,7 +259,7 @@ bool SvxTabulatorTabPage::FillItemSet( SfxItemSet* rSet )
-SfxTabPage* SvxTabulatorTabPage::Create( Window* pParent,
+SfxTabPage* SvxTabulatorTabPage::Create( vcl::Window* pParent,
const SfxItemSet* rSet)
{
return ( new SvxTabulatorTabPage( pParent, *rSet ) );
diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx
index 4ba2bb7c623f..4e1761d0a18d 100644
--- a/cui/source/tabpages/textanim.cxx
+++ b/cui/source/tabpages/textanim.cxx
@@ -41,7 +41,7 @@ static const sal_uInt16 pRanges[] =
|*
\************************************************************************/
-SvxTextTabDialog::SvxTextTabDialog( Window* pParent,
+SvxTextTabDialog::SvxTextTabDialog( vcl::Window* pParent,
const SfxItemSet* pAttr,
const SdrView* pSdrView ) :
SfxTabDialog ( pParent
@@ -76,7 +76,7 @@ void SvxTextTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
|*
\************************************************************************/
-SvxTextAnimationPage::SvxTextAnimationPage( Window* pWindow, const SfxItemSet& rInAttrs ) :
+SvxTextAnimationPage::SvxTextAnimationPage( vcl::Window* pWindow, const SfxItemSet& rInAttrs ) :
SfxTabPage ( pWindow
,"TextAnimation"
,"cui/ui/textanimtabpage.ui"
@@ -450,7 +450,7 @@ const sal_uInt16* SvxTextAnimationPage::GetRanges()
|*
\************************************************************************/
-SfxTabPage* SvxTextAnimationPage::Create( Window* pWindow,
+SfxTabPage* SvxTextAnimationPage::Create( vcl::Window* pWindow,
const SfxItemSet* rAttrs )
{
return( new SvxTextAnimationPage( pWindow, *rAttrs ) );
diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx
index d97cca54836a..3f74020f47c6 100644
--- a/cui/source/tabpages/textattr.cxx
+++ b/cui/source/tabpages/textattr.cxx
@@ -53,7 +53,7 @@ static const sal_uInt16 pRanges[] =
|* dialog (page) for copying objects
|*
\************************************************************************/
-SvxTextAttrPage::SvxTextAttrPage(Window* pWindow, const SfxItemSet& rInAttrs)
+SvxTextAttrPage::SvxTextAttrPage(vcl::Window* pWindow, const SfxItemSet& rInAttrs)
: SvxTabPage(pWindow,"TextAttributesPage","cui/ui/textattrtabpage.ui", rInAttrs)
, rOutAttrs(rInAttrs)
, pView(NULL)
@@ -520,7 +520,7 @@ void SvxTextAttrPage::Construct()
|*
\************************************************************************/
-SfxTabPage* SvxTextAttrPage::Create( Window* pWindow,
+SfxTabPage* SvxTextAttrPage::Create( vcl::Window* pWindow,
const SfxItemSet* rAttrs )
{
return( new SvxTextAttrPage( pWindow, *rAttrs ) );
@@ -533,7 +533,7 @@ const sal_uInt16* SvxTextAttrPage::GetRanges()
/** Check whether we have to uncheck the "Full width" check box.
*/
-void SvxTextAttrPage::PointChanged( Window*, RECT_POINT eRP )
+void SvxTextAttrPage::PointChanged( vcl::Window*, RECT_POINT eRP )
{
if (m_pTsbFullWidth->GetState() == TRISTATE_TRUE)
{
diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index 698d0a5de0ab..0dfd93040826 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -224,7 +224,7 @@ void SvxTransparenceTabPage::SetControlState_Impl(XGradientStyle eXGS)
}
}
-SvxTransparenceTabPage::SvxTransparenceTabPage(Window* pParent, const SfxItemSet& rInAttrs)
+SvxTransparenceTabPage::SvxTransparenceTabPage(vcl::Window* pParent, const SfxItemSet& rInAttrs)
: SvxTabPage ( pParent,
"TransparencyTabPage",
"cui/ui/transparencytabpage.ui",
@@ -289,7 +289,7 @@ void SvxTransparenceTabPage::Construct()
{
}
-SfxTabPage* SvxTransparenceTabPage::Create(Window* pWindow, const SfxItemSet* rAttrs)
+SfxTabPage* SvxTransparenceTabPage::Create(vcl::Window* pWindow, const SfxItemSet* rAttrs)
{
return(new SvxTransparenceTabPage(pWindow, *rAttrs));
}
@@ -486,7 +486,7 @@ int SvxTransparenceTabPage::DeactivatePage(SfxItemSet* _pSet)
return(LEAVE_PAGE);
}
-void SvxTransparenceTabPage::PointChanged(Window* , RECT_POINT eRcPt)
+void SvxTransparenceTabPage::PointChanged(vcl::Window* , RECT_POINT eRcPt)
{
eRP = eRcPt;
}
@@ -579,7 +579,7 @@ void SvxTransparenceTabPage::PageCreated(const SfxAllItemSet& aSet)
|*
\************************************************************************/
-SvxAreaTabPage::SvxAreaTabPage( Window* pParent, const SfxItemSet& rInAttrs ) :
+SvxAreaTabPage::SvxAreaTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ) :
SvxTabPage( pParent,
"AreaTabPage",
@@ -1756,7 +1756,7 @@ void SvxAreaTabPage::Reset( const SfxItemSet* rAttrs )
-SfxTabPage* SvxAreaTabPage::Create( Window* pWindow,
+SfxTabPage* SvxAreaTabPage::Create( vcl::Window* pWindow,
const SfxItemSet* rAttrs )
{
return( new SvxAreaTabPage( pWindow, *rAttrs ) );
@@ -2365,7 +2365,7 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ClickScaleHdl_Impl)
-void SvxAreaTabPage::PointChanged( Window* pWindow, RECT_POINT eRcPt )
+void SvxAreaTabPage::PointChanged( vcl::Window* pWindow, RECT_POINT eRcPt )
{
eRP = eRcPt;
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index 42915cd6e848..b6b9280235dd 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -50,7 +50,7 @@
using namespace com::sun::star;
-SvxBitmapTabPage::SvxBitmapTabPage( Window* pParent, const SfxItemSet& rInAttrs) :
+SvxBitmapTabPage::SvxBitmapTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs) :
SvxTabPage ( pParent,
"BitmapTabPage",
@@ -291,7 +291,7 @@ void SvxBitmapTabPage::Reset( const SfxItemSet* )
-SfxTabPage* SvxBitmapTabPage::Create( Window* pWindow,
+SfxTabPage* SvxBitmapTabPage::Create( vcl::Window* pWindow,
const SfxItemSet* rSet )
{
return new SvxBitmapTabPage( pWindow, *rSet );
@@ -949,7 +949,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ChangeBackgrndColorHdl_Impl)
-void SvxBitmapTabPage::PointChanged( Window* pWindow, RECT_POINT )
+void SvxBitmapTabPage::PointChanged( vcl::Window* pWindow, RECT_POINT )
{
if( pWindow == m_pCtlPixel )
{
@@ -967,7 +967,7 @@ void SvxBitmapTabPage::PointChanged( Window* pWindow, RECT_POINT )
-Window* SvxBitmapTabPage::GetParentLabeledBy( const Window* pLabeled ) const
+vcl::Window* SvxBitmapTabPage::GetParentLabeledBy( const vcl::Window* pLabeled ) const
{
if (pLabeled == m_pLbBitmaps)
return const_cast<FixedText*>(m_pLbBitmapsHidden);
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index 7d2def85d888..2fc15158a11a 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -300,7 +300,7 @@ struct SvxColorTabPageShadow
-SvxColorTabPage::SvxColorTabPage(Window* pParent, const SfxItemSet& rInAttrs)
+SvxColorTabPage::SvxColorTabPage(vcl::Window* pParent, const SfxItemSet& rInAttrs)
: SfxTabPage(pParent, "ColorPage", "cui/ui/colorpage.ui", &rInAttrs)
, meType( XCOLOR_LIST )
, mpXPool( (XOutdevItemPool*) rInAttrs.GetPool() )
@@ -619,7 +619,7 @@ void SvxColorTabPage::Reset( const SfxItemSet* rSet )
-SfxTabPage* SvxColorTabPage::Create( Window* pWindow,
+SfxTabPage* SvxColorTabPage::Create( vcl::Window* pWindow,
const SfxItemSet* rOutAttrs )
{
return( new SvxColorTabPage( pWindow, *rOutAttrs ) );
@@ -657,7 +657,7 @@ IMPL_LINK_NOARG(SvxColorTabPage, ModifiedHdl_Impl)
IMPL_LINK_NOARG(SvxColorTabPage, ClickAddHdl_Impl)
{
- Window *pWindow = this;
+ vcl::Window *pWindow = this;
while( pWindow )
{
pWindow = pWindow->GetParent();
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index bc1050e54a37..085ba9ce144f 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -46,7 +46,7 @@ using namespace com::sun::star;
SvxGradientTabPage::SvxGradientTabPage
(
- Window* pParent,
+ vcl::Window* pParent,
const SfxItemSet& rInAttrs
) :
SfxTabPage ( pParent, "GradientPage", "cui/ui/gradientpage.ui", &rInAttrs ),
@@ -366,7 +366,7 @@ void SvxGradientTabPage::Reset( const SfxItemSet* )
-SfxTabPage* SvxGradientTabPage::Create( Window* pWindow,
+SfxTabPage* SvxGradientTabPage::Create( vcl::Window* pWindow,
const SfxItemSet* rOutAttrs )
{
return new SvxGradientTabPage( pWindow, *rOutAttrs );
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index 85768a5cb066..ee0c8a2a666f 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -48,7 +48,7 @@ using namespace com::sun::star;
SvxHatchTabPage::SvxHatchTabPage
(
- Window* pParent,
+ vcl::Window* pParent,
const SfxItemSet& rInAttrs
) :
@@ -339,7 +339,7 @@ void SvxHatchTabPage::Reset( const SfxItemSet* rSet )
-SfxTabPage* SvxHatchTabPage::Create( Window* pWindow,
+SfxTabPage* SvxHatchTabPage::Create( vcl::Window* pWindow,
const SfxItemSet* rSet )
{
return new SvxHatchTabPage( pWindow, *rSet );
@@ -799,7 +799,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickSaveHdl_Impl)
-void SvxHatchTabPage::PointChanged( Window* pWindow, RECT_POINT eRcPt )
+void SvxHatchTabPage::PointChanged( vcl::Window* pWindow, RECT_POINT eRcPt )
{
if( pWindow == m_pCtlAngle )
{
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index 20efb0e3b754..5da506f3d745 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -76,7 +76,7 @@ static const sal_uInt16 pLineRanges[] =
SvxLineTabPage::SvxLineTabPage
(
- Window* pParent,
+ vcl::Window* pParent,
const SfxItemSet& rInAttrs
) :
SvxTabPage ( pParent
@@ -1483,7 +1483,7 @@ void SvxLineTabPage::Reset( const SfxItemSet* rAttrs )
-SfxTabPage* SvxLineTabPage::Create( Window* pWindow,
+SfxTabPage* SvxLineTabPage::Create( vcl::Window* pWindow,
const SfxItemSet* rAttrs )
{
return( new SvxLineTabPage( pWindow, *rAttrs ) );
@@ -1673,7 +1673,7 @@ IMPL_LINK_NOARG(SvxLineTabPage, ChangeTransparentHdl_Impl)
-void SvxLineTabPage::PointChanged( Window*, RECT_POINT eRcPt )
+void SvxLineTabPage::PointChanged( vcl::Window*, RECT_POINT eRcPt )
{
eRP = eRcPt;
}
diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx
index 8d8583eabbce..cf945d689375 100644
--- a/cui/source/tabpages/tplnedef.cxx
+++ b/cui/source/tabpages/tplnedef.cxx
@@ -48,7 +48,7 @@
SvxLineDefTabPage::SvxLineDefTabPage
(
- Window* pParent,
+ vcl::Window* pParent,
const SfxItemSet& rInAttrs
) :
@@ -320,7 +320,7 @@ void SvxLineDefTabPage::Reset( const SfxItemSet* rAttrs )
-SfxTabPage* SvxLineDefTabPage::Create( Window* pWindow, const SfxItemSet* rOutAttrs )
+SfxTabPage* SvxLineDefTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rOutAttrs )
{
return( new SvxLineDefTabPage( pWindow, *rOutAttrs ) );
}
diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx
index 94cf7635bc3f..a71ce58192b1 100644
--- a/cui/source/tabpages/tplneend.cxx
+++ b/cui/source/tabpages/tplneend.cxx
@@ -50,7 +50,7 @@
SvxLineEndDefTabPage::SvxLineEndDefTabPage
(
- Window* pParent,
+ vcl::Window* pParent,
const SfxItemSet& rInAttrs
) :
@@ -264,7 +264,7 @@ void SvxLineEndDefTabPage::Reset( const SfxItemSet* )
-SfxTabPage* SvxLineEndDefTabPage::Create( Window* pWindow, const SfxItemSet* rSet )
+SfxTabPage* SvxLineEndDefTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rSet )
{
return( new SvxLineEndDefTabPage( pWindow, *rSet ) );
}
diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx
index 97ba83597c3d..7bd6076eb6c9 100644
--- a/cui/source/tabpages/tpshadow.cxx
+++ b/cui/source/tabpages/tpshadow.cxx
@@ -45,7 +45,7 @@ static const sal_uInt16 pShadowRanges[] =
0
};
-SvxShadowTabPage::SvxShadowTabPage( Window* pParent, const SfxItemSet& rInAttrs ) :
+SvxShadowTabPage::SvxShadowTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ) :
SvxTabPage ( pParent,
"ShadowTabPage",
@@ -456,7 +456,7 @@ void SvxShadowTabPage::Reset( const SfxItemSet* rAttrs )
-SfxTabPage* SvxShadowTabPage::Create( Window* pWindow,
+SfxTabPage* SvxShadowTabPage::Create( vcl::Window* pWindow,
const SfxItemSet* rAttrs )
{
return( new SvxShadowTabPage( pWindow, *rAttrs ) );
@@ -533,7 +533,7 @@ IMPL_LINK_NOARG(SvxShadowTabPage, ModifyShadowHdl_Impl)
-void SvxShadowTabPage::PointChanged( Window* pWindow, RECT_POINT eRcPt )
+void SvxShadowTabPage::PointChanged( vcl::Window* pWindow, RECT_POINT eRcPt )
{
eRP = eRcPt;
diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx
index 0245dcf1ba59..c6273945c7cb 100644
--- a/cui/source/tabpages/transfrm.cxx
+++ b/cui/source/tabpages/transfrm.cxx
@@ -102,7 +102,7 @@ static void lcl_ScaleRect(basegfx::B2DRange& rRange, const Fraction aUIScale)
|*
\************************************************************************/
-SvxTransformTabDialog::SvxTransformTabDialog( Window* pParent, const SfxItemSet* pAttr,
+SvxTransformTabDialog::SvxTransformTabDialog( vcl::Window* pParent, const SfxItemSet* pAttr,
const SdrView* pSdrView, sal_uInt16 nAnchorTypes )
: SfxTabDialog( pParent
,"PositionAndSizeDialog"
@@ -197,7 +197,7 @@ void SvxTransformTabDialog::SetValidateFramePosLink(const Link& rLink)
|* angle and the rotation angle of the graphic objects
|*
\************************************************************************/
-SvxAngleTabPage::SvxAngleTabPage(Window* pParent, const SfxItemSet& rInAttrs)
+SvxAngleTabPage::SvxAngleTabPage(vcl::Window* pParent, const SfxItemSet& rInAttrs)
: SvxTabPage( pParent,"Rotation","cui/ui/rotationtabpage.ui", rInAttrs)
, rOutAttrs(rInAttrs)
, pView(NULL)
@@ -330,7 +330,7 @@ void SvxAngleTabPage::Reset(const SfxItemSet* rAttrs)
-SfxTabPage* SvxAngleTabPage::Create( Window* pWindow, const SfxItemSet* rSet)
+SfxTabPage* SvxAngleTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rSet)
{
return(new SvxAngleTabPage(pWindow, *rSet));
}
@@ -362,7 +362,7 @@ int SvxAngleTabPage::DeactivatePage( SfxItemSet* _pSet )
-void SvxAngleTabPage::PointChanged(Window* pWindow, RECT_POINT eRP)
+void SvxAngleTabPage::PointChanged(vcl::Window* pWindow, RECT_POINT eRP)
{
if(pWindow == m_pCtlRect)
{
@@ -431,7 +431,7 @@ void SvxAngleTabPage::PointChanged(Window* pWindow, RECT_POINT eRP)
|* dialog for changing slant and corner radius
|*
\************************************************************************/
-SvxSlantTabPage::SvxSlantTabPage(Window* pParent, const SfxItemSet& rInAttrs)
+SvxSlantTabPage::SvxSlantTabPage(vcl::Window* pParent, const SfxItemSet& rInAttrs)
: SvxTabPage( pParent,"SlantAndCornerRadius","cui/ui/slantcornertabpage.ui",
rInAttrs)
, rOutAttrs(rInAttrs)
@@ -564,7 +564,7 @@ void SvxSlantTabPage::Reset(const SfxItemSet* rAttrs)
-SfxTabPage* SvxSlantTabPage::Create( Window* pWindow, const SfxItemSet* rOutAttrs )
+SfxTabPage* SvxSlantTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rOutAttrs )
{
return( new SvxSlantTabPage( pWindow, *rOutAttrs ) );
}
@@ -603,7 +603,7 @@ int SvxSlantTabPage::DeactivatePage( SfxItemSet* _pSet )
-void SvxSlantTabPage::PointChanged( Window* , RECT_POINT )
+void SvxSlantTabPage::PointChanged( vcl::Window* , RECT_POINT )
{
}
@@ -612,7 +612,7 @@ void SvxSlantTabPage::PointChanged( Window* , RECT_POINT )
|* Dialog for changing position and size of graphic objects
|*
\************************************************************************/
-SvxPositionSizeTabPage::SvxPositionSizeTabPage(Window* pParent, const SfxItemSet& rInAttrs)
+SvxPositionSizeTabPage::SvxPositionSizeTabPage(vcl::Window* pParent, const SfxItemSet& rInAttrs)
: SvxTabPage(pParent,"PositionAndSize","cui/ui/possizetabpage.ui", rInAttrs)
, mrOutAttrs(rInAttrs)
, mpView(NULL)
@@ -1003,7 +1003,7 @@ void SvxPositionSizeTabPage::Reset( const SfxItemSet* )
-SfxTabPage* SvxPositionSizeTabPage::Create( Window* pWindow, const SfxItemSet* rOutAttrs )
+SfxTabPage* SvxPositionSizeTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rOutAttrs )
{
return( new SvxPositionSizeTabPage( pWindow, *rOutAttrs ) );
}
@@ -1349,7 +1349,7 @@ void SvxPositionSizeTabPage::GetTopLeftPosition(double& rfX, double& rfY, const
-void SvxPositionSizeTabPage::PointChanged( Window* pWindow, RECT_POINT eRP )
+void SvxPositionSizeTabPage::PointChanged( vcl::Window* pWindow, RECT_POINT eRP )
{
if( pWindow == m_pCtlPos )
{
diff --git a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
index 136290f8d8d0..c643e8042942 100644
--- a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
+++ b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
@@ -126,7 +126,7 @@ namespace dbmm
};
// MacroMigrationDialog
- MacroMigrationDialog::MacroMigrationDialog(Window* _pParent, const Reference<XComponentContext>& _rContext,
+ MacroMigrationDialog::MacroMigrationDialog(vcl::Window* _pParent, const Reference<XComponentContext>& _rContext,
const Reference< XOfficeDatabaseDocument >& _rxDocument)
: MacroMigrationDialog_Base(_pParent)
, m_pData( new MacroMigrationDialog_Data( _rContext, _rxDocument ) )
diff --git a/dbaccess/source/ext/macromigration/macromigrationdialog.hxx b/dbaccess/source/ext/macromigration/macromigrationdialog.hxx
index 9db62481463f..b5ee3d1be704 100644
--- a/dbaccess/source/ext/macromigration/macromigrationdialog.hxx
+++ b/dbaccess/source/ext/macromigration/macromigrationdialog.hxx
@@ -36,7 +36,7 @@ namespace dbmm
{
public:
MacroMigrationDialog(
- Window* _pParent,
+ vcl::Window* _pParent,
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rContext,
const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XOfficeDatabaseDocument >& _rxDocument
);
diff --git a/dbaccess/source/ext/macromigration/macromigrationpages.cxx b/dbaccess/source/ext/macromigration/macromigrationpages.cxx
index 04c9cc7aaf73..3a2f559fdab8 100644
--- a/dbaccess/source/ext/macromigration/macromigrationpages.cxx
+++ b/dbaccess/source/ext/macromigration/macromigrationpages.cxx
@@ -45,7 +45,7 @@ namespace dbmm
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::frame::XModel;
- MacroMigrationPage::MacroMigrationPage(Window *pParent, const OString& rID, const OUString& rUIXMLDescription)
+ MacroMigrationPage::MacroMigrationPage(vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription)
: MacroMigrationPage_Base(pParent, rID, rUIXMLDescription)
{
}
@@ -61,7 +61,7 @@ namespace dbmm
}
// PreparationPage
- PreparationPage::PreparationPage(Window *pParent)
+ PreparationPage::PreparationPage(vcl::Window *pParent)
: MacroMigrationPage(pParent, "PreparePage" ,"dbaccess/ui/preparepage.ui")
{
get(m_pCloseDocError, "closedocerror");
@@ -162,7 +162,7 @@ namespace dbmm
}
// ProgressPage
- ProgressPage::ProgressPage(Window* pParent)
+ ProgressPage::ProgressPage(vcl::Window* pParent)
: MacroMigrationPage(pParent, "MigratePage" ,"dbaccess/ui/migratepage.ui")
{
get(m_pObjectCount, "count");
@@ -246,7 +246,7 @@ namespace dbmm
}
// ResultPage
- ResultPage::ResultPage(Window* pParent)
+ ResultPage::ResultPage(vcl::Window* pParent)
: MacroMigrationPage(pParent, "SummaryPage" ,"dbaccess/ui/summarypage.ui")
{
get(m_pChanges, "textview");
diff --git a/dbaccess/source/ext/macromigration/macromigrationpages.hxx b/dbaccess/source/ext/macromigration/macromigrationpages.hxx
index 46989c58cb78..fc6ffc934521 100644
--- a/dbaccess/source/ext/macromigration/macromigrationpages.hxx
+++ b/dbaccess/source/ext/macromigration/macromigrationpages.hxx
@@ -45,7 +45,7 @@ namespace dbmm
class MacroMigrationPage : public MacroMigrationPage_Base
{
public:
- MacroMigrationPage(Window *pParent, const OString& rID, const OUString& rUIXMLDescription);
+ MacroMigrationPage(vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription);
protected:
const MacroMigrationDialog& getDialog() const;
@@ -56,7 +56,7 @@ namespace dbmm
class PreparationPage : public MacroMigrationPage
{
public:
- PreparationPage(Window *pParent);
+ PreparationPage(vcl::Window *pParent);
static TabPage* Create( ::svt::RoadmapWizard& _rParentDialog );
@@ -100,7 +100,7 @@ namespace dbmm
class ProgressPage : public MacroMigrationPage, public IMigrationProgress
{
public:
- ProgressPage(Window *pParent);
+ ProgressPage(vcl::Window *pParent);
static TabPage* Create( ::svt::RoadmapWizard& _rParentDialog );
@@ -131,7 +131,7 @@ namespace dbmm
class ResultPage : public MacroMigrationPage
{
public:
- ResultPage(Window *pParent);
+ ResultPage(vcl::Window *pParent);
static TabPage* Create( ::svt::RoadmapWizard& _rParentDialog );
diff --git a/dbaccess/source/ext/macromigration/macromigrationwizard.cxx b/dbaccess/source/ext/macromigration/macromigrationwizard.cxx
index 4913bcd737ae..f61045458791 100644
--- a/dbaccess/source/ext/macromigration/macromigrationwizard.cxx
+++ b/dbaccess/source/ext/macromigration/macromigrationwizard.cxx
@@ -88,7 +88,7 @@ namespace dbmm
virtual ~MacroMigrationDialogService();
protected:
- virtual Dialog* createDialog( Window* _pParent ) SAL_OVERRIDE;
+ virtual Dialog* createDialog( vcl::Window* _pParent ) SAL_OVERRIDE;
virtual void destroyDialog() SAL_OVERRIDE;
private:
@@ -121,7 +121,7 @@ namespace dbmm
return *(new MacroMigrationDialogService( _rxContext ) );
}
- Dialog* MacroMigrationDialogService::createDialog( Window* _pParent )
+ Dialog* MacroMigrationDialogService::createDialog( vcl::Window* _pParent )
{
return new MacroMigrationDialog( _pParent, m_aContext, m_xDocument );
}
diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx
index 570e32821377..0c03368c977a 100644
--- a/dbaccess/source/filter/xml/xmlfilter.cxx
+++ b/dbaccess/source/filter/xml/xmlfilter.cxx
@@ -405,7 +405,7 @@ sal_Bool SAL_CALL ODBFilter::filter( const Sequence< PropertyValue >& rDescripto
uno::Reference< ::com::sun::star::awt::XWindow > xWindow;
{
SolarMutexGuard aGuard;
- Window* pFocusWindow = Application::GetFocusWindow();
+ vcl::Window* pFocusWindow = Application::GetFocusWindow();
xWindow = VCLUnoHelper::GetInterface( pFocusWindow );
if( pFocusWindow )
pFocusWindow->EnterWait();
@@ -418,7 +418,7 @@ sal_Bool SAL_CALL ODBFilter::filter( const Sequence< PropertyValue >& rDescripto
if ( xWindow.is() )
{
SolarMutexGuard aGuard;
- Window* pFocusWindow = VCLUnoHelper::GetWindow( xWindow );
+ vcl::Window* pFocusWindow = VCLUnoHelper::GetWindow( xWindow );
if ( pFocusWindow )
pFocusWindow->LeaveWait();
}
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index 4996d491ce68..092ee4a909b1 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -312,7 +312,7 @@ OApplicationController::~OApplicationController()
dispose();
}
SAL_WNODEPRECATED_DECLARATIONS_PUSH
- ::std::auto_ptr< Window> aTemp( getView() );
+ ::std::auto_ptr< vcl::Window> aTemp( getView() );
SAL_WNODEPRECATED_DECLARATIONS_POP
clearView();
@@ -429,7 +429,7 @@ void SAL_CALL OApplicationController::disposing()
OApplicationController_CBASE::disposing(); // here the m_refCount must be equal 5
}
-bool OApplicationController::Construct(Window* _pParent)
+bool OApplicationController::Construct(vcl::Window* _pParent)
{
setView( * new OApplicationView( _pParent, getORB(), *this, m_ePreviewMode ) );
getView()->SetUniqueId(UID_APP_VIEW);
@@ -452,7 +452,7 @@ bool OApplicationController::Construct(Window* _pParent)
if ( !bSuccess )
{
SAL_WNODEPRECATED_DECLARATIONS_PUSH
- ::std::auto_ptr< Window> aTemp( getView() );
+ ::std::auto_ptr< vcl::Window> aTemp( getView() );
SAL_WNODEPRECATED_DECLARATIONS_POP
clearView();
return false;
diff --git a/dbaccess/source/ui/app/AppController.hxx b/dbaccess/source/ui/app/AppController.hxx
index 18fdb41d14fc..2e262c67d22f 100644
--- a/dbaccess/source/ui/app/AppController.hxx
+++ b/dbaccess/source/ui/app/AppController.hxx
@@ -546,7 +546,7 @@ namespace dbaui
virtual void disconnect();
// late construction
- virtual bool Construct(Window* pParent) SAL_OVERRIDE;
+ virtual bool Construct(vcl::Window* pParent) SAL_OVERRIDE;
virtual void describeSupportedFeatures() SAL_OVERRIDE;
protected:
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
index 691775f20836..af80ee80ad34 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@ -125,17 +125,17 @@ namespace
return (nIndex != -1 ? lcl_findEntry_impl(rTree,_rName.copy(sErase.getLength() + 1),_pFirst) : NULL);
}
// class OPreviewWindow
- class OTablePreviewWindow : public Window
+ class OTablePreviewWindow : public vcl::Window
{
DECL_LINK(OnDisableInput, void*);
void ImplInitSettings( bool bFont, bool bForeground, bool bBackground );
protected:
virtual void DataChanged(const DataChangedEvent& rDCEvt) SAL_OVERRIDE;
public:
- OTablePreviewWindow( Window* pParent, WinBits nStyle = 0 );
+ OTablePreviewWindow( vcl::Window* pParent, WinBits nStyle = 0 );
virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
};
- OTablePreviewWindow::OTablePreviewWindow(Window* pParent, WinBits nStyle) : Window( pParent, nStyle)
+ OTablePreviewWindow::OTablePreviewWindow(vcl::Window* pParent, WinBits nStyle) : Window( pParent, nStyle)
{
ImplInitSettings( true, true, true );
}
@@ -186,7 +186,7 @@ namespace
}
// class OAppDetailPageHelper
-OAppDetailPageHelper::OAppDetailPageHelper(Window* _pParent,OAppBorderWindow& _rBorderWin,PreviewMode _ePreviewMode) : Window(_pParent,WB_DIALOGCONTROL)
+OAppDetailPageHelper::OAppDetailPageHelper(vcl::Window* _pParent,OAppBorderWindow& _rBorderWin,PreviewMode _ePreviewMode) : Window(_pParent,WB_DIALOGCONTROL)
,m_rBorderWin(_rBorderWin)
,m_aFL(this,WB_VERT)
,m_aTBPreview(this,WB_TABSTOP )
@@ -675,10 +675,10 @@ void OAppDetailPageHelper::createPage(ElementType _eType,const Reference< XNameA
}
}
-void OAppDetailPageHelper::setDetailPage(Window* _pWindow)
+void OAppDetailPageHelper::setDetailPage(vcl::Window* _pWindow)
{
OSL_ENSURE(_pWindow,"OAppDetailPageHelper::setDetailPage: Window is NULL!");
- Window* pCurrent = getCurrentView();
+ vcl::Window* pCurrent = getCurrentView();
if ( pCurrent )
pCurrent->Hide();
@@ -965,7 +965,7 @@ void OAppDetailPageHelper::Resize()
long nOutputWidth = aOutputSize.Width();
long nOutputHeight = aOutputSize.Height();
- Window* pWindow = getCurrentView();
+ vcl::Window* pWindow = getCurrentView();
if ( pWindow )
{
Size aFLSize = LogicToPixel( Size( 2, 6 ), MAP_APPFONT );
@@ -1273,7 +1273,7 @@ void OAppDetailPageHelper::ImplInitSettings()
m_pTablePreview->SetBackground( rStyleSettings.GetFieldColor() );
}
-OPreviewWindow::OPreviewWindow(Window* _pParent)
+OPreviewWindow::OPreviewWindow(vcl::Window* _pParent)
: Window(_pParent)
{
ImplInitSettings( true, true, true );
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.hxx b/dbaccess/source/ui/app/AppDetailPageHelper.hxx
index f102e5e37708..24affd63da1e 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.hxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.hxx
@@ -47,7 +47,7 @@ namespace dbaui
class OAppBorderWindow;
class DBTreeListBox;
- class OPreviewWindow : public Window
+ class OPreviewWindow : public vcl::Window
{
GraphicObject m_aGraphicObj;
Rectangle m_aPreviewRect;
@@ -66,7 +66,7 @@ namespace dbaui
protected:
virtual void DataChanged(const DataChangedEvent& rDCEvt) SAL_OVERRIDE;
public:
- OPreviewWindow(Window* _pParent);
+ OPreviewWindow(vcl::Window* _pParent);
// window overloads
virtual void Paint(const Rectangle& rRect) SAL_OVERRIDE;
@@ -75,7 +75,7 @@ namespace dbaui
};
// A helper class for the controls in the detail page.
// Combines general functionality.
- class OAppDetailPageHelper : public Window
+ class OAppDetailPageHelper : public vcl::Window
{
DBTreeListBox* m_pLists[ELEMENT_COUNT];
OAppBorderWindow& m_rBorderWin;
@@ -85,7 +85,7 @@ namespace dbaui
OPreviewWindow m_aPreview;
::svtools::ODocumentInfoPreview
m_aDocumentInfo;
- Window* m_pTablePreview;
+ vcl::Window* m_pTablePreview;
::std::auto_ptr<PopupMenu> m_aMenu;
PreviewMode m_ePreviewMode;
::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame2 >
@@ -129,7 +129,7 @@ namespace dbaui
@param _pWindow
The control which should be visible.
*/
- void setDetailPage(Window* _pWindow);
+ void setDetailPage(vcl::Window* _pWindow);
/** sets all HandleCallbacks
@param _pTreeView
@@ -167,7 +167,7 @@ namespace dbaui
void ImplInitSettings();
public:
- OAppDetailPageHelper(Window* _pParent,OAppBorderWindow& _rBorderWin,PreviewMode _ePreviewMode);
+ OAppDetailPageHelper(vcl::Window* _pParent,OAppBorderWindow& _rBorderWin,PreviewMode _ePreviewMode);
virtual ~OAppDetailPageHelper();
// window overloads
diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx
index e6e01c4e9809..4882593c2526 100644
--- a/dbaccess/source/ui/app/AppDetailView.cxx
+++ b/dbaccess/source/ui/app/AppDetailView.cxx
@@ -339,7 +339,7 @@ void OCreationList::KeyInput( const KeyEvent& rKEvt )
}
}
-OTasksWindow::OTasksWindow(Window* _pParent,OApplicationDetailView* _pDetailView)
+OTasksWindow::OTasksWindow(vcl::Window* _pParent,OApplicationDetailView* _pDetailView)
: Window(_pParent,WB_DIALOGCONTROL )
,m_aCreation(*this)
,m_aDescription(this)
@@ -886,7 +886,7 @@ bool OApplicationDetailView::isSortUp() const
return m_pControlHelper->isSortUp();
}
-Window* OApplicationDetailView::getTreeWindow() const
+vcl::Window* OApplicationDetailView::getTreeWindow() const
{
return m_pControlHelper->getCurrentView();
}
diff --git a/dbaccess/source/ui/app/AppDetailView.hxx b/dbaccess/source/ui/app/AppDetailView.hxx
index 4f83589343b7..ac12a0d0cfe8 100644
--- a/dbaccess/source/ui/app/AppDetailView.hxx
+++ b/dbaccess/source/ui/app/AppDetailView.hxx
@@ -109,7 +109,7 @@ namespace dbaui
sal_uInt16 nTitleId;
};
- class OTasksWindow : public Window
+ class OTasksWindow : public vcl::Window
{
OCreationList m_aCreation;
FixedText m_aDescription;
@@ -122,7 +122,7 @@ namespace dbaui
protected:
virtual void DataChanged(const DataChangedEvent& rDCEvt) SAL_OVERRIDE;
public:
- OTasksWindow(Window* _pParent,OApplicationDetailView* _pDetailView);
+ OTasksWindow(vcl::Window* _pParent,OApplicationDetailView* _pDetailView);
virtual ~OTasksWindow();
// window overloads
@@ -352,7 +352,7 @@ namespace dbaui
SvTreeListEntry* getEntry( const Point& _aPoint ) const;
- Window* getTreeWindow() const;
+ vcl::Window* getTreeWindow() const;
private:
void impl_createPage(
ElementType _eType,
diff --git a/dbaccess/source/ui/app/AppIconControl.cxx b/dbaccess/source/ui/app/AppIconControl.cxx
index 62afddd51d2a..ff73ba0fdafc 100644
--- a/dbaccess/source/ui/app/AppIconControl.cxx
+++ b/dbaccess/source/ui/app/AppIconControl.cxx
@@ -29,7 +29,7 @@
using namespace ::dbaui;
// class OApplicationIconControl
-OApplicationIconControl::OApplicationIconControl(Window* _pParent)
+OApplicationIconControl::OApplicationIconControl(vcl::Window* _pParent)
: SvtIconChoiceCtrl(_pParent,WB_ICON | WB_NOCOLUMNHEADER | WB_HIGHLIGHTFRAME | /*!WB_NOSELECTION |*/
WB_TABSTOP | WB_CLIPCHILDREN | WB_NOVSCROLL | WB_SMART_ARRANGE | WB_NOHSCROLL | WB_CENTER)
,DropTargetHelper(this)
diff --git a/dbaccess/source/ui/app/AppIconControl.hxx b/dbaccess/source/ui/app/AppIconControl.hxx
index f8038ace0142..5fcecef90022 100644
--- a/dbaccess/source/ui/app/AppIconControl.hxx
+++ b/dbaccess/source/ui/app/AppIconControl.hxx
@@ -32,7 +32,7 @@ namespace dbaui
IControlActionListener* m_pActionListener;
public:
- OApplicationIconControl(Window* _pParent);
+ OApplicationIconControl(vcl::Window* _pParent);
virtual ~OApplicationIconControl();
void setControlActionListener( IControlActionListener* _pListener ) { m_pActionListener = _pListener; }
diff --git a/dbaccess/source/ui/app/AppSwapWindow.cxx b/dbaccess/source/ui/app/AppSwapWindow.cxx
index 4f12cb9eb566..8c3d451bd0e3 100644
--- a/dbaccess/source/ui/app/AppSwapWindow.cxx
+++ b/dbaccess/source/ui/app/AppSwapWindow.cxx
@@ -36,7 +36,7 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::container;
// class OApplicationSwapWindow
-OApplicationSwapWindow::OApplicationSwapWindow( Window* _pParent, OAppBorderWindow& _rBorderWindow )
+OApplicationSwapWindow::OApplicationSwapWindow( vcl::Window* _pParent, OAppBorderWindow& _rBorderWindow )
:Window(_pParent,WB_DIALOGCONTROL )
,m_aIconControl(this)
,m_eLastType(E_NONE)
diff --git a/dbaccess/source/ui/app/AppSwapWindow.hxx b/dbaccess/source/ui/app/AppSwapWindow.hxx
index 2282039f9995..5c10903cf9be 100644
--- a/dbaccess/source/ui/app/AppSwapWindow.hxx
+++ b/dbaccess/source/ui/app/AppSwapWindow.hxx
@@ -27,7 +27,7 @@
namespace dbaui
{
class OAppBorderWindow;
- class OApplicationSwapWindow : public Window,
+ class OApplicationSwapWindow : public vcl::Window,
public IClipboardTest
{
OApplicationIconControl m_aIconControl;
@@ -41,7 +41,7 @@ namespace dbaui
protected:
virtual void DataChanged(const DataChangedEvent& rDCEvt) SAL_OVERRIDE;
public:
- OApplicationSwapWindow( Window* _pParent, OAppBorderWindow& _rBorderWindow );
+ OApplicationSwapWindow( vcl::Window* _pParent, OAppBorderWindow& _rBorderWindow );
virtual ~OApplicationSwapWindow();
// window overloads
virtual void Resize() SAL_OVERRIDE;
diff --git a/dbaccess/source/ui/app/AppTitleWindow.cxx b/dbaccess/source/ui/app/AppTitleWindow.cxx
index 72e37369f362..4276a553122b 100644
--- a/dbaccess/source/ui/app/AppTitleWindow.cxx
+++ b/dbaccess/source/ui/app/AppTitleWindow.cxx
@@ -27,7 +27,7 @@
namespace dbaui
{
-OTitleWindow::OTitleWindow(Window* _pParent,sal_uInt16 _nTitleId,WinBits _nBits,bool _bShift)
+OTitleWindow::OTitleWindow(vcl::Window* _pParent,sal_uInt16 _nTitleId,WinBits _nBits,bool _bShift)
: Window(_pParent,_nBits | WB_DIALOGCONTROL)
, m_aSpace1(this)
, m_aSpace2(this)
@@ -40,7 +40,7 @@ OTitleWindow::OTitleWindow(Window* _pParent,sal_uInt16 _nTitleId,WinBits _nBits,
SetBorderStyle(WINDOW_BORDER_MONO);
ImplInitSettings( true, true, true );
- Window* pWindows [] = { &m_aSpace1, &m_aSpace2, &m_aTitle };
+ vcl::Window* pWindows [] = { &m_aSpace1, &m_aSpace2, &m_aTitle };
for (size_t i=0; i < sizeof(pWindows)/sizeof(pWindows[0]); ++i)
pWindows[i]->Show();
}
@@ -50,13 +50,13 @@ OTitleWindow::~OTitleWindow()
if ( m_pChild )
{
m_pChild->Hide();
- boost::scoped_ptr<Window> aTemp(m_pChild);
+ boost::scoped_ptr<vcl::Window> aTemp(m_pChild);
m_pChild = NULL;
}
}
-void OTitleWindow::setChildWindow(Window* _pChild)
+void OTitleWindow::setChildWindow(vcl::Window* _pChild)
{
m_pChild = _pChild;
}
@@ -151,7 +151,7 @@ void OTitleWindow::ImplInitSettings( bool bFont, bool bForeground, bool bBackgro
if( bBackground )
SetBackground( rStyleSettings.GetFieldColor() );
- Window* pWindows [] = { &m_aSpace1, &m_aSpace2, &m_aTitle};
+ vcl::Window* pWindows [] = { &m_aSpace1, &m_aSpace2, &m_aTitle};
for (size_t i=0; i < sizeof(pWindows)/sizeof(pWindows[0]); ++i)
{
vcl::Font aFont = pWindows[i]->GetFont();
diff --git a/dbaccess/source/ui/app/AppTitleWindow.hxx b/dbaccess/source/ui/app/AppTitleWindow.hxx
index 0f1bedafd939..e33144a87395 100644
--- a/dbaccess/source/ui/app/AppTitleWindow.hxx
+++ b/dbaccess/source/ui/app/AppTitleWindow.hxx
@@ -23,18 +23,18 @@
namespace dbaui
{
- class OTitleWindow : public Window
+ class OTitleWindow : public vcl::Window
{
FixedText m_aSpace1;
FixedText m_aSpace2;
FixedText m_aTitle;
- Window* m_pChild;
+ vcl::Window* m_pChild;
bool m_bShift;
void ImplInitSettings( bool bFont, bool bForeground, bool bBackground );
protected:
virtual void DataChanged(const DataChangedEvent& rDCEvt) SAL_OVERRIDE;
public:
- OTitleWindow(Window* _pParent,sal_uInt16 _nTitleId,WinBits _nBits,bool _bShift = true);
+ OTitleWindow(vcl::Window* _pParent,sal_uInt16 _nTitleId,WinBits _nBits,bool _bShift = true);
virtual ~OTitleWindow();
// window overloads
@@ -45,14 +45,14 @@ namespace dbaui
@param _pChild
The child window.
*/
- void setChildWindow(Window* _pChild);
+ void setChildWindow(vcl::Window* _pChild);
/** gets the child window.
@return
The child winodw.
*/
- inline Window* getChildWindow() const { return m_pChild; }
+ inline vcl::Window* getChildWindow() const { return m_pChild; }
/** sets the title text out of the resource
@param _nTitleId
diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx
index 3b22fd88badc..a3375b651fb0 100644
--- a/dbaccess/source/ui/app/AppView.cxx
+++ b/dbaccess/source/ui/app/AppView.cxx
@@ -90,13 +90,13 @@ OAppBorderWindow::~OAppBorderWindow()
if ( m_pPanel )
{
m_pPanel->Hide();
- boost::scoped_ptr<Window> aTemp(m_pPanel);
+ boost::scoped_ptr<vcl::Window> aTemp(m_pPanel);
m_pPanel = NULL;
}
if ( m_pDetailView )
{
m_pDetailView->Hide();
- boost::scoped_ptr<Window> aTemp(m_pDetailView);
+ boost::scoped_ptr<vcl::Window> aTemp(m_pDetailView);
m_pDetailView = NULL;
}
@@ -177,7 +177,7 @@ OApplicationSwapWindow* OAppBorderWindow::getPanel() const
// class OApplicationView
-OApplicationView::OApplicationView( Window* pParent
+OApplicationView::OApplicationView( vcl::Window* pParent
,const Reference< XComponentContext >& _rxOrb
,IApplicationController& _rAppController
,PreviewMode _ePreviewMode
@@ -208,7 +208,7 @@ OApplicationView::~OApplicationView()
{
stopComponentListening(m_xObject);
m_pWin->Hide();
- boost::scoped_ptr<Window> aTemp(m_pWin);
+ boost::scoped_ptr<vcl::Window> aTemp(m_pWin);
m_pWin = NULL;
}
}
diff --git a/dbaccess/source/ui/app/AppView.hxx b/dbaccess/source/ui/app/AppView.hxx
index 109f63114ca1..a19118ac1917 100644
--- a/dbaccess/source/ui/app/AppView.hxx
+++ b/dbaccess/source/ui/app/AppView.hxx
@@ -42,7 +42,7 @@ namespace dbaui
class OApplicationDetailView;
class OApplicationSwapWindow;
class OTitleWindow;
- class OAppBorderWindow : public Window
+ class OAppBorderWindow : public vcl::Window
{
OTitleWindow* m_pPanel;
OApplicationDetailView* m_pDetailView;
@@ -97,7 +97,7 @@ namespace dbaui
// Window
virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
public:
- OApplicationView( Window* pParent
+ OApplicationView( vcl::Window* pParent
,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&
,IApplicationController& _rAppController
,PreviewMode _ePreviewMode
diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx
index 96ee1a44b88a..dfa6774cb25f 100644
--- a/dbaccess/source/ui/browser/brwctrlr.cxx
+++ b/dbaccess/source/ui/browser/brwctrlr.cxx
@@ -722,7 +722,7 @@ void SbaXDataBrowserController::describeSupportedFeatures()
implDescribeSupportedFeature( ".uno:FormSlots/insertRecord", ID_BROWSER_INSERT_ROW, CommandGroup::INSERT );
}
-bool SbaXDataBrowserController::Construct(Window* pParent)
+bool SbaXDataBrowserController::Construct(vcl::Window* pParent)
{
// create/initialize the form and the grid model
m_xRowSet = CreateForm();
diff --git a/dbaccess/source/ui/browser/brwview.cxx b/dbaccess/source/ui/browser/brwview.cxx
index 6be18a14ae17..9292887c63e3 100644
--- a/dbaccess/source/ui/browser/brwview.cxx
+++ b/dbaccess/source/ui/browser/brwview.cxx
@@ -65,7 +65,7 @@ namespace
// UnoDataBrowserView
-UnoDataBrowserView::UnoDataBrowserView( Window* pParent,
+UnoDataBrowserView::UnoDataBrowserView( vcl::Window* pParent,
IController& _rController,
const Reference< ::com::sun::star::uno::XComponentContext >& _rxContext)
:ODataView(pParent,_rController,_rxContext)
@@ -161,7 +161,7 @@ void UnoDataBrowserView::setTreeView(DBTreeView* _pTreeView)
{
if (m_pTreeView)
{
- boost::scoped_ptr<Window> aTemp(m_pTreeView);
+ boost::scoped_ptr<vcl::Window> aTemp(m_pTreeView);
m_pTreeView = NULL;
}
m_pTreeView = _pTreeView;
diff --git a/dbaccess/source/ui/browser/dataview.cxx b/dbaccess/source/ui/browser/dataview.cxx
index ec220d3b562a..bf06baa5ebbe 100644
--- a/dbaccess/source/ui/browser/dataview.cxx
+++ b/dbaccess/source/ui/browser/dataview.cxx
@@ -59,7 +59,7 @@ namespace dbaui
}
};
- ODataView::ODataView( Window* pParent,
+ ODataView::ODataView( vcl::Window* pParent,
IController& _rController,
const Reference< XComponentContext >& _rxContext,
WinBits nStyle)
diff --git a/dbaccess/source/ui/browser/dbtreeview.cxx b/dbaccess/source/ui/browser/dbtreeview.cxx
index e769f378ebd2..2d140c3b1326 100644
--- a/dbaccess/source/ui/browser/dbtreeview.cxx
+++ b/dbaccess/source/ui/browser/dbtreeview.cxx
@@ -31,7 +31,7 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
// class DBTreeView
-DBTreeView::DBTreeView( Window* pParent, WinBits nBits)
+DBTreeView::DBTreeView( vcl::Window* pParent, WinBits nBits)
: Window( pParent, nBits )
, m_pTreeListBox(NULL)
{
@@ -53,7 +53,7 @@ DBTreeView::~DBTreeView()
m_pTreeListBox->GetModel()->RemoveView(m_pTreeListBox);
m_pTreeListBox->DisconnectFromModel();
}
- boost::scoped_ptr<Window> aTemp(m_pTreeListBox);
+ boost::scoped_ptr<vcl::Window> aTemp(m_pTreeListBox);
m_pTreeListBox = NULL;
}
}
diff --git a/dbaccess/source/ui/browser/dbtreeview.hxx b/dbaccess/source/ui/browser/dbtreeview.hxx
index b084411f63e1..99bf4416ce8c 100644
--- a/dbaccess/source/ui/browser/dbtreeview.hxx
+++ b/dbaccess/source/ui/browser/dbtreeview.hxx
@@ -28,7 +28,7 @@ namespace dbaui
class DBTreeListBox;
// - DBTreeView -
- class DBTreeView : public Window
+ class DBTreeView : public vcl::Window
{
private:
DBTreeListBox* m_pTreeListBox;
@@ -37,7 +37,7 @@ namespace dbaui
virtual void Resize() SAL_OVERRIDE;
public:
- DBTreeView( Window* pParent,
+ DBTreeView( vcl::Window* pParent,
WinBits nBits );
virtual ~DBTreeView();
diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx
index c06a5047ccd2..c8526427cbf3 100644
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@ -226,7 +226,7 @@ OGenericUnoController::~OGenericUnoController()
}
-bool OGenericUnoController::Construct(Window* /*pParent*/)
+bool OGenericUnoController::Construct(vcl::Window* /*pParent*/)
{
OSL_ENSURE( getView(), "the view is NULL!" );
@@ -297,7 +297,7 @@ void SAL_CALL OGenericUnoController::initialize( const Sequence< Any >& aArgumen
xParent = xFrame->getContainerWindow();
VCLXWindow* pParentComponent = VCLXWindow::GetImplementation(xParent);
- Window* pParentWin = pParentComponent ? pParentComponent->GetWindow() : NULL;
+ vcl::Window* pParentWin = pParentComponent ? pParentComponent->GetWindow() : NULL;
if (!pParentWin)
{
throw IllegalArgumentException("Parent window is null", *this, 1 );
@@ -318,7 +318,7 @@ void SAL_CALL OGenericUnoController::initialize( const Sequence< Any >& aArgumen
catch(Exception&)
{
// no one clears my view if I won't
- boost::scoped_ptr<Window> aTemp(m_pView);
+ boost::scoped_ptr<vcl::Window> aTemp(m_pView);
m_pView = NULL;
throw;
}
diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx
index 2d7d9c1804c2..125b881af63c 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -145,7 +145,7 @@ SbaXGridControl::~SbaXGridControl()
{
}
-FmXGridPeer* SbaXGridControl::imp_CreatePeer(Window* pParent)
+FmXGridPeer* SbaXGridControl::imp_CreatePeer(vcl::Window* pParent)
{
FmXGridPeer* pReturn = new SbaXGridPeer(m_xContext);
@@ -549,7 +549,7 @@ SbaXGridPeer* SbaXGridPeer::getImplementation(const Reference< XInterface >& _rx
return NULL;
}
-FmGridControl* SbaXGridPeer::imp_CreateControl(Window* pParent, WinBits nStyle)
+FmGridControl* SbaXGridPeer::imp_CreateControl(vcl::Window* pParent, WinBits nStyle)
{
return new SbaGridControl( m_xContext, pParent, this, nStyle);
}
@@ -706,7 +706,7 @@ void SbaGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupM
// SbaGridControl
SbaGridControl::SbaGridControl(Reference< XComponentContext > _rM,
- Window* pParent, FmXGridPeer* _pPeer, WinBits nBits)
+ vcl::Window* pParent, FmXGridPeer* _pPeer, WinBits nBits)
:FmGridControl(_rM,pParent, _pPeer, nBits)
,m_pMasterListener(NULL)
,m_nAsyncDropEvent(0)
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index a088b29feaf6..6d59880cf35b 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -325,7 +325,7 @@ void SAL_CALL SbaTableQueryBrowser::disposing()
SbaXDataBrowserController::disposing();
}
-bool SbaTableQueryBrowser::Construct(Window* pParent)
+bool SbaTableQueryBrowser::Construct(vcl::Window* pParent)
{
if ( !SbaXDataBrowserController::Construct( pParent ) )
return false;
@@ -1339,7 +1339,7 @@ void SbaTableQueryBrowser::implCheckExternalSlot( sal_uInt16 _nId )
if ( !m_xMainToolbar.is() )
return;
- Window* pToolboxWindow = VCLUnoHelper::GetWindow( m_xMainToolbar );
+ vcl::Window* pToolboxWindow = VCLUnoHelper::GetWindow( m_xMainToolbar );
ToolBox* pToolbox = dynamic_cast< ToolBox* >( pToolboxWindow );
OSL_ENSURE( pToolbox, "SbaTableQueryBrowser::implCheckExternalSlot: cannot obtain the toolbox window!" );
diff --git a/dbaccess/source/ui/control/ColumnControlWindow.cxx b/dbaccess/source/ui/control/ColumnControlWindow.cxx
index a6d8810f7b0b..a4d44cbc6464 100644
--- a/dbaccess/source/ui/control/ColumnControlWindow.cxx
+++ b/dbaccess/source/ui/control/ColumnControlWindow.cxx
@@ -35,7 +35,7 @@ using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star::lang;
// OColumnControlWindow
-OColumnControlWindow::OColumnControlWindow(Window* pParent
+OColumnControlWindow::OColumnControlWindow(vcl::Window* pParent
,const Reference<XComponentContext>& _rxContext)
: OFieldDescControl(pParent,NULL)
, m_xContext(_rxContext)
diff --git a/dbaccess/source/ui/control/FieldControls.cxx b/dbaccess/source/ui/control/FieldControls.cxx
index 3a14cdd3d2cf..9335be836606 100644
--- a/dbaccess/source/ui/control/FieldControls.cxx
+++ b/dbaccess/source/ui/control/FieldControls.cxx
@@ -26,7 +26,7 @@ namespace dbaui {
namespace {
-void lcl_setSpecialReadOnly( bool _bReadOnly, Window* _pWin )
+void lcl_setSpecialReadOnly( bool _bReadOnly, vcl::Window* _pWin )
{
StyleSettings aSystemStyle = Application::GetSettings().GetStyleSettings();
const Color& rNewColor = _bReadOnly ? aSystemStyle.GetDialogColor() : aSystemStyle.GetFieldColor();
@@ -36,7 +36,7 @@ void lcl_setSpecialReadOnly( bool _bReadOnly, Window* _pWin )
}
-OPropColumnEditCtrl::OPropColumnEditCtrl(Window* pParent,
+OPropColumnEditCtrl::OPropColumnEditCtrl(vcl::Window* pParent,
rtl::OUString& _rAllowedChars,
sal_uInt16 nHelpId,
short nPosition,
@@ -56,7 +56,7 @@ OPropColumnEditCtrl::SetSpecialReadOnly(bool _bReadOnly)
-OPropEditCtrl::OPropEditCtrl(Window* pParent, sal_uInt16 nHelpId, short nPosition, WinBits nWinStyle)
+OPropEditCtrl::OPropEditCtrl(vcl::Window* pParent, sal_uInt16 nHelpId, short nPosition, WinBits nWinStyle)
:Edit(pParent, nWinStyle)
,m_nPos(nPosition)
{
@@ -78,14 +78,14 @@ OPropNumericEditCtrl::SetSpecialReadOnly(bool _bReadOnly)
}
-OPropNumericEditCtrl::OPropNumericEditCtrl(Window* pParent, sal_uInt16 nHelpId, short nPosition, WinBits nWinStyle)
+OPropNumericEditCtrl::OPropNumericEditCtrl(vcl::Window* pParent, sal_uInt16 nHelpId, short nPosition, WinBits nWinStyle)
:NumericField(pParent, nWinStyle)
,m_nPos(nPosition)
{
m_strHelpText = ModuleRes(nHelpId);
}
-OPropListBoxCtrl::OPropListBoxCtrl(Window* pParent, sal_uInt16 nHelpId, short nPosition, WinBits nWinStyle)
+OPropListBoxCtrl::OPropListBoxCtrl(vcl::Window* pParent, sal_uInt16 nHelpId, short nPosition, WinBits nWinStyle)
:ListBox(pParent, nWinStyle)
,m_nPos(nPosition)
{
diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx
index 44bf027627b3..d0c35b7cd759 100644
--- a/dbaccess/source/ui/control/FieldDescControl.cxx
+++ b/dbaccess/source/ui/control/FieldDescControl.cxx
@@ -93,7 +93,7 @@ namespace
}
// class OFieldDescControl
-OFieldDescControl::OFieldDescControl( Window* pParent, OTableDesignHelpBar* pHelpBar )
+OFieldDescControl::OFieldDescControl( vcl::Window* pParent, OTableDesignHelpBar* pHelpBar )
:TabPage( pParent, WB_3DLOOK | WB_DIALOGCONTROL )
,pHelp( pHelpBar )
,pLastFocusWindow(NULL)
@@ -163,11 +163,11 @@ OFieldDescControl::~OFieldDescControl()
{
{
- boost::scoped_ptr<Window> aTemp(m_pVertScroll);
+ boost::scoped_ptr<vcl::Window> aTemp(m_pVertScroll);
m_pVertScroll = NULL;
}
{
- boost::scoped_ptr<Window> aTemp(m_pHorzScroll);
+ boost::scoped_ptr<vcl::Window> aTemp(m_pHorzScroll);
m_pHorzScroll = NULL;
}
if ( m_bAdded )
@@ -226,7 +226,7 @@ IMPL_LINK(OFieldDescControl, OnScroll, ScrollBar*, /*pBar*/)
namespace
{
- void getMaxXPosition(Window* _pWindow,long& _rnMaxXPosition)
+ void getMaxXPosition(vcl::Window* _pWindow,long& _rnMaxXPosition)
{
if (_pWindow)
{
@@ -1556,7 +1556,7 @@ void OFieldDescControl::GetFocus()
}
}
-void OFieldDescControl::implFocusLost(Window* _pWhich)
+void OFieldDescControl::implFocusLost(vcl::Window* _pWhich)
{
OSL_ENSURE(!_pWhich || IsChild(_pWhich), "OFieldDescControl::implFocusLost : invalid window !");
diff --git a/dbaccess/source/ui/control/RelationControl.cxx b/dbaccess/source/ui/control/RelationControl.cxx
index 9082511dded4..35bf2e2f0d00 100644
--- a/dbaccess/source/ui/control/RelationControl.cxx
+++ b/dbaccess/source/ui/control/RelationControl.cxx
@@ -78,7 +78,7 @@ namespace dbaui
*/
sal_uInt16 getColumnIdent( sal_uInt16 _nColId ) const;
public:
- ORelationControl(Window *pParent);
+ ORelationControl(vcl::Window *pParent);
void SetController(OTableListBoxControl* pController)
{
m_pBoxControl = pController;
@@ -127,7 +127,7 @@ namespace dbaui
};
// class ORelationControl
- ORelationControl::ORelationControl(Window *pParent)
+ ORelationControl::ORelationControl(vcl::Window *pParent)
: EditBrowseBox(pParent,
EBBF_SMART_TAB_TRAVEL | EBBF_NOROWPICTURE,
WB_TABSTOP | WB_BORDER | BROWSER_AUTOSIZE_LASTCOL)
@@ -138,7 +138,7 @@ namespace dbaui
{
}
- extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeORelationControl(Window *pParent, VclBuilder::stringmap &)
+ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeORelationControl(vcl::Window *pParent, VclBuilder::stringmap &)
{
return new ORelationControl(pParent);
}
diff --git a/dbaccess/source/ui/control/SqlNameEdit.cxx b/dbaccess/source/ui/control/SqlNameEdit.cxx
index 1d4fe29ad2e9..bd3fd01c8f09 100644
--- a/dbaccess/source/ui/control/SqlNameEdit.cxx
+++ b/dbaccess/source/ui/control/SqlNameEdit.cxx
@@ -81,12 +81,12 @@ namespace dbaui
}
}
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeOSQLNameEdit(Window *pParent, VclBuilder::stringmap &)
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeOSQLNameEdit(vcl::Window *pParent, VclBuilder::stringmap &)
{
return new dbaui::OSQLNameEdit(pParent);
}
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeOSQLNameComboBox(Window *pParent, VclBuilder::stringmap &)
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeOSQLNameComboBox(vcl::Window *pParent, VclBuilder::stringmap &)
{
return new dbaui::OSQLNameComboBox(pParent);
}
diff --git a/dbaccess/source/ui/control/TableGrantCtrl.cxx b/dbaccess/source/ui/control/TableGrantCtrl.cxx
index abf2d5f489f4..f334c2b621b1 100644
--- a/dbaccess/source/ui/control/TableGrantCtrl.cxx
+++ b/dbaccess/source/ui/control/TableGrantCtrl.cxx
@@ -46,7 +46,7 @@ const sal_uInt16 COL_DROP = 8;
// OTableGrantControl
-OTableGrantControl::OTableGrantControl( Window* pParent, WinBits nBits)
+OTableGrantControl::OTableGrantControl( vcl::Window* pParent, WinBits nBits)
:EditBrowseBox( pParent, EBBF_SMART_TAB_TRAVEL | EBBF_NOROWPICTURE, nBits )
,m_pCheckCell( NULL )
,m_pEdit( NULL )
diff --git a/dbaccess/source/ui/control/VertSplitView.cxx b/dbaccess/source/ui/control/VertSplitView.cxx
index 975cefd84de9..d199b6f32fef 100644
--- a/dbaccess/source/ui/control/VertSplitView.cxx
+++ b/dbaccess/source/ui/control/VertSplitView.cxx
@@ -28,7 +28,7 @@
using namespace ::dbaui;
// class OSplitterView
-OSplitterView::OSplitterView(Window* _pParent,bool _bVertical) : Window(_pParent,WB_DIALOGCONTROL) // ,WB_BORDER
+OSplitterView::OSplitterView(vcl::Window* _pParent,bool _bVertical) : Window(_pParent,WB_DIALOGCONTROL) // ,WB_BORDER
,m_pSplitter( NULL )
,m_pLeft(NULL)
,m_pRight(NULL)
@@ -183,7 +183,7 @@ void OSplitterView::Resize()
}
-void OSplitterView::set(Window* _pRight,Window* _pLeft)
+void OSplitterView::set(vcl::Window* _pRight,Window* _pLeft)
{
m_pLeft = _pLeft;
m_pRight = _pRight;
diff --git a/dbaccess/source/ui/control/charsetlistbox.cxx b/dbaccess/source/ui/control/charsetlistbox.cxx
index 7327a5889f6d..3181a82a53aa 100644
--- a/dbaccess/source/ui/control/charsetlistbox.cxx
+++ b/dbaccess/source/ui/control/charsetlistbox.cxx
@@ -25,7 +25,7 @@
namespace dbaui
{
- CharSetListBox::CharSetListBox( Window* _pParent, WinBits _nBits = WB_DROPDOWN )
+ CharSetListBox::CharSetListBox( vcl::Window* _pParent, WinBits _nBits = WB_DROPDOWN )
: ListBox( _pParent, _nBits )
{
SetDropDownLineCount( 20 );
@@ -38,7 +38,7 @@ namespace dbaui
}
}
- extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeCharSetListBox(Window *pParent)
+ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeCharSetListBox(vcl::Window *pParent)
{
return new CharSetListBox(pParent);
}
diff --git a/dbaccess/source/ui/control/curledit.cxx b/dbaccess/source/ui/control/curledit.cxx
index 3c856db50c18..22d8241448ca 100644
--- a/dbaccess/source/ui/control/curledit.cxx
+++ b/dbaccess/source/ui/control/curledit.cxx
@@ -25,7 +25,7 @@
namespace dbaui
{
-OConnectionURLEdit::OConnectionURLEdit(Window* _pParent, WinBits _nBits,bool _bShowPrefix)
+OConnectionURLEdit::OConnectionURLEdit(vcl::Window* _pParent, WinBits _nBits,bool _bShowPrefix)
:Edit(_pParent, _nBits)
,m_pTypeCollection(NULL)
,m_pForcedPrefix(NULL)
@@ -33,7 +33,7 @@ OConnectionURLEdit::OConnectionURLEdit(Window* _pParent, WinBits _nBits,bool _bS
{
}
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeConnectionURLEdit(Window *pParent)
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeConnectionURLEdit(vcl::Window *pParent)
{
return new OConnectionURLEdit(pParent, WB_BORDER, false);
}
diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx
index cdc185fb3e4c..71120eca7bc1 100644
--- a/dbaccess/source/ui/control/dbtreelistbox.cxx
+++ b/dbaccess/source/ui/control/dbtreelistbox.cxx
@@ -54,7 +54,7 @@ using namespace ::com::sun::star::view;
#define SPACEBETWEENENTRIES 4
// class DBTreeListBox
-DBTreeListBox::DBTreeListBox( Window* pParent, WinBits nWinStyle ,bool _bHandleEnterKey)
+DBTreeListBox::DBTreeListBox( vcl::Window* pParent, WinBits nWinStyle ,bool _bHandleEnterKey)
:SvTreeListBox(pParent,nWinStyle)
,m_pDragedEntry(NULL)
,m_pActionListener(NULL)
diff --git a/dbaccess/source/ui/control/marktree.cxx b/dbaccess/source/ui/control/marktree.cxx
index 3cb9c7d6c158..d51db97fb548 100644
--- a/dbaccess/source/ui/control/marktree.cxx
+++ b/dbaccess/source/ui/control/marktree.cxx
@@ -28,7 +28,7 @@ namespace dbaui
using namespace ::com::sun::star::lang;
-OMarkableTreeListBox::OMarkableTreeListBox( Window* pParent, WinBits nWinStyle )
+OMarkableTreeListBox::OMarkableTreeListBox( vcl::Window* pParent, WinBits nWinStyle )
: DBTreeListBox(pParent, nWinStyle)
{
diff --git a/dbaccess/source/ui/control/opendoccontrols.cxx b/dbaccess/source/ui/control/opendoccontrols.cxx
index e696386b6f4b..f808ae9ae2e6 100644
--- a/dbaccess/source/ui/control/opendoccontrols.cxx
+++ b/dbaccess/source/ui/control/opendoccontrols.cxx
@@ -156,13 +156,13 @@ namespace dbaui
// OpenButton
- OpenDocumentButton::OpenDocumentButton( Window* _pParent, const sal_Char* _pAsciiModuleName )
+ OpenDocumentButton::OpenDocumentButton( vcl::Window* _pParent, const sal_Char* _pAsciiModuleName )
:PushButton( _pParent )
{
impl_init( _pAsciiModuleName );
}
- extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeOpenDocumentButton( Window *pParent, VclBuilder::stringmap & )
+ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeOpenDocumentButton( vcl::Window *pParent, VclBuilder::stringmap & )
{
return new OpenDocumentButton( pParent, "com.sun.star.sdb.OfficeDatabaseDocument" );
}
@@ -186,13 +186,13 @@ namespace dbaui
// OpenDocumentListBox
- OpenDocumentListBox::OpenDocumentListBox( Window* _pParent, const sal_Char* _pAsciiModuleName )
+ OpenDocumentListBox::OpenDocumentListBox( vcl::Window* _pParent, const sal_Char* _pAsciiModuleName )
:ListBox( _pParent, WB_BORDER | WB_DROPDOWN )
{
impl_init( _pAsciiModuleName );
}
- extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeOpenDocumentListBox( Window *pParent, VclBuilder::stringmap & )
+ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeOpenDocumentListBox( vcl::Window *pParent, VclBuilder::stringmap & )
{
return new OpenDocumentListBox( pParent, "com.sun.star.sdb.OfficeDatabaseDocument" );
}
diff --git a/dbaccess/source/ui/control/tabletree.cxx b/dbaccess/source/ui/control/tabletree.cxx
index 86dbf17aa0b3..20cacd7db203 100644
--- a/dbaccess/source/ui/control/tabletree.cxx
+++ b/dbaccess/source/ui/control/tabletree.cxx
@@ -65,7 +65,7 @@ namespace DatabaseObject = ::com::sun::star::sdb::application::DatabaseObject;
namespace DatabaseObjectContainer = ::com::sun::star::sdb::application::DatabaseObjectContainer;
// OTableTreeListBox
-OTableTreeListBox::OTableTreeListBox(Window* pParent, WinBits nWinStyle)
+OTableTreeListBox::OTableTreeListBox(vcl::Window* pParent, WinBits nWinStyle)
:OMarkableTreeListBox(pParent, nWinStyle)
,m_xImageProvider( new ImageProvider )
,m_bVirtualRoot(false)
@@ -74,7 +74,7 @@ OTableTreeListBox::OTableTreeListBox(Window* pParent, WinBits nWinStyle)
implSetDefaultImages();
}
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeOTableTreeListBox(Window *pParent, VclBuilder::stringmap &rMap)
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeOTableTreeListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap)
{
WinBits nWinStyle = 0;
OString sBorder = VclBuilder::extractCustomProperty(rMap);
diff --git a/dbaccess/source/ui/dlg/CollectionView.cxx b/dbaccess/source/ui/dlg/CollectionView.cxx
index 6d82fc53b2d9..0a54a5a92a13 100644
--- a/dbaccess/source/ui/dlg/CollectionView.cxx
+++ b/dbaccess/source/ui/dlg/CollectionView.cxx
@@ -55,7 +55,7 @@ using namespace ::com::sun::star::container;
using namespace ::com::sun::star::task;
using namespace ::com::sun::star::sdbc;
using namespace comphelper;
-OCollectionView::OCollectionView( Window * pParent
+OCollectionView::OCollectionView( vcl::Window * pParent
,const Reference< XContent>& _xContent
,const OUString& _sDefaultName
,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext)
diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
index 5c4dc6ab3c6c..b31c067e4690 100644
--- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
@@ -87,7 +87,7 @@ namespace dbaui
using namespace ::dbtools;
using namespace ::svt;
- OConnectionHelper::OConnectionHelper( Window* pParent, const OString& _rId, const OUString& _rUIXMLDescription, const SfxItemSet& _rCoreAttrs)
+ OConnectionHelper::OConnectionHelper( vcl::Window* pParent, const OString& _rId, const OUString& _rUIXMLDescription, const SfxItemSet& _rCoreAttrs)
: OGenericAdministrationPage(pParent, _rId, _rUIXMLDescription, _rCoreAttrs)
, m_bUserGrabFocus(false)
, m_pCollection(NULL)
diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.hxx b/dbaccess/source/ui/dlg/ConnectionHelper.hxx
index 78aa62db9293..117295bea89d 100644
--- a/dbaccess/source/ui/dlg/ConnectionHelper.hxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.hxx
@@ -40,7 +40,7 @@ namespace dbaui
bool m_bUserGrabFocus : 1;
public:
- OConnectionHelper( Window* pParent, const OString& _rId, const OUString& _rUIXMLDescription, const SfxItemSet& _rCoreAttrs);
+ OConnectionHelper( vcl::Window* pParent, const OString& _rId, const OUString& _rUIXMLDescription, const SfxItemSet& _rCoreAttrs);
virtual ~OConnectionHelper();
FixedText *m_pFT_Connection;
OConnectionURLEdit *m_pConnectionURL;
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx
index c76327c0e883..4e7b8cc39987 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx
@@ -81,12 +81,12 @@ namespace dbaui
using namespace ::dbtools;
using namespace ::svt;
- SfxTabPage* OConnectionTabPage::Create( Window* pParent, const SfxItemSet* _rAttrSet )
+ SfxTabPage* OConnectionTabPage::Create( vcl::Window* pParent, const SfxItemSet* _rAttrSet )
{
return ( new OConnectionTabPage( pParent, *_rAttrSet ) );
}
// OConnectionTabPage
- OConnectionTabPage::OConnectionTabPage(Window* pParent, const SfxItemSet& _rCoreAttrs)
+ OConnectionTabPage::OConnectionTabPage(vcl::Window* pParent, const SfxItemSet& _rCoreAttrs)
:OConnectionHelper(pParent, "ConnectionPage", "dbaccess/ui/connectionpage.ui", _rCoreAttrs)
{
get(m_pFL2, "userlabel");
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.hxx b/dbaccess/source/ui/dlg/ConnectionPage.hxx
index 692d5536440f..5e1c84fb88a1 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.hxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.hxx
@@ -55,7 +55,7 @@ namespace dbaui
DECL_LINK(OnEditModified,Edit*);
public:
- static SfxTabPage* Create( Window* pParent, const SfxItemSet* _rAttrSet );
+ static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* _rAttrSet );
virtual bool FillItemSet (SfxItemSet* _rCoreAttrs) SAL_OVERRIDE;
virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE;
@@ -68,7 +68,7 @@ namespace dbaui
affect the type may be changed (compared to the previous URL).</p>
*/
private:
- OConnectionTabPage(Window* pParent, const SfxItemSet& _rCoreAttrs);
+ OConnectionTabPage(vcl::Window* pParent, const SfxItemSet& _rCoreAttrs);
// nControlFlags is a combination of the CBTP_xxx-constants
virtual ~OConnectionTabPage();
diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
index e362b451b7e0..db19ebb9d21b 100644
--- a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
@@ -63,32 +63,32 @@ namespace dbaui
using namespace ::dbtools;
using namespace ::svt;
- OGenericAdministrationPage* OConnectionTabPageSetup::CreateDbaseTabPage( Window* pParent, const SfxItemSet& _rAttrSet )
+ OGenericAdministrationPage* OConnectionTabPageSetup::CreateDbaseTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet )
{
return new OConnectionTabPageSetup( pParent, "ConnectionPage", "dbaccess/ui/dbwizconnectionpage.ui", _rAttrSet, STR_DBASE_HELPTEXT, STR_DBASE_HEADERTEXT, STR_DBASE_PATH_OR_FILE);
}
- OGenericAdministrationPage* OConnectionTabPageSetup::CreateMSAccessTabPage( Window* pParent, const SfxItemSet& _rAttrSet )
+ OGenericAdministrationPage* OConnectionTabPageSetup::CreateMSAccessTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet )
{
return new OConnectionTabPageSetup( pParent, "ConnectionPage", "dbaccess/ui/dbwizconnectionpage.ui", _rAttrSet, STR_MSACCESS_HELPTEXT, STR_MSACCESS_HEADERTEXT, STR_MSACCESS_MDB_FILE);
}
- OGenericAdministrationPage* OConnectionTabPageSetup::CreateADOTabPage( Window* pParent, const SfxItemSet& _rAttrSet )
+ OGenericAdministrationPage* OConnectionTabPageSetup::CreateADOTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet )
{
return new OConnectionTabPageSetup( pParent, "ConnectionPage", "dbaccess/ui/dbwizconnectionpage.ui", _rAttrSet, STR_ADO_HELPTEXT, STR_ADO_HEADERTEXT, STR_COMMONURL);
}
- OGenericAdministrationPage* OConnectionTabPageSetup::CreateODBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet )
+ OGenericAdministrationPage* OConnectionTabPageSetup::CreateODBCTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet )
{
return new OConnectionTabPageSetup( pParent, "ConnectionPage", "dbaccess/ui/dbwizconnectionpage.ui", _rAttrSet, STR_ODBC_HELPTEXT, STR_ODBC_HEADERTEXT, STR_NAME_OF_ODBC_DATASOURCE);
}
- OGenericAdministrationPage* OConnectionTabPageSetup::CreateUserDefinedTabPage( Window* pParent, const SfxItemSet& _rAttrSet )
+ OGenericAdministrationPage* OConnectionTabPageSetup::CreateUserDefinedTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet )
{
return new OConnectionTabPageSetup( pParent, "ConnectionPage", "dbaccess/ui/dbwizconnectionpage.ui", _rAttrSet, USHRT_MAX, USHRT_MAX, STR_COMMONURL);
}
- OConnectionTabPageSetup::OConnectionTabPageSetup(Window* pParent, const OString& _rId, const OUString& _rUIXMLDescription, const SfxItemSet& _rCoreAttrs, sal_uInt16 _nHelpTextResId, sal_uInt16 _nHeaderResId, sal_uInt16 _nUrlResId)
+ OConnectionTabPageSetup::OConnectionTabPageSetup(vcl::Window* pParent, const OString& _rId, const OUString& _rUIXMLDescription, const SfxItemSet& _rCoreAttrs, sal_uInt16 _nHelpTextResId, sal_uInt16 _nHeaderResId, sal_uInt16 _nUrlResId)
:OConnectionHelper(pParent, _rId, _rUIXMLDescription, _rCoreAttrs)
,m_bUserGrabFocus(true)
{
diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx
index 02dbbdfc0d49..5705c1530cc2 100644
--- a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx
+++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx
@@ -46,11 +46,11 @@ namespace dbaui
DECL_LINK(OnEditModified,Edit*);
public:
- static OGenericAdministrationPage* CreateDbaseTabPage( Window* pParent, const SfxItemSet& _rAttrSet );
- static OGenericAdministrationPage* CreateMSAccessTabPage( Window* pParent, const SfxItemSet& _rAttrSet );
- static OGenericAdministrationPage* CreateADOTabPage( Window* pParent, const SfxItemSet& _rAttrSet );
- static OGenericAdministrationPage* CreateODBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet );
- static OGenericAdministrationPage* CreateUserDefinedTabPage( Window* pParent, const SfxItemSet& _rAttrSet );
+ static OGenericAdministrationPage* CreateDbaseTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet );
+ static OGenericAdministrationPage* CreateMSAccessTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet );
+ static OGenericAdministrationPage* CreateADOTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet );
+ static OGenericAdministrationPage* CreateODBCTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet );
+ static OGenericAdministrationPage* CreateUserDefinedTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet );
virtual bool FillItemSet (SfxItemSet* _rCoreAttrs) SAL_OVERRIDE;
@@ -68,7 +68,7 @@ namespace dbaui
OUString getConnectionURL( ) const;
protected:
- OConnectionTabPageSetup(Window* pParent, const OString& _rId, const OUString& _rUIXMLDescription, const SfxItemSet& _rCoreAttrs, sal_uInt16 _nHelpTextResId, sal_uInt16 _nHeaderResId, sal_uInt16 _nUrlResId);
+ OConnectionTabPageSetup(vcl::Window* pParent, const OString& _rId, const OUString& _rUIXMLDescription, const SfxItemSet& _rCoreAttrs, sal_uInt16 _nHelpTextResId, sal_uInt16 _nHeaderResId, sal_uInt16 _nUrlResId);
virtual bool checkTestConnection() SAL_OVERRIDE;
// nControlFlags is a combination of the CBTP_xxx-constants
virtual ~OConnectionTabPageSetup();
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
index d025ab71141e..ceef0fe6f67f 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
@@ -60,13 +60,13 @@ namespace dbaui
{
using namespace ::com::sun::star;
- OGenericAdministrationPage* OTextConnectionPageSetup::CreateTextTabPage( Window* pParent, const SfxItemSet& _rAttrSet )
+ OGenericAdministrationPage* OTextConnectionPageSetup::CreateTextTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet )
{
return ( new OTextConnectionPageSetup( pParent, _rAttrSet ) );
}
// OTextConnectionPageSetup
- OTextConnectionPageSetup::OTextConnectionPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs )
+ OTextConnectionPageSetup::OTextConnectionPageSetup( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs )
:OConnectionTabPageSetup(pParent, "DBWizTextPage", "dbaccess/ui/dbwiztextpage.ui", _rCoreAttrs, STR_TEXT_HELPTEXT, STR_TEXT_HEADERTEXT, STR_TEXT_PATH_OR_FILE)
{
@@ -124,13 +124,13 @@ using namespace ::com::sun::star;
return m_pTextConnectionHelper->prepareLeave();
}
- OGenericAdministrationPage* OLDAPConnectionPageSetup::CreateLDAPTabPage( Window* pParent, const SfxItemSet& _rAttrSet )
+ OGenericAdministrationPage* OLDAPConnectionPageSetup::CreateLDAPTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet )
{
return ( new OLDAPConnectionPageSetup( pParent, _rAttrSet ) );
}
// OLDAPPageSetup
- OLDAPConnectionPageSetup::OLDAPConnectionPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs )
+ OLDAPConnectionPageSetup::OLDAPConnectionPageSetup( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs )
:OGenericAdministrationPage(pParent, "LDAPConnectionPage", "dbaccess/ui/ldapconnectionpage.ui",_rCoreAttrs)
{
get(m_pFTHelpText, "helpLabel");
@@ -217,13 +217,13 @@ using namespace ::com::sun::star;
return 0L;
}
- OMySQLIntroPageSetup* OMySQLIntroPageSetup::CreateMySQLIntroTabPage( Window* _pParent, const SfxItemSet& _rAttrSet )
+ OMySQLIntroPageSetup* OMySQLIntroPageSetup::CreateMySQLIntroTabPage( vcl::Window* _pParent, const SfxItemSet& _rAttrSet )
{
return ( new OMySQLIntroPageSetup( _pParent, _rAttrSet) );
}
- OMySQLIntroPageSetup::OMySQLIntroPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs )
+ OMySQLIntroPageSetup::OMySQLIntroPageSetup( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs )
:OGenericAdministrationPage(pParent, "DBWizMysqlIntroPage", "dbaccess/ui/dbwizmysqlintropage.ui", _rCoreAttrs)
{
get(m_pODBCDatabase, "odbc");
@@ -290,7 +290,7 @@ using namespace ::com::sun::star;
}
// MySQLNativeSetupPage
- MySQLNativeSetupPage::MySQLNativeSetupPage( Window* _pParent, const SfxItemSet& _rCoreAttrs )
+ MySQLNativeSetupPage::MySQLNativeSetupPage( vcl::Window* _pParent, const SfxItemSet& _rCoreAttrs )
:OGenericAdministrationPage( _pParent, "DBWizMysqlNativePage", "dbaccess/ui/dbwizmysqlnativepage.ui", _rCoreAttrs )
,m_aMySQLSettings ( *get<VclVBox>("MySQLSettingsContainer"), getControlModifiedLink() )
{
@@ -300,7 +300,7 @@ using namespace ::com::sun::star;
SetRoadmapStateValue(false);
}
- OGenericAdministrationPage* MySQLNativeSetupPage::Create( Window* pParent, const SfxItemSet& _rAttrSet )
+ OGenericAdministrationPage* MySQLNativeSetupPage::Create( vcl::Window* pParent, const SfxItemSet& _rAttrSet )
{
return new MySQLNativeSetupPage( pParent, _rAttrSet );
}
@@ -343,7 +343,7 @@ using namespace ::com::sun::star;
}
// OMySQLJDBCConnectionPageSetup
- OGeneralSpecialJDBCConnectionPageSetup::OGeneralSpecialJDBCConnectionPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs ,sal_uInt16 _nPortId, sal_uInt16 _nDefaultPortResId, sal_uInt16 _nHelpTextResId, sal_uInt16 _nHeaderTextResId, sal_uInt16 _nDriverClassId)
+ OGeneralSpecialJDBCConnectionPageSetup::OGeneralSpecialJDBCConnectionPageSetup( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ,sal_uInt16 _nPortId, sal_uInt16 _nDefaultPortResId, sal_uInt16 _nHelpTextResId, sal_uInt16 _nHeaderTextResId, sal_uInt16 _nDriverClassId)
:OGenericAdministrationPage(pParent, "SpecialJDBCConnectionPage", "dbaccess/ui/specialjdbcconnectionpage.ui", _rCoreAttrs)
,m_nPortId(_nPortId)
{
@@ -387,7 +387,7 @@ using namespace ::com::sun::star;
SetRoadmapStateValue(false);
}
- OGenericAdministrationPage* OGeneralSpecialJDBCConnectionPageSetup::CreateMySQLJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet )
+ OGenericAdministrationPage* OGeneralSpecialJDBCConnectionPageSetup::CreateMySQLJDBCTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet )
{
return ( new OGeneralSpecialJDBCConnectionPageSetup( pParent,
_rAttrSet,
@@ -398,7 +398,7 @@ using namespace ::com::sun::star;
STR_MYSQL_DRIVERCLASSTEXT) );
}
- OGenericAdministrationPage* OGeneralSpecialJDBCConnectionPageSetup::CreateOracleJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet )
+ OGenericAdministrationPage* OGeneralSpecialJDBCConnectionPageSetup::CreateOracleJDBCTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet )
{
return ( new OGeneralSpecialJDBCConnectionPageSetup( pParent,
_rAttrSet,
@@ -512,13 +512,13 @@ using namespace ::com::sun::star;
return 0L;
}
- OGenericAdministrationPage* OJDBCConnectionPageSetup::CreateJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet )
+ OGenericAdministrationPage* OJDBCConnectionPageSetup::CreateJDBCTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet )
{
return ( new OJDBCConnectionPageSetup( pParent, _rAttrSet));
}
// OMySQLJDBCConnectionPageSetup
- OJDBCConnectionPageSetup::OJDBCConnectionPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs)
+ OJDBCConnectionPageSetup::OJDBCConnectionPageSetup( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs)
:OConnectionTabPageSetup(pParent, "JDBCConnectionPage", "dbaccess/ui/jdbcconnectionpage.ui", _rCoreAttrs,
STR_JDBC_HELPTEXT, STR_JDBC_HEADERTEXT, STR_COMMONURL)
{
@@ -621,13 +621,13 @@ using namespace ::com::sun::star;
return 0L;
}
- OGenericAdministrationPage* OSpreadSheetConnectionPageSetup::CreateSpreadSheetTabPage( Window* pParent, const SfxItemSet& _rAttrSet )
+ OGenericAdministrationPage* OSpreadSheetConnectionPageSetup::CreateSpreadSheetTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet )
{
return ( new OSpreadSheetConnectionPageSetup( pParent, _rAttrSet ) );
}
- OSpreadSheetConnectionPageSetup::OSpreadSheetConnectionPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs )
+ OSpreadSheetConnectionPageSetup::OSpreadSheetConnectionPageSetup( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs )
:OConnectionTabPageSetup(pParent, "DBWizSpreadsheetPage", "dbaccess/ui/dbwizspreadsheetpage.ui", _rCoreAttrs, STR_SPREADSHEET_HELPTEXT, STR_SPREADSHEET_HEADERTEXT, STR_SPREADSHEETPATH)
{
get(m_pPasswordrequired, "passwordrequired");
@@ -662,13 +662,13 @@ using namespace ::com::sun::star;
return bChangedSomething;
}
- OGenericAdministrationPage* OAuthentificationPageSetup::CreateAuthentificationTabPage( Window* pParent, const SfxItemSet& _rAttrSet )
+ OGenericAdministrationPage* OAuthentificationPageSetup::CreateAuthentificationTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet )
{
return ( new OAuthentificationPageSetup( pParent, _rAttrSet) );
}
- OAuthentificationPageSetup::OAuthentificationPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs )
+ OAuthentificationPageSetup::OAuthentificationPageSetup( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs )
:OGenericAdministrationPage(pParent, "AuthentificationPage", "dbaccess/ui/authentificationpage.ui", _rCoreAttrs )
{
get(m_pFTHelpText, "helptext");
@@ -729,13 +729,13 @@ using namespace ::com::sun::star;
return bChangedSomething;
}
- OGenericAdministrationPage* OFinalDBPageSetup::CreateFinalDBTabPageSetup( Window* pParent, const SfxItemSet& _rAttrSet)
+ OGenericAdministrationPage* OFinalDBPageSetup::CreateFinalDBTabPageSetup( vcl::Window* pParent, const SfxItemSet& _rAttrSet)
{
return ( new OFinalDBPageSetup( pParent, _rAttrSet) );
}
- OFinalDBPageSetup::OFinalDBPageSetup(Window* pParent, const SfxItemSet& _rCoreAttrs)
+ OFinalDBPageSetup::OFinalDBPageSetup(vcl::Window* pParent, const SfxItemSet& _rCoreAttrs)
: OGenericAdministrationPage(pParent, "PageFinal",
"dbaccess/ui/finalpagewizard.ui", _rCoreAttrs)
{
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
index 6ffd08b5c770..4756b6c75b57 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
@@ -40,8 +40,8 @@ namespace dbaui
{
public:
virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE;
- static OGenericAdministrationPage* CreateSpreadSheetTabPage( Window* pParent, const SfxItemSet& _rAttrSet );
- OSpreadSheetConnectionPageSetup(Window* pParent, const SfxItemSet& _rCoreAttrs);
+ static OGenericAdministrationPage* CreateSpreadSheetTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet );
+ OSpreadSheetConnectionPageSetup(vcl::Window* pParent, const SfxItemSet& _rCoreAttrs);
protected:
CheckBox *m_pPasswordrequired;
@@ -59,8 +59,8 @@ namespace dbaui
{
public:
virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE;
- static OGenericAdministrationPage* CreateTextTabPage( Window* pParent, const SfxItemSet& _rAttrSet );
- OTextConnectionPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs );
+ static OGenericAdministrationPage* CreateTextTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet );
+ OTextConnectionPageSetup( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs );
OTextConnectionHelper* m_pTextConnectionHelper;
private:
@@ -81,8 +81,8 @@ namespace dbaui
{
public:
virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE;
- static OGenericAdministrationPage* CreateLDAPTabPage( Window* pParent, const SfxItemSet& _rAttrSet );
- OLDAPConnectionPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs );
+ static OGenericAdministrationPage* CreateLDAPTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet );
+ OLDAPConnectionPageSetup( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs );
virtual Link getControlModifiedLink() SAL_OVERRIDE { return LINK(this, OLDAPConnectionPageSetup, OnEditModified); }
protected:
@@ -111,9 +111,9 @@ namespace dbaui
MySQLNativeSettings m_aMySQLSettings;
public:
- MySQLNativeSetupPage( Window* _pParent, const SfxItemSet& _rCoreAttrs );
+ MySQLNativeSetupPage( vcl::Window* _pParent, const SfxItemSet& _rCoreAttrs );
- static OGenericAdministrationPage* Create( Window* pParent, const SfxItemSet& _rAttrSet );
+ static OGenericAdministrationPage* Create( vcl::Window* pParent, const SfxItemSet& _rAttrSet );
protected:
virtual void fillControls( ::std::vector< ISaveValueWrapper* >& _rControlList ) SAL_OVERRIDE;
@@ -132,15 +132,15 @@ namespace dbaui
class OGeneralSpecialJDBCConnectionPageSetup : public OGenericAdministrationPage
{
public:
- OGeneralSpecialJDBCConnectionPageSetup( Window* pParent
+ OGeneralSpecialJDBCConnectionPageSetup( vcl::Window* pParent
, const SfxItemSet& _rCoreAttrs
, sal_uInt16 _nPortId
, sal_uInt16 _nDefaultPortResId
, sal_uInt16 _nHelpTextResId
, sal_uInt16 _nHeaderTextResId
, sal_uInt16 _nDriverClassId );
- static OGenericAdministrationPage* CreateMySQLJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet );
- static OGenericAdministrationPage* CreateOracleJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet );
+ static OGenericAdministrationPage* CreateMySQLJDBCTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet );
+ static OGenericAdministrationPage* CreateOracleJDBCTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet );
protected:
virtual bool FillItemSet( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE;
@@ -173,8 +173,8 @@ namespace dbaui
class OJDBCConnectionPageSetup : public OConnectionTabPageSetup
{
public:
- OJDBCConnectionPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs );
- static OGenericAdministrationPage* CreateJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet );
+ OJDBCConnectionPageSetup( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs );
+ static OGenericAdministrationPage* CreateJDBCTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet );
protected:
virtual bool checkTestConnection() SAL_OVERRIDE;
@@ -202,9 +202,9 @@ namespace dbaui
VIA_NATIVE
};
- OMySQLIntroPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs);
+ OMySQLIntroPageSetup( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs);
- static OMySQLIntroPageSetup* CreateMySQLIntroTabPage( Window* _pParent, const SfxItemSet& _rAttrSet );
+ static OMySQLIntroPageSetup* CreateMySQLIntroTabPage( vcl::Window* _pParent, const SfxItemSet& _rAttrSet );
ConnectionType getMySQLMode();
Link maClickHdl;
void SetClickHdl( const Link& rLink ) { maClickHdl = rLink; }
@@ -232,8 +232,8 @@ namespace dbaui
{
public:
virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE;
- static OGenericAdministrationPage* CreateAuthentificationTabPage( Window* pParent, const SfxItemSet& _rAttrSet );
- OAuthentificationPageSetup(Window* pParent, const SfxItemSet& _rCoreAttrs);
+ static OGenericAdministrationPage* CreateAuthentificationTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet );
+ OAuthentificationPageSetup(vcl::Window* pParent, const SfxItemSet& _rCoreAttrs);
protected:
FixedText* m_pFTHelpText;
@@ -254,7 +254,7 @@ namespace dbaui
{
public:
virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE;
- static OGenericAdministrationPage* CreateFinalDBTabPageSetup( Window* pParent, const SfxItemSet& _rAttrSet);
+ static OGenericAdministrationPage* CreateFinalDBTabPageSetup( vcl::Window* pParent, const SfxItemSet& _rAttrSet);
FixedText* m_pFTFinalHeader;
FixedText* m_pFTFinalHelpText;
@@ -265,7 +265,7 @@ namespace dbaui
CheckBox* m_pCBStartTableWizard;
FixedText* m_pFTFinalText;
- OFinalDBPageSetup(Window* pParent, const SfxItemSet& _rCoreAttrs);
+ OFinalDBPageSetup(vcl::Window* pParent, const SfxItemSet& _rCoreAttrs);
bool IsDatabaseDocumentToBeRegistered();
bool IsDatabaseDocumentToBeOpened();
bool IsTableWizardToBeStarted();
diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
index 5387c6359e0f..f459c81add7f 100644
--- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
@@ -139,7 +139,7 @@ namespace
}
// ODbDataSourceAdministrationHelper
-ODbDataSourceAdministrationHelper::ODbDataSourceAdministrationHelper(const Reference< XComponentContext >& _xORB,Window* _pParent,IItemSetHelper* _pItemSetHelper)
+ODbDataSourceAdministrationHelper::ODbDataSourceAdministrationHelper(const Reference< XComponentContext >& _xORB, vcl::Window* _pParent,IItemSetHelper* _pItemSetHelper)
: m_xContext(_xORB)
, m_pParent(_pParent)
, m_pItemSetHelper(_pItemSetHelper)
diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.hxx b/dbaccess/source/ui/dlg/DbAdminImpl.hxx
index de06359af2bd..4b46778afb92 100644
--- a/dbaccess/source/ui/dlg/DbAdminImpl.hxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.hxx
@@ -36,7 +36,7 @@
#include <com/sun/star/frame/XModel.hpp>
#include <svl/poolitem.hxx>
-class Window;
+namespace vcl { class Window; }
namespace dbaui
{
namespace DataSourceInfoConverter
@@ -68,12 +68,12 @@ namespace dbaui
MapInt2String m_aDirectPropTranslator; /// translating property id's into names (direct properties of a data source)
MapInt2String m_aIndirectPropTranslator; /// translating property id's into names (indirect properties of a data source)
- Window* m_pParent;
+ vcl::Window* m_pParent;
IItemSetHelper* m_pItemSetHelper;
public:
ODbDataSourceAdministrationHelper(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _xORB
- ,Window* _pParent
+ ,vcl::Window* _pParent
,IItemSetHelper* _pItemSetHelper);
/** translate the current dialog SfxItems into driver relevant PropertyValues
diff --git a/dbaccess/source/ui/dlg/DriverSettings.hxx b/dbaccess/source/ui/dlg/DriverSettings.hxx
index a31fd62625fd..6a6ed636f295 100644
--- a/dbaccess/source/ui/dlg/DriverSettings.hxx
+++ b/dbaccess/source/ui/dlg/DriverSettings.hxx
@@ -24,7 +24,7 @@
#include <vector>
class SfxTabPage;
-class Window;
+namespace vcl { class Window; }
namespace dbaui
{
/// a collection class for all details a driver needs
@@ -44,53 +44,53 @@ namespace dbaui
/** Creates the detail page for Dbase
*/
- static SfxTabPage* CreateDbase2( Window* _pParent, const SfxItemSet* _rAttrSet );
+ static SfxTabPage* CreateDbase2( vcl::Window* _pParent, const SfxItemSet* _rAttrSet );
/** Creates the detail page for ado
*/
- static SfxTabPage* CreateDbase( Window* _pParent, const SfxItemSet* _rAttrSet );
+ static SfxTabPage* CreateDbase( vcl::Window* _pParent, const SfxItemSet* _rAttrSet );
/** Creates the detail page for ado
*/
- static SfxTabPage* CreateAdo( Window* _pParent, const SfxItemSet* _rAttrSet );
+ static SfxTabPage* CreateAdo( vcl::Window* _pParent, const SfxItemSet* _rAttrSet );
/** Creates the detail page for ODBC
*/
- static SfxTabPage* CreateODBC( Window* _pParent, const SfxItemSet* _rAttrSet );
+ static SfxTabPage* CreateODBC( vcl::Window* _pParent, const SfxItemSet* _rAttrSet );
/** Creates the detail page for user
*/
- static SfxTabPage* CreateUser( Window* _pParent, const SfxItemSet* _rAttrSet );
+ static SfxTabPage* CreateUser( vcl::Window* _pParent, const SfxItemSet* _rAttrSet );
/** Creates the detail page for MySQLODBC
*/
- static SfxTabPage* CreateMySQLODBC( Window* _pParent, const SfxItemSet* _rAttrSet );
+ static SfxTabPage* CreateMySQLODBC( vcl::Window* _pParent, const SfxItemSet* _rAttrSet );
/** Creates the detail page for MySQLJDBC
*/
- static SfxTabPage* CreateMySQLJDBC( Window* _pParent, const SfxItemSet* _rAttrSet );
+ static SfxTabPage* CreateMySQLJDBC( vcl::Window* _pParent, const SfxItemSet* _rAttrSet );
/** Creates the detail page for MySQLNATIVE
*/
- static SfxTabPage* CreateMySQLNATIVE( Window* _pParent, const SfxItemSet* _rAttrSet );
+ static SfxTabPage* CreateMySQLNATIVE( vcl::Window* _pParent, const SfxItemSet* _rAttrSet );
/** Creates the detail page for Oracle JDBC
*/
- static SfxTabPage* CreateOracleJDBC( Window* pParent, const SfxItemSet* _rAttrSet );
+ static SfxTabPage* CreateOracleJDBC( vcl::Window* pParent, const SfxItemSet* _rAttrSet );
/** Creates the detail page for LDAP
*/
- static SfxTabPage* CreateLDAP( Window* _pParent, const SfxItemSet* _rAttrSet );
+ static SfxTabPage* CreateLDAP( vcl::Window* _pParent, const SfxItemSet* _rAttrSet );
/// Creates the detail page for Text
- static SfxTabPage* CreateText( Window* _pParent, const SfxItemSet* _rAttrSet );
+ static SfxTabPage* CreateText( vcl::Window* _pParent, const SfxItemSet* _rAttrSet );
/// creates the GeneratedValues page
- static SfxTabPage* CreateGeneratedValuesPage( Window* _pParent, const SfxItemSet* _rAttrSet );
+ static SfxTabPage* CreateGeneratedValuesPage( vcl::Window* _pParent, const SfxItemSet* _rAttrSet );
/// creates the "Special Settings" page of the "Advanced Settings" dialog
- static SfxTabPage* CreateSpecialSettingsPage( Window* _pParent, const SfxItemSet* _rAttrSet );
+ static SfxTabPage* CreateSpecialSettingsPage( vcl::Window* _pParent, const SfxItemSet* _rAttrSet );
};
}
diff --git a/dbaccess/source/ui/dlg/QueryPropertiesDialog.cxx b/dbaccess/source/ui/dlg/QueryPropertiesDialog.cxx
index 1907630ada63..2c8b9b68ab48 100644
--- a/dbaccess/source/ui/dlg/QueryPropertiesDialog.cxx
+++ b/dbaccess/source/ui/dlg/QueryPropertiesDialog.cxx
@@ -13,7 +13,7 @@ namespace dbaui
{
QueryPropertiesDialog::QueryPropertiesDialog(
- Window* pParent, const bool bDistinct, const sal_Int64 nLimit )
+ vcl::Window* pParent, const bool bDistinct, const sal_Int64 nLimit )
: ModalDialog(pParent, "QueryPropertiesDialog", "dbaccess/ui/querypropertiesdialog.ui")
, m_pRB_Distinct( 0 )
, m_pRB_NonDistinct( 0 )
diff --git a/dbaccess/source/ui/dlg/TablesSingleDlg.cxx b/dbaccess/source/ui/dlg/TablesSingleDlg.cxx
index f7f2789ef8b2..a4a51e3d2623 100644
--- a/dbaccess/source/ui/dlg/TablesSingleDlg.cxx
+++ b/dbaccess/source/ui/dlg/TablesSingleDlg.cxx
@@ -37,7 +37,7 @@ using namespace com::sun::star::beans;
using namespace com::sun::star::container;
// OTableSubscriptionDialog
-OTableSubscriptionDialog::OTableSubscriptionDialog(Window* pParent
+OTableSubscriptionDialog::OTableSubscriptionDialog(vcl::Window* pParent
,SfxItemSet* _pItems
,const Reference< XComponentContext >& _rxORB
,const ::com::sun::star::uno::Any& _aDataSourceName)
diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
index aab6965310df..c99292a925ef 100644
--- a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
@@ -56,7 +56,7 @@
namespace dbaui
{
- OTextConnectionHelper::OTextConnectionHelper( Window* pParent, const short _nAvailableSections )
+ OTextConnectionHelper::OTextConnectionHelper( vcl::Window* pParent, const short _nAvailableSections )
:TabPage(pParent, "TextPage", "dbaccess/ui/textpage.ui")
,m_aFieldSeparatorList (ModuleRes(STR_AUTOFIELDSEPARATORLIST))
,m_aTextSeparatorList (ModuleRes(STR_AUTOTEXTSEPARATORLIST))
@@ -114,7 +114,7 @@ namespace dbaui
struct SectionDescriptor
{
short nFlag;
- Window* pFirstControl;
+ vcl::Window* pFirstControl;
} aSections[] = {
{ TC_EXTENSION, m_pExtensionHeader },
{ TC_SEPARATORS, m_pFormatHeader },
@@ -131,14 +131,14 @@ namespace dbaui
continue;
}
- Window* pThisSection = aSections[section].pFirstControl;
- Window* pNextSection = aSections[section+1].pFirstControl;
+ vcl::Window* pThisSection = aSections[section].pFirstControl;
+ vcl::Window* pNextSection = aSections[section+1].pFirstControl;
// hide all elements from this section
- Window* pControl = pThisSection;
+ vcl::Window* pControl = pThisSection;
while ( ( pControl != pNextSection ) && pControl )
{
- Window* pRealWindow = pControl->GetWindow( WINDOW_CLIENT );
+ vcl::Window* pRealWindow = pControl->GetWindow( WINDOW_CLIENT );
#if OSL_DEBUG_LEVEL > 0
OUString sWindowText( pRealWindow->GetText() );
(void)sWindowText;
diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.hxx b/dbaccess/source/ui/dlg/TextConnectionHelper.hxx
index a45574ba8a9b..b9317f8b46b6 100644
--- a/dbaccess/source/ui/dlg/TextConnectionHelper.hxx
+++ b/dbaccess/source/ui/dlg/TextConnectionHelper.hxx
@@ -47,7 +47,7 @@ namespace dbaui
Link m_aModifiedHandler; /// to be called if something on the page has been modified
public:
- OTextConnectionHelper( Window* pParent, const short _nAvailableSections );
+ OTextConnectionHelper( vcl::Window* pParent, const short _nAvailableSections );
virtual ~OTextConnectionHelper();
private:
diff --git a/dbaccess/source/ui/dlg/UserAdmin.cxx b/dbaccess/source/ui/dlg/UserAdmin.cxx
index d6dc4f2bae98..6afe53364b3b 100644
--- a/dbaccess/source/ui/dlg/UserAdmin.cxx
+++ b/dbaccess/source/ui/dlg/UserAdmin.cxx
@@ -61,13 +61,13 @@ class OPasswordDialog : public ModalDialog
DECL_LINK( ModifiedHdl, Edit * );
public:
- OPasswordDialog( Window* pParent,const OUString& _sUserName);
+ OPasswordDialog( vcl::Window* pParent,const OUString& _sUserName);
OUString GetOldPassword() const { return m_pEDOldPassword->GetText(); }
OUString GetNewPassword() const { return m_pEDPassword->GetText(); }
};
-OPasswordDialog::OPasswordDialog(Window* _pParent,const OUString& _sUserName)
+OPasswordDialog::OPasswordDialog(vcl::Window* _pParent,const OUString& _sUserName)
: ModalDialog(_pParent, "PasswordDialog", "dbaccess/ui/password.ui")
{
get(m_pUser, "userframe");
@@ -108,7 +108,7 @@ IMPL_LINK( OPasswordDialog, ModifiedHdl, Edit *, pEdit )
}
// OUserAdmin
-OUserAdmin::OUserAdmin(Window* pParent,const SfxItemSet& _rAttrSet)
+OUserAdmin::OUserAdmin(vcl::Window* pParent,const SfxItemSet& _rAttrSet)
: OGenericAdministrationPage( pParent, "UserAdminPage", "dbaccess/ui/useradminpage.ui", _rAttrSet)
, m_pUSER(0)
, m_pNEWUSER(0)
@@ -181,7 +181,7 @@ void OUserAdmin::FillUserNames()
}
-SfxTabPage* OUserAdmin::Create( Window* pParent, const SfxItemSet* _rAttrSet )
+SfxTabPage* OUserAdmin::Create( vcl::Window* pParent, const SfxItemSet* _rAttrSet )
{
return ( new OUserAdmin( pParent, *_rAttrSet ) );
}
diff --git a/dbaccess/source/ui/dlg/UserAdmin.hxx b/dbaccess/source/ui/dlg/UserAdmin.hxx
index 8d8115cce534..605baea7b30e 100644
--- a/dbaccess/source/ui/dlg/UserAdmin.hxx
+++ b/dbaccess/source/ui/dlg/UserAdmin.hxx
@@ -60,9 +60,9 @@ protected:
void FillUserNames();
- OUserAdmin( Window* pParent, const SfxItemSet& _rCoreAttrs);
+ OUserAdmin( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs);
public:
- static SfxTabPage* Create( Window* pParent, const SfxItemSet* _rAttrSet );
+ static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* _rAttrSet );
virtual ~OUserAdmin();
OUString GetUser();
diff --git a/dbaccess/source/ui/dlg/UserAdminDlg.cxx b/dbaccess/source/ui/dlg/UserAdminDlg.cxx
index 633e83e2998c..2b17eccec0f9 100644
--- a/dbaccess/source/ui/dlg/UserAdminDlg.cxx
+++ b/dbaccess/source/ui/dlg/UserAdminDlg.cxx
@@ -46,7 +46,7 @@ namespace dbaui
using namespace ::com::sun::star::sdbcx;
// OUserAdminDlg
- OUserAdminDlg::OUserAdminDlg(Window* _pParent
+ OUserAdminDlg::OUserAdminDlg(vcl::Window* _pParent
, SfxItemSet* _pItems
,const Reference< XComponentContext >& _rxORB
,const ::com::sun::star::uno::Any& _aDataSourceName
@@ -119,7 +119,7 @@ namespace dbaui
static_cast<OGenericAdministrationPage&>(_rPage).SetServiceFactory( m_pImpl->getORB() );
static_cast<OGenericAdministrationPage&>(_rPage).SetAdminDialog(this,this);
- Window *pWin = GetViewWindow();
+ vcl::Window *pWin = GetViewWindow();
if(pWin)
pWin->Invalidate();
diff --git a/dbaccess/source/ui/dlg/admincontrols.cxx b/dbaccess/source/ui/dlg/admincontrols.cxx
index 94459d8be876..ddff2e67b7cf 100644
--- a/dbaccess/source/ui/dlg/admincontrols.cxx
+++ b/dbaccess/source/ui/dlg/admincontrols.cxx
@@ -56,14 +56,14 @@ namespace dbaui
}
// IWindowOperator
- virtual void operateOn( const VclWindowEvent& _rTrigger, Window& _rOperateOn ) const SAL_OVERRIDE;
+ virtual void operateOn( const VclWindowEvent& _rTrigger, vcl::Window& _rOperateOn ) const SAL_OVERRIDE;
private:
const OUString m_sDisabledText;
OUString m_sUserText;
};
- void TextResetOperator::operateOn( const VclWindowEvent& _rTrigger, Window& _rOperateOn ) const
+ void TextResetOperator::operateOn( const VclWindowEvent& _rTrigger, vcl::Window& _rOperateOn ) const
{
OSL_ENSURE( _rTrigger.GetWindow() == &_rOperateOn, "TextResetOperator::operateOn: you're misusing this implementation!" );
@@ -116,7 +116,7 @@ namespace dbaui
,public ::svt::DialogController
{
public:
- TextResetOperatorController( Window& _rObservee, const OUString& _rDisabledText )
+ TextResetOperatorController( vcl::Window& _rObservee, const OUString& _rDisabledText )
:TextResetOperatorController_Base( _rDisabledText )
,::svt::DialogController( _rObservee, getEventFilter(), getOperator() )
{
@@ -125,7 +125,7 @@ namespace dbaui
};
// MySQLNativeSettings
- MySQLNativeSettings::MySQLNativeSettings( Window& _rParent, const Link& _rControlModificationLink )
+ MySQLNativeSettings::MySQLNativeSettings( vcl::Window& _rParent, const Link& _rControlModificationLink )
:TabPage( &_rParent, "MysqlNativeSettings", "dbaccess/ui/mysqlnativesettings.ui" )
{
get(m_pDatabaseNameLabel, "dbnamelabel");
diff --git a/dbaccess/source/ui/dlg/admincontrols.hxx b/dbaccess/source/ui/dlg/admincontrols.hxx
index daff95a6a918..e6e214dca1b9 100644
--- a/dbaccess/source/ui/dlg/admincontrols.hxx
+++ b/dbaccess/source/ui/dlg/admincontrols.hxx
@@ -52,7 +52,7 @@ namespace dbaui
m_aControlDependencies;
public:
- MySQLNativeSettings( Window& _rParent, const Link& _rControlModificationLink );
+ MySQLNativeSettings( vcl::Window& _rParent, const Link& _rControlModificationLink );
virtual ~MySQLNativeSettings();
void fillControls( ::std::vector< ISaveValueWrapper* >& _rControlList );
diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx
index 8a5991e6a0b0..0d1510998831 100644
--- a/dbaccess/source/ui/dlg/adminpages.cxx
+++ b/dbaccess/source/ui/dlg/adminpages.cxx
@@ -56,7 +56,7 @@ namespace dbaui
{
}
- OGenericAdministrationPage::OGenericAdministrationPage(Window* _pParent, const OString& _rId, const OUString& _rUIXMLDescription, const SfxItemSet& _rAttrSet)
+ OGenericAdministrationPage::OGenericAdministrationPage(vcl::Window* _pParent, const OString& _rId, const OUString& _rUIXMLDescription, const SfxItemSet& _rAttrSet)
:SfxTabPage(_pParent, _rId, _rUIXMLDescription, &_rAttrSet)
,m_abEnableRoadmap(false)
,m_pAdminDialog(NULL)
@@ -258,7 +258,7 @@ namespace dbaui
Point aReference = _rReference.GetPosPixel();
aReference.Y() += _rReference.GetSizePixel().Height();
- const Window* pConverter = _rControl.GetParent();
+ const vcl::Window* pConverter = _rControl.GetParent();
Size aOffset = pConverter->LogicToPixel( Size( _nIndentAppFont, ( _eRelation == RelatedControls ? 3 : 6 ) ), MAP_APPFONT );
Point aControlPos( aReference.X() + aOffset.Width(), aReference.Y() + aOffset.Height() );
diff --git a/dbaccess/source/ui/dlg/adminpages.hxx b/dbaccess/source/ui/dlg/adminpages.hxx
index bf6ec61d005f..d822a6a64031 100644
--- a/dbaccess/source/ui/dlg/adminpages.hxx
+++ b/dbaccess/source/ui/dlg/adminpages.hxx
@@ -102,7 +102,7 @@ namespace dbaui
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >
m_xORB;
public:
- OGenericAdministrationPage(Window* _pParent, const OString& _rId, const OUString& _rUIXMLDescription, const SfxItemSet& _rAttrSet);
+ OGenericAdministrationPage(vcl::Window* _pParent, const OString& _rId, const OUString& _rUIXMLDescription, const SfxItemSet& _rAttrSet);
/// set a handler which gets called every time something on the page has been modified
void SetModifiedHandler(const Link& _rHandler) { m_aModifiedHandler = _rHandler; }
@@ -256,7 +256,7 @@ namespace dbaui
/** fits the button size to be large enough to contain the buttons text
*/
static void fitSizeRightAligned( PushButton& io_button );
- // why is CalcMinimumSize not a virtual method of ::Window?
+ // why is CalcMinimumSize not a virtual method of vcl::Window?
};
} // namespace dbaui
diff --git a/dbaccess/source/ui/dlg/adtabdlg.cxx b/dbaccess/source/ui/dlg/adtabdlg.cxx
index e5721abe2ecc..d10b40cd32d6 100644
--- a/dbaccess/source/ui/dlg/adtabdlg.cxx
+++ b/dbaccess/source/ui/dlg/adtabdlg.cxx
@@ -314,7 +314,7 @@ bool QueryListFacade::isLeafSelected() const
return pEntry && !m_rQueryList.GetModel()->HasChildren( pEntry );
}
-OAddTableDlg::OAddTableDlg( Window* pParent, IAddTableDialogContext& _rContext )
+OAddTableDlg::OAddTableDlg( vcl::Window* pParent, IAddTableDialogContext& _rContext )
: ModelessDialog(pParent, "TablesJoinDialog", "dbaccess/ui/tablesjoindialog.ui")
, m_rContext(_rContext)
{
diff --git a/dbaccess/source/ui/dlg/advancedsettings.cxx b/dbaccess/source/ui/dlg/advancedsettings.cxx
index 27c202e58799..dadbb5c467fb 100644
--- a/dbaccess/source/ui/dlg/advancedsettings.cxx
+++ b/dbaccess/source/ui/dlg/advancedsettings.cxx
@@ -55,7 +55,7 @@ namespace dbaui
};
// SpecialSettingsPage
- SpecialSettingsPage::SpecialSettingsPage( Window* pParent, const SfxItemSet& _rCoreAttrs, const DataSourceMetaData& _rDSMeta )
+ SpecialSettingsPage::SpecialSettingsPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs, const DataSourceMetaData& _rDSMeta )
: OGenericAdministrationPage(pParent, "SpecialSettingsPage",
"dbaccess/ui/specialsettingspage.ui", _rCoreAttrs)
, m_pIsSQL92Check( NULL )
@@ -295,7 +295,7 @@ namespace dbaui
}
// GeneratedValuesPage
- GeneratedValuesPage::GeneratedValuesPage( Window* pParent, const SfxItemSet& _rCoreAttrs )
+ GeneratedValuesPage::GeneratedValuesPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs )
: OGenericAdministrationPage(pParent, "GeneratedValuesPage",
"dbaccess/ui/generatedvaluespage.ui", _rCoreAttrs)
{
@@ -368,7 +368,7 @@ namespace dbaui
}
// AdvancedSettingsDialog
- AdvancedSettingsDialog::AdvancedSettingsDialog( Window* _pParent, SfxItemSet* _pItems,
+ AdvancedSettingsDialog::AdvancedSettingsDialog( vcl::Window* _pParent, SfxItemSet* _pItems,
const Reference< XComponentContext >& _rxContext, const Any& _aDataSourceName )
: SfxTabDialog(_pParent, "AdvancedSettingsDialog",
"dbaccess/ui/advancedsettingsdialog.ui", _pItems)
@@ -435,7 +435,7 @@ namespace dbaui
static_cast<OGenericAdministrationPage&>(_rPage).SetServiceFactory( getORB() );
static_cast<OGenericAdministrationPage&>(_rPage).SetAdminDialog(this,this);
- Window *pWin = GetViewWindow();
+ vcl::Window *pWin = GetViewWindow();
if(pWin)
pWin->Invalidate();
diff --git a/dbaccess/source/ui/dlg/advancedsettings.hxx b/dbaccess/source/ui/dlg/advancedsettings.hxx
index ff28557b804d..af8d91a8d258 100644
--- a/dbaccess/source/ui/dlg/advancedsettings.hxx
+++ b/dbaccess/source/ui/dlg/advancedsettings.hxx
@@ -74,7 +74,7 @@ namespace dbaui
public:
virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE;
- SpecialSettingsPage(Window* pParent, const SfxItemSet& _rCoreAttrs, const DataSourceMetaData& _rDSMeta );
+ SpecialSettingsPage(vcl::Window* pParent, const SfxItemSet& _rCoreAttrs, const DataSourceMetaData& _rDSMeta );
protected:
virtual ~SpecialSettingsPage();
@@ -110,7 +110,7 @@ namespace dbaui
public:
virtual bool FillItemSet (SfxItemSet* _rCoreAttrs) SAL_OVERRIDE;
- GeneratedValuesPage( Window* pParent, const SfxItemSet& _rCoreAttrs );
+ GeneratedValuesPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs );
protected:
// nControlFlags is a combination of the CBTP_xxx-constants
diff --git a/dbaccess/source/ui/dlg/dbadmin.cxx b/dbaccess/source/ui/dlg/dbadmin.cxx
index 8f99adbb4533..ff60c14f8995 100644
--- a/dbaccess/source/ui/dlg/dbadmin.cxx
+++ b/dbaccess/source/ui/dlg/dbadmin.cxx
@@ -47,7 +47,7 @@ using namespace com::sun::star::beans;
using namespace com::sun::star::container;
// ODbAdminDialog
-ODbAdminDialog::ODbAdminDialog(Window* _pParent
+ODbAdminDialog::ODbAdminDialog(vcl::Window* _pParent
, SfxItemSet* _pItems
, const Reference< XComponentContext >& _rxContext)
: SfxTabDialog(_pParent, "AdminDialog",
@@ -85,7 +85,7 @@ void ODbAdminDialog::PageCreated(sal_uInt16 _nId, SfxTabPage& _rPage)
static_cast<OGenericAdministrationPage&>(_rPage).SetServiceFactory( getORB() );
static_cast<OGenericAdministrationPage&>(_rPage).SetAdminDialog(this,this);
- Window *pWin = GetViewWindow();
+ vcl::Window *pWin = GetViewWindow();
if(pWin)
pWin->Invalidate();
diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx
index ad111503149d..238a8ba415aa 100644
--- a/dbaccess/source/ui/dlg/dbfindex.cxx
+++ b/dbaccess/source/ui/dlg/dbfindex.cxx
@@ -40,7 +40,7 @@ using namespace ::svt;
const OString aGroupIdent("dBase III");
-ODbaseIndexDialog::ODbaseIndexDialog(Window * pParent, const OUString& aDataSrcName)
+ODbaseIndexDialog::ODbaseIndexDialog(vcl::Window * pParent, const OUString& aDataSrcName)
: ModalDialog(pParent, "DBaseIndexDialog", "dbaccess/ui/dbaseindexdialog.ui")
, m_aDSN(aDataSrcName)
, m_bCaseSensitiv(true)
diff --git a/dbaccess/source/ui/dlg/dbfindex.hxx b/dbaccess/source/ui/dlg/dbfindex.hxx
index e2cc016a9085..58aae3b04091 100644
--- a/dbaccess/source/ui/dlg/dbfindex.hxx
+++ b/dbaccess/source/ui/dlg/dbfindex.hxx
@@ -112,7 +112,7 @@ protected:
void checkButtons();
public:
- ODbaseIndexDialog( Window * pParent, const OUString& aDataSrcName );
+ ODbaseIndexDialog( vcl::Window * pParent, const OUString& aDataSrcName );
};
} // namespace dbaui
diff --git a/dbaccess/source/ui/dlg/dbwiz.cxx b/dbaccess/source/ui/dlg/dbwiz.cxx
index 03ffa016812c..00dcddd2d87d 100644
--- a/dbaccess/source/ui/dlg/dbwiz.cxx
+++ b/dbaccess/source/ui/dlg/dbwiz.cxx
@@ -62,7 +62,7 @@ using namespace com::sun::star::container;
#define ADDITIONAL_PAGE_MYSQL_NATIVE 12
// ODbTypeWizDialog
-ODbTypeWizDialog::ODbTypeWizDialog(Window* _pParent
+ODbTypeWizDialog::ODbTypeWizDialog(vcl::Window* _pParent
,SfxItemSet* _pItems
,const Reference< XComponentContext >& _rxORB
,const ::com::sun::star::uno::Any& _aDataSourceName
diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index 175f6c8d37c0..5649db4547ea 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -100,7 +100,7 @@ using namespace ::comphelper;
using namespace ::cppu;
// ODbTypeWizDialogSetup
-ODbTypeWizDialogSetup::ODbTypeWizDialogSetup(Window* _pParent
+ODbTypeWizDialogSetup::ODbTypeWizDialogSetup(vcl::Window* _pParent
,SfxItemSet* _pItems
,const Reference< XComponentContext >& _rxORB
,const ::com::sun::star::uno::Any& _aDataSourceName
diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx
index a0257d58dd4f..0904d6d1967c 100644
--- a/dbaccess/source/ui/dlg/detailpages.cxx
+++ b/dbaccess/source/ui/dlg/detailpages.cxx
@@ -56,7 +56,7 @@ namespace dbaui
using namespace ::com::sun::star::container;
using namespace ::dbtools;
- OCommonBehaviourTabPage::OCommonBehaviourTabPage(Window* pParent, const OString& rId,
+ OCommonBehaviourTabPage::OCommonBehaviourTabPage(vcl::Window* pParent, const OString& rId,
const OUString& rUIXMLDescription, const SfxItemSet& _rCoreAttrs,
sal_uInt32 nControlFlags)
@@ -187,7 +187,7 @@ namespace dbaui
}
// ODbaseDetailsPage
- ODbaseDetailsPage::ODbaseDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs )
+ ODbaseDetailsPage::ODbaseDetailsPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs )
:OCommonBehaviourTabPage(pParent, "DbasePage", "dbaccess/ui/dbasepage.ui", _rCoreAttrs, CBTP_USE_CHARSET)
{
get(m_pShowDeleted, "showDelRowsCheckbutton");
@@ -204,7 +204,7 @@ namespace dbaui
}
- SfxTabPage* ODriversSettings::CreateDbase( Window* pParent, const SfxItemSet* _rAttrSet )
+ SfxTabPage* ODriversSettings::CreateDbase( vcl::Window* pParent, const SfxItemSet* _rAttrSet )
{
return ( new ODbaseDetailsPage( pParent, *_rAttrSet ) );
}
@@ -260,7 +260,7 @@ namespace dbaui
}
// OAdoDetailsPage
- OAdoDetailsPage::OAdoDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs )
+ OAdoDetailsPage::OAdoDetailsPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs )
:OCommonBehaviourTabPage(pParent, "AutoCharset", "dbaccess/ui/autocharsetpage.ui", _rCoreAttrs, CBTP_USE_CHARSET )
{
@@ -270,20 +270,20 @@ namespace dbaui
{
}
- SfxTabPage* ODriversSettings::CreateAdo( Window* pParent, const SfxItemSet* _rAttrSet )
+ SfxTabPage* ODriversSettings::CreateAdo( vcl::Window* pParent, const SfxItemSet* _rAttrSet )
{
return ( new OAdoDetailsPage( pParent, *_rAttrSet ) );
}
// OOdbcDetailsPage
- OOdbcDetailsPage::OOdbcDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs )
+ OOdbcDetailsPage::OOdbcDetailsPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs )
:OCommonBehaviourTabPage(pParent, "ODBC", "dbaccess/ui/odbcpage.ui", _rCoreAttrs, CBTP_USE_CHARSET | CBTP_USE_OPTIONS)
{
get(m_pUseCatalog, "useCatalogCheckbutton");
m_pUseCatalog->SetToggleHdl(getControlModifiedLink());
}
- SfxTabPage* ODriversSettings::CreateODBC( Window* pParent, const SfxItemSet* _rAttrSet )
+ SfxTabPage* ODriversSettings::CreateODBC( vcl::Window* pParent, const SfxItemSet* _rAttrSet )
{
return ( new OOdbcDetailsPage( pParent, *_rAttrSet ) );
}
@@ -308,7 +308,7 @@ namespace dbaui
OCommonBehaviourTabPage::implInitControls(_rSet, _bSaveValue);
}
// OOdbcDetailsPage
- OUserDriverDetailsPage::OUserDriverDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs )
+ OUserDriverDetailsPage::OUserDriverDetailsPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs )
: OCommonBehaviourTabPage(pParent, "UserDetailsPage", "dbaccess/ui/userdetailspage.ui", _rCoreAttrs,
CBTP_USE_CHARSET | CBTP_USE_OPTIONS)
{
@@ -321,7 +321,7 @@ namespace dbaui
m_pUseCatalog->SetToggleHdl(getControlModifiedLink());
}
- SfxTabPage* ODriversSettings::CreateUser( Window* pParent, const SfxItemSet* _rAttrSet )
+ SfxTabPage* ODriversSettings::CreateUser( vcl::Window* pParent, const SfxItemSet* _rAttrSet )
{
return ( new OUserDriverDetailsPage( pParent, *_rAttrSet ) );
}
@@ -373,18 +373,18 @@ namespace dbaui
OCommonBehaviourTabPage::implInitControls(_rSet, _bSaveValue);
}
// OMySQLODBCDetailsPage
- OMySQLODBCDetailsPage::OMySQLODBCDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs )
+ OMySQLODBCDetailsPage::OMySQLODBCDetailsPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs )
:OCommonBehaviourTabPage(pParent, "AutoCharset", "dbaccess/ui/autocharsetpage.ui", _rCoreAttrs, CBTP_USE_CHARSET )
{
}
- SfxTabPage* ODriversSettings::CreateMySQLODBC( Window* pParent, const SfxItemSet* _rAttrSet )
+ SfxTabPage* ODriversSettings::CreateMySQLODBC( vcl::Window* pParent, const SfxItemSet* _rAttrSet )
{
return ( new OMySQLODBCDetailsPage( pParent, *_rAttrSet ) );
}
// OMySQLJDBCDetailsPage
- OGeneralSpecialJDBCDetailsPage::OGeneralSpecialJDBCDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ,sal_uInt16 _nPortId, bool bShowSocket )
+ OGeneralSpecialJDBCDetailsPage::OGeneralSpecialJDBCDetailsPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ,sal_uInt16 _nPortId, bool bShowSocket )
:OCommonBehaviourTabPage(pParent, "GeneralSpecialJDBCDetails", "dbaccess/ui/generalspecialjdbcdetailspage.ui", _rCoreAttrs, CBTP_USE_CHARSET)
,m_nPortId(_nPortId)
,m_bUseClass(true)
@@ -514,7 +514,7 @@ namespace dbaui
}
// MySQLNativePage
- MySQLNativePage::MySQLNativePage( Window* pParent, const SfxItemSet& _rCoreAttrs )
+ MySQLNativePage::MySQLNativePage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs )
:OCommonBehaviourTabPage(pParent, "MysqlNativePage", "dbaccess/ui/mysqlnativepage.ui", _rCoreAttrs, CBTP_USE_CHARSET )
,m_aMySQLSettings ( *get<VclVBox>("MySQLSettingsContainer"), getControlModifiedLink() )
{
@@ -584,22 +584,22 @@ namespace dbaui
OCommonBehaviourTabPage::implInitControls(_rSet, _bSaveValue);
}
- SfxTabPage* ODriversSettings::CreateMySQLJDBC( Window* pParent, const SfxItemSet* _rAttrSet )
+ SfxTabPage* ODriversSettings::CreateMySQLJDBC( vcl::Window* pParent, const SfxItemSet* _rAttrSet )
{
return ( new OGeneralSpecialJDBCDetailsPage( pParent, *_rAttrSet,DSID_MYSQL_PORTNUMBER ) );
}
- SfxTabPage* ODriversSettings::CreateMySQLNATIVE( Window* pParent, const SfxItemSet* _rAttrSet )
+ SfxTabPage* ODriversSettings::CreateMySQLNATIVE( vcl::Window* pParent, const SfxItemSet* _rAttrSet )
{
return ( new MySQLNativePage( pParent, *_rAttrSet ) );
}
- SfxTabPage* ODriversSettings::CreateOracleJDBC( Window* pParent, const SfxItemSet* _rAttrSet )
+ SfxTabPage* ODriversSettings::CreateOracleJDBC( vcl::Window* pParent, const SfxItemSet* _rAttrSet )
{
return ( new OGeneralSpecialJDBCDetailsPage( pParent, *_rAttrSet,DSID_ORACLE_PORTNUMBER, false) );
}
// OLDAPDetailsPage
- OLDAPDetailsPage::OLDAPDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs )
+ OLDAPDetailsPage::OLDAPDetailsPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs )
:OCommonBehaviourTabPage(pParent, "LDAP", "dbaccess/ui/ldappage.ui", _rCoreAttrs, 0)
{
get(m_pETBaseDN, "baseDNEntry");
@@ -619,7 +619,7 @@ namespace dbaui
m_pCBUseSSL->SetClickHdl(LINK(this, OLDAPDetailsPage,OnCheckBoxClick));
}
- SfxTabPage* ODriversSettings::CreateLDAP( Window* pParent, const SfxItemSet* _rAttrSet )
+ SfxTabPage* ODriversSettings::CreateLDAP( vcl::Window* pParent, const SfxItemSet* _rAttrSet )
{
return ( new OLDAPDetailsPage( pParent, *_rAttrSet ) );
}
@@ -676,7 +676,7 @@ namespace dbaui
}
// OTextDetailsPage
- OTextDetailsPage::OTextDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs )
+ OTextDetailsPage::OTextDetailsPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs )
:OCommonBehaviourTabPage(pParent, "EmptyPage", "dbaccess/ui/emptypage.ui", _rCoreAttrs, 0)
{
@@ -689,7 +689,7 @@ namespace dbaui
}
- SfxTabPage* ODriversSettings::CreateText( Window* pParent, const SfxItemSet* _rAttrSet )
+ SfxTabPage* ODriversSettings::CreateText( vcl::Window* pParent, const SfxItemSet* _rAttrSet )
{
return ( new OTextDetailsPage( pParent, *_rAttrSet ) );
}
@@ -727,12 +727,12 @@ namespace dbaui
return m_pTextConnectionHelper->prepareLeave();
}
- SfxTabPage* ODriversSettings::CreateGeneratedValuesPage( Window* _pParent, const SfxItemSet* _rAttrSet )
+ SfxTabPage* ODriversSettings::CreateGeneratedValuesPage( vcl::Window* _pParent, const SfxItemSet* _rAttrSet )
{
return new GeneratedValuesPage( _pParent, *_rAttrSet );
}
- SfxTabPage* ODriversSettings::CreateSpecialSettingsPage( Window* _pParent, const SfxItemSet* _rAttrSet )
+ SfxTabPage* ODriversSettings::CreateSpecialSettingsPage( vcl::Window* _pParent, const SfxItemSet* _rAttrSet )
{
OUString eType = ODbDataSourceAdministrationHelper::getDatasourceType( *_rAttrSet );
DataSourceMetaData aMetaData( eType );
diff --git a/dbaccess/source/ui/dlg/detailpages.hxx b/dbaccess/source/ui/dlg/detailpages.hxx
index 8fbba3c536fa..6ffef01e1434 100644
--- a/dbaccess/source/ui/dlg/detailpages.hxx
+++ b/dbaccess/source/ui/dlg/detailpages.hxx
@@ -73,7 +73,7 @@ namespace dbaui
virtual bool FillItemSet (SfxItemSet* _rCoreAttrs) SAL_OVERRIDE;
// nControlFlags is a combination of the CBTP_xxx-constants
- OCommonBehaviourTabPage(Window* pParent, const OString& rId, const OUString& rUIXMLDescription, const SfxItemSet& _rCoreAttrs, sal_uInt32 nControlFlags);
+ OCommonBehaviourTabPage(vcl::Window* pParent, const OString& rId, const OUString& rUIXMLDescription, const SfxItemSet& _rCoreAttrs, sal_uInt32 nControlFlags);
protected:
virtual ~OCommonBehaviourTabPage();
@@ -94,7 +94,7 @@ namespace dbaui
public:
virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE;
- ODbaseDetailsPage(Window* pParent, const SfxItemSet& _rCoreAttrs);
+ ODbaseDetailsPage(vcl::Window* pParent, const SfxItemSet& _rCoreAttrs);
private:
CheckBox* m_pShowDeleted;
FixedText* m_pFT_Message;
@@ -120,7 +120,7 @@ namespace dbaui
virtual ~OAdoDetailsPage();
public:
- OAdoDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs );
+ OAdoDetailsPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs );
};
// OOdbcDetailsPage
@@ -129,7 +129,7 @@ namespace dbaui
public:
virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE;
- OOdbcDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs );
+ OOdbcDetailsPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs );
protected:
virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE;
private:
@@ -142,7 +142,7 @@ namespace dbaui
public:
virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE;
- OUserDriverDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs );
+ OUserDriverDetailsPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs );
protected:
virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE;
virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE;
@@ -159,14 +159,14 @@ namespace dbaui
class OMySQLODBCDetailsPage : public OCommonBehaviourTabPage
{
public:
- OMySQLODBCDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs );
+ OMySQLODBCDetailsPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs );
};
// OGeneralSpecialJDBCDetailsPage
class OGeneralSpecialJDBCDetailsPage : public OCommonBehaviourTabPage
{
public:
- OGeneralSpecialJDBCDetailsPage( Window* pParent
+ OGeneralSpecialJDBCDetailsPage( vcl::Window* pParent
, const SfxItemSet& _rCoreAttrs
, sal_uInt16 _nPortId
, bool bShowSocket = true
@@ -198,7 +198,7 @@ namespace dbaui
class MySQLNativePage : public OCommonBehaviourTabPage
{
public:
- MySQLNativePage( Window* pParent,
+ MySQLNativePage( vcl::Window* pParent,
const SfxItemSet& _rCoreAttrs );
private:
@@ -223,7 +223,7 @@ namespace dbaui
public:
virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE;
- OLDAPDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs );
+ OLDAPDetailsPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs );
protected:
virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE;
private:
@@ -244,7 +244,7 @@ namespace dbaui
virtual ~OMozillaDetailsPage();
public:
- OMozillaDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs );
+ OMozillaDetailsPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs );
};
// OTextDetailsPage
@@ -253,7 +253,7 @@ namespace dbaui
public:
virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE;
- OTextDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs );
+ OTextDetailsPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs );
OTextConnectionHelper* m_pTextConnectionHelper;
private:
diff --git a/dbaccess/source/ui/dlg/directsql.cxx b/dbaccess/source/ui/dlg/directsql.cxx
index e78dd8387beb..b02b73332e6f 100644
--- a/dbaccess/source/ui/dlg/directsql.cxx
+++ b/dbaccess/source/ui/dlg/directsql.cxx
@@ -35,7 +35,7 @@ namespace dbaui
using namespace ::com::sun::star::lang;
// DirectSQLDialog
- DirectSQLDialog::DirectSQLDialog( Window* _pParent, const Reference< XConnection >& _rxConn )
+ DirectSQLDialog::DirectSQLDialog( vcl::Window* _pParent, const Reference< XConnection >& _rxConn )
:ModalDialog(_pParent, "DirectSQLDialog" , "dbaccess/ui/directsqldialog.ui")
,m_nHistoryLimit(20)
,m_nStatusCount(1)
diff --git a/dbaccess/source/ui/dlg/dlgattr.cxx b/dbaccess/source/ui/dlg/dlgattr.cxx
index 8af7569c36b6..468233f5c748 100644
--- a/dbaccess/source/ui/dlg/dlgattr.cxx
+++ b/dbaccess/source/ui/dlg/dlgattr.cxx
@@ -34,7 +34,7 @@
using namespace dbaui;
-SbaSbAttrDlg::SbaSbAttrDlg(Window* pParent, const SfxItemSet* pCellAttrs,
+SbaSbAttrDlg::SbaSbAttrDlg(vcl::Window* pParent, const SfxItemSet* pCellAttrs,
SvNumberFormatter* pFormatter, bool bHasFormat, bool bRow)
: SfxTabDialog(pParent, "FieldDialog", "dbaccess/ui/fielddialog.ui", pCellAttrs)
, m_nNumberFormatId(0)
diff --git a/dbaccess/source/ui/dlg/dlgsave.cxx b/dbaccess/source/ui/dlg/dlgsave.cxx
index 72219bb317ab..e2817a3d9b7a 100644
--- a/dbaccess/source/ui/dlg/dlgsave.cxx
+++ b/dbaccess/source/ui/dlg/dlgsave.cxx
@@ -176,7 +176,7 @@ namespace
}
}
-OSaveAsDlg::OSaveAsDlg( Window * pParent,
+OSaveAsDlg::OSaveAsDlg( vcl::Window * pParent,
const sal_Int32& _rType,
const Reference< XComponentContext >& _rxContext,
const Reference< XConnection>& _xConnection,
@@ -269,7 +269,7 @@ OSaveAsDlg::OSaveAsDlg( Window * pParent,
implInit();
}
-OSaveAsDlg::OSaveAsDlg( Window * pParent,
+OSaveAsDlg::OSaveAsDlg( vcl::Window * pParent,
const Reference< XComponentContext >& _rxContext,
const OUString& rDefault,
const OUString& _sLabel,
diff --git a/dbaccess/source/ui/dlg/dlgsize.cxx b/dbaccess/source/ui/dlg/dlgsize.cxx
index 209aecebb219..f73a1a27e95f 100644
--- a/dbaccess/source/ui/dlg/dlgsize.cxx
+++ b/dbaccess/source/ui/dlg/dlgsize.cxx
@@ -27,7 +27,7 @@ namespace dbaui
#define DEF_ROW_HEIGHT 45
#define DEF_COL_WIDTH 227
-DlgSize::DlgSize( Window* pParent, sal_Int32 nVal, bool bRow, sal_Int32 _nAlternativeStandard )
+DlgSize::DlgSize( vcl::Window* pParent, sal_Int32 nVal, bool bRow, sal_Int32 _nAlternativeStandard )
: ModalDialog(pParent, bRow ? OString("RowHeightDialog") : OString("ColWidthDialog"),
bRow ? OUString("dbaccess/ui/rowheightdialog.ui") : OUString("dbaccess/ui/colwidthdialog.ui"))
, m_nPrevValue(nVal)
diff --git a/dbaccess/source/ui/dlg/dsselect.cxx b/dbaccess/source/ui/dlg/dsselect.cxx
index 5583bfc5abb1..bcd1dc6add60 100644
--- a/dbaccess/source/ui/dlg/dsselect.cxx
+++ b/dbaccess/source/ui/dlg/dsselect.cxx
@@ -47,7 +47,7 @@ using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star::sdbcx;
using namespace ::com::sun::star::ui::dialogs;
using namespace ::comphelper;
-ODatasourceSelectDialog::ODatasourceSelectDialog(Window* _pParent, const StringBag& _rDatasources, SfxItemSet* _pOutputSet)
+ODatasourceSelectDialog::ODatasourceSelectDialog(vcl::Window* _pParent, const StringBag& _rDatasources, SfxItemSet* _pOutputSet)
: ModalDialog(_pParent, "ChooseDataSourceDialog",
"dbaccess/ui/choosedatasourcedialog.ui")
, m_pOutputSet(_pOutputSet)
diff --git a/dbaccess/source/ui/dlg/dsselect.hxx b/dbaccess/source/ui/dlg/dsselect.hxx
index d1e0deaddc67..298d7464fb87 100644
--- a/dbaccess/source/ui/dlg/dsselect.hxx
+++ b/dbaccess/source/ui/dlg/dsselect.hxx
@@ -52,7 +52,7 @@ protected:
#endif
public:
- ODatasourceSelectDialog( Window* _pParent, const StringBag& _rDatasources, SfxItemSet* _pOutputSet = NULL );
+ ODatasourceSelectDialog( vcl::Window* _pParent, const StringBag& _rDatasources, SfxItemSet* _pOutputSet = NULL );
virtual ~ODatasourceSelectDialog();
OUString GetSelected() const { return m_pDatasource->GetSelectEntry();}
diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx
index 77f970304606..29b08e0c7091 100644
--- a/dbaccess/source/ui/dlg/generalpage.cxx
+++ b/dbaccess/source/ui/dlg/generalpage.cxx
@@ -51,7 +51,7 @@ namespace dbaui
using namespace ::com::sun::star::container;
// OGeneralPage
- OGeneralPage::OGeneralPage( Window* pParent, const OUString& _rUIXMLDescription, const SfxItemSet& _rItems )
+ OGeneralPage::OGeneralPage( vcl::Window* pParent, const OUString& _rUIXMLDescription, const SfxItemSet& _rItems )
:OGenericAdministrationPage( pParent, "PageGeneral", _rUIXMLDescription, _rItems )
,m_eNotSupportedKnownType ( ::dbaccess::DST_UNKNOWN )
,m_pSpecialMessage ( NULL )
@@ -439,7 +439,7 @@ namespace dbaui
}
// OGeneralPageDialog
- OGeneralPageDialog::OGeneralPageDialog( Window* pParent, const SfxItemSet& _rItems )
+ OGeneralPageDialog::OGeneralPageDialog( vcl::Window* pParent, const SfxItemSet& _rItems )
:OGeneralPage( pParent, "dbaccess/ui/generalpagedialog.ui", _rItems )
{
}
@@ -482,7 +482,7 @@ namespace dbaui
}
// OGeneralPageWizard
- OGeneralPageWizard::OGeneralPageWizard( Window* pParent, const SfxItemSet& _rItems )
+ OGeneralPageWizard::OGeneralPageWizard( vcl::Window* pParent, const SfxItemSet& _rItems )
:OGeneralPage( pParent, "dbaccess/ui/generalpagewizard.ui", _rItems )
,m_pRB_CreateDatabase ( NULL )
,m_pRB_OpenExistingDatabase ( NULL )
diff --git a/dbaccess/source/ui/dlg/generalpage.hxx b/dbaccess/source/ui/dlg/generalpage.hxx
index 8fe77e17845c..0668f679721a 100644
--- a/dbaccess/source/ui/dlg/generalpage.hxx
+++ b/dbaccess/source/ui/dlg/generalpage.hxx
@@ -33,7 +33,7 @@ namespace dbaui
class OGeneralPage : public OGenericAdministrationPage
{
protected:
- OGeneralPage( Window* pParent, const OUString& _rUIXMLDescription, const SfxItemSet& _rItems );
+ OGeneralPage( vcl::Window* pParent, const OUString& _rUIXMLDescription, const SfxItemSet& _rItems );
virtual ~OGeneralPage();
OUString m_eCurrentSelection; /// currently selected type
@@ -102,7 +102,7 @@ namespace dbaui
class OGeneralPageDialog : public OGeneralPage
{
public:
- OGeneralPageDialog( Window* pParent, const SfxItemSet& _rItems );
+ OGeneralPageDialog( vcl::Window* pParent, const SfxItemSet& _rItems );
protected:
virtual bool FillItemSet( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE;
@@ -115,7 +115,7 @@ namespace dbaui
class OGeneralPageWizard : public OGeneralPage
{
public:
- OGeneralPageWizard( Window* pParent, const SfxItemSet& _rItems );
+ OGeneralPageWizard( vcl::Window* pParent, const SfxItemSet& _rItems );
public:
enum CreationMode
diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx
index 278af5a99388..9f2989efc949 100644
--- a/dbaccess/source/ui/dlg/indexdialog.cxx
+++ b/dbaccess/source/ui/dlg/indexdialog.cxx
@@ -87,7 +87,7 @@ namespace dbaui
}
// DbaIndexList
- DbaIndexList::DbaIndexList(Window* _pParent, WinBits nWinBits)
+ DbaIndexList::DbaIndexList(vcl::Window* _pParent, WinBits nWinBits)
:SvTreeListBox(_pParent, nWinBits)
,m_bSuspendSelectHdl(false)
{
@@ -158,13 +158,13 @@ namespace dbaui
return bReturn;
}
- extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeDbaIndexList(Window *pParent, VclBuilder::stringmap &)
+ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeDbaIndexList(vcl::Window *pParent, VclBuilder::stringmap &)
{
return new DbaIndexList (pParent, WB_BORDER);
}
// DbaIndexDialog
- DbaIndexDialog::DbaIndexDialog( Window* _pParent, const Sequence< OUString >& _rFieldNames,
+ DbaIndexDialog::DbaIndexDialog( vcl::Window* _pParent, const Sequence< OUString >& _rFieldNames,
const Reference< XNameAccess >& _rxIndexes,
const Reference< XConnection >& _rxConnection,
const Reference< XComponentContext >& _rxContext,sal_Int32 _nMaxColumnsInIndex)
diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
index b82f719ba14d..08901ac03c97 100644
--- a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
+++ b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
@@ -90,7 +90,7 @@ namespace dbaui
}
// IndexFieldsControl
- IndexFieldsControl::IndexFieldsControl( Window* _pParent, WinBits nWinStyle)
+ IndexFieldsControl::IndexFieldsControl( vcl::Window* _pParent, WinBits nWinStyle)
: EditBrowseBox(_pParent, EBBF_SMART_TAB_TRAVEL | EBBF_ACTIVATE_ON_BUTTONDOWN, nWinStyle, BROWSER_STANDARD_FLAGS)
, m_aSeekRow(m_aFields.end())
, m_pSortingCell(NULL)
@@ -103,7 +103,7 @@ namespace dbaui
GetDataWindow().SetUniqueId( UID_DLGINDEX_INDEXDETAILS_MAIN );
}
- extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeDbaIndexFieldsControl(Window *pParent, VclBuilder::stringmap &)
+ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeDbaIndexFieldsControl(vcl::Window *pParent, VclBuilder::stringmap &)
{
return new IndexFieldsControl (pParent, WB_BORDER | WB_NOTABSTOP);
}
diff --git a/dbaccess/source/ui/dlg/paramdialog.cxx b/dbaccess/source/ui/dlg/paramdialog.cxx
index 0d4267e5f182..d21d742670f8 100644
--- a/dbaccess/source/ui/dlg/paramdialog.cxx
+++ b/dbaccess/source/ui/dlg/paramdialog.cxx
@@ -51,7 +51,7 @@ namespace dbaui
OParameterDialog::OParameterDialog(
- Window* pParent, const Reference< XIndexAccess > & rParamContainer,
+ vcl::Window* pParent, const Reference< XIndexAccess > & rParamContainer,
const Reference< XConnection > & _rxConnection, const Reference< XComponentContext >& rxContext)
:ModalDialog( pParent, "Parameters", "dbaccess/ui/parametersdialog.ui")
,m_nCurrentlySelected(LISTBOX_ENTRY_NOTFOUND)
@@ -341,7 +341,7 @@ namespace dbaui
m_pOKBtn->SetStyle(m_pOKBtn->GetStyle() | WB_DEFBUTTON);
// set to focus to one of the buttons temporary (with this their "default"-state is really updated)
- Window* pOldFocus = Application::GetFocusWindow();
+ vcl::Window* pOldFocus = Application::GetFocusWindow();
// if the old focus window is the value edit do some preparations ...
Selection aSel;
diff --git a/dbaccess/source/ui/dlg/queryfilter.cxx b/dbaccess/source/ui/dlg/queryfilter.cxx
index 21b05b13ce2c..c686ae53f19b 100644
--- a/dbaccess/source/ui/dlg/queryfilter.cxx
+++ b/dbaccess/source/ui/dlg/queryfilter.cxx
@@ -62,7 +62,7 @@ void Replace_SQL_PlaceHolder(OUString& aString)
}
-DlgFilterCrit::DlgFilterCrit(Window * pParent,
+DlgFilterCrit::DlgFilterCrit(vcl::Window * pParent,
const Reference< XComponentContext >& rxContext,
const Reference< XConnection>& _rxConnection,
const Reference< XSingleSelectQueryComposer >& _rxComposer,
diff --git a/dbaccess/source/ui/dlg/queryorder.cxx b/dbaccess/source/ui/dlg/queryorder.cxx
index 47f42749ffcb..69f5fe4ae4e3 100644
--- a/dbaccess/source/ui/dlg/queryorder.cxx
+++ b/dbaccess/source/ui/dlg/queryorder.cxx
@@ -44,7 +44,7 @@ using namespace ::com::sun::star::sdbcx;
using namespace ::com::sun::star::beans;
-DlgOrderCrit::DlgOrderCrit(Window * pParent,
+DlgOrderCrit::DlgOrderCrit(vcl::Window * pParent,
const Reference< XConnection>& _rxConnection,
const Reference< XSingleSelectQueryComposer >& _rxComposer,
const Reference< XNameAccess>& _rxCols)
diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx
index 991319d1b880..2ab17aac08b2 100644
--- a/dbaccess/source/ui/dlg/sqlmessage.cxx
+++ b/dbaccess/source/ui/dlg/sqlmessage.cxx
@@ -301,13 +301,13 @@ class OExceptionChainDialog : public ModalDialog
ExceptionDisplayChain m_aExceptions;
public:
- OExceptionChainDialog( Window* pParent, const ExceptionDisplayChain& _rExceptions );
+ OExceptionChainDialog( vcl::Window* pParent, const ExceptionDisplayChain& _rExceptions );
protected:
DECL_LINK(OnExceptionSelected, void*);
};
-OExceptionChainDialog::OExceptionChainDialog(Window* pParent, const ExceptionDisplayChain& _rExceptions)
+OExceptionChainDialog::OExceptionChainDialog(vcl::Window* pParent, const ExceptionDisplayChain& _rExceptions)
: ModalDialog(pParent, "SQLExceptionDialog", "dbaccess/ui/sqlexception.ui")
, m_aExceptions(_rExceptions)
{
@@ -413,7 +413,7 @@ struct SQLMessageBox_Impl
namespace
{
- void lcl_positionInAppFont( const Window& _rParent, Window& _rChild, long _nX, long _nY, long _Width, long _Height )
+ void lcl_positionInAppFont( const vcl::Window& _rParent, vcl::Window& _rChild, long _nX, long _nY, long _Width, long _Height )
{
Point aPos = _rParent.LogicToPixel( Point( _nX, _nY ), MAP_APPFONT );
Size aSize = _rParent.LogicToPixel( Size( _Width, _Height ), MAP_APPFONT );
@@ -664,7 +664,7 @@ void OSQLMessageBox::Construct( WinBits _nStyle, MessageType _eImage )
impl_addDetailsButton();
}
-OSQLMessageBox::OSQLMessageBox(Window* _pParent, const SQLExceptionInfo& _rException, WinBits _nStyle, const OUString& _rHelpURL )
+OSQLMessageBox::OSQLMessageBox(vcl::Window* _pParent, const SQLExceptionInfo& _rException, WinBits _nStyle, const OUString& _rHelpURL )
:ButtonDialog( _pParent, WB_HORZ | WB_STDDIALOG )
,m_aInfoImage( this )
,m_aTitle( this, WB_WORDBREAK | WB_LEFT )
@@ -675,7 +675,7 @@ OSQLMessageBox::OSQLMessageBox(Window* _pParent, const SQLExceptionInfo& _rExcep
Construct( _nStyle, AUTO );
}
-OSQLMessageBox::OSQLMessageBox( Window* _pParent, const OUString& _rTitle, const OUString& _rMessage, WinBits _nStyle, MessageType _eType, const ::dbtools::SQLExceptionInfo* _pAdditionalErrorInfo )
+OSQLMessageBox::OSQLMessageBox( vcl::Window* _pParent, const OUString& _rTitle, const OUString& _rMessage, WinBits _nStyle, MessageType _eType, const ::dbtools::SQLExceptionInfo* _pAdditionalErrorInfo )
:ButtonDialog( _pParent, WB_HORZ | WB_STDDIALOG )
,m_aInfoImage( this )
,m_aTitle( this, WB_WORDBREAK | WB_LEFT )
@@ -704,14 +704,14 @@ IMPL_LINK( OSQLMessageBox, ButtonClickHdl, Button *, /*pButton*/ )
}
// OSQLWarningBox
-OSQLWarningBox::OSQLWarningBox( Window* _pParent, const OUString& _rMessage, WinBits _nStyle,
+OSQLWarningBox::OSQLWarningBox( vcl::Window* _pParent, const OUString& _rMessage, WinBits _nStyle,
const ::dbtools::SQLExceptionInfo* _pAdditionalErrorInfo )
:OSQLMessageBox( _pParent, ModuleRes( STR_EXCEPTION_WARNING ), _rMessage, _nStyle, OSQLMessageBox::Warning, _pAdditionalErrorInfo )
{
}
// OSQLErrorBox
-OSQLErrorBox::OSQLErrorBox( Window* _pParent, const OUString& _rMessage, WinBits _nStyle,
+OSQLErrorBox::OSQLErrorBox( vcl::Window* _pParent, const OUString& _rMessage, WinBits _nStyle,
const ::dbtools::SQLExceptionInfo* _pAdditionalErrorInfo )
:OSQLMessageBox( _pParent, ModuleRes( STR_EXCEPTION_ERROR ), _rMessage, _nStyle, OSQLMessageBox::Error, _pAdditionalErrorInfo )
{
diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx
index a45578c1b8c7..4a34d3809877 100644
--- a/dbaccess/source/ui/dlg/tablespage.cxx
+++ b/dbaccess/source/ui/dlg/tablespage.cxx
@@ -69,7 +69,7 @@ namespace dbaui
using namespace ::comphelper;
// OTableSubscriptionPage
- OTableSubscriptionPage::OTableSubscriptionPage(Window* pParent, const SfxItemSet& _rCoreAttrs,
+ OTableSubscriptionPage::OTableSubscriptionPage(vcl::Window* pParent, const SfxItemSet& _rCoreAttrs,
OTableSubscriptionDialog* _pTablesDlg)
: OGenericAdministrationPage(pParent, "TablesFilterPage",
"dbaccess/ui/tablesfilterpage.ui", _rCoreAttrs)
diff --git a/dbaccess/source/ui/dlg/tablespage.hxx b/dbaccess/source/ui/dlg/tablespage.hxx
index acfeaa45834f..fe217b06f703 100644
--- a/dbaccess/source/ui/dlg/tablespage.hxx
+++ b/dbaccess/source/ui/dlg/tablespage.hxx
@@ -62,7 +62,7 @@ namespace dbaui
*/
virtual void resizeControls(const Size& _rDiff);
- OTableSubscriptionPage( Window* pParent, const SfxItemSet& _rCoreAttrs ,OTableSubscriptionDialog* _pTablesDlg);
+ OTableSubscriptionPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ,OTableSubscriptionDialog* _pTablesDlg);
virtual ~OTableSubscriptionPage();
protected:
diff --git a/dbaccess/source/ui/dlg/textconnectionsettings.cxx b/dbaccess/source/ui/dlg/textconnectionsettings.cxx
index 6d8a27bad872..11f84162318b 100644
--- a/dbaccess/source/ui/dlg/textconnectionsettings.cxx
+++ b/dbaccess/source/ui/dlg/textconnectionsettings.cxx
@@ -29,7 +29,7 @@
namespace dbaui
{
// TextConnectionSettingsDialog
- TextConnectionSettingsDialog::TextConnectionSettingsDialog( Window* _pParent, SfxItemSet& _rItems )
+ TextConnectionSettingsDialog::TextConnectionSettingsDialog( vcl::Window* _pParent, SfxItemSet& _rItems )
:ModalDialog( _pParent, "TextConnectionSettingsDialog", "dbaccess/ui/textconnectionsettings.ui" )
,m_rItems( _rItems )
{
diff --git a/dbaccess/source/ui/inc/CollectionView.hxx b/dbaccess/source/ui/inc/CollectionView.hxx
index 6c6fecb8bac0..80dc9bbaa45e 100644
--- a/dbaccess/source/ui/inc/CollectionView.hxx
+++ b/dbaccess/source/ui/inc/CollectionView.hxx
@@ -54,7 +54,7 @@ namespace dbaui
/// sets the fixedtext to the right content
void initCurrentPath();
public:
- OCollectionView( Window * pParent
+ OCollectionView( vcl::Window * pParent
,const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent>& _xContent
,const OUString& _sDefaultName
,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext);
diff --git a/dbaccess/source/ui/inc/ColumnControlWindow.hxx b/dbaccess/source/ui/inc/ColumnControlWindow.hxx
index 19c55b9b69ce..b09d6ff6e030 100644
--- a/dbaccess/source/ui/inc/ColumnControlWindow.hxx
+++ b/dbaccess/source/ui/inc/ColumnControlWindow.hxx
@@ -53,7 +53,7 @@ namespace dbaui
virtual void CellModified(long nRow, sal_uInt16 nColId ) SAL_OVERRIDE;
public:
- OColumnControlWindow(Window* pParent
+ OColumnControlWindow(vcl::Window* pParent
,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext);
virtual ~OColumnControlWindow();
diff --git a/dbaccess/source/ui/inc/FieldControls.hxx b/dbaccess/source/ui/inc/FieldControls.hxx
index 3d7c3cd45890..ff1bfec69880 100644
--- a/dbaccess/source/ui/inc/FieldControls.hxx
+++ b/dbaccess/source/ui/inc/FieldControls.hxx
@@ -34,7 +34,7 @@ namespace dbaui
short m_nPos;
OUString m_strHelpText;
public:
- OPropColumnEditCtrl(Window* pParent, OUString& _rAllowedChars, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0);
+ OPropColumnEditCtrl(vcl::Window* pParent, OUString& _rAllowedChars, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0);
virtual bool IsModified() const SAL_OVERRIDE { return IsValueChangedFromSaved(); }
@@ -52,7 +52,7 @@ namespace dbaui
OUString m_strHelpText;
public:
- OPropEditCtrl(Window* pParent, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0);
+ OPropEditCtrl(vcl::Window* pParent, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0);
virtual bool IsModified() const SAL_OVERRIDE { return IsValueChangedFromSaved(); }
@@ -68,7 +68,7 @@ namespace dbaui
OUString m_strHelpText;
public:
- OPropNumericEditCtrl(Window* pParent, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0);
+ OPropNumericEditCtrl(vcl::Window* pParent, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0);
virtual bool IsModified() const SAL_OVERRIDE { return IsValueChangedFromSaved(); }
@@ -85,7 +85,7 @@ namespace dbaui
OUString m_strHelpText;
public:
- OPropListBoxCtrl(Window* pParent, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0);
+ OPropListBoxCtrl(vcl::Window* pParent, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0);
bool IsModified() const { return IsValueChangedFromSaved(); }
diff --git a/dbaccess/source/ui/inc/FieldDescControl.hxx b/dbaccess/source/ui/inc/FieldDescControl.hxx
index 01bb0591b54d..4205212e7bd8 100644
--- a/dbaccess/source/ui/inc/FieldDescControl.hxx
+++ b/dbaccess/source/ui/inc/FieldDescControl.hxx
@@ -66,8 +66,8 @@ namespace dbaui
{
private:
OTableDesignHelpBar* pHelp;
- Window* pLastFocusWindow;
- Window* m_pActFocusWindow;
+ vcl::Window* pLastFocusWindow;
+ vcl::Window* m_pActFocusWindow;
FixedText* pDefaultText;
FixedText* pRequiredText;
@@ -170,10 +170,10 @@ namespace dbaui
const OPropColumnEditCtrl* getColumnCtrl() const { return m_pColumnName; }
- void implFocusLost(Window* _pWhich);
+ void implFocusLost(vcl::Window* _pWhich);
public:
- OFieldDescControl( Window* pParent, OTableDesignHelpBar* pHelpBar);
+ OFieldDescControl( vcl::Window* pParent, OTableDesignHelpBar* pHelpBar);
virtual ~OFieldDescControl();
void DisplayData(OFieldDescription* pFieldDescr );
diff --git a/dbaccess/source/ui/inc/JoinDesignView.hxx b/dbaccess/source/ui/inc/JoinDesignView.hxx
index be666126f457..ff86d28f8eaf 100644
--- a/dbaccess/source/ui/inc/JoinDesignView.hxx
+++ b/dbaccess/source/ui/inc/JoinDesignView.hxx
@@ -38,7 +38,7 @@ namespace dbaui
OJoinController& m_rController;
public:
- OJoinDesignView(Window* pParent,
+ OJoinDesignView(vcl::Window* pParent,
OJoinController& _rController,
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& );
virtual ~OJoinDesignView();
diff --git a/dbaccess/source/ui/inc/JoinExchange.hxx b/dbaccess/source/ui/inc/JoinExchange.hxx
index 448a8c7820f3..18ab49a2c4fd 100644
--- a/dbaccess/source/ui/inc/JoinExchange.hxx
+++ b/dbaccess/source/ui/inc/JoinExchange.hxx
@@ -54,7 +54,7 @@ namespace dbaui
// XUnoTunnel
virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& _rIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- void StartDrag( Window* pWindow, sal_Int8 nDragSourceActions, IDragTransferableListener* _pListener );
+ void StartDrag( vcl::Window* pWindow, sal_Int8 nDragSourceActions, IDragTransferableListener* _pListener );
static OJoinExchangeData GetSourceDescription(const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& _rxObject);
static bool isFormatAvailable( const DataFlavorExVector& _rFormats ,SotFormatStringId _nSlotID=SOT_FORMATSTR_ID_SBA_JOIN);
diff --git a/dbaccess/source/ui/inc/JoinTableView.hxx b/dbaccess/source/ui/inc/JoinTableView.hxx
index f3e39b917018..c9c500263402 100644
--- a/dbaccess/source/ui/inc/JoinTableView.hxx
+++ b/dbaccess/source/ui/inc/JoinTableView.hxx
@@ -48,18 +48,18 @@ namespace dbaui
// this class conatins only the scrollbars to avoid that
// the tablewindows clip the scrollbars
class OJoinTableView;
- class OScrollWindowHelper : public Window
+ class OScrollWindowHelper : public vcl::Window
{
ScrollBar m_aHScrollBar;
ScrollBar m_aVScrollBar;
- Window* m_pCornerWindow;
+ vcl::Window* m_pCornerWindow;
OJoinTableView* m_pTableView;
protected:
virtual void Resize() SAL_OVERRIDE;
public:
- OScrollWindowHelper( Window* pParent);
+ OScrollWindowHelper( vcl::Window* pParent);
virtual ~OScrollWindowHelper();
void setTableView(OJoinTableView* _pTableView);
@@ -72,7 +72,7 @@ namespace dbaui
};
- class OJoinTableView : public Window,
+ class OJoinTableView : public vcl::Window,
public IDragTransferableListener,
public DropTargetHelper
{
@@ -109,7 +109,7 @@ namespace dbaui
OJoinDesignViewAccess* m_pAccessible;
public:
- OJoinTableView( Window* pParent, OJoinDesignView* pView );
+ OJoinTableView( vcl::Window* pParent, OJoinDesignView* pView );
virtual ~OJoinTableView();
// window override
diff --git a/dbaccess/source/ui/inc/LimitBox.hxx b/dbaccess/source/ui/inc/LimitBox.hxx
index 5e5db54b797b..5f9187a38bba 100644
--- a/dbaccess/source/ui/inc/LimitBox.hxx
+++ b/dbaccess/source/ui/inc/LimitBox.hxx
@@ -23,7 +23,7 @@ namespace dbaui
class LimitBox: public NumericBox
{
public:
- LimitBox( Window* pParent, WinBits nStyle );
+ LimitBox( vcl::Window* pParent, WinBits nStyle );
virtual ~LimitBox();
virtual OUString CreateFieldText( sal_Int64 nValue ) const SAL_OVERRIDE;
diff --git a/dbaccess/source/ui/inc/QueryPropertiesDialog.hxx b/dbaccess/source/ui/inc/QueryPropertiesDialog.hxx
index 442668be6cc4..6b19daedb287 100644
--- a/dbaccess/source/ui/inc/QueryPropertiesDialog.hxx
+++ b/dbaccess/source/ui/inc/QueryPropertiesDialog.hxx
@@ -28,7 +28,7 @@ class QueryPropertiesDialog : public ModalDialog
public:
QueryPropertiesDialog(
- Window* pParent, const bool bDistinct, const sal_Int64 nLimit );
+ vcl::Window* pParent, const bool bDistinct, const sal_Int64 nLimit );
virtual ~QueryPropertiesDialog();
bool getDistinct() const;
diff --git a/dbaccess/source/ui/inc/QueryTableView.hxx b/dbaccess/source/ui/inc/QueryTableView.hxx
index f42285e4fc01..ef4174c19878 100644
--- a/dbaccess/source/ui/inc/QueryTableView.hxx
+++ b/dbaccess/source/ui/inc/QueryTableView.hxx
@@ -57,7 +57,7 @@ namespace dbaui
virtual bool supressCrossNaturalJoin(const TTableConnectionData::value_type& _pData) const SAL_OVERRIDE;
public:
- OQueryTableView(Window* pParent,OQueryDesignView* pView);
+ OQueryTableView(vcl::Window* pParent,OQueryDesignView* pView);
virtual ~OQueryTableView();
/// base class overwritten: create and delete windows
diff --git a/dbaccess/source/ui/inc/QueryTextView.hxx b/dbaccess/source/ui/inc/QueryTextView.hxx
index f1f7c0422733..9e9cdc4c6392 100644
--- a/dbaccess/source/ui/inc/QueryTextView.hxx
+++ b/dbaccess/source/ui/inc/QueryTextView.hxx
@@ -25,7 +25,7 @@
namespace dbaui
{
class OSqlEdit;
- class OQueryTextView : public Window
+ class OQueryTextView : public vcl::Window
{
friend class OQueryViewSwitch;
OSqlEdit* m_pEdit;
diff --git a/dbaccess/source/ui/inc/RelationController.hxx b/dbaccess/source/ui/inc/RelationController.hxx
index 5953f3b310cf..00868b542329 100644
--- a/dbaccess/source/ui/inc/RelationController.hxx
+++ b/dbaccess/source/ui/inc/RelationController.hxx
@@ -55,7 +55,7 @@ namespace dbaui
void mergeData(const TTableConnectionData& _aConnectionData);
- virtual bool Construct(Window* pParent) SAL_OVERRIDE;
+ virtual bool Construct(vcl::Window* pParent) SAL_OVERRIDE;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/dbaccess/source/ui/inc/RelationDesignView.hxx b/dbaccess/source/ui/inc/RelationDesignView.hxx
index b2c8936aac7b..f7a97a9687f5 100644
--- a/dbaccess/source/ui/inc/RelationDesignView.hxx
+++ b/dbaccess/source/ui/inc/RelationDesignView.hxx
@@ -32,7 +32,7 @@ namespace dbaui
class ORelationDesignView : public OJoinDesignView
{
public:
- ORelationDesignView(Window* pParent, ORelationController& _rController,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& );
+ ORelationDesignView(vcl::Window* pParent, ORelationController& _rController,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& );
virtual ~ORelationDesignView();
// set the statement for representation
diff --git a/dbaccess/source/ui/inc/RelationTableView.hxx b/dbaccess/source/ui/inc/RelationTableView.hxx
index aec50985d581..9b38d8fb47b6 100644
--- a/dbaccess/source/ui/inc/RelationTableView.hxx
+++ b/dbaccess/source/ui/inc/RelationTableView.hxx
@@ -52,7 +52,7 @@ namespace dbaui
virtual void _elementReplaced( const ::com::sun::star::container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
public:
- ORelationTableView( Window* pParent, ORelationDesignView* pView );
+ ORelationTableView( vcl::Window* pParent, ORelationDesignView* pView );
virtual ~ORelationTableView();
virtual void RemoveTabWin( OTableWindow* pTabWin ) SAL_OVERRIDE;
diff --git a/dbaccess/source/ui/inc/SqlNameEdit.hxx b/dbaccess/source/ui/inc/SqlNameEdit.hxx
index 8430dc4d4f38..4368648429d9 100644
--- a/dbaccess/source/ui/inc/SqlNameEdit.hxx
+++ b/dbaccess/source/ui/inc/SqlNameEdit.hxx
@@ -56,12 +56,12 @@ namespace dbaui
,public OSQLNameChecker
{
public:
- OSQLNameEdit(Window* _pParent,WinBits nStyle = WB_BORDER, const OUString& _rAllowedChars = OUString())
+ OSQLNameEdit(vcl::Window* _pParent,WinBits nStyle = WB_BORDER, const OUString& _rAllowedChars = OUString())
: Edit(_pParent,nStyle)
,OSQLNameChecker(_rAllowedChars)
{
}
- OSQLNameEdit(Window* _pParent,const ResId& _rRes,const OUString& _rAllowedChars = OUString())
+ OSQLNameEdit(vcl::Window* _pParent,const ResId& _rRes,const OUString& _rAllowedChars = OUString())
: Edit(_pParent,_rRes)
,OSQLNameChecker(_rAllowedChars)
{
@@ -77,12 +77,12 @@ namespace dbaui
,public OSQLNameChecker
{
public:
- OSQLNameComboBox(Window* _pParent,WinBits nStyle = WB_BORDER, const OUString& _rAllowedChars = OUString())
+ OSQLNameComboBox(vcl::Window* _pParent,WinBits nStyle = WB_BORDER, const OUString& _rAllowedChars = OUString())
: ComboBox(_pParent,nStyle)
, OSQLNameChecker(_rAllowedChars)
{
}
- OSQLNameComboBox(Window* _pParent,const ResId& _rRes,const OUString& _rAllowedChars = OUString())
+ OSQLNameComboBox(vcl::Window* _pParent,const ResId& _rRes,const OUString& _rAllowedChars = OUString())
: ComboBox(_pParent,_rRes)
, OSQLNameChecker(_rAllowedChars)
{
diff --git a/dbaccess/source/ui/inc/TableConnection.hxx b/dbaccess/source/ui/inc/TableConnection.hxx
index 95f60752ae65..76428fb60b24 100644
--- a/dbaccess/source/ui/inc/TableConnection.hxx
+++ b/dbaccess/source/ui/inc/TableConnection.hxx
@@ -36,7 +36,7 @@ namespace dbaui
class OJoinTableView;
class OConnectionLine;
- class OTableConnection : public Window
+ class OTableConnection : public vcl::Window
{
::std::vector<OConnectionLine*> m_vConnLine;
TTableConnectionData::value_type
diff --git a/dbaccess/source/ui/inc/TableController.hxx b/dbaccess/source/ui/inc/TableController.hxx
index d0f6b4d8f543..999a7fe15aee 100644
--- a/dbaccess/source/ui/inc/TableController.hxx
+++ b/dbaccess/source/ui/inc/TableController.hxx
@@ -113,7 +113,7 @@ namespace dbaui
inline TOTypeInfoSP getTypeInfoFallBack() const { return m_pTypeInfo; }
- virtual bool Construct(Window* pParent) SAL_OVERRIDE;
+ virtual bool Construct(vcl::Window* pParent) SAL_OVERRIDE;
// XEventListener
virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/dbaccess/source/ui/inc/TableDesignControl.hxx b/dbaccess/source/ui/inc/TableDesignControl.hxx
index ca99ce7464ce..e1a9f1e84ae4 100644
--- a/dbaccess/source/ui/inc/TableDesignControl.hxx
+++ b/dbaccess/source/ui/inc/TableDesignControl.hxx
@@ -46,7 +46,7 @@ namespace dbaui
bool m_bClipboardFilled;
public:
- OTableRowView(Window* pParent);
+ OTableRowView(vcl::Window* pParent);
virtual ~OTableRowView();
virtual void SetCellData( long nRow, sal_uInt16 nColId, const TOTypeInfoSP& _pTypeInfo ) = 0;
diff --git a/dbaccess/source/ui/inc/TableDesignHelpBar.hxx b/dbaccess/source/ui/inc/TableDesignHelpBar.hxx
index a025d341afe8..900c32374754 100644
--- a/dbaccess/source/ui/inc/TableDesignHelpBar.hxx
+++ b/dbaccess/source/ui/inc/TableDesignHelpBar.hxx
@@ -39,7 +39,7 @@ namespace dbaui
virtual void Resize() SAL_OVERRIDE;
public:
- OTableDesignHelpBar( Window* pParent );
+ OTableDesignHelpBar( vcl::Window* pParent );
virtual ~OTableDesignHelpBar();
void SetHelpText( const OUString& rText );
diff --git a/dbaccess/source/ui/inc/TableDesignView.hxx b/dbaccess/source/ui/inc/TableDesignView.hxx
index c37bc7969450..1643aaccb037 100644
--- a/dbaccess/source/ui/inc/TableDesignView.hxx
+++ b/dbaccess/source/ui/inc/TableDesignView.hxx
@@ -30,7 +30,7 @@ namespace dbaui
class OTableController;
class OTableFieldDescWin;
class OTableEditorCtrl;
- class OTableBorderWindow : public Window
+ class OTableBorderWindow : public vcl::Window
{
Splitter m_aHorzSplitter;
OTableFieldDescWin* m_pFieldDescWin;
@@ -42,7 +42,7 @@ namespace dbaui
protected:
virtual void DataChanged(const DataChangedEvent& rDCEvt) SAL_OVERRIDE;
public:
- OTableBorderWindow(Window* pParent);
+ OTableBorderWindow(vcl::Window* pParent);
virtual ~OTableBorderWindow();
// window overloads
virtual void Resize() SAL_OVERRIDE;
@@ -73,7 +73,7 @@ namespace dbaui
virtual void resizeDocumentView(Rectangle& rRect) SAL_OVERRIDE;
public:
- OTableDesignView( Window* pParent,
+ OTableDesignView( vcl::Window* pParent,
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&,
OTableController& _rController);
virtual ~OTableDesignView();
diff --git a/dbaccess/source/ui/inc/TableFieldDescription.hxx b/dbaccess/source/ui/inc/TableFieldDescription.hxx
index 376d958e089f..9a6992bd732c 100644
--- a/dbaccess/source/ui/inc/TableFieldDescription.hxx
+++ b/dbaccess/source/ui/inc/TableFieldDescription.hxx
@@ -33,7 +33,7 @@ namespace comphelper
class NamedValueCollection;
}
-class Window;
+namespace vcl { class Window; }
namespace dbaui
{
@@ -49,7 +49,7 @@ namespace dbaui
OUString m_aFieldAlias; ///< column alias
OUString m_aFunctionName;///< contains the function name (only if m_eFunctionType != FKT_NONE)
- Window* m_pTabWindow;
+ vcl::Window* m_pTabWindow;
sal_Int32 m_eDataType;
sal_Int32 m_eFunctionType;
@@ -79,7 +79,7 @@ namespace dbaui
void SetVisible( bool bVis=true ) { m_bVisible = bVis; }
void SetGroupBy( bool bGb=false ) { m_bGroupBy = bGb; }
- void SetTabWindow( Window* pWin ){ m_pTabWindow = pWin; }
+ void SetTabWindow( vcl::Window* pWin ){ m_pTabWindow = pWin; }
void SetField( const OUString& rF ) { m_aFieldName = rF; }
void SetFieldAlias( const OUString& rF ) { m_aFieldAlias = rF; }
void SetTable( const OUString& rT ) { m_aTableName = rT; }
@@ -105,7 +105,7 @@ namespace dbaui
OUString GetCriteria( sal_uInt16 nIdx ) const;
sal_Int32 GetColWidth() const { return m_nColWidth; }
sal_Int32 GetFieldIndex() const { return m_nIndex; }
- Window* GetTabWindow() const { return m_pTabWindow;}
+ vcl::Window* GetTabWindow() const { return m_pTabWindow;}
sal_Int32 GetFunctionType() const { return m_eFunctionType; }
sal_uInt16 GetColumnId() const { return m_nColumnId;}
diff --git a/dbaccess/source/ui/inc/TableGrantCtrl.hxx b/dbaccess/source/ui/inc/TableGrantCtrl.hxx
index 32e0f519ad94..c16cba5d5568 100644
--- a/dbaccess/source/ui/inc/TableGrantCtrl.hxx
+++ b/dbaccess/source/ui/inc/TableGrantCtrl.hxx
@@ -59,7 +59,7 @@ class OTableGrantControl : public ::svt::EditBrowseBox
ImplSVEvent * m_nDeactivateEvent;
public:
- OTableGrantControl( Window* pParent, WinBits nBits);
+ OTableGrantControl( vcl::Window* pParent, WinBits nBits);
virtual ~OTableGrantControl();
void UpdateTables();
void setUserName(const OUString& _sUserName);
diff --git a/dbaccess/source/ui/inc/TableWindow.hxx b/dbaccess/source/ui/inc/TableWindow.hxx
index 82028e1607be..7fc4bfdb70ae 100644
--- a/dbaccess/source/ui/inc/TableWindow.hxx
+++ b/dbaccess/source/ui/inc/TableWindow.hxx
@@ -48,7 +48,7 @@ namespace dbaui
class OTableWindow : public ::cppu::BaseMutex
,public ::comphelper::OContainerListener
- ,public Window
+ ,public vcl::Window
{
friend class OTableWindowTitle;
friend class OTableWindowListBox;
@@ -121,7 +121,7 @@ namespace dbaui
*/
void impl_updateImage();
- OTableWindow( Window* pParent, const TTableWindowData::value_type& pTabWinData );
+ OTableWindow( vcl::Window* pParent, const TTableWindowData::value_type& pTabWinData );
public:
virtual ~OTableWindow();
diff --git a/dbaccess/source/ui/inc/TablesSingleDlg.hxx b/dbaccess/source/ui/inc/TablesSingleDlg.hxx
index 3761026ec4c7..3ded3cef2e91 100644
--- a/dbaccess/source/ui/inc/TablesSingleDlg.hxx
+++ b/dbaccess/source/ui/inc/TablesSingleDlg.hxx
@@ -49,7 +49,7 @@ class ODbDataSourceAdministrationHelper;
SfxItemSet* m_pOutSet;
public:
- OTableSubscriptionDialog(Window* pParent
+ OTableSubscriptionDialog(vcl::Window* pParent
,SfxItemSet* _pItems
,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB
,const ::com::sun::star::uno::Any& _aDataSourceName
diff --git a/dbaccess/source/ui/inc/TokenWriter.hxx b/dbaccess/source/ui/inc/TokenWriter.hxx
index e005461d8465..6e0cc172a7b7 100644
--- a/dbaccess/source/ui/inc/TokenWriter.hxx
+++ b/dbaccess/source/ui/inc/TokenWriter.hxx
@@ -196,7 +196,7 @@ namespace dbaui
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetUpdate > m_xTargetResultSetUpdate;
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowUpdate > m_xTargetRowUpdate;
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > m_xTargetResultSetMetaData;
- Window* m_pParent;
+ vcl::Window* m_pParent;
bool m_bAlreadyAsked;
bool insertNewRow();
@@ -205,7 +205,7 @@ namespace dbaui
public:
// export data
- ORowSetImportExport(Window* _pParent,
+ ORowSetImportExport(vcl::Window* _pParent,
const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetUpdate >& _xResultSetUpdate,
const ::svx::ODataAccessDescriptor& _aDataDescriptor,
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rM,
diff --git a/dbaccess/source/ui/inc/UITools.hxx b/dbaccess/source/ui/inc/UITools.hxx
index 7be8fd7b505c..ec384984cd0d 100644
--- a/dbaccess/source/ui/inc/UITools.hxx
+++ b/dbaccess/source/ui/inc/UITools.hxx
@@ -65,7 +65,7 @@ namespace svt
class EditBrowseBox;
}
-class Window;
+namespace vcl { class Window; }
class ToolBox;
namespace vcl { class Font; }
class SvNumberFormatter;
@@ -107,7 +107,7 @@ namespace dbaui
@param _rxContext need to create the dialog
*/
void showError( const ::dbtools::SQLExceptionInfo& _rInfo,
- Window* _pParent,
+ vcl::Window* _pParent,
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext);
/** fills a map and a vector with localized type names
@@ -163,7 +163,7 @@ namespace dbaui
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource >
getDataSourceByName(
const OUString& _rDataSourceName,
- Window* _pErrorMessageParent,
+ vcl::Window* _pErrorMessageParent,
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > _rxContext,
::dbtools::SQLExceptionInfo* _pErrorInfo
);
@@ -187,11 +187,11 @@ namespace dbaui
void callColumnFormatDialog(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xAffectedCol,
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xField,
SvNumberFormatter* _pFormatter,
- Window* _pParent);
+ vcl::Window* _pParent);
/** second variant of the function before
*/
- bool callColumnFormatDialog(Window* _pParent,
+ bool callColumnFormatDialog(vcl::Window* _pParent,
SvNumberFormatter* _pFormatter,
sal_Int32 _nDataType,
sal_Int32& _nFormatKey,
@@ -207,7 +207,7 @@ namespace dbaui
bool appendToFilter(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection,
const OUString& _sName,
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext,
- Window* _pParent);
+ vcl::Window* _pParent);
/** notifySystemWindow adds or remove the given window _pToRegister at the Systemwindow found when search _pWindow.
@param _pWindow
@@ -220,9 +220,9 @@ namespace dbaui
::comphelper::mem_fun(&TaskPaneList::AddWindow)
::comphelper::mem_fun(&TaskPaneList::RemoveWindow)
*/
- void notifySystemWindow(Window* _pWindow,
- Window* _pToRegister,
- ::comphelper::mem_fun1_t<TaskPaneList,Window*> _rMemFunc);
+ void notifySystemWindow(vcl::Window* _pWindow,
+ vcl::Window* _pToRegister,
+ ::comphelper::mem_fun1_t<TaskPaneList,vcl::Window*> _rMemFunc);
/** adjustToolBoxSize checks if the size of the ToolBox is still valid. If not it will be resized.
@param _pToolBox
@@ -327,7 +327,7 @@ namespace dbaui
@return
RET_YES, RET_NO, RET_ALL
*/
- sal_Int32 askForUserAction(Window* _pParent,sal_uInt16 _nTitle,sal_uInt16 _nText,bool _bAll,const OUString& _sName);
+ sal_Int32 askForUserAction(vcl::Window* _pParent,sal_uInt16 _nTitle,sal_uInt16 _nText,bool _bAll,const OUString& _sName);
/** creates a new view from a query or table
@param _sName
@@ -389,7 +389,7 @@ namespace dbaui
<TRUE/> if the insert opertions was successful, otherwise <FALSE/>.
*/
bool insertHierachyElement(
- Window* _pParent,
+ vcl::Window* _pParent,
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext,
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XHierarchicalNameContainer>& _xNames,
const OUString& _sParentFolder,
diff --git a/dbaccess/source/ui/inc/UserAdminDlg.hxx b/dbaccess/source/ui/inc/UserAdminDlg.hxx
index 9e136c1968e4..a342856b7aad 100644
--- a/dbaccess/source/ui/inc/UserAdminDlg.hxx
+++ b/dbaccess/source/ui/inc/UserAdminDlg.hxx
@@ -53,7 +53,7 @@ namespace dbaui
protected:
virtual void PageCreated(sal_uInt16 _nId, SfxTabPage& _rPage) SAL_OVERRIDE;
public:
- OUserAdminDlg( Window* _pParent
+ OUserAdminDlg( vcl::Window* _pParent
,SfxItemSet* _pItems
,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB
,const ::com::sun::star::uno::Any& _aDataSourceName
diff --git a/dbaccess/source/ui/inc/VertSplitView.hxx b/dbaccess/source/ui/inc/VertSplitView.hxx
index cdc635e187cf..f34af430a936 100644
--- a/dbaccess/source/ui/inc/VertSplitView.hxx
+++ b/dbaccess/source/ui/inc/VertSplitView.hxx
@@ -25,11 +25,11 @@ class Splitter;
namespace dbaui
{
- class OSplitterView : public Window
+ class OSplitterView : public vcl::Window
{
Splitter* m_pSplitter;
- Window* m_pLeft;
- Window* m_pRight;
+ vcl::Window* m_pLeft;
+ vcl::Window* m_pRight;
bool m_bVertical;
void ImplInitSettings( bool bFont, bool bForeground, bool bBackground );
@@ -37,13 +37,13 @@ namespace dbaui
protected:
virtual void DataChanged(const DataChangedEvent& rDCEvt) SAL_OVERRIDE;
public:
- OSplitterView(Window* _pParent,bool _bVertical = true);
+ OSplitterView(vcl::Window* _pParent,bool _bVertical = true);
virtual ~OSplitterView();
// window overloads
virtual void GetFocus() SAL_OVERRIDE;
void setSplitter(Splitter* _pSplitter);
- void set(Window* _pRight,Window* _pLeft = NULL);
+ void set(vcl::Window* _pRight,Window* _pLeft = NULL);
virtual void Resize() SAL_OVERRIDE;
};
}
diff --git a/dbaccess/source/ui/inc/WCPage.hxx b/dbaccess/source/ui/inc/WCPage.hxx
index 0c0e1ff3ea41..e99fcf810529 100644
--- a/dbaccess/source/ui/inc/WCPage.hxx
+++ b/dbaccess/source/ui/inc/WCPage.hxx
@@ -64,7 +64,7 @@ namespace dbaui
virtual bool LeavePage() SAL_OVERRIDE;
virtual OUString GetTitle() const SAL_OVERRIDE ;
- OCopyTable( Window * pParent );
+ OCopyTable( vcl::Window * pParent );
virtual ~OCopyTable();
bool IsOptionDefData() const { return m_pRB_DefData->IsChecked(); }
diff --git a/dbaccess/source/ui/inc/WColumnSelect.hxx b/dbaccess/source/ui/inc/WColumnSelect.hxx
index 20288dfb1c40..98f029c6c665 100644
--- a/dbaccess/source/ui/inc/WColumnSelect.hxx
+++ b/dbaccess/source/ui/inc/WColumnSelect.hxx
@@ -78,7 +78,7 @@ namespace dbaui
virtual bool LeavePage() SAL_OVERRIDE;
virtual OUString GetTitle() const SAL_OVERRIDE ;
- OWizColumnSelect(Window* pParent);
+ OWizColumnSelect(vcl::Window* pParent);
virtual ~OWizColumnSelect();
};
}
diff --git a/dbaccess/source/ui/inc/WCopyTable.hxx b/dbaccess/source/ui/inc/WCopyTable.hxx
index 671bdc943e60..388ee1c27a1d 100644
--- a/dbaccess/source/ui/inc/WCopyTable.hxx
+++ b/dbaccess/source/ui/inc/WCopyTable.hxx
@@ -298,7 +298,7 @@ namespace dbaui
public:
// used for copy tables or queries
OCopyTableWizard(
- Window * pParent,
+ vcl::Window * pParent,
const OUString& _rDefaultName,
sal_Int16 _nOperation,
const ICopyTableSourceObject& _rSourceObject,
@@ -310,7 +310,7 @@ namespace dbaui
// used for importing rtf/html sources
OCopyTableWizard(
- Window* pParent,
+ vcl::Window* pParent,
const OUString& _rDefaultName,
sal_Int16 _nOperation,
const ODatabaseExport::TColumns& _rDestColumns,
diff --git a/dbaccess/source/ui/inc/WExtendPages.hxx b/dbaccess/source/ui/inc/WExtendPages.hxx
index effb2399bc8e..e9d19621457f 100644
--- a/dbaccess/source/ui/inc/WExtendPages.hxx
+++ b/dbaccess/source/ui/inc/WExtendPages.hxx
@@ -30,12 +30,12 @@ namespace dbaui
protected:
virtual SvParser* createReader(sal_Int32 _nRows) SAL_OVERRIDE;
public:
- OWizHTMLExtend(Window* pParent, SvStream& _rStream)
+ OWizHTMLExtend(vcl::Window* pParent, SvStream& _rStream)
: OWizTypeSelect( pParent, &_rStream )
{
}
- static OWizTypeSelect* Create( Window* _pParent, SvStream& _rInput ) { return new OWizHTMLExtend( _pParent, _rInput ); }
+ static OWizTypeSelect* Create( vcl::Window* _pParent, SvStream& _rInput ) { return new OWizHTMLExtend( _pParent, _rInput ); }
virtual ~OWizHTMLExtend(){}
};
@@ -45,12 +45,12 @@ namespace dbaui
protected:
virtual SvParser* createReader(sal_Int32 _nRows) SAL_OVERRIDE;
public:
- OWizRTFExtend(Window* pParent,SvStream& _rStream)
+ OWizRTFExtend(vcl::Window* pParent,SvStream& _rStream)
: OWizTypeSelect( pParent, &_rStream )
{
}
- static OWizTypeSelect* Create( Window* _pParent, SvStream& _rInput ) { return new OWizRTFExtend( _pParent, _rInput ); }
+ static OWizTypeSelect* Create( vcl::Window* _pParent, SvStream& _rInput ) { return new OWizRTFExtend( _pParent, _rInput ); }
virtual ~OWizRTFExtend(){}
};
@@ -61,7 +61,7 @@ namespace dbaui
protected:
virtual SvParser* createReader(sal_Int32 _nRows) SAL_OVERRIDE;
public:
- OWizNormalExtend(Window* pParent);
+ OWizNormalExtend(vcl::Window* pParent);
};
}
#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_WEXTENDPAGES_HXX
diff --git a/dbaccess/source/ui/inc/WNameMatch.hxx b/dbaccess/source/ui/inc/WNameMatch.hxx
index 0c713685c0d3..3feb7dc28e01 100644
--- a/dbaccess/source/ui/inc/WNameMatch.hxx
+++ b/dbaccess/source/ui/inc/WNameMatch.hxx
@@ -36,7 +36,7 @@ namespace dbaui
virtual void InitEntry(SvTreeListEntry* pEntry, const OUString& rStr, const Image& rImg1, const Image& rImg2, SvLBoxButtonKind eButtonKind) SAL_OVERRIDE;
public:
- OColumnTreeBox( Window* pParent, WinBits nBits = WB_BORDER );
+ OColumnTreeBox( vcl::Window* pParent, WinBits nBits = WB_BORDER );
void FillListBox( const ODatabaseExport::TColumnVector& _rList);
void SetReadOnly(bool _bRo=true) { m_bReadOnly = _bRo; }
@@ -77,7 +77,7 @@ namespace dbaui
virtual bool LeavePage() SAL_OVERRIDE;
virtual OUString GetTitle() const SAL_OVERRIDE ;
- OWizNameMatching(Window* pParent);
+ OWizNameMatching(vcl::Window* pParent);
virtual ~OWizNameMatching();
};
diff --git a/dbaccess/source/ui/inc/WTabPage.hxx b/dbaccess/source/ui/inc/WTabPage.hxx
index 83398f7e385f..9a30d7c311fb 100644
--- a/dbaccess/source/ui/inc/WTabPage.hxx
+++ b/dbaccess/source/ui/inc/WTabPage.hxx
@@ -32,7 +32,7 @@ namespace dbaui
OCopyTableWizard* m_pParent;
bool m_bFirstTime; // Page wird das erste mal gerufen ; should be set in the reset methode
- OWizardPage( Window *pParent, const OString& rID, const OUString& rUIXMLDescription );
+ OWizardPage( vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription );
public:
virtual void Reset ( ) = 0;
diff --git a/dbaccess/source/ui/inc/WTypeSelect.hxx b/dbaccess/source/ui/inc/WTypeSelect.hxx
index 0967c5c06252..5f587481e867 100644
--- a/dbaccess/source/ui/inc/WTypeSelect.hxx
+++ b/dbaccess/source/ui/inc/WTypeSelect.hxx
@@ -37,7 +37,7 @@ namespace dbaui
class OWizTypeSelectControl : public OFieldDescControl
{
protected:
- Window* m_pParentTabPage;
+ vcl::Window* m_pParentTabPage;
virtual void ActivateAggregate( EControlType eType ) SAL_OVERRIDE;
virtual void DeactivateAggregate( EControlType eType ) SAL_OVERRIDE;
@@ -51,7 +51,7 @@ namespace dbaui
virtual OUString getAutoIncrementValue() const SAL_OVERRIDE;
public:
- OWizTypeSelectControl(Window* pParent, Window* pParentTabPage, OTableDesignHelpBar* pHelpBar=NULL);
+ OWizTypeSelectControl(vcl::Window* pParent, vcl::Window* pParentTabPage, OTableDesignHelpBar* pHelpBar=NULL);
virtual ~OWizTypeSelectControl();
virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData> getMetaData() SAL_OVERRIDE;
@@ -69,15 +69,15 @@ namespace dbaui
bool _bSet = false);
protected:
virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
- Window* m_pParentTabPage;
+ vcl::Window* m_pParentTabPage;
public:
- OWizTypeSelectList( Window* pParent, WinBits nStyle = WB_BORDER )
+ OWizTypeSelectList( vcl::Window* pParent, WinBits nStyle = WB_BORDER )
: MultiListBox(pParent,nStyle)
, m_bPKey(false)
, m_pParentTabPage(NULL)
{}
void SetPKey(bool bPKey) { m_bPKey = bPKey; }
- void SetParentTabPage(Window* pParentTabPage) { m_pParentTabPage = pParentTabPage; }
+ void SetParentTabPage(vcl::Window* pParentTabPage) { m_pParentTabPage = pParentTabPage; }
};
// Wizard Page: OWizTypeSelect
@@ -116,14 +116,14 @@ namespace dbaui
virtual bool LeavePage() SAL_OVERRIDE;
virtual OUString GetTitle() const SAL_OVERRIDE;
- OWizTypeSelect(Window* pParent, SvStream* _pStream = NULL );
+ OWizTypeSelect(vcl::Window* pParent, SvStream* _pStream = NULL );
virtual ~OWizTypeSelect();
inline void setDisplayRow(sal_Int32 _nRow) { m_nDisplayRow = _nRow - 1; }
inline void setDuplicateName(bool _bDuplicateName) { m_bDuplicateName = _bDuplicateName; }
};
- typedef OWizTypeSelect* (*TypeSelectionPageFactory)( Window*, SvStream& );
+ typedef OWizTypeSelect* (*TypeSelectionPageFactory)( vcl::Window*, SvStream& );
}
#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_WTYPESELECT_HXX
diff --git a/dbaccess/source/ui/inc/adtabdlg.hxx b/dbaccess/source/ui/inc/adtabdlg.hxx
index d33ea5f0570a..360ee70fa9eb 100644
--- a/dbaccess/source/ui/inc/adtabdlg.hxx
+++ b/dbaccess/source/ui/inc/adtabdlg.hxx
@@ -50,7 +50,7 @@ namespace dbaui
virtual bool allowQueries() const = 0;
virtual bool allowAddition() const = 0;
virtual void addTableWindow( const OUString& _rQualifiedTableName, const OUString& _rAliasName ) = 0;
- virtual void onWindowClosing( const Window* _pWindow ) = 0;
+ virtual void onWindowClosing( const vcl::Window* _pWindow ) = 0;
protected:
~IAddTableDialogContext() {}
@@ -78,7 +78,7 @@ namespace dbaui
public:
OAddTableDlg(
- Window* _pParent,
+ vcl::Window* _pParent,
IAddTableDialogContext& _rContext );
virtual ~OAddTableDlg();
diff --git a/dbaccess/source/ui/inc/advancedsettingsdlg.hxx b/dbaccess/source/ui/inc/advancedsettingsdlg.hxx
index ef0622bf0f62..3520485684be 100644
--- a/dbaccess/source/ui/inc/advancedsettingsdlg.hxx
+++ b/dbaccess/source/ui/inc/advancedsettingsdlg.hxx
@@ -45,7 +45,7 @@ namespace dbaui
virtual void PageCreated(sal_uInt16 _nId, SfxTabPage& _rPage) SAL_OVERRIDE;
public:
- AdvancedSettingsDialog( Window* _pParent
+ AdvancedSettingsDialog( vcl::Window* _pParent
,SfxItemSet* _pItems
,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB
,const ::com::sun::star::uno::Any& _aDataSourceName);
diff --git a/dbaccess/source/ui/inc/brwctrlr.hxx b/dbaccess/source/ui/inc/brwctrlr.hxx
index bb2d19c087a6..f28f54185f1a 100644
--- a/dbaccess/source/ui/inc/brwctrlr.hxx
+++ b/dbaccess/source/ui/inc/brwctrlr.hxx
@@ -149,7 +149,7 @@ namespace dbaui
UnoDataBrowserView* getBrowserView() const { return static_cast< UnoDataBrowserView*>(getView()); }
// late construction
- virtual bool Construct(Window* pParent) SAL_OVERRIDE;
+ virtual bool Construct(vcl::Window* pParent) SAL_OVERRIDE;
// UNO
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/dbaccess/source/ui/inc/brwview.hxx b/dbaccess/source/ui/inc/brwview.hxx
index 0f799f87075e..b0c9852de938 100644
--- a/dbaccess/source/ui/inc/brwview.hxx
+++ b/dbaccess/source/ui/inc/brwview.hxx
@@ -49,7 +49,7 @@ namespace dbaui
DBTreeView* m_pTreeView;
Splitter* m_pSplitter;
mutable SbaGridControl* m_pVclControl; // our grid's VCL representation
- Window* m_pStatus;
+ vcl::Window* m_pStatus;
DECL_LINK( SplitHdl, void* );
// attribute access
@@ -58,7 +58,7 @@ namespace dbaui
SbaGridControl* getVclControl() const;
public:
- UnoDataBrowserView( Window* pParent,
+ UnoDataBrowserView( vcl::Window* pParent,
IController& _rController,
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& );
virtual ~UnoDataBrowserView();
diff --git a/dbaccess/source/ui/inc/charsetlistbox.hxx b/dbaccess/source/ui/inc/charsetlistbox.hxx
index 990c9df4f4e2..78f2da4f4a28 100644
--- a/dbaccess/source/ui/inc/charsetlistbox.hxx
+++ b/dbaccess/source/ui/inc/charsetlistbox.hxx
@@ -33,7 +33,7 @@ namespace dbaui
class CharSetListBox : public ListBox
{
public:
- CharSetListBox( Window* _pParent, WinBits _nBits );
+ CharSetListBox( vcl::Window* _pParent, WinBits _nBits );
virtual ~CharSetListBox();
void SelectEntryByIanaName( const OUString& _rIanaName );
diff --git a/dbaccess/source/ui/inc/curledit.hxx b/dbaccess/source/ui/inc/curledit.hxx
index 4a1238dbb4ad..dc1a42986116 100644
--- a/dbaccess/source/ui/inc/curledit.hxx
+++ b/dbaccess/source/ui/inc/curledit.hxx
@@ -41,7 +41,7 @@ class OConnectionURLEdit : public Edit
bool m_bShowPrefix; // when <TRUE> the prefix will be visible, otherwise not
public:
- OConnectionURLEdit(Window* pParent, WinBits _nBits,bool _bShowPrefix = false);
+ OConnectionURLEdit(vcl::Window* pParent, WinBits _nBits,bool _bShowPrefix = false);
virtual ~OConnectionURLEdit();
public:
diff --git a/dbaccess/source/ui/inc/datasourceconnector.hxx b/dbaccess/source/ui/inc/datasourceconnector.hxx
index f87f4681a9ab..f5d64a0f48cd 100644
--- a/dbaccess/source/ui/inc/datasourceconnector.hxx
+++ b/dbaccess/source/ui/inc/datasourceconnector.hxx
@@ -30,7 +30,7 @@ namespace dbtools
class SQLExceptionInfo;
}
-class Window;
+namespace vcl { class Window; }
namespace dbaui
{
@@ -38,7 +38,7 @@ namespace dbaui
class ODatasourceConnector
{
protected:
- Window* m_pErrorMessageParent;
+ vcl::Window* m_pErrorMessageParent;
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >
m_xContext;
OUString m_sContextInformation;
@@ -46,11 +46,11 @@ namespace dbaui
public:
ODatasourceConnector(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext,
- Window* _pMessageParent
+ vcl::Window* _pMessageParent
);
ODatasourceConnector(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext,
- Window* _pMessageParent,
+ vcl::Window* _pMessageParent,
const OUString& _rContextInformation
);
diff --git a/dbaccess/source/ui/inc/dbadmin.hxx b/dbaccess/source/ui/inc/dbadmin.hxx
index ddce2e2250ef..66989228b351 100644
--- a/dbaccess/source/ui/inc/dbadmin.hxx
+++ b/dbaccess/source/ui/inc/dbadmin.hxx
@@ -61,7 +61,7 @@ public:
/** ctor. The itemset given should have been created by <method>createItemSet</method> and should be destroyed
after the dialog has been destroyed
*/
- ODbAdminDialog(Window* pParent,
+ ODbAdminDialog(vcl::Window* pParent,
SfxItemSet* _pItems,
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB
);
diff --git a/dbaccess/source/ui/inc/dbtreelistbox.hxx b/dbaccess/source/ui/inc/dbtreelistbox.hxx
index ce9ad84ea2d4..ab15137087bb 100644
--- a/dbaccess/source/ui/inc/dbtreelistbox.hxx
+++ b/dbaccess/source/ui/inc/dbtreelistbox.hxx
@@ -80,7 +80,7 @@ namespace dbaui
DECL_LINK( ScrollDownHdl, SvTreeListBox* );
public:
- DBTreeListBox( Window* pParent
+ DBTreeListBox( vcl::Window* pParent
,WinBits nWinStyle=0
,bool _bHandleEnterKey = false);
virtual ~DBTreeListBox();
diff --git a/dbaccess/source/ui/inc/dbwiz.hxx b/dbaccess/source/ui/inc/dbwiz.hxx
index 124b6a8b6eb6..0f84ea6404f4 100644
--- a/dbaccess/source/ui/inc/dbwiz.hxx
+++ b/dbaccess/source/ui/inc/dbwiz.hxx
@@ -70,7 +70,7 @@ public:
/** ctor. The itemset given should have been created by <method>createItemSet</method> and should be destroyed
after the dialog has been destroyed
*/
- ODbTypeWizDialog(Window* pParent
+ ODbTypeWizDialog(vcl::Window* pParent
,SfxItemSet* _pItems
,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB
,const ::com::sun::star::uno::Any& _aDataSourceName
diff --git a/dbaccess/source/ui/inc/dbwizsetup.hxx b/dbaccess/source/ui/inc/dbwizsetup.hxx
index 067907ca335f..bdd22395f9c6 100644
--- a/dbaccess/source/ui/inc/dbwizsetup.hxx
+++ b/dbaccess/source/ui/inc/dbwizsetup.hxx
@@ -96,7 +96,7 @@ public:
/** ctor. The itemset given should have been created by <method>createItemSet</method> and should be destroyed
after the dialog has been destroyed
*/
- ODbTypeWizDialogSetup(Window* pParent
+ ODbTypeWizDialogSetup(vcl::Window* pParent
,SfxItemSet* _pItems
,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB
,const ::com::sun::star::uno::Any& _aDataSourceName
diff --git a/dbaccess/source/ui/inc/directsql.hxx b/dbaccess/source/ui/inc/directsql.hxx
index ef4aff479b3d..d27de6c58125 100644
--- a/dbaccess/source/ui/inc/directsql.hxx
+++ b/dbaccess/source/ui/inc/directsql.hxx
@@ -66,7 +66,7 @@ namespace dbaui
public:
DirectSQLDialog(
- Window* _pParent,
+ vcl::Window* _pParent,
const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConn);
virtual ~DirectSQLDialog();
diff --git a/dbaccess/source/ui/inc/dlgattr.hxx b/dbaccess/source/ui/inc/dlgattr.hxx
index f6956361fbdc..b6614cf62701 100644
--- a/dbaccess/source/ui/inc/dlgattr.hxx
+++ b/dbaccess/source/ui/inc/dlgattr.hxx
@@ -33,7 +33,7 @@ namespace dbaui
sal_uInt32 m_nNumberFormatId;
public:
- SbaSbAttrDlg(Window * pParent, const SfxItemSet*, SvNumberFormatter*, bool bHasFormat, bool bRow = false);
+ SbaSbAttrDlg(vcl::Window * pParent, const SfxItemSet*, SvNumberFormatter*, bool bHasFormat, bool bRow = false);
virtual ~SbaSbAttrDlg();
virtual void PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage ) SAL_OVERRIDE;
diff --git a/dbaccess/source/ui/inc/dlgsave.hxx b/dbaccess/source/ui/inc/dlgsave.hxx
index 5d30bd92bff5..5217e1fcb0a0 100644
--- a/dbaccess/source/ui/inc/dlgsave.hxx
+++ b/dbaccess/source/ui/inc/dlgsave.hxx
@@ -52,14 +52,14 @@ namespace dbaui
OSaveAsDlgImpl* m_pImpl;
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext;
public:
- OSaveAsDlg( Window * pParent,const sal_Int32& _rType,
+ OSaveAsDlg( vcl::Window * pParent,const sal_Int32& _rType,
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext,
const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection,
const OUString& rDefault,
const IObjectNameCheck& _rObjectNameCheck,
sal_Int32 _nFlags = SAD_DEFAULT | SAD_TITLE_STORE_AS);
- OSaveAsDlg( Window* _pParent,
+ OSaveAsDlg( vcl::Window* _pParent,
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext,
const OUString& _rDefault,
const OUString& _sLabel,
diff --git a/dbaccess/source/ui/inc/dlgsize.hxx b/dbaccess/source/ui/inc/dlgsize.hxx
index 25e35964efe6..e145cf7675ad 100644
--- a/dbaccess/source/ui/inc/dlgsize.hxx
+++ b/dbaccess/source/ui/inc/dlgsize.hxx
@@ -43,7 +43,7 @@ namespace dbaui
CheckBox* m_pCB_STANDARD;
public:
- DlgSize( Window * pParent, sal_Int32 nVal, bool bRow, sal_Int32 _nAlternativeStandard = -1 );
+ DlgSize( vcl::Window * pParent, sal_Int32 nVal, bool bRow, sal_Int32 _nAlternativeStandard = -1 );
sal_Int32 GetValue();
};
} // namespace dbaui
diff --git a/dbaccess/source/ui/inc/indexdialog.hxx b/dbaccess/source/ui/inc/indexdialog.hxx
index 3aa05ffafe8e..f204c8c3cf89 100644
--- a/dbaccess/source/ui/inc/indexdialog.hxx
+++ b/dbaccess/source/ui/inc/indexdialog.hxx
@@ -48,7 +48,7 @@ namespace dbaui
bool m_bSuspendSelectHdl;
public:
- DbaIndexList(Window* _pParent, WinBits nWinBits);
+ DbaIndexList(vcl::Window* _pParent, WinBits nWinBits);
void SetSelectHdl(const Link& _rHdl) { m_aSelectHdl = _rHdl; }
Link GetSelectHdl() const { return m_aSelectHdl; }
@@ -103,7 +103,7 @@ namespace dbaui
m_xContext;
public:
DbaIndexDialog(
- Window* _pParent,
+ vcl::Window* _pParent,
const ::com::sun::star::uno::Sequence< OUString >& _rFieldNames,
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxIndexes,
const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection,
diff --git a/dbaccess/source/ui/inc/indexfieldscontrol.hxx b/dbaccess/source/ui/inc/indexfieldscontrol.hxx
index 7151d6dc9b38..fb1347d2b3eb 100644
--- a/dbaccess/source/ui/inc/indexfieldscontrol.hxx
+++ b/dbaccess/source/ui/inc/indexfieldscontrol.hxx
@@ -50,7 +50,7 @@ namespace dbaui
bool m_bAddIndexAppendix;
public:
- IndexFieldsControl( Window* _pParent, WinBits nWinStyle);
+ IndexFieldsControl( vcl::Window* _pParent, WinBits nWinStyle);
virtual ~IndexFieldsControl();
void Init(const ::com::sun::star::uno::Sequence< OUString >& _rAvailableFields, sal_Int32 _nMaxColumnsInIndex,bool _bAddIndexAppendix);
diff --git a/dbaccess/source/ui/inc/linkeddocuments.hxx b/dbaccess/source/ui/inc/linkeddocuments.hxx
index ebe50f47c8e7..7c597b24624e 100644
--- a/dbaccess/source/ui/inc/linkeddocuments.hxx
+++ b/dbaccess/source/ui/inc/linkeddocuments.hxx
@@ -33,7 +33,7 @@
#include <com/sun/star/sdb/application/XDatabaseDocumentUI.hpp>
#include <comphelper/namedvaluecollection.hxx>
-class Window;
+namespace vcl { class Window; }
namespace dbaui
{
@@ -49,13 +49,13 @@ namespace dbaui
m_xConnection;
::com::sun::star::uno::Reference< ::com::sun::star::sdb::application::XDatabaseDocumentUI >
m_xDocumentUI;
- Window* m_pDialogParent;
+ vcl::Window* m_pDialogParent;
OUString m_sCurrentlyEditing;
OUString m_sDataSourceName;
public:
OLinkedDocumentsAccess(
- Window* _pDialogParent,
+ vcl::Window* _pDialogParent,
const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::application::XDatabaseDocumentUI >& i_rDocumentUI,
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext,
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxContainer,
diff --git a/dbaccess/source/ui/inc/marktree.hxx b/dbaccess/source/ui/inc/marktree.hxx
index cd86e1a8eba1..2e10a99b82c6 100644
--- a/dbaccess/source/ui/inc/marktree.hxx
+++ b/dbaccess/source/ui/inc/marktree.hxx
@@ -38,7 +38,7 @@ class OMarkableTreeListBox : public DBTreeListBox
Link m_aCheckButtonHandler;
public:
- OMarkableTreeListBox( Window* pParent, WinBits nWinStyle=0 );
+ OMarkableTreeListBox( vcl::Window* pParent, WinBits nWinStyle=0 );
virtual ~OMarkableTreeListBox();
virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE;
diff --git a/dbaccess/source/ui/inc/opendoccontrols.hxx b/dbaccess/source/ui/inc/opendoccontrols.hxx
index 1dcd219a818a..24d475cb8c3d 100644
--- a/dbaccess/source/ui/inc/opendoccontrols.hxx
+++ b/dbaccess/source/ui/inc/opendoccontrols.hxx
@@ -40,7 +40,7 @@ namespace dbaui
OUString m_sModule;
public:
- OpenDocumentButton( Window* _pParent, const sal_Char* _pAsciiModuleName );
+ OpenDocumentButton( vcl::Window* _pParent, const sal_Char* _pAsciiModuleName );
protected:
void impl_init( const sal_Char* _pAsciiModuleName );
@@ -57,7 +57,7 @@ namespace dbaui
MapIndexToStringPair m_aURLs;
public:
- OpenDocumentListBox( Window* _pParent, const sal_Char* _pAsciiModuleName );
+ OpenDocumentListBox( vcl::Window* _pParent, const sal_Char* _pAsciiModuleName );
OUString GetSelectedDocumentURL() const;
OUString GetSelectedDocumentFilter() const;
diff --git a/dbaccess/source/ui/inc/paramdialog.hxx b/dbaccess/source/ui/inc/paramdialog.hxx
index 71b1f4b347e9..edc37862a366 100644
--- a/dbaccess/source/ui/inc/paramdialog.hxx
+++ b/dbaccess/source/ui/inc/paramdialog.hxx
@@ -79,7 +79,7 @@ namespace dbaui
m_aFinalValues; /// the final values as entered by the user
public:
- OParameterDialog(Window* _pParent,
+ OParameterDialog(vcl::Window* _pParent,
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > & _rParamContainer,
const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > & _rxConnection,
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext);
diff --git a/dbaccess/source/ui/inc/querycontainerwindow.hxx b/dbaccess/source/ui/inc/querycontainerwindow.hxx
index e895a0dae32d..64f828ecb721 100644
--- a/dbaccess/source/ui/inc/querycontainerwindow.hxx
+++ b/dbaccess/source/ui/inc/querycontainerwindow.hxx
@@ -35,7 +35,7 @@ namespace dbaui
class OBeamer : public DockingWindow
{
public:
- OBeamer(Window* _pParent) : DockingWindow(_pParent,0){}
+ OBeamer(vcl::Window* _pParent) : DockingWindow(_pParent,0){}
};
// OQueryContainerWindow
@@ -48,7 +48,7 @@ namespace dbaui
DECL_LINK( SplitHdl, void* );
public:
- OQueryContainerWindow(Window* pParent, OQueryController& _rController,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&);
+ OQueryContainerWindow(vcl::Window* pParent, OQueryController& _rController,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&);
virtual ~OQueryContainerWindow();
virtual void Construct() SAL_OVERRIDE;
diff --git a/dbaccess/source/ui/inc/querycontroller.hxx b/dbaccess/source/ui/inc/querycontroller.hxx
index 6d94e84fc02b..35d9165d0ae1 100644
--- a/dbaccess/source/ui/inc/querycontroller.hxx
+++ b/dbaccess/source/ui/inc/querycontroller.hxx
@@ -165,7 +165,7 @@ namespace dbaui
::connectivity::OSQLParser& getParser() { return m_aSqlParser; }
::connectivity::OSQLParseTreeIterator& getParseIterator() { return *m_pSqlIterator; }
- virtual bool Construct(Window* pParent) SAL_OVERRIDE;
+ virtual bool Construct(vcl::Window* pParent) SAL_OVERRIDE;
DECLARE_XINTERFACE( )
DECLARE_XTYPEPROVIDER( )
diff --git a/dbaccess/source/ui/inc/queryfilter.hxx b/dbaccess/source/ui/inc/queryfilter.hxx
index 25694f44ff76..b9d76cccca97 100644
--- a/dbaccess/source/ui/inc/queryfilter.hxx
+++ b/dbaccess/source/ui/inc/queryfilter.hxx
@@ -106,7 +106,7 @@ namespace dbaui
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getQueryColumn( const OUString& _rFieldName ) const;
public:
- DlgFilterCrit( Window * pParent,
+ DlgFilterCrit( vcl::Window * pParent,
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _rxConnection,
const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer>& _rxComposer,
diff --git a/dbaccess/source/ui/inc/queryorder.hxx b/dbaccess/source/ui/inc/queryorder.hxx
index a4a535ada1d0..007c42966a6a 100644
--- a/dbaccess/source/ui/inc/queryorder.hxx
+++ b/dbaccess/source/ui/inc/queryorder.hxx
@@ -79,7 +79,7 @@ namespace dbaui
void EnableLines();
public:
- DlgOrderCrit( Window * pParent,
+ DlgOrderCrit( vcl::Window * pParent,
const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _rxConnection,
const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer>& _rxComposer,
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& _rxCols);
diff --git a/dbaccess/source/ui/inc/queryview.hxx b/dbaccess/source/ui/inc/queryview.hxx
index 467b09f040b0..0a05a3153b40 100644
--- a/dbaccess/source/ui/inc/queryview.hxx
+++ b/dbaccess/source/ui/inc/queryview.hxx
@@ -27,7 +27,7 @@ namespace dbaui
class OQueryView : public OJoinDesignView
{
public:
- OQueryView(Window* pParent, OQueryController& _rController,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& );
+ OQueryView(vcl::Window* pParent, OQueryController& _rController,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& );
virtual ~OQueryView();
virtual bool isCutAllowed() = 0;
diff --git a/dbaccess/source/ui/inc/sbagrid.hxx b/dbaccess/source/ui/inc/sbagrid.hxx
index e9c7e3ba586e..3141c0cf96b3 100644
--- a/dbaccess/source/ui/inc/sbagrid.hxx
+++ b/dbaccess/source/ui/inc/sbagrid.hxx
@@ -88,7 +88,7 @@ namespace dbaui
virtual void SAL_CALL createPeer(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit > & rToolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > & rParentPeer) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
protected:
- virtual FmXGridPeer* imp_CreatePeer(Window* pParent) SAL_OVERRIDE;
+ virtual FmXGridPeer* imp_CreatePeer(vcl::Window* pParent) SAL_OVERRIDE;
};
// SbaXGridPeer
@@ -127,7 +127,7 @@ namespace dbaui
virtual void SAL_CALL dispose(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
protected:
- virtual FmGridControl* imp_CreateControl(Window* pParent, WinBits nStyle) SAL_OVERRIDE;
+ virtual FmGridControl* imp_CreateControl(vcl::Window* pParent, WinBits nStyle) SAL_OVERRIDE;
#ifdef _MSC_VER
typedef ::com::sun::star::frame::XStatusListener xstlist_type;
typedef ::com::sun::star::uno::Reference< xstlist_type > xlistener_type;
diff --git a/dbaccess/source/ui/inc/sqlmessage.hxx b/dbaccess/source/ui/inc/sqlmessage.hxx
index 6a6387445e2b..d91ec74cac56 100644
--- a/dbaccess/source/ui/inc/sqlmessage.hxx
+++ b/dbaccess/source/ui/inc/sqlmessage.hxx
@@ -70,7 +70,7 @@ public:
detailed field of an <type scope="com::sun::star::sdb">SQLContext</type>).
*/
OSQLMessageBox(
- Window* _pParent,
+ vcl::Window* _pParent,
const dbtools::SQLExceptionInfo& _rException,
WinBits _nStyle = WB_OK | WB_DEF_OK,
const OUString& _rHelpURL = OUString()
@@ -82,7 +82,7 @@ public:
@param rMessage the detailed message to display
@param _eType determines the image to use. AUTO is disallowed in this constructor version
*/
- OSQLMessageBox(Window* pParent,
+ OSQLMessageBox(vcl::Window* pParent,
const OUString& rTitle,
const OUString& rMessage,
WinBits nStyle = WB_OK | WB_DEF_OK,
@@ -107,7 +107,7 @@ private:
class OSQLWarningBox : public OSQLMessageBox
{
public:
- OSQLWarningBox( Window* _pParent,
+ OSQLWarningBox( vcl::Window* _pParent,
const OUString& _rMessage,
WinBits _nStyle = WB_OK | WB_DEF_OK,
const ::dbtools::SQLExceptionInfo* _pAdditionalErrorInfo = NULL );
@@ -117,7 +117,7 @@ public:
class OSQLErrorBox : public OSQLMessageBox
{
public:
- OSQLErrorBox( Window* _pParent,
+ OSQLErrorBox( vcl::Window* _pParent,
const OUString& _rMessage,
WinBits _nStyle = WB_OK | WB_DEF_OK,
const ::dbtools::SQLExceptionInfo* _pAdditionalErrorInfo = NULL );
diff --git a/dbaccess/source/ui/inc/tabletree.hxx b/dbaccess/source/ui/inc/tabletree.hxx
index 3114ef511525..52afd2764b40 100644
--- a/dbaccess/source/ui/inc/tabletree.hxx
+++ b/dbaccess/source/ui/inc/tabletree.hxx
@@ -46,7 +46,7 @@ protected:
bool m_bNoEmptyFolders; // should empty catalogs/schematas be prevented from being displayed?
public:
- OTableTreeListBox(Window* pParent, WinBits nWinStyle);
+ OTableTreeListBox(vcl::Window* pParent, WinBits nWinStyle);
void init(bool bVirtualRoot) { m_bVirtualRoot = bVirtualRoot; }
diff --git a/dbaccess/source/ui/inc/textconnectionsettings.hxx b/dbaccess/source/ui/inc/textconnectionsettings.hxx
index 080025084dd6..40ab9616095b 100644
--- a/dbaccess/source/ui/inc/textconnectionsettings.hxx
+++ b/dbaccess/source/ui/inc/textconnectionsettings.hxx
@@ -37,7 +37,7 @@ namespace dbaui
class TextConnectionSettingsDialog : public ModalDialog
{
public:
- TextConnectionSettingsDialog( Window* _pParent, SfxItemSet& _rItems );
+ TextConnectionSettingsDialog( vcl::Window* _pParent, SfxItemSet& _rItems );
virtual ~TextConnectionSettingsDialog();
/** initializes a set of PropertyStorage instaces, which are bound to
diff --git a/dbaccess/source/ui/inc/unodatbr.hxx b/dbaccess/source/ui/inc/unodatbr.hxx
index 1c004917d8d8..e28f3e2adff5 100644
--- a/dbaccess/source/ui/inc/unodatbr.hxx
+++ b/dbaccess/source/ui/inc/unodatbr.hxx
@@ -147,7 +147,7 @@ namespace dbaui
DECLARE_UNO3_DEFAULTS(SbaTableQueryBrowser,SbaXDataBrowserController)
// late construction
- virtual bool Construct(Window* pParent) SAL_OVERRIDE;
+ virtual bool Construct(vcl::Window* pParent) SAL_OVERRIDE;
// XInterface
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/dbaccess/source/ui/inc/unosqlmessage.hxx b/dbaccess/source/ui/inc/unosqlmessage.hxx
index 5bae185c4528..45cfaf2ec921 100644
--- a/dbaccess/source/ui/inc/unosqlmessage.hxx
+++ b/dbaccess/source/ui/inc/unosqlmessage.hxx
@@ -69,7 +69,7 @@ protected:
virtual sal_Bool SAL_CALL convertFastPropertyValue( com::sun::star::uno::Any& _rConvertedValue, com::sun::star::uno::Any& _rOldValue, sal_Int32 _nHandle, const com::sun::star::uno::Any& _rValue) throw(com::sun::star::lang::IllegalArgumentException) SAL_OVERRIDE;
// OGenericUnoDialog overridables
- virtual Dialog* createDialog(Window* _pParent) SAL_OVERRIDE;
+ virtual Dialog* createDialog(vcl::Window* _pParent) SAL_OVERRIDE;
};
} // namespace dbaui
diff --git a/dbaccess/source/ui/misc/RowSetDrop.cxx b/dbaccess/source/ui/misc/RowSetDrop.cxx
index 6f374f003933..5a061ea0c448 100644
--- a/dbaccess/source/ui/misc/RowSetDrop.cxx
+++ b/dbaccess/source/ui/misc/RowSetDrop.cxx
@@ -38,7 +38,7 @@ using namespace ::com::sun::star::sdb;
using namespace ::com::sun::star::lang;
// export data
-ORowSetImportExport::ORowSetImportExport( Window* _pParent,
+ORowSetImportExport::ORowSetImportExport( vcl::Window* _pParent,
const Reference< XResultSetUpdate >& _xResultSetUpdate,
const ::svx::ODataAccessDescriptor& _aDataDescriptor,
const Reference< XComponentContext >& _rM,
diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx
index d0e69379d20e..83f6ac0298ac 100644
--- a/dbaccess/source/ui/misc/UITools.cxx
+++ b/dbaccess/source/ui/misc/UITools.cxx
@@ -208,7 +208,7 @@ SQLExceptionInfo createConnection( const Reference< ::com::sun::star::beans::XP
}
Reference< XDataSource > getDataSourceByName( const OUString& _rDataSourceName,
- Window* _pErrorMessageParent, Reference< XComponentContext > _rxContext, ::dbtools::SQLExceptionInfo* _pErrorInfo )
+ vcl::Window* _pErrorMessageParent, Reference< XComponentContext > _rxContext, ::dbtools::SQLExceptionInfo* _pErrorInfo )
{
Reference< XDatabaseContext > xDatabaseContext = DatabaseContext::create(_rxContext);
@@ -280,7 +280,7 @@ Reference< XInterface > getDataSourceOrModel(const Reference< XInterface >& _xOb
return xRet;
}
-void showError(const SQLExceptionInfo& _rInfo,Window* _pParent,const Reference< XComponentContext >& _rxContext)
+void showError(const SQLExceptionInfo& _rInfo, vcl::Window* _pParent,const Reference< XComponentContext >& _rxContext)
{
OSL_ENSURE(_pParent,"showError: Parent window must be NOT NULL!");
::dbtools::showError(_rInfo,VCLUnoHelper::GetInterface(_pParent), _rxContext);
@@ -753,7 +753,7 @@ SvxCellHorJustify mapTextJustify(const sal_Int32& _nAlignment)
void callColumnFormatDialog(const Reference<XPropertySet>& xAffectedCol,
const Reference<XPropertySet>& xField,
SvNumberFormatter* _pFormatter,
- Window* _pParent)
+ vcl::Window* _pParent)
{
if (xAffectedCol.is() && xField.is())
{
@@ -786,7 +786,7 @@ void callColumnFormatDialog(const Reference<XPropertySet>& xAffectedCol,
}
}
-bool callColumnFormatDialog(Window* _pParent,
+bool callColumnFormatDialog(vcl::Window* _pParent,
SvNumberFormatter* _pFormatter,
sal_Int32 _nDataType,
sal_Int32& _nFormatKey,
@@ -908,7 +908,7 @@ const SfxFilter* getStandardDatabaseFilter()
bool appendToFilter(const Reference<XConnection>& _xConnection,
const OUString& _sName,
const Reference< XComponentContext >& _rxContext,
- Window* _pParent)
+ vcl::Window* _pParent)
{
bool bRet = false;
Reference< XChild> xChild(_xConnection,UNO_QUERY);
@@ -956,7 +956,7 @@ bool appendToFilter(const Reference<XConnection>& _xConnection,
return bRet;
}
-void notifySystemWindow(Window* _pWindow,Window* _pToRegister, ::comphelper::mem_fun1_t<TaskPaneList,Window*> _rMemFunc)
+void notifySystemWindow(vcl::Window* _pWindow, vcl::Window* _pToRegister, ::comphelper::mem_fun1_t<TaskPaneList,vcl::Window*> _rMemFunc)
{
OSL_ENSURE(_pWindow,"Window can not be null!");
SystemWindow* pSystemWindow = _pWindow ? _pWindow->GetSystemWindow() : NULL;
@@ -1281,7 +1281,7 @@ TOTypeInfoSP queryTypeInfoByType(sal_Int32 _nDataType,const OTypeInfoMap& _rType
return pTypeInfo;
}
-sal_Int32 askForUserAction(Window* _pParent,sal_uInt16 _nTitle,sal_uInt16 _nText,bool _bAll,const OUString& _sName)
+sal_Int32 askForUserAction(vcl::Window* _pParent,sal_uInt16 _nTitle,sal_uInt16 _nText,bool _bAll,const OUString& _sName)
{
SolarMutexGuard aGuard;
OUString aMsg = ModuleRes(_nText);
@@ -1385,7 +1385,7 @@ Reference<XPropertySet> createView( const OUString& _rName, const Reference< XCo
return createView( _rName, _rxConnection, sCommand );
}
-bool insertHierachyElement( Window* _pParent, const Reference< XComponentContext >& _rxContext,
+bool insertHierachyElement( vcl::Window* _pParent, const Reference< XComponentContext >& _rxContext,
const Reference<XHierarchicalNameContainer>& _xNames,
const OUString& _sParentFolder,
bool _bForm,
diff --git a/dbaccess/source/ui/misc/WCPage.cxx b/dbaccess/source/ui/misc/WCPage.cxx
index f73c73c2ca27..ae647cf79972 100644
--- a/dbaccess/source/ui/misc/WCPage.cxx
+++ b/dbaccess/source/ui/misc/WCPage.cxx
@@ -50,7 +50,7 @@ using namespace ::com::sun::star::sdbcx;
namespace CopyTableOperation = ::com::sun::star::sdb::application::CopyTableOperation;
// Klasse OCopyTable
-OCopyTable::OCopyTable(Window * pParent)
+OCopyTable::OCopyTable(vcl::Window * pParent)
: OWizardPage(pParent, "CopyTablePage", "dbaccess/ui/copytablepage.ui")
, m_nOldOperation(0)
, m_pPage2(NULL)
diff --git a/dbaccess/source/ui/misc/WColumnSelect.cxx b/dbaccess/source/ui/misc/WColumnSelect.cxx
index 62cce5672ff3..0df651f41212 100644
--- a/dbaccess/source/ui/misc/WColumnSelect.cxx
+++ b/dbaccess/source/ui/misc/WColumnSelect.cxx
@@ -43,7 +43,7 @@ namespace CopyTableOperation = ::com::sun::star::sdb::application::CopyTableOper
OUString OWizColumnSelect::GetTitle() const { return ModuleRes(STR_WIZ_COLUMN_SELECT_TITEL); }
-OWizardPage::OWizardPage(Window* pParent, const OString& rID, const OUString& rUIXMLDescription)
+OWizardPage::OWizardPage(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription)
: TabPage(pParent, rID, rUIXMLDescription)
,m_pParent(static_cast<OCopyTableWizard*>(pParent))
,m_bFirstTime(true)
@@ -51,7 +51,7 @@ OWizardPage::OWizardPage(Window* pParent, const OString& rID, const OUString& rU
}
// OWizColumnSelect
-OWizColumnSelect::OWizColumnSelect( Window* pParent)
+OWizColumnSelect::OWizColumnSelect( vcl::Window* pParent)
:OWizardPage( pParent, "ApplyColPage", "dbaccess/ui/applycolpage.ui")
{
get(m_pOrgColumnNames, "from");
diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx
index 755d22bbc7c4..505ef7793602 100644
--- a/dbaccess/source/ui/misc/WCopyTable.cxx
+++ b/dbaccess/source/ui/misc/WCopyTable.cxx
@@ -499,7 +499,7 @@ namespace
}
// OCopyTableWizard
-OCopyTableWizard::OCopyTableWizard( Window * pParent, const OUString& _rDefaultName, sal_Int16 _nOperation,
+OCopyTableWizard::OCopyTableWizard( vcl::Window * pParent, const OUString& _rDefaultName, sal_Int16 _nOperation,
const ICopyTableSourceObject& _rSourceObject, const Reference< XConnection >& _xSourceConnection,
const Reference< XConnection >& _xConnection, const Reference< XComponentContext >& _rxContext,
const Reference< XInteractionHandler>& _xInteractionHandler)
@@ -591,7 +591,7 @@ OCopyTableWizard::OCopyTableWizard( Window * pParent, const OUString& _rDefaultN
ActivatePage();
}
-OCopyTableWizard::OCopyTableWizard( Window* pParent, const OUString& _rDefaultName, sal_Int16 _nOperation,
+OCopyTableWizard::OCopyTableWizard( vcl::Window* pParent, const OUString& _rDefaultName, sal_Int16 _nOperation,
const ODatabaseExport::TColumns& _rSourceColumns, const ODatabaseExport::TColumnVector& _rSourceColVec,
const Reference< XConnection >& _xConnection, const Reference< XNumberFormatter >& _xFormatter,
TypeSelectionPageFactory _pTypeSelectionPageFactory, SvStream& _rTypeSelectionPageArg, const Reference< XComponentContext >& _rxContext )
diff --git a/dbaccess/source/ui/misc/WExtendPages.cxx b/dbaccess/source/ui/misc/WExtendPages.cxx
index 9ec4d842f36f..6a21d512bd0f 100644
--- a/dbaccess/source/ui/misc/WExtendPages.cxx
+++ b/dbaccess/source/ui/misc/WExtendPages.cxx
@@ -48,7 +48,7 @@ SvParser* OWizRTFExtend::createReader(sal_Int32 _nRows)
m_pParent->shouldCreatePrimaryKey());
}
-OWizNormalExtend::OWizNormalExtend(Window* pParent) : OWizTypeSelect( pParent )
+OWizNormalExtend::OWizNormalExtend(vcl::Window* pParent) : OWizTypeSelect( pParent )
{
EnableAuto(false);
}
diff --git a/dbaccess/source/ui/misc/WNameMatch.cxx b/dbaccess/source/ui/misc/WNameMatch.cxx
index fcdd0ae60e2f..8126f1cf804a 100644
--- a/dbaccess/source/ui/misc/WNameMatch.cxx
+++ b/dbaccess/source/ui/misc/WNameMatch.cxx
@@ -30,7 +30,7 @@
using namespace ::dbaui;
// OWizColumnSelect
-OWizNameMatching::OWizNameMatching( Window* pParent)
+OWizNameMatching::OWizNameMatching( vcl::Window* pParent)
:OWizardPage( pParent, "NameMatching", "dbaccess/ui/namematchingpage.ui" )
, m_aImgUp(ModuleRes(IMG_UP))
, m_aImgDown(ModuleRes(IMG_DOWN))
@@ -344,7 +344,7 @@ void OColumnString::Paint(const Point& rPos, SvTreeListBox& rDev, const SvViewDa
rDev.DrawText( rPos, GetText() );
}
-OColumnTreeBox::OColumnTreeBox( Window* pParent, WinBits nBits )
+OColumnTreeBox::OColumnTreeBox( vcl::Window* pParent, WinBits nBits )
: OMarkableTreeListBox(pParent, nBits)
, m_bReadOnly(false)
{
@@ -354,7 +354,7 @@ OColumnTreeBox::OColumnTreeBox( Window* pParent, WinBits nBits )
SetSelectionMode( SINGLE_SELECTION );
}
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeOColumnTreeBox(Window *pParent, VclBuilder::stringmap &)
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeOColumnTreeBox(vcl::Window *pParent, VclBuilder::stringmap &)
{
return new OColumnTreeBox(pParent);
}
diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx b/dbaccess/source/ui/misc/WTypeSelect.cxx
index a0bca4b20eaa..46f952f2dd14 100644
--- a/dbaccess/source/ui/misc/WTypeSelect.cxx
+++ b/dbaccess/source/ui/misc/WTypeSelect.cxx
@@ -42,7 +42,7 @@ using namespace ::com::sun::star::util;
using namespace ::com::sun::star::sdbc;
// OWizTypeSelectControl
-OWizTypeSelectControl::OWizTypeSelectControl(Window* pParent, Window* pParentTabPage, OTableDesignHelpBar* pHelpBar)
+OWizTypeSelectControl::OWizTypeSelectControl(vcl::Window* pParent, vcl::Window* pParentTabPage, OTableDesignHelpBar* pHelpBar)
: OFieldDescControl(pParent, pHelpBar)
{
@@ -211,7 +211,7 @@ OUString OWizTypeSelectControl::getAutoIncrementValue() const
}
#define IMG_PRIMARY_KEY 1
-OWizTypeSelect::OWizTypeSelect( Window* pParent, SvStream* _pStream )
+OWizTypeSelect::OWizTypeSelect( vcl::Window* pParent, SvStream* _pStream )
:OWizardPage( pParent, "TypeSelect", "dbaccess/ui/typeselectpage.ui")
,m_pTypeControl(new OWizTypeSelectControl(get<VclVBox>("control_container"), this) )
,m_pParserStream( _pStream )
@@ -373,7 +373,7 @@ void OWizTypeSelectList::setPrimaryKey(OFieldDescription* _pFieldDescr, sal_uInt
SetEntryData(_nPos,_pFieldDescr);
}
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeOWizTypeSelectList(Window *pParent, VclBuilder::stringmap &)
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeOWizTypeSelectList(vcl::Window *pParent, VclBuilder::stringmap &)
{
return new OWizTypeSelectList(pParent);
}
diff --git a/dbaccess/source/ui/misc/controllerframe.cxx b/dbaccess/source/ui/misc/controllerframe.cxx
index 3bfd496321b1..fae7d7555961 100644
--- a/dbaccess/source/ui/misc/controllerframe.cxx
+++ b/dbaccess/source/ui/misc/controllerframe.cxx
@@ -262,7 +262,7 @@ namespace dbaui
const Reference< XWindow > xContainerWindow( m_pData->m_xFrame->getContainerWindow(), UNO_SET_THROW );
if ( _bRegister )
{
- const Window* pContainerWindow = VCLUnoHelper::GetWindow( xContainerWindow );
+ const vcl::Window* pContainerWindow = VCLUnoHelper::GetWindow( xContainerWindow );
ENSURE_OR_THROW( pContainerWindow, "no Window implementation for the frame's container window!" );
m_pData->m_bIsTopLevelDocumentWindow = ( pContainerWindow->GetExtendedStyle() & WB_EXT_DOCUMENT ) != 0;
diff --git a/dbaccess/source/ui/misc/databaseobjectview.cxx b/dbaccess/source/ui/misc/databaseobjectview.cxx
index 8150e76a7201..bd5de5f1c238 100644
--- a/dbaccess/source/ui/misc/databaseobjectview.cxx
+++ b/dbaccess/source/ui/misc/databaseobjectview.cxx
@@ -133,7 +133,7 @@ namespace dbaui
// "ThisComponent"-game for the global application Basic.
const Reference< XFrame > xFrame( m_xFrameLoader, UNO_QUERY_THROW );
const Reference< XWindow > xFrameWindow( xFrame->getContainerWindow(), UNO_SET_THROW );
- Window* pContainerWindow = VCLUnoHelper::GetWindow( xFrameWindow );
+ vcl::Window* pContainerWindow = VCLUnoHelper::GetWindow( xFrameWindow );
ENSURE_OR_THROW( pContainerWindow, "no implementation access to the frame's container window!" );
pContainerWindow->SetExtendedStyle( pContainerWindow->GetExtendedStyle() | WB_EXT_DOCUMENT );
}
diff --git a/dbaccess/source/ui/misc/datasourceconnector.cxx b/dbaccess/source/ui/misc/datasourceconnector.cxx
index 9b072e4d7225..24eca91203af 100644
--- a/dbaccess/source/ui/misc/datasourceconnector.cxx
+++ b/dbaccess/source/ui/misc/datasourceconnector.cxx
@@ -57,13 +57,13 @@ namespace dbaui
using ::svt::OFileNotation;
// ODatasourceConnector
- ODatasourceConnector::ODatasourceConnector(const Reference< XComponentContext >& _rxContext, Window* _pMessageParent)
+ ODatasourceConnector::ODatasourceConnector(const Reference< XComponentContext >& _rxContext, vcl::Window* _pMessageParent)
:m_pErrorMessageParent(_pMessageParent)
,m_xContext(_rxContext)
{
}
- ODatasourceConnector::ODatasourceConnector( const Reference< XComponentContext >& _rxContext, Window* _pMessageParent,
+ ODatasourceConnector::ODatasourceConnector( const Reference< XComponentContext >& _rxContext, vcl::Window* _pMessageParent,
const OUString& _rContextInformation )
:m_pErrorMessageParent(_pMessageParent)
,m_xContext(_rxContext)
diff --git a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx
index a9cc5e19de5c..edd50cf2534e 100644
--- a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx
+++ b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx
@@ -451,7 +451,7 @@ namespace dbaui
{
OUString aMessage(ModuleRes(RID_STR_CONNECTION_LOST));
Reference< XWindow > xWindow = getTopMostContainerWindow();
- Window* pWin = NULL;
+ vcl::Window* pWin = NULL;
if ( xWindow.is() )
pWin = VCLUnoHelper::GetWindow(xWindow);
if ( !pWin )
diff --git a/dbaccess/source/ui/misc/linkeddocuments.cxx b/dbaccess/source/ui/misc/linkeddocuments.cxx
index e3bff76e76f8..04d417a67b2c 100644
--- a/dbaccess/source/ui/misc/linkeddocuments.cxx
+++ b/dbaccess/source/ui/misc/linkeddocuments.cxx
@@ -102,7 +102,7 @@ namespace dbaui
}
// OLinkedDocumentsAccess
- OLinkedDocumentsAccess::OLinkedDocumentsAccess( Window* _pDialogParent, const Reference< XDatabaseDocumentUI >& i_rDocumentUI,
+ OLinkedDocumentsAccess::OLinkedDocumentsAccess( vcl::Window* _pDialogParent, const Reference< XDatabaseDocumentUI >& i_rDocumentUI,
const Reference< XComponentContext >& _rxContext, const Reference< XNameAccess >& _rxContainer,
const Reference< XConnection>& _xConnection, const OUString& _sDataSourceName )
:m_xContext(_rxContext)
diff --git a/dbaccess/source/ui/querydesign/JoinController.cxx b/dbaccess/source/ui/querydesign/JoinController.cxx
index c80ad3fbd40e..826a8a6203e6 100644
--- a/dbaccess/source/ui/querydesign/JoinController.cxx
+++ b/dbaccess/source/ui/querydesign/JoinController.cxx
@@ -96,7 +96,7 @@ public:
virtual bool allowQueries() const SAL_OVERRIDE;
virtual bool allowAddition() const SAL_OVERRIDE;
virtual void addTableWindow( const OUString& _rQualifiedTableName, const OUString& _rAliasName ) SAL_OVERRIDE;
- virtual void onWindowClosing( const Window* _pWindow ) SAL_OVERRIDE;
+ virtual void onWindowClosing( const vcl::Window* _pWindow ) SAL_OVERRIDE;
private:
OJoinTableView* getTableView() const;
@@ -127,13 +127,13 @@ void AddTableDialogContext::addTableWindow( const OUString& _rQualifiedTableName
getTableView()->AddTabWin( _rQualifiedTableName, _rAliasName, true );
}
-void AddTableDialogContext::onWindowClosing( const Window* _pWindow )
+void AddTableDialogContext::onWindowClosing( const vcl::Window* _pWindow )
{
if ( !m_rController.getView() )
return;
::dbaui::notifySystemWindow(
- m_rController.getView(), const_cast< Window* >( _pWindow ), ::comphelper::mem_fun( &TaskPaneList::RemoveWindow ) );
+ m_rController.getView(), const_cast< vcl::Window* >( _pWindow ), ::comphelper::mem_fun( &TaskPaneList::RemoveWindow ) );
m_rController.InvalidateFeature( ID_BROWSER_ADDTABLE );
m_rController.getView()->GrabFocus();
@@ -171,7 +171,7 @@ OJoinDesignView* OJoinController::getJoinView()
void OJoinController::disposing()
{
{
- boost::scoped_ptr< Window > pEnsureDelete( m_pAddTableDialog );
+ boost::scoped_ptr< vcl::Window > pEnsureDelete( m_pAddTableDialog );
m_pAddTableDialog = NULL;
}
diff --git a/dbaccess/source/ui/querydesign/JoinDesignView.cxx b/dbaccess/source/ui/querydesign/JoinDesignView.cxx
index 45014975512b..b61a512c1de6 100644
--- a/dbaccess/source/ui/querydesign/JoinDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinDesignView.cxx
@@ -51,7 +51,7 @@ namespace dbaui
{
// OJoinDesignView
-OJoinDesignView::OJoinDesignView(Window* _pParent, OJoinController& _rController,const Reference< XComponentContext >& _rxContext)
+OJoinDesignView::OJoinDesignView(vcl::Window* _pParent, OJoinController& _rController,const Reference< XComponentContext >& _rxContext)
:ODataView( _pParent, _rController, _rxContext )
,m_pTableView(NULL)
,m_rController( _rController )
@@ -61,9 +61,9 @@ OJoinDesignView::OJoinDesignView(Window* _pParent, OJoinController& _rController
OJoinDesignView::~OJoinDesignView()
{
- boost::scoped_ptr<Window> aT3(m_pScrollWindow);
+ boost::scoped_ptr<vcl::Window> aT3(m_pScrollWindow);
m_pScrollWindow = NULL;
- boost::scoped_ptr<Window> aT2(m_pTableView);
+ boost::scoped_ptr<vcl::Window> aT2(m_pTableView);
m_pTableView = NULL;
}
diff --git a/dbaccess/source/ui/querydesign/JoinExchange.cxx b/dbaccess/source/ui/querydesign/JoinExchange.cxx
index e2531a5dce60..eb05f2009faa 100644
--- a/dbaccess/source/ui/querydesign/JoinExchange.cxx
+++ b/dbaccess/source/ui/querydesign/JoinExchange.cxx
@@ -43,7 +43,7 @@ namespace dbaui
{
}
- void OJoinExchObj::StartDrag( Window* _pWindow, sal_Int8 _nDragSourceActions, IDragTransferableListener* _pListener )
+ void OJoinExchObj::StartDrag( vcl::Window* _pWindow, sal_Int8 _nDragSourceActions, IDragTransferableListener* _pListener )
{
m_pDragListener = _pListener;
TransferableHelper::StartDrag(_pWindow, _nDragSourceActions);
diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx
index 668d5434923c..8d64d01840ff 100644
--- a/dbaccess/source/ui/querydesign/JoinTableView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx
@@ -64,7 +64,7 @@ using namespace ::com::sun::star::lang;
#define TABWIN_WIDTH_STD 120
#define TABWIN_HEIGHT_STD 120
-OScrollWindowHelper::OScrollWindowHelper( Window* pParent) : Window( pParent)
+OScrollWindowHelper::OScrollWindowHelper( vcl::Window* pParent) : Window( pParent)
,m_aHScrollBar( this, WB_HSCROLL|WB_REPEAT|WB_DRAG )
,m_aVScrollBar( this, WB_VSCROLL|WB_REPEAT|WB_DRAG )
,m_pCornerWindow(new ScrollBarBox(this, WB_3DLOOK))
@@ -89,7 +89,7 @@ OScrollWindowHelper::OScrollWindowHelper( Window* pParent) : Window( pParent)
OScrollWindowHelper::~OScrollWindowHelper()
{
- boost::scoped_ptr<Window> aTemp(m_pCornerWindow);
+ boost::scoped_ptr<vcl::Window> aTemp(m_pCornerWindow);
m_pCornerWindow = NULL;
m_pTableView = NULL;
}
@@ -152,7 +152,7 @@ void OScrollWindowHelper::Resize()
// class OJoinTableView
-OJoinTableView::OJoinTableView( Window* pParent, OJoinDesignView* pView )
+OJoinTableView::OJoinTableView( vcl::Window* pParent, OJoinDesignView* pView )
:Window( pParent,WB_BORDER )
,DropTargetHelper(this)
,m_aDragOffset( Point(0,0) )
@@ -1391,10 +1391,10 @@ bool OJoinTableView::PreNotify(NotifyEvent& rNEvt)
if (m_aTableMap.empty())
// no tab wins -> no conns -> no focus change
break;
- Window* pSource = rNEvt.GetWindow();
+ vcl::Window* pSource = rNEvt.GetWindow();
if (pSource)
{
- Window* pSearchFor = NULL;
+ vcl::Window* pSearchFor = NULL;
if (pSource->GetParent() == this)
// it may be one of the tab wins
pSearchFor = pSource;
@@ -1517,7 +1517,7 @@ void OJoinTableView::clearLayoutInformation()
{
if ( aIter->second )
aIter->second->clearListBox();
- boost::scoped_ptr<Window> aTemp(aIter->second);
+ boost::scoped_ptr<vcl::Window> aTemp(aIter->second);
aIter->second = NULL;
}
diff --git a/dbaccess/source/ui/querydesign/LimitBox.cxx b/dbaccess/source/ui/querydesign/LimitBox.cxx
index 194f029c2d32..4f4175be859b 100644
--- a/dbaccess/source/ui/querydesign/LimitBox.cxx
+++ b/dbaccess/source/ui/querydesign/LimitBox.cxx
@@ -32,7 +32,7 @@ namespace dbaui
{
-LimitBox::LimitBox( Window* pParent, WinBits nStyle )
+LimitBox::LimitBox( vcl::Window* pParent, WinBits nStyle )
: NumericBox( pParent, nStyle )
{
SetShowTrailingZeros( false );
@@ -112,7 +112,7 @@ void LimitBox::LoadDefaultLimits()
}
}
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeLimitBox( Window *pParent, VclBuilder::stringmap & )
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeLimitBox( vcl::Window *pParent, VclBuilder::stringmap & )
{
LimitBox* pBox = new LimitBox( pParent, WB_DROPDOWN | WB_VSCROLL );
return pBox;
diff --git a/dbaccess/source/ui/querydesign/QTableWindow.cxx b/dbaccess/source/ui/querydesign/QTableWindow.cxx
index 77cb02340194..85a3e45bc2ca 100644
--- a/dbaccess/source/ui/querydesign/QTableWindow.cxx
+++ b/dbaccess/source/ui/querydesign/QTableWindow.cxx
@@ -49,7 +49,7 @@ using namespace ::com::sun::star::container;
using namespace ::com::sun::star::beans;
using namespace dbaui;
// class OQueryTableWindow
-OQueryTableWindow::OQueryTableWindow( Window* pParent, const TTableWindowData::value_type& pTabWinData, sal_Unicode* pszInitialAlias)
+OQueryTableWindow::OQueryTableWindow( vcl::Window* pParent, const TTableWindowData::value_type& pTabWinData, sal_Unicode* pszInitialAlias)
:OTableWindow( pParent, pTabWinData )
,m_nAliasNum(0)
{
diff --git a/dbaccess/source/ui/querydesign/QTableWindow.hxx b/dbaccess/source/ui/querydesign/QTableWindow.hxx
index e1b2d4b38cbd..95c674107e77 100644
--- a/dbaccess/source/ui/querydesign/QTableWindow.hxx
+++ b/dbaccess/source/ui/querydesign/QTableWindow.hxx
@@ -31,7 +31,7 @@ namespace dbaui
sal_Int32 m_nAliasNum;
OUString m_strInitialAlias;
public:
- OQueryTableWindow( Window* pParent, const TTableWindowData::value_type& pTabWinData, sal_Unicode* pszInitialAlias = NULL );
+ OQueryTableWindow( vcl::Window* pParent, const TTableWindowData::value_type& pTabWinData, sal_Unicode* pszInitialAlias = NULL );
virtual ~OQueryTableWindow();
OUString GetAliasName() const
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index 3601fd0b0127..c095a73ee036 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -2517,7 +2517,7 @@ OQueryDesignView::~OQueryDesignView()
{
if ( m_pTableView )
::dbaui::notifySystemWindow(this,m_pTableView,::comphelper::mem_fun(&TaskPaneList::RemoveWindow));
- boost::scoped_ptr<Window> aTemp(m_pSelectionBox);
+ boost::scoped_ptr<vcl::Window> aTemp(m_pSelectionBox);
m_pSelectionBox = NULL;
}
@@ -2776,7 +2776,7 @@ bool OQueryDesignView::PreNotify(NotifyEvent& rNEvt)
case EVENT_GETFOCUS:
#if OSL_DEBUG_LEVEL > 0
{
- Window* pFocus = Application::GetFocusWindow();
+ vcl::Window* pFocus = Application::GetFocusWindow();
(void)pFocus;
}
#endif
diff --git a/dbaccess/source/ui/querydesign/QueryTableView.cxx b/dbaccess/source/ui/querydesign/QueryTableView.cxx
index 0d44b0ded818..a12731cb4786 100644
--- a/dbaccess/source/ui/querydesign/QueryTableView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryTableView.cxx
@@ -222,7 +222,7 @@ namespace
}
// class OQueryTableView
-OQueryTableView::OQueryTableView( Window* pParent,OQueryDesignView* pView)
+OQueryTableView::OQueryTableView( vcl::Window* pParent,OQueryDesignView* pView)
: OJoinTableView( pParent,pView)
{
SetHelpId(HID_CTL_QRYDGNTAB);
diff --git a/dbaccess/source/ui/querydesign/QueryTextView.cxx b/dbaccess/source/ui/querydesign/QueryTextView.cxx
index 3d1f4b0cfcaa..eca9e830f14a 100644
--- a/dbaccess/source/ui/querydesign/QueryTextView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryTextView.cxx
@@ -52,7 +52,7 @@ OQueryTextView::OQueryTextView(OQueryContainerWindow* _pParent)
OQueryTextView::~OQueryTextView()
{
- boost::scoped_ptr<Window> aTemp(m_pEdit);
+ boost::scoped_ptr<vcl::Window> aTemp(m_pEdit);
m_pEdit = NULL;
}
diff --git a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
index 4d97d18297d9..e506dbeddbbd 100644
--- a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
+++ b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
@@ -43,11 +43,11 @@ OQueryViewSwitch::OQueryViewSwitch(OQueryContainerWindow* _pParent, OQueryContro
OQueryViewSwitch::~OQueryViewSwitch()
{
{
- boost::scoped_ptr<Window> aTemp(m_pTextView);
+ boost::scoped_ptr<vcl::Window> aTemp(m_pTextView);
m_pTextView = NULL;
}
{
- boost::scoped_ptr<Window> aTemp(m_pDesignView);
+ boost::scoped_ptr<vcl::Window> aTemp(m_pDesignView);
m_pDesignView = NULL;
}
}
@@ -167,7 +167,7 @@ void OQueryViewSwitch::paste()
OQueryContainerWindow* OQueryViewSwitch::getContainer() const
{
- Window* pDesignParent = getDesignView() ? getDesignView()->GetParent() : NULL;
+ vcl::Window* pDesignParent = getDesignView() ? getDesignView()->GetParent() : NULL;
return static_cast< OQueryContainerWindow* >( pDesignParent );
}
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index 217604dc7529..97ca36ac2660 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -97,7 +97,7 @@ namespace
}
}
-OSelectionBrowseBox::OSelectionBrowseBox( Window* pParent )
+OSelectionBrowseBox::OSelectionBrowseBox( vcl::Window* pParent )
:EditBrowseBox( pParent,EBBF_NOROWPICTURE, WB_3DLOOK, BROWSER_COLUMNSELECTION | BROWSER_KEEPSELECTION | BROWSER_HIDESELECT |
BROWSER_HIDECURSOR | BROWSER_HLINESFULL | BROWSER_VLINESFULL )
,m_nSeekRow(0)
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx
index e42c24ee5507..fd84856e3092 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx
@@ -78,7 +78,7 @@ namespace dbaui
bool m_bInUndoMode;
DECL_LINK(OnInvalidateTimer, void*);
- public: OSelectionBrowseBox( Window* pParent );
+ public: OSelectionBrowseBox( vcl::Window* pParent );
virtual ~OSelectionBrowseBox();
void initialize();
diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx
index 027f49e4c311..78b212ff2437 100644
--- a/dbaccess/source/ui/querydesign/TableWindow.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindow.cxx
@@ -66,7 +66,7 @@ namespace DatabaseObject = css::sdb::application::DatabaseObject;
#define TABWIN_HEIGHT_MIN 80
// class OTableWindow
-OTableWindow::OTableWindow( Window* pParent, const TTableWindowData::value_type& pTabWinData )
+OTableWindow::OTableWindow( vcl::Window* pParent, const TTableWindowData::value_type& pTabWinData )
: ::comphelper::OContainerListener(m_aMutex)
,Window( pParent, WB_3DLOOK|WB_MOVEABLE )
,m_aTypeImage( this )
@@ -103,7 +103,7 @@ OTableWindow::~OTableWindow()
if (m_pListBox)
{
OSL_ENSURE(m_pListBox->GetEntryCount()==0,"Forgot to call EmptyListbox()!");
- boost::scoped_ptr<Window> aTemp(m_pListBox);
+ boost::scoped_ptr<vcl::Window> aTemp(m_pListBox);
m_pListBox = NULL;
}
if ( m_pContainerListener.is() )
diff --git a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
index 75ab9389f1c9..636dc9a26d7e 100644
--- a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
@@ -343,7 +343,7 @@ void OTableWindowListBox::GetFocus()
IMPL_LINK( OTableWindowListBox, OnDoubleClick, SvTreeListBox *, /*pBox*/ )
{
// tell my parent
- Window* pParent = Window::GetParent();
+ vcl::Window* pParent = Window::GetParent();
OSL_ENSURE(pParent != NULL, "OTableWindowListBox::OnDoubleClick : habe kein Parent !");
static_cast<OTableWindow*>(pParent)->OnEntryDoubleClicked(GetHdlEntry());
diff --git a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
index 4978043ef2ff..ed2768b958bc 100644
--- a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
+++ b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
@@ -32,7 +32,7 @@ namespace dbaui
class LimitBoxImpl: public LimitBox
{
public:
- LimitBoxImpl( Window* pParent, LimitBoxController* pCtrl );
+ LimitBoxImpl( vcl::Window* pParent, LimitBoxController* pCtrl );
virtual ~LimitBoxImpl();
virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
@@ -41,7 +41,7 @@ class LimitBoxImpl: public LimitBox
LimitBoxController* m_pControl;
};
-LimitBoxImpl::LimitBoxImpl( Window* pParent, LimitBoxController* pCtrl )
+LimitBoxImpl::LimitBoxImpl( vcl::Window* pParent, LimitBoxController* pCtrl )
: LimitBox( pParent, WinBits( WB_DROPDOWN | WB_VSCROLL) )
, m_pControl( pCtrl )
{
@@ -199,7 +199,7 @@ uno::Reference< awt::XWindow > SAL_CALL LimitBoxController::createItemWindow(
uno::Reference< awt::XWindow > xItemWindow;
uno::Reference< awt::XWindow > xParent( Parent );
- Window* pParent = VCLUnoHelper::GetWindow( xParent );
+ vcl::Window* pParent = VCLUnoHelper::GetWindow( xParent );
if ( pParent )
{
SolarMutexGuard aSolarMutexGuard;
diff --git a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
index 87713caab9b5..5465148be499 100644
--- a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
+++ b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
@@ -42,7 +42,7 @@ namespace dbaui
using namespace ::com::sun::star::beans;
// OQueryContainerWindow
- OQueryContainerWindow::OQueryContainerWindow(Window* pParent, OQueryController& _rController,const Reference< XComponentContext >& _rxContext)
+ OQueryContainerWindow::OQueryContainerWindow(vcl::Window* pParent, OQueryController& _rController,const Reference< XComponentContext >& _rxContext)
:ODataView( pParent, _rController, _rxContext )
,m_pViewSwitch(NULL)
,m_pBeamer(NULL)
@@ -71,7 +71,7 @@ namespace dbaui
xCloseable->close(sal_False); // false - holds the owner ship of this frame
}
- boost::scoped_ptr<Window> aTemp(m_pSplitter);
+ boost::scoped_ptr<vcl::Window> aTemp(m_pSplitter);
m_pSplitter = NULL;
}
diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx
index 71bb2720d26a..f773f71c3354 100644
--- a/dbaccess/source/ui/querydesign/querycontroller.cxx
+++ b/dbaccess/source/ui/querydesign/querycontroller.cxx
@@ -289,7 +289,7 @@ namespace
if (xUIElement.is())
{
Reference< XWindow > xWindow(xUIElement->getRealInterface(), css::uno::UNO_QUERY);
- Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
+ vcl::Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
if( pWindow || pWindow->HasChildPathFocus() )
{
pWindow->GrabFocusToDocument();
@@ -762,7 +762,7 @@ void OQueryController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >&
::connectivity::OSQLParseNode* pNode = m_aSqlParser.parseTree( aErrorMsg, m_sStatement, m_bGraphicalDesign );
if ( pNode )
{
- Window* pView = getView();
+ vcl::Window* pView = getView();
ModalDialog* pWindow = new ModalDialog( pView, WB_STDMODAL | WB_SIZEMOVE | WB_CENTER );
pWindow->SetSizePixel( ::Size( pView->GetSizePixel().Width() / 2, pView->GetSizePixel().Height() / 2 ) );
SvTreeListBox* pTreeBox = new SvTreeListBox( pWindow, WB_BORDER | WB_HASLINES | WB_HASBUTTONS | WB_HASBUTTONSATROOT | WB_HASLINESATROOT | WB_VSCROLL );
@@ -1113,7 +1113,7 @@ void OQueryController::setQueryComposer()
}
}
-bool OQueryController::Construct(Window* pParent)
+bool OQueryController::Construct(vcl::Window* pParent)
{
// TODO: we have to check if we should create the text view or the design view
diff --git a/dbaccess/source/ui/querydesign/queryview.cxx b/dbaccess/source/ui/querydesign/queryview.cxx
index 4a125c0b877f..a10a73045a0b 100644
--- a/dbaccess/source/ui/querydesign/queryview.cxx
+++ b/dbaccess/source/ui/querydesign/queryview.cxx
@@ -24,7 +24,7 @@
using namespace dbaui;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
-OQueryView::OQueryView(Window* _pParent, OQueryController& _rController,const Reference< XComponentContext >& _rxContext)
+OQueryView::OQueryView(vcl::Window* _pParent, OQueryController& _rController,const Reference< XComponentContext >& _rxContext)
:OJoinDesignView( _pParent, _rController, _rxContext )
{
diff --git a/dbaccess/source/ui/relationdesign/RTableWindow.hxx b/dbaccess/source/ui/relationdesign/RTableWindow.hxx
index e315edb4ee36..27d31189a098 100644
--- a/dbaccess/source/ui/relationdesign/RTableWindow.hxx
+++ b/dbaccess/source/ui/relationdesign/RTableWindow.hxx
@@ -26,7 +26,7 @@ namespace dbaui
class ORelationTableWindow : public OTableWindow
{
public:
- ORelationTableWindow( Window* pParent,const TTableWindowData::value_type& pTabWinData)
+ ORelationTableWindow( vcl::Window* pParent,const TTableWindowData::value_type& pTabWinData)
: OTableWindow(pParent, pTabWinData) {}
/** returns the name which should be used when displaying join or relations
diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx
index 0237d46212e4..184a20e27f0e 100644
--- a/dbaccess/source/ui/relationdesign/RelationController.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationController.cxx
@@ -243,7 +243,7 @@ OUString ORelationController::getPrivateTitle( ) const
return ::dbaui::getStrippedDatabaseName(getDataSource(),sName);
}
-bool ORelationController::Construct(Window* pParent)
+bool ORelationController::Construct(vcl::Window* pParent)
{
setView( * new ORelationDesignView( pParent, *this, getORB() ) );
OJoinController::Construct(pParent);
diff --git a/dbaccess/source/ui/relationdesign/RelationDesignView.cxx b/dbaccess/source/ui/relationdesign/RelationDesignView.cxx
index 02a826e88dd5..0305b4603736 100644
--- a/dbaccess/source/ui/relationdesign/RelationDesignView.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationDesignView.cxx
@@ -45,7 +45,7 @@ using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::container;
-ORelationDesignView::ORelationDesignView(Window* _pParent, ORelationController& _rController,const Reference< XComponentContext >& _rxContext)
+ORelationDesignView::ORelationDesignView(vcl::Window* _pParent, ORelationController& _rController,const Reference< XComponentContext >& _rxContext)
:OJoinDesignView( _pParent, _rController, _rxContext )
{
}
diff --git a/dbaccess/source/ui/relationdesign/RelationTableView.cxx b/dbaccess/source/ui/relationdesign/RelationTableView.cxx
index 84a84f5cc792..a5ce0cf4714e 100644
--- a/dbaccess/source/ui/relationdesign/RelationTableView.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationTableView.cxx
@@ -61,7 +61,7 @@ using namespace ::com::sun::star::container;
using namespace ::com::sun::star::accessibility;
// class ORelationTableView
-ORelationTableView::ORelationTableView( Window* pParent, ORelationDesignView* pView )
+ORelationTableView::ORelationTableView( vcl::Window* pParent, ORelationDesignView* pView )
:OJoinTableView( pParent, pView )
, ::comphelper::OContainerListener(m_aMutex)
,m_pExistingConnection(NULL)
diff --git a/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx b/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx
index 167cc017574a..94f646154b58 100644
--- a/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx
+++ b/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx
@@ -28,7 +28,7 @@
using namespace dbaui;
// class OFieldDescGenWin
-OFieldDescGenWin::OFieldDescGenWin( Window* pParent, OTableDesignHelpBar* pHelp ) :
+OFieldDescGenWin::OFieldDescGenWin( vcl::Window* pParent, OTableDesignHelpBar* pHelp ) :
TabPage( pParent, WB_3DLOOK | WB_DIALOGCONTROL )
{
m_pFieldControl = new OTableFieldControl(this,pHelp);
@@ -38,7 +38,7 @@ OFieldDescGenWin::OFieldDescGenWin( Window* pParent, OTableDesignHelpBar* pHelp
OFieldDescGenWin::~OFieldDescGenWin()
{
- boost::scoped_ptr<Window> aTemp(m_pFieldControl);
+ boost::scoped_ptr<vcl::Window> aTemp(m_pFieldControl);
m_pFieldControl = NULL;
}
diff --git a/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx b/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx
index e4a8c541515c..aaf01fd35d3c 100644
--- a/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx
+++ b/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx
@@ -37,7 +37,7 @@ namespace dbaui
virtual void Resize() SAL_OVERRIDE;
public:
- OFieldDescGenWin( Window* pParent, OTableDesignHelpBar* pHelpBar );
+ OFieldDescGenWin( vcl::Window* pParent, OTableDesignHelpBar* pHelpBar );
virtual ~OFieldDescGenWin();
virtual void GetFocus() SAL_OVERRIDE;
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx
index 2f0a4572377e..566906a08aba 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx
@@ -138,7 +138,7 @@ void OTableEditorCtrl::UpdateAll()
Invalidate();
}
-OTableEditorCtrl::OTableEditorCtrl(Window* pWindow)
+OTableEditorCtrl::OTableEditorCtrl(vcl::Window* pWindow)
:OTableRowView(pWindow)
,pNameCell(NULL)
,pTypeCell(NULL)
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.hxx b/dbaccess/source/ui/tabledesign/TEditControl.hxx
index d09060a24458..623c48ea8aa3 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.hxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.hxx
@@ -122,7 +122,7 @@ namespace dbaui
DECL_LINK(ControlPreNotifyHdl, NotifyEvent*);
public:
- OTableEditorCtrl(Window* pParentWin);
+ OTableEditorCtrl(vcl::Window* pParentWin);
virtual ~OTableEditorCtrl();
virtual bool CursorMoving(long nNewRow, sal_uInt16 nNewCol) SAL_OVERRIDE;
virtual void UpdateAll();
diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx
index dfdbcf4aa7dc..8dbaf5672843 100644
--- a/dbaccess/source/ui/tabledesign/TableController.cxx
+++ b/dbaccess/source/ui/tabledesign/TableController.cxx
@@ -538,7 +538,7 @@ void OTableController::impl_initialize()
}
}
-bool OTableController::Construct(Window* pParent)
+bool OTableController::Construct(vcl::Window* pParent)
{
setView( * new OTableDesignView( pParent, getORB(), *this ) );
OTableController_BASE::Construct(pParent);
diff --git a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
index 9db53a80e726..f4348d5ebdfb 100644
--- a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
@@ -34,7 +34,7 @@ using namespace ::com::sun::star::util;
// Defines
#define HANDLE_ID 0
-OTableRowView::OTableRowView(Window* pParent)
+OTableRowView::OTableRowView(vcl::Window* pParent)
:EditBrowseBox(pParent, ModuleRes(RID_DB_TAB_EDITOR),EBBF_NONE,
BROWSER_COLUMNSELECTION | BROWSER_MULTISELECTION | BROWSER_AUTOSIZE_LASTCOL |
BROWSER_KEEPSELECTION | BROWSER_HLINESFULL | BROWSER_VLINESFULL)
diff --git a/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx b/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx
index 36161117a219..5a69fc0b7ead 100644
--- a/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx
+++ b/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx
@@ -26,7 +26,7 @@
using namespace dbaui;
#define STANDARD_MARGIN 6
// class OTableDesignHelpBar
-OTableDesignHelpBar::OTableDesignHelpBar( Window* pParent ) :
+OTableDesignHelpBar::OTableDesignHelpBar( vcl::Window* pParent ) :
TabPage( pParent, WB_3DLOOK )
{
m_pTextWin = new MultiLineEdit( this, WB_VSCROLL | WB_LEFT | WB_BORDER | WB_NOTABSTOP | WB_READONLY);
@@ -38,7 +38,7 @@ OTableDesignHelpBar::OTableDesignHelpBar( Window* pParent ) :
OTableDesignHelpBar::~OTableDesignHelpBar()
{
- boost::scoped_ptr<Window> aTemp(m_pTextWin);
+ boost::scoped_ptr<vcl::Window> aTemp(m_pTextWin);
m_pTextWin = NULL;
}
diff --git a/dbaccess/source/ui/tabledesign/TableDesignView.cxx b/dbaccess/source/ui/tabledesign/TableDesignView.cxx
index 46d20a980e4e..b1743c5d35cd 100644
--- a/dbaccess/source/ui/tabledesign/TableDesignView.cxx
+++ b/dbaccess/source/ui/tabledesign/TableDesignView.cxx
@@ -41,7 +41,7 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::beans;
// class OTableBorderWindow
-OTableBorderWindow::OTableBorderWindow(Window* pParent) : Window(pParent,WB_BORDER)
+OTableBorderWindow::OTableBorderWindow(vcl::Window* pParent) : Window(pParent,WB_BORDER)
,m_aHorzSplitter( this )
{
@@ -68,11 +68,11 @@ OTableBorderWindow::~OTableBorderWindow()
m_pFieldDescWin->Hide();
{
- boost::scoped_ptr<Window> aTemp(m_pEditorCtrl);
+ boost::scoped_ptr<vcl::Window> aTemp(m_pEditorCtrl);
m_pEditorCtrl = NULL;
}
{
- boost::scoped_ptr<Window> aTemp(m_pFieldDescWin);
+ boost::scoped_ptr<vcl::Window> aTemp(m_pFieldDescWin);
m_pFieldDescWin = NULL;
}
@@ -167,7 +167,7 @@ void OTableBorderWindow::GetFocus()
}
// class OTableDesignView
-OTableDesignView::OTableDesignView( Window* pParent,
+OTableDesignView::OTableDesignView( vcl::Window* pParent,
const Reference< XComponentContext >& _rxOrb,
OTableController& _rController
) :
@@ -193,7 +193,7 @@ OTableDesignView::~OTableDesignView()
m_pWin->Hide();
{
- boost::scoped_ptr<Window> aTemp(m_pWin);
+ boost::scoped_ptr<vcl::Window> aTemp(m_pWin);
m_pWin = NULL;
}
}
diff --git a/dbaccess/source/ui/tabledesign/TableFieldControl.cxx b/dbaccess/source/ui/tabledesign/TableFieldControl.cxx
index 11e313bfea23..6016da7e79c7 100644
--- a/dbaccess/source/ui/tabledesign/TableFieldControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TableFieldControl.cxx
@@ -35,7 +35,7 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::sdbc;
using namespace dbaui;
-OTableFieldControl::OTableFieldControl( Window* pParent, OTableDesignHelpBar* pHelpBar) :OFieldDescControl(pParent,pHelpBar)
+OTableFieldControl::OTableFieldControl( vcl::Window* pParent, OTableDesignHelpBar* pHelpBar) :OFieldDescControl(pParent,pHelpBar)
{
}
diff --git a/dbaccess/source/ui/tabledesign/TableFieldControl.hxx b/dbaccess/source/ui/tabledesign/TableFieldControl.hxx
index 0e2a6d9ee8f8..80e6bd5aa114 100644
--- a/dbaccess/source/ui/tabledesign/TableFieldControl.hxx
+++ b/dbaccess/source/ui/tabledesign/TableFieldControl.hxx
@@ -46,7 +46,7 @@ namespace dbaui
virtual OUString getAutoIncrementValue() const SAL_OVERRIDE;
public:
- OTableFieldControl( Window* pParent, OTableDesignHelpBar* pHelpBar);
+ OTableFieldControl( vcl::Window* pParent, OTableDesignHelpBar* pHelpBar);
OUString BoolStringPersistent(const OUString& rUIString) const { return OFieldDescControl::BoolStringPersistent(rUIString); }
OUString BoolStringUI(const OUString& rPersistentString) const { return OFieldDescControl::BoolStringUI(rPersistentString); }
diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
index aa3ab08bc6de..eef570c905d2 100644
--- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
+++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
@@ -45,7 +45,7 @@
using namespace dbaui;
// class OTableFieldDescWin
-OTableFieldDescWin::OTableFieldDescWin( Window* pParent)
+OTableFieldDescWin::OTableFieldDescWin( vcl::Window* pParent)
: TabPage(pParent, WB_3DLOOK)
, m_eChildFocus(NONE)
{
@@ -72,15 +72,15 @@ OTableFieldDescWin::~OTableFieldDescWin()
m_pHeader->Hide();
{
- boost::scoped_ptr<Window> aTemp(m_pGenPage);
+ boost::scoped_ptr<vcl::Window> aTemp(m_pGenPage);
m_pGenPage = NULL;
}
{
- boost::scoped_ptr<Window> aTemp(m_pHeader);
+ boost::scoped_ptr<vcl::Window> aTemp(m_pHeader);
m_pHeader = NULL;
}
{
- boost::scoped_ptr<Window> aTemp(m_pHelpBar);
+ boost::scoped_ptr<vcl::Window> aTemp(m_pHelpBar);
m_pHelpBar = NULL;
}
}
diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx
index ac3beafa252d..8f1ef89bbaa0 100644
--- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx
+++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx
@@ -53,7 +53,7 @@ namespace dbaui
virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE;
public:
- OTableFieldDescWin( Window* pParent);
+ OTableFieldDescWin( vcl::Window* pParent);
virtual ~OTableFieldDescWin();
virtual void Init();
diff --git a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx
index c6d98828b4eb..cf90db45463b 100644
--- a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx
+++ b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx
@@ -63,7 +63,7 @@ namespace dbaui
virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const SAL_OVERRIDE;
protected:
// OGenericUnoDialog overridables
- virtual Dialog* createDialog(Window* _pParent) SAL_OVERRIDE;
+ virtual Dialog* createDialog(vcl::Window* _pParent) SAL_OVERRIDE;
};
OAdvancedSettingsDialog::OAdvancedSettingsDialog(const Reference< XComponentContext >& _rxORB)
@@ -119,7 +119,7 @@ namespace dbaui
describeProperties(aProps);
return new ::cppu::OPropertyArrayHelper(aProps);
}
- Dialog* OAdvancedSettingsDialog::createDialog(Window* _pParent)
+ Dialog* OAdvancedSettingsDialog::createDialog(vcl::Window* _pParent)
{
AdvancedSettingsDialog* pDlg = new AdvancedSettingsDialog(_pParent, m_pDatasourceItems, m_aContext, m_aInitialSelection);
return pDlg;
diff --git a/dbaccess/source/ui/uno/ColumnControl.cxx b/dbaccess/source/ui/uno/ColumnControl.cxx
index a91c0949c3d3..fe7a24e969c6 100644
--- a/dbaccess/source/ui/uno/ColumnControl.cxx
+++ b/dbaccess/source/ui/uno/ColumnControl.cxx
@@ -65,7 +65,7 @@ void SAL_CALL OColumnControl::createPeer(const Reference< XToolkit >& /*rToolkit
{
mbCreatingPeer = true;
- Window* pParentWin = NULL;
+ vcl::Window* pParentWin = NULL;
if (rParentPeer.is())
{
VCLXWindow* pParent = VCLXWindow::GetImplementation(rParentPeer);
diff --git a/dbaccess/source/ui/uno/ColumnPeer.cxx b/dbaccess/source/ui/uno/ColumnPeer.cxx
index 2de839f8382b..1422c629b3a1 100644
--- a/dbaccess/source/ui/uno/ColumnPeer.cxx
+++ b/dbaccess/source/ui/uno/ColumnPeer.cxx
@@ -31,7 +31,7 @@ using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::sdbc;
-OColumnPeer::OColumnPeer(Window* _pParent,const Reference<XComponentContext>& _rxContext)
+OColumnPeer::OColumnPeer(vcl::Window* _pParent,const Reference<XComponentContext>& _rxContext)
:m_pActFieldDescr(NULL)
{
osl_atomic_increment( &m_refCount );
diff --git a/dbaccess/source/ui/uno/ColumnPeer.hxx b/dbaccess/source/ui/uno/ColumnPeer.hxx
index 6ce446c385d7..5e15a10ed344 100644
--- a/dbaccess/source/ui/uno/ColumnPeer.hxx
+++ b/dbaccess/source/ui/uno/ColumnPeer.hxx
@@ -33,7 +33,7 @@ namespace dbaui
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> m_xColumn;
public:
- OColumnPeer(Window* _pParent
+ OColumnPeer(vcl::Window* _pParent
,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext);
void setColumn(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xColumn);
diff --git a/dbaccess/source/ui/uno/DBTypeWizDlg.cxx b/dbaccess/source/ui/uno/DBTypeWizDlg.cxx
index ef1d0cde8bf0..bc1873982ea0 100644
--- a/dbaccess/source/ui/uno/DBTypeWizDlg.cxx
+++ b/dbaccess/source/ui/uno/DBTypeWizDlg.cxx
@@ -92,7 +92,7 @@ Reference<XPropertySetInfo> SAL_CALL ODBTypeWizDialog::getPropertySetInfo() thr
return new ::cppu::OPropertyArrayHelper(aProps);
}
-Dialog* ODBTypeWizDialog::createDialog(Window* _pParent)
+Dialog* ODBTypeWizDialog::createDialog(vcl::Window* _pParent)
{
ODbTypeWizDialog* pDlg = new ODbTypeWizDialog(_pParent, m_pDatasourceItems, m_aContext, m_aInitialSelection);
return pDlg;
diff --git a/dbaccess/source/ui/uno/DBTypeWizDlg.hxx b/dbaccess/source/ui/uno/DBTypeWizDlg.hxx
index 3958b98f8e9e..4a3a265a6a68 100644
--- a/dbaccess/source/ui/uno/DBTypeWizDlg.hxx
+++ b/dbaccess/source/ui/uno/DBTypeWizDlg.hxx
@@ -55,7 +55,7 @@ public:
virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const SAL_OVERRIDE;
protected:
// OGenericUnoDialog overridables
- virtual Dialog* createDialog(Window* _pParent) SAL_OVERRIDE;
+ virtual Dialog* createDialog(vcl::Window* _pParent) SAL_OVERRIDE;
};
} // namespace dbaui
diff --git a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx
index ddc72538b3ec..a6db1563e1d3 100644
--- a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx
+++ b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx
@@ -106,7 +106,7 @@ Reference<XPropertySetInfo> SAL_CALL ODBTypeWizDialogSetup::getPropertySetInfo(
return new ::cppu::OPropertyArrayHelper(aProps);
}
-Dialog* ODBTypeWizDialogSetup::createDialog(Window* _pParent)
+Dialog* ODBTypeWizDialogSetup::createDialog(vcl::Window* _pParent)
{
return new ODbTypeWizDialogSetup(_pParent, m_pDatasourceItems, m_aContext, m_aInitialSelection);
}
diff --git a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx
index e5a2b0945a65..8ed555e4014a 100644
--- a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx
+++ b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx
@@ -58,7 +58,7 @@ public:
virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const SAL_OVERRIDE;
protected:
// OGenericUnoDialog overridables
- virtual Dialog* createDialog(Window* _pParent) SAL_OVERRIDE;
+ virtual Dialog* createDialog(vcl::Window* _pParent) SAL_OVERRIDE;
virtual void executedDialog(sal_Int16 _nExecutionResult) SAL_OVERRIDE;
};
diff --git a/dbaccess/source/ui/uno/TableFilterDlg.cxx b/dbaccess/source/ui/uno/TableFilterDlg.cxx
index 0a2d346700ff..9f284263bb1e 100644
--- a/dbaccess/source/ui/uno/TableFilterDlg.cxx
+++ b/dbaccess/source/ui/uno/TableFilterDlg.cxx
@@ -92,7 +92,7 @@ Reference<XPropertySetInfo> SAL_CALL OTableFilterDialog::getPropertySetInfo() t
return new ::cppu::OPropertyArrayHelper(aProps);
}
-Dialog* OTableFilterDialog::createDialog(Window* _pParent)
+Dialog* OTableFilterDialog::createDialog(vcl::Window* _pParent)
{
OTableSubscriptionDialog* pDlg = new OTableSubscriptionDialog(_pParent, m_pDatasourceItems, m_aContext, m_aInitialSelection);
return pDlg;
diff --git a/dbaccess/source/ui/uno/TableFilterDlg.hxx b/dbaccess/source/ui/uno/TableFilterDlg.hxx
index 1dc2bface661..408457ea8cc1 100644
--- a/dbaccess/source/ui/uno/TableFilterDlg.hxx
+++ b/dbaccess/source/ui/uno/TableFilterDlg.hxx
@@ -55,7 +55,7 @@ public:
virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const SAL_OVERRIDE;
protected:
// OGenericUnoDialog overridables
- virtual Dialog* createDialog(Window* _pParent) SAL_OVERRIDE;
+ virtual Dialog* createDialog(vcl::Window* _pParent) SAL_OVERRIDE;
};
} // namespace dbaui
diff --git a/dbaccess/source/ui/uno/UserSettingsDlg.cxx b/dbaccess/source/ui/uno/UserSettingsDlg.cxx
index 4ab1a5fa57db..e66d888c25a1 100644
--- a/dbaccess/source/ui/uno/UserSettingsDlg.cxx
+++ b/dbaccess/source/ui/uno/UserSettingsDlg.cxx
@@ -92,7 +92,7 @@ Reference<XPropertySetInfo> SAL_CALL OUserSettingsDialog::getPropertySetInfo()
return new ::cppu::OPropertyArrayHelper(aProps);
}
-Dialog* OUserSettingsDialog::createDialog(Window* _pParent)
+Dialog* OUserSettingsDialog::createDialog(vcl::Window* _pParent)
{
OUserAdminDlg* pDlg = new OUserAdminDlg(_pParent, m_pDatasourceItems, m_aContext, m_aInitialSelection, m_xActiveConnection);
return pDlg;
diff --git a/dbaccess/source/ui/uno/UserSettingsDlg.hxx b/dbaccess/source/ui/uno/UserSettingsDlg.hxx
index f0440cfb5d95..043fa1a52410 100644
--- a/dbaccess/source/ui/uno/UserSettingsDlg.hxx
+++ b/dbaccess/source/ui/uno/UserSettingsDlg.hxx
@@ -55,7 +55,7 @@ public:
virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const SAL_OVERRIDE;
protected:
// OGenericUnoDialog overridables
- virtual Dialog* createDialog(Window* _pParent) SAL_OVERRIDE;
+ virtual Dialog* createDialog(vcl::Window* _pParent) SAL_OVERRIDE;
};
} // namespace dbaui
diff --git a/dbaccess/source/ui/uno/admindlg.cxx b/dbaccess/source/ui/uno/admindlg.cxx
index e14a46fcf8ae..f2f52d656174 100644
--- a/dbaccess/source/ui/uno/admindlg.cxx
+++ b/dbaccess/source/ui/uno/admindlg.cxx
@@ -92,7 +92,7 @@ Reference<XPropertySetInfo> SAL_CALL ODataSourcePropertyDialog::getPropertySetI
return new ::cppu::OPropertyArrayHelper(aProps);
}
-Dialog* ODataSourcePropertyDialog::createDialog(Window* _pParent)
+Dialog* ODataSourcePropertyDialog::createDialog(vcl::Window* _pParent)
{
ODbAdminDialog* pDialog = new ODbAdminDialog(_pParent, m_pDatasourceItems, m_aContext);
diff --git a/dbaccess/source/ui/uno/admindlg.hxx b/dbaccess/source/ui/uno/admindlg.hxx
index 352251e31ec3..c791129851f3 100644
--- a/dbaccess/source/ui/uno/admindlg.hxx
+++ b/dbaccess/source/ui/uno/admindlg.hxx
@@ -55,7 +55,7 @@ public:
virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const SAL_OVERRIDE;
protected:
// OGenericUnoDialog overridables
- virtual Dialog* createDialog(Window* _pParent) SAL_OVERRIDE;
+ virtual Dialog* createDialog(vcl::Window* _pParent) SAL_OVERRIDE;
};
} // namespace dbaui
diff --git a/dbaccess/source/ui/uno/composerdialogs.cxx b/dbaccess/source/ui/uno/composerdialogs.cxx
index e5584465a520..7cf58cdec9d8 100644
--- a/dbaccess/source/ui/uno/composerdialogs.cxx
+++ b/dbaccess/source/ui/uno/composerdialogs.cxx
@@ -77,7 +77,7 @@ namespace dbaui
IMPLEMENT_PROPERTYCONTAINER_DEFAULTS( ComposerDialog )
- Dialog* ComposerDialog::createDialog(Window* _pParent)
+ Dialog* ComposerDialog::createDialog(vcl::Window* _pParent)
{
// obtain all the objects needed for the dialog
Reference< XConnection > xConnection;
@@ -140,7 +140,7 @@ namespace dbaui
return static_cast< XServiceInfo* >(new RowsetFilterDialog( comphelper::getComponentContext(_rxORB)));
}
- Dialog* RowsetFilterDialog::createComposerDialog( Window* _pParent, const Reference< XConnection >& _rxConnection, const Reference< XNameAccess >& _rxColumns )
+ Dialog* RowsetFilterDialog::createComposerDialog( vcl::Window* _pParent, const Reference< XConnection >& _rxConnection, const Reference< XNameAccess >& _rxColumns )
{
return new DlgFilterCrit( _pParent, m_aContext, _rxConnection, m_xComposer, _rxColumns );
}
@@ -188,7 +188,7 @@ namespace dbaui
return static_cast< XServiceInfo* >(new RowsetOrderDialog( comphelper::getComponentContext(_rxORB)));
}
- Dialog* RowsetOrderDialog::createComposerDialog( Window* _pParent, const Reference< XConnection >& _rxConnection, const Reference< XNameAccess >& _rxColumns )
+ Dialog* RowsetOrderDialog::createComposerDialog( vcl::Window* _pParent, const Reference< XConnection >& _rxConnection, const Reference< XNameAccess >& _rxColumns )
{
return new DlgOrderCrit( _pParent, _rxConnection, m_xComposer, _rxColumns );
}
diff --git a/dbaccess/source/ui/uno/composerdialogs.hxx b/dbaccess/source/ui/uno/composerdialogs.hxx
index 9d3b8580107a..4eb6fe8c2de1 100644
--- a/dbaccess/source/ui/uno/composerdialogs.hxx
+++ b/dbaccess/source/ui/uno/composerdialogs.hxx
@@ -63,14 +63,14 @@ namespace dbaui
protected:
// own overridables
virtual Dialog* createComposerDialog(
- Window* _pParent,
+ vcl::Window* _pParent,
const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection,
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxColumns
) = 0;
private:
// OGenericUnoDialog overridables
- virtual Dialog* createDialog(Window* _pParent) SAL_OVERRIDE;
+ virtual Dialog* createDialog(vcl::Window* _pParent) SAL_OVERRIDE;
};
// RowsetFilterDialog
@@ -86,7 +86,7 @@ namespace dbaui
protected:
// own overridables
virtual Dialog* createComposerDialog(
- Window* _pParent,
+ vcl::Window* _pParent,
const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection,
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxColumns
) SAL_OVERRIDE;
@@ -111,7 +111,7 @@ namespace dbaui
protected:
// own overridables
virtual Dialog* createComposerDialog(
- Window* _pParent,
+ vcl::Window* _pParent,
const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection,
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxColumns
) SAL_OVERRIDE;
diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx b/dbaccess/source/ui/uno/copytablewizard.cxx
index 49dd9aef75c2..1f6f0b8cdb2b 100644
--- a/dbaccess/source/ui/uno/copytablewizard.cxx
+++ b/dbaccess/source/ui/uno/copytablewizard.cxx
@@ -193,7 +193,7 @@ namespace dbaui
virtual ~CopyTableWizard();
// OGenericUnoDialog overridables
- virtual Dialog* createDialog( Window* _pParent ) SAL_OVERRIDE;
+ virtual Dialog* createDialog( vcl::Window* _pParent ) SAL_OVERRIDE;
virtual void executedDialog( sal_Int16 _nExecutionResult ) SAL_OVERRIDE;
private:
@@ -1521,7 +1521,7 @@ void SAL_CALL CopyTableWizard::initialize( const Sequence< Any >& _rArguments )
return new ::cppu::OPropertyArrayHelper( aProps );
}
-Dialog* CopyTableWizard::createDialog( Window* _pParent )
+Dialog* CopyTableWizard::createDialog( vcl::Window* _pParent )
{
OSL_PRECOND( isInitialized(), "CopyTableWizard::createDialog: not initialized!" );
// this should have been prevented in ::execute already
diff --git a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
index 6e81e7667789..d0c4969b57fb 100644
--- a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
+++ b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
@@ -104,7 +104,7 @@ namespace dbaui
protected:
// OGenericUnoDialog overridables
- virtual Dialog* createDialog( Window* _pParent ) SAL_OVERRIDE;
+ virtual Dialog* createDialog( vcl::Window* _pParent ) SAL_OVERRIDE;
virtual void implInitialize( const com::sun::star::uno::Any& _rValue ) SAL_OVERRIDE;
protected:
using OTextConnectionSettingsDialog_BASE::getFastPropertyValue;
@@ -204,7 +204,7 @@ namespace dbaui
return new ::cppu::OPropertyArrayHelper( aProps );
}
- Dialog* OTextConnectionSettingsDialog::createDialog(Window* _pParent)
+ Dialog* OTextConnectionSettingsDialog::createDialog(vcl::Window* _pParent)
{
return new TextConnectionSettingsDialog( _pParent, *m_pDatasourceItems );
}
diff --git a/dbaccess/source/ui/uno/unoDirectSql.cxx b/dbaccess/source/ui/uno/unoDirectSql.cxx
index bc58efbae59e..9c214d5a4dce 100644
--- a/dbaccess/source/ui/uno/unoDirectSql.cxx
+++ b/dbaccess/source/ui/uno/unoDirectSql.cxx
@@ -78,7 +78,7 @@ namespace dbaui
IMPLEMENT_PROPERTYCONTAINER_DEFAULTS( ODirectSQLDialog )
- Dialog* ODirectSQLDialog::createDialog(Window* _pParent)
+ Dialog* ODirectSQLDialog::createDialog(vcl::Window* _pParent)
{
// obtain all the objects needed for the dialog
Reference< XConnection > xConnection = m_xActiveConnection;
diff --git a/dbaccess/source/ui/uno/unoDirectSql.hxx b/dbaccess/source/ui/uno/unoDirectSql.hxx
index 4fa7ec69ff81..43844874009e 100644
--- a/dbaccess/source/ui/uno/unoDirectSql.hxx
+++ b/dbaccess/source/ui/uno/unoDirectSql.hxx
@@ -57,7 +57,7 @@ namespace dbaui
protected:
// OGenericUnoDialog overridables
- virtual Dialog* createDialog(Window* _pParent) SAL_OVERRIDE;
+ virtual Dialog* createDialog(vcl::Window* _pParent) SAL_OVERRIDE;
virtual void implInitialize(const com::sun::star::uno::Any& _rValue) SAL_OVERRIDE;
};
diff --git a/dbaccess/source/ui/uno/unosqlmessage.cxx b/dbaccess/source/ui/uno/unosqlmessage.cxx
index 9235528c52a4..7ba1725b0b16 100644
--- a/dbaccess/source/ui/uno/unosqlmessage.cxx
+++ b/dbaccess/source/ui/uno/unosqlmessage.cxx
@@ -141,7 +141,7 @@ Reference<XPropertySetInfo> SAL_CALL OSQLMessageDialog::getPropertySetInfo() th
return new ::cppu::OPropertyArrayHelper(aProps);
}
-Dialog* OSQLMessageDialog::createDialog(Window* _pParent)
+Dialog* OSQLMessageDialog::createDialog(vcl::Window* _pParent)
{
if ( m_aException.hasValue() )
return new OSQLMessageBox( _pParent, SQLExceptionInfo( m_aException ), WB_OK | WB_DEF_OK, m_sHelpURL );
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 126704867aa8..6a59eee1f002 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -2620,7 +2620,7 @@ void Desktop::HandleAppEvent( const ApplicationEvent& rAppEvent )
xStartModule->attachFrame(xBackingFrame);
xContainerWindow->setVisible(sal_True);
- Window* pCompWindow = VCLUnoHelper::GetWindow(xBackingFrame->getComponentWindow());
+ vcl::Window* pCompWindow = VCLUnoHelper::GetWindow(xBackingFrame->getComponentWindow());
if (pCompWindow)
pCompWindow->Update();
}
@@ -2843,7 +2843,7 @@ void Desktop::ShowBackingComponent(Desktop * progress)
// set the WB_EXT_DOCUMENT style. Normally, this is done by the TaskCreator service when a "_blank"
// frame/window is created. Since we do not use the TaskCreator here, we need to mimic its behavior,
// otherwise documents loaded into this frame will later on miss functionality depending on the style.
- Window* pContainerWindow = VCLUnoHelper::GetWindow( xContainerWindow );
+ vcl::Window* pContainerWindow = VCLUnoHelper::GetWindow( xContainerWindow );
SAL_WARN_IF( !pContainerWindow, "desktop.app", "Desktop::Main: no implementation access to the frame's container window!" );
pContainerWindow->SetExtendedStyle( pContainerWindow->GetExtendedStyle() | WB_EXT_DOCUMENT );
if (progress != 0)
diff --git a/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx b/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx
index bcdf2320e78f..da831ad9b38f 100644
--- a/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx
@@ -31,12 +31,12 @@
#include "dp_gui_dependencydialog.hxx"
#include "dp_gui_shared.hxx"
-class Window;
+namespace vcl { class Window; }
using dp_gui::DependencyDialog;
DependencyDialog::DependencyDialog(
- Window * parent, std::vector< OUString > const & dependencies):
+ vcl::Window * parent, std::vector< OUString > const & dependencies):
ModalDialog(parent, "Dependencies", "desktop/ui/dependenciesdialog.ui")
{
get(m_list, "depListTreeview");
diff --git a/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx b/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx
index e9397e221925..a778ad37630a 100644
--- a/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx
+++ b/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx
@@ -29,14 +29,14 @@
#include <vcl/fixed.hxx>
#include <vcl/lstbox.hxx>
-class Window;
+namespace vcl { class Window; }
namespace dp_gui {
class DependencyDialog: public ModalDialog {
public:
DependencyDialog(
- Window * parent, std::vector< OUString > const & dependencies);
+ vcl::Window * parent, std::vector< OUString > const & dependencies);
virtual ~DependencyDialog();
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index e5ba333ff85d..e40c2910d468 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -136,7 +136,7 @@ class ExtBoxWithBtns_Impl : public ExtensionBox_Impl
DECL_DLLPRIVATE_LINK( HandleRemoveBtn, void * );
public:
- ExtBoxWithBtns_Impl(Window* pParent);
+ ExtBoxWithBtns_Impl(vcl::Window* pParent);
virtual ~ExtBoxWithBtns_Impl();
void InitFromDialog(ExtMgrDialog *pParentDialog);
@@ -150,7 +150,7 @@ public:
void enableButtons( bool bEnable );
};
-ExtBoxWithBtns_Impl::ExtBoxWithBtns_Impl(Window* pParent)
+ExtBoxWithBtns_Impl::ExtBoxWithBtns_Impl(vcl::Window* pParent)
: ExtensionBox_Impl(pParent)
, m_bInterfaceLocked(false)
, m_pOptionsBtn(NULL)
@@ -195,7 +195,7 @@ void ExtBoxWithBtns_Impl::InitFromDialog(ExtMgrDialog *pParentDialog)
}
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeExtBoxWithBtns(Window *pParent, VclBuilder::stringmap &)
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeExtBoxWithBtns(vcl::Window *pParent, VclBuilder::stringmap &)
{
return new ExtBoxWithBtns_Impl(pParent);
}
@@ -581,7 +581,7 @@ bool DialogHelper::IsSharedPkgMgr( const uno::Reference< deployment::XPackage >
bool DialogHelper::continueOnSharedExtension( const uno::Reference< deployment::XPackage > &xPackage,
- Window *pParent,
+ vcl::Window *pParent,
const sal_uInt16 nResID,
bool &bHadWarning )
{
@@ -662,7 +662,7 @@ void DialogHelper::PostUserEvent( const Link& rLink, void* pCaller )
}
// ExtMgrDialog
-ExtMgrDialog::ExtMgrDialog(Window *pParent, TheExtensionManager *pManager)
+ExtMgrDialog::ExtMgrDialog(vcl::Window *pParent, TheExtensionManager *pManager)
: ModelessDialog(pParent, "ExtensionManagerDialog", "desktop/ui/extensionmanager.ui")
, DialogHelper(pManager->getContext(), (Dialog*) this)
, m_sAddPackages(getResourceString(RID_STR_ADD_PACKAGES))
@@ -1153,7 +1153,7 @@ bool ExtMgrDialog::Close()
}
//UpdateRequiredDialog
-UpdateRequiredDialog::UpdateRequiredDialog(Window *pParent, TheExtensionManager *pManager)
+UpdateRequiredDialog::UpdateRequiredDialog(vcl::Window *pParent, TheExtensionManager *pManager)
: ModalDialog(pParent, "UpdateRequiredDialog", "desktop/ui/updaterequireddialog.ui")
, DialogHelper(pManager->getContext(), (Dialog*) this)
, m_sAddPackages(getResourceString(RID_STR_ADD_PACKAGES))
@@ -1560,7 +1560,7 @@ void UpdateRequiredDialog::disableAllEntries()
// ShowLicenseDialog
-ShowLicenseDialog::ShowLicenseDialog( Window * pParent,
+ShowLicenseDialog::ShowLicenseDialog( vcl::Window * pParent,
const uno::Reference< deployment::XPackage > &xPackage )
: ModalDialog(pParent, "ShowLicenseDialog", "desktop/ui/showlicensedialog.ui")
{
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
index df9622dd5025..36e40e1b62af 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
@@ -84,7 +84,7 @@ public:
static OUString getResourceString( sal_uInt16 id );
static bool IsSharedPkgMgr( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &);
static bool continueOnSharedExtension( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &,
- Window *pParent,
+ vcl::Window *pParent,
const sal_uInt16 nResID,
bool &bHadWarning );
@@ -138,7 +138,7 @@ class ExtMgrDialog : public ModelessDialog,
DECL_DLLPRIVATE_LINK( startProgress, void * );
public:
- ExtMgrDialog( Window * pParent, TheExtensionManager *pManager );
+ ExtMgrDialog( vcl::Window * pParent, TheExtensionManager *pManager );
virtual ~ExtMgrDialog();
virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
@@ -209,7 +209,7 @@ class UpdateRequiredDialog : public ModalDialog,
void disableAllEntries();
public:
- UpdateRequiredDialog( Window * pParent, TheExtensionManager *pManager );
+ UpdateRequiredDialog( vcl::Window * pParent, TheExtensionManager *pManager );
virtual ~UpdateRequiredDialog();
virtual short Execute() SAL_OVERRIDE;
@@ -241,7 +241,7 @@ class ShowLicenseDialog : public ModalDialog
{
VclMultiLineEdit* m_pLicenseText;
public:
- ShowLicenseDialog(Window * pParent, const css::uno::Reference< css::deployment::XPackage > &xPackage);
+ ShowLicenseDialog(vcl::Window * pParent, const css::uno::Reference< css::deployment::XPackage > &xPackage);
};
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index 8e7225629bb2..4894fabecb82 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -175,7 +175,7 @@ ExtensionRemovedListener::~ExtensionRemovedListener()
// ExtensionBox_Impl
-ExtensionBox_Impl::ExtensionBox_Impl(Window* pParent) :
+ExtensionBox_Impl::ExtensionBox_Impl(vcl::Window* pParent) :
IExtensionListBox( pParent, WB_BORDER | WB_TABSTOP | WB_CHILDDLGCTRL ),
m_bHasScrollBar( false ),
m_bHasActive( false ),
@@ -837,7 +837,7 @@ Size ExtensionBox_Impl::GetOptimalSize() const
return LogicToPixel(Size(250, 150), MAP_APPFONT);
}
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeExtensionBox(Window *pParent, VclBuilder::stringmap &)
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeExtensionBox(vcl::Window *pParent, VclBuilder::stringmap &)
{
return new ExtensionBox_Impl(pParent);
}
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
index e94eb41554b9..79be76e05c11 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
@@ -182,7 +182,7 @@ class ExtensionBox_Impl : public ::svt::IExtensionListBox
void Init();
public:
- ExtensionBox_Impl(Window* pParent);
+ ExtensionBox_Impl(vcl::Window* pParent);
virtual ~ExtensionBox_Impl();
virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
index 218a9977c5b0..b8b5ba94e6e5 100644
--- a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
+++ b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
@@ -49,7 +49,7 @@ namespace dp_gui {
// TheExtensionManager
-TheExtensionManager::TheExtensionManager( Window *pParent,
+TheExtensionManager::TheExtensionManager( vcl::Window *pParent,
const uno::Reference< uno::XComponentContext > &xContext ) :
m_xContext( xContext ),
m_pParent( pParent ),
@@ -488,7 +488,7 @@ void TheExtensionManager::modified( ::lang::EventObject const & /*rEvt*/ )
return s_ExtMgr;
}
- Window* pParent = DIALOG_NO_PARENT;
+ vcl::Window* pParent = DIALOG_NO_PARENT;
if (xParent.is())
pParent = VCLUnoHelper::GetWindow(xParent);
diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.hxx b/desktop/source/deployment/gui/dp_gui_theextmgr.hxx
index 0d1352eb102e..f5e1665e31a4 100644
--- a/desktop/source/deployment/gui/dp_gui_theextmgr.hxx
+++ b/desktop/source/deployment/gui/dp_gui_theextmgr.hxx
@@ -53,7 +53,7 @@ private:
::com::sun::star::uno::Reference< ::com::sun::star::deployment::XExtensionManager > m_xExtensionManager;
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xNameAccessNodes;
- Window *m_pParent;
+ vcl::Window *m_pParent;
ExtMgrDialog *m_pExtMgrDialog;
UpdateRequiredDialog *m_pUpdReqDialog;
ExtensionCmdQueue *m_pExecuteCmdQueue;
@@ -63,7 +63,7 @@ private:
public:
static ::rtl::Reference<TheExtensionManager> s_ExtMgr;
- TheExtensionManager( Window * pParent,
+ TheExtensionManager( vcl::Window * pParent,
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &xContext );
virtual ~TheExtensionManager();
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
index adcc1657f8aa..01420bf6d7ca 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
@@ -116,7 +116,7 @@
class KeyEvent;
class MouseEvent;
-class Window;
+namespace vcl { class Window; }
namespace com { namespace sun { namespace star { namespace uno {
class XComponentContext;
} } } }
@@ -487,7 +487,7 @@ bool UpdateDialog::Thread::update(
// UpdateDialog ----------------------------------------------------------
UpdateDialog::UpdateDialog(
uno::Reference< uno::XComponentContext > const & context,
- Window * parent,
+ vcl::Window * parent,
const std::vector<uno::Reference< deployment::XPackage > > &vExtensionList,
std::vector< dp_gui::UpdateData > * updateData):
ModalDialog(parent, "UpdateDialog", "desktop/ui/updatedialog.ui"),
@@ -589,7 +589,7 @@ short UpdateDialog::Execute() {
return ModalDialog::Execute();
}
-UpdateDialog::CheckListBox::CheckListBox( Window* pParent, UpdateDialog & dialog):
+UpdateDialog::CheckListBox::CheckListBox( vcl::Window* pParent, UpdateDialog & dialog):
SvxCheckListBox( pParent, WinBits(WB_BORDER) ),
m_ignoreUpdate( DPGUI_RESSTR( RID_DLG_UPDATE_IGNORE ) ),
m_ignoreAllUpdates( DPGUI_RESSTR( RID_DLG_UPDATE_IGNORE_ALL ) ),
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
index e5365498b635..de861673fb29 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
@@ -45,7 +45,7 @@ class Image;
class KeyEvent;
class MouseEvent;
class ResId;
-class Window;
+namespace vcl { class Window; }
namespace com { namespace sun { namespace star {
namespace deployment { class XExtensionManager;
@@ -79,7 +79,7 @@ public:
*/
UpdateDialog(
com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const & context,
- Window * parent,
+ vcl::Window * parent,
const std::vector< com::sun::star::uno::Reference<
com::sun::star::deployment::XPackage > > & vExtensionList,
std::vector< dp_gui::UpdateData > * updateData);
@@ -109,7 +109,7 @@ private:
class CheckListBox: public SvxCheckListBox {
public:
CheckListBox(
- Window* pParent, UpdateDialog & dialog);
+ vcl::Window* pParent, UpdateDialog & dialog);
virtual ~CheckListBox();
diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
index 1a2cef33a0e6..501cdd04cc8a 100644
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
@@ -70,7 +70,7 @@
#include <vector>
-class Window;
+namespace vcl { class Window; }
namespace cssu = ::com::sun::star::uno;
@@ -200,7 +200,7 @@ void UpdateInstallDialog::Thread::execute()
}
UpdateInstallDialog::UpdateInstallDialog(
- Window * parent,
+ vcl::Window * parent,
std::vector<dp_gui::UpdateData> & aVecUpdateData,
cssu::Reference< cssu::XComponentContext > const & xCtx):
ModalDialog(
diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx
index 434b1a188afa..3bad18abe96d 100644
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx
+++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx
@@ -37,7 +37,7 @@ namespace com { namespace sun { namespace star { namespace uno {
class XComponentContext;
}}}}
-class Window;
+namespace vcl { class Window; }
namespace dp_gui {
@@ -56,7 +56,7 @@ public:
@param parent
the parent window, may be null
*/
- UpdateInstallDialog(Window * parent, std::vector<UpdateData> & aVecUpdateData,
+ UpdateInstallDialog(vcl::Window * parent, std::vector<UpdateData> & aVecUpdateData,
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xCtx);
virtual ~UpdateInstallDialog();
diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx
index 183504801d00..ff375208630d 100644
--- a/desktop/source/deployment/gui/license_dialog.cxx
+++ b/desktop/source/deployment/gui/license_dialog.cxx
@@ -55,7 +55,7 @@ class LicenseView : public MultiLineEdit, public SfxListener
Link maScrolledHdl;
public:
- LicenseView( Window* pParent, WinBits nStyle );
+ LicenseView( vcl::Window* pParent, WinBits nStyle );
virtual ~LicenseView();
void ScrollDown( ScrollType eScroll );
@@ -94,7 +94,7 @@ struct LicenseDialogImpl : public ModalDialog
bool m_bLicenseRead;
LicenseDialogImpl(
- Window * pParent,
+ vcl::Window * pParent,
css::uno::Reference< css::uno::XComponentContext > const & xContext,
const OUString & sExtensionName,
const OUString & sLicenseText);
@@ -103,7 +103,7 @@ struct LicenseDialogImpl : public ModalDialog
};
-LicenseView::LicenseView( Window* pParent, WinBits nStyle )
+LicenseView::LicenseView( vcl::Window* pParent, WinBits nStyle )
: MultiLineEdit( pParent, nStyle )
{
SetLeftMargin( 5 );
@@ -111,7 +111,7 @@ LicenseView::LicenseView( Window* pParent, WinBits nStyle )
StartListening( *GetTextEngine() );
}
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeLicenseView(Window *pParent, VclBuilder::stringmap &rMap)
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeLicenseView(vcl::Window *pParent, VclBuilder::stringmap &rMap)
{
WinBits nWinStyle = WB_CLIPCHILDREN|WB_LEFT;
OString sBorder = VclBuilder::extractCustomProperty(rMap);
@@ -182,7 +182,7 @@ void LicenseView::Notify( SfxBroadcaster&, const SfxHint& rHint )
LicenseDialogImpl::LicenseDialogImpl(
- Window * pParent,
+ vcl::Window * pParent,
cssu::Reference< cssu::XComponentContext > const & xContext,
const OUString & sExtensionName,
const OUString & sLicenseText)
diff --git a/drawinglayer/source/primitive2d/controlprimitive2d.cxx b/drawinglayer/source/primitive2d/controlprimitive2d.cxx
index 58388e4d34ad..f03157c138a6 100644
--- a/drawinglayer/source/primitive2d/controlprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/controlprimitive2d.cxx
@@ -152,7 +152,7 @@ namespace drawinglayer
if(pVCLXWindow)
{
- Window* pWindow = pVCLXWindow->GetWindow();
+ vcl::Window* pWindow = pVCLXWindow->GetWindow();
if(pWindow)
{
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index 00355e7a0213..7d292e34ec0d 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -951,7 +951,7 @@ void EditEngine::SetInSelectionMode(bool b)
pImpEditEngine->bInSelection = b;
}
-bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditView, Window* pFrameWin )
+bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditView, vcl::Window* pFrameWin )
{
DBG_ASSERT( pEditView, "no View - no cookie !" );
diff --git a/editeng/source/editeng/editsel.cxx b/editeng/source/editeng/editsel.cxx
index 861ddb17ef18..1cbc655bb3b1 100644
--- a/editeng/source/editeng/editsel.cxx
+++ b/editeng/source/editeng/editsel.cxx
@@ -82,7 +82,7 @@ void EditSelFunctionSet::DeselectAll()
// class EditSelectionEngine
-EditSelectionEngine::EditSelectionEngine() : SelectionEngine( (Window*)0 )
+EditSelectionEngine::EditSelectionEngine() : SelectionEngine( (vcl::Window*)0 )
{
SetSelectionMode( RANGE_SELECTION );
EnableDrag( true );
@@ -96,7 +96,7 @@ void EditSelectionEngine::SetCurView( EditView* pNewView )
if ( pNewView )
SetWindow( pNewView->GetWindow() );
else
- SetWindow( (Window*)0 );
+ SetWindow( (vcl::Window*)0 );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx
index db0444b62ec5..f972ad75cecb 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -151,7 +151,7 @@ LanguageType EditView::CheckLanguage(
// class EditView
-EditView::EditView( EditEngine* pEng, Window* pWindow )
+EditView::EditView( EditEngine* pEng, vcl::Window* pWindow )
{
pImpEditView = new ImpEditView( this, pEng, pWindow );
}
@@ -276,13 +276,13 @@ void EditView::SetEditEngine( EditEngine* pEditEng )
pImpEditView->SetEditSelection( aStartSel );
}
-void EditView::SetWindow( Window* pWin )
+void EditView::SetWindow( vcl::Window* pWin )
{
pImpEditView->pOutWin = pWin;
pImpEditView->pEditEngine->pImpEditEngine->GetSelEngine().Reset();
}
-Window* EditView::GetWindow() const
+vcl::Window* EditView::GetWindow() const
{
return pImpEditView->pOutWin;
}
@@ -355,7 +355,7 @@ void EditView::InsertText( const OUString& rStr, bool bSelect )
pEE->FormatAndUpdate( this );
}
-bool EditView::PostKeyEvent( const KeyEvent& rKeyEvent, Window* pFrameWin )
+bool EditView::PostKeyEvent( const KeyEvent& rKeyEvent, vcl::Window* pFrameWin )
{
return pImpEditView->PostKeyEvent( rKeyEvent, pFrameWin );
}
@@ -673,7 +673,7 @@ void EditView::TransliterateText( sal_Int32 nTransliterationMode )
}
}
-void EditView::CompleteAutoCorrect( Window* pFrameWin )
+void EditView::CompleteAutoCorrect( vcl::Window* pFrameWin )
{
if ( !pImpEditView->HasSelection() && pImpEditView->pEditEngine->pImpEditEngine->GetStatus().DoAutoCorrect() )
{
diff --git a/editeng/source/editeng/edtspell.cxx b/editeng/source/editeng/edtspell.cxx
index 52196a668426..41f754996a61 100644
--- a/editeng/source/editeng/edtspell.cxx
+++ b/editeng/source/editeng/edtspell.cxx
@@ -40,7 +40,7 @@ using namespace com::sun::star::beans;
using namespace com::sun::star::linguistic2;
-EditSpellWrapper::EditSpellWrapper( Window* _pWin,
+EditSpellWrapper::EditSpellWrapper( vcl::Window* _pWin,
Reference< XSpellChecker1 > &xChecker,
bool bIsStart, bool bIsAllRight, EditView* pView ) :
SvxSpellWrapper( _pWin, xChecker, bIsStart, bIsAllRight )
diff --git a/editeng/source/editeng/edtspell.hxx b/editeng/source/editeng/edtspell.hxx
index 797e41b1143e..a3b1382090e3 100644
--- a/editeng/source/editeng/edtspell.hxx
+++ b/editeng/source/editeng/edtspell.hxx
@@ -57,7 +57,7 @@ protected:
virtual void AutoCorrect( const OUString& rOldWord, const OUString& rNewWord ) SAL_OVERRIDE;
public:
- EditSpellWrapper( Window* pWin,
+ EditSpellWrapper( vcl::Window* pWin,
::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XSpellChecker1 > &xChecker,
bool bIsStart,
diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx
index e45abb4213b3..bdd5065ec6a9 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -67,7 +67,7 @@ static inline void lcl_AllignToPixel( Point& rPoint, OutputDevice* pOutDev, shor
// class ImpEditView
-ImpEditView::ImpEditView( EditView* pView, EditEngine* pEng, Window* pWindow ) :
+ImpEditView::ImpEditView( EditView* pView, EditEngine* pEng, vcl::Window* pWindow ) :
aOutArea( Point(), pEng->GetPaperSize() )
{
pEditView = pView;
@@ -333,7 +333,7 @@ void ImpEditView::ImplDrawHighlightRect( OutputDevice* _pTarget, const Point& rD
}
else
{
- Window* pWindow = dynamic_cast< Window* >(_pTarget);
+ vcl::Window* pWindow = dynamic_cast< vcl::Window* >(_pTarget);
if(pWindow)
{
@@ -985,7 +985,7 @@ Pair ImpEditView::Scroll( long ndX, long ndY, sal_uInt8 nRangeCheck )
return Pair( nRealDiffX, nRealDiffY );
}
-bool ImpEditView::PostKeyEvent( const KeyEvent& rKeyEvent, Window* pFrameWin )
+bool ImpEditView::PostKeyEvent( const KeyEvent& rKeyEvent, vcl::Window* pFrameWin )
{
bool bDone = false;
@@ -1964,7 +1964,7 @@ void ImpEditView::dragOver(const ::com::sun::star::datatransfer::dnd::DropTarget
void ImpEditView::AddDragAndDropListeners()
{
- Window* pWindow = GetWindow();
+ vcl::Window* pWindow = GetWindow();
if ( !bActiveDragAndDropListener && pWindow && pWindow->GetDragGestureRecognizer().is() )
{
vcl::unohelper::DragAndDropWrapper* pDnDWrapper = new vcl::unohelper::DragAndDropWrapper( this );
diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx
index 634aaa0b8b92..b0756c7c73a6 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -79,7 +79,7 @@ class TextRanger;
class SvKeyValueIterator;
class SvxForbiddenCharactersTable;
class SvtCTLOptions;
-class Window;
+namespace vcl { class Window; }
class SvxNumberFormat;
@@ -215,7 +215,7 @@ private:
vcl::Cursor* pCursor;
Color* pBackgroundColor;
EditEngine* pEditEngine;
- Window* pOutWin;
+ vcl::Window* pOutWin;
Pointer* pPointer;
DragAndDropInfo* pDragAndDropInfo;
@@ -263,7 +263,7 @@ protected:
void ImplDrawHighlightRect( OutputDevice* _pTarget, const Point& rDocPosTopLeft, const Point& rDocPosBottomRight, PolyPolygon* pPolyPoly );
public:
- ImpEditView( EditView* pView, EditEngine* pEng, Window* pWindow );
+ ImpEditView( EditView* pView, EditEngine* pEng, vcl::Window* pWindow );
virtual ~ImpEditView();
EditView* GetEditViewPtr() { return pEditView; }
@@ -284,7 +284,7 @@ public:
bool IsVertical() const;
- bool PostKeyEvent( const KeyEvent& rKeyEvent, Window* pFrameWin = NULL );
+ bool PostKeyEvent( const KeyEvent& rKeyEvent, vcl::Window* pFrameWin = NULL );
bool MouseButtonUp( const MouseEvent& rMouseEvent );
bool MouseButtonDown( const MouseEvent& rMouseEvent );
@@ -310,7 +310,7 @@ public:
void DrawSelection() { DrawSelection( aEditSelection ); }
void DrawSelection( EditSelection, Region* pRegion = NULL, OutputDevice* pTargetDevice = NULL );
- Window* GetWindow() const { return pOutWin; }
+ vcl::Window* GetWindow() const { return pOutWin; }
EESelectionMode GetSelectionMode() const { return eSelectionMode; }
void SetSelectionMode( EESelectionMode eMode );
@@ -760,7 +760,7 @@ public:
EditPaM DeleteSelected( EditSelection aEditSelection);
EditPaM InsertText( const EditSelection& rCurEditSelection, sal_Unicode c, bool bOverwrite, bool bIsUserInput = false );
EditPaM InsertText(const EditSelection& aCurEditSelection, const OUString& rStr);
- EditPaM AutoCorrect( const EditSelection& rCurEditSelection, sal_Unicode c, bool bOverwrite, Window* pFrameWin = NULL );
+ EditPaM AutoCorrect( const EditSelection& rCurEditSelection, sal_Unicode c, bool bOverwrite, vcl::Window* pFrameWin = NULL );
EditPaM DeleteLeftOrRight( const EditSelection& rEditSelection, sal_uInt8 nMode, sal_uInt8 nDelMode = DELMODE_SIMPLE );
EditPaM InsertParaBreak( EditSelection aEditSelection );
EditPaM InsertLineBreak(const EditSelection& aEditSelection);
diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx
index 63ccd0e36aec..6dd731e2f2f1 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -2465,7 +2465,7 @@ void ImpEditEngine::ImpRemoveParagraph( sal_Int32 nPara )
}
EditPaM ImpEditEngine::AutoCorrect( const EditSelection& rCurSel, sal_Unicode c,
- bool bOverwrite, Window* pFrameWin )
+ bool bOverwrite, vcl::Window* pFrameWin )
{
EditSelection aSel( rCurSel );
SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect();
diff --git a/editeng/source/editeng/textconv.cxx b/editeng/source/editeng/textconv.cxx
index 92035210ae69..e5230587185e 100644
--- a/editeng/source/editeng/textconv.cxx
+++ b/editeng/source/editeng/textconv.cxx