diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2013-02-13 16:40:34 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2013-02-14 09:35:03 +0000 |
| commit | d1f7124c4bec104d0ee12927cba3f67f56b11829 (patch) | |
| tree | a942b5bc4f8aa0aa4573924d77fc589caaf77114 /sw/source/ui/envelp/label1.cxx | |
| parent | 8cefe14f428ab5521f10962ff68b02151d1207ad (diff) | |
Get Labels.xcu out of configuration data.
Modify the file format, install separately into share/labels,
and parse it using xmlreader when needed.
Saves time on startup and reduces pointless configurarion size.
Diffstat (limited to 'sw/source/ui/envelp/label1.cxx')
| -rw-r--r-- | sw/source/ui/envelp/label1.cxx | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx index 97e0159d83a8..dcc0f7516477 100644 --- a/sw/source/ui/envelp/label1.cxx +++ b/sw/source/ui/envelp/label1.cxx @@ -153,13 +153,12 @@ SwLabDlg::SwLabDlg(Window* pParent, const SfxItemSet& rSet, pRecs->insert( pRecs->begin(), pRec ); sal_uInt16 nLstGroup = 0; - const ::com::sun::star::uno::Sequence<rtl::OUString>& rMan = aLabelsCfg.GetManufacturers(); - const rtl::OUString* pMan = rMan.getConstArray(); - for(sal_Int32 nMan = 0; nMan < rMan.getLength(); nMan++) + const std::vector<rtl::OUString>& rMan = aLabelsCfg.GetManufacturers(); + for(sal_uInt16 nMan = 0; nMan < rMan.size(); nMan++) { - aMakes.push_back(pMan[nMan]); - if ( pMan[nMan] == aItem.aLstMake ) - nLstGroup = (sal_uInt16) nMan; + aMakes.push_back(rMan[nMan]); + if ( rMan[nMan] == aItem.aLstMake ) + nLstGroup = nMan; } if ( !aMakes.empty() ) |