diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2009-12-01 17:50:41 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2009-12-01 17:50:41 +0000 |
| commit | 4f0d2859107bc02e3b62fbc2acc42c1af706c7da (patch) | |
| tree | 83527d821c0c8fe815eb027268e666509bab10ab /sw/source/ui/fldui | |
| parent | 4a3821a109cb04769de35dee54c10633410015d0 (diff) | |
| parent | f71bb16fc284f022a844b575a8db75be7a4aafb1 (diff) | |
chartshapes: merge with DEV300 m62
Diffstat (limited to 'sw/source/ui/fldui')
| -rw-r--r-- | sw/source/ui/fldui/fldmgr.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/fldui/fldtdlg.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/ui/fldui/fldmgr.cxx b/sw/source/ui/fldui/fldmgr.cxx index f35efbe41253..dfb7823a1216 100644 --- a/sw/source/ui/fldui/fldmgr.cxx +++ b/sw/source/ui/fldui/fldmgr.cxx @@ -1615,7 +1615,7 @@ USHORT SwFldMgr::GetCurrLanguage() const SwWrtShell* pSh = pWrtShell ? pWrtShell : ::lcl_GetShell(); if( pSh ) return pSh->GetCurLang(); - return SvxLocaleToLanguage( GetAppLocaleData().getLocale() ); + return SvxLocaleToLanguage( SvtSysLocale().GetLocaleData().getLocale() ); } void SwFieldType::_GetFldName() diff --git a/sw/source/ui/fldui/fldtdlg.cxx b/sw/source/ui/fldui/fldtdlg.cxx index 23b85f9e8339..0de17286fcad 100644 --- a/sw/source/ui/fldui/fldtdlg.cxx +++ b/sw/source/ui/fldui/fldtdlg.cxx @@ -136,7 +136,7 @@ SwFldDlg::SwFldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, Window *pParent) ::comphelper::getProcessServiceFactory(), rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "/org.openoffice.Office.DataAccess/ApplicationIntegration/InstalledFeatures/Writer" ) ), + "/org.openoffice.Office.DataAccess/Policies/Features/Writer" ) ), -1, utl::OConfigurationTreeRoot::CM_READONLY); |