svtools/source/dialogs/addresstemplate.cxx | 4 ++-- svtools/source/dialogs/addresstemplate.hrc | 2 +- svtools/source/dialogs/addresstemplate.src | 2 +- vcl/source/gdi/outdev3.cxx | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-)
New commits: commit dce056ec03bcefda7ed5f36b5e51070f8f7f912d Author: Caolán McNamara <[email protected]> Date: Thu Mar 1 14:27:00 2012 +0000 LOCAGICAL->LOGICAL diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx index 27ed3ba..b295a73 100644 --- a/svtools/source/dialogs/addresstemplate.cxx +++ b/svtools/source/dialogs/addresstemplate.cxx @@ -181,7 +181,7 @@ public: // first collect all known programmatic names StringBag aKnownNames; - rtl::OUString sLogicalFieldNames(ResId::toString(SvtResId(STR_LOCAGICAL_FIELD_NAMES))); + rtl::OUString sLogicalFieldNames(ResId::toString(SvtResId(STR_LOGICAL_FIELD_NAMES))); sal_Int32 nIndex = 0; do { @@ -690,7 +690,7 @@ void AssignmentPersistentData::Commit() implScrollFields(0, sal_False, sal_False); // the logical names - rtl::OUString sLogicalFieldNames(ResId::toString(SvtResId(STR_LOCAGICAL_FIELD_NAMES))); + rtl::OUString sLogicalFieldNames(ResId::toString(SvtResId(STR_LOGICAL_FIELD_NAMES))); sal_Int32 nAdjustedTokenCount = comphelper::string::getTokenCount(sLogicalFieldNames, ';') + (m_pImpl->bOddFieldNumber ? 1 : 0); DBG_ASSERT(nAdjustedTokenCount == (sal_Int32)m_pImpl->aFieldLabels.size(), "AddressBookSourceDialog::AddressBookSourceDialog: inconsistence between logical and UI field names!"); diff --git a/svtools/source/dialogs/addresstemplate.hrc b/svtools/source/dialogs/addresstemplate.hrc index 5fb89cd..7c6f5d0 100644 --- a/svtools/source/dialogs/addresstemplate.hrc +++ b/svtools/source/dialogs/addresstemplate.hrc @@ -81,7 +81,7 @@ #define STR_FIELD_CALENDAR 31 #define STR_FIELD_INVITE 32 -#define STR_LOCAGICAL_FIELD_NAMES 33 +#define STR_LOGICAL_FIELD_NAMES 33 #endif // _SVT_ADDRESSTEMPLATE_HRC_ diff --git a/svtools/source/dialogs/addresstemplate.src b/svtools/source/dialogs/addresstemplate.src index 0e48459..a679174 100644 --- a/svtools/source/dialogs/addresstemplate.src +++ b/svtools/source/dialogs/addresstemplate.src @@ -181,7 +181,7 @@ ModalDialog DLG_ADDRESSBOOKSOURCE Size = MAP_APPFONT ( 50 , 14 ) ; }; - String STR_LOCAGICAL_FIELD_NAMES + String STR_LOGICAL_FIELD_NAMES { Text = "FirstName;LastName;Company;Department;Street;Zip;City;State;Country;PhonePriv;PhoneComp;PhoneOffice;PhoneCell;PhoneOther;Pager;Fax;EMail;URL;Title;Position;Code;AddrForm;AddrFormMail;Id;CalendarURL;InviteParticipant;Note;Altfield1;Altfield2;Altfield3;Altfield4"; // no need to translate this commit 6c3699b4a6be5c2d37fa62ee152d26ae5cba3422 Author: Caolán McNamara <[email protected]> Date: Thu Mar 1 12:38:34 2012 +0000 I really only want to know if IsSymbolFont was toggled diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx index d9367c0..ac507af 100755 --- a/vcl/source/gdi/outdev3.cxx +++ b/vcl/source/gdi/outdev3.cxx @@ -2394,7 +2394,7 @@ ImplFontEntry* ImplFontCache::GetFontEntry( ImplDevFontList* pFontList, aFontSelData.mpFontData = pFontData; bool bNewIsSymbol = aFontSelData.mpFontData && aFontSelData.mpFontData->IsSymbolFont(); - if (bNewIsSymbol || bOrigWasSymbol) + if (bNewIsSymbol != bOrigWasSymbol) { // it is possible, though generally unlikely, that at this point we // will attempt to use a symbol font as a last-ditch fallback for a
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
