summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorPedro Giffuni <pfg@apache.org>2014-06-16 03:07:14 +0000
committerCaolán McNamara <caolanm@redhat.com>2014-06-16 09:32:10 +0100
commita41e5ef986377d9bacf8cd317b60cf9b9e2cdd2a (patch)
tree461bcc2715103acf94201eb5831a2f704d851c05 /svx
parent7242fe6e3360843f9ef5ce07b447de729323a3c8 (diff)
Sidebar: fix some typos in function naming.
Mostly found by: Noel Grandin Reviewed by: Andre Fischer (cherry picked from commit 1ad216c0b831fc10ff4e73392dbcc9832463a7bc) Conflicts: svx/source/sidebar/line/LineWidthControl.cxx svx/source/sidebar/line/LineWidthControl.hxx Change-Id: I662a262d2cd920b54338c16bf688181b95e2f863
Diffstat (limited to 'svx')
-rw-r--r--svx/source/sidebar/line/LineWidthControl.cxx27
-rw-r--r--svx/source/sidebar/line/LineWidthControl.hxx4
2 files changed, 6 insertions, 25 deletions
diff --git a/svx/source/sidebar/line/LineWidthControl.cxx b/svx/source/sidebar/line/LineWidthControl.cxx
index a16e59e2a77f..3483d3a794f7 100644
--- a/svx/source/sidebar/line/LineWidthControl.cxx
+++ b/svx/source/sidebar/line/LineWidthControl.cxx
@@ -51,7 +51,7 @@ LineWidthControl::LineWidthControl (
mnCustomWidth(0),
mbCustom(false),
mbCloseByEdit(false),
- mnTmpCusomWidth(0),
+ mnTmpCustomWidth(0),
mbVSFocus(true),
maIMGCus(SVX_RES(IMG_WIDTH_CUSTOM)),
maIMGCusGray(SVX_RES(IMG_WIDTH_CUSTOM_GRAY))
@@ -278,7 +278,7 @@ IMPL_LINK(LineWidthControl, VSSelectHdl, void *, pControl)
mrLinePropertyPanel.SetWidthIcon(iPos);
mrLinePropertyPanel.SetWidth(nVal);
mbCloseByEdit = false;
- mnTmpCusomWidth = 0;
+ mnTmpCustomWidth = 0;
}
else if(iPos == 9)
{//last custom
@@ -291,7 +291,7 @@ IMPL_LINK(LineWidthControl, VSSelectHdl, void *, pControl)
mpBindings->GetDispatcher()->Execute(SID_ATTR_LINE_WIDTH, SFX_CALLMODE_RECORD, &aWidthItem, 0L);
mrLinePropertyPanel.SetWidth(nVal);
mbCloseByEdit = false;
- mnTmpCusomWidth = 0;
+ mnTmpCustomWidth = 0;
}
else
{
@@ -329,30 +329,11 @@ IMPL_LINK(LineWidthControl, MFModifyHdl, void *, pControl)
mpBindings->GetDispatcher()->Execute(SID_ATTR_LINE_WIDTH, SFX_CALLMODE_RECORD, &aWidthItem, 0L);
mbCloseByEdit = true;
- mnTmpCusomWidth = nTmp;
- /*for(sal_uInt16 i = 0; i < 8; i++)
- {
- if(nTmp == (sal_Int32)maVSWidth.GetItemData(i))
- {
- mbCloseByEdit = false;
- break;
- }
- }*/
-
+ mnTmpCustomWidth = nTmp;
}
return( 0L );
}
-
-
-
-
-
-
-
-
-
-
} } // end of namespace svx::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sidebar/line/LineWidthControl.hxx b/svx/source/sidebar/line/LineWidthControl.hxx
index 6053edb54c6b..7e06a6b58beb 100644
--- a/svx/source/sidebar/line/LineWidthControl.hxx
+++ b/svx/source/sidebar/line/LineWidthControl.hxx
@@ -44,7 +44,7 @@ public:
void SetWidthSelect( long lValue, bool bValuable, SfxMapUnit eMapUnit);
bool IsCloseByEdit() { return mbCloseByEdit;}
- long GetTmpCustomWidth() { return mnTmpCusomWidth;}
+ long GetTmpCustomWidth() { return mnTmpCustomWidth;}
private:
LinePropertyPanel& mrLinePropertyPanel;
@@ -59,7 +59,7 @@ private:
long mnCustomWidth;
bool mbCustom;
bool mbCloseByEdit;
- long mnTmpCusomWidth;
+ long mnTmpCustomWidth;
bool mbVSFocus;
Image maIMGCus;