[Libreoffice-commits] .: chart2/source sc/source
Joseph Powers
jpowers at kemper.freedesktop.org
Sat Nov 13 00:37:43 PST 2010
chart2/source/controller/dialogs/Bitmaps_HC.hrc | 5
chart2/source/controller/dialogs/Bitmaps_HC.src | 11 -
chart2/source/controller/dialogs/RangeSelectionButton.cxx | 5
chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx | 47 ++++---
sc/source/ui/cctrl/dpcontrol.cxx | 66 +++++------
sc/source/ui/miscdlgs/optsolver.cxx | 8 -
sc/source/ui/pagedlg/hfedtdlg.hrc | 9 -
sc/source/ui/pagedlg/hfedtdlg.src | 43 +------
sc/source/ui/pagedlg/scuitphfedit.cxx | 10 -
9 files changed, 73 insertions(+), 131 deletions(-)
New commits:
commit 0705821695d7a234421f739709867776b4c39d5b
Author: Joseph Powers <jpowers27 at cox.net>
Date: Sat Nov 13 00:32:23 2010 -0800
Purged BmpColorMode from libs-gui - calc
diff --git a/chart2/source/controller/dialogs/Bitmaps_HC.hrc b/chart2/source/controller/dialogs/Bitmaps_HC.hrc
index 232dc4a..c0e1d6a 100644
--- a/chart2/source/controller/dialogs/Bitmaps_HC.hrc
+++ b/chart2/source/controller/dialogs/Bitmaps_HC.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -208,6 +208,3 @@
#define BMP_REGRESSION_LOG_HC (RID_SCH_START + 94)
#define BMP_REGRESSION_EXP_HC (RID_SCH_START + 95)
#define BMP_REGRESSION_POWER_HC (RID_SCH_START + 96)
-
-// hide-button for range-choosing
-#define IMG_SELECTRANGE_HC (RID_SCH_START + 100)
diff --git a/chart2/source/controller/dialogs/Bitmaps_HC.src b/chart2/source/controller/dialogs/Bitmaps_HC.src
index 8c48d70..fe3c909 100644
--- a/chart2/source/controller/dialogs/Bitmaps_HC.src
+++ b/chart2/source/controller/dialogs/Bitmaps_HC.src
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -532,12 +532,3 @@ Image BMP_REGRESSION_POWER_HC
File = "regpow_h.bmp" ;
};
};
-//---------------------
-Image IMG_SELECTRANGE_HC
-{
- ImageBitmap = Bitmap
- {
- File = "selectrange.png";
- };
- MaskColor = SC_HC_MASKCOLOR;
-};
diff --git a/chart2/source/controller/dialogs/RangeSelectionButton.cxx b/chart2/source/controller/dialogs/RangeSelectionButton.cxx
index 0d4be5d..9b7e6ba 100644
--- a/chart2/source/controller/dialogs/RangeSelectionButton.cxx
+++ b/chart2/source/controller/dialogs/RangeSelectionButton.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -43,8 +43,7 @@ namespace chart
RangeSelectionButton::RangeSelectionButton( Window *pParent, const ResId& rResId ) :
ImageButton( pParent, rResId )
{
- SetModeImage( Image( SchResId(IMG_SELECTRANGE) ), BMP_COLOR_NORMAL );
- SetModeImage( Image( SchResId(IMG_SELECTRANGE_HC) ), BMP_COLOR_HIGHCONTRAST );
+ SetModeImage( Image( SchResId(IMG_SELECTRANGE) ) );
this->SetQuickHelpText(SchResId(STR_TIP_SELECT_RANGE));
}
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
index a8d2be0..41d3449 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -64,8 +64,7 @@ LightButton::LightButton( Window* pParent, const ResId& rResId, sal_Int32 nLight
: ImageButton( pParent, rResId )
, m_bLightOn(false)
{
- SetModeImage( Image( SVX_RES(RID_SVXIMAGE_LIGHT_OFF) ), BMP_COLOR_NORMAL );
- SetModeImage( Image( SVX_RES(RID_SVXIMAGE_LIGHT_OFF_H) ), BMP_COLOR_HIGHCONTRAST );
+ SetModeImage( Image( SVX_RES(RID_SVXIMAGE_LIGHT_OFF) ) );
String aTipHelpStr( SchResId(STR_TIP_LIGHTSOURCE_X) );
rtl::OUString aTipHelp( aTipHelpStr );
@@ -78,9 +77,11 @@ LightButton::LightButton( Window* pParent, const ResId& rResId, sal_Int32 nLight
}
this->SetQuickHelpText( String( aTipHelp ) );
}
+
LightButton::~LightButton()
{
}
+
void LightButton::switchLightOn(bool bOn)
{
if( m_bLightOn==bOn )
@@ -88,15 +89,14 @@ void LightButton::switchLightOn(bool bOn)
m_bLightOn = bOn;
if(m_bLightOn)
{
- SetModeImage( Image( SVX_RES(RID_SVXIMAGE_LIGHT_ON) ), BMP_COLOR_NORMAL );
- SetModeImage( Image( SVX_RES(RID_SVXIMAGE_LIGHT_ON_H) ), BMP_COLOR_HIGHCONTRAST );
+ SetModeImage( Image( SVX_RES(RID_SVXIMAGE_LIGHT_ON) ) );
}
else
{
- SetModeImage( Image( SVX_RES(RID_SVXIMAGE_LIGHT_OFF) ), BMP_COLOR_NORMAL );
- SetModeImage( Image( SVX_RES(RID_SVXIMAGE_LIGHT_OFF_H) ), BMP_COLOR_HIGHCONTRAST );
+ SetModeImage( Image( SVX_RES(RID_SVXIMAGE_LIGHT_OFF) ) );
}
}
+
bool LightButton::isLightOn() const
{
return m_bLightOn;
@@ -107,11 +107,10 @@ bool LightButton::isLightOn() const
ColorButton::ColorButton( Window* pParent, const ResId& rResId )
: ImageButton( pParent, rResId )
{
- SetModeImage( Image( SVX_RES(RID_SVXIMAGE_COLORDLG) ), BMP_COLOR_NORMAL );
- SetModeImage( Image( SVX_RES(RID_SVXIMAGE_COLORDLG_H) ), BMP_COLOR_HIGHCONTRAST );
-
+ SetModeImage( Image( SVX_RES(RID_SVXIMAGE_COLORDLG) ) );
this->SetQuickHelpText( String( SchResId(STR_TIP_CHOOSECOLOR) ) );
}
+
ColorButton::~ColorButton()
{
}
@@ -148,12 +147,14 @@ LightSourceInfo::LightSourceInfo()
aLightSource.aDirection = drawing::Direction3D(1,1,1);
aLightSource.bIsEnabled = sal_False;
}
+
void LightSourceInfo::initButtonFromSource()
{
if(!pButton)
return;
- pButton->SetModeImage( Image( SVX_RES( aLightSource.bIsEnabled ? RID_SVXIMAGE_LIGHT_ON : RID_SVXIMAGE_LIGHT_OFF ) ), BMP_COLOR_NORMAL );
- pButton->SetModeImage( Image( SVX_RES( aLightSource.bIsEnabled ? RID_SVXIMAGE_LIGHT_ON_H : RID_SVXIMAGE_LIGHT_OFF_H ) ), BMP_COLOR_HIGHCONTRAST );
+ pButton->SetModeImage( Image( SVX_RES(
+ aLightSource.bIsEnabled ? RID_SVXIMAGE_LIGHT_ON : RID_SVXIMAGE_LIGHT_OFF
+ ) ) );
}
//-----------------------------------------------------------------------------
@@ -332,7 +333,7 @@ ThreeD_SceneIllumination_TabPage::ThreeD_SceneIllumination_TabPage( Window* pWin
m_pLightSourceInfoList[7].pButton = &m_aBtn_Light8;
fillControlsFromModel(0);
-
+
m_aBtn_Light1.SetClickHdl( LINK( this, ThreeD_SceneIllumination_TabPage, ClickLightSourceButtonHdl ) );
m_aBtn_Light2.SetClickHdl( LINK( this, ThreeD_SceneIllumination_TabPage, ClickLightSourceButtonHdl ) );
m_aBtn_Light3.SetClickHdl( LINK( this, ThreeD_SceneIllumination_TabPage, ClickLightSourceButtonHdl ) );
@@ -354,7 +355,7 @@ ThreeD_SceneIllumination_TabPage::ThreeD_SceneIllumination_TabPage( Window* pWin
ClickLightSourceButtonHdl(&m_aBtn_Light2);
//m_aDelyedModelChangeTimer.SetTimeout( 4*EDIT_UPDATEDATA_TIMEOUT );
-
+
m_aModelChangeListener.startListening( uno::Reference< util::XModifyBroadcaster >(m_xSceneProperties, uno::UNO_QUERY) );
}
@@ -451,7 +452,7 @@ IMPL_LINK( ThreeD_SceneIllumination_TabPage, PreviewChangeHdl, void*, EMPTYARG )
pInfo->aLightSource.aDirection = B3DVectorToDirection3D(((const Svx3DLightDirection8Item&)a3DLightAttributes.Get(SDRATTR_3DSCENE_LIGHTDIRECTION_8)).GetValue());
applyLightSourcesToModel();
-
+
return 0;
}
@@ -463,7 +464,7 @@ IMPL_LINK( ThreeD_SceneIllumination_TabPage, PreviewSelectHdl, void*, EMPTYARG )
LightButton* pButton = m_pLightSourceInfoList[nLightNumber].pButton;
if(!pButton->IsChecked())
ClickLightSourceButtonHdl(pButton);
-
+
applyLightSourcesToModel();
}
return 0;
@@ -593,37 +594,37 @@ void ThreeD_SceneIllumination_TabPage::updatePreview()
aItemSet.Put(Svx3DLightcolor1Item(pInfo->aLightSource.nDiffuseColor));
aItemSet.Put(Svx3DLightOnOff1Item(pInfo->aLightSource.bIsEnabled));
aItemSet.Put(Svx3DLightDirection1Item(Direction3DToB3DVector(pInfo->aLightSource.aDirection)));
-
+
pInfo = &m_pLightSourceInfoList[1];
aItemSet.Put(Svx3DLightcolor2Item(pInfo->aLightSource.nDiffuseColor));
aItemSet.Put(Svx3DLightOnOff2Item(pInfo->aLightSource.bIsEnabled));
aItemSet.Put(Svx3DLightDirection2Item(Direction3DToB3DVector(pInfo->aLightSource.aDirection)));
-
+
pInfo = &m_pLightSourceInfoList[2];
aItemSet.Put(Svx3DLightcolor3Item(pInfo->aLightSource.nDiffuseColor));
aItemSet.Put(Svx3DLightOnOff3Item(pInfo->aLightSource.bIsEnabled));
aItemSet.Put(Svx3DLightDirection3Item(Direction3DToB3DVector(pInfo->aLightSource.aDirection)));
-
+
pInfo = &m_pLightSourceInfoList[3];
aItemSet.Put(Svx3DLightcolor4Item(pInfo->aLightSource.nDiffuseColor));
aItemSet.Put(Svx3DLightOnOff4Item(pInfo->aLightSource.bIsEnabled));
aItemSet.Put(Svx3DLightDirection4Item(Direction3DToB3DVector(pInfo->aLightSource.aDirection)));
-
+
pInfo = &m_pLightSourceInfoList[4];
aItemSet.Put(Svx3DLightcolor5Item(pInfo->aLightSource.nDiffuseColor));
aItemSet.Put(Svx3DLightOnOff5Item(pInfo->aLightSource.bIsEnabled));
aItemSet.Put(Svx3DLightDirection5Item(Direction3DToB3DVector(pInfo->aLightSource.aDirection)));
-
+
pInfo = &m_pLightSourceInfoList[5];
aItemSet.Put(Svx3DLightcolor6Item(pInfo->aLightSource.nDiffuseColor));
aItemSet.Put(Svx3DLightOnOff6Item(pInfo->aLightSource.bIsEnabled));
aItemSet.Put(Svx3DLightDirection6Item(Direction3DToB3DVector(pInfo->aLightSource.aDirection)));
-
+
pInfo = &m_pLightSourceInfoList[6];
aItemSet.Put(Svx3DLightcolor7Item(pInfo->aLightSource.nDiffuseColor));
aItemSet.Put(Svx3DLightOnOff7Item(pInfo->aLightSource.bIsEnabled));
aItemSet.Put(Svx3DLightDirection7Item(Direction3DToB3DVector(pInfo->aLightSource.aDirection)));
-
+
pInfo = &m_pLightSourceInfoList[7];
aItemSet.Put(Svx3DLightcolor8Item(pInfo->aLightSource.nDiffuseColor));
aItemSet.Put(Svx3DLightOnOff8Item(pInfo->aLightSource.bIsEnabled));
diff --git a/sc/source/ui/cctrl/dpcontrol.cxx b/sc/source/ui/cctrl/dpcontrol.cxx
index 8fc8dcb..74333ef 100644
--- a/sc/source/ui/cctrl/dpcontrol.cxx
+++ b/sc/source/ui/cctrl/dpcontrol.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -131,7 +131,7 @@ void ScDPFieldButton::draw()
const long nMargin = 2;
bool bOldMapEnablaed = mpOutDev->IsMapModeEnabled();
mpOutDev->EnableMapMode(false);
-
+
if (mbBaseButton)
{
// Background
@@ -139,18 +139,18 @@ void ScDPFieldButton::draw()
mpOutDev->SetLineColor(mpStyle->GetFaceColor());
mpOutDev->SetFillColor(mpStyle->GetFaceColor());
mpOutDev->DrawRect(aRect);
-
+
// Border lines
mpOutDev->SetLineColor(mpStyle->GetLightColor());
mpOutDev->DrawLine(Point(maPos), Point(maPos.X(), maPos.Y()+maSize.Height()-1));
mpOutDev->DrawLine(Point(maPos), Point(maPos.X()+maSize.Width()-1, maPos.Y()));
-
+
mpOutDev->SetLineColor(mpStyle->GetShadowColor());
mpOutDev->DrawLine(Point(maPos.X(), maPos.Y()+maSize.Height()-1),
Point(maPos.X()+maSize.Width()-1, maPos.Y()+maSize.Height()-1));
mpOutDev->DrawLine(Point(maPos.X()+maSize.Width()-1, maPos.Y()),
Point(maPos.X()+maSize.Width()-1, maPos.Y()+maSize.Height()-1));
-
+
// Field name.
// Get the font and size the same way as in scenario selection (lcl_DrawOneFrame in gridwin4.cxx)
Font aTextFont( mpStyle->GetAppFont() );
@@ -164,7 +164,7 @@ void ScDPFieldButton::draw()
}
mpOutDev->SetFont(aTextFont);
mpOutDev->SetTextColor(mpStyle->GetButtonTextColor());
-
+
Point aTextPos = maPos;
long nTHeight = mpOutDev->GetTextHeight();
aTextPos.setX(maPos.getX() + nMargin);
@@ -186,7 +186,7 @@ void ScDPFieldButton::getPopupBoundingBox(Point& rPos, Size& rSize) const
{
long nW = maSize.getWidth() / 2;
long nH = maSize.getHeight();
- if (nW > 18)
+ if (nW > 18)
nW = 18;
if (nH > 18)
nH = 18;
@@ -214,12 +214,12 @@ void ScDPFieldButton::drawPopupButton()
mpOutDev->DrawRect(Rectangle(aPos, aSize));
if (!mbPopupPressed)
- {
+ {
// border lines
mpOutDev->SetLineColor(mpStyle->GetLightColor());
mpOutDev->DrawLine(Point(aPos.X()+1, aPos.Y()+1), Point(aPos.X()+1, aPos.Y()+aSize.Height()-2));
mpOutDev->DrawLine(Point(aPos.X()+1, aPos.Y()+1), Point(aPos.X()+aSize.Width()-2, aPos.Y()+1));
-
+
mpOutDev->SetLineColor(mpStyle->GetShadowColor());
mpOutDev->DrawLine(Point(aPos.X()+1, aPos.Y()+aSize.Height()-2),
Point(aPos.X()+aSize.Width()-2, aPos.Y()+aSize.Height()-2));
@@ -446,14 +446,14 @@ void ScMenuFloatingWindow::Paint(const Rectangle& /*rRect*/)
Reference<XAccessible> ScMenuFloatingWindow::CreateAccessible()
{
if (!mxAccessible.is())
- {
- Reference<XAccessible> xAccParent = mpParentMenu ?
+ {
+ Reference<XAccessible> xAccParent = mpParentMenu ?
mpParentMenu->GetAccessible() : GetAccessibleParentWindow()->GetAccessible();
mxAccessible.set(new ScAccessibleFilterMenu(xAccParent, this, maName, 999, getDoc()));
ScAccessibleFilterMenu* p = static_cast<ScAccessibleFilterMenu*>(
mxAccessible.get());
-
+
vector<MenuItemData>::const_iterator itr, itrBeg = maMenuItems.begin(), itrEnd = maMenuItems.end();
for (itr = itrBeg; itr != itrEnd; ++itr)
{
@@ -516,7 +516,7 @@ void ScMenuFloatingWindow::drawAllMenuItems()
{
size_t n = maMenuItems.size();
for (size_t i = 0; i < n; ++i)
- highlightMenuItem(i, i == mnSelectedMenu);
+ highlightMenuItem(i, i == mnSelectedMenu);
}
const Font& ScMenuFloatingWindow::getLabelFont() const
@@ -546,10 +546,10 @@ void ScMenuFloatingWindow::setSelectedMenuItem(size_t nPos, bool bSubMenuTimer,
if (bEnsureSubMenu)
{
// Dismiss any child popup menu windows.
- if (mnSelectedMenu < maMenuItems.size() &&
- maMenuItems[mnSelectedMenu].mpSubMenuWin &&
+ if (mnSelectedMenu < maMenuItems.size() &&
+ maMenuItems[mnSelectedMenu].mpSubMenuWin &&
maMenuItems[mnSelectedMenu].mpSubMenuWin->IsVisible())
- {
+ {
maMenuItems[mnSelectedMenu].mpSubMenuWin->ensureSubMenuNotVisible();
}
@@ -671,7 +671,7 @@ void ScMenuFloatingWindow::endSubMenu(ScMenuFloatingWindow* pSubMenu)
size_t nMenuPos = getSubMenuPos(pSubMenu);
if (nMenuPos != MENU_NOT_SELECTED)
- {
+ {
highlightMenuItem(nMenuPos, true);
mnSelectedMenu = nMenuPos;
fireMenuHighlightedEvent();
@@ -721,7 +721,7 @@ void ScMenuFloatingWindow::selectMenuItem(size_t nPos, bool bSelected, bool bSub
}
if (!maMenuItems[nPos].mbEnabled)
- {
+ {
queueCloseSubMenu();
return;
}
@@ -794,7 +794,7 @@ void ScMenuFloatingWindow::highlightMenuItem(size_t nPos, bool bSelected)
{
Push(PUSH_CLIPREGION);
IntersectClipRegion(Rectangle(aPos, aSize));
- Rectangle aCtrlRect(Point(0,0), GetOutputSizePixel());
+ Rectangle aCtrlRect(Point(0,0), GetOutputSizePixel());
DrawNativeControl(
CTRL_MENU_POPUP, PART_ENTIRE_CONTROL, aCtrlRect, CTRL_STATE_ENABLED,
ImplControlValue(), OUString());
@@ -938,10 +938,10 @@ void ScMenuFloatingWindow::ensureSubMenuVisible(ScMenuFloatingWindow* pSubMenu)
void ScMenuFloatingWindow::ensureSubMenuNotVisible()
{
- if (mnSelectedMenu <= maMenuItems.size() &&
- maMenuItems[mnSelectedMenu].mpSubMenuWin &&
+ if (mnSelectedMenu <= maMenuItems.size() &&
+ maMenuItems[mnSelectedMenu].mpSubMenuWin &&
maMenuItems[mnSelectedMenu].mpSubMenuWin->IsVisible())
- {
+ {
maMenuItems[mnSelectedMenu].mpSubMenuWin->ensureSubMenuNotVisible();
}
@@ -985,8 +985,8 @@ ScDPFieldPopupWindow::ScDPFieldPopupWindow(Window* pParent, ScDocument* pDoc) :
ScMenuFloatingWindow(pParent, pDoc),
maChecks(this, 0),
maChkToggleAll(this, 0),
- maBtnSelectSingle (this, 0),
- maBtnUnselectSingle(this, 0),
+ maBtnSelectSingle (this, 0),
+ maBtnUnselectSingle(this, 0),
maBtnOk(this),
maBtnCancel(this),
mnCurTabStop(0),
@@ -1040,14 +1040,14 @@ ScDPFieldPopupWindow::ScDPFieldPopupWindow(Window* pParent, ScDocument* pDoc) :
getSectionPosSize(aPos, aSize, BTN_SINGLE_SELECT);
maBtnSelectSingle.SetPosSizePixel(aPos, aSize);
maBtnSelectSingle.SetQuickHelpText(ScRscStrLoader(RID_POPUP_FILTER, STR_BTN_SELECT_CURRENT).GetString());
- maBtnSelectSingle.SetModeImage(Image(ScResId(RID_IMG_SELECT_CURRENT)), BMP_COLOR_NORMAL);
+ maBtnSelectSingle.SetModeImage(Image(ScResId(RID_IMG_SELECT_CURRENT)));
maBtnSelectSingle.SetClickHdl( LINK(this, ScDPFieldPopupWindow, ButtonHdl) );
maBtnSelectSingle.Show();
getSectionPosSize(aPos, aSize, BTN_SINGLE_UNSELECT);
maBtnUnselectSingle.SetPosSizePixel(aPos, aSize);
maBtnUnselectSingle.SetQuickHelpText(ScRscStrLoader(RID_POPUP_FILTER, STR_BTN_UNSELECT_CURRENT).GetString());
- maBtnUnselectSingle.SetModeImage(Image(ScResId(RID_IMG_UNSELECT_CURRENT)), BMP_COLOR_NORMAL);
+ maBtnUnselectSingle.SetModeImage(Image(ScResId(RID_IMG_UNSELECT_CURRENT)));
maBtnUnselectSingle.SetClickHdl( LINK(this, ScDPFieldPopupWindow, ButtonHdl) );
maBtnUnselectSingle.Show();
}
@@ -1073,7 +1073,7 @@ void ScDPFieldPopupWindow::getSectionPosSize(Point& rPos, Size& rSize, SectionTy
// parameters calculated from constants.
const sal_uInt16 nListBoxWidth = static_cast< sal_uInt16 >( maWndSize.Width() - nListBoxMargin*2 );
- const sal_uInt16 nListBoxHeight = static_cast< sal_uInt16 >( maWndSize.Height() - nTopMargin - nMenuHeight -
+ const sal_uInt16 nListBoxHeight = static_cast< sal_uInt16 >( maWndSize.Height() - nTopMargin - nMenuHeight -
nMenuListMargin - nSingleItemBtnAreaHeight - nBottomBtnAreaHeight );
const sal_uInt16 nSingleBtnAreaY = nTopMargin + nMenuHeight + nListBoxHeight + nMenuListMargin - 1;
@@ -1200,12 +1200,12 @@ IMPL_LINK( ScDPFieldPopupWindow, ButtonHdl, Button*, pBtn )
if (pBtn == &maBtnOk)
close(true);
else if (pBtn == &maBtnSelectSingle)
- {
+ {
selectCurrentMemberOnly(true);
CheckHdl(&maChecks);
}
else if (pBtn == &maBtnUnselectSingle)
- {
+ {
selectCurrentMemberOnly(false);
CheckHdl(&maChecks);
}
@@ -1314,7 +1314,7 @@ Window* ScDPFieldPopupWindow::GetPreferredKeyInputWindow()
Reference<XAccessible> ScDPFieldPopupWindow::CreateAccessible()
{
if (!mxAccessible.is())
- {
+ {
mxAccessible.set(new ScAccessibleFilterTopWindow(
GetAccessibleParentWindow()->GetAccessible(), this, getName(), getDoc()));
ScAccessibleFilterTopWindow* pAccTop = static_cast<ScAccessibleFilterTopWindow*>(mxAccessible.get());
@@ -1362,19 +1362,19 @@ void ScDPFieldPopupWindow::initMembers()
++nVisMemCount;
}
if (nVisMemCount == n)
- {
+ {
// all members visible
maChkToggleAll.SetState(STATE_CHECK);
mePrevToggleAllState = STATE_CHECK;
}
else if (nVisMemCount == 0)
- {
+ {
// no members visible
maChkToggleAll.SetState(STATE_NOCHECK);
mePrevToggleAllState = STATE_NOCHECK;
}
else
- {
+ {
maChkToggleAll.SetState(STATE_DONTKNOW);
mePrevToggleAllState = STATE_DONTKNOW;
}
diff --git a/sc/source/ui/miscdlgs/optsolver.cxx b/sc/source/ui/miscdlgs/optsolver.cxx
index 9dd2e84..a6e10c8 100644
--- a/sc/source/ui/miscdlgs/optsolver.cxx
+++ b/sc/source/ui/miscdlgs/optsolver.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -291,12 +291,10 @@ void ScOptSolverDlg::Init(const ScAddress& rCursorPos)
aSlotURL += rtl::OUString::valueOf( sal_Int32( SID_DEL_ROWS ) );
uno::Reference<frame::XFrame> xFrame = GetBindings().GetActiveFrame();
Image aDelNm = ::GetImage( xFrame, aSlotURL, FALSE, FALSE );
- Image aDelHC = ::GetImage( xFrame, aSlotURL, FALSE, TRUE ); // high contrast
for ( sal_uInt16 nRow = 0; nRow < EDIT_ROW_COUNT; ++nRow )
{
- mpDelButton[nRow]->SetModeImage( aDelNm, BMP_COLOR_NORMAL );
- mpDelButton[nRow]->SetModeImage( aDelHC, BMP_COLOR_HIGHCONTRAST );
+ mpDelButton[nRow]->SetModeImage( aDelNm );
}
maBtnOpt.SetClickHdl( LINK( this, ScOptSolverDlg, BtnHdl ) );
@@ -499,7 +497,7 @@ void ScOptSolverDlg::SetReference( const ScRange& rRef, ScDocument* pDocP )
{
USHORT nFmt = ( aAdr.Tab() == mnCurTab ) ? SCA_ABS : SCA_ABS_3D;
if ( bSingle )
- aAdr.Format( aStr, nFmt, pDocP, pDocP->GetAddressConvention() );
+ aAdr.Format( aStr, nFmt, pDocP, pDocP->GetAddressConvention() );
else
rRef.Format( aStr, nFmt | SCR_ABS, pDocP, pDocP->GetAddressConvention() );
}
diff --git a/sc/source/ui/pagedlg/hfedtdlg.hrc b/sc/source/ui/pagedlg/hfedtdlg.hrc
index a8a32da..11ea33d 100644
--- a/sc/source/ui/pagedlg/hfedtdlg.hrc
+++ b/sc/source/ui/pagedlg/hfedtdlg.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -52,13 +52,6 @@
#define FL_INFO 14
-#define IMG_TEXT_H 21
-#define IMG_PAGE_H 22
-#define IMG_PAGES_H 23
-#define IMG_DATE_H 24
-#define IMG_TIME_H 25
-#define IMG_FILE_H 26
-#define IMG_TABLE_H 27
#define FT_HF_DEFINED 28
#define LB_DEFINED 29
#define FT_HF_CUSTOM 30
diff --git a/sc/source/ui/pagedlg/hfedtdlg.src b/sc/source/ui/pagedlg/hfedtdlg.src
index 749303c..dc7baa3 100644
--- a/sc/source/ui/pagedlg/hfedtdlg.src
+++ b/sc/source/ui/pagedlg/hfedtdlg.src
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -517,11 +517,7 @@ TabPage RID_HFBASE
MaskColor = STD_MASKCOLOR ;
};
};
- Image IMG_TEXT_H
- {
- ImageBitmap = Bitmap { File = "text_h.bmp" ; };
- MaskColor = SC_HC_MASKCOLOR;
- };
+
ImageButton BTN_FILE
{
HelpId = HID_SC_HF_FILE ;
@@ -535,11 +531,6 @@ TabPage RID_HFBASE
MaskColor = STD_MASKCOLOR ;
};
};
- Image IMG_FILE_H
- {
- ImageBitmap = Bitmap { File = "file_h.bmp" ; };
- MaskColor = SC_HC_MASKCOLOR;
- };
Menu RID_POPUP_FCOMMAND
{
@@ -581,11 +572,7 @@ TabPage RID_HFBASE
MaskColor = STD_MASKCOLOR;
};
};
- Image IMG_TABLE_H
- {
- ImageBitmap = Bitmap { File = "table_h.bmp" ; };
- MaskColor = SC_HC_MASKCOLOR;
- };
+
ImageButton BTN_PAGE
{
HelpId = HID_SC_HF_PAGE ;
@@ -599,11 +586,7 @@ TabPage RID_HFBASE
MaskColor = STD_MASKCOLOR ;
};
};
- Image IMG_PAGE_H
- {
- ImageBitmap = Bitmap { File = "page_h.bmp" ; };
- MaskColor = SC_HC_MASKCOLOR;
- };
+
ImageButton BTN_PAGES
{
HelpId = HID_SC_HF_PAGES ;
@@ -617,11 +600,7 @@ TabPage RID_HFBASE
MaskColor = STD_MASKCOLOR ;
};
};
- Image IMG_PAGES_H
- {
- ImageBitmap = Bitmap { File = "pages_h.bmp" ; };
- MaskColor = SC_HC_MASKCOLOR;
- };
+
ImageButton BTN_DATE
{
HelpId = HID_SC_HF_DATE ;
@@ -635,11 +614,7 @@ TabPage RID_HFBASE
MaskColor = STD_MASKCOLOR ;
};
};
- Image IMG_DATE_H
- {
- ImageBitmap = Bitmap { File = "date_h.bmp" ; };
- MaskColor = SC_HC_MASKCOLOR;
- };
+
ImageButton BTN_TIME
{
HelpId = HID_SC_HF_TIME ;
@@ -653,11 +628,7 @@ TabPage RID_HFBASE
MaskColor = STD_MASKCOLOR ;
};
};
- Image IMG_TIME_H
- {
- ImageBitmap = Bitmap { File = "time_h.bmp" ; };
- MaskColor = SC_HC_MASKCOLOR;
- };
+
FixedText FT_INFO
{
Pos = MAP_APPFONT ( 12 , 155 ) ;
diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxx
index 05ee896..98b42af 100644
--- a/sc/source/ui/pagedlg/scuitphfedit.cxx
+++ b/sc/source/ui/pagedlg/scuitphfedit.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -140,14 +140,6 @@ ScHFEditPage::ScHFEditPage( Window* pParent,
aBtnFile .SetClickHdl( LINK( this, ScHFEditPage, ClickHdl ) );
aBtnTable .SetClickHdl( LINK( this, ScHFEditPage, ClickHdl ) );
- aBtnText .SetModeImage( Image( ScResId( IMG_TEXT_H ) ), BMP_COLOR_HIGHCONTRAST );
- aBtnFile .SetModeImage( Image( ScResId( IMG_FILE_H ) ), BMP_COLOR_HIGHCONTRAST );
- aBtnTable .SetModeImage( Image( ScResId( IMG_TABLE_H ) ), BMP_COLOR_HIGHCONTRAST );
- aBtnPage .SetModeImage( Image( ScResId( IMG_PAGE_H ) ), BMP_COLOR_HIGHCONTRAST );
- aBtnLastPage.SetModeImage( Image( ScResId( IMG_PAGES_H ) ), BMP_COLOR_HIGHCONTRAST );
- aBtnDate .SetModeImage( Image( ScResId( IMG_DATE_H ) ), BMP_COLOR_HIGHCONTRAST );
- aBtnTime .SetModeImage( Image( ScResId( IMG_TIME_H ) ), BMP_COLOR_HIGHCONTRAST );
-
if(!bHeader)
{
maFtDefinedHF.SetText(ScGlobal::GetRscString( STR_FOOTER ));
More information about the Libreoffice-commits
mailing list