diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-10-28 13:37:33 +0100 |
|---|---|---|
| committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2018-06-25 12:24:03 +0200 |
| commit | 4b5d7b638dbbef50da258ef6f00c06596fba5f91 (patch) | |
| tree | 4bf7b71a9261767a551cc9c36f67771d26355a15 /cui/source/tabpages/backgrnd.cxx | |
| parent | let menu button launch arbitrary floating windows (diff) | |
| download | core-4b5d7b638dbbef50da258ef6f00c06596fba5f91.tar.gz core-4b5d7b638dbbef50da258ef6f00c06596fba5f91.zip | |
unify color selectors
private/s.mehrbrodt/colorpicker-backport
Note: this removes the use of auto-color from writer's asian text grid, because
its always invisible as far as I can see in practice.
(cherry picked from commit 43bc3031483d172eccd72c3804e2d4fc2ef37de4)
Conflicts:
chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx
chart2/source/controller/inc/dlg_View3D.hxx
cui/source/inc/border.hxx
cui/source/inc/chardlg.hxx
cui/source/inc/cuitabarea.hxx
cui/source/inc/cuitabline.hxx
cui/source/inc/numpages.hxx
cui/source/options/optcolor.cxx
cui/source/tabpages/border.cxx
cui/source/tabpages/borderconn.cxx
cui/source/tabpages/chardlg.cxx
cui/source/tabpages/numpages.cxx
cui/source/tabpages/tpgradnt.cxx
cui/source/tabpages/tphatch.cxx
cui/source/tabpages/tpline.cxx
cui/source/tabpages/tppattern.cxx
cui/source/tabpages/tpshadow.cxx
cui/uiconfig/ui/gradientpage.ui
cui/uiconfig/ui/hatchpage.ui
cui/uiconfig/ui/patterntabpage.ui
include/sfx2/controlwrapper.hxx
include/svx/PaletteManager.hxx
include/svx/colorwindow.hxx
include/svx/float3d.hxx
include/svx/fontwork.hxx
include/svx/sidebar/AreaPropertyPanelBase.hxx
include/svx/svxids.hrc
include/svx/tbcontrl.hxx
sc/source/ui/condformat/colorformat.cxx
sc/source/ui/condformat/condformatdlgentry.cxx
sc/source/ui/dbgui/scendlg.cxx
sc/source/ui/inc/scendlg.hxx
sc/source/ui/optdlg/opredlin.cxx
sc/source/ui/optdlg/tpview.cxx
sc/uiconfig/scalc/ui/conditionalentry.ui
sd/inc/sdabstdlg.hxx
sd/qa/unit/dialogs-test.cxx
sd/source/ui/animations/CustomAnimationDialog.cxx
sd/source/ui/dlg/copydlg.cxx
sd/source/ui/dlg/sddlgfact.cxx
sd/source/ui/dlg/sddlgfact.hxx
sd/source/ui/func/fucopy.cxx
sd/source/ui/inc/copydlg.hxx
sd/source/ui/sidebar/SlideBackground.cxx
sd/source/ui/sidebar/SlideBackground.hxx
sd/uiconfig/simpress/ui/sidebarslidebackground.ui
svtools/source/control/ctrlbox.cxx
svx/source/dialog/bmpmask.hrc
svx/source/dialog/bmpmask.src
svx/source/dialog/fontwork.cxx
svx/source/engine3d/float3d.cxx
svx/source/sidebar/area/AreaPropertyPanelBase.cxx
svx/source/sidebar/shadow/ShadowPropertyPanel.cxx
svx/source/sidebar/shadow/ShadowPropertyPanel.hxx
svx/source/tbxctrls/PaletteManager.cxx
svx/source/tbxctrls/tbcontrl.cxx
svx/uiconfig/ui/sidebararea.ui
sw/source/ui/config/optpage.cxx
sw/source/ui/frmdlg/column.cxx
sw/source/ui/misc/pgfnote.cxx
sw/source/ui/misc/pggrid.cxx
sw/source/uibase/inc/column.hxx
sw/source/uibase/inc/optpage.hxx
sw/source/uibase/inc/pgfnote.hxx
sw/source/uibase/inc/pggrid.hxx
sw/source/uibase/sidebar/PageStylesPanel.cxx
sw/source/uibase/sidebar/PageStylesPanel.hxx
sw/uiconfig/swriter/ui/optredlinepage.ui
sw/uiconfig/swriter/ui/pagestylespanel.ui
Change-Id: Ie850790d740a4d56c43015e493e093678cef3b4e
Diffstat (limited to 'cui/source/tabpages/backgrnd.cxx')
| -rw-r--r-- | cui/source/tabpages/backgrnd.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index 59df9a96c345..30b14853af37 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -382,7 +382,7 @@ SvxBackgroundTabPage::SvxBackgroundTabPage(vcl::Window* pParent, const SfxItemSe m_pBackgroundColorSet->SetSelectHdl( HDL(BackgroundColorHdl_Impl) ); m_pBackgroundColorSet->SetStyle(m_pBackgroundColorSet->GetStyle() | WB_ITEMBORDER | WB_NAMEFIELD | WB_NONEFIELD); - m_pBackgroundColorSet->SetText(SVX_RESSTR(RID_SVXSTR_TRANSPARENT)); + m_pBackgroundColorSet->SetText(SVX_RESSTR(RID_SVXSTR_NOFILL)); } SvxBackgroundTabPage::~SvxBackgroundTabPage() |