diff options
Diffstat (limited to 'sw/source/ui/envelp/labfmt.cxx')
| -rw-r--r-- | sw/source/ui/envelp/labfmt.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx index 7cfe36022b79..93e71b16c4d1 100644 --- a/sw/source/ui/envelp/labfmt.cxx +++ b/sw/source/ui/envelp/labfmt.cxx @@ -36,7 +36,6 @@ using namespace utl; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; -using ::rtl::OUString; #define ROUND(x) ((sal_uInt16) ((x) + .5)) @@ -83,7 +82,7 @@ SwLabPreview::SwLabPreview( const SwLabFmtPage* pParent, const ResId& rResID ) : lPWidthWidth = GetTextWidth(aPWidthStr); lPHeightWidth = GetTextWidth(aPHeightStr); lXHeight = GetTextHeight(); - lXWidth = GetTextWidth(rtl::OUString('X')); + lXWidth = GetTextWidth(OUString('X')); // Scale factor float fx = (float)(lOutWPix - (2 * (lLeftWidth + 15))) / (float)lOutWPix; @@ -577,7 +576,7 @@ IMPL_LINK_NOARG(SwLabFmtPage, SaveHdl) { bModified = false; const std::vector<OUString>& rMan = GetParentSwLabDlg()->GetLabelsConfig().GetManufacturers(); - std::vector<rtl::OUString>& rMakes(GetParentSwLabDlg()->Makes()); + std::vector<OUString>& rMakes(GetParentSwLabDlg()->Makes()); if(rMakes.size() < rMan.size()) { rMakes = rMan; @@ -637,8 +636,8 @@ IMPL_LINK_NOARG(SwSaveLabelDlg, OkHdl) } String sTmp(aQueryMB.GetMessText()); String sQuery(sTmp); - sQuery.SearchAndReplace(rtl::OUString("%1"), sMake); - sQuery.SearchAndReplace(rtl::OUString("%2"), sType); + sQuery.SearchAndReplace(OUString("%1"), sMake); + sQuery.SearchAndReplace(OUString("%2"), sType); aQueryMB.SetMessText(sQuery); short eRet = aQueryMB.Execute(); |