commit b420a6ab0729530df6ff95c41d24673b5399ceae
author Maxim Monastirsky <momonasmon@gmail.com> Wed Oct 19 22:59:08 2016 +0300
committer Maxim Monastirsky <momonasmon@gmail.com> Thu Oct 20 00:01:07 2016 +0300
tree 30bad5a10846924739eede99e75f01bb6837b45f
parent 9d93fe6ca8a50e8cfbcec40507ee90f1f26bd7ba

SvxColorWindow_Impl: Unify title setting

Change-Id: Ic61fddfc92d30bfc5a5d0a298605606fba7ca676

svx/source/tbxctrls/colorwindow.hxx

diff --git a/svx/source/tbxctrls/colorwindow.hxx b/svx/source/tbxctrls/colorwindow.hxx
index 56b9ed2..551db2b 100644
--- a/svx/source/tbxctrls/colorwindow.hxx
+++ b/svx/source/tbxctrls/colorwindow.hxx
@@ -66,7 +66,6 @@ public:
                         BorderColorStatus& rBorderColorStatus,
                         sal_uInt16 nSlotId,
                         const css::uno::Reference< css::frame::XFrame >& rFrame,
                         const OUString& rWndTitle,
                         vcl::Window* pParentWindow,
                         std::function<void(const OUString&, const Color&)> const & maColorSelectFunction);
    virtual ~SvxColorWindow_Impl() override;

svx/source/tbxctrls/tbcontrl.cxx

diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 89da4fb..d1c26ba 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -1249,7 +1249,6 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString&            rCommand,
                                          BorderColorStatus&         rBorderColorStatus,
                                          sal_uInt16                 nSlotId,
                                          const Reference< XFrame >& rFrame,
                                          const OUString&            rWndTitle,
                                          vcl::Window*                    pParentWindow,
                                          std::function<void(const OUString&, const Color&)> const & aFunction):

@@ -1279,7 +1278,6 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString&            rCommand,
        case SID_ATTR_CHAR_BACK_COLOR:
        {
            mpButtonAutoColor->SetText( SVX_RESSTR( RID_SVXSTR_TRANSPARENT ) );
            mpColorSet->SetAccessibleName( SVX_RESSTR( RID_SVXSTR_BACKGROUND ) );
            break;
        }
        case SID_ATTR_CHAR_COLOR:
@@ -1294,35 +1292,53 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString&            rCommand,
                                         OUString( ".uno:AutoColorInvalid" ));
            SfxItemState eState = aQueryStatus.QueryState( pDummy );
            if( (SfxItemState::DEFAULT > eState) || ( SID_EXTRUSION_3D_COLOR == theSlotId ) )
            {
                mpButtonAutoColor->SetText( SVX_RESSTR( RID_SVXSTR_AUTOMATIC ) );
                mpColorSet->SetAccessibleName( SVX_RESSTR( RID_SVXSTR_TEXTCOLOR ) );
            }
            break;
        }
        case SID_FRAME_LINECOLOR:
        default:
        {
            mpButtonAutoColor->Hide();
            mpAutomaticSeparator->Hide();
            mpColorSet->SetAccessibleName( SVX_RESSTR( RID_SVXSTR_FRAME_COLOR ) );
            break;
        }
        case SID_ATTR_LINE_COLOR:
        {
            mpButtonAutoColor->Hide();
            mpAutomaticSeparator->Hide();
            mpColorSet->SetAccessibleName( SVX_RESSTR( RID_SVXSTR_LINECOLOR ) );
            break;
        }
        case SID_ATTR_FILL_COLOR:
        {
            mpButtonAutoColor->Hide();
            mpAutomaticSeparator->Hide();
            mpColorSet->SetAccessibleName( SVX_RESSTR( RID_SVXSTR_FILLCOLOR ) );
            break;
        }
    }

    OUString aWindowTitle;
    switch ( theSlotId )
    {
        case SID_ATTR_CHAR_COLOR:
        case SID_ATTR_CHAR_COLOR2:
            aWindowTitle = SVX_RESSTR( RID_SVXSTR_TEXTCOLOR );
            break;

        case SID_ATTR_CHAR_COLOR_BACKGROUND:
        case SID_ATTR_CHAR_BACK_COLOR:
            aWindowTitle = SVX_RESSTR( RID_SVXSTR_EXTRAS_CHARBACKGROUND );
            break;

        case SID_BACKGROUND_COLOR:
            aWindowTitle = SVX_RESSTR( RID_SVXSTR_BACKGROUND );
            break;

        case SID_FRAME_LINECOLOR:
            aWindowTitle = SVX_RESSTR( RID_SVXSTR_FRAME_COLOR );
            break;

        case SID_EXTRUSION_3D_COLOR:
            aWindowTitle = SVX_RESSTR( RID_SVXSTR_EXTRUSION_COLOR );
            break;

        case SID_ATTR_LINE_COLOR:
            aWindowTitle = SVX_RESSTR( RID_SVXSTR_LINECOLOR );
            break;

        case SID_ATTR_FILL_COLOR:
            aWindowTitle = SVX_RESSTR( RID_SVXSTR_FILLCOLOR );
            break;
    }
    SetText( aWindowTitle );
    mpColorSet->SetAccessibleName( aWindowTitle );

    mpPaletteListBox->SetStyle( mpPaletteListBox->GetStyle() | WB_BORDER | WB_AUTOSIZE );
    mpPaletteListBox->SetSelectHdl( LINK( this, SvxColorWindow_Impl, SelectPaletteHdl ) );
    mpPaletteListBox->AdaptDropDownLineCountToMaximum();
@@ -1342,7 +1358,6 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString&            rCommand,
    mpRecentColorSet->SetSelectHdl( LINK( this, SvxColorWindow_Impl, SelectHdl ) );
    SetHelpId( HID_POPUP_COLOR );
    mpColorSet->SetHelpId( HID_POPUP_COLOR_CTRL );
    SetText( rWndTitle );

    mrPaletteManager.ReloadColorSet(*mpColorSet);
    mpColorSet->layoutToGivenHeight(mpColorSet->GetSizePixel().Height(), mrPaletteManager.GetColorCount());
@@ -2699,38 +2714,9 @@ VclPtr<SfxPopupWindow> SvxColorToolBoxControl::CreatePopupWindow()
                            m_aBorderColorStatus,
                            GetSlotId(),
                            m_xFrame,
                            SVX_RESSTR( RID_SVXSTR_TEXTCOLOR ),
                            &GetToolBox(),
                            m_aColorSelectFunction);

    switch( GetSlotId() )
    {
        case SID_ATTR_CHAR_COLOR_BACKGROUND :
        case SID_ATTR_CHAR_BACK_COLOR :
            pColorWin->SetText( SVX_RESSTR( RID_SVXSTR_EXTRAS_CHARBACKGROUND ) );
            break;

        case SID_BACKGROUND_COLOR :
            pColorWin->SetText( SVX_RESSTR( RID_SVXSTR_BACKGROUND ) );
            break;

        case SID_FRAME_LINECOLOR:
            pColorWin->SetText( SVX_RESSTR( RID_SVXSTR_FRAME_COLOR ) );
            break;

        case SID_EXTRUSION_3D_COLOR:
            pColorWin->SetText( SVX_RESSTR( RID_SVXSTR_EXTRUSION_COLOR ) );
            break;

        case SID_ATTR_LINE_COLOR:
            pColorWin->SetText( SVX_RESSTR( RID_SVXSTR_LINECOLOR ) );
            break;

        case SID_ATTR_FILL_COLOR:
            pColorWin->SetText( SVX_RESSTR( RID_SVXSTR_FILLCOLOR ) );
            break;
    }

    pColorWin->StartPopupMode( &GetToolBox(),
        FloatWinPopupFlags::AllowTearOff|FloatWinPopupFlags::NoAppFocusClose );
    pColorWin->StartSelection();