include/vcl/window.hxx | 4 -
vcl/source/window/window.cxx | 2
vcl/source/window/window2.cxx | 96 +++++++++++++++++++++---------------------
3 files changed, 51 insertions(+), 51 deletions(-)
New commits:
commit 7f3116bb8d58897e35505ff1d012f9e5bf2cfa72
Author: Xisco Fauli <aniste...@gmail.com>
Date: Sat Jun 4 23:54:17 2016 +0200
tdf#89329: use unique_ptr for pImpl in window
Change-Id: I0cb050875a7cb03b730cbbf93078f36fc1f372ce
Reviewed-on: https://gerrit.libreoffice.org/25901
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Noel Grandin <noelgran...@gmail.com>
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index e93870c..3a3e980 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -538,7 +538,7 @@ private:
// Please do *not* add new members or inline functions to class
Window,
// but use class WindowImpl instead
- WindowImpl* mpWindowImpl;
+ std::unique_ptr<WindowImpl> mpWindowImpl;
#ifdef DBG_UTIL
friend const char* ::ImplDbgCheckWindow( const void* pObj );
@@ -580,7 +580,7 @@ public:
SAL_DLLPRIVATE void ImplIsInTaskPaneList( bool
mbIsInTaskList );
- SAL_DLLPRIVATE WindowImpl* ImplGetWindowImpl() const { return
mpWindowImpl; }
+ SAL_DLLPRIVATE WindowImpl* ImplGetWindowImpl() const { return
mpWindowImpl.get(); }
SAL_DLLPRIVATE Point ImplFrameToOutput( const Point& rPos );
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index e37a052..6cdb1f6 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -550,7 +550,7 @@ void Window::dispose()
}
// should be the last statements
- delete mpWindowImpl; mpWindowImpl = nullptr;
+ mpWindowImpl.reset();
OutputDevice::dispose();
}
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index 801943b..fa9fc15 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -1381,7 +1381,7 @@ namespace
void Window::InvalidateSizeCache()
{
- WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl : mpWindowImpl;
+ WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl.get() : mpWindowImpl.get();
pWindowImpl->mnOptimalWidthCache = -1;
pWindowImpl->mnOptimalHeightCache = -1;
}
@@ -1398,7 +1398,7 @@ void Window::queue_resize(StateChangedType eReason)
InvalidateSizeCache();
}
- WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl : mpWindowImpl;
+ WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl.get() : mpWindowImpl.get();
if (pWindowImpl->m_xSizeGroup && pWindowImpl->m_xSizeGroup->get_mode() !=
VCL_SIZE_GROUP_NONE)
{
std::set<VclPtr<vcl::Window> > &rWindows =
pWindowImpl->m_xSizeGroup->get_widgets();
@@ -1645,7 +1645,7 @@ void Window::set_height_request(sal_Int32 nHeightRequest)
if (!mpWindowImpl)
return;
- WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl : mpWindowImpl;
+ WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl.get() : mpWindowImpl.get();
if ( pWindowImpl->mnHeightRequest != nHeightRequest )
{
@@ -1659,7 +1659,7 @@ void Window::set_width_request(sal_Int32 nWidthRequest)
if (!mpWindowImpl)
return;
- WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl : mpWindowImpl;
+ WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl.get() : mpWindowImpl.get();
if ( pWindowImpl->mnWidthRequest != nWidthRequest )
{
@@ -1674,7 +1674,7 @@ Size Window::get_ungrouped_preferred_size() const
if (aRet.Width() == -1 || aRet.Height() == -1)
{
//cache gets blown away by queue_resize
- WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl : mpWindowImpl;
+ WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl.get() : mpWindowImpl.get();
if (pWindowImpl->mnOptimalWidthCache == -1 ||
pWindowImpl->mnOptimalHeightCache == -1)
{
Size aOptimal(GetOptimalSize());
@@ -1694,7 +1694,7 @@ Size Window::get_preferred_size() const
{
Size aRet(get_ungrouped_preferred_size());
- WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl : mpWindowImpl;
+ WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl.get() : mpWindowImpl.get();
if (pWindowImpl->m_xSizeGroup)
{
const VclSizeGroupMode eMode = pWindowImpl->m_xSizeGroup->get_mode();
@@ -1723,247 +1723,247 @@ Size Window::get_preferred_size() const
VclAlign Window::get_halign() const
{
- WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl : mpWindowImpl;
+ WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl.get() : mpWindowImpl.get();
return pWindowImpl->meHalign;
}
void Window::set_halign(VclAlign eAlign)
{
- WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl : mpWindowImpl;
+ WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl.get() : mpWindowImpl.get();
pWindowImpl->meHalign = eAlign;
}
VclAlign Window::get_valign() const
{
- WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl : mpWindowImpl;
+ WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl.get() : mpWindowImpl.get();
return pWindowImpl->meValign;
}
void Window::set_valign(VclAlign eAlign)
{
- WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl : mpWindowImpl;
+ WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl.get() : mpWindowImpl.get();
pWindowImpl->meValign = eAlign;
}
bool Window::get_hexpand() const
{
- WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl : mpWindowImpl;
+ WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl.get() : mpWindowImpl.get();
return pWindowImpl->mbHexpand;
}
void Window::set_hexpand(bool bExpand)
{
- WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl : mpWindowImpl;
+ WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl.get() : mpWindowImpl.get();
pWindowImpl->mbHexpand = bExpand;
}
bool Window::get_vexpand() const
{
- WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl : mpWindowImpl;
+ WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl.get() : mpWindowImpl.get();
return pWindowImpl->mbVexpand;
}
void Window::set_vexpand(bool bExpand)
{
- WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl : mpWindowImpl;
+ WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl.get() : mpWindowImpl.get();
pWindowImpl->mbVexpand = bExpand;
}
bool Window::get_expand() const
{
- WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl : mpWindowImpl;
+ WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl.get() : mpWindowImpl.get();
return pWindowImpl->mbExpand;
}
void Window::set_expand(bool bExpand)
{
- WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl : mpWindowImpl;
+ WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl.get() : mpWindowImpl.get();
pWindowImpl->mbExpand = bExpand;
}
VclPackType Window::get_pack_type() const
{
- WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl : mpWindowImpl;
+ WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl.get() : mpWindowImpl.get();
return pWindowImpl->mePackType;
}
void Window::set_pack_type(VclPackType ePackType)
{
- WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl : mpWindowImpl;
+ WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl.get() : mpWindowImpl.get();
pWindowImpl->mePackType = ePackType;
}
sal_Int32 Window::get_padding() const
{
- WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl : mpWindowImpl;
+ WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl.get() : mpWindowImpl.get();
return pWindowImpl->mnPadding;
}
void Window::set_padding(sal_Int32 nPadding)
{
- WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl : mpWindowImpl;
+ WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl.get() : mpWindowImpl.get();
pWindowImpl->mnPadding = nPadding;
}
bool Window::get_fill() const
{
- WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl : mpWindowImpl;
+ WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl.get() : mpWindowImpl.get();
return pWindowImpl->mbFill;
}
void Window::set_fill(bool bFill)
{
- WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl : mpWindowImpl;
+ WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl.get() : mpWindowImpl.get();
pWindowImpl->mbFill = bFill;
}
sal_Int32 Window::get_grid_width() const
{
- WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl : mpWindowImpl;
+ WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl.get() : mpWindowImpl.get();
return pWindowImpl->mnGridWidth;
}
void Window::set_grid_width(sal_Int32 nCols)
{
- WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl : mpWindowImpl;
+ WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl.get() : mpWindowImpl.get();
pWindowImpl->mnGridWidth = nCols;
}
sal_Int32 Window::get_grid_left_attach() const
{
- WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl : mpWindowImpl;
+ WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl.get() : mpWindowImpl.get();
return pWindowImpl->mnGridLeftAttach;
}
void Window::set_grid_left_attach(sal_Int32 nAttach)
{
- WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl : mpWindowImpl;
+ WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl.get() : mpWindowImpl.get();
pWindowImpl->mnGridLeftAttach = nAttach;
}
sal_Int32 Window::get_grid_height() const
{
- WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl : mpWindowImpl;
+ WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl.get() : mpWindowImpl.get();
return pWindowImpl->mnGridHeight;
}
void Window::set_grid_height(sal_Int32 nRows)
{
- WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl : mpWindowImpl;
+ WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl.get() : mpWindowImpl.get();
pWindowImpl->mnGridHeight = nRows;
}
sal_Int32 Window::get_grid_top_attach() const
{
- WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl : mpWindowImpl;
+ WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl.get() : mpWindowImpl.get();
return pWindowImpl->mnGridTopAttach;
}
void Window::set_grid_top_attach(sal_Int32 nAttach)
{
- WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl : mpWindowImpl;
+ WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl.get() : mpWindowImpl.get();
pWindowImpl->mnGridTopAttach = nAttach;
}
void Window::set_border_width(sal_Int32 nBorderWidth)
{
- WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl : mpWindowImpl;
+ WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl.get() : mpWindowImpl.get();
pWindowImpl->mnBorderWidth = nBorderWidth;
}
sal_Int32 Window::get_border_width() const
{
- WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl : mpWindowImpl;
+ WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl.get() : mpWindowImpl.get();
return pWindowImpl->mnBorderWidth;
}
void Window::set_margin_left(sal_Int32 nWidth)
{
- WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl : mpWindowImpl;
+ WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl.get() : mpWindowImpl.get();
pWindowImpl->mnMarginLeft = nWidth;
}
sal_Int32 Window::get_margin_left() const
{
- WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl : mpWindowImpl;
+ WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl.get() : mpWindowImpl.get();
return pWindowImpl->mnMarginLeft;
}
void Window::set_margin_right(sal_Int32 nWidth)
{
- WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl : mpWindowImpl;
+ WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl.get() : mpWindowImpl.get();
pWindowImpl->mnMarginRight = nWidth;
}
sal_Int32 Window::get_margin_right() const
{
- WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl : mpWindowImpl;
+ WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl.get() : mpWindowImpl.get();
return pWindowImpl->mnMarginRight;
}
void Window::set_margin_top(sal_Int32 nWidth)
{
- WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl : mpWindowImpl;
+ WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl.get() : mpWindowImpl.get();
pWindowImpl->mnMarginTop = nWidth;
}
sal_Int32 Window::get_margin_top() const
{
- WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl : mpWindowImpl;
+ WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl.get() : mpWindowImpl.get();
return pWindowImpl->mnMarginTop;
}
void Window::set_margin_bottom(sal_Int32 nWidth)
{
- WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl : mpWindowImpl;
+ WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl.get() : mpWindowImpl.get();
pWindowImpl->mnMarginBottom = nWidth;
}
sal_Int32 Window::get_margin_bottom() const
{
- WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl : mpWindowImpl;
+ WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl.get() : mpWindowImpl.get();
return pWindowImpl->mnMarginBottom;
}
sal_Int32 Window::get_height_request() const
{
- WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl : mpWindowImpl;
+ WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl.get() : mpWindowImpl.get();
return pWindowImpl->mnHeightRequest;
}
sal_Int32 Window::get_width_request() const
{
- WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl : mpWindowImpl;
+ WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl.get() : mpWindowImpl.get();
return pWindowImpl->mnWidthRequest;
}
bool Window::get_secondary() const
{
- WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl : mpWindowImpl;
+ WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl.get() : mpWindowImpl.get();
return pWindowImpl->mbSecondary;
}
void Window::set_secondary(bool bSecondary)
{
- WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl : mpWindowImpl;
+ WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl.get() : mpWindowImpl.get();
pWindowImpl->mbSecondary = bSecondary;
}
bool Window::get_non_homogeneous() const
{
- WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl : mpWindowImpl;
+ WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl.get() : mpWindowImpl.get();
return pWindowImpl->mbNonHomogeneous;
}
void Window::set_non_homogeneous(bool bNonHomogeneous)
{
- WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl : mpWindowImpl;
+ WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl.get() : mpWindowImpl.get();
pWindowImpl->mbNonHomogeneous = bNonHomogeneous;
}
void Window::add_to_size_group(const std::shared_ptr<VclSizeGroup>& xGroup)
{
- WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl : mpWindowImpl;
+ WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl.get() : mpWindowImpl.get();
//To-Do, multiple groups
pWindowImpl->m_xSizeGroup = xGroup;
pWindowImpl->m_xSizeGroup->insert(this);
@@ -1973,7 +1973,7 @@ void Window::add_to_size_group(const
std::shared_ptr<VclSizeGroup>& xGroup)
void Window::remove_from_all_size_groups()
{
- WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl : mpWindowImpl;
+ WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl.get() : mpWindowImpl.get();
//To-Do, multiple groups
if (pWindowImpl->m_xSizeGroup)
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
