diff options
author | Maxim Monastirsky <momonasmon@gmail.com> | 2014-11-03 16:41:10 +0200 |
---|---|---|
committer | Maxim Monastirsky <momonasmon@gmail.com> | 2014-11-03 22:37:29 +0200 |
commit | 8e399602ea7aa11a81d704ff6ce8e660df4205b9 (patch) | |
tree | e714b251cf714549a18c3e072579b3a3e6827d31 /svx | |
parent | a62553cb5bac29398cf445b8f068940e4085e001 (diff) |
Related: fdo#84844 Get rid of ColorControl and ColorPopup
Change-Id: Ie2d00cfbccefd69c8e46381b712620def655a798
Diffstat (limited to 'svx')
-rw-r--r-- | svx/Library_svx.mk | 2 | ||||
-rw-r--r-- | svx/source/sidebar/tools/ColorControl.cxx | 224 | ||||
-rw-r--r-- | svx/source/sidebar/tools/ColorPopup.cxx | 59 |
3 files changed, 0 insertions, 285 deletions
diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk index f5e5deda67ad..1fc78a2cf0d7 100644 --- a/svx/Library_svx.mk +++ b/svx/Library_svx.mk @@ -200,8 +200,6 @@ $(eval $(call gb_Library_add_exception_objects,svx,\ svx/source/sidebar/line/LineWidthPopup \ svx/source/sidebar/possize/PosSizePropertyPanel \ svx/source/sidebar/possize/SidebarDialControl \ - svx/source/sidebar/tools/ColorControl \ - svx/source/sidebar/tools/ColorPopup \ svx/source/sidebar/tools/PopupControl \ svx/source/sidebar/tools/PopupContainer \ svx/source/sidebar/tools/Popup \ diff --git a/svx/source/sidebar/tools/ColorControl.cxx b/svx/source/sidebar/tools/ColorControl.cxx deleted file mode 100644 index 68f8ce08cbde..000000000000 --- a/svx/source/sidebar/tools/ColorControl.cxx +++ /dev/null @@ -1,224 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include <svx/sidebar/ColorControl.hxx> -#include "svx/svxids.hrc" -#include "svx/drawitem.hxx" -#include "svx/xtable.hxx" -#include "svx/dialmgr.hxx" -#include "svx/xflclit.hxx" -#include <tools/resid.hxx> -#include <sfx2/sidebar/Theme.hxx> -#include <sfx2/objsh.hxx> -#include <sfx2/bindings.hxx> -#include <sfx2/dispatch.hxx> -#include <vcl/floatwin.hxx> -#include <unotools/pathoptions.hxx> -#include <editeng/editrids.hrc> - -using ::sfx2::sidebar::Theme; - -namespace svx { namespace sidebar { - -namespace { - short GetItemId_Imp( ValueSet& rValueSet, const Color& rCol ) - { - if(rCol == COL_AUTO) - return 0; - - bool bFound = false; - sal_uInt16 nCount = rValueSet.GetItemCount(); - sal_uInt16 n = 1; - - while ( !bFound && n <= nCount ) - { - Color aValCol = rValueSet.GetItemColor(n); - - bFound = ( aValCol.GetRed() == rCol.GetRed() - && aValCol.GetGreen() == rCol.GetGreen() - && aValCol.GetBlue() == rCol.GetBlue() ); - - if ( !bFound ) - n++; - } - return bFound ? n : -1; - } - XColorListRef GetColorTable (void) - { - SfxObjectShell* pDocSh = SfxObjectShell::Current(); - DBG_ASSERT(pDocSh!=NULL, "DocShell not found!"); - if (pDocSh != NULL) - { - const SfxPoolItem* pItem = pDocSh->GetItem(SID_COLOR_TABLE); - if (pItem != NULL) - { - XColorListRef xTable = static_cast<const SvxColorListItem*>(pItem)->GetColorList(); - if (xTable.is()) - return xTable; - } - } - - return XColorList::GetStdColorList(); - } -} // end of anonymous namespace - - - - -ColorControl::ColorControl ( - vcl::Window* pParent, - SfxBindings* /* pBindings */, - const ResId& rControlResId, - const ResId& rValueSetResId, - const ::boost::function<Color(void)>& rNoColorGetter, - const ::boost::function<void(OUString&,Color)>& rColorSetter, - FloatingWindow* pFloatingWindow, - const ResId* pNoColorStringResId) // const sal_uInt32 nNoColorStringResId) - : PopupControl(pParent, rControlResId), - maVSColor(this, rValueSetResId), - mpFloatingWindow(pFloatingWindow), - msNoColorString( - pNoColorStringResId - ? pNoColorStringResId->toString() - : OUString()), - maNoColorGetter(rNoColorGetter), - maColorSetter(rColorSetter) -{ - FreeResource(); - FillColors(); -} - - - -ColorControl::~ColorControl (void) -{ -} - - - - -void ColorControl::FillColors (void) -{ - XColorListRef xColorTable (GetColorTable()); - - if (xColorTable.is()) - { - const long nColorCount(xColorTable->Count()); - if (nColorCount <= 0) - return; - - const WinBits aWinBits(maVSColor.GetStyle() | WB_TABSTOP | WB_ITEMBORDER | WB_NAMEFIELD | - WB_NO_DIRECTSELECT | WB_MENUSTYLEVALUESET); - - maVSColor.SetStyle(aWinBits); - - // neds to be done *before* layouting - if(!msNoColorString.isEmpty()) - { - maVSColor.SetStyle(maVSColor.GetStyle() | WB_NONEFIELD); - maVSColor.SetText(msNoColorString); - } - - const Size aNewSize(maVSColor.layoutAllVisible(nColorCount)); - maVSColor.SetOutputSizePixel(aNewSize); - const sal_Int32 nAdd = 4; - - SetOutputSizePixel(Size(aNewSize.Width() + nAdd, aNewSize.Height() + nAdd)); - Link aLink = LINK(this, ColorControl, VSSelectHdl); - maVSColor.SetSelectHdl(aLink); - - // Now, after all calls to SetStyle, we can change the - // background color. - maVSColor.SetBackground(Theme::GetWallpaper(Theme::Paint_DropDownBackground)); - - // add entrties - maVSColor.Clear(); - maVSColor.addEntriesForXColorList(*xColorTable); - } - - maVSColor.Show(); -} - - - - -void ColorControl::GetFocus (void) -{ - maVSColor.GrabFocus(); -} - - - - -void ColorControl::SetCurColorSelect(Color aCol,bool bAvailable) -{ - //UUUU When transparent use transparent entry (entry 0) - const bool bIsTransparent(0xff == aCol.GetTransparency()); - short nCol = bIsTransparent ? 0 : GetItemId_Imp(maVSColor,aCol); - - if(!bAvailable) - { - maVSColor.SetNoSelection(); - return; - } - - //if not found - if(nCol == -1) - { - maVSColor.SetNoSelection(); - } - else - { - // remove selection first to force evtl. scroll when scroll is needed - maVSColor.SetNoSelection(); - maVSColor.SelectItem(nCol); - } -} - - - - -IMPL_LINK(ColorControl, VSSelectHdl, void *, pControl) -{ - if(pControl == &maVSColor) - { - sal_uInt16 iPos = maVSColor.GetSelectItemId(); - Color aColor = maVSColor.GetItemColor( iPos ); - OUString aTmpStr = maVSColor.GetItemText( iPos ); - - // react when the WB_NONEFIELD created entry is selected - if (aColor.GetColor() == 0 && aTmpStr.isEmpty()) - { - if (maNoColorGetter) - aColor = maNoColorGetter(); - } - if (maColorSetter) - maColorSetter(aTmpStr, aColor); - - if (mpFloatingWindow!=NULL && mpFloatingWindow->IsInPopupMode()) - mpFloatingWindow->EndPopupMode(); - } - - return 0; -} - - -} } // end of namespace svx::sidebar - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sidebar/tools/ColorPopup.cxx b/svx/source/sidebar/tools/ColorPopup.cxx deleted file mode 100644 index cd778304a508..000000000000 --- a/svx/source/sidebar/tools/ColorPopup.cxx +++ /dev/null @@ -1,59 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#include <svx/sidebar/ColorPopup.hxx> -#include <svx/sidebar/ColorControl.hxx> - - -namespace svx { namespace sidebar { - -ColorPopup::ColorPopup ( - vcl::Window* pParent, - const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator) - : Popup( - pParent, - rControlCreator, - OUString("Color")) -{ -} - - - - -ColorPopup::~ColorPopup (void) -{ -} - - - - -void ColorPopup::SetCurrentColor ( - const Color aCurrentColor, - const bool bIsColorAvailable) -{ - ProvideContainerAndControl(); - - ColorControl* pColorControl = dynamic_cast<ColorControl*>(mpControl.get()); - if (pColorControl != NULL) - pColorControl->SetCurColorSelect(aCurrentColor, bIsColorAvailable); -} - - -} } // end of namespace svx::sidebar - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |