sd/source/ui/unoidl/unopage.cxx | 16 +++++++++++++ unotools/source/config/useroptions.cxx | 38 +++++++++++++++++++++++++++------ 2 files changed, 48 insertions(+), 6 deletions(-)
New commits: commit 2b8f66388450fcf7fb2f8087ee7c66c142fe72c0 Author: Armin Le Grand <a...@apache.org> Date: Wed Jul 9 11:57:21 2014 +0000 Resolves: #i119287# corrected default style for draw objects... created using UNO API (cherry picked from commit d07778f62ed386672a60ef7570a89b5fa109e026) Conflicts: sd/source/ui/unoidl/unopage.cxx (cherry picked from commit 0aa3dee5e88a1494a7a6a8401e084cbdb4324727) Signed-off-by: Andras Timar <andras.ti...@collabora.com> Conflicts: sd/source/ui/unoidl/unopage.cxx Change-Id: I016d801edefb5ab32b7b6a8e13a1dc3e8fdb866e diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx index 9ad3473..fa61e5f 100644 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/sd/source/ui/unoidl/unopage.cxx @@ -69,6 +69,7 @@ #include "unopback.hxx" #include "unohelp.hxx" #include <vcl/dibtools.hxx> +#include <svx/svdograf.hxx> using ::com::sun::star::animations::XAnimationNode; using ::com::sun::star::animations::XAnimationNodeSupplier; @@ -410,7 +411,22 @@ SdrObject * SdGenericDrawPage::_CreateSdrObject( const Reference< drawing::XShap { SdDrawDocument* pDoc = (SdDrawDocument*)GetPage()->GetModel(); if( pDoc ) + { + // #i119287# similar to the code in the SdrObject methods the graphic and ole + // SdrObjects need another default style than the rest, see task. Adding here, too. + // TTTT: Same as for #i119287#: Can be removed in branch aw080 again + const bool bIsSdrGrafObj(0 != dynamic_cast< SdrGrafObj* >(pObj)); + const bool bIsSdrOle2Obj(0 != dynamic_cast< SdrOle2Obj* >(pObj)); + + if(bIsSdrGrafObj || bIsSdrOle2Obj) + { + pObj->NbcSetStyleSheet(pDoc->GetDefaultStyleSheetForSdrGrafObjAndSdrOle2Obj(), sal_True); + } + else + { pObj->NbcSetStyleSheet( pDoc->GetDefaultStyleSheet(), sal_True ); + } + } } return pObj; } commit 848ee355904db1453f343c8257a86635c1dddcac Author: Andras Timar <andras.ti...@collabora.com> Date: Wed Jul 9 11:44:32 2014 +0200 localized GetFullName() Change-Id: I4f2bffadef3db1bd07432202525734ab9b0cb0de (cherry picked from commit 33c36fb9fbc69bbc32088532dd21db7153aee09d) diff --git a/unotools/source/config/useroptions.cxx b/unotools/source/config/useroptions.cxx index 01ae9e6..1dadaf3 100644 --- a/unotools/source/config/useroptions.cxx +++ b/unotools/source/config/useroptions.cxx @@ -19,7 +19,7 @@ #include <unotools/useroptions.hxx> - +#include <unotools/syslocale.hxx> #include <unotools/configmgr.hxx> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Sequence.hxx> @@ -39,6 +39,7 @@ #include <com/sun/star/util/ChangesEvent.hpp> #include <comphelper/configurationhelper.hxx> #include <comphelper/processfactory.hxx> +#include <i18nlangtag/mslangid.hxx> using namespace utl; using namespace com::sun::star; @@ -210,11 +211,36 @@ void SvtUserOptions::Impl::SetToken (sal_uInt16 nToken, OUString const& sToken) OUString SvtUserOptions::Impl::GetFullName () const { - // TODO international name - OUString sFullName = GetToken(USER_OPT_FIRSTNAME).trim(); - if (!sFullName.isEmpty()) - sFullName += " "; - sFullName += GetToken(USER_OPT_LASTNAME).trim(); + OUString sFullName; + switch (LanguageType const eLang = SvtSysLocale().GetUILanguageTag().getLanguageType()) + { + case LANGUAGE_RUSSIAN: + sFullName = GetToken(USER_OPT_FIRSTNAME).trim(); + if (!sFullName.isEmpty()) + sFullName += " "; + sFullName += GetToken(USER_OPT_FATHERSNAME).trim(); + if (!sFullName.isEmpty()) + sFullName += " "; + sFullName += GetToken(USER_OPT_LASTNAME).trim(); + break; + default: + if (MsLangId::isFamilyNameFirst(eLang)) + { + sFullName = GetToken(USER_OPT_LASTNAME).trim(); + if (!sFullName.isEmpty()) + sFullName += " "; + sFullName += GetToken(USER_OPT_FIRSTNAME).trim(); + } + else + { + sFullName = GetToken(USER_OPT_FIRSTNAME).trim(); + if (!sFullName.isEmpty()) + sFullName += " "; + sFullName += GetToken(USER_OPT_LASTNAME).trim(); + } + break; + } + return sFullName; } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits