svx/source/tbxctrls/colorwindow.hxx | 6 ++---
svx/source/tbxctrls/tbcontrl.cxx | 42 ++++++++++++++++++------------------
2 files changed, 24 insertions(+), 24 deletions(-)
New commits:
commit 4778444d20e5396d012164603018fa968331e012
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri Oct 28 13:15:18 2016 +0100
rename SvxColorWindow_Impl to SvxColorWindow
Change-Id: I84941f4566792e11a9070f8623857a3fac44591d
diff --git a/svx/source/tbxctrls/colorwindow.hxx
b/svx/source/tbxctrls/colorwindow.hxx
index 551db2b..19b9132 100644
--- a/svx/source/tbxctrls/colorwindow.hxx
+++ b/svx/source/tbxctrls/colorwindow.hxx
@@ -33,7 +33,7 @@
class BorderColorStatus;
-class SvxColorWindow_Impl : public SfxPopupWindow
+class SvxColorWindow : public SfxPopupWindow
{
private:
const sal_uInt16 theSlotId;
@@ -61,14 +61,14 @@ protected:
virtual void Resize() override;
public:
- SvxColorWindow_Impl( const OUString& rCommand,
+ SvxColorWindow( const OUString& rCommand,
PaletteManager& rPaletteManager,
BorderColorStatus& rBorderColorStatus,
sal_uInt16 nSlotId,
const css::uno::Reference< css::frame::XFrame >&
rFrame,
vcl::Window* pParentWindow,
std::function<void(const OUString&, const Color&)>
const & maColorSelectFunction);
- virtual ~SvxColorWindow_Impl() override;
+ virtual ~SvxColorWindow() override;
virtual void dispose() override;
void StartSelection();
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 2f8a09e..c93eb0e 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -1245,7 +1245,7 @@ void SvxFontNameBox_Impl::Select()
#endif
-SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString& rCommand,
+SvxColorWindow::SvxColorWindow( const OUString& rCommand,
PaletteManager&
rPaletteManager,
BorderColorStatus&
rBorderColorStatus,
sal_uInt16 nSlotId,
@@ -1341,7 +1341,7 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString&
rCommand,
mpColorSet->SetAccessibleName( aWindowTitle );
mpPaletteListBox->SetStyle( mpPaletteListBox->GetStyle() | WB_BORDER |
WB_AUTOSIZE );
- mpPaletteListBox->SetSelectHdl( LINK( this, SvxColorWindow_Impl,
SelectPaletteHdl ) );
+ mpPaletteListBox->SetSelectHdl( LINK( this, SvxColorWindow,
SelectPaletteHdl ) );
mpPaletteListBox->AdaptDropDownLineCountToMaximum();
std::vector<OUString> aPaletteList = mrPaletteManager.GetPaletteList();
for( std::vector<OUString>::iterator it = aPaletteList.begin(); it !=
aPaletteList.end(); ++it )
@@ -1352,11 +1352,11 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const
OUString& rCommand,
mpPaletteListBox->SelectEntry( aPaletteName );
SelectPaletteHdl( *mpPaletteListBox );
- mpButtonAutoColor->SetClickHdl( LINK( this, SvxColorWindow_Impl,
AutoColorClickHdl ) );
- mpButtonPicker->SetClickHdl( LINK( this, SvxColorWindow_Impl,
OpenPickerClickHdl ) );
+ mpButtonAutoColor->SetClickHdl( LINK( this, SvxColorWindow,
AutoColorClickHdl ) );
+ mpButtonPicker->SetClickHdl( LINK( this, SvxColorWindow,
OpenPickerClickHdl ) );
- mpColorSet->SetSelectHdl( LINK( this, SvxColorWindow_Impl, SelectHdl ) );
- mpRecentColorSet->SetSelectHdl( LINK( this, SvxColorWindow_Impl, SelectHdl
) );
+ mpColorSet->SetSelectHdl( LINK( this, SvxColorWindow, SelectHdl ) );
+ mpRecentColorSet->SetSelectHdl( LINK( this, SvxColorWindow, SelectHdl ) );
SetHelpId( HID_POPUP_COLOR );
mpColorSet->SetHelpId( HID_POPUP_COLOR_CTRL );
@@ -1378,12 +1378,12 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const
OUString& rCommand,
}
}
-SvxColorWindow_Impl::~SvxColorWindow_Impl()
+SvxColorWindow::~SvxColorWindow()
{
disposeOnce();
}
-void SvxColorWindow_Impl::dispose()
+void SvxColorWindow::dispose()
{
mpColorSet.clear();
mpRecentColorSet.clear();
@@ -1394,14 +1394,14 @@ void SvxColorWindow_Impl::dispose()
SfxPopupWindow::dispose();
}
-void SvxColorWindow_Impl::KeyInput( const KeyEvent& rKEvt )
+void SvxColorWindow::KeyInput( const KeyEvent& rKEvt )
{
mpColorSet->KeyInput(rKEvt);
}
-IMPL_LINK(SvxColorWindow_Impl, SelectHdl, ValueSet*, pColorSet, void)
+IMPL_LINK(SvxColorWindow, SelectHdl, ValueSet*, pColorSet, void)
{
- VclPtr<SvxColorWindow_Impl> xThis(this);
+ VclPtr<SvxColorWindow> xThis(this);
Color aColor = pColorSet->GetItemColor( pColorSet->GetSelectItemId() );
/* #i33380# DR 2004-09-03 Moved the following line above the Dispatch()
calls.
@@ -1424,7 +1424,7 @@ IMPL_LINK(SvxColorWindow_Impl, SelectHdl, ValueSet*,
pColorSet, void)
maColorSelectFunction(maCommand, aColor);
}
-IMPL_LINK_NOARG(SvxColorWindow_Impl, SelectPaletteHdl, ListBox&, void)
+IMPL_LINK_NOARG(SvxColorWindow, SelectPaletteHdl, ListBox&, void)
{
sal_Int32 nPos = mpPaletteListBox->GetSelectEntryPos();
mrPaletteManager.SetPalette( nPos );
@@ -1432,9 +1432,9 @@ IMPL_LINK_NOARG(SvxColorWindow_Impl, SelectPaletteHdl,
ListBox&, void)
mpColorSet->layoutToGivenHeight(mpColorSet->GetSizePixel().Height(),
mrPaletteManager.GetColorCount());
}
-IMPL_LINK_NOARG(SvxColorWindow_Impl, AutoColorClickHdl, Button*, void)
+IMPL_LINK_NOARG(SvxColorWindow, AutoColorClickHdl, Button*, void)
{
- VclPtr<SvxColorWindow_Impl> xThis(this);
+ VclPtr<SvxColorWindow> xThis(this);
Color aColor;
switch ( theSlotId )
@@ -1465,25 +1465,25 @@ IMPL_LINK_NOARG(SvxColorWindow_Impl, AutoColorClickHdl,
Button*, void)
maColorSelectFunction(maCommand, aColor);
}
-IMPL_LINK_NOARG(SvxColorWindow_Impl, OpenPickerClickHdl, Button*, void)
+IMPL_LINK_NOARG(SvxColorWindow, OpenPickerClickHdl, Button*, void)
{
- VclPtr<SvxColorWindow_Impl> xThis(this);
+ VclPtr<SvxColorWindow> xThis(this);
if ( IsInPopupMode() )
EndPopupMode();
mrPaletteManager.PopupColorPicker(maCommand);
}
-void SvxColorWindow_Impl::Resize()
+void SvxColorWindow::Resize()
{
}
-void SvxColorWindow_Impl::StartSelection()
+void SvxColorWindow::StartSelection()
{
mpColorSet->StartSelection();
}
-void SvxColorWindow_Impl::statusChanged( const css::frame::FeatureStateEvent&
rEvent )
+void SvxColorWindow::statusChanged( const css::frame::FeatureStateEvent&
rEvent )
{
if ( rEvent.IsEnabled && rEvent.FeatureURL.Complete ==
".uno:ColorTableState"
&& mrPaletteManager.GetPalette() == 0)
@@ -2710,8 +2710,8 @@ void SvxColorToolBoxControl::setColorSelectFunction(const
ColorSelectFunction& a
VclPtr<SfxPopupWindow> SvxColorToolBoxControl::CreatePopupWindow()
{
- SvxColorWindow_Impl* pColorWin =
- VclPtr<SvxColorWindow_Impl>::Create(
+ SvxColorWindow* pColorWin =
+ VclPtr<SvxColorWindow>::Create(
m_aCommandURL,
m_aPaletteManager,
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
