diff options
| -rw-r--r-- | officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 7 | ||||
| -rw-r--r-- | svx/source/dialog/autocdlg.cxx | 7 | ||||
| -rw-r--r-- | svx/source/dialog/autocdlg.src | 2 | ||||
| -rw-r--r-- | svx/source/dialog/hldocntp.cxx | 5 |
4 files changed, 18 insertions, 3 deletions
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu index bb82fedfe7fd..4f7fd863cfb0 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu @@ -5380,6 +5380,11 @@ <value xml:lang="en-US">More Dictionaries Online...</value> </prop> </node> - </node> + <node oor:name=".uno:ActivateStyleApply" oor:op="replace"> + <prop oor:name="Label" oor:type="xs:string"> + <value xml:lang="en-US">Set Focus in Combo Box</value> + </prop> + </node> </node> + </node> </oor:component-data> diff --git a/svx/source/dialog/autocdlg.cxx b/svx/source/dialog/autocdlg.cxx index d42e75bc44c1..577049c18bd6 100644 --- a/svx/source/dialog/autocdlg.cxx +++ b/svx/source/dialog/autocdlg.cxx @@ -57,6 +57,7 @@ #include <sfx2/request.hxx> #include <sfx2/sfxsids.hrc> #include <svtools/eitem.hxx> +#include <svtools/languageoptions.hxx> #include <svx/SmartTagMgr.hxx> #include <com/sun/star/smarttags/XSmartTagRecognizer.hpp> #include <com/sun/star/smarttags/XSmartTagAction.hpp> @@ -143,7 +144,11 @@ OfaAutoCorrDlg::OfaAutoCorrDlg(Window* pParent, const SfxItemSet* _pSet ) : // initialize languages //! LANGUAGE_NONE is displayed as '[All]' and the LanguageType //! will be set to LANGUAGE_DONTKNOW - aLanguageLB.SetLanguageList( LANG_LIST_WESTERN, TRUE, TRUE ); + sal_Int16 nLangList = LANG_LIST_WESTERN; + + if( SvtLanguageOptions().IsCTLFontEnabled() ) + nLangList |= LANG_LIST_CTL; + aLanguageLB.SetLanguageList( nLangList, TRUE, TRUE ); aLanguageLB.SelectLanguage( LANGUAGE_NONE ); USHORT nPos = aLanguageLB.GetSelectEntryPos(); DBG_ASSERT( LISTBOX_ENTRY_NOTFOUND != nPos, "listbox entry missing" ); diff --git a/svx/source/dialog/autocdlg.src b/svx/source/dialog/autocdlg.src index 040e79424624..9ec079a5daae 100644 --- a/svx/source/dialog/autocdlg.src +++ b/svx/source/dialog/autocdlg.src @@ -98,7 +98,7 @@ TabDialog RID_OFA_AUTOCORR_DLG ListBox LB_LANG { Pos = MAP_APPFONT ( 150 , 3 ) ; - Size = MAP_APPFONT ( 60 , 50 ) ; + Size = MAP_APPFONT ( 60 , 100 ) ; DropDown = TRUE; TabStop = TRUE ; Border = TRUE ; diff --git a/svx/source/dialog/hldocntp.cxx b/svx/source/dialog/hldocntp.cxx index c54342fbe9dc..8ecaf7429edd 100644 --- a/svx/source/dialog/hldocntp.cxx +++ b/svx/source/dialog/hldocntp.cxx @@ -236,6 +236,11 @@ void SvxHyperlinkNewDocTp::FillDocumentList () else if ( rDynamicMenuEntry[e].Name == DYNAMICMENU_PROPERTYNAME_TARGETNAME ) rDynamicMenuEntry[e].Value >>= aTargetName; } + //#i96822# business cards, labels and database should not be inserted here + if( aDocumentUrl.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( "private:factory/swriter?slot=21051" ) ) || + aDocumentUrl.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( "private:factory/swriter?slot=21052" )) || + aDocumentUrl.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( "private:factory/sdatabase?Interactive" ))) + continue; // Insert into listbox if ( aDocumentUrl.getLength() ) |