bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx | 3 +- svx/source/sidebar/line/LineWidthControl.cxx | 24 +++++++++---------- svx/source/sidebar/line/LineWidthControl.hxx | 4 +-- 3 files changed, 16 insertions(+), 15 deletions(-)
New commits: commit 1ad216c0b831fc10ff4e73392dbcc9832463a7bc Author: Pedro Giffuni <[email protected]> Date: Mon Jun 16 03:07:14 2014 +0000 Sidebar: fix some typos in function naming. Mostly found by: Noel Grandin Reviewed by: Andre Fischer diff --git a/svx/source/sidebar/line/LineWidthControl.cxx b/svx/source/sidebar/line/LineWidthControl.cxx index 77e582b..b2a6e22 100644 --- a/svx/source/sidebar/line/LineWidthControl.cxx +++ b/svx/source/sidebar/line/LineWidthControl.cxx @@ -52,8 +52,8 @@ LineWidthControl::LineWidthControl ( mstrPT(SVX_RES(STR_PT)), mnCustomWidth(0), mbCustom(false), - mbColseByEdit(false), - mnTmpCusomWidth(0), + mbCloseByEdit(false), + mnTmpCustomWidth(0), mbVSFocus(true), maIMGCus(SVX_RES(IMG_WIDTH_CUSTOM)), maIMGCusGray(SVX_RES(IMG_WIDTH_CUSTOM_GRAY)) @@ -208,7 +208,7 @@ void LineWidthControl::SetWidthSelect( long lValue, bool bValuable, SfxMapUnit e { mbVSFocus = true; maVSWidth.SetSelItem(0); - mbColseByEdit = false; + mbCloseByEdit = false; meMapUnit = eMapUnit; SvtViewOptions aWinOpt( E_WINDOW, SIDEBAR_LINE_WIDTH_GLOBAL_VALUE ); if ( aWinOpt.Exists() ) @@ -287,8 +287,8 @@ IMPL_LINK(LineWidthControl, VSSelectHdl, void *, pControl) mpBindings->GetDispatcher()->Execute(SID_ATTR_LINE_WIDTH, SFX_CALLMODE_RECORD, &aWidthItem, 0L); mrLinePropertyPanel.SetWidthIcon(iPos); mrLinePropertyPanel.SetWidth(nVal); - mbColseByEdit = false; - mnTmpCusomWidth = 0; + mbCloseByEdit = false; + mnTmpCustomWidth = 0; } else if(iPos == 9) {//last custom @@ -300,8 +300,8 @@ IMPL_LINK(LineWidthControl, VSSelectHdl, void *, pControl) XLineWidthItem aWidthItem( nVal ); mpBindings->GetDispatcher()->Execute(SID_ATTR_LINE_WIDTH, SFX_CALLMODE_RECORD, &aWidthItem, 0L); mrLinePropertyPanel.SetWidth(nVal); - mbColseByEdit = false; - mnTmpCusomWidth = 0; + mbCloseByEdit = false; + mnTmpCustomWidth = 0; } else { @@ -338,13 +338,13 @@ IMPL_LINK(LineWidthControl, MFModifyHdl, void *, pControl) XLineWidthItem aWidthItem(nNewWidth); mpBindings->GetDispatcher()->Execute(SID_ATTR_LINE_WIDTH, SFX_CALLMODE_RECORD, &aWidthItem, 0L); - mbColseByEdit = true; - mnTmpCusomWidth = nTmp; + mbCloseByEdit = true; + mnTmpCustomWidth = nTmp; /*for(sal_uInt16 i = 0; i < 8; i++) { if(nTmp == (sal_Int32)maVSWidth.GetItemData(i)) { - mbColseByEdit = false; + mbCloseByEdit = false; break; } }*/ @@ -358,7 +358,7 @@ IMPL_LINK(LineWidthControl, MFModifyHdl, void *, pControl) bool LineWidthControl::IsCloseByEdit() { - return mbColseByEdit; + return mbCloseByEdit; } @@ -366,7 +366,7 @@ bool LineWidthControl::IsCloseByEdit() long LineWidthControl::GetTmpCustomWidth() { - return mnTmpCusomWidth; + return mnTmpCustomWidth; } diff --git a/svx/source/sidebar/line/LineWidthControl.hxx b/svx/source/sidebar/line/LineWidthControl.hxx index 88b6147..9e43b87 100644 --- a/svx/source/sidebar/line/LineWidthControl.hxx +++ b/svx/source/sidebar/line/LineWidthControl.hxx @@ -58,8 +58,8 @@ private: XubString mstrPT; // long mnCustomWidth; bool mbCustom; - bool mbColseByEdit; - long mnTmpCusomWidth; + bool mbCloseByEdit; + long mnTmpCustomWidth; bool mbVSFocus; Image maIMGCus; commit 200e87e524cadd91fb3854b6c8d2bc6b0b540727 Author: Pedro Giffuni <[email protected]> Date: Mon Jun 16 02:46:39 2014 +0000 Fix mismatch from a mismatched patch. diff --git a/bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx b/bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx index ecaf9f6..307185f 100644 --- a/bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx +++ b/bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx @@ -32,7 +32,8 @@ #include <string.h> #include <dlfcn.h> #include <cxxabi.h> -#include <hash_map>#include <sys/param.h> +#include <hash_map> +#include <sys/param.h> #include <rtl/strbuf.hxx> #include <rtl/ustrbuf.hxx> _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
