summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-01-08 11:01:38 +0000
committerCaolán McNamara <caolanm@redhat.com>2016-01-08 18:20:25 +0000
commitca66b8c025fafe5fa79b749d17a28710322621c4 (patch)
treec6443e9f55db51e5a56f77ab5f8dc2fc85fac6ad /sfx2
parentb7dc6101dafcfe01023608b7e1be31c1c17a82bf (diff)
SfxTemplatePanelControl doesn't have to be a DockingWindow anymore
so we can drop one more DockingWindow from .src files leaving just one left Change-Id: I2e12398ce7682193aace966ebb8d153ec9acea2e
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/dialog/templdlg.cxx16
-rw-r--r--sfx2/source/dialog/templdlg.src18
2 files changed, 5 insertions, 29 deletions
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 75807592fe03..2aa03aacb02c 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -341,7 +341,7 @@ std::unique_ptr<PopupMenu> SfxActionListBox::CreateContextMenu()
}
SfxTemplatePanelControl::SfxTemplatePanelControl(SfxBindings* pBindings, vcl::Window* pParentWindow)
- : DockingWindow(pParentWindow, SfxResId(DLG_STYLE_DESIGNER))
+ : Window(pParentWindow)
, pImpl(new SfxTemplateDialog_Impl(pBindings, this))
, mpBindings(pBindings)
{
@@ -360,7 +360,7 @@ SfxTemplatePanelControl::~SfxTemplatePanelControl()
void SfxTemplatePanelControl::dispose()
{
pImpl.reset();
- DockingWindow::dispose();
+ Window::dispose();
}
void SfxTemplatePanelControl::DataChanged( const DataChangedEvent& _rDCEvt )
@@ -372,19 +372,14 @@ void SfxTemplatePanelControl::DataChanged( const DataChangedEvent& _rDCEvt )
pImpl->updateNonFamilyImages();
}
- DockingWindow::DataChanged( _rDCEvt );
+ Window::DataChanged( _rDCEvt );
}
void SfxTemplatePanelControl::Resize()
{
if(pImpl)
pImpl->Resize();
- DockingWindow::Resize();
-}
-
-void SfxTemplatePanelControl::FreeResource()
-{
- DockingWindow::FreeResource();
+ Window::Resize();
}
void SfxTemplatePanelControl::StateChanged( StateChangedType nStateChange )
@@ -403,7 +398,7 @@ void SfxTemplatePanelControl::StateChanged( StateChangedType nStateChange )
// SetFloatingPos( aPoint );
}
- DockingWindow::StateChanged( nStateChange );
+ Window::StateChanged( nStateChange );
}
void StyleTreeListBox_Impl::MakeExpanded_Impl(ExpandedEntries_t& rEntries) const
@@ -2258,7 +2253,6 @@ SfxTemplateDialog_Impl::SfxTemplateDialog_Impl(SfxBindings* pB, SfxTemplatePanel
{
}
- pDlgWindow->FreeResource();
Initialize();
}
diff --git a/sfx2/source/dialog/templdlg.src b/sfx2/source/dialog/templdlg.src
index 2fddb59d5212..16f2e57cf29d 100644
--- a/sfx2/source/dialog/templdlg.src
+++ b/sfx2/source/dialog/templdlg.src
@@ -45,22 +45,4 @@ String STR_STYLE_FILTER_HIERARCHICAL
Text [ en-US ] = "Hierarchical" ;
};
- // DLG_STYLE_DESIGNER ----------------------------------------------------
-DockingWindow DLG_STYLE_DESIGNER
-{
- HelpId = CMD_SID_STYLE_DESIGNER ;
- OutputSize = TRUE ;
- Hide = TRUE ;
- SVLook = TRUE ;
- Size = MAP_APPFONT ( 116 , 215 ) ;
- Pos = MAP_APPFONT ( 0 , 0 ) ;
- Closeable = TRUE ;
- Zoomable = TRUE ;
- Sizeable = TRUE ;
- Dockable = TRUE ;
- EnableResizing = TRUE ;
- Border = TRUE ;
- Moveable = TRUE ;
-};
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */