lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx | 3 +-- vcl/source/window/layout.cxx | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-)
New commits: commit 6ad708912c433c2d6035340258a002a12db5b895 Author: Julien Nabet <serval2...@yahoo.fr> Date: Thu Jan 17 22:00:10 2013 +0100 Reduce scope Change-Id: I58a1f5d36939dd95648ea42b31331e757c65ee57 diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx index 749c615..cc9bfb7 100644 --- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx +++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx @@ -327,8 +327,7 @@ Reference< XHyphenatedWord > SAL_CALL Hyphenator::hyphenate( const ::rtl::OUStri if (eEnc == RTL_TEXTENCODING_DONTKNOW) return NULL; - sal_uInt16 ct = CAPTYPE_UNKNOWN; - ct = capitalType(aWord, pCC); + sal_uInt16 ct = capitalType(aWord, pCC); // first convert any smart quotes or apostrophes to normal ones OUStringBuffer rBuf(aWord); commit 4a3398ce12bcfd2475dbbc682b881844a58a2ccf Author: Julien Nabet <serval2...@yahoo.fr> Date: Thu Jan 17 21:59:25 2013 +0100 Fix duplicate if Change-Id: If08b51e8e0e5c21599d62b4f2fc0baa847e3d750 diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx index a6d9d40..ddf0a5b 100644 --- a/vcl/source/window/layout.cxx +++ b/vcl/source/window/layout.cxx @@ -387,9 +387,7 @@ bool VclButtonBox::set_property(const rtl::OString &rKey, const rtl::OString &rV if (rKey == "layout-style") { VclButtonBoxStyle eStyle = VCL_BUTTONBOX_DEFAULT_STYLE; - if (rValue == "start") - eStyle = VCL_BUTTONBOX_START; - else if (rValue == "spread") + if (rValue == "spread") eStyle = VCL_BUTTONBOX_SPREAD; else if (rValue == "edge") eStyle = VCL_BUTTONBOX_EDGE; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits