summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@suse.cz>2013-04-07 12:06:47 +0200
committerLuboš Luňák <l.lunak@suse.cz>2013-04-07 14:23:11 +0200
commit1946794ae09ba732022fe6a74ea45e304ab70b84 (patch)
treee32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /vcl
parent5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (diff)
mass removal of rtl:: prefixes for O(U)String*
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk have kept them, in order not to break external API (the automatic using declaration is LO-internal). Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
Diffstat (limited to 'vcl')
-rw-r--r--vcl/android/androidinst.cxx36
-rw-r--r--vcl/aqua/source/app/salinst.cxx24
-rw-r--r--vcl/aqua/source/app/salsys.cxx21
-rw-r--r--vcl/aqua/source/dtrans/DataFlavorMapping.cxx5
-rw-r--r--vcl/aqua/source/dtrans/DataFlavorMapping.hxx4
-rw-r--r--vcl/aqua/source/dtrans/DragSource.cxx1
-rw-r--r--vcl/aqua/source/dtrans/DragSource.hxx6
-rw-r--r--vcl/aqua/source/dtrans/DropTarget.cxx1
-rw-r--r--vcl/aqua/source/dtrans/DropTarget.hxx6
-rw-r--r--vcl/aqua/source/dtrans/OSXTransferable.cxx1
-rw-r--r--vcl/aqua/source/dtrans/aqua_clipboard.cxx1
-rw-r--r--vcl/aqua/source/dtrans/aqua_clipboard.hxx8
-rw-r--r--vcl/aqua/source/gdi/atsui/salatslayout.cxx2
-rw-r--r--vcl/aqua/source/gdi/atsui/salatsuifontutils.cxx2
-rw-r--r--vcl/aqua/source/gdi/atsui/salgdi.cxx22
-rw-r--r--vcl/aqua/source/gdi/salgdicommon.cxx6
-rw-r--r--vcl/aqua/source/gdi/salnativewidgets.cxx4
-rw-r--r--vcl/aqua/source/gdi/salprn.cxx32
-rw-r--r--vcl/aqua/source/window/salframe.cxx102
-rw-r--r--vcl/aqua/source/window/salmenu.cxx12
-rw-r--r--vcl/coretext/salcoretextfontutils.cxx2
-rw-r--r--vcl/coretext/salgdi.cxx4
-rw-r--r--vcl/generic/app/gendisp.cxx1
-rw-r--r--vcl/generic/fontmanager/fontcache.cxx19
-rw-r--r--vcl/generic/fontmanager/fontconfig.cxx31
-rw-r--r--vcl/generic/fontmanager/fontmanager.cxx68
-rw-r--r--vcl/generic/fontmanager/fontsubst.cxx14
-rw-r--r--vcl/generic/fontmanager/helper.cxx9
-rw-r--r--vcl/generic/glyphs/gcach_ftyp.cxx10
-rw-r--r--vcl/generic/glyphs/gcach_ftyp.hxx14
-rw-r--r--vcl/generic/glyphs/glyphcache.cxx4
-rw-r--r--vcl/generic/glyphs/graphite_serverfont.cxx14
-rw-r--r--vcl/generic/print/common_gfx.cxx8
-rw-r--r--vcl/generic/print/genprnpsp.cxx59
-rw-r--r--vcl/generic/print/genpspgraphics.cxx28
-rw-r--r--vcl/generic/print/glyphset.cxx4
-rw-r--r--vcl/generic/print/glyphset.hxx20
-rw-r--r--vcl/generic/print/printerjob.cxx74
-rw-r--r--vcl/generic/print/psputil.cxx6
-rw-r--r--vcl/generic/print/psputil.hxx4
-rw-r--r--vcl/generic/print/text_gfx.cxx20
-rw-r--r--vcl/headless/svpelement.cxx8
-rw-r--r--vcl/headless/svpframe.cxx6
-rw-r--r--vcl/headless/svpgdi.cxx2
-rw-r--r--vcl/headless/svptext.cxx2
-rw-r--r--vcl/inc/aqua/atsui/salgdi.h8
-rw-r--r--vcl/inc/aqua/salframe.h8
-rw-r--r--vcl/inc/aqua/salinst.h8
-rw-r--r--vcl/inc/aqua/salmenu.h4
-rw-r--r--vcl/inc/aqua/salprn.h20
-rw-r--r--vcl/inc/aqua/salsys.h6
-rw-r--r--vcl/inc/coretext/salgdi.h10
-rw-r--r--vcl/inc/cupsmgr.hxx24
-rw-r--r--vcl/inc/fontcache.hxx8
-rw-r--r--vcl/inc/generic/gendata.hxx8
-rw-r--r--vcl/inc/generic/geninst.h2
-rw-r--r--vcl/inc/generic/genprn.h20
-rw-r--r--vcl/inc/generic/genpspgraphics.h12
-rw-r--r--vcl/inc/generic/gensys.h12
-rw-r--r--vcl/inc/generic/glyphcache.hxx4
-rw-r--r--vcl/inc/generic/printergfx.hxx6
-rw-r--r--vcl/inc/generic/printerjob.hxx18
-rw-r--r--vcl/inc/graphite_features.hxx12
-rw-r--r--vcl/inc/headless/svpdummies.hxx8
-rw-r--r--vcl/inc/headless/svpframe.hxx6
-rw-r--r--vcl/inc/headless/svpgdi.hxx4
-rw-r--r--vcl/inc/headless/svpinst.hxx4
-rw-r--r--vcl/inc/ilstbox.hxx4
-rw-r--r--vcl/inc/image.h12
-rw-r--r--vcl/inc/impimagetree.hxx24
-rw-r--r--vcl/inc/jobset.h6
-rw-r--r--vcl/inc/outdev.h4
-rw-r--r--vcl/inc/outfont.hxx10
-rw-r--r--vcl/inc/print.h6
-rw-r--r--vcl/inc/printdlg.hxx26
-rw-r--r--vcl/inc/quartz/utils.h8
-rw-r--r--vcl/inc/salframe.hxx3
-rw-r--r--vcl/inc/salgdi.hxx16
-rw-r--r--vcl/inc/salinst.hxx2
-rw-r--r--vcl/inc/salmenu.hxx10
-rw-r--r--vcl/inc/salprn.hxx24
-rw-r--r--vcl/inc/svdata.hxx2
-rw-r--r--vcl/inc/toolbox.h2
-rw-r--r--vcl/inc/unx/gtk/gtkframe.hxx10
-rw-r--r--vcl/inc/unx/gtk/gtkgdi.hxx8
-rw-r--r--vcl/inc/unx/gtk/gtkinst.hxx2
-rw-r--r--vcl/inc/unx/gtk/gtkprn.hxx8
-rw-r--r--vcl/inc/unx/gtk/gtksalmenu.hxx8
-rw-r--r--vcl/inc/unx/gtk/gtksys.hxx8
-rw-r--r--vcl/inc/unx/saldisp.hxx8
-rw-r--r--vcl/inc/unx/salframe.h10
-rw-r--r--vcl/inc/unx/salgdi.h4
-rw-r--r--vcl/inc/unx/salinst.h4
-rw-r--r--vcl/inc/unx/salmenu.h4
-rw-r--r--vcl/inc/unx/sm.hxx13
-rw-r--r--vcl/inc/unx/x11/x11sys.hxx8
-rw-r--r--vcl/inc/vcl/button.hxx6
-rw-r--r--vcl/inc/vcl/combobox.hxx2
-rw-r--r--vcl/inc/vcl/configsettings.hxx10
-rw-r--r--vcl/inc/vcl/dialog.hxx10
-rw-r--r--vcl/inc/vcl/edit.hxx8
-rw-r--r--vcl/inc/vcl/field.hxx4
-rw-r--r--vcl/inc/vcl/fixed.hxx4
-rw-r--r--vcl/inc/vcl/font.hxx2
-rw-r--r--vcl/inc/vcl/fontmanager.hxx74
-rw-r--r--vcl/inc/vcl/gdimtf.hxx4
-rw-r--r--vcl/inc/vcl/gfxlink.hxx2
-rw-r--r--vcl/inc/vcl/graphicfilter.hxx4
-rw-r--r--vcl/inc/vcl/helper.hxx14
-rw-r--r--vcl/inc/vcl/i18nhelp.hxx4
-rw-r--r--vcl/inc/vcl/image.hxx26
-rw-r--r--vcl/inc/vcl/imagerepository.hxx2
-rw-r--r--vcl/inc/vcl/jobdata.hxx2
-rw-r--r--vcl/inc/vcl/jobset.hxx6
-rw-r--r--vcl/inc/vcl/longcurr.hxx2
-rw-r--r--vcl/inc/vcl/lstbox.hxx2
-rw-r--r--vcl/inc/vcl/menu.hxx4
-rw-r--r--vcl/inc/vcl/metaact.hxx30
-rw-r--r--vcl/inc/vcl/outdev.hxx4
-rw-r--r--vcl/inc/vcl/pdfextoutdevdata.hxx8
-rw-r--r--vcl/inc/vcl/pdfwriter.hxx46
-rw-r--r--vcl/inc/vcl/ppdparser.hxx24
-rw-r--r--vcl/inc/vcl/print.hxx168
-rw-r--r--vcl/inc/vcl/printerinfomanager.hxx58
-rw-r--r--vcl/inc/vcl/settings.hxx12
-rw-r--r--vcl/inc/vcl/spinfld.hxx2
-rw-r--r--vcl/inc/vcl/status.hxx8
-rw-r--r--vcl/inc/vcl/strhelper.hxx10
-rw-r--r--vcl/inc/vcl/svapp.hxx10
-rw-r--r--vcl/inc/vcl/svgdata.hxx8
-rw-r--r--vcl/inc/vcl/syswin.hxx8
-rw-r--r--vcl/inc/vcl/tabctrl.hxx4
-rw-r--r--vcl/inc/vcl/tabdlg.hxx2
-rw-r--r--vcl/inc/vcl/textview.hxx4
-rw-r--r--vcl/inc/vcl/throbber.hxx2
-rw-r--r--vcl/inc/vcl/toolbox.hxx10
-rw-r--r--vcl/inc/vcl/unohelp.hxx2
-rw-r--r--vcl/inc/vcl/vclmedit.hxx2
-rw-r--r--vcl/inc/vcl/window.hxx16
-rw-r--r--vcl/inc/win/saldata.hxx2
-rw-r--r--vcl/inc/win/salframe.h10
-rw-r--r--vcl/inc/win/salgdi.h8
-rw-r--r--vcl/inc/win/salinst.h4
-rw-r--r--vcl/inc/win/salmenu.h4
-rw-r--r--vcl/inc/win/salprn.h14
-rw-r--r--vcl/inc/win/salsys.h16
-rw-r--r--vcl/inc/window.h4
-rw-r--r--vcl/ios/iosinst.cxx14
-rw-r--r--vcl/null/printerinfomanager.cxx6
-rw-r--r--vcl/qa/cppunit/graphicfilter/filters-test.cxx36
-rw-r--r--vcl/quartz/utils.cxx22
-rw-r--r--vcl/source/app/dbggui.cxx58
-rw-r--r--vcl/source/app/i18nhelp.cxx8
-rw-r--r--vcl/source/app/salvtables.cxx6
-rw-r--r--vcl/source/app/session.cxx3
-rw-r--r--vcl/source/app/settings.cxx68
-rw-r--r--vcl/source/app/svapp.cxx24
-rw-r--r--vcl/source/app/svdata.cxx31
-rw-r--r--vcl/source/app/svmain.cxx13
-rw-r--r--vcl/source/app/unohelp.cxx4
-rw-r--r--vcl/source/app/unohelp2.cxx2
-rw-r--r--vcl/source/components/dtranscomp.cxx29
-rw-r--r--vcl/source/components/factory.cxx2
-rw-r--r--vcl/source/components/fontident.cxx1
-rw-r--r--vcl/source/control/button.cxx26
-rw-r--r--vcl/source/control/combobox.cxx12
-rw-r--r--vcl/source/control/edit.cxx26
-rw-r--r--vcl/source/control/field.cxx26
-rw-r--r--vcl/source/control/field2.cxx12
-rw-r--r--vcl/source/control/fixed.cxx6
-rw-r--r--vcl/source/control/ilstbox.cxx8
-rw-r--r--vcl/source/control/longcurr.cxx2
-rw-r--r--vcl/source/control/lstbox.cxx16
-rw-r--r--vcl/source/control/quickselectionengine.cxx2
-rw-r--r--vcl/source/control/scrbar.cxx25
-rw-r--r--vcl/source/control/slider.cxx6
-rw-r--r--vcl/source/control/spinfld.cxx20
-rw-r--r--vcl/source/control/tabctrl.cxx16
-rw-r--r--vcl/source/control/throbber.cxx10
-rw-r--r--vcl/source/edit/texteng.cxx20
-rw-r--r--vcl/source/edit/textund2.hxx12
-rw-r--r--vcl/source/edit/textundo.cxx24
-rw-r--r--vcl/source/edit/textundo.hxx2
-rw-r--r--vcl/source/edit/textview.cxx16
-rw-r--r--vcl/source/edit/vclmedit.cxx14
-rw-r--r--vcl/source/edit/xtextedt.cxx2
-rw-r--r--vcl/source/filter/FilterConfigCache.cxx10
-rw-r--r--vcl/source/filter/FilterConfigItem.cxx7
-rw-r--r--vcl/source/filter/graphicfilter.cxx68
-rw-r--r--vcl/source/filter/graphicfilter2.cxx2
-rw-r--r--vcl/source/filter/igif/gifread.cxx6
-rw-r--r--vcl/source/filter/ixbm/xbmread.cxx14
-rw-r--r--vcl/source/filter/ixbm/xbmread.hxx4
-rw-r--r--vcl/source/filter/sgvmain.cxx2
-rw-r--r--vcl/source/filter/sgvmain.hxx2
-rw-r--r--vcl/source/filter/sgvtext.cxx34
-rw-r--r--vcl/source/filter/wmf/emfwr.cxx4
-rw-r--r--vcl/source/filter/wmf/enhwmf.cxx8
-rw-r--r--vcl/source/filter/wmf/winmtf.cxx6
-rw-r--r--vcl/source/filter/wmf/winwmf.cxx2
-rw-r--r--vcl/source/filter/wmf/wmfwr.cxx22
-rw-r--r--vcl/source/filter/wmf/wmfwr.hxx4
-rw-r--r--vcl/source/gdi/animate.cxx2
-rw-r--r--vcl/source/gdi/base14.cxx2
-rw-r--r--vcl/source/gdi/bitmapex.cxx6
-rw-r--r--vcl/source/gdi/bmpconv.cxx1
-rw-r--r--vcl/source/gdi/configsettings.cxx5
-rw-r--r--vcl/source/gdi/cvtsvm.cxx20
-rw-r--r--vcl/source/gdi/font.cxx10
-rw-r--r--vcl/source/gdi/gdimtf.cxx18
-rw-r--r--vcl/source/gdi/image.cxx40
-rw-r--r--vcl/source/gdi/imagerepository.cxx6
-rw-r--r--vcl/source/gdi/impgraph.cxx12
-rw-r--r--vcl/source/gdi/impimage.cxx4
-rw-r--r--vcl/source/gdi/impimagetree.cxx60
-rw-r--r--vcl/source/gdi/jobset.cxx16
-rw-r--r--vcl/source/gdi/metaact.cxx10
-rw-r--r--vcl/source/gdi/outdev3.cxx36
-rw-r--r--vcl/source/gdi/outdev6.cxx2
-rw-r--r--vcl/source/gdi/outdevnative.cxx4
-rw-r--r--vcl/source/gdi/pdfextoutdevdata.cxx10
-rw-r--r--vcl/source/gdi/pdfwriter.cxx14
-rw-r--r--vcl/source/gdi/pdfwriter_impl.cxx127
-rw-r--r--vcl/source/gdi/pdfwriter_impl.hxx130
-rw-r--r--vcl/source/gdi/pdfwriter_impl2.cxx12
-rw-r--r--vcl/source/gdi/print.cxx46
-rw-r--r--vcl/source/gdi/print3.cxx278
-rw-r--r--vcl/source/gdi/salgdilayout.cxx2
-rw-r--r--vcl/source/gdi/salnativewidgets-none.cxx1
-rw-r--r--vcl/source/gdi/svgdata.cxx6
-rw-r--r--vcl/source/gdi/textlayout.cxx4
-rw-r--r--vcl/source/glyphs/graphite_features.cxx14
-rw-r--r--vcl/source/helper/canvasbitmap.cxx4
-rw-r--r--vcl/source/helper/strhelper.cxx14
-rw-r--r--vcl/source/helper/xconnection.cxx1
-rw-r--r--vcl/source/uipreviewer/previewer.cxx10
-rw-r--r--vcl/source/window/abstdlg.cxx2
-rw-r--r--vcl/source/window/brdwin.cxx6
-rw-r--r--vcl/source/window/decoview.cxx6
-rw-r--r--vcl/source/window/dialog.cxx28
-rw-r--r--vcl/source/window/dlgctrl.cxx4
-rw-r--r--vcl/source/window/dockingarea.cxx4
-rw-r--r--vcl/source/window/layout.cxx16
-rw-r--r--vcl/source/window/menu.cxx28
-rw-r--r--vcl/source/window/mnemonic.cxx2
-rw-r--r--vcl/source/window/msgbox.cxx6
-rw-r--r--vcl/source/window/printdlg.cxx176
-rw-r--r--vcl/source/window/status.cxx24
-rw-r--r--vcl/source/window/syschild.cxx4
-rw-r--r--vcl/source/window/syswin.cxx20
-rw-r--r--vcl/source/window/tabdlg.cxx2
-rw-r--r--vcl/source/window/tabpage.cxx4
-rw-r--r--vcl/source/window/toolbox.cxx16
-rw-r--r--vcl/source/window/toolbox2.cxx13
-rw-r--r--vcl/source/window/window.cxx69
-rw-r--r--vcl/test/canvasbitmaptest.cxx6
-rw-r--r--vcl/test/dndtest.cxx2
-rw-r--r--vcl/unx/generic/app/i18n_cb.cxx6
-rw-r--r--vcl/unx/generic/app/i18n_ic.cxx2
-rw-r--r--vcl/unx/generic/app/i18n_im.cxx2
-rw-r--r--vcl/unx/generic/app/i18n_status.cxx2
-rw-r--r--vcl/unx/generic/app/keysymnames.cxx8
-rw-r--r--vcl/unx/generic/app/saldata.cxx14
-rw-r--r--vcl/unx/generic/app/saldisp.cxx19
-rw-r--r--vcl/unx/generic/app/sm.cxx24
-rw-r--r--vcl/unx/generic/app/wmadaptor.cxx26
-rw-r--r--vcl/unx/generic/desktopdetect/desktopdetector.cxx6
-rw-r--r--vcl/unx/generic/dtrans/X11_clipboard.cxx1
-rw-r--r--vcl/unx/generic/dtrans/X11_clipboard.hxx12
-rw-r--r--vcl/unx/generic/dtrans/X11_droptarget.cxx1
-rw-r--r--vcl/unx/generic/dtrans/X11_selection.cxx5
-rw-r--r--vcl/unx/generic/dtrans/X11_selection.hxx40
-rw-r--r--vcl/unx/generic/dtrans/X11_service.cxx3
-rw-r--r--vcl/unx/generic/dtrans/X11_transferable.cxx1
-rw-r--r--vcl/unx/generic/dtrans/config.cxx3
-rw-r--r--vcl/unx/generic/gdi/salgdi3.cxx11
-rw-r--r--vcl/unx/generic/plugadapt/salplug.cxx12
-rw-r--r--vcl/unx/generic/printer/cupsmgr.cxx14
-rw-r--r--vcl/unx/generic/printer/jobdata.cxx14
-rw-r--r--vcl/unx/generic/printer/ppdparser.cxx247
-rw-r--r--vcl/unx/generic/printer/printerinfomanager.cxx144
-rw-r--r--vcl/unx/generic/window/salframe.cxx26
-rw-r--r--vcl/unx/gtk/a11y/atkaction.cxx18
-rw-r--r--vcl/unx/gtk/a11y/atkeditabletext.cxx4
-rw-r--r--vcl/unx/gtk/a11y/atkhypertext.cxx2
-rw-r--r--vcl/unx/gtk/a11y/atkimage.cxx6
-rw-r--r--vcl/unx/gtk/a11y/atklistener.cxx8
-rw-r--r--vcl/unx/gtk/a11y/atktable.cxx6
-rw-r--r--vcl/unx/gtk/a11y/atktext.cxx12
-rw-r--r--vcl/unx/gtk/a11y/atktextattributes.cxx16
-rw-r--r--vcl/unx/gtk/a11y/atkwindow.cxx4
-rw-r--r--vcl/unx/gtk/a11y/atkwrapper.cxx10
-rw-r--r--vcl/unx/gtk/a11y/atkwrapper.hxx8
-rw-r--r--vcl/unx/gtk/app/gtkdata.cxx3
-rw-r--r--vcl/unx/gtk/app/gtkinst.cxx12
-rw-r--r--vcl/unx/gtk/app/gtksys.cxx20
-rw-r--r--vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx106
-rw-r--r--vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx38
-rw-r--r--vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx12
-rw-r--r--vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx10
-rw-r--r--vcl/unx/gtk/fpicker/SalGtkPicker.cxx22
-rw-r--r--vcl/unx/gtk/fpicker/SalGtkPicker.hxx12
-rw-r--r--vcl/unx/gtk/fpicker/resourceprovider.cxx4
-rw-r--r--vcl/unx/gtk/gdi/gtkprintwrapper.cxx4
-rw-r--r--vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx1
-rw-r--r--vcl/unx/gtk/gdi/salprn-gtk.cxx148
-rw-r--r--vcl/unx/gtk/window/gtkframe.cxx24
-rw-r--r--vcl/unx/gtk/window/gtksalmenu.cxx18
-rw-r--r--vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx6
-rw-r--r--vcl/unx/kde/UnxCommandThread.cxx42
-rw-r--r--vcl/unx/kde/UnxCommandThread.hxx16
-rw-r--r--vcl/unx/kde/UnxFilePicker.cxx168
-rw-r--r--vcl/unx/kde/UnxFilePicker.hxx40
-rw-r--r--vcl/unx/kde/UnxNotifyThread.hxx2
-rw-r--r--vcl/unx/kde/kdedata.cxx10
-rw-r--r--vcl/unx/kde4/KDE4FilePicker.cxx62
-rw-r--r--vcl/unx/kde4/KDE4FilePicker.hxx30
-rw-r--r--vcl/unx/kde4/KDESalGraphics.hxx4
-rw-r--r--vcl/unx/kde4/KDEXLib.cxx8
-rw-r--r--vcl/unx/kde4/main.cxx2
-rw-r--r--vcl/unx/x11/x11sys.cxx16
-rw-r--r--vcl/win/source/app/salinfo.cxx28
-rw-r--r--vcl/win/source/app/salinst.cxx10
-rw-r--r--vcl/win/source/gdi/salgdi.cxx1
-rw-r--r--vcl/win/source/gdi/salgdi3.cxx56
-rw-r--r--vcl/win/source/gdi/salnativewidgets-luna.cxx1
-rw-r--r--vcl/win/source/gdi/salprn.cxx27
-rw-r--r--vcl/win/source/gdi/winlayout.cxx9
-rw-r--r--vcl/win/source/window/keynames.cxx6
-rw-r--r--vcl/win/source/window/salframe.cxx23
-rw-r--r--vcl/win/source/window/salmenu.cxx4
-rw-r--r--vcl/workben/outdevgrind.cxx4
-rw-r--r--vcl/workben/svdem.cxx2
-rw-r--r--vcl/workben/svpclient.cxx30
-rw-r--r--vcl/workben/svptest.cxx6
-rw-r--r--vcl/workben/vcldemo.cxx4
336 files changed, 2870 insertions, 2993 deletions
diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx
index e67dc8f9d0f5..cd0390b146c1 100644
--- a/vcl/android/androidinst.cxx
+++ b/vcl/android/androidinst.cxx
@@ -230,9 +230,9 @@ class AndroidSalSystem : public SvpSalSystem {
public:
AndroidSalSystem() : SvpSalSystem() {}
virtual ~AndroidSalSystem() {}
- virtual int ShowNativeDialog( const rtl::OUString& rTitle,
- const rtl::OUString& rMessage,
- const std::list< rtl::OUString >& rButtons,
+ virtual int ShowNativeDialog( const OUString& rTitle,
+ const OUString& rMessage,
+ const std::list< OUString >& rButtons,
int nDefButton );
};
@@ -277,7 +277,7 @@ public:
// Clobber the UI fonts
#if 0
psp::FastPrintFontInfo aInfo;
- aInfo.m_aFamilyName = rtl::OUString( "Roboto" );
+ aInfo.m_aFamilyName = OUString( "Roboto" );
aInfo.m_eItalic = ITALIC_NORMAL;
aInfo.m_eWeight = WEIGHT_NORMAL;
aInfo.m_eWidth = WIDTH_NORMAL;
@@ -285,7 +285,7 @@ public:
#endif
// FIXME: is 14 point enough ?
- Font aFont( rtl::OUString( "Roboto" ), Size( 0, 14 ) );
+ Font aFont( OUString( "Roboto" ), Size( 0, 14 ) );
StyleSettings aStyleSet = rSettings.GetStyleSettings();
aStyleSet.SetAppFont( aFont );
@@ -320,15 +320,15 @@ void InitSalData() {}
void DeInitSalData() {}
void InitSalMain() {}
-void SalAbort( const rtl::OUString& rErrorText, bool bDumpCore )
+void SalAbort( const OUString& rErrorText, bool bDumpCore )
{
- rtl::OUString aError( rErrorText );
+ OUString aError( rErrorText );
if( aError.isEmpty() )
- aError = rtl::OUString::createFromAscii("Unknown application error");
- LOGI("%s", rtl::OUStringToOString(rErrorText, osl_getThreadTextEncoding()).getStr() );
+ aError = OUString::createFromAscii("Unknown application error");
+ LOGI("%s", OUStringToOString(rErrorText, osl_getThreadTextEncoding()).getStr() );
LOGI("SalAbort: '%s'",
- rtl::OUStringToOString(aError, RTL_TEXTENCODING_ASCII_US).getStr());
+ OUStringToOString(aError, RTL_TEXTENCODING_ASCII_US).getStr());
if( bDumpCore )
abort();
else
@@ -337,7 +337,7 @@ void SalAbort( const rtl::OUString& rErrorText, bool bDumpCore )
const OUString& SalGetDesktopEnvironment()
{
- static rtl::OUString aEnv( "android" );
+ static OUString aEnv( "android" );
return aEnv;
}
@@ -370,18 +370,18 @@ void DestroySalInstance( SalInstance *pInst )
#include <vcl/msgbox.hxx>
-int AndroidSalSystem::ShowNativeDialog( const rtl::OUString& rTitle,
- const rtl::OUString& rMessage,
- const std::list< rtl::OUString >& rButtons,
+int AndroidSalSystem::ShowNativeDialog( const OUString& rTitle,
+ const OUString& rMessage,
+ const std::list< OUString >& rButtons,
int nDefButton )
{
(void)rButtons; (void)nDefButton;
LOGI("LibreOffice native dialog '%s': '%s'",
- rtl::OUStringToOString(rTitle, RTL_TEXTENCODING_ASCII_US).getStr(),
- rtl::OUStringToOString(rMessage, RTL_TEXTENCODING_ASCII_US).getStr());
+ OUStringToOString(rTitle, RTL_TEXTENCODING_ASCII_US).getStr(),
+ OUStringToOString(rMessage, RTL_TEXTENCODING_ASCII_US).getStr());
LOGI("Dialog '%s': '%s'",
- rtl::OUStringToOString(rTitle, RTL_TEXTENCODING_ASCII_US).getStr(),
- rtl::OUStringToOString(rMessage, RTL_TEXTENCODING_ASCII_US).getStr());
+ OUStringToOString(rTitle, RTL_TEXTENCODING_ASCII_US).getStr(),
+ OUStringToOString(rMessage, RTL_TEXTENCODING_ASCII_US).getStr());
if (AndroidSalInstance::getInstance() != NULL)
{
diff --git a/vcl/aqua/source/app/salinst.cxx b/vcl/aqua/source/app/salinst.cxx
index 0c104009ea75..5a3ad3304768 100644
--- a/vcl/aqua/source/app/salinst.cxx
+++ b/vcl/aqua/source/app/salinst.cxx
@@ -120,12 +120,12 @@ NSMenu* AquaSalInstance::GetDynamicDockMenu()
return pDockMenu;
}
-bool AquaSalInstance::isOnCommandLine( const rtl::OUString& rArg )
+bool AquaSalInstance::isOnCommandLine( const OUString& rArg )
{
sal_uInt32 nArgs = osl_getCommandArgCount();
for( sal_uInt32 i = 0; i < nArgs; i++ )
{
- rtl::OUString aArg;
+ OUString aArg;
osl_getCommandArg( i, &aArg.pData );
if( aArg.equals( rArg ) )
return true;
@@ -217,10 +217,10 @@ sal_Bool ImplSVMainHook( int * pnInit )
{
[NSApp postEvent: pEvent atStart: NO];
- rtl::OUString aExeURL, aExe;
+ OUString aExeURL, aExe;
osl_getExecutableFile( &aExeURL.pData );
osl_getSystemPathFromFileURL( aExeURL.pData, &aExe.pData );
- rtl::OString aByteExe( rtl::OUStringToOString( aExe, osl_getThreadTextEncoding() ) );
+ OString aByteExe( OUStringToOString( aExe, osl_getThreadTextEncoding() ) );
#ifdef DEBUG
aByteExe += OString ( " NSAccessibilityDebugLogLevel 1" );
@@ -241,13 +241,13 @@ sal_Bool ImplSVMainHook( int * pnInit )
// =======================================================================
-void SalAbort( const rtl::OUString& rErrorText, bool bDumpCore )
+void SalAbort( const OUString& rErrorText, bool bDumpCore )
{
if( rErrorText.isEmpty() )
fprintf( stderr, "Application Error " );
else
fprintf( stderr, "%s ",
- rtl::OUStringToOString( rErrorText, osl_getThreadTextEncoding() ).getStr() );
+ OUStringToOString( rErrorText, osl_getThreadTextEncoding() ).getStr() );
if( bDumpCore )
abort();
else
@@ -264,7 +264,7 @@ void InitSalData()
// -----------------------------------------------------------------------
-const ::rtl::OUString& SalGetDesktopEnvironment()
+const OUString& SalGetDesktopEnvironment()
{
static OUString aDesktopEnvironment( "MacOSX" );
return aDesktopEnvironment;
@@ -923,7 +923,7 @@ void AquaSalInstance::DeletePrinterQueueInfo( SalPrinterQueueInfo* pInfo )
// -----------------------------------------------------------------------
-rtl::OUString AquaSalInstance::GetDefaultPrinter()
+OUString AquaSalInstance::GetDefaultPrinter()
{
// #i113170# may not be the main thread if called from UNO API
SalData::ensureThreadAutoreleasePool();
@@ -1013,7 +1013,7 @@ void* AquaSalInstance::GetConnectionIdentifier( ConnectionIdentifierType& rRetur
// We need to re-encode file urls because osl_getFileURLFromSystemPath converts
// to UTF-8 before encoding non ascii characters, which is not what other apps expect.
-static rtl::OUString translateToExternalUrl(const rtl::OUString& internalUrl)
+static OUString translateToExternalUrl(const OUString& internalUrl)
{
uno::Reference< uno::XComponentContext > context(
comphelper::getProcessComponentContext());
@@ -1023,7 +1023,7 @@ static rtl::OUString translateToExternalUrl(const rtl::OUString& internalUrl)
// #i104525# many versions of OSX have problems with some URLs:
// when an app requests OSX to add one of these URLs to the "Recent Items" list
// then this app gets killed (TextEdit, Preview, etc. and also OOo)
-static bool isDangerousUrl( const rtl::OUString& rUrl )
+static bool isDangerousUrl( const OUString& rUrl )
{
// use a heuristic that detects all known cases since there is no official comment
// on the exact impact and root cause of the OSX bug
@@ -1051,10 +1051,10 @@ static bool isDangerousUrl( const rtl::OUString& rUrl )
return false;
}
-void AquaSalInstance::AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& /*rMimeType*/)
+void AquaSalInstance::AddToRecentDocumentList(const OUString& rFileUrl, const OUString& /*rMimeType*/)
{
// Convert file URL for external use (see above)
- rtl::OUString externalUrl = translateToExternalUrl(rFileUrl);
+ OUString externalUrl = translateToExternalUrl(rFileUrl);
if( externalUrl.isEmpty() )
externalUrl = rFileUrl;
diff --git a/vcl/aqua/source/app/salsys.cxx b/vcl/aqua/source/app/salsys.cxx
index e849f013cbee..9886ecdf35b9 100644
--- a/vcl/aqua/source/app/salsys.cxx
+++ b/vcl/aqua/source/app/salsys.cxx
@@ -29,7 +29,6 @@
#include "svids.hrc"
-using ::rtl::OUString;
// =======================================================================
@@ -81,7 +80,7 @@ Rectangle AquaSalSystem::GetDisplayScreenWorkAreaPosSizePixel( unsigned int nScr
return aRet;
}
-rtl::OUString AquaSalSystem::GetDisplayScreenName( unsigned int nScreen )
+OUString AquaSalSystem::GetDisplayScreenName( unsigned int nScreen )
{
NSArray* pScreens = [NSScreen screens];
OUString aRet;
@@ -100,7 +99,7 @@ rtl::OUString AquaSalSystem::GetDisplayScreenName( unsigned int nScreen )
static NSString* getStandardString( int nButtonId, bool bUseResources )
{
- rtl::OUString aText;
+ OUString aText;
if( bUseResources )
{
aText = Button::GetStandardText( nButtonId );
@@ -109,19 +108,19 @@ static NSString* getStandardString( int nButtonId, bool bUseResources )
{
switch( nButtonId )
{
- case BUTTON_OK: aText = rtl::OUString( "OK" );break;
- case BUTTON_ABORT: aText = rtl::OUString( "Abort" );break;
- case BUTTON_CANCEL: aText = rtl::OUString( "Cancel" );break;
- case BUTTON_RETRY: aText = rtl::OUString( "Retry" );break;
- case BUTTON_YES: aText = rtl::OUString( "Yes" );break;
- case BUTTON_NO : aText = rtl::OUString( "No" );break;
+ case BUTTON_OK: aText = OUString( "OK" );break;
+ case BUTTON_ABORT: aText = OUString( "Abort" );break;
+ case BUTTON_CANCEL: aText = OUString( "Cancel" );break;
+ case BUTTON_RETRY: aText = OUString( "Retry" );break;
+ case BUTTON_YES: aText = OUString( "Yes" );break;
+ case BUTTON_NO : aText = OUString( "No" );break;
}
}
return aText.isEmpty() ? nil : CreateNSString( aText);
}
-int AquaSalSystem::ShowNativeMessageBox( const rtl::OUString& rTitle,
- const rtl::OUString& rMessage,
+int AquaSalSystem::ShowNativeMessageBox( const OUString& rTitle,
+ const OUString& rMessage,
int nButtonCombination,
int nDefaultButton, bool bUseResources)
{
diff --git a/vcl/aqua/source/dtrans/DataFlavorMapping.cxx b/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
index b030ac8e0fb1..7b5787149844 100644
--- a/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
+++ b/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
@@ -44,9 +44,6 @@ using namespace com::sun::star::lang;
using namespace cppu;
using namespace std;
-using ::rtl::OUString;
-using ::rtl::OUStringToOString;
-using ::rtl::OString;
namespace // private
{
@@ -681,7 +678,7 @@ DataProviderPtr_t DataFlavorMapper::getDataProvider(const NSString* systemFlavor
return dp;
}
-bool DataFlavorMapper::isValidMimeContentType(const rtl::OUString& contentType) const
+bool DataFlavorMapper::isValidMimeContentType(const OUString& contentType) const
{
bool result = true;
diff --git a/vcl/aqua/source/dtrans/DataFlavorMapping.hxx b/vcl/aqua/source/dtrans/DataFlavorMapping.hxx
index 7ef36401c3ca..ed78689c426c 100644
--- a/vcl/aqua/source/dtrans/DataFlavorMapping.hxx
+++ b/vcl/aqua/source/dtrans/DataFlavorMapping.hxx
@@ -126,11 +126,11 @@ public:
private:
/* Determines if the provided Mime content type is valid.
*/
- bool isValidMimeContentType(const rtl::OUString& contentType) const;
+ bool isValidMimeContentType(const OUString& contentType) const;
private:
::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XMimeContentTypeFactory> mrXMimeCntFactory;
- typedef boost::unordered_map< rtl::OUString, NSString*, rtl::OUStringHash > OfficeOnlyTypes;
+ typedef boost::unordered_map< OUString, NSString*, OUStringHash > OfficeOnlyTypes;
mutable OfficeOnlyTypes maOfficeOnlyTypes;
};
diff --git a/vcl/aqua/source/dtrans/DragSource.cxx b/vcl/aqua/source/dtrans/DragSource.cxx
index 36b6a9fca71c..f2e6081be9ec 100644
--- a/vcl/aqua/source/dtrans/DragSource.cxx
+++ b/vcl/aqua/source/dtrans/DragSource.cxx
@@ -51,7 +51,6 @@ using namespace com::sun::star::lang;
using namespace comphelper;
using namespace std;
-using ::rtl::OUString;
// For OOo internal D&D we provide the Transferable without NSDragPboard
// interference as a shortcut
diff --git a/vcl/aqua/source/dtrans/DragSource.hxx b/vcl/aqua/source/dtrans/DragSource.hxx
index 5ca8ffc68aeb..2932a83e7cef 100644
--- a/vcl/aqua/source/dtrans/DragSource.hxx
+++ b/vcl/aqua/source/dtrans/DragSource.hxx
@@ -101,9 +101,9 @@ public:
throw(com::sun::star::uno::RuntimeException);
// XServiceInfo
- virtual rtl::OUString SAL_CALL getImplementationName() throw (com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw (com::sun::star::uno::RuntimeException);
- virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getImplementationName() throw (com::sun::star::uno::RuntimeException);
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (com::sun::star::uno::RuntimeException);
+ virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException);
virtual void saveMouseEvent(NSEvent* theEvent);
virtual unsigned int getSupportedDragOperations(bool isLocal) const;
diff --git a/vcl/aqua/source/dtrans/DropTarget.cxx b/vcl/aqua/source/dtrans/DropTarget.cxx
index 1eeebc520186..6c359cc93430 100644
--- a/vcl/aqua/source/dtrans/DropTarget.cxx
+++ b/vcl/aqua/source/dtrans/DropTarget.cxx
@@ -52,7 +52,6 @@ using namespace com::sun::star::uno;
using namespace com::sun::star;
using namespace comphelper;
-using ::rtl::OUString;
OUString dropTarget_getImplementationName()
{
diff --git a/vcl/aqua/source/dtrans/DropTarget.hxx b/vcl/aqua/source/dtrans/DropTarget.hxx
index d2050eca5b4f..988943873e6c 100644
--- a/vcl/aqua/source/dtrans/DropTarget.hxx
+++ b/vcl/aqua/source/dtrans/DropTarget.hxx
@@ -118,9 +118,9 @@ public:
virtual void SAL_CALL dropComplete(sal_Bool success) throw (com::sun::star::uno::RuntimeException);
// XServiceInfo
- virtual rtl::OUString SAL_CALL getImplementationName() throw (com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw (com::sun::star::uno::RuntimeException);
- virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getImplementationName() throw (com::sun::star::uno::RuntimeException);
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (com::sun::star::uno::RuntimeException);
+ virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException);
// NSDraggingDestination protocol functions
virtual NSDragOperation draggingEntered(id sender);
diff --git a/vcl/aqua/source/dtrans/OSXTransferable.cxx b/vcl/aqua/source/dtrans/OSXTransferable.cxx
index 5d541972f82b..c71bfc452b01 100644
--- a/vcl/aqua/source/dtrans/OSXTransferable.cxx
+++ b/vcl/aqua/source/dtrans/OSXTransferable.cxx
@@ -32,7 +32,6 @@ using namespace com::sun::star::io;
using namespace com::sun::star::lang;
using namespace com::sun::star::container;
-using ::rtl::OUString;
namespace // private
{
diff --git a/vcl/aqua/source/dtrans/aqua_clipboard.cxx b/vcl/aqua/source/dtrans/aqua_clipboard.cxx
index 0db1318695de..383c7488aa2f 100644
--- a/vcl/aqua/source/dtrans/aqua_clipboard.cxx
+++ b/vcl/aqua/source/dtrans/aqua_clipboard.cxx
@@ -36,7 +36,6 @@ using namespace osl;
using namespace std;
using namespace comphelper;
-using ::rtl::OUString;
@implementation EventListener;
diff --git a/vcl/aqua/source/dtrans/aqua_clipboard.hxx b/vcl/aqua/source/dtrans/aqua_clipboard.hxx
index a12a3ec20f5e..2e7670588ede 100644
--- a/vcl/aqua/source/dtrans/aqua_clipboard.hxx
+++ b/vcl/aqua/source/dtrans/aqua_clipboard.hxx
@@ -97,7 +97,7 @@ public:
const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner )
throw( ::com::sun::star::uno::RuntimeException );
- virtual ::rtl::OUString SAL_CALL getName()
+ virtual OUString SAL_CALL getName()
throw( ::com::sun::star::uno::RuntimeException );
//------------------------------------------------
@@ -127,13 +127,13 @@ public:
// XServiceInfo
//------------------------------------------------
- virtual ::rtl::OUString SAL_CALL getImplementationName()
+ virtual OUString SAL_CALL getImplementationName()
throw(::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName )
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
throw(::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw(::com::sun::star::uno::RuntimeException);
/* Get a reference to the used pastboard.
diff --git a/vcl/aqua/source/gdi/atsui/salatslayout.cxx b/vcl/aqua/source/gdi/atsui/salatslayout.cxx
index ad62d0115355..06bf683afcb1 100644
--- a/vcl/aqua/source/gdi/atsui/salatslayout.cxx
+++ b/vcl/aqua/source/gdi/atsui/salatslayout.cxx
@@ -236,7 +236,7 @@ bool ATSLayout::LayoutText( ImplLayoutArgs& rArgs )
ByteCount nDummy;
ATSUGetAttribute( mrATSUStyle, kATSUSizeTag, sizeof(fFontSize), &fFontSize, &nDummy);
String aUniName( &rArgs.mpStr[rArgs.mnMinCharPos], mnCharCount );
- rtl::OString aCName(rtl::OUStringToOString(aUniName, RTL_TEXTENCODING_UTF8));
+ OString aCName(OUStringToOString(aUniName, RTL_TEXTENCODING_UTF8));
fprintf( stderr, "ATSLayout( \"%s\" %d..%d of %d) with h=%4.1f\n",
aCName.getStr(),rArgs.mnMinCharPos,rArgs.mnEndCharPos,rArgs.mnLength,Fix2X(fFontSize) );
#endif
diff --git a/vcl/aqua/source/gdi/atsui/salatsuifontutils.cxx b/vcl/aqua/source/gdi/atsui/salatsuifontutils.cxx
index 1dae840c79b1..0c0f58023c94 100644
--- a/vcl/aqua/source/gdi/atsui/salatsuifontutils.cxx
+++ b/vcl/aqua/source/gdi/atsui/salatsuifontutils.cxx
@@ -40,7 +40,7 @@
// and SFNT fonts on Mac usually do not contain an OS/2 table.
static void UpdateAttributesFromPSName( const String& rPSName, ImplDevFontAttributes& rDFA )
{
- rtl::OString aPSName( rtl::OUStringToOString( rPSName, RTL_TEXTENCODING_UTF8 ).toAsciiLowerCase() );
+ OString aPSName( OUStringToOString( rPSName, RTL_TEXTENCODING_UTF8 ).toAsciiLowerCase() );
// TODO: use a multi-string ignore-case matcher once it becomes available
if( (aPSName.indexOf("regular") != -1)
diff --git a/vcl/aqua/source/gdi/atsui/salgdi.cxx b/vcl/aqua/source/gdi/atsui/salgdi.cxx
index 02e86b1da5a1..f4518f9fb461 100644
--- a/vcl/aqua/source/gdi/atsui/salgdi.cxx
+++ b/vcl/aqua/source/gdi/atsui/salgdi.cxx
@@ -470,13 +470,13 @@ static bool AddLocalTempFontDirs( void )
// add private font files
- rtl::OUString aBrandStr( "$BRAND_BASE_DIR" );
+ OUString aBrandStr( "$BRAND_BASE_DIR" );
rtl_bootstrap_expandMacros( &aBrandStr.pData );
- rtl::OUString aBrandSysPath;
+ OUString aBrandSysPath;
OSL_VERIFY( osl_getSystemPathFromFileURL( aBrandStr.pData, &aBrandSysPath.pData ) == osl_File_E_None );
- rtl::OStringBuffer aBrandFontDir( aBrandSysPath.getLength()*2 );
- aBrandFontDir.append( rtl::OUStringToOString( aBrandSysPath, RTL_TEXTENCODING_UTF8 ) );
+ OStringBuffer aBrandFontDir( aBrandSysPath.getLength()*2 );
+ aBrandFontDir.append( OUStringToOString( aBrandSysPath, RTL_TEXTENCODING_UTF8 ) );
aBrandFontDir.append( "/share/fonts/truetype/" );
return AddTempFontDir( aBrandFontDir.getStr() );
}
@@ -513,14 +513,14 @@ void AquaSalGraphics::ClearDevFontCache()
// -----------------------------------------------------------------------
bool AquaSalGraphics::AddTempDevFont( ImplDevFontList*,
- const rtl::OUString& rFontFileURL, const rtl::OUString& /*rFontName*/ )
+ const OUString& rFontFileURL, const OUString& /*rFontName*/ )
{
- ::rtl::OUString aUSytemPath;
+ OUString aUSytemPath;
OSL_VERIFY( !osl::FileBase::getSystemPathFromFileURL( rFontFileURL, aUSytemPath ) );
FSRef aNewRef;
Boolean bIsDirectory = true;
- ::rtl::OString aCFileName = rtl::OUStringToOString( aUSytemPath, RTL_TEXTENCODING_UTF8 );
+ OString aCFileName = OUStringToOString( aUSytemPath, RTL_TEXTENCODING_UTF8 );
OSStatus eStatus = FSPathMakeRef( (UInt8*)aCFileName.getStr(), &aNewRef, &bIsDirectory );
DBG_ASSERT( (eStatus==noErr) && !bIsDirectory, "vcl AddTempDevFont() with invalid fontfile name!" );
if( eStatus != noErr )
@@ -774,11 +774,11 @@ sal_uInt16 AquaSalGraphics::SetFont( FontSelectPattern* pReqFont, int /*nFallbac
#if OSL_DEBUG_LEVEL > 3
fprintf( stderr, "SetFont to (\"%s\", \"%s\", fontid=%d) for (\"%s\" \"%s\" weight=%d, slant=%d size=%dx%d orientation=%d)\n",
- ::rtl::OUStringToOString( pMacFont->GetFamilyName(), RTL_TEXTENCODING_UTF8 ).getStr(),
- ::rtl::OUStringToOString( pMacFont->GetStyleName(), RTL_TEXTENCODING_UTF8 ).getStr(),
+ OUStringToOString( pMacFont->GetFamilyName(), RTL_TEXTENCODING_UTF8 ).getStr(),
+ OUStringToOString( pMacFont->GetStyleName(), RTL_TEXTENCODING_UTF8 ).getStr(),
(int)nFontID,
- ::rtl::OUStringToOString( pReqFont->GetFamilyName(), RTL_TEXTENCODING_UTF8 ).getStr(),
- ::rtl::OUStringToOString( pReqFont->GetStyleName(), RTL_TEXTENCODING_UTF8 ).getStr(),
+ OUStringToOString( pReqFont->GetFamilyName(), RTL_TEXTENCODING_UTF8 ).getStr(),
+ OUStringToOString( pReqFont->GetStyleName(), RTL_TEXTENCODING_UTF8 ).getStr(),
pReqFont->GetWeight(),
pReqFont->GetSlant(),
pReqFont->mnHeight,
diff --git a/vcl/aqua/source/gdi/salgdicommon.cxx b/vcl/aqua/source/gdi/salgdicommon.cxx
index 5b78f3394f64..afedd3b9a339 100644
--- a/vcl/aqua/source/gdi/salgdicommon.cxx
+++ b/vcl/aqua/source/gdi/salgdicommon.cxx
@@ -136,7 +136,7 @@ static void AddPolyPolygonToPath( CGMutablePathRef xPath,
}
}
-sal_Bool AquaSalGraphics::CreateFontSubset( const rtl::OUString& rToFile,
+sal_Bool AquaSalGraphics::CreateFontSubset( const OUString& rToFile,
const PhysicalFontFace* pFontData,
sal_Int32* pGlyphIDs, sal_uInt8* pEncoding,
sal_Int32* pGlyphWidths, int nGlyphCount,
@@ -145,11 +145,11 @@ sal_Bool AquaSalGraphics::CreateFontSubset( const rtl::OUString& rToFile,
// TODO: move more of the functionality here into the generic subsetter code
// prepare the requested file name for writing the font-subset file
- rtl::OUString aSysPath;
+ OUString aSysPath;
if( osl_File_E_None != osl_getSystemPathFromFileURL( rToFile.pData, &aSysPath.pData ) )
return sal_False;
const rtl_TextEncoding aThreadEncoding = osl_getThreadTextEncoding();
- const rtl::OString aToFile( rtl::OUStringToOString( aSysPath, aThreadEncoding ) );
+ const OString aToFile( OUStringToOString( aSysPath, aThreadEncoding ) );
// get the raw-bytes from the font to be subset
ByteVector aBuffer;
diff --git a/vcl/aqua/source/gdi/salnativewidgets.cxx b/vcl/aqua/source/gdi/salnativewidgets.cxx
index a2586ac22cc3..8e2ef02b3bac 100644
--- a/vcl/aqua/source/gdi/salnativewidgets.cxx
+++ b/vcl/aqua/source/gdi/salnativewidgets.cxx
@@ -461,7 +461,7 @@ sal_Bool AquaSalGraphics::drawNativeControl(ControlType nType,
const Rectangle& rControlRegion,
ControlState nState,
const ImplControlValue& aValue,
- const rtl::OUString& )
+ const OUString& )
{
sal_Bool bOK = sal_False;
@@ -1168,7 +1168,7 @@ sal_Bool AquaSalGraphics::drawNativeControl(ControlType nType,
* aCaption: A caption or title string (like button text etc)
*/
sal_Bool AquaSalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState /*nState*/,
- const ImplControlValue& aValue, const rtl::OUString&,
+ const ImplControlValue& aValue, const OUString&,
Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion )
{
diff --git a/vcl/aqua/source/gdi/salprn.cxx b/vcl/aqua/source/gdi/salprn.cxx
index d32c6d943b0d..6b61398a87b5 100644
--- a/vcl/aqua/source/gdi/salprn.cxx
+++ b/vcl/aqua/source/gdi/salprn.cxx
@@ -44,8 +44,6 @@ using namespace vcl;
using namespace com::sun::star;
using namespace com::sun::star::beans;
-using ::rtl::OUString;
-using ::rtl::OStringToOUString;
// =======================================================================
@@ -225,7 +223,7 @@ void AquaSalInfoPrinter::setPaperSize( long i_nWidth, long i_nHeight, Orientatio
if( pPaper )
{
- NSString* pPaperName = [CreateNSString( rtl::OStringToOUString(PaperInfo::toPSName(pPaper->getPaper()), RTL_TEXTENCODING_ASCII_US) ) autorelease];
+ NSString* pPaperName = [CreateNSString( OStringToOUString(PaperInfo::toPSName(pPaper->getPaper()), RTL_TEXTENCODING_ASCII_US) ) autorelease];
[mpPrintInfo setPaperName: pPaperName];
}
else if( i_nWidth > 0 && i_nHeight > 0 )
@@ -286,9 +284,9 @@ sal_uLong AquaSalInfoPrinter::GetPaperBinCount( const ImplJobSetup* )
// -----------------------------------------------------------------------
-rtl::OUString AquaSalInfoPrinter::GetPaperBinName( const ImplJobSetup*, sal_uLong )
+OUString AquaSalInfoPrinter::GetPaperBinName( const ImplJobSetup*, sal_uLong )
{
- return rtl::OUString();
+ return OUString();
}
// -----------------------------------------------------------------------
@@ -376,9 +374,9 @@ static Size getPageSize( vcl::PrinterController& i_rController, sal_Int32 i_nPag
return aPageSize;
}
-sal_Bool AquaSalInfoPrinter::StartJob( const rtl::OUString* i_pFileName,
- const rtl::OUString& i_rJobName,
- const rtl::OUString& /*i_rAppName*/,
+sal_Bool AquaSalInfoPrinter::StartJob( const OUString* i_pFileName,
+ const OUString& i_rJobName,
+ const OUString& /*i_rAppName*/,
ImplJobSetup* i_pSetupData,
vcl::PrinterController& i_rController
)
@@ -401,7 +399,7 @@ sal_Bool AquaSalInfoPrinter::StartJob( const rtl::OUString* i_pFileName,
// do we want a progress panel ?
sal_Bool bShowProgressPanel = sal_True;
- beans::PropertyValue* pMonitor = i_rController.getValue( rtl::OUString( "MonitorVisible" ) );
+ beans::PropertyValue* pMonitor = i_rController.getValue( OUString( "MonitorVisible" ) );
if( pMonitor )
pMonitor->Value >>= bShowProgressPanel;
if( ! i_rController.isShowDialogs() )
@@ -409,7 +407,7 @@ sal_Bool AquaSalInfoPrinter::StartJob( const rtl::OUString* i_pFileName,
// possibly create one job for collated output
sal_Bool bSinglePrintJobs = sal_False;
- beans::PropertyValue* pSingleValue = i_rController.getValue( rtl::OUString( "PrintCollateAsSingleJobs" ) );
+ beans::PropertyValue* pSingleValue = i_rController.getValue( OUString( "PrintCollateAsSingleJobs" ) );
if( pSingleValue )
{
pSingleValue->Value >>= bSinglePrintJobs;
@@ -621,9 +619,9 @@ AquaSalPrinter::~AquaSalPrinter()
// -----------------------------------------------------------------------
-sal_Bool AquaSalPrinter::StartJob( const rtl::OUString* i_pFileName,
- const rtl::OUString& i_rJobName,
- const rtl::OUString& i_rAppName,
+sal_Bool AquaSalPrinter::StartJob( const OUString* i_pFileName,
+ const OUString& i_rJobName,
+ const OUString& i_rAppName,
ImplJobSetup* i_pSetupData,
vcl::PrinterController& i_rController )
{
@@ -632,9 +630,9 @@ sal_Bool AquaSalPrinter::StartJob( const rtl::OUString* i_pFileName,
// -----------------------------------------------------------------------
-sal_Bool AquaSalPrinter::StartJob( const rtl::OUString* /*i_pFileName*/,
- const rtl::OUString& /*i_rJobName*/,
- const rtl::OUString& /*i_rAppName*/,
+sal_Bool AquaSalPrinter::StartJob( const OUString* /*i_pFileName*/,
+ const OUString& /*i_rJobName*/,
+ const OUString& /*i_rAppName*/,
sal_uLong /*i_nCopies*/,
bool /*i_bCollate*/,
bool /*i_bDirect*/,
@@ -696,7 +694,7 @@ void AquaSalInfoPrinter::InitPaperFormats( const ImplJobSetup* )
{
NSString* pPaper = [pPaperNames objectAtIndex: i];
// first try to match the name
- rtl::OString aPaperName( [pPaper UTF8String] );
+ OString aPaperName( [pPaper UTF8String] );
Paper ePaper = PaperInfo::fromPSName( aPaperName );
if( ePaper != PAPER_USER )
{
diff --git a/vcl/aqua/source/window/salframe.cxx b/vcl/aqua/source/window/salframe.cxx
index 1d03c30d95eb..608e9d891305 100644
--- a/vcl/aqua/source/window/salframe.cxx
+++ b/vcl/aqua/source/window/salframe.cxx
@@ -308,7 +308,7 @@ sal_Bool AquaSalFrame::PostEvent( void *pData )
}
// -----------------------------------------------------------------------
-void AquaSalFrame::SetTitle(const rtl::OUString& rTitle)
+void AquaSalFrame::SetTitle(const OUString& rTitle)
{
if ( !mpWindow )
return;
@@ -352,14 +352,14 @@ void AquaSalFrame::SetIcon( sal_uInt16 )
// -----------------------------------------------------------------------
-void AquaSalFrame::SetRepresentedURL( const rtl::OUString& i_rDocURL )
+void AquaSalFrame::SetRepresentedURL( const OUString& i_rDocURL )
{
// #i113170# may not be the main thread if called from UNO API
SalData::ensureThreadAutoreleasePool();
if( i_rDocURL.indexOfAsciiL( "file:", 5 ) == 0 )
{
- rtl::OUString aSysPath;
+ OUString aSysPath;
osl_getSystemPathFromFileURL( i_rDocURL.pData, &aSysPath.pData );
NSString* pStr = CreateNSString( aSysPath );
if( pStr )
@@ -728,7 +728,7 @@ void AquaSalFrame::SetScreenNumber(unsigned int nScreen)
}
}
-void AquaSalFrame::SetApplicationID( const rtl::OUString &/*rApplicationID*/ )
+void AquaSalFrame::SetApplicationID( const OUString &/*rApplicationID*/ )
{
}
@@ -1054,74 +1054,74 @@ void AquaSalFrame::EndExtTextInput( sal_uInt16 )
// -----------------------------------------------------------------------
-rtl::OUString AquaSalFrame::GetKeyName( sal_uInt16 nKeyCode )
+OUString AquaSalFrame::GetKeyName( sal_uInt16 nKeyCode )
{
- static std::map< sal_uInt16, rtl::OUString > aKeyMap;
+ static std::map< sal_uInt16, OUString > aKeyMap;
if( aKeyMap.empty() )
{
sal_uInt16 i;
for( i = KEY_A; i <= KEY_Z; i++ )
- aKeyMap[ i ] = rtl::OUString( sal_Unicode( 'A' + (i - KEY_A) ) );
+ aKeyMap[ i ] = OUString( sal_Unicode( 'A' + (i - KEY_A) ) );
for( i = KEY_0; i <= KEY_9; i++ )
- aKeyMap[ i ] = rtl::OUString( sal_Unicode( '0' + (i - KEY_0) ) );
+ aKeyMap[ i ] = OUString( sal_Unicode( '0' + (i - KEY_0) ) );
for( i = KEY_F1; i <= KEY_F26; i++ )
{
- rtl::OUStringBuffer aKey( 3 );
+ OUStringBuffer aKey( 3 );
aKey.append( sal_Unicode( 'F' ) );
aKey.append( sal_Int32( i - KEY_F1 + 1 ) );
aKeyMap[ i ] = aKey.makeStringAndClear();
}
- aKeyMap[ KEY_DOWN ] = rtl::OUString( sal_Unicode( 0x21e3 ) );
- aKeyMap[ KEY_UP ] = rtl::OUString( sal_Unicode( 0x21e1 ) );
- aKeyMap[ KEY_LEFT ] = rtl::OUString( sal_Unicode( 0x21e0 ) );
- aKeyMap[ KEY_RIGHT ] = rtl::OUString( sal_Unicode( 0x21e2 ) );
- aKeyMap[ KEY_HOME ] = rtl::OUString( sal_Unicode( 0x2196 ) );
- aKeyMap[ KEY_END ] = rtl::OUString( sal_Unicode( 0x2198 ) );
- aKeyMap[ KEY_PAGEUP ] = rtl::OUString( sal_Unicode( 0x21de ) );
- aKeyMap[ KEY_PAGEDOWN ] = rtl::OUString( sal_Unicode( 0x21df ) );
- aKeyMap[ KEY_RETURN ] = rtl::OUString( sal_Unicode( 0x21a9 ) );
- aKeyMap[ KEY_ESCAPE ] = rtl::OUString( "esc" );
- aKeyMap[ KEY_TAB ] = rtl::OUString( sal_Unicode( 0x21e5 ) );
- aKeyMap[ KEY_BACKSPACE ]= rtl::OUString( sal_Unicode( 0x232b ) );
- aKeyMap[ KEY_SPACE ] = rtl::OUString( sal_Unicode( 0x2423 ) );
- aKeyMap[ KEY_DELETE ] = rtl::OUString( sal_Unicode( 0x2326 ) );
- aKeyMap[ KEY_ADD ] = rtl::OUString( sal_Unicode( '+' ) );
- aKeyMap[ KEY_SUBTRACT ] = rtl::OUString( sal_Unicode( '-' ) );
- aKeyMap[ KEY_DIVIDE ] = rtl::OUString( sal_Unicode( '/' ) );
- aKeyMap[ KEY_MULTIPLY ] = rtl::OUString( sal_Unicode( '*' ) );
- aKeyMap[ KEY_POINT ] = rtl::OUString( sal_Unicode( '.' ) );
- aKeyMap[ KEY_COMMA ] = rtl::OUString( sal_Unicode( ',' ) );
- aKeyMap[ KEY_LESS ] = rtl::OUString( sal_Unicode( '<' ) );
- aKeyMap[ KEY_GREATER ] = rtl::OUString( sal_Unicode( '>' ) );
- aKeyMap[ KEY_EQUAL ] = rtl::OUString( sal_Unicode( '=' ) );
- aKeyMap[ KEY_OPEN ] = rtl::OUString( sal_Unicode( 0x23cf ) );
+ aKeyMap[ KEY_DOWN ] = OUString( sal_Unicode( 0x21e3 ) );
+ aKeyMap[ KEY_UP ] = OUString( sal_Unicode( 0x21e1 ) );
+ aKeyMap[ KEY_LEFT ] = OUString( sal_Unicode( 0x21e0 ) );
+ aKeyMap[ KEY_RIGHT ] = OUString( sal_Unicode( 0x21e2 ) );
+ aKeyMap[ KEY_HOME ] = OUString( sal_Unicode( 0x2196 ) );
+ aKeyMap[ KEY_END ] = OUString( sal_Unicode( 0x2198 ) );
+ aKeyMap[ KEY_PAGEUP ] = OUString( sal_Unicode( 0x21de ) );
+ aKeyMap[ KEY_PAGEDOWN ] = OUString( sal_Unicode( 0x21df ) );
+ aKeyMap[ KEY_RETURN ] = OUString( sal_Unicode( 0x21a9 ) );
+ aKeyMap[ KEY_ESCAPE ] = OUString( "esc" );
+ aKeyMap[ KEY_TAB ] = OUString( sal_Unicode( 0x21e5 ) );
+ aKeyMap[ KEY_BACKSPACE ]= OUString( sal_Unicode( 0x232b ) );
+ aKeyMap[ KEY_SPACE ] = OUString( sal_Unicode( 0x2423 ) );
+ aKeyMap[ KEY_DELETE ] = OUString( sal_Unicode( 0x2326 ) );
+ aKeyMap[ KEY_ADD ] = OUString( sal_Unicode( '+' ) );
+ aKeyMap[ KEY_SUBTRACT ] = OUString( sal_Unicode( '-' ) );
+ aKeyMap[ KEY_DIVIDE ] = OUString( sal_Unicode( '/' ) );
+ aKeyMap[ KEY_MULTIPLY ] = OUString( sal_Unicode( '*' ) );
+ aKeyMap[ KEY_POINT ] = OUString( sal_Unicode( '.' ) );
+ aKeyMap[ KEY_COMMA ] = OUString( sal_Unicode( ',' ) );
+ aKeyMap[ KEY_LESS ] = OUString( sal_Unicode( '<' ) );
+ aKeyMap[ KEY_GREATER ] = OUString( sal_Unicode( '>' ) );
+ aKeyMap[ KEY_EQUAL ] = OUString( sal_Unicode( '=' ) );
+ aKeyMap[ KEY_OPEN ] = OUString( sal_Unicode( 0x23cf ) );
/* yet unmapped KEYCODES:
- aKeyMap[ KEY_INSERT ] = rtl::OUString( sal_Unicode( ) );
- aKeyMap[ KEY_CUT ] = rtl::OUString( sal_Unicode( ) );
- aKeyMap[ KEY_COPY ] = rtl::OUString( sal_Unicode( ) );
- aKeyMap[ KEY_PASTE ] = rtl::OUString( sal_Unicode( ) );
- aKeyMap[ KEY_UNDO ] = rtl::OUString( sal_Unicode( ) );
- aKeyMap[ KEY_REPEAT ] = rtl::OUString( sal_Unicode( ) );
- aKeyMap[ KEY_FIND ] = rtl::OUString( sal_Unicode( ) );
- aKeyMap[ KEY_PROPERTIES ] = rtl::OUString( sal_Unicode( ) );
- aKeyMap[ KEY_FRONT ] = rtl::OUString( sal_Unicode( ) );
- aKeyMap[ KEY_CONTEXTMENU ] = rtl::OUString( sal_Unicode( ) );
- aKeyMap[ KEY_MENU ] = rtl::OUString( sal_Unicode( ) );
- aKeyMap[ KEY_HELP ] = rtl::OUString( sal_Unicode( ) );
- aKeyMap[ KEY_HANGUL_HANJA ] = rtl::OUString( sal_Unicode( ) );
- aKeyMap[ KEY_DECIMAL ] = rtl::OUString( sal_Unicode( ) );
- aKeyMap[ KEY_TILDE ] = rtl::OUString( sal_Unicode( ) );
- aKeyMap[ KEY_QUOTELEFT ]= rtl::OUString( sal_Unicode( ) );
+ aKeyMap[ KEY_INSERT ] = OUString( sal_Unicode( ) );
+ aKeyMap[ KEY_CUT ] = OUString( sal_Unicode( ) );
+ aKeyMap[ KEY_COPY ] = OUString( sal_Unicode( ) );
+ aKeyMap[ KEY_PASTE ] = OUString( sal_Unicode( ) );
+ aKeyMap[ KEY_UNDO ] = OUString( sal_Unicode( ) );
+ aKeyMap[ KEY_REPEAT ] = OUString( sal_Unicode( ) );
+ aKeyMap[ KEY_FIND ] = OUString( sal_Unicode( ) );
+ aKeyMap[ KEY_PROPERTIES ] = OUString( sal_Unicode( ) );
+ aKeyMap[ KEY_FRONT ] = OUString( sal_Unicode( ) );
+ aKeyMap[ KEY_CONTEXTMENU ] = OUString( sal_Unicode( ) );
+ aKeyMap[ KEY_MENU ] = OUString( sal_Unicode( ) );
+ aKeyMap[ KEY_HELP ] = OUString( sal_Unicode( ) );
+ aKeyMap[ KEY_HANGUL_HANJA ] = OUString( sal_Unicode( ) );
+ aKeyMap[ KEY_DECIMAL ] = OUString( sal_Unicode( ) );
+ aKeyMap[ KEY_TILDE ] = OUString( sal_Unicode( ) );
+ aKeyMap[ KEY_QUOTELEFT ]= OUString( sal_Unicode( ) );
*/
}
- rtl::OUStringBuffer aResult( 16 );
+ OUStringBuffer aResult( 16 );
sal_uInt16 nUnmodifiedCode = (nKeyCode & KEY_CODE);
- std::map< sal_uInt16, rtl::OUString >::const_iterator it = aKeyMap.find( nUnmodifiedCode );
+ std::map< sal_uInt16, OUString >::const_iterator it = aKeyMap.find( nUnmodifiedCode );
if( it != aKeyMap.end() )
{
if( (nKeyCode & KEY_SHIFT) != 0 )
diff --git a/vcl/aqua/source/window/salmenu.cxx b/vcl/aqua/source/window/salmenu.cxx
index 8f37ddc41d24..0bdf9ed8c729 100644
--- a/vcl/aqua/source/window/salmenu.cxx
+++ b/vcl/aqua/source/window/salmenu.cxx
@@ -62,11 +62,11 @@ const AquaSalMenu* AquaSalMenu::pCurrentMenuBar = NULL;
}
else
{
- rtl::OUString aDialog;
+ OUString aDialog;
if( nDialog == SHOWDIALOG_ID_ABOUT )
- aDialog = rtl::OUString("ABOUT");
+ aDialog = OUString("ABOUT");
else if( nDialog == SHOWDIALOG_ID_PREFERENCES )
- aDialog = rtl::OUString("PREFERENCES");
+ aDialog = OUString("PREFERENCES");
const ApplicationEvent* pAppEvent = new ApplicationEvent(
ApplicationEvent::TYPE_SHOWDIALOG, aDialog);
AquaSalInstance::aAppEventList.push_back( pAppEvent );
@@ -668,7 +668,7 @@ void AquaSalMenu::SetItemImage( unsigned /*nPos*/, SalMenuItem* pSMI, const Imag
[pImage release];
}
-void AquaSalMenu::SetItemText( unsigned /*i_nPos*/, SalMenuItem* i_pSalMenuItem, const rtl::OUString& i_rText )
+void AquaSalMenu::SetItemText( unsigned /*i_nPos*/, SalMenuItem* i_pSalMenuItem, const OUString& i_rText )
{
if (!i_pSalMenuItem)
return;
@@ -703,7 +703,7 @@ void AquaSalMenu::SetItemText( unsigned /*i_nPos*/, SalMenuItem* i_pSalMenuItem,
}
}
-void AquaSalMenu::SetAccelerator( unsigned /*nPos*/, SalMenuItem* pSalMenuItem, const KeyCode& rKeyCode, const rtl::OUString& /*rKeyName*/ )
+void AquaSalMenu::SetAccelerator( unsigned /*nPos*/, SalMenuItem* pSalMenuItem, const KeyCode& rKeyCode, const OUString& /*rKeyName*/ )
{
sal_uInt16 nModifier;
sal_Unicode nCommandKey = 0;
@@ -779,7 +779,7 @@ void AquaSalMenu::SetAccelerator( unsigned /*nPos*/, SalMenuItem* pSalMenuItem,
nItemModifier |= NSControlKeyMask;
AquaSalMenuItem *pAquaSalMenuItem = (AquaSalMenuItem *) pSalMenuItem;
- NSString* pString = CreateNSString( rtl::OUString( &nCommandKey, 1 ) );
+ NSString* pString = CreateNSString( OUString( &nCommandKey, 1 ) );
[pAquaSalMenuItem->mpMenuItem setKeyEquivalent: pString];
[pAquaSalMenuItem->mpMenuItem setKeyEquivalentModifierMask: nItemModifier];
if (pString)
diff --git a/vcl/coretext/salcoretextfontutils.cxx b/vcl/coretext/salcoretextfontutils.cxx
index 3bcfa2285585..5b6b6c0027d3 100644
--- a/vcl/coretext/salcoretextfontutils.cxx
+++ b/vcl/coretext/salcoretextfontutils.cxx
@@ -155,7 +155,7 @@ static bool GetDevFontAttributes( CTFontDescriptorRef font_descriptor, ImplDevFo
}
CFStringRef string_ref = (CFStringRef)CTFontDescriptorCopyAttribute(font_descriptor, kCTFontStyleNameAttribute);
- rtl::OUString style(GetOUString(string_ref).toAsciiLowerCase());
+ OUString style(GetOUString(string_ref).toAsciiLowerCase());
CFRelease(string_ref);
// heuristics to adjust font slant
diff --git a/vcl/coretext/salgdi.cxx b/vcl/coretext/salgdi.cxx
index 7fdd97532176..c1ace406d512 100644
--- a/vcl/coretext/salgdi.cxx
+++ b/vcl/coretext/salgdi.cxx
@@ -81,8 +81,8 @@ QuartzSalGraphics::~QuartzSalGraphics()
#endif
inline bool QuartzSalGraphics::AddTempDevFont( ImplDevFontList*,
- const rtl::OUString& ,
- const rtl::OUString& )
+ const OUString& ,
+ const OUString& )
{
OSL_ASSERT( FALSE );
return false;
diff --git a/vcl/generic/app/gendisp.cxx b/vcl/generic/app/gendisp.cxx
index f6d1e2e8c759..fffb5aac2d20 100644
--- a/vcl/generic/app/gendisp.cxx
+++ b/vcl/generic/app/gendisp.cxx
@@ -21,7 +21,6 @@
#include <generic/gendisp.hxx>
#include <generic/geninst.h>
-using ::rtl::OUString;
SalGenericDisplay::SalGenericDisplay()
{
diff --git a/vcl/generic/fontmanager/fontcache.cxx b/vcl/generic/fontmanager/fontcache.cxx
index 863ee708f480..b2a2af528af6 100644
--- a/vcl/generic/fontmanager/fontcache.cxx
+++ b/vcl/generic/fontmanager/fontcache.cxx
@@ -45,9 +45,6 @@ using namespace std;
using namespace psp;
using namespace utl;
-using ::rtl::OUString;
-using ::rtl::OString;
-using ::rtl::OUStringToOString;
/*
* FontCache constructor
@@ -103,7 +100,7 @@ void FontCache::flush()
if( ! (aStream.IsOpen() && aStream.IsWritable()) )
{
#if OSL_DEBUG_LEVEL > 1
- fprintf( stderr, "FontCache::flush: opening cache file %s failed\n", rtl::OUStringToOString(m_aCacheFile, osl_getThreadTextEncoding()).getStr() );
+ fprintf( stderr, "FontCache::flush: opening cache file %s failed\n", OUStringToOString(m_aCacheFile, osl_getThreadTextEncoding()).getStr() );
#endif
return;
}
@@ -118,8 +115,8 @@ void FontCache::flush()
{
const FontDirMap& rDir( dir_it->second.m_aEntries );
- rtl::OString aDirectory(rManager.getDirectory(dir_it->first));
- rtl::OStringBuffer aLine("FontCacheDirectory:");
+ OString aDirectory(rManager.getDirectory(dir_it->first));
+ OStringBuffer aLine("FontCacheDirectory:");
aLine.append(dir_it->second.m_nTimestamp);
aLine.append(':');
aLine.append(aDirectory);
@@ -226,7 +223,7 @@ void FontCache::flush()
}
aStream.WriteLine(aLine.makeStringAndClear());
}
- aStream.WriteLine(rtl::OString());
+ aStream.WriteLine(OString());
}
}
m_bDoFlush = false;
@@ -245,7 +242,7 @@ void FontCache::read()
if( ! aStream.IsOpen() )
{
#if OSL_DEBUG_LEVEL > 1
- fprintf( stderr, "FontCache::read: opening cache file %s failed\n", rtl::OUStringToOString(m_aCacheFile, osl_getThreadTextEncoding()).getStr() );
+ fprintf( stderr, "FontCache::read: opening cache file %s failed\n", OUStringToOString(m_aCacheFile, osl_getThreadTextEncoding()).getStr() );
#endif
return;
}
@@ -256,7 +253,7 @@ void FontCache::read()
if ( !(aLine == CACHE_MAGIC) )
{
#if OSL_DEBUG_LEVEL >1
- fprintf( stderr, "FontCache::read: cache file %s fails magic test\n", rtl::OUStringToOString(m_aCacheFile, osl_getThreadTextEncoding()).getStr() );
+ fprintf( stderr, "FontCache::read: cache file %s fails magic test\n", OUStringToOString(m_aCacheFile, osl_getThreadTextEncoding()).getStr() );
#endif
return;
}
@@ -278,7 +275,7 @@ void FontCache::read()
sal_Int32 nTEnd = aLine.indexOf( ':', nSearchIndex );
if( nTEnd != -1 )
{
- rtl::OString aTimeStamp = aLine.copy( nSearchIndex, nTEnd - nSearchIndex );
+ OString aTimeStamp = aLine.copy( nSearchIndex, nTEnd - nSearchIndex );
nTimestamp = aTimeStamp.toInt64();
aDir = aLine.copy( nTEnd+1 );
}
@@ -452,7 +449,7 @@ void FontCache::read()
{
if( pFont->m_bUserOverride )
{
- rtl::OStringBuffer aFilePath(rManager.getDirectory(nDir));
+ OStringBuffer aFilePath(rManager.getDirectory(nDir));
aFilePath.append('/').append(aFile);
struct stat aStat;
if( stat( aFilePath.getStr(), &aStat ) ||
diff --git a/vcl/generic/fontmanager/fontconfig.cxx b/vcl/generic/fontmanager/fontconfig.cxx
index 33aff6a36d3c..dc8dfa7976e1 100644
--- a/vcl/generic/fontmanager/fontconfig.cxx
+++ b/vcl/generic/fontmanager/fontconfig.cxx
@@ -94,9 +94,6 @@ using namespace psp;
#include <algorithm>
using namespace osl;
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
-using ::rtl::OString;
namespace
{
@@ -124,8 +121,8 @@ public:
FcResult LocalizedElementFromPattern(FcPattern* pPattern, FcChar8 **family,
const char *elementtype, const char *elementlangtype);
//to-do, make private and add some cleanish accessor methods
- boost::unordered_map< rtl::OString, rtl::OString, rtl::OStringHash > m_aFontNameToLocalized;
- boost::unordered_map< rtl::OString, rtl::OString, rtl::OStringHash > m_aLocalizedToCanonical;
+ boost::unordered_map< OString, OString, OStringHash > m_aFontNameToLocalized;
+ boost::unordered_map< OString, OString, OStringHash > m_aLocalizedToCanonical;
private:
void cacheLocalizedFontNames(const FcChar8 *origfontname, const FcChar8 *bestfontname, const std::vector< lang_and_element > &lang_and_elements);
@@ -297,10 +294,10 @@ namespace
/* FIXME-BCP47: once fontconfig supports language tags this
* language-territory stuff needs to be changed! */
SAL_INFO_IF( !rLangTag.isIsoLocale(), "i18n", "localizedsorter::bestname - not an ISO locale");
- rtl::OString sLangMatch(rtl::OUStringToOString(rLangTag.getLanguage().toAsciiLowerCase(), RTL_TEXTENCODING_UTF8));
- rtl::OString sFullMatch = sLangMatch;
+ OString sLangMatch(OUStringToOString(rLangTag.getLanguage().toAsciiLowerCase(), RTL_TEXTENCODING_UTF8));
+ OString sFullMatch = sLangMatch;
sFullMatch += OString('-');
- sFullMatch += rtl::OUStringToOString(rLangTag.getCountry().toAsciiLowerCase(), RTL_TEXTENCODING_UTF8);
+ sFullMatch += OUStringToOString(rLangTag.getCountry().toAsciiLowerCase(), RTL_TEXTENCODING_UTF8);
std::vector<lang_and_element>::const_iterator aEnd = elements.end();
bool alreadyclosematch = false;
@@ -504,7 +501,7 @@ static void lcl_FcFontSetRemove(FcFontSet* pFSet, int i)
memmove(pFSet->fonts + i, pFSet->fonts + i + 1, nTail*sizeof(FcPattern*));
}
-void PrintFontManager::countFontconfigFonts( boost::unordered_map<rtl::OString, int, rtl::OStringHash>& o_rVisitedPaths )
+void PrintFontManager::countFontconfigFonts( boost::unordered_map<OString, int, OStringHash>& o_rVisitedPaths )
{
#if OSL_DEBUG_LEVEL > 1
int nFonts = 0;
@@ -696,7 +693,7 @@ void PrintFontManager::deinitFontconfig()
FontCfgWrapper::release();
}
-bool PrintFontManager::addFontconfigDir( const rtl::OString& rDirName )
+bool PrintFontManager::addFontconfigDir( const OString& rDirName )
{
// workaround for a stability problems in older FC versions
// when handling application specifc fonts
@@ -714,7 +711,7 @@ bool PrintFontManager::addFontconfigDir( const rtl::OString& rDirName )
return false;
// load dir-specific fc-config file too if available
- const rtl::OString aConfFileName = rDirName + "/fc_local.conf";
+ const OString aConfFileName = rDirName + "/fc_local.conf";
FILE* pCfgFile = fopen( aConfFileName.getStr(), "rb" );
if( pCfgFile )
{
@@ -921,7 +918,7 @@ IMPL_LINK_NOARG(PrintFontManager, autoInstallFontLangSupport)
return 0;
}
-bool PrintFontManager::Substitute( FontSelectPattern &rPattern, rtl::OUString& rMissingCodes )
+bool PrintFontManager::Substitute( FontSelectPattern &rPattern, OUString& rMissingCodes )
{
bool bRet = false;
@@ -933,7 +930,7 @@ bool PrintFontManager::Substitute( FontSelectPattern &rPattern, rtl::OUString& r
// Prefer scalable fonts
FcPatternAddBool(pPattern, FC_SCALABLE, FcTrue);
- const rtl::OString aTargetName = rtl::OUStringToOString( rPattern.maTargetName, RTL_TEXTENCODING_UTF8 );
+ const OString aTargetName = OUStringToOString( rPattern.maTargetName, RTL_TEXTENCODING_UTF8 );
const FcChar8* pTargetNameUtf8 = (FcChar8*)aTargetName.getStr();
FcPatternAddString(pPattern, FC_FAMILY, pTargetNameUtf8);
@@ -1021,11 +1018,11 @@ bool PrintFontManager::Substitute( FontSelectPattern &rPattern, rtl::OUString& r
if( eFamilyRes == FcResultMatch )
{
OString sFamily((sal_Char*)family);
- boost::unordered_map< rtl::OString, rtl::OString, rtl::OStringHash >::const_iterator aI =
+ boost::unordered_map< OString, OString, OStringHash >::const_iterator aI =
rWrapper.m_aFontNameToLocalized.find(sFamily);
if (aI != rWrapper.m_aFontNameToLocalized.end())
sFamily = aI->second;
- rPattern.maSearchName = rtl::OStringToOUString( sFamily, RTL_TEXTENCODING_UTF8 );
+ rPattern.maSearchName = OStringToOUString( sFamily, RTL_TEXTENCODING_UTF8 );
bRet = true;
}
}
@@ -1150,7 +1147,7 @@ ImplFontOptions* PrintFontManager::getFontOptions(
OString sFamily = OUStringToOString( rInfo.m_aFamilyName, RTL_TEXTENCODING_UTF8 );
- boost::unordered_map< rtl::OString, rtl::OString, rtl::OStringHash >::const_iterator aI = rWrapper.m_aLocalizedToCanonical.find(sFamily);
+ boost::unordered_map< OString, OString, OStringHash >::const_iterator aI = rWrapper.m_aLocalizedToCanonical.find(sFamily);
if (aI != rWrapper.m_aLocalizedToCanonical.end())
sFamily = aI->second;
if( !sFamily.isEmpty() )
@@ -1220,7 +1217,7 @@ bool PrintFontManager::matchFont( FastPrintFontInfo& rInfo, const com::sun::star
// populate pattern with font characteristics
const LanguageTag aLangTag(rLocale);
- const rtl::OString aLangAttrib = mapToFontConfigLangTag(aLangTag);
+ const OString aLangAttrib = mapToFontConfigLangTag(aLangTag);
if (!aLangAttrib.isEmpty())
FcPatternAddString(pPattern, FC_LANG, (FcChar8*)aLangAttrib.getStr());
diff --git a/vcl/generic/fontmanager/fontmanager.cxx b/vcl/generic/fontmanager/fontmanager.cxx
index 8a1a5e1ea6b5..e86fceb11ce2 100644
--- a/vcl/generic/fontmanager/fontmanager.cxx
+++ b/vcl/generic/fontmanager/fontmanager.cxx
@@ -87,14 +87,6 @@ using namespace com::sun::star::beans;
using namespace com::sun::star::lang;
using ::comphelper::string::getToken;
-using ::rtl::OUString;
-using ::rtl::OString;
-using ::rtl::OStringHash;
-using ::rtl::OStringBuffer;
-using ::rtl::OUStringBuffer;
-using ::rtl::OUStringHash;
-using ::rtl::OStringToOUString;
-using ::rtl::OUStringToOString;
/*
* static helpers
@@ -120,7 +112,7 @@ inline sal_uInt32 getUInt32BE( const sal_uInt8*& pBuffer )
// -------------------------------------------------------------------------
-static FontWeight parseWeight( const rtl::OString& rWeight )
+static FontWeight parseWeight( const OString& rWeight )
{
FontWeight eWeight = WEIGHT_DONTKNOW;
if (rWeight.indexOf("bold") != -1)
@@ -237,7 +229,7 @@ bool PrintFontManager::TrueTypeFontFile::queryMetricPage( int nPage, MultiAtomPr
{
bool bSuccess = false;
- rtl::OString aFile( PrintFontManager::get().getFontFile( this ) );
+ OString aFile( PrintFontManager::get().getFontFile( this ) );
TrueTypeFont* pTTFont = NULL;
@@ -611,7 +603,7 @@ bool PrintFontManager::PrintFont::readAfmMetrics( MultiAtomProvider* pProvider,
m_eItalic = ITALIC_NONE;
// weight
- rtl::OString aWeight( pInfo->gfi->weight );
+ OString aWeight( pInfo->gfi->weight );
m_eWeight = parseWeight( aWeight.toAsciiLowerCase() );
// pitch
@@ -810,7 +802,7 @@ bool PrintFontManager::PrintFont::readAfmMetrics( MultiAtomProvider* pProvider,
continue;
}
- rtl::OStringBuffer aTranslate;
+ OStringBuffer aTranslate;
if( pChar->code & 0xff000000 )
aTranslate.append((char)(pChar->code >> 24));
if( pChar->code & 0xffff0000 )
@@ -818,7 +810,7 @@ bool PrintFontManager::PrintFont::readAfmMetrics( MultiAtomProvider* pProvider,
if( pChar->code & 0xffffff00 )
aTranslate.append((char)((pChar->code & 0x0000ff00) >> 8 ));
aTranslate.append((char)(pChar->code & 0xff));
- rtl::OUString aUni(rtl::OStringToOUString(aTranslate.makeStringAndClear(), m_aEncoding));
+ OUString aUni(OStringToOUString(aTranslate.makeStringAndClear(), m_aEncoding));
pUnicodes[i] = aUni.toChar();
}
else
@@ -990,8 +982,8 @@ PrintFontManager::PrintFontManager()
{
for( unsigned int i = 0; i < SAL_N_ELEMENTS( aAdobeCodes ); i++ )
{
- m_aUnicodeToAdobename.insert( ::boost::unordered_multimap< sal_Unicode, ::rtl::OString >::value_type( aAdobeCodes[i].aUnicode, aAdobeCodes[i].pAdobename ) );
- m_aAdobenameToUnicode.insert( ::boost::unordered_multimap< ::rtl::OString, sal_Unicode, ::rtl::OStringHash >::value_type( aAdobeCodes[i].pAdobename, aAdobeCodes[i].aUnicode ) );
+ m_aUnicodeToAdobename.insert( ::boost::unordered_multimap< sal_Unicode, OString >::value_type( aAdobeCodes[i].aUnicode, aAdobeCodes[i].pAdobename ) );
+ m_aAdobenameToUnicode.insert( ::boost::unordered_multimap< OString, sal_Unicode, OStringHash >::value_type( aAdobeCodes[i].pAdobename, aAdobeCodes[i].aUnicode ) );
if( aAdobeCodes[i].aAdobeStandardCode )
{
m_aUnicodeToAdobecode.insert( ::boost::unordered_multimap< sal_Unicode, sal_uInt8 >::value_type( aAdobeCodes[i].aUnicode, aAdobeCodes[i].aAdobeStandardCode ) );
@@ -1043,7 +1035,7 @@ int PrintFontManager::getDirectoryAtom( const OString& rDirectory, bool bCreate
// -------------------------------------------------------------------------
-std::vector<fontID> PrintFontManager::addFontFile( const ::rtl::OString& rFileName )
+std::vector<fontID> PrintFontManager::addFontFile( const OString& rFileName )
{
rtl_TextEncoding aEncoding = osl_getThreadTextEncoding();
INetURLObject aPath( OStringToOUString( rFileName, aEncoding ), INetURLObject::FSYS_DETECT );
@@ -1103,7 +1095,7 @@ bool PrintFontManager::analyzeFontFile( int nDirID, const OString& rFontFile, ::
}
if (eFormat == UNKNOWN)
{
- rtl::OString aExt( rFontFile.copy( rFontFile.lastIndexOf( '.' )+1 ) );
+ OString aExt( rFontFile.copy( rFontFile.lastIndexOf( '.' )+1 ) );
if( aExt.equalsIgnoreAsciiCase("pfb") || aExt.equalsIgnoreAsciiCase("pfa") )
eFormat = TYPE1;
else if( aExt.equalsIgnoreAsciiCase("afm"))
@@ -1124,7 +1116,7 @@ bool PrintFontManager::analyzeFontFile( int nDirID, const OString& rFontFile, ::
for( unsigned int i = 0; i < SAL_N_ELEMENTS(pSuffix); i++ )
{
- rtl::OString aName = rtl::OStringBuffer(
+ OString aName = OStringBuffer(
rFontFile.copy(0, rFontFile.getLength() - 4)).
append(pSuffix[i]).makeStringAndClear();
@@ -1470,7 +1462,7 @@ bool PrintFontManager::analyzeTrueTypeFile( PrintFont* pFont ) const
{
bool bSuccess = false;
rtl_TextEncoding aEncoding = osl_getThreadTextEncoding();
- rtl::OString aFile = getFontFile( pFont );
+ OString aFile = getFontFile( pFont );
TrueTypeFont* pTTFont = NULL;
TrueTypeFontFile* pTTFontFile = static_cast< TrueTypeFontFile* >(pFont);
@@ -1524,8 +1516,8 @@ bool PrintFontManager::analyzeTrueTypeFile( PrintFont* pFont ) const
SAL_WARN_IF( !aInfo.psname, "vcl", "No PostScript name in font:" << aFile.getStr() );
- rtl::OUString sPSName = aInfo.psname ?
- rtl::OUString(aInfo.psname, rtl_str_getLength(aInfo.psname), aEncoding) :
+ OUString sPSName = aInfo.psname ?
+ OUString(aInfo.psname, rtl_str_getLength(aInfo.psname), aEncoding) :
m_pAtoms->getString(ATOM_FAMILYNAME, pFont->m_nFamilyName); // poor font does not have a postscript name
pFont->m_nPSName = m_pAtoms->getAtom( ATOM_PSNAME, sPSName, sal_True );
@@ -1685,13 +1677,13 @@ void PrintFontManager::initialize()
// part one - look for downloadable fonts
rtl_TextEncoding aEncoding = osl_getThreadTextEncoding();
- const ::rtl::OUString &rSalPrivatePath = psp::getFontPath();
+ const OUString &rSalPrivatePath = psp::getFontPath();
// search for the fonts in SAL_PRIVATE_FONTPATH first; those are
// the fonts installed with the office
if( !rSalPrivatePath.isEmpty() )
{
- OString aPath = rtl::OUStringToOString( rSalPrivatePath, aEncoding );
+ OString aPath = OUStringToOString( rSalPrivatePath, aEncoding );
const bool bAreFCSubstitutionsEnabled = AreFCSubstitutionsEnabled();
sal_Int32 nIndex = 0;
do
@@ -1819,7 +1811,7 @@ void PrintFontManager::initialize()
while( ! readdir_r( pDIR, (struct dirent*)aDirEntBuffer, &pDirEntry ) && pDirEntry )
{
- rtl::OStringBuffer aFile(aDir);
+ OStringBuffer aFile(aDir);
aFile.append('/').append(pDirEntry->d_name);
struct stat aStat;
if( ! stat( aFile.getStr(), &aStat )
@@ -1868,7 +1860,7 @@ void PrintFontManager::initialize()
m_aFamilyTypes.find( font_it->second->m_nFamilyName );
if (it != m_aFamilyTypes.end())
continue;
- const ::rtl::OUString& rFamily =
+ const OUString& rFamily =
m_pAtoms->getString( ATOM_FAMILYNAME, font_it->second->m_nFamilyName);
FontFamily eType = matchFamilyName( rFamily );
m_aFamilyTypes[ font_it->second->m_nFamilyName ] = eType;
@@ -2213,7 +2205,7 @@ int PrintFontManager::getFontFaceNumber( fontID nFontID ) const
// -------------------------------------------------------------------------
-FontFamily PrintFontManager::matchFamilyName( const ::rtl::OUString& rFamily ) const
+FontFamily PrintFontManager::matchFamilyName( const OUString& rFamily ) const
{
typedef struct {
const char* mpName;
@@ -2251,7 +2243,7 @@ FontFamily PrintFontManager::matchFamilyName( const ::rtl::OUString& rFamily ) c
{ InitializeClass( "zapfchancery", FAMILY_SCRIPT ) }
};
- rtl::OString aFamily = rtl::OUStringToOString( rFamily, RTL_TEXTENCODING_ASCII_US );
+ OString aFamily = OUStringToOString( rFamily, RTL_TEXTENCODING_ASCII_US );
sal_uInt32 nLower = 0;
sal_uInt32 nUpper = SAL_N_ELEMENTS(pFamilyMatch);
@@ -2336,7 +2328,7 @@ OString PrintFontManager::getFontFile( PrintFont* pFont ) const
// -------------------------------------------------------------------------
-const ::rtl::OUString& PrintFontManager::getPSName( fontID nFontID ) const
+const OUString& PrintFontManager::getPSName( fontID nFontID ) const
{
PrintFont* pFont = getFont( nFontID );
if( pFont && pFont->m_nPSName == 0 )
@@ -2442,7 +2434,7 @@ bool PrintFontManager::isFontDownloadingAllowedForPrinting( fontID nFont ) const
if( pTTFontFile->m_nTypeFlags & TYPEFLAG_INVALID )
{
TrueTypeFont* pTTFont = NULL;
- rtl::OString aFile = getFontFile( pFont );
+ OString aFile = getFontFile( pFont );
if( OpenTTFontFile( aFile.getStr(), pTTFontFile->m_nCollectionEntry, &pTTFont ) == SF_OK )
{
// get type flags
@@ -2616,7 +2608,7 @@ bool PrintFontManager::createFontSubset(
// prepare system name for read access for subset source file
// TODO: since this file is usually already mmapped there is no need to open it again
- const rtl::OString aFromFile = getFontFile( pFont );
+ const OString aFromFile = getFontFile( pFont );
TrueTypeFont* pTTFont = NULL; // TODO: rename to SfntFont
TrueTypeFontFile* pTTFontFile = static_cast< TrueTypeFontFile* >(pFont);
@@ -2628,7 +2620,7 @@ bool PrintFontManager::createFontSubset(
if( osl_File_E_None != osl_getSystemPathFromFileURL( rOutFile.pData, &aSysPath.pData ) )
return false;
const rtl_TextEncoding aEncoding = osl_getThreadTextEncoding();
- const rtl::OString aToFile( OUStringToOString( aSysPath, aEncoding ) );
+ const OString aToFile( OUStringToOString( aSysPath, aEncoding ) );
// do CFF subsetting if possible
int nCffLength = 0;
@@ -2713,7 +2705,7 @@ void PrintFontManager::getGlyphWidths( fontID nFont,
{
TrueTypeFont* pTTFont = NULL;
TrueTypeFontFile* pTTFontFile = static_cast< TrueTypeFontFile* >(pFont);
- rtl::OString aFromFile = getFontFile( pFont );
+ OString aFromFile = getFontFile( pFont );
if( OpenTTFontFile( aFromFile.getStr(), pTTFontFile->m_nCollectionEntry, &pTTFont ) != SF_OK )
return;
int nGlyphs = GetTTGlyphCount( pTTFont );
@@ -2791,7 +2783,7 @@ void PrintFontManager::getGlyphWidths( fontID nFont,
// -------------------------------------------------------------------------
-const std::map< sal_Unicode, sal_Int32 >* PrintFontManager::getEncodingMap( fontID nFont, const std::map< sal_Unicode, rtl::OString >** pNonEncoded ) const
+const std::map< sal_Unicode, sal_Int32 >* PrintFontManager::getEncodingMap( fontID nFont, const std::map< sal_Unicode, OString >** pNonEncoded ) const
{
PrintFont* pFont = getFont( nFont );
if( !pFont ||
@@ -2812,8 +2804,8 @@ const std::map< sal_Unicode, sal_Int32 >* PrintFontManager::getEncodingMap( font
std::list< OString > PrintFontManager::getAdobeNameFromUnicode( sal_Unicode aChar ) const
{
- std::pair< boost::unordered_multimap< sal_Unicode, rtl::OString >::const_iterator,
- boost::unordered_multimap< sal_Unicode, rtl::OString >::const_iterator > range
+ std::pair< boost::unordered_multimap< sal_Unicode, OString >::const_iterator,
+ boost::unordered_multimap< sal_Unicode, OString >::const_iterator > range
= m_aUnicodeToAdobename.equal_range( aChar );
std::list< OString > aRet;
@@ -2831,10 +2823,10 @@ std::list< OString > PrintFontManager::getAdobeNameFromUnicode( sal_Unicode aCha
}
// -------------------------------------------------------------------------
-std::list< sal_Unicode > PrintFontManager::getUnicodeFromAdobeName( const rtl::OString& rName ) const
+std::list< sal_Unicode > PrintFontManager::getUnicodeFromAdobeName( const OString& rName ) const
{
- std::pair< boost::unordered_multimap< rtl::OString, sal_Unicode, rtl::OStringHash >::const_iterator,
- boost::unordered_multimap< rtl::OString, sal_Unicode, rtl::OStringHash >::const_iterator > range
+ std::pair< boost::unordered_multimap< OString, sal_Unicode, OStringHash >::const_iterator,
+ boost::unordered_multimap< OString, sal_Unicode, OStringHash >::const_iterator > range
= m_aAdobenameToUnicode.equal_range( rName );
std::list< sal_Unicode > aRet;
diff --git a/vcl/generic/fontmanager/fontsubst.cxx b/vcl/generic/fontmanager/fontsubst.cxx
index a339ca9ff037..94dcda14e75a 100644
--- a/vcl/generic/fontmanager/fontsubst.cxx
+++ b/vcl/generic/fontmanager/fontsubst.cxx
@@ -60,7 +60,7 @@ class FcGlyphFallbackSubstititution
{
// TODO: add a cache
public:
- bool FindFontSubstitute( FontSelectPattern&, rtl::OUString& rMissingCodes ) const;
+ bool FindFontSubstitute( FontSelectPattern&, OUString& rMissingCodes ) const;
};
int SalGenericInstance::FetchFontSubstitutionFlags()
@@ -116,7 +116,7 @@ void SalGenericInstance::RegisterFontSubstitutors( ImplDevFontList* pList )
// -----------------------------------------------------------------------
-static FontSelectPattern GetFcSubstitute(const FontSelectPattern &rFontSelData, rtl::OUString& rMissingCodes )
+static FontSelectPattern GetFcSubstitute(const FontSelectPattern &rFontSelData, OUString& rMissingCodes )
{
FontSelectPattern aSubstituted(rFontSelData);
psp::PrintFontManager& rMgr = psp::PrintFontManager::get();
@@ -193,9 +193,9 @@ bool FcPreMatchSubstititution::FindFontSubstitute( FontSelectPattern &rFontSelDa
const bool bHaveSubstitute = !uselessmatch( rFontSelData, aOut );
#ifdef DEBUG
- const rtl::OString aOrigName(rtl::OUStringToOString(rFontSelData.maTargetName,
+ const OString aOrigName(OUStringToOString(rFontSelData.maTargetName,
RTL_TEXTENCODING_UTF8));
- const rtl::OString aSubstName(rtl::OUStringToOString(aOut.maSearchName,
+ const OString aSubstName(OUStringToOString(aOut.maSearchName,
RTL_TEXTENCODING_UTF8));
printf( "FcPreMatchSubstititution \"%s\" bipw=%d%d%d%d -> ",
aOrigName.getStr(), rFontSelData.GetWeight(), rFontSelData.GetSlant(),
@@ -223,7 +223,7 @@ bool FcPreMatchSubstititution::FindFontSubstitute( FontSelectPattern &rFontSelDa
// -----------------------------------------------------------------------
bool FcGlyphFallbackSubstititution::FindFontSubstitute( FontSelectPattern& rFontSelData,
- rtl::OUString& rMissingCodes ) const
+ OUString& rMissingCodes ) const
{
// We dont' actually want to talk to Fontconfig at all for symbol fonts
if( rFontSelData.IsSymbolFont() )
@@ -244,9 +244,9 @@ bool FcGlyphFallbackSubstititution::FindFontSubstitute( FontSelectPattern& rFont
const bool bHaveSubstitute = !uselessmatch( rFontSelData, aOut );
#ifdef DEBUG
- const rtl::OString aOrigName(rtl::OUStringToOString(rFontSelData.maTargetName,
+ const OString aOrigName(OUStringToOString(rFontSelData.maTargetName,
RTL_TEXTENCODING_UTF8));
- const rtl::OString aSubstName(rtl::OUStringToOString(aOut.maSearchName,
+ const OString aSubstName(OUStringToOString(aOut.maSearchName,
RTL_TEXTENCODING_UTF8));
printf( "FcGFSubstititution \"%s\" bipw=%d%d%d%d ->",
aOrigName.getStr(), rFontSelData.GetWeight(), rFontSelData.GetSlant(),
diff --git a/vcl/generic/fontmanager/helper.cxx b/vcl/generic/fontmanager/helper.cxx
index 7b1a5713da12..33db29819c79 100644
--- a/vcl/generic/fontmanager/helper.cxx
+++ b/vcl/generic/fontmanager/helper.cxx
@@ -32,11 +32,6 @@
#include "rtl/bootstrap.hxx"
using ::rtl::Bootstrap;
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
-using ::rtl::OString;
-using ::rtl::OStringToOUString;
-using ::rtl::OUStringToOString;
namespace psp {
@@ -166,7 +161,7 @@ void psp::getPrinterPathList( std::list< OUString >& rPathList, const char* pSub
#ifdef SYSTEM_PPD_DIR
if( pSubDir && rtl_str_compare( pSubDir, PRINTER_PPDDIR ) == 0 )
{
- rPathList.push_back( rtl::OStringToOUString( rtl::OString( SYSTEM_PPD_DIR ), RTL_TEXTENCODING_UTF8 ) );
+ rPathList.push_back( OStringToOUString( OString( SYSTEM_PPD_DIR ), RTL_TEXTENCODING_UTF8 ) );
}
#endif
@@ -360,7 +355,7 @@ void psp::normPath( OString& rPath )
// double slashes and slash at end are probably
// removed by realpath anyway, but since this runs
// on many different platforms let's play it safe
- rtl::OString aPath = rPath.replaceAll("//", "/");
+ OString aPath = rPath.replaceAll("//", "/");
if( !aPath.isEmpty() && aPath[aPath.getLength()-1] == '/' )
aPath = aPath.copy(0, aPath.getLength()-1);
diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx
index 17e089ff6642..09a00dba182e 100644
--- a/vcl/generic/glyphs/gcach_ftyp.cxx
+++ b/vcl/generic/glyphs/gcach_ftyp.cxx
@@ -156,7 +156,7 @@ static int nDefaultPrioAntiAlias = 1;
// FreetypeManager
// =======================================================================
-FtFontFile::FtFontFile( const ::rtl::OString& rNativeFileName )
+FtFontFile::FtFontFile( const OString& rNativeFileName )
: maNativeFileName( rNativeFileName ),
mpFileMap( NULL ),
mnFileSize( 0 ),
@@ -184,7 +184,7 @@ FtFontFile::FtFontFile( const ::rtl::OString& rNativeFileName )
// -----------------------------------------------------------------------
-FtFontFile* FtFontFile::FindFontFile( const ::rtl::OString& rNativeFileName )
+FtFontFile* FtFontFile::FindFontFile( const OString& rNativeFileName )
{
// font file already known? (e.g. for ttc, synthetic, aliased fonts)
const char* pFileName = rNativeFileName.getStr();
@@ -299,7 +299,7 @@ const void * graphiteFontTable(const void* appFaceHandle, unsigned int name, siz
// =======================================================================
FtFontInfo::FtFontInfo( const ImplDevFontAttributes& rDevFontAttributes,
- const ::rtl::OString& rNativeFileName, int nFaceNum, sal_IntPtr nFontId, int nSynthetic,
+ const OString& rNativeFileName, int nFaceNum, sal_IntPtr nFontId, int nSynthetic,
const ExtraKernInfo* pExtraKernInfo )
:
maFaceFT( NULL ),
@@ -568,7 +568,7 @@ FreetypeManager::~FreetypeManager()
// -----------------------------------------------------------------------
-void FreetypeManager::AddFontFile( const rtl::OString& rNormalizedName,
+void FreetypeManager::AddFontFile( const OString& rNormalizedName,
int nFaceNum, sal_IntPtr nFontId, const ImplDevFontAttributes& rDevFontAttr,
const ExtraKernInfo* pExtraKernInfo )
{
@@ -885,7 +885,7 @@ boost::shared_ptr<ImplFontOptions> ServerFont::GetFontOptions() const
return mpFontOptions;
}
-const ::rtl::OString* ServerFont::GetFontFileName() const
+const OString* ServerFont::GetFontFileName() const
{
return mpFontInfo->GetFontFileName();
}
diff --git a/vcl/generic/glyphs/gcach_ftyp.hxx b/vcl/generic/glyphs/gcach_ftyp.hxx
index dea75b3b2332..2c31bb424449 100644
--- a/vcl/generic/glyphs/gcach_ftyp.hxx
+++ b/vcl/generic/glyphs/gcach_ftyp.hxx
@@ -37,20 +37,20 @@ class GraphiteFaceWrapper;
class FtFontFile
{
public:
- static FtFontFile* FindFontFile( const ::rtl::OString& rNativeFileName );
+ static FtFontFile* FindFontFile( const OString& rNativeFileName );
bool Map();
void Unmap();
const unsigned char* GetBuffer() const { return mpFileMap; }
int GetFileSize() const { return mnFileSize; }
- const ::rtl::OString* GetFileName() const { return &maNativeFileName; }
+ const OString* GetFileName() const { return &maNativeFileName; }
int GetLangBoost() const { return mnLangBoost; }
private:
- FtFontFile( const ::rtl::OString& rNativeFileName );
+ FtFontFile( const OString& rNativeFileName );
- const ::rtl::OString maNativeFileName;
+ const OString maNativeFileName;
const unsigned char* mpFileMap;
int mnFileSize;
int mnRefCount;
@@ -64,7 +64,7 @@ class FtFontInfo
{
public:
FtFontInfo( const ImplDevFontAttributes&,
- const ::rtl::OString& rNativeFileName,
+ const OString& rNativeFileName,
int nFaceNum, sal_IntPtr nFontId, int nSynthetic,
const ExtraKernInfo* );
~FtFontInfo();
@@ -77,7 +77,7 @@ public:
#endif
void ReleaseFaceFT( FT_FaceRec_* );
- const ::rtl::OString* GetFontFileName() const { return mpFontFile->GetFileName(); }
+ const OString* GetFontFileName() const { return mpFontFile->GetFileName(); }
int GetFaceNum() const { return mnFaceNum; }
int GetSynthetic() const { return mnSynthetic; }
sal_IntPtr GetFontId() const { return mnFontId; }
@@ -148,7 +148,7 @@ public:
FreetypeManager();
~FreetypeManager();
- void AddFontFile( const rtl::OString& rNormalizedName,
+ void AddFontFile( const OString& rNormalizedName,
int nFaceNum, sal_IntPtr nFontId, const ImplDevFontAttributes&,
const ExtraKernInfo* );
void AnnounceFonts( ImplDevFontList* ) const;
diff --git a/vcl/generic/glyphs/glyphcache.cxx b/vcl/generic/glyphs/glyphcache.cxx
index 3ceb72442516..fa3659a3990f 100644
--- a/vcl/generic/glyphs/glyphcache.cxx
+++ b/vcl/generic/glyphs/glyphcache.cxx
@@ -89,7 +89,7 @@ size_t GlyphCache::IFSD_Hash::operator()( const FontSelectPattern& rFontSelData
if (rFontSelData.maTargetName.indexOf(grutils::GrFeatureParser::FEAT_PREFIX)
!= -1)
{
- rtl::OString aFeatName = rtl::OUStringToOString( rFontSelData.maTargetName, RTL_TEXTENCODING_UTF8 );
+ OString aFeatName = OUStringToOString( rFontSelData.maTargetName, RTL_TEXTENCODING_UTF8 );
nFontId ^= aFeatName.hashCode();
}
#endif
@@ -163,7 +163,7 @@ GlyphCache& GlyphCache::GetInstance()
// -----------------------------------------------------------------------
-void GlyphCache::AddFontFile( const rtl::OString& rNormalizedName, int nFaceNum,
+void GlyphCache::AddFontFile( const OString& rNormalizedName, int nFaceNum,
sal_IntPtr nFontId, const ImplDevFontAttributes& rDFA, const ExtraKernInfo* pExtraKern )
{
if( mpFtManager )
diff --git a/vcl/generic/glyphs/graphite_serverfont.cxx b/vcl/generic/glyphs/graphite_serverfont.cxx
index 2e3739c063b3..42d98ad287d5 100644
--- a/vcl/generic/glyphs/graphite_serverfont.cxx
+++ b/vcl/generic/glyphs/graphite_serverfont.cxx
@@ -63,13 +63,13 @@ GraphiteServerFontLayout::GraphiteServerFontLayout(ServerFont& rServerFont) thro
rServerFont.GetGraphiteFace()->addFont(rServerFont.GetFontSelData().mnHeight, pFont);
}
maImpl.SetFont(pFont);
- rtl::OString aLang("");
+ OString aLang("");
if (rServerFont.GetFontSelData().meLanguage != LANGUAGE_DONTKNOW)
{
- aLang = rtl::OUStringToOString( LanguageTag( rServerFont.GetFontSelData().meLanguage ).getBcp47(),
+ aLang = OUStringToOString( LanguageTag( rServerFont.GetFontSelData().meLanguage ).getBcp47(),
RTL_TEXTENCODING_UTF8 );
}
- rtl::OString name = rtl::OUStringToOString(
+ OString name = OUStringToOString(
rServerFont.GetFontSelData().maTargetName, RTL_TEXTENCODING_UTF8 );
#ifdef DEBUG
printf("GraphiteServerFontLayout %lx %s size %d %f\n", (long unsigned int)this, name.getStr(),
@@ -79,17 +79,17 @@ GraphiteServerFontLayout::GraphiteServerFontLayout(ServerFont& rServerFont) thro
sal_Int32 nFeat = name.indexOf(grutils::GrFeatureParser::FEAT_PREFIX) + 1;
if (nFeat > 0)
{
- rtl::OString aFeat = name.copy(nFeat, name.getLength() - nFeat);
+ OString aFeat = name.copy(nFeat, name.getLength() - nFeat);
mpFeatures = new grutils::GrFeatureParser(
rServerFont.GetGraphiteFace()->face(), aFeat, aLang);
#ifdef DEBUG
if (mpFeatures)
printf("GraphiteServerFontLayout %s/%s/%s %x language %d features %d errors\n",
- rtl::OUStringToOString( rServerFont.GetFontSelData().GetFamilyName(),
+ OUStringToOString( rServerFont.GetFontSelData().GetFamilyName(),
RTL_TEXTENCODING_UTF8 ).getStr(),
- rtl::OUStringToOString( rServerFont.GetFontSelData().maTargetName,
+ OUStringToOString( rServerFont.GetFontSelData().maTargetName,
RTL_TEXTENCODING_UTF8 ).getStr(),
- rtl::OUStringToOString( rServerFont.GetFontSelData().maSearchName,
+ OUStringToOString( rServerFont.GetFontSelData().maSearchName,
RTL_TEXTENCODING_UTF8 ).getStr(),
rServerFont.GetFontSelData().meLanguage,
(int)mpFeatures->numFeatures(), mpFeatures->parseErrors());
diff --git a/vcl/generic/print/common_gfx.cxx b/vcl/generic/print/common_gfx.cxx
index c460558f641d..260fbc951cd5 100644
--- a/vcl/generic/print/common_gfx.cxx
+++ b/vcl/generic/print/common_gfx.cxx
@@ -788,7 +788,7 @@ PrinterGfx::PSSetFont ()
&& rCurrent.maEncoding <= RTL_TEXTENCODING_USER_END)
)
{
- rtl::OString aReencodedFont =
+ OString aReencodedFont =
psp::GlyphSet::GetReencodedFontName (rCurrent.maEncoding,
rCurrent.maFont);
@@ -1163,9 +1163,9 @@ PrinterGfx::DrawEPS( const Rectangle& rBoundingBox, void* pPtr, sal_uInt32 nSize
// first search the BoundingBox of the EPS data
SvMemoryStream aStream( pPtr, nSize, STREAM_READ );
aStream.Seek( STREAM_SEEK_TO_BEGIN );
- rtl::OString aLine;
+ OString aLine;
- rtl::OString aDocTitle;
+ OString aDocTitle;
double fLeft = 0, fRight = 0, fTop = 0, fBottom = 0;
bool bEndComments = false;
while( ! aStream.IsEof()
@@ -1179,7 +1179,7 @@ PrinterGfx::DrawEPS( const Rectangle& rBoundingBox, void* pPtr, sal_uInt32 nSize
char cChar = aLine[1];
if( cChar == '%' )
{
- if( aLine.matchIgnoreAsciiCase( rtl::OString( "%%BoundingBox:") ) )
+ if( aLine.matchIgnoreAsciiCase( OString( "%%BoundingBox:") ) )
{
aLine = WhitespaceToSpace( aLine.getToken(1, ':') );
if( !aLine.isEmpty() && aLine.indexOf( "atend" ) == -1 )
diff --git a/vcl/generic/print/genprnpsp.cxx b/vcl/generic/print/genprnpsp.cxx
index 583587002361..9ffb69cdcaa3 100644
--- a/vcl/generic/print/genprnpsp.cxx
+++ b/vcl/generic/print/genprnpsp.cxx
@@ -60,9 +60,6 @@
using namespace psp;
using namespace com::sun::star;
-using ::rtl::OUString;
-using ::rtl::OUStringHash;
-using ::rtl::OUStringToOString;
/*
* static helpers
@@ -79,19 +76,19 @@ typedef int(*faxFunction)(OUString&);
static faxFunction pFaxNrFunction = NULL;
}
-static rtl::OUString getPdfDir( const PrinterInfo& rInfo )
+static OUString getPdfDir( const PrinterInfo& rInfo )
{
- rtl::OUString aDir;
+ OUString aDir;
sal_Int32 nIndex = 0;
while( nIndex != -1 )
{
- rtl::OUString aToken( rInfo.m_aFeatures.getToken( 0, ',', nIndex ) );
+ OUString aToken( rInfo.m_aFeatures.getToken( 0, ',', nIndex ) );
if( aToken.startsWith( "pdf=" ) )
{
sal_Int32 nPos = 0;
aDir = aToken.getToken( 1, '=', nPos );
if( aDir.isEmpty() && getenv( "HOME" ) )
- aDir = rtl::OUString( getenv( "HOME" ), strlen( getenv( "HOME" ) ), osl_getThreadTextEncoding() );
+ aDir = OUString( getenv( "HOME" ), strlen( getenv( "HOME" ) ), osl_getThreadTextEncoding() );
break;
}
}
@@ -227,14 +224,14 @@ static bool passFileToCommandLine( const OUString& rFilename, const OUString& rC
bool bSuccess = false;
rtl_TextEncoding aEncoding = osl_getThreadTextEncoding();
- rtl::OString aCmdLine(rtl::OUStringToOString(rCommandLine, aEncoding));
- rtl::OString aFilename(rtl::OUStringToOString(rFilename, aEncoding));
+ OString aCmdLine(OUStringToOString(rCommandLine, aEncoding));
+ OString aFilename(OUStringToOString(rFilename, aEncoding));
bool bPipe = aCmdLine.indexOf( "(TMP)" ) != -1 ? false : true;
// setup command line for exec
if( ! bPipe )
- aCmdLine = aCmdLine.replaceAll(rtl::OString("(TMP)"), aFilename);
+ aCmdLine = aCmdLine.replaceAll(OString("(TMP)"), aFilename);
#if OSL_DEBUG_LEVEL > 1
fprintf( stderr, "%s commandline: \"%s\"\n",
@@ -362,7 +359,7 @@ static bool sendAFax( const OUString& rFaxNumber, const OUString& rFileName, con
bSuccess = false;
// clean up temp file
- unlink(rtl::OUStringToOString(rFileName, osl_getThreadTextEncoding()).getStr());
+ unlink(OUStringToOString(rFileName, osl_getThreadTextEncoding()).getStr());
return bSuccess;
#else
@@ -465,7 +462,7 @@ void SalGenericInstance::GetPrinterQueueInfo( ImplPrnQueueList* pList )
sal_Int32 nIndex = 0;
while( nIndex != -1 )
{
- rtl::OUString aToken( rInfo.m_aFeatures.getToken( 0, ',', nIndex ) );
+ OUString aToken( rInfo.m_aFeatures.getToken( 0, ',', nIndex ) );
if( aToken.match( "pdf=" ) )
{
pInfo->maLocation = getPdfDir( rInfo );
@@ -487,7 +484,7 @@ void SalGenericInstance::GetPrinterQueueState( SalPrinterQueueInfo* )
mbPrinterInit = true;
}
-rtl::OUString SalGenericInstance::GetDefaultPrinter()
+OUString SalGenericInstance::GetDefaultPrinter()
{
mbPrinterInit = true;
PrinterInfoManager& rManager( PrinterInfoManager::get() );
@@ -642,7 +639,7 @@ sal_Bool PspSalInfoPrinter::SetData(
TenMuToPt( pJobSetup->mnPaperWidth ),
TenMuToPt( pJobSetup->mnPaperHeight ) );
else
- aPaper = rtl::OStringToOUString(PaperInfo::toPSName(pJobSetup->mePaperFormat), RTL_TEXTENCODING_ISO_8859_1);
+ aPaper = OStringToOUString(PaperInfo::toPSName(pJobSetup->mePaperFormat), RTL_TEXTENCODING_ISO_8859_1);
pKey = aData.m_pParser->getKey( OUString("PageSize") );
pValue = pKey ? pKey->getValueCaseInsensitive( aPaper ) : NULL;
@@ -779,7 +776,7 @@ sal_uLong PspSalInfoPrinter::GetPaperBinCount( const ImplJobSetup* pJobSetup )
return pKey ? pKey->countValues() : 0;
}
-rtl::OUString PspSalInfoPrinter::GetPaperBinName( const ImplJobSetup* pJobSetup, sal_uLong nPaperBin )
+OUString PspSalInfoPrinter::GetPaperBinName( const ImplJobSetup* pJobSetup, sal_uLong nPaperBin )
{
JobData aData;
JobData::constructFromStreamBuffer( pJobSetup->mpDriverData, pJobSetup->mnDriverDataLen, aData );
@@ -879,9 +876,9 @@ PspSalPrinter::~PspSalPrinter()
{
}
-static rtl::OUString getTmpName()
+static OUString getTmpName()
{
- rtl::OUString aTmp, aSys;
+ OUString aTmp, aSys;
osl_createTempFile( NULL, NULL, &aTmp.pData );
osl_getSystemPathFromFileURL( aTmp.pData, &aSys.pData );
@@ -889,9 +886,9 @@ static rtl::OUString getTmpName()
}
sal_Bool PspSalPrinter::StartJob(
- const rtl::OUString* pFileName,
- const rtl::OUString& rJobName,
- const rtl::OUString& rAppName,
+ const OUString* pFileName,
+ const OUString& rJobName,
+ const OUString& rAppName,
sal_uLong nCopies,
bool bCollate,
bool bDirect,
@@ -902,8 +899,8 @@ sal_Bool PspSalPrinter::StartJob(
m_bFax = false;
m_bPdf = false;
- m_aFileName = pFileName ? *pFileName : rtl::OUString();
- m_aTmpFile = rtl::OUString();
+ m_aFileName = pFileName ? *pFileName : OUString();
+ m_aTmpFile = OUString();
m_nCopies = nCopies;
m_bCollate = bCollate;
@@ -930,7 +927,7 @@ sal_Bool PspSalPrinter::StartJob(
m_aTmpFile = getTmpName();
nMode = S_IRUSR | S_IWUSR;
- ::boost::unordered_map< OUString, OUString, ::rtl::OUStringHash >::const_iterator it;
+ ::boost::unordered_map< OUString, OUString, OUStringHash >::const_iterator it;
it = pJobSetup->maValueMap.find( OUString("FAX#") );
if( it != pJobSetup->maValueMap.end() )
m_aFaxNr = it->second;
@@ -948,7 +945,7 @@ sal_Bool PspSalPrinter::StartJob(
if( m_aFileName.isEmpty() )
{
- rtl::OUStringBuffer aFileName( getPdfDir( rInfo ) );
+ OUStringBuffer aFileName( getPdfDir( rInfo ) );
aFileName.append( '/' );
aFileName.append( rJobName );
aFileName.appendAscii( ".pdf" );
@@ -1061,18 +1058,18 @@ struct PDFNewJobParameters
struct PDFPrintFile
{
- rtl::OUString maTmpURL;
+ OUString maTmpURL;
PDFNewJobParameters maParameters;
- PDFPrintFile( const rtl::OUString& i_rURL, const PDFNewJobParameters& i_rNewParameters )
+ PDFPrintFile( const OUString& i_rURL, const PDFNewJobParameters& i_rNewParameters )
: maTmpURL( i_rURL )
, maParameters( i_rNewParameters ) {}
};
-sal_Bool PspSalPrinter::StartJob( const rtl::OUString* i_pFileName, const rtl::OUString& i_rJobName, const rtl::OUString& i_rAppName,
+sal_Bool PspSalPrinter::StartJob( const OUString* i_pFileName, const OUString& i_rJobName, const OUString& i_rAppName,
ImplJobSetup* i_pSetupData, vcl::PrinterController& i_rController )
{
- OSL_TRACE( "StartJob with controller: pFilename = %s", i_pFileName ? rtl::OUStringToOString( *i_pFileName, RTL_TEXTENCODING_UTF8 ).getStr() : "<nil>" );
+ OSL_TRACE( "StartJob with controller: pFilename = %s", i_pFileName ? OUStringToOString( *i_pFileName, RTL_TEXTENCODING_UTF8 ).getStr() : "<nil>" );
// mark for endjob
m_bIsPDFWriterJob = true;
// reset IsLastPage
@@ -1174,7 +1171,7 @@ sal_Bool PspSalPrinter::StartJob( const rtl::OUString* i_pFileName, const rtl::O
{
// this is not a file URL, but it should
// form it into a osl friendly file URL
- rtl::OUString aTmp;
+ OUString aTmp;
osl_getFileURLFromSystemPath( aPDFUrl.pData, &aTmp.pData );
aPDFUrl = aTmp;
}
@@ -1270,7 +1267,7 @@ sal_Bool PspSalPrinter::StartJob( const rtl::OUString* i_pFileName, const rtl::O
break;
}
} while( nBytesRead == buffer.size() );
- rtl::OUStringBuffer aBuf( i_rJobName.getLength() + 8 );
+ OUStringBuffer aBuf( i_rJobName.getLength() + 8 );
aBuf.append( i_rJobName );
if( i > 0 || nCurJob > 0 )
{
@@ -1295,7 +1292,7 @@ sal_Bool PspSalPrinter::StartJob( const rtl::OUString* i_pFileName, const rtl::O
for( size_t i = 0; i < aPDFFiles.size(); i++ )
{
osl_removeFile( aPDFFiles[i].maTmpURL.pData );
- OSL_TRACE( "removed print PDF file %s", rtl::OUStringToOString( aPDFFiles[i].maTmpURL, RTL_TEXTENCODING_UTF8 ).getStr() );
+ OSL_TRACE( "removed print PDF file %s", OUStringToOString( aPDFFiles[i].maTmpURL, RTL_TEXTENCODING_UTF8 ).getStr() );
}
}
diff --git a/vcl/generic/print/genpspgraphics.cxx b/vcl/generic/print/genpspgraphics.cxx
index 98601f034410..a26a844a19c4 100644
--- a/vcl/generic/print/genpspgraphics.cxx
+++ b/vcl/generic/print/genpspgraphics.cxx
@@ -57,8 +57,6 @@
using namespace psp;
-using ::rtl::OUString;
-using ::rtl::OString;
// ----- Implementation of PrinterBmp by means of SalBitmap/BitmapBuffer ---------------
@@ -279,7 +277,7 @@ GenPspGraphics::GenPspGraphics()
}
void GenPspGraphics::Init( psp::JobData* pJob, psp::PrinterGfx* pGfx,
- rtl::OUString* pPhone, bool bSwallow,
+ OUString* pPhone, bool bSwallow,
SalInfoPrinter* pInfoPrinter )
{
m_pJobData = pJob;
@@ -700,7 +698,7 @@ private:
bool mbVertical;
bool mbArtItalic;
bool mbArtBold;
- rtl::OUString maText;
+ OUString maText;
int mnMinCharPos;
};
@@ -887,7 +885,7 @@ void GenPspGraphics::SetTextColor( SalColor nSalColor )
m_pPrinterGfx->SetTextColor (aColor);
}
-bool GenPspGraphics::AddTempDevFont( ImplDevFontList*, const rtl::OUString&,const rtl::OUString& )
+bool GenPspGraphics::AddTempDevFont( ImplDevFontList*, const OUString&,const OUString& )
{
return false;
}
@@ -918,7 +916,7 @@ void GenPspGraphics::GetDevFontSubstList( OutputDevice* pOutDev )
const psp::PrinterInfo& rInfo = psp::PrinterInfoManager::get().getPrinterInfo( m_pJobData->m_aPrinterName );
if( rInfo.m_bPerformFontSubstitution )
{
- for( boost::unordered_map< rtl::OUString, rtl::OUString, rtl::OUStringHash >::const_iterator it = rInfo.m_aFontSubstitutes.begin(); it != rInfo.m_aFontSubstitutes.end(); ++it )
+ for( boost::unordered_map< OUString, OUString, OUStringHash >::const_iterator it = rInfo.m_aFontSubstitutes.begin(); it != rInfo.m_aFontSubstitutes.end(); ++it )
pOutDev->ImplAddDevFontSubstitute( it->first, it->second, FONT_SUBSTITUTE_ALWAYS );
}
}
@@ -1040,7 +1038,7 @@ SalLayout* GenPspGraphics::GetTextLayout( ImplLayoutArgs& rArgs, int nFallbackLe
//--------------------------------------------------------------------------
sal_Bool GenPspGraphics::CreateFontSubset(
- const rtl::OUString& rToFile,
+ const OUString& rToFile,
const PhysicalFontFace* pFont,
sal_Int32* pGlyphIDs,
sal_uInt8* pEncoding,
@@ -1171,8 +1169,8 @@ ImplDevFontAttributes GenPspGraphics::Info2DevFontAttributes( const psp::FastPri
#if OSL_DEBUG_LEVEL > 2
if( bHasMapNames )
{
- rtl::OString aOrigName(rtl::OUStringToOString(aDFA.GetFamilyName(), osl_getThreadTextEncoding()));
- rtl::OString aAliasNames(rtl::OUStringToOString(aDFA.GetAliasNames(), osl_getThreadTextEncoding()));
+ OString aOrigName(OUStringToOString(aDFA.GetFamilyName(), osl_getThreadTextEncoding()));
+ OString aAliasNames(OUStringToOString(aDFA.GetAliasNames(), osl_getThreadTextEncoding()));
SAL_INFO( "vcl.fonts", "using alias names " << aAliasNames.getStr() << " for font family " << aOrigName.getStr() );
}
#endif
@@ -1235,7 +1233,7 @@ void GenPspGraphics::AnnounceFonts( ImplDevFontList* pFontList, const psp::FastP
pFontList->Add( pFD );
}
-bool GenPspGraphics::filterText( const rtl::OUString& rOrig, rtl::OUString& rNewText, sal_Int32 nIndex, sal_Int32& rLen, sal_Int32& rCutStart, sal_Int32& rCutStop )
+bool GenPspGraphics::filterText( const OUString& rOrig, OUString& rNewText, sal_Int32 nIndex, sal_Int32& rLen, sal_Int32& rCutStart, sal_Int32& rCutStop )
{
if( ! m_pPhoneNr )
return false;
@@ -1253,7 +1251,7 @@ bool GenPspGraphics::filterText( const rtl::OUString& rOrig, rtl::OUString& rNew
sal_Int32 nPos;
sal_Int32 nStart = 0;
sal_Int32 nStop = rLen;
- rtl::OUString aPhone = rOrig.copy( nIndex, rLen );
+ OUString aPhone = rOrig.copy( nIndex, rLen );
if( ! m_bPhoneCollectionActive )
{
@@ -1282,7 +1280,7 @@ bool GenPspGraphics::filterText( const rtl::OUString& rOrig, rtl::OUString& rNew
m_aPhoneCollection += aPhone.copy( nTokenStart, nTokenStop - nTokenStart );
if( ! m_bPhoneCollectionActive )
{
- rtl::OUStringBuffer aPhoneNr;
+ OUStringBuffer aPhoneNr;
aPhoneNr.append( "<Fax#>" );
aPhoneNr.append( m_aPhoneCollection );
aPhoneNr.append( "</Fax#>" );
@@ -1303,7 +1301,7 @@ bool GenPspGraphics::filterText( const rtl::OUString& rOrig, rtl::OUString& rNew
rCutStart = nStart+nIndex;
rCutStop = nStop+nIndex;
if (rCutStart != rCutStop)
- rNewText = ( rCutStart ? rOrig.copy( 0, rCutStart ) : rtl::OUString() ) + rOrig.copy( rCutStop );
+ rNewText = ( rCutStart ? rOrig.copy( 0, rCutStart ) : OUString() ) + rOrig.copy( rCutStop );
}
return bRet && m_bSwallowFaxNo;
@@ -1391,8 +1389,8 @@ const void* GenPspGraphics::DoGetEmbedFontData( psp::fontID aFont, const sal_Ucs
*pDataLen = aStat.st_size;
#else
// FIXME: test me ! ...
- rtl::OUString aURL;
- if( !osl::File::getFileURLFromSystemPath( rtl::OStringToOUString( aSysPath, osl_getThreadTextEncoding() ), aURL ) )
+ OUString aURL;
+ if( !osl::File::getFileURLFromSystemPath( OStringToOUString( aSysPath, osl_getThreadTextEncoding() ), aURL ) )
return NULL;
osl::File aFile( aURL );
if( aFile.open( osl_File_OpenFlag_Read | osl_File_OpenFlag_NoLock ) != osl::File::E_None )
diff --git a/vcl/generic/print/glyphset.cxx b/vcl/generic/print/glyphset.cxx
index d5635e7e4d5b..d22d2c89e56d 100644
--- a/vcl/generic/print/glyphset.cxx
+++ b/vcl/generic/print/glyphset.cxx
@@ -43,10 +43,6 @@
using namespace vcl;
using namespace psp;
-using ::rtl::OUString;
-using ::rtl::OString;
-using ::rtl::OStringBuffer;
-using ::rtl::OUStringToOString;
GlyphSet::GlyphSet (sal_Int32 nFontID, sal_Bool bVertical)
: mnFontID (nFontID),
diff --git a/vcl/generic/print/glyphset.hxx b/vcl/generic/print/glyphset.hxx
index f469d9b2a3af..a062bb829b1b 100644
--- a/vcl/generic/print/glyphset.hxx
+++ b/vcl/generic/print/glyphset.hxx
@@ -42,7 +42,7 @@ private:
sal_Int32 mnFontID;
sal_Bool mbVertical;
- rtl::OString maBaseName;
+ OString maBaseName;
fonttype::type meBaseType;
rtl_TextEncoding mnBaseEncoding;
bool mbUseFontEncoding;
@@ -55,12 +55,12 @@ private:
char_list_t maCharList;
glyph_list_t maGlyphList;
- rtl::OString GetGlyphSetName (sal_Int32 nGlyphSetID);
- rtl::OString GetCharSetName (sal_Int32 nGlyphSetID);
+ OString GetGlyphSetName (sal_Int32 nGlyphSetID);
+ OString GetCharSetName (sal_Int32 nGlyphSetID);
sal_Int32 GetGlyphSetEncoding (sal_Int32 nGlyphSetID);
- rtl::OString GetGlyphSetEncodingName (sal_Int32 nGlyphSetID);
+ OString GetGlyphSetEncodingName (sal_Int32 nGlyphSetID);
- rtl::OString GetReencodedFontName (sal_Int32 nGlyphSetID);
+ OString GetReencodedFontName (sal_Int32 nGlyphSetID);
void PSDefineReencodedFont (osl::File* pOutFile,
sal_Int32 nGlyphSetID);
@@ -96,12 +96,12 @@ public:
sal_Int32 GetFontID ();
fonttype::type GetFontType ();
- static rtl::OString
+ static OString
GetReencodedFontName (rtl_TextEncoding nEnc,
- const rtl::OString &rFontName);
- static rtl::OString
+ const OString &rFontName);
+ static OString
GetGlyphSetEncodingName (rtl_TextEncoding nEnc,
- const rtl::OString &rFontName);
+ const OString &rFontName);
sal_Bool IsVertical ();
void DrawText (PrinterGfx &rGfx, const Point& rPoint,
@@ -115,7 +115,7 @@ public:
const sal_Int32* pDeltaArray,
sal_Bool bUseGlyphs=sal_True);
sal_Bool PSUploadEncoding(osl::File* pOutFile, PrinterGfx &rGfx);
- sal_Bool PSUploadFont (osl::File& rOutFile, PrinterGfx &rGfx, bool bAsType42, std::list< rtl::OString >& rSuppliedFonts );
+ sal_Bool PSUploadFont (osl::File& rOutFile, PrinterGfx &rGfx, bool bAsType42, std::list< OString >& rSuppliedFonts );
};
diff --git a/vcl/generic/print/printerjob.cxx b/vcl/generic/print/printerjob.cxx
index 2d7ada98857c..5d61ff90a9bf 100644
--- a/vcl/generic/print/printerjob.cxx
+++ b/vcl/generic/print/printerjob.cxx
@@ -47,10 +47,6 @@
using namespace psp;
-using ::rtl::OUString;
-using ::rtl::OUStringToOString;
-using ::rtl::OString;
-using ::rtl::OStringBuffer;
// forward declaration
@@ -94,16 +90,16 @@ AppendPS (FILE* pDst, osl::File* pSrc, sal_uChar* pBuffer,
*/
osl::File*
-PrinterJob::CreateSpoolFile (const rtl::OUString& rName, const rtl::OUString& rExtension)
+PrinterJob::CreateSpoolFile (const OUString& rName, const OUString& rExtension)
{
osl::File* pFile = NULL;
- rtl::OUString aFile = rName + rExtension;
- rtl::OUString aFileURL;
+ OUString aFile = rName + rExtension;
+ OUString aFileURL;
osl::File::RC nError = osl::File::getFileURLFromSystemPath( aFile, aFileURL );
if (nError != osl::File::E_None)
return NULL;
- aFileURL = maSpoolDirName + rtl::OUString("/") + aFileURL;
+ aFileURL = maSpoolDirName + OUString("/") + aFileURL;
pFile = new osl::File (aFileURL);
nError = pFile->open (osl_File_OpenFlag_Read | osl_File_OpenFlag_Write | osl_File_OpenFlag_Create);
@@ -194,9 +190,9 @@ PrinterJob::PrinterJob () :
/* remove all our temporary files, uses external program "rm", since
osl functionality is inadequate */
void
-removeSpoolDir (const rtl::OUString& rSpoolDir)
+removeSpoolDir (const OUString& rSpoolDir)
{
- rtl::OUString aSysPath;
+ OUString aSysPath;
if( osl::File::E_None != osl::File::getSystemPathFromFileURL( rSpoolDir, aSysPath ) )
{
// Conversion did not work, as this is quite a dangerous action,
@@ -204,8 +200,8 @@ removeSpoolDir (const rtl::OUString& rSpoolDir)
OSL_FAIL( "psprint: couldn't remove spool directory" );
return;
}
- rtl::OString aSysPathByte =
- rtl::OUStringToOString (aSysPath, osl_getThreadTextEncoding());
+ OString aSysPathByte =
+ OUStringToOString (aSysPath, osl_getThreadTextEncoding());
sal_Char pSystem [128];
sal_Int32 nChar = 0;
@@ -218,23 +214,23 @@ removeSpoolDir (const rtl::OUString& rSpoolDir)
/* creates a spool directory with a "pidgin random" value based on
current system time */
-rtl::OUString
+OUString
createSpoolDir ()
{
TimeValue aCur;
osl_getSystemTime( &aCur );
sal_Int32 nRand = aCur.Seconds ^ (aCur.Nanosec/1000);
- rtl::OUString aTmpDir;
+ OUString aTmpDir;
osl_getTempDirURL( &aTmpDir.pData );
do
{
- rtl::OUStringBuffer aDir( aTmpDir.getLength() + 16 );
+ OUStringBuffer aDir( aTmpDir.getLength() + 16 );
aDir.append( aTmpDir );
aDir.appendAscii( "/psp" );
aDir.append(nRand);
- rtl::OUString aResult = aDir.makeStringAndClear();
+ OUString aResult = aDir.makeStringAndClear();
if( osl::Directory::create( aResult ) == osl::FileBase::E_None )
{
osl::File::setAttributes( aResult,
@@ -245,7 +241,7 @@ createSpoolDir ()
}
nRand++;
} while( nRand );
- return rtl::OUString();
+ return OUString();
}
PrinterJob::~PrinterJob ()
@@ -293,7 +289,7 @@ static void WriteLocalTimePS( osl::File *rFile )
WritePS( rFile, "Unknown-Time" );
}
-static bool isAscii( const rtl::OUString& rStr )
+static bool isAscii( const OUString& rStr )
{
sal_Int32 nLen = rStr.getLength();
for( sal_Int32 i = 0; i < nLen; i++ )
@@ -304,10 +300,10 @@ static bool isAscii( const rtl::OUString& rStr )
sal_Bool
PrinterJob::StartJob (
- const rtl::OUString& rFileName,
+ const OUString& rFileName,
int nMode,
- const rtl::OUString& rJobName,
- const rtl::OUString& rAppName,
+ const OUString& rJobName,
+ const OUString& rAppName,
const JobData& rSetupData,
PrinterGfx* pGraphics,
bool bIsQuickJob
@@ -325,9 +321,9 @@ PrinterJob::StartJob (
maSpoolDirName = createSpoolDir ();
maJobTitle = rJobName;
- rtl::OUString aExt(".ps");
- mpJobHeader = CreateSpoolFile (rtl::OUString("psp_head"), aExt);
- mpJobTrailer = CreateSpoolFile (rtl::OUString("psp_tail"), aExt);
+ OUString aExt(".ps");
+ mpJobHeader = CreateSpoolFile (OUString("psp_head"), aExt);
+ mpJobTrailer = CreateSpoolFile (OUString("psp_tail"), aExt);
if( ! (mpJobHeader && mpJobTrailer) ) // existing files are removed in destructor
return sal_False;
@@ -336,7 +332,7 @@ PrinterJob::StartJob (
"%!PS-Adobe-3.0\n"
"%%BoundingBox: (atend)\n" );
- rtl::OUString aFilterWS;
+ OUString aFilterWS;
// Creator (this application)
aFilterWS = WhitespaceToSpace( rAppName, sal_False );
@@ -346,7 +342,7 @@ PrinterJob::StartJob (
// For (user name)
osl::Security aSecurity;
- rtl::OUString aUserName;
+ OUString aUserName;
if( aSecurity.getUserName( aUserName ) )
{
WritePS (mpJobHeader, "%%For: (");
@@ -369,7 +365,7 @@ PrinterJob::StartJob (
* else omit %%Title
*/
aFilterWS = WhitespaceToSpace( rJobName, sal_False );
- rtl::OUString aTitle( aFilterWS );
+ OUString aTitle( aFilterWS );
if( ! isAscii( aTitle ) )
{
sal_Int32 nIndex = 0;
@@ -377,7 +373,7 @@ PrinterJob::StartJob (
aTitle = rFileName.getToken( 0, '/', nIndex );
aTitle = WhitespaceToSpace( aTitle, sal_False );
if( ! isAscii( aTitle ) )
- aTitle = rtl::OUString();
+ aTitle = OUString();
}
maJobTitle = aFilterWS;
@@ -429,7 +425,7 @@ PrinterJob::EndJob ()
return sal_False;
// write document trailer according to Document Structuring Conventions (DSC)
- rtl::OStringBuffer aTrailer(512);
+ OStringBuffer aTrailer(512);
aTrailer.append( "%%Trailer\n" );
aTrailer.append( "%%BoundingBox: 0 0 " );
aTrailer.append( (sal_Int32)mnMaxWidthPt );
@@ -454,7 +450,7 @@ PrinterJob::EndJob ()
sal_Bool bSpoolToFile = !maFileName.isEmpty();
if (bSpoolToFile)
{
- const rtl::OString aFileName = rtl::OUStringToOString (maFileName,
+ const OString aFileName = OUStringToOString (maFileName,
osl_getThreadTextEncoding());
if( mnFileMode )
{
@@ -556,7 +552,7 @@ PrinterJob::InitPaperSize (const JobData& rJobSetup)
{
int nRes = rJobSetup.m_aContext.getRenderResolution ();
- rtl::OUString aPaper;
+ OUString aPaper;
int nWidth, nHeight;
rJobSetup.m_aContext.getPageSize (aPaper, nWidth, nHeight);
@@ -590,11 +586,11 @@ PrinterJob::StartPage (const JobData& rJobSetup)
{
InitPaperSize (rJobSetup);
- rtl::OUString aPageNo = rtl::OUString::valueOf ((sal_Int32)maPageList.size()+1); // sequential page number must start with 1
- rtl::OUString aExt = aPageNo + rtl::OUString(".ps");
+ OUString aPageNo = OUString::valueOf ((sal_Int32)maPageList.size()+1); // sequential page number must start with 1
+ OUString aExt = aPageNo + OUString(".ps");
- osl::File* pPageHeader = CreateSpoolFile ( rtl::OUString("psp_pghead"), aExt);
- osl::File* pPageBody = CreateSpoolFile ( rtl::OUString("psp_pgbody"), aExt);
+ osl::File* pPageHeader = CreateSpoolFile ( OUString("psp_pghead"), aExt);
+ osl::File* pPageBody = CreateSpoolFile ( OUString("psp_pgbody"), aExt);
maHeaderList.push_back (pPageHeader);
maPageList.push_back (pPageBody);
@@ -975,15 +971,15 @@ bool PrinterJob::writeSetup( osl::File* pFile, const JobData& rJob )
WritePS (pFile, "%%BeginSetup\n%\n");
// download fonts
- std::list< rtl::OString > aFonts[2];
+ std::list< OString > aFonts[2];
m_pGraphics->writeResources( pFile, aFonts[0], aFonts[1] );
for( int i = 0; i < 2; i++ )
{
if( !aFonts[i].empty() )
{
- std::list< rtl::OString >::const_iterator it = aFonts[i].begin();
- rtl::OStringBuffer aLine( 256 );
+ std::list< OString >::const_iterator it = aFonts[i].begin();
+ OStringBuffer aLine( 256 );
if( i == 0 )
aLine.append( "%%DocumentSuppliedResources: font " );
else
@@ -1009,7 +1005,7 @@ bool PrinterJob::writeSetup( osl::File* pFile, const JobData& rJob )
if( ! bExternalDialog && rJob.m_nCopies > 1 )
{
// setup code
- rtl::OStringBuffer aLine("/#copies ");
+ OStringBuffer aLine("/#copies ");
aLine.append(static_cast<sal_Int32>(rJob.m_nCopies));
aLine.append(" def\n");
sal_uInt64 nWritten = 0;
diff --git a/vcl/generic/print/psputil.cxx b/vcl/generic/print/psputil.cxx
index e2d3ca4b1a89..81da3844c5f0 100644
--- a/vcl/generic/print/psputil.cxx
+++ b/vcl/generic/print/psputil.cxx
@@ -158,7 +158,7 @@ WritePS (osl::File* pFile, const sal_Char* pString, sal_uInt64 nInLength)
}
sal_Bool
-WritePS (osl::File* pFile, const rtl::OString &rString)
+WritePS (osl::File* pFile, const OString &rString)
{
sal_uInt64 nInLength = rString.getLength();
sal_uInt64 nOutLength = 0;
@@ -170,9 +170,9 @@ WritePS (osl::File* pFile, const rtl::OString &rString)
}
sal_Bool
-WritePS (osl::File* pFile, const rtl::OUString &rString)
+WritePS (osl::File* pFile, const OUString &rString)
{
- return WritePS (pFile, rtl::OUStringToOString(rString, RTL_TEXTENCODING_ASCII_US));
+ return WritePS (pFile, OUStringToOString(rString, RTL_TEXTENCODING_ASCII_US));
}
/*
diff --git a/vcl/generic/print/psputil.hxx b/vcl/generic/print/psputil.hxx
index 9187931e8f4c..55e3d3b4c129 100644
--- a/vcl/generic/print/psputil.hxx
+++ b/vcl/generic/print/psputil.hxx
@@ -43,8 +43,8 @@ sal_Int32 appendStr (const sal_Char* pSrc, sal_Char* pDst);
sal_Bool WritePS (osl::File* pFile, const sal_Char* pString);
sal_Bool WritePS (osl::File* pFile, const sal_Char* pString, sal_uInt64 nInLength);
-sal_Bool WritePS (osl::File* pFile, const rtl::OString &rString);
-sal_Bool WritePS (osl::File* pFile, const rtl::OUString &rString);
+sal_Bool WritePS (osl::File* pFile, const OString &rString);
+sal_Bool WritePS (osl::File* pFile, const OUString &rString);
class ConverterFactory
{
diff --git a/vcl/generic/print/text_gfx.cxx b/vcl/generic/print/text_gfx.cxx
index 633b7421b612..841a9db7a355 100644
--- a/vcl/generic/print/text_gfx.cxx
+++ b/vcl/generic/print/text_gfx.cxx
@@ -118,7 +118,7 @@ PrinterGfx::SetFont(
// font and encoding will be set by drawText again immediately
// before PSShowText
mnFontID = nFontID;
- maVirtualStatus.maFont = rtl::OString();
+ maVirtualStatus.maFont = OString();
maVirtualStatus.maEncoding = RTL_TEXTENCODING_DONTKNOW;
maVirtualStatus.mnTextHeight = nHeight;
maVirtualStatus.mnTextWidth = nWidth;
@@ -531,13 +531,13 @@ PrinterGfx::LicenseWarning(const Point& rPoint, const sal_Unicode* pStr,
// they are installed on displays and printers, but get not embedded in
// print files or documents because they are not licensed for use outside
// the company.
- rtl::OString aMessage( "The font " );
- aMessage += rtl::OUStringToOString( mrFontMgr.getPSName(mnFontID),
+ OString aMessage( "The font " );
+ aMessage += OUStringToOString( mrFontMgr.getPSName(mnFontID),
RTL_TEXTENCODING_ASCII_US );
aMessage += " could not be downloaded\nbecause its license does not allow for that";
PSComment( aMessage.getStr() );
- rtl::OString aFontName = rtl::OUStringToOString(
+ OString aFontName = OUStringToOString(
mrFontMgr.getPSName(mnFontID),
RTL_TEXTENCODING_ASCII_US);
PSSetFont (aFontName, RTL_TEXTENCODING_ISO_8859_1);
@@ -706,21 +706,21 @@ PrinterGfx::OnEndJob ()
}
void
-PrinterGfx::writeResources( osl::File* pFile, std::list< rtl::OString >& rSuppliedFonts, std::list< rtl::OString >& rNeededFonts )
+PrinterGfx::writeResources( osl::File* pFile, std::list< OString >& rSuppliedFonts, std::list< OString >& rNeededFonts )
{
// write all type 1 fonts
std::list< sal_Int32 >::iterator aFont;
// already in the document header ?
for (aFont = maPS1Font.begin(); aFont != maPS1Font.end(); ++aFont)
{
- const rtl::OString& rSysPath (mrFontMgr.getFontFileSysPath(*aFont) );
- rtl::OUString aUNCPath;
+ const OString& rSysPath (mrFontMgr.getFontFileSysPath(*aFont) );
+ OUString aUNCPath;
osl::File::getFileURLFromSystemPath (OStringToOUString (rSysPath, osl_getThreadTextEncoding()), aUNCPath);
osl::File aFontFile (aUNCPath);
// provide the pfb or pfa font as a (pfa-)font resource
- rtl::OString aPostScriptName =
- rtl::OUStringToOString ( mrFontMgr.getPSName(*aFont),
+ OString aPostScriptName =
+ OUStringToOString ( mrFontMgr.getPSName(*aFont),
RTL_TEXTENCODING_ASCII_US );
WritePS (pFile, "%%BeginResource: font ");
@@ -763,7 +763,7 @@ PrinterGfx::writeResources( osl::File* pFile, std::list< rtl::OString >& rSuppli
aIter->PSUploadEncoding (pFile, *this);
if( aIter->GetFontType() == fonttype::Builtin )
rNeededFonts.push_back(
- rtl::OUStringToOString(
+ OUStringToOString(
mrFontMgr.getPSName( aIter->GetFontID() ),
RTL_TEXTENCODING_ASCII_US ) );
}
diff --git a/vcl/headless/svpelement.cxx b/vcl/headless/svpelement.cxx
index 5458fe8a7539..8b6f3604ca41 100644
--- a/vcl/headless/svpelement.cxx
+++ b/vcl/headless/svpelement.cxx
@@ -158,21 +158,21 @@ IMPL_LINK( SvpElementContainer, processRequest, void*, pSocket )
{
int nFile = (int)pSocket;
- rtl::OStringBuffer aBuf( 256 ), aAnswer( 256 );
+ OStringBuffer aBuf( 256 ), aAnswer( 256 );
char c;
while( read( nFile, &c, 1 ) && c != '\n' )
aBuf.append( sal_Char(c) );
- rtl::OString aCommand( aBuf.makeStringAndClear() );
+ OString aCommand( aBuf.makeStringAndClear() );
if( aCommand.startsWith( "list" ) )
{
- boost::unordered_map< rtl::OString, std::list<SvpElement*>, rtl::OStringHash > aMap;
+ boost::unordered_map< OString, std::list<SvpElement*>, OStringHash > aMap;
for( std::list< SvpElement* >::const_iterator it = m_aElements.begin();
it != m_aElements.end(); ++it )
{
std::list<SvpElement*>& rList = aMap[matchType(*it)];
rList.push_back( *it );
}
- for( boost::unordered_map< rtl::OString, std::list<SvpElement*>, rtl::OStringHash>::const_iterator hash_it = aMap.begin();
+ for( boost::unordered_map< OString, std::list<SvpElement*>, OStringHash>::const_iterator hash_it = aMap.begin();
hash_it != aMap.end(); ++hash_it )
{
aAnswer.append( "ElementType: " );
diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx
index 41f4629cf75c..18c84f3ef9e5 100644
--- a/vcl/headless/svpframe.cxx
+++ b/vcl/headless/svpframe.cxx
@@ -191,7 +191,7 @@ void SvpSalFrame::PostPaint(bool bImmediate) const
}
}
-void SvpSalFrame::SetTitle( const rtl::OUString& )
+void SvpSalFrame::SetTitle( const OUString& )
{
}
@@ -400,9 +400,9 @@ void SvpSalFrame::EndExtTextInput( sal_uInt16 )
{
}
-rtl::OUString SvpSalFrame::GetKeyName( sal_uInt16 )
+OUString SvpSalFrame::GetKeyName( sal_uInt16 )
{
- return rtl::OUString();
+ return OUString();
}
sal_Bool SvpSalFrame::MapUnicodeToKeyCode( sal_Unicode, LanguageType, KeyCode& )
diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index 96733ec97d8c..2c4412fb2705 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -48,7 +48,7 @@ rDevice
{
#if OSL_DEBUG_LEVEL > 2
static int dbgStreamNum = 0;
- rtl::OStringBuffer aBuf( 256 );
+ OStringBuffer aBuf( 256 );
aBuf.append( "debug" );
mkdir( aBuf.getStr(), 0777 );
aBuf.append( "/" );
diff --git a/vcl/headless/svptext.cxx b/vcl/headless/svptext.cxx
index 1e748231b637..717579f8e90a 100644
--- a/vcl/headless/svptext.cxx
+++ b/vcl/headless/svptext.cxx
@@ -341,7 +341,7 @@ void SvpSalGraphics::GetDevFontList( ImplDevFontList* pDevFontList )
// inform GlyphCache about this font provided by the PsPrint subsystem
ImplDevFontAttributes aDFA = GenPspGraphics::Info2DevFontAttributes( aInfo );
aDFA.mnQuality += 4096;
- const rtl::OString& rFileName = rMgr.getFontFileSysPath( aInfo.m_nID );
+ const OString& rFileName = rMgr.getFontFileSysPath( aInfo.m_nID );
rGC.AddFontFile( rFileName, nFaceNum, aInfo.m_nID, aDFA, pExtraKernInfo );
}
diff --git a/vcl/inc/aqua/atsui/salgdi.h b/vcl/inc/aqua/atsui/salgdi.h
index 2faf8462fe1a..cb5941b9fce9 100644
--- a/vcl/inc/aqua/atsui/salgdi.h
+++ b/vcl/inc/aqua/atsui/salgdi.h
@@ -221,9 +221,9 @@ public:
const Point& aPos, sal_Bool& rIsInside );
virtual sal_Bool drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
ControlState nState, const ImplControlValue& aValue,
- const rtl::OUString& aCaption );
+ const OUString& aCaption );
virtual sal_Bool getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState,
- const ImplControlValue& aValue, const rtl::OUString& aCaption,
+ const ImplControlValue& aValue, const OUString& aCaption,
Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion );
// get device resolution
@@ -270,7 +270,7 @@ public:
// graphics should call ImplAddDevFontSubstitute on supplied
// OutputDevice for all its device specific preferred font substitutions
virtual void GetDevFontSubstList( OutputDevice* );
- virtual bool AddTempDevFont( ImplDevFontList*, const rtl::OUString& rFileURL, const rtl::OUString& rFontName );
+ virtual bool AddTempDevFont( ImplDevFontList*, const OUString& rFileURL, const OUString& rFontName );
// CreateFontSubset: a method to get a subset of glyhps of a font
// inside a new valid font file
// returns TRUE if creation of subset was successfull
@@ -283,7 +283,7 @@ public:
// rInfo: additional outgoing information
// implementation note: encoding 0 with glyph id 0 should be added implicitly
// as "undefined character"
- virtual sal_Bool CreateFontSubset( const rtl::OUString& rToFile,
+ virtual sal_Bool CreateFontSubset( const OUString& rToFile,
const PhysicalFontFace* pFont,
sal_Int32* pGlyphIDs,
sal_uInt8* pEncoding,
diff --git a/vcl/inc/aqua/salframe.h b/vcl/inc/aqua/salframe.h
index 39d9496a9fe0..ade5438ac580 100644
--- a/vcl/inc/aqua/salframe.h
+++ b/vcl/inc/aqua/salframe.h
@@ -107,9 +107,9 @@ public:
virtual SalGraphics* GetGraphics();
virtual void ReleaseGraphics( SalGraphics* pGraphics );
virtual sal_Bool PostEvent( void* pData );
- virtual void SetTitle( const rtl::OUString& rTitle );
+ virtual void SetTitle( const OUString& rTitle );
virtual void SetIcon( sal_uInt16 nIcon );
- virtual void SetRepresentedURL( const rtl::OUString& );
+ virtual void SetRepresentedURL( const OUString& );
virtual void SetMenu( SalMenu* pSalMenu );
virtual void DrawMenuBar();
virtual void Show( sal_Bool bVisible, sal_Bool bNoActivate = sal_False );
@@ -134,7 +134,7 @@ public:
virtual void Sync();
virtual void SetInputContext( SalInputContext* pContext );
virtual void EndExtTextInput( sal_uInt16 nFlags );
- virtual rtl::OUString GetKeyName( sal_uInt16 nKeyCode );
+ virtual OUString GetKeyName( sal_uInt16 nKeyCode );
virtual sal_Bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode );
virtual LanguageType GetInputLanguage();
virtual void UpdateSettings( AllSettings& rSettings );
@@ -147,7 +147,7 @@ public:
virtual bool SetPluginParent( SystemParentData* pNewParent );
virtual void SetExtendedFrameStyle( SalExtStyle );
virtual void SetScreenNumber(unsigned int);
- virtual void SetApplicationID( const rtl::OUString &rApplicationID );
+ virtual void SetApplicationID( const OUString &rApplicationID );
// shaped system windows
// set clip region to none (-> rectangular windows, normal state)
diff --git a/vcl/inc/aqua/salinst.h b/vcl/inc/aqua/salinst.h
index 7498d57ee7cb..89469c779ae7 100644
--- a/vcl/inc/aqua/salinst.h
+++ b/vcl/inc/aqua/salinst.h
@@ -67,7 +67,7 @@ class AquaSalInstance : public SalInstance
public:
SalYieldMutex* mpSalYieldMutex; // Sal-Yield-Mutex
- rtl::OUString maDefaultPrinter;
+ OUString maDefaultPrinter;
oslThreadIdentifier maMainThread;
bool mbWaitingYield;
int mnActivePrintJobs;
@@ -102,7 +102,7 @@ public:
virtual void GetPrinterQueueInfo( ImplPrnQueueList* pList );
virtual void GetPrinterQueueState( SalPrinterQueueInfo* pInfo );
virtual void DeletePrinterQueueInfo( SalPrinterQueueInfo* pInfo );
- virtual rtl::OUString GetDefaultPrinter();
+ virtual OUString GetDefaultPrinter();
virtual SalTimer* CreateSalTimer();
virtual SalI18NImeStatus* CreateI18NImeStatus();
virtual SalSystem* CreateSalSystem();
@@ -119,7 +119,7 @@ public:
virtual void DestroyMenuItem( SalMenuItem* );
virtual SalSession* CreateSalSession();
virtual void* GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes );
- virtual void AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType);
+ virtual void AddToRecentDocumentList(const OUString& rFileUrl, const OUString& rMimeType);
virtual void SetEventCallback( void* pInstance, bool(*pCallback)(void*,void*,int) );
virtual void SetErrorEventCallback( void* pInstance, bool(*pCallback)(void*,void*,int) );
@@ -133,7 +133,7 @@ public:
// check whether a particular string is passed on the command line
// this is needed to avoid duplicate open events through a) command line and b) NSApp's openFile
- static bool isOnCommandLine( const rtl::OUString& );
+ static bool isOnCommandLine( const OUString& );
void wakeupYield();
diff --git a/vcl/inc/aqua/salmenu.h b/vcl/inc/aqua/salmenu.h
index 2f0383f53476..326bcd7f4cf2 100644
--- a/vcl/inc/aqua/salmenu.h
+++ b/vcl/inc/aqua/salmenu.h
@@ -65,9 +65,9 @@ public:
virtual void SetFrame( const SalFrame* pFrame );
virtual void CheckItem( unsigned nPos, sal_Bool bCheck );
virtual void EnableItem( unsigned nPos, sal_Bool bEnable );
- virtual void SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const rtl::OUString& rText );
+ virtual void SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const OUString& rText );
virtual void SetItemImage( unsigned nPos, SalMenuItem* pSalMenuItem, const Image& rImage);
- virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const KeyCode& rKeyCode, const rtl::OUString& rKeyName );
+ virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const KeyCode& rKeyCode, const OUString& rKeyName );
virtual void GetSystemMenuData( SystemMenuData* pData );
virtual bool ShowNativePopupMenu(FloatingWindow * pWin, const Rectangle& rRect, sal_uLong nFlags);
virtual bool AddMenuBarButton( const SalMenuButtonItem& );
diff --git a/vcl/inc/aqua/salprn.h b/vcl/inc/aqua/salprn.h
index 5245d6912c1f..443cbe421e4f 100644
--- a/vcl/inc/aqua/salprn.h
+++ b/vcl/inc/aqua/salprn.h
@@ -82,7 +82,7 @@ class AquaSalInfoPrinter : public SalInfoPrinter
long& o_rPageWidth, long& o_rPageHeight );
virtual sal_uLong GetCapabilities( const ImplJobSetup* i_pSetupData, sal_uInt16 i_nType );
virtual sal_uLong GetPaperBinCount( const ImplJobSetup* i_pSetupData );
- virtual rtl::OUString GetPaperBinName( const ImplJobSetup* i_pSetupData, sal_uLong i_nPaperBin );
+ virtual OUString GetPaperBinName( const ImplJobSetup* i_pSetupData, sal_uLong i_nPaperBin );
virtual void InitPaperFormats( const ImplJobSetup* i_pSetupData );
virtual int GetLandscapeAngle( const ImplJobSetup* i_pSetupData );
@@ -91,9 +91,9 @@ class AquaSalInfoPrinter : public SalInfoPrinter
// so let's make AquaSalPrinter just a forwarder to AquaSalInfoPrinter
// and concentrate the real work in one class
// implement pull model print system
- sal_Bool StartJob( const rtl::OUString* i_pFileName,
- const rtl::OUString& rJobName,
- const rtl::OUString& i_rAppName,
+ sal_Bool StartJob( const OUString* i_pFileName,
+ const OUString& rJobName,
+ const OUString& i_rAppName,
ImplJobSetup* i_pSetupData,
vcl::PrinterController& i_rController );
sal_Bool EndJob();
@@ -127,17 +127,17 @@ class AquaSalPrinter : public SalPrinter
AquaSalPrinter( AquaSalInfoPrinter* i_pInfoPrinter );
virtual ~AquaSalPrinter();
- virtual sal_Bool StartJob( const rtl::OUString* i_pFileName,
- const rtl::OUString& i_rJobName,
- const rtl::OUString& i_rAppName,
+ virtual sal_Bool StartJob( const OUString* i_pFileName,
+ const OUString& i_rJobName,
+ const OUString& i_rAppName,
sal_uLong i_nCopies,
bool i_bCollate,
bool i_bDirect,
ImplJobSetup* i_pSetupData );
// implement pull model print system
- virtual sal_Bool StartJob( const rtl::OUString* i_pFileName,
- const rtl::OUString& rJobName,
- const rtl::OUString& i_rAppName,
+ virtual sal_Bool StartJob( const OUString* i_pFileName,
+ const OUString& rJobName,
+ const OUString& i_rAppName,
ImplJobSetup* i_pSetupData,
vcl::PrinterController& i_rListener );
diff --git a/vcl/inc/aqua/salsys.h b/vcl/inc/aqua/salsys.h
index 1a8bc8716b54..38bbe8a737c2 100644
--- a/vcl/inc/aqua/salsys.h
+++ b/vcl/inc/aqua/salsys.h
@@ -39,9 +39,9 @@ public:
virtual Rectangle GetDisplayScreenPosSizePixel( unsigned int nScreen );
virtual Rectangle GetDisplayScreenWorkAreaPosSizePixel( unsigned int nScreen );
- virtual rtl::OUString GetDisplayScreenName( unsigned int nScreen );
- virtual int ShowNativeMessageBox( const rtl::OUString& rTitle,
- const rtl::OUString& rMessage,
+ virtual OUString GetDisplayScreenName( unsigned int nScreen );
+ virtual int ShowNativeMessageBox( const OUString& rTitle,
+ const OUString& rMessage,
int nButtonCombination,
int nDefaultButton, bool bUseResources);
};
diff --git a/vcl/inc/coretext/salgdi.h b/vcl/inc/coretext/salgdi.h
index 4ca5eb638a67..220e2e368781 100644
--- a/vcl/inc/coretext/salgdi.h
+++ b/vcl/inc/coretext/salgdi.h
@@ -183,10 +183,10 @@ public:
const Point& aPos, sal_Bool& rIsInside );
virtual sal_Bool drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
ControlState nState, const ImplControlValue& aValue,
- const rtl::OUString& aCaption );
+ const OUString& aCaption );
virtual sal_Bool getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
ControlState nState, const ImplControlValue& aValue,
- const rtl::OUString& aCaption,
+ const OUString& aCaption,
Rectangle &rNativeBoundingRegion,
Rectangle &rNativeContentRegion );
@@ -234,8 +234,8 @@ public:
// graphics should call ImplAddDevFontSubstitute on supplied
// OutputDevice for all its device specific preferred font substitutions
virtual void GetDevFontSubstList( OutputDevice* );
- virtual bool AddTempDevFont( ImplDevFontList*, const rtl::OUString& rFileURL,
- const rtl::OUString& rFontName );
+ virtual bool AddTempDevFont( ImplDevFontList*, const OUString& rFileURL,
+ const OUString& rFontName );
// CreateFontSubset: a method to get a subset of glyhps of a font
// inside a new valid font file
// returns TRUE if creation of subset was successfull
@@ -248,7 +248,7 @@ public:
// rInfo: additional outgoing information
// implementation note: encoding 0 with glyph id 0 should be added implicitly
// as "undefined character"
- virtual sal_Bool CreateFontSubset( const rtl::OUString& rToFile,
+ virtual sal_Bool CreateFontSubset( const OUString& rToFile,
const PhysicalFontFace* pFont,
sal_Int32* pGlyphIDs,
sal_uInt8* pEncoding,
diff --git a/vcl/inc/cupsmgr.hxx b/vcl/inc/cupsmgr.hxx
index 02346cd31069..9a84b7790889 100644
--- a/vcl/inc/cupsmgr.hxx
+++ b/vcl/inc/cupsmgr.hxx
@@ -38,19 +38,19 @@ struct FPtrHash
class CUPSManager : public PrinterInfoManager
{
- boost::unordered_map< FILE*, rtl::OString, FPtrHash > m_aSpoolFiles;
+ boost::unordered_map< FILE*, OString, FPtrHash > m_aSpoolFiles;
int m_nDests;
void* m_pDests;
bool m_bNewDests;
- boost::unordered_map< rtl::OUString, int, rtl::OUStringHash > m_aCUPSDestMap;
+ boost::unordered_map< OUString, int, OUStringHash > m_aCUPSDestMap;
- boost::unordered_map< rtl::OUString, PPDContext, rtl::OUStringHash > m_aDefaultContexts;
+ boost::unordered_map< OUString, PPDContext, OUStringHash > m_aDefaultContexts;
- rtl::OString m_aUser;
+ OString m_aUser;
// this is a security risk, but the CUPS API demands
// to deliver a pointer to a static buffer containing
// the password, so this cannot be helped
- rtl::OString m_aPassword;
+ OString m_aPassword;
osl::Mutex m_aCUPSMutex;
oslThread m_aDestThread;
@@ -72,27 +72,27 @@ public:
static CUPSManager* tryLoadCUPS();
- const PPDParser* createCUPSParser( const rtl::OUString& rPrinter );
+ const PPDParser* createCUPSParser( const OUString& rPrinter );
// wraps cupsGetPPD, so unlink after use !
const char* authenticateUser( const char* );
- virtual FILE* startSpool( const rtl::OUString& rPrinterName, bool bQuickCommand );
- virtual int endSpool( const rtl::OUString& rPrinterName, const rtl::OUString& rJobTitle, FILE* pFile, const JobData& rDocumentJobData, bool bBanner );
+ virtual FILE* startSpool( const OUString& rPrinterName, bool bQuickCommand );
+ virtual int endSpool( const OUString& rPrinterName, const OUString& rJobTitle, FILE* pFile, const JobData& rDocumentJobData, bool bBanner );
virtual void setupJobContextData( JobData& rData );
// changes the info about a named printer
- virtual void changePrinterInfo( const ::rtl::OUString& rPrinter, const PrinterInfo& rNewInfo );
+ virtual void changePrinterInfo( const OUString& rPrinter, const PrinterInfo& rNewInfo );
// check if the printer configuration has changed
virtual bool checkPrintersChanged( bool bWait );
// members for administration (->padmin)
// disable for CUPS
- virtual bool addPrinter( const rtl::OUString& rPrinterName, const ::rtl::OUString& rDriverName );
- virtual bool removePrinter( const rtl::OUString& rPrinterName, bool bCheckOnly = false );
+ virtual bool addPrinter( const OUString& rPrinterName, const OUString& rDriverName );
+ virtual bool removePrinter( const OUString& rPrinterName, bool bCheckOnly = false );
virtual bool writePrinterConfig();
- virtual bool setDefaultPrinter( const rtl::OUString& rPrinterName );
+ virtual bool setDefaultPrinter( const OUString& rPrinterName );
virtual bool addOrRemovePossible() const;
};
diff --git a/vcl/inc/fontcache.hxx b/vcl/inc/fontcache.hxx
index 8a9e736605d6..ad2a8bbd10ac 100644
--- a/vcl/inc/fontcache.hxx
+++ b/vcl/inc/fontcache.hxx
@@ -43,7 +43,7 @@ class VCL_PLUGIN_PUBLIC FontCache
FontCacheEntry m_aEntry;
};
- typedef boost::unordered_map< ::rtl::OString, FontFile, ::rtl::OStringHash > FontDirMap;
+ typedef boost::unordered_map< OString, FontFile, OStringHash > FontDirMap;
struct FontDir
{
sal_Int64 m_nTimestamp;
@@ -71,15 +71,15 @@ public:
FontCache();
~FontCache();
- bool getFontCacheFile( int nDirID, const rtl::OString& rFile, std::list< PrintFontManager::PrintFont* >& rNewFonts ) const;
+ bool getFontCacheFile( int nDirID, const OString& rFile, std::list< PrintFontManager::PrintFont* >& rNewFonts ) const;
void updateFontCacheEntry( const PrintFontManager::PrintFont*, bool bFlush );
void markEmptyDir( int nDirID, bool bNoFiles = true );
// returns false for non cached directory
// a cached but empty directory will return true but not append anything
- bool listDirectory( const rtl::OString& rDir, std::list< PrintFontManager::PrintFont* >& rNewFonts ) const;
+ bool listDirectory( const OString& rDir, std::list< PrintFontManager::PrintFont* >& rNewFonts ) const;
// returns true for directoris that contain only user overridden fonts
- bool scanAdditionalFiles( const rtl::OString& rDir );
+ bool scanAdditionalFiles( const OString& rDir );
void flush();
};
diff --git a/vcl/inc/generic/gendata.hxx b/vcl/inc/generic/gendata.hxx
index 67226b0a5239..123544f0e38c 100644
--- a/vcl/inc/generic/gendata.hxx
+++ b/vcl/inc/generic/gendata.hxx
@@ -49,9 +49,9 @@ class VCL_DLLPUBLIC SalGenericData : public SalData
SalGenericDataType m_eType;
SalGenericDisplay *m_pDisplay;
// cached hostname to avoid slow lookup
- rtl::OUString m_aHostname;
+ OUString m_aHostname;
// for transient storage of unicode strings eg. 'u123' by input methods
- rtl::OUString m_aUnicodeEntry;
+ OUString m_aUnicodeEntry;
public:
SalGenericData( SalGenericDataType t, SalInstance *pInstance ) : SalData(), m_eType( t ), m_pDisplay( NULL ) { m_pInstance = pInstance; SetSalData( this ); }
virtual ~SalGenericData() {}
@@ -60,13 +60,13 @@ class VCL_DLLPUBLIC SalGenericData : public SalData
SalGenericDisplay *GetDisplay() const { return m_pDisplay; }
void SetDisplay( SalGenericDisplay *pDisp ) { m_pDisplay = pDisp; }
- const rtl::OUString& GetHostname()
+ const OUString& GetHostname()
{
if (m_aHostname.isEmpty())
osl_getLocalHostname( &m_aHostname.pData );
return m_aHostname;
}
- rtl::OUString &GetUnicodeCommand()
+ OUString &GetUnicodeCommand()
{
return m_aUnicodeEntry;
}
diff --git a/vcl/inc/generic/geninst.h b/vcl/inc/generic/geninst.h
index 9e2b5ca47512..de47409e4fff 100644
--- a/vcl/inc/generic/geninst.h
+++ b/vcl/inc/generic/geninst.h
@@ -95,7 +95,7 @@ public:
virtual void GetPrinterQueueInfo ( ImplPrnQueueList* pList );
virtual void GetPrinterQueueState ( SalPrinterQueueInfo* pInfo );
virtual void DeletePrinterQueueInfo ( SalPrinterQueueInfo* pInfo );
- virtual rtl::OUString GetDefaultPrinter();
+ virtual OUString GetDefaultPrinter();
virtual void PostPrintersChanged() = 0;
virtual void updatePrinterUpdate();
virtual void jobStartedPrinterUpdate();
diff --git a/vcl/inc/generic/genprn.h b/vcl/inc/generic/genprn.h
index d7397b4d01d7..698cc3e95dfc 100644
--- a/vcl/inc/generic/genprn.h
+++ b/vcl/inc/generic/genprn.h
@@ -49,7 +49,7 @@ public:
long& rPageWidth, long& rPageHeight );
virtual sal_uIntPtr GetCapabilities( const ImplJobSetup* pSetupData, sal_uInt16 nType );
virtual sal_uIntPtr GetPaperBinCount( const ImplJobSetup* pSetupData );
- virtual rtl::OUString GetPaperBinName( const ImplJobSetup* pSetupData, sal_uIntPtr nPaperBin );
+ virtual OUString GetPaperBinName( const ImplJobSetup* pSetupData, sal_uIntPtr nPaperBin );
virtual void InitPaperFormats( const ImplJobSetup* pSetupData );
virtual int GetLandscapeAngle( const ImplJobSetup* pSetupData );
};
@@ -57,9 +57,9 @@ public:
class VCL_DLLPUBLIC PspSalPrinter : public SalPrinter
{
public:
- rtl::OUString m_aFileName;
- rtl::OUString m_aTmpFile;
- rtl::OUString m_aFaxNr;
+ OUString m_aFileName;
+ OUString m_aTmpFile;
+ OUString m_aFaxNr;
bool m_bFax:1;
bool m_bPdf:1;
bool m_bSwallowFaxNo:1;
@@ -76,16 +76,16 @@ public:
virtual ~PspSalPrinter();
// overload all pure virtual methods
- virtual sal_Bool StartJob( const rtl::OUString* pFileName,
- const rtl::OUString& rJobName,
- const rtl::OUString& rAppName,
+ virtual sal_Bool StartJob( const OUString* pFileName,
+ const OUString& rJobName,
+ const OUString& rAppName,
sal_uIntPtr nCopies,
bool bCollate,
bool bDirect,
ImplJobSetup* pSetupData );
- virtual sal_Bool StartJob( const rtl::OUString*,
- const rtl::OUString&,
- const rtl::OUString&,
+ virtual sal_Bool StartJob( const OUString*,
+ const OUString&,
+ const OUString&,
ImplJobSetup*,
vcl::PrinterController& i_rController );
virtual sal_Bool EndJob();
diff --git a/vcl/inc/generic/genpspgraphics.h b/vcl/inc/generic/genpspgraphics.h
index 36c0e609fa67..4a1d8a00aa2b 100644
--- a/vcl/inc/generic/genpspgraphics.h
+++ b/vcl/inc/generic/genpspgraphics.h
@@ -39,9 +39,9 @@ class VCL_DLLPUBLIC GenPspGraphics : public SalGraphics
protected:
psp::JobData* m_pJobData;
psp::PrinterGfx* m_pPrinterGfx;
- rtl::OUString* m_pPhoneNr;
+ OUString* m_pPhoneNr;
bool m_bSwallowFaxNo;
- rtl::OUString m_aPhoneCollection;
+ OUString m_aPhoneCollection;
bool m_bPhoneCollectionActive;
ServerFont* m_pServerFont[ MAX_FALLBACK ];
@@ -52,7 +52,7 @@ public:
virtual ~GenPspGraphics();
void Init( psp::JobData* pJob, psp::PrinterGfx* pGfx,
- rtl::OUString* pPhone, bool bSwallow,
+ OUString* pPhone, bool bSwallow,
SalInfoPrinter* pInfoPrinter );
// helper methods
@@ -97,9 +97,9 @@ public:
// graphics must drop any cached font info
virtual void ClearDevFontCache();
virtual void GetDevFontSubstList( OutputDevice* );
- virtual bool AddTempDevFont( ImplDevFontList*, const rtl::OUString& rFileURL, const rtl::OUString& rFontName );
+ virtual bool AddTempDevFont( ImplDevFontList*, const OUString& rFileURL, const OUString& rFontName );
- virtual sal_Bool CreateFontSubset( const rtl::OUString& rToFile,
+ virtual sal_Bool CreateFontSubset( const OUString& rToFile,
const PhysicalFontFace*,
sal_Int32* pGlyphIDs,
sal_uInt8* pEncoding,
@@ -175,7 +175,7 @@ public:
virtual void invert( sal_uIntPtr nPoints, const SalPoint* pPtAry, SalInvert nFlags );
virtual sal_Bool drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uIntPtr nSize );
- virtual bool filterText( const rtl::OUString& rOrigText, rtl::OUString& rNewText, sal_Int32 nIndex, sal_Int32& rLen, sal_Int32& rCutStart, sal_Int32& rCutStop );
+ virtual bool filterText( const OUString& rOrigText, OUString& rNewText, sal_Int32 nIndex, sal_Int32& rLen, sal_Int32& rCutStart, sal_Int32& rCutStop );
virtual bool drawAlphaBitmap( const SalTwoRect&,
const SalBitmap& rSourceBitmap,
diff --git a/vcl/inc/generic/gensys.h b/vcl/inc/generic/gensys.h
index d51f222a4855..d60cc1766b14 100644
--- a/vcl/inc/generic/gensys.h
+++ b/vcl/inc/generic/gensys.h
@@ -33,13 +33,13 @@ class VCL_DLLPUBLIC SalGenericSystem : public SalSystem
public:
SalGenericSystem();
virtual ~SalGenericSystem();
- virtual int ShowNativeDialog( const rtl::OUString& rTitle,
- const rtl::OUString& rMessage,
- const std::list< rtl::OUString >& rButtons,
+ virtual int ShowNativeDialog( const OUString& rTitle,
+ const OUString& rMessage,
+ const std::list< OUString >& rButtons,
int nDefButton ) = 0;
- virtual int ShowNativeMessageBox( const rtl::OUString& rTitle,
- const rtl::OUString& rMessage,
+ virtual int ShowNativeMessageBox( const OUString& rTitle,
+ const OUString& rMessage,
int nButtonCombination,
int nDefaultButton, bool bUseResources);
@@ -47,7 +47,7 @@ class VCL_DLLPUBLIC SalGenericSystem : public SalSystem
// Simple helpers for X11 WM_CLASS hints
static const char *getFrameResName();
static const char *getFrameClassName();
- static rtl::OString getFrameResName( SalExtStyle nStyle );
+ static OString getFrameResName( SalExtStyle nStyle );
#endif
};
diff --git a/vcl/inc/generic/glyphcache.hxx b/vcl/inc/generic/glyphcache.hxx
index 033b6463e984..24cda3c21040 100644
--- a/vcl/inc/generic/glyphcache.hxx
+++ b/vcl/inc/generic/glyphcache.hxx
@@ -72,7 +72,7 @@ public:
static GlyphCache& GetInstance();
- void AddFontFile( const rtl::OString& rNormalizedName,
+ void AddFontFile( const OString& rNormalizedName,
int nFaceNum, sal_IntPtr nFontId, const ImplDevFontAttributes&,
const ExtraKernInfo* = NULL );
void AnnounceFonts( ImplDevFontList* ) const;
@@ -184,7 +184,7 @@ public:
ServerFont( const FontSelectPattern&, FtFontInfo* );
virtual ~ServerFont();
- const ::rtl::OString* GetFontFileName() const;
+ const OString* GetFontFileName() const;
bool TestFont() const;
FT_Face GetFtFace() const;
int GetLoadFlags() const { return (mnLoadFlags & ~FT_LOAD_IGNORE_TRANSFORM); }
diff --git a/vcl/inc/generic/printergfx.hxx b/vcl/inc/generic/printergfx.hxx
index d69837e05d97..68a1069c07dc 100644
--- a/vcl/inc/generic/printergfx.hxx
+++ b/vcl/inc/generic/printergfx.hxx
@@ -160,7 +160,7 @@ typedef enum {
struct GraphicsStatus
{
- rtl::OString maFont;
+ OString maFont;
rtl_TextEncoding maEncoding;
bool mbArtItalic;
bool mbArtBold;
@@ -264,7 +264,7 @@ public:
{ maVirtualStatus.maColor = rColor; }
void PSUploadPS1Font (sal_Int32 nFontID);
- void PSSetFont (const rtl::OString& rName,
+ void PSSetFont (const OString& rName,
rtl_TextEncoding nEncoding = RTL_TEXTENCODING_DONTKNOW)
{ maVirtualStatus.maFont = rName; maVirtualStatus.maEncoding = nEncoding; }
@@ -302,7 +302,7 @@ public:
void OnEndPage ();
void OnEndJob ();
- void writeResources( osl::File* pFile, std::list< rtl::OString >& rSuppliedFonts, std::list< rtl::OString >& rNeededFonts );
+ void writeResources( osl::File* pFile, std::list< OString >& rSuppliedFonts, std::list< OString >& rNeededFonts );
PrintFontManager& GetFontMgr () { return mrFontMgr; }
void drawVerticalizedText (const Point& rPoint,
diff --git a/vcl/inc/generic/printerjob.hxx b/vcl/inc/generic/printerjob.hxx
index 055b92d5a944..b60cc098323b 100644
--- a/vcl/inc/generic/printerjob.hxx
+++ b/vcl/inc/generic/printerjob.hxx
@@ -36,9 +36,9 @@ class PrinterJob
{
private: // private data
- rtl::OUString maSpoolDirName;
- rtl::OUString maFileName; // empty: spool to command, else spool to named file
- rtl::OUString maJobTitle;
+ OUString maSpoolDirName;
+ OUString maFileName; // empty: spool to command, else spool to named file
+ OUString maJobTitle;
int mnFileMode;
osl::File* mpJobHeader;
@@ -73,8 +73,8 @@ private: // private data
private: // private methods
- osl::File* CreateSpoolFile (const rtl::OUString& rName,
- const rtl::OUString& rExtension);
+ osl::File* CreateSpoolFile (const OUString& rName,
+ const OUString& rExtension);
void InitPaperSize (const JobData& rJobSetup);
bool writeFeatureList( osl::File* pFile, const JobData&, bool bDocumentSetup );
@@ -94,7 +94,7 @@ public: // for usage in PrinterGfx
osl::File* GetCurrentPageHeader ();
osl::File* GetCurrentPageBody ();
- const ::rtl::OUString& GetPrinterName() const { return m_aLastJobData.m_aPrinterName; }
+ const OUString& GetPrinterName() const { return m_aLastJobData.m_aPrinterName; }
public:
PrinterJob ();
@@ -114,10 +114,10 @@ public:
* the quick command for spooling should be used instead
* of the normal command
*/
- sal_Bool StartJob (const rtl::OUString& rFileName,
+ sal_Bool StartJob (const OUString& rFileName,
int nMode,
- const rtl::OUString& rJobName,
- const rtl::OUString& rAppName,
+ const OUString& rJobName,
+ const OUString& rAppName,
const JobData& rSetupData,
PrinterGfx* pGraphics,
bool bIsQuickJob
diff --git a/vcl/inc/graphite_features.hxx b/vcl/inc/graphite_features.hxx
index 26ff9b49198e..da8e619fd64c 100644
--- a/vcl/inc/graphite_features.hxx
+++ b/vcl/inc/graphite_features.hxx
@@ -40,8 +40,8 @@ namespace grutils
static const char FEAT_PREFIX;
static const char FEAT_SEPARATOR;
static const char FEAT_ID_VALUE_SEPARATOR;
- GrFeatureParser(const gr_face * face, const ::rtl::OString features, const ::rtl::OString lang);
- GrFeatureParser(const gr_face * face, const ::rtl::OString lang);
+ GrFeatureParser(const gr_face * face, const OString features, const OString lang);
+ GrFeatureParser(const gr_face * face, const OString lang);
~GrFeatureParser();
//size_t getFontFeatures(gr::FeatureSetting settings[MAX_FEATURES]) const;
bool parseErrors() { return mbErrors; };
@@ -53,10 +53,10 @@ namespace grutils
gr_feature_val * values() const { return mpSettings; };
private:
GrFeatureParser(const GrFeatureParser & copy);
- void setLang(const gr_face * face, const ::rtl::OString & lang);
- bool isCharId(const ::rtl::OString & id, size_t offset, size_t length);
- gr_uint32 getCharId(const ::rtl::OString & id, size_t offset, size_t length);
- short getIntValue(const ::rtl::OString & id, size_t offset, size_t length);
+ void setLang(const gr_face * face, const OString & lang);
+ bool isCharId(const OString & id, size_t offset, size_t length);
+ gr_uint32 getCharId(const OString & id, size_t offset, size_t length);
+ short getIntValue(const OString & id, size_t offset, size_t length);
size_t mnNumSettings;
FeatId maLang;
bool mbErrors;
diff --git a/vcl/inc/headless/svpdummies.hxx b/vcl/inc/headless/svpdummies.hxx
index e4405c3d390c..147811d359c3 100644
--- a/vcl/inc/headless/svpdummies.hxx
+++ b/vcl/inc/headless/svpdummies.hxx
@@ -67,11 +67,11 @@ public:
virtual unsigned int GetDisplayScreenCount();
virtual Rectangle GetDisplayScreenPosSizePixel( unsigned int nScreen );
virtual Rectangle GetDisplayScreenWorkAreaPosSizePixel( unsigned int nScreen );
- virtual rtl::OUString GetDisplayScreenName( unsigned int nScreen );
+ virtual OUString GetDisplayScreenName( unsigned int nScreen );
- virtual int ShowNativeDialog( const rtl::OUString& rTitle,
- const rtl::OUString& rMessage,
- const std::list< rtl::OUString >& rButtons,
+ virtual int ShowNativeDialog( const OUString& rTitle,
+ const OUString& rMessage,
+ const std::list< OUString >& rButtons,
int nDefButton );
};
diff --git a/vcl/inc/headless/svpframe.hxx b/vcl/inc/headless/svpframe.hxx
index 342f542e2554..aa3cdd27ef9b 100644
--- a/vcl/inc/headless/svpframe.hxx
+++ b/vcl/inc/headless/svpframe.hxx
@@ -74,7 +74,7 @@ public:
virtual sal_Bool PostEvent( void* pData );
- virtual void SetTitle( const rtl::OUString& rTitle );
+ virtual void SetTitle( const OUString& rTitle );
virtual void SetIcon( sal_uInt16 nIcon );
virtual void SetMenu( SalMenu* pMenu );
virtual void DrawMenuBar();
@@ -102,7 +102,7 @@ public:
virtual void Sync();
virtual void SetInputContext( SalInputContext* pContext );
virtual void EndExtTextInput( sal_uInt16 nFlags );
- virtual rtl::OUString GetKeyName( sal_uInt16 nKeyCode );
+ virtual OUString GetKeyName( sal_uInt16 nKeyCode );
virtual sal_Bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode );
virtual LanguageType GetInputLanguage();
virtual void UpdateSettings( AllSettings& rSettings );
@@ -124,7 +124,7 @@ public:
/*TODO: functional implementation */
virtual void SetScreenNumber( unsigned int nScreen ) { (void)nScreen; }
- virtual void SetApplicationID(const rtl::OUString &rApplicationID) { (void) rApplicationID; }
+ virtual void SetApplicationID(const OUString &rApplicationID) { (void) rApplicationID; }
bool IsVisible() { return m_bVisible; }
static SvpSalFrame* GetFocusFrame() { return s_pFocusFrame; }
diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx
index 50a3f872d5c6..3cf98ee2b1cc 100644
--- a/vcl/inc/headless/svpgdi.hxx
+++ b/vcl/inc/headless/svpgdi.hxx
@@ -120,8 +120,8 @@ public:
virtual void GetDevFontList( ImplDevFontList* );
virtual void ClearDevFontCache();
virtual void GetDevFontSubstList( OutputDevice* );
- virtual bool AddTempDevFont( ImplDevFontList*, const rtl::OUString& rFileURL, const rtl::OUString& rFontName );
- virtual sal_Bool CreateFontSubset( const rtl::OUString& rToFile,
+ virtual bool AddTempDevFont( ImplDevFontList*, const OUString& rFileURL, const OUString& rFontName );
+ virtual sal_Bool CreateFontSubset( const OUString& rToFile,
const PhysicalFontFace*,
sal_Int32* pGlyphIDs,
sal_uInt8* pEncoding,
diff --git a/vcl/inc/headless/svpinst.hxx b/vcl/inc/headless/svpinst.hxx
index 176002e34d27..7f625e86f4de 100644
--- a/vcl/inc/headless/svpinst.hxx
+++ b/vcl/inc/headless/svpinst.hxx
@@ -135,7 +135,7 @@ public:
virtual void GetPrinterQueueInfo( ImplPrnQueueList* pList );
virtual void GetPrinterQueueState( SalPrinterQueueInfo* pInfo );
virtual void DeletePrinterQueueInfo( SalPrinterQueueInfo* pInfo );
- virtual rtl::OUString GetDefaultPrinter();
+ virtual OUString GetDefaultPrinter();
virtual void PostPrintersChanged();
// SalTimer
@@ -158,7 +158,7 @@ public:
virtual void* GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes );
- virtual void AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType);
+ virtual void AddToRecentDocumentList(const OUString& rFileUrl, const OUString& rMimeType);
virtual GenPspGraphics *CreatePrintGraphics();
};
diff --git a/vcl/inc/ilstbox.hxx b/vcl/inc/ilstbox.hxx
index d2ae81f8ceff..a18b2931709c 100644
--- a/vcl/inc/ilstbox.hxx
+++ b/vcl/inc/ilstbox.hxx
@@ -496,8 +496,8 @@ public:
sal_Bool IsSelectionChanged() const { return maLBWindow.IsSelectionChanged(); }
sal_uInt16 GetSelectModifier() const { return maLBWindow.GetSelectModifier(); }
- void SetMRUEntries( const rtl::OUString& rEntries, sal_Unicode cSep );
- rtl::OUString GetMRUEntries( sal_Unicode cSep ) const;
+ void SetMRUEntries( const OUString& rEntries, sal_Unicode cSep );
+ OUString GetMRUEntries( sal_Unicode cSep ) const;
void SetMaxMRUCount( sal_uInt16 n ) { maLBWindow.GetEntryList()->SetMaxMRUCount( n ); }
sal_uInt16 GetMaxMRUCount() const { return maLBWindow.GetEntryList()->GetMaxMRUCount(); }
sal_uInt16 GetDisplayLineCount() const
diff --git a/vcl/inc/image.h b/vcl/inc/image.h
index f16b595c2709..ec12a3d41aba 100644
--- a/vcl/inc/image.h
+++ b/vcl/inc/image.h
@@ -68,18 +68,18 @@ enum ImageType { IMAGETYPE_BITMAP, IMAGETYPE_IMAGE };
struct ImageAryData
{
- ::rtl::OUString maName;
+ OUString maName;
// Images identified by either name, or by id
sal_uInt16 mnId;
BitmapEx maBitmapEx;
- ImageAryData( const rtl::OUString &aName,
+ ImageAryData( const OUString &aName,
sal_uInt16 nId, const BitmapEx &aBitmap );
ImageAryData( const ImageAryData& rData );
~ImageAryData();
bool IsLoadable() { return maBitmapEx.IsEmpty() && !maName.isEmpty(); }
- void Load(const rtl::OUString &rPrefix);
+ void Load(const OUString &rPrefix);
ImageAryData& operator=( const ImageAryData& rData );
};
@@ -89,12 +89,12 @@ struct ImageAryData
struct ImplImageList
{
typedef std::vector<ImageAryData *> ImageAryDataVec;
- typedef boost::unordered_map< rtl::OUString, ImageAryData *, rtl::OUStringHash >
+ typedef boost::unordered_map< OUString, ImageAryData *, OUStringHash >
ImageAryDataNameHash;
ImageAryDataVec maImages;
ImageAryDataNameHash maNameHash;
- rtl::OUString maPrefix;
+ OUString maPrefix;
Size maImageSize;
sal_uIntPtr mnRefCount;
@@ -102,7 +102,7 @@ struct ImplImageList
ImplImageList( const ImplImageList &aSrc );
~ImplImageList();
- void AddImage( const ::rtl::OUString &aName,
+ void AddImage( const OUString &aName,
sal_uInt16 nId, const BitmapEx &aBitmapEx );
void RemoveImage( sal_uInt16 nPos );
};
diff --git a/vcl/inc/impimagetree.hxx b/vcl/inc/impimagetree.hxx
index 75009faafd5c..f42a0391bc90 100644
--- a/vcl/inc/impimagetree.hxx
+++ b/vcl/inc/impimagetree.hxx
@@ -45,14 +45,14 @@ public:
~ImplImageTree();
// check whether the icon style is installed
- bool checkStyle(rtl::OUString const & style);
+ bool checkStyle(OUString const & style);
bool loadImage(
- rtl::OUString const & name, rtl::OUString const & style,
+ OUString const & name, OUString const & style,
BitmapEx & bitmap, bool localized = false, bool loadMissing = false );
bool loadDefaultImage(
- rtl::OUString const & style,
+ OUString const & style,
BitmapEx& bitmap);
void shutDown();
@@ -62,34 +62,34 @@ public:
private:
bool doLoadImage(
- rtl::OUString const & name, rtl::OUString const & style,
+ OUString const & name, OUString const & style,
BitmapEx & bitmap, bool localized);
typedef std::list<
std::pair<
- rtl::OUString,
+ OUString,
com::sun::star::uno::Reference<
com::sun::star::container::XNameAccess > > > Paths;
typedef boost::unordered_map<
- rtl::OUString, bool, rtl::OUStringHash > CheckStyleCache;
+ OUString, bool, OUStringHash > CheckStyleCache;
typedef boost::unordered_map<
- rtl::OUString, std::pair< bool, BitmapEx >, rtl::OUStringHash > IconCache;
+ OUString, std::pair< bool, BitmapEx >, OUStringHash > IconCache;
- rtl::OUString m_style;
+ OUString m_style;
Paths m_paths;
CheckStyleCache m_checkStyleCache;
IconCache m_iconCache;
bool m_cacheIcons;
- void setStyle(rtl::OUString const & style );
+ void setStyle(OUString const & style );
void resetPaths();
- bool checkStyleCacheLookup( rtl::OUString const & style, bool &exists );
- bool iconCacheLookup( rtl::OUString const & name, bool localized, BitmapEx & bitmap );
+ bool checkStyleCacheLookup( OUString const & style, bool &exists );
+ bool iconCacheLookup( OUString const & name, bool localized, BitmapEx & bitmap );
- bool find(std::vector< rtl::OUString > const & paths, BitmapEx & bitmap );
+ bool find(std::vector< OUString > const & paths, BitmapEx & bitmap );
};
typedef salhelper::SingletonRef< ImplImageTree > ImplImageTreeSingletonRef;
diff --git a/vcl/inc/jobset.h b/vcl/inc/jobset.h
index 529855895cec..262e8b5818da 100644
--- a/vcl/inc/jobset.h
+++ b/vcl/inc/jobset.h
@@ -45,8 +45,8 @@ struct ImplJobSetup
{
sal_uInt16 mnRefCount; // RefCount (only independ data)
sal_uInt16 mnSystem; // Sytem - JOBSETUP_SYSTEM_xxxx
- rtl::OUString maPrinterName; // Printer-Name
- rtl::OUString maDriver; // Driver-Name
+ OUString maPrinterName; // Printer-Name
+ OUString maDriver; // Driver-Name
Orientation meOrientation; // Orientation
DuplexMode meDuplexMode; // Duplex
sal_uInt16 mnPaperBin; // paper bin / in tray
@@ -55,7 +55,7 @@ struct ImplJobSetup
long mnPaperHeight; // paper height (100th mm)
sal_uIntPtr mnDriverDataLen; // length of system specific data
sal_uInt8* mpDriverData; // system specific data (will be streamed a byte block)
- ::boost::unordered_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash > maValueMap;
+ ::boost::unordered_map< OUString, OUString, OUStringHash > maValueMap;
ImplJobSetup();
ImplJobSetup( const ImplJobSetup& rJobSetup );
diff --git a/vcl/inc/outdev.h b/vcl/inc/outdev.h
index 0842a013d1ac..cf5feb0093ca 100644
--- a/vcl/inc/outdev.h
+++ b/vcl/inc/outdev.h
@@ -189,7 +189,7 @@ class ImplGlyphFallbackFontSubstitution
: public ImplFontSubstitution
{
public:
- virtual bool FindFontSubstitute( FontSelectPattern&, rtl::OUString& rMissingCodes ) const = 0;
+ virtual bool FindFontSubstitute( FontSelectPattern&, OUString& rMissingCodes ) const = 0;
};
// -----------------
@@ -220,7 +220,7 @@ public:
ImplFontEntry* GetFontEntry( ImplDevFontList*,
FontSelectPattern&, ImplDirectFontSubstitution* pDevSpecific );
ImplFontEntry* GetGlyphFallbackFont( ImplDevFontList*, FontSelectPattern&,
- int nFallbackLevel, rtl::OUString& rMissingCodes );
+ int nFallbackLevel, OUString& rMissingCodes );
void Release( ImplFontEntry* );
void Invalidate();
};
diff --git a/vcl/inc/outfont.hxx b/vcl/inc/outfont.hxx
index 9d5066ba5af5..140af384f13a 100644
--- a/vcl/inc/outfont.hxx
+++ b/vcl/inc/outfont.hxx
@@ -238,7 +238,7 @@ public:
// suggest fonts for glyph fallback
ImplDevFontListData* GetGlyphFallbackFont( FontSelectPattern&,
- rtl::OUString& rMissingCodes, int nFallbackLevel ) const;
+ OUString& rMissingCodes, int nFallbackLevel ) const;
// prepare platform specific font substitutions
void SetPreMatchHook( ImplPreMatchFontSubstitution* );
@@ -249,17 +249,17 @@ public:
ImplGetDevFontList* GetDevFontList() const;
ImplGetDevSizeList* GetDevSizeList( const String& rFontName ) const;
- ImplDevFontListData* ImplFindByTokenNames(const rtl::OUString& rTokenStr) const;
+ ImplDevFontListData* ImplFindByTokenNames(const OUString& rTokenStr) const;
protected:
void InitMatchData() const;
bool AreMapNamesAvailable() const { return mbMapNames; }
- ImplDevFontListData* ImplFindByAliasName(const rtl::OUString& rSearchName,
- const rtl::OUString& rShortName) const;
+ ImplDevFontListData* ImplFindByAliasName(const OUString& rSearchName,
+ const OUString& rShortName) const;
ImplDevFontListData* ImplFindBySubstFontAttr( const utl::FontNameAttr& ) const;
ImplDevFontListData* ImplFindByAttributes(sal_uLong nSearchType, FontWeight, FontWidth,
- FontItalic, const rtl::OUString& rSearchFamily) const;
+ FontItalic, const OUString& rSearchFamily) const;
ImplDevFontListData* FindDefaultFont() const;
private:
diff --git a/vcl/inc/print.h b/vcl/inc/print.h
index aabe813704f0..bd642c66bdd9 100644
--- a/vcl/inc/print.h
+++ b/vcl/inc/print.h
@@ -52,16 +52,16 @@ struct ImplPrnQueueData
class VCL_PLUGIN_PUBLIC ImplPrnQueueList
{
public:
- boost::unordered_map< rtl::OUString, sal_Int32, rtl::OUStringHash >
+ boost::unordered_map< OUString, sal_Int32, OUStringHash >
m_aNameToIndex;
std::vector< ImplPrnQueueData > m_aQueueInfos;
- std::vector< rtl::OUString > m_aPrinterList;
+ std::vector< OUString > m_aPrinterList;
ImplPrnQueueList() {}
~ImplPrnQueueList();
void Add( SalPrinterQueueInfo* pData );
- ImplPrnQueueData* Get( const rtl::OUString& rPrinter );
+ ImplPrnQueueData* Get( const OUString& rPrinter );
};
// --------------
diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx
index 296d5b89edea..30e5fe8e9b6b 100644
--- a/vcl/inc/printdlg.hxx
+++ b/vcl/inc/printdlg.hxx
@@ -52,8 +52,8 @@ namespace vcl
Size maPreviewSize;
VirtualDevice maPageVDev;
Bitmap maPreviewBitmap;
- rtl::OUString maReplacementString;
- rtl::OUString maToolTipString;
+ OUString maReplacementString;
+ OUString maToolTipString;
bool mbGreyscale;
FixedLine maHorzDim;
FixedLine maVertDim;
@@ -70,8 +70,8 @@ namespace vcl
virtual void DataChanged( const DataChangedEvent& );
void setPreview( const GDIMetaFile&, const Size& i_rPaperSize,
- const rtl::OUString& i_rPaperName,
- const rtl::OUString& i_rNoPageString,
+ const OUString& i_rPaperName,
+ const OUString& i_rNoPageString,
sal_Int32 i_nDPIX, sal_Int32 i_nDPIY,
bool i_bGreyscale
);
@@ -200,16 +200,16 @@ namespace vcl
CancelButton* mpCancelButton;
HelpButton* mpHelpButton;
- rtl::OUString maPageStr;
- rtl::OUString maNoPageStr;
+ OUString maPageStr;
+ OUString maNoPageStr;
sal_Int32 mnCurPage;
sal_Int32 mnCachedPages;
- std::map< Window*, rtl::OUString > maControlToPropertyMap;
- std::map< rtl::OUString, std::vector< Window* > >
+ std::map< Window*, OUString > maControlToPropertyMap;
+ std::map< OUString, std::vector< Window* > >
maPropertyToWindowMap;
std::map< Window*, sal_Int32 > maControlToNumValMap;
- std::set< rtl::OUString > maReverseDependencySet;
+ std::set< OUString > maReverseDependencySet;
Size maNupPortraitSize;
Size maNupLandscapeSize;
@@ -217,9 +217,9 @@ namespace vcl
// internal, used for automatic Nup-Portrait/landscape
Size maFirstPageSize;
- rtl::OUString maPrintToFileText;
- rtl::OUString maPrintText;
- rtl::OUString maDefPrtText;
+ OUString maPrintToFileText;
+ OUString maPrintText;
+ OUString maDefPrtText;
Size maDetailsCollapsedSize;
Size maDetailsExpandedSize;
@@ -235,7 +235,7 @@ namespace vcl
void checkControlDependencies();
void checkOptionalControlDependencies();
void makeEnabled( Window* );
- void updateWindowFromProperty( const rtl::OUString& );
+ void updateWindowFromProperty( const OUString& );
void setupOptionalUI();
void readFromSettings();
void storeToSettings();
diff --git a/vcl/inc/quartz/utils.h b/vcl/inc/quartz/utils.h
index 0e0dfe5493ad..ed7e233a7285 100644
--- a/vcl/inc/quartz/utils.h
+++ b/vcl/inc/quartz/utils.h
@@ -34,10 +34,10 @@
#include <rtl/ustring.hxx>
-rtl::OUString GetOUString( CFStringRef );
-rtl::OUString GetOUString( NSString* );
-CFStringRef CreateCFString( const rtl::OUString& );
-NSString* CreateNSString( const rtl::OUString& );
+OUString GetOUString( CFStringRef );
+OUString GetOUString( NSString* );
+CFStringRef CreateCFString( const OUString& );
+NSString* CreateNSString( const OUString& );
std::ostream &operator <<(std::ostream& s, CGRect &rRect);
diff --git a/vcl/inc/salframe.hxx b/vcl/inc/salframe.hxx
index 0e5a92bf1d48..531d0d4f50b1 100644
--- a/vcl/inc/salframe.hxx
+++ b/vcl/inc/salframe.hxx
@@ -94,9 +94,6 @@ typedef sal_uInt64 SalExtStyle;
#define SAL_FRAME_POSSIZE_WIDTH ((sal_uInt16)0x0004)
#define SAL_FRAME_POSSIZE_HEIGHT ((sal_uInt16)0x0008)
-using ::rtl::OUString;
-using ::rtl::OString;
-
struct SystemParentData;
class VCL_PLUGIN_PUBLIC SalFrame : public vcl::DeletionNotifier
diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx
index 21d73801b70d..f20cbe44592c 100644
--- a/vcl/inc/salgdi.hxx
+++ b/vcl/inc/salgdi.hxx
@@ -72,7 +72,7 @@ namespace basegfx {
typedef sal_Unicode sal_Ucs; // TODO: use sal_UCS4 instead of sal_Unicode
typedef std::map< sal_Ucs, sal_Int32 > Ucs2SIntMap;
typedef std::map< sal_Ucs, sal_uInt32 > Ucs2UIntMap;
-typedef std::map< sal_Ucs, rtl::OString > Ucs2OStrMap;
+typedef std::map< sal_Ucs, OString > Ucs2OStrMap;
typedef std::vector< sal_Int32 > Int32Vector;
// note: if you add any new methods to class SalGraphics using coordinates
@@ -152,9 +152,9 @@ protected:
const Point& aPos, sal_Bool& rIsInside );
virtual sal_Bool drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
ControlState nState, const ImplControlValue& aValue,
- const rtl::OUString& aCaption );
+ const OUString& aCaption );
virtual sal_Bool getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState,
- const ImplControlValue& aValue, const rtl::OUString& aCaption,
+ const ImplControlValue& aValue, const OUString& aCaption,
Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion );
/** Render bitmap with alpha channel
@@ -251,7 +251,7 @@ public:
// OutputDevice for all its device specific preferred font substitutions
virtual void GetDevFontSubstList( OutputDevice* ) = 0;
- virtual bool AddTempDevFont( ImplDevFontList*, const rtl::OUString& rFileURL, const rtl::OUString& rFontName ) = 0;
+ virtual bool AddTempDevFont( ImplDevFontList*, const OUString& rFileURL, const OUString& rFontName ) = 0;
// CreateFontSubset: a method to get a subset of glyhps of a font
// inside a new valid font file
@@ -265,7 +265,7 @@ public:
// rInfo: additional outgoing information
// implementation note: encoding 0 with glyph id 0 should be added implicitly
// as "undefined character"
- virtual sal_Bool CreateFontSubset( const rtl::OUString& rToFile,
+ virtual sal_Bool CreateFontSubset( const OUString& rToFile,
const PhysicalFontFace* pFont,
sal_Int32* pGlyphIDs,
sal_uInt8* pEncoding,
@@ -346,7 +346,7 @@ public:
true: a substitution has taken place and rNewText rLen, rCutStart and rCutStop have been filled accordingly
false: no substitution has taken place, rNewText, rLen, rCutStart, rCutStop remain unchanged
*/
- virtual bool filterText( const rtl::OUString& rOrigText, rtl::OUString& rNewText,
+ virtual bool filterText( const OUString& rOrigText, OUString& rNewText,
sal_Int32 nIndex, sal_Int32& rLen, sal_Int32& rCutStart, sal_Int32& rCutStop );
virtual bool supportsOperation( OutDevSupportType ) const = 0;
@@ -472,7 +472,7 @@ public:
const Rectangle& rControlRegion,
ControlState nState,
const ImplControlValue& aValue,
- const rtl::OUString& aCaption,
+ const OUString& aCaption,
const OutputDevice *pOutDev );
// Query the native control's actual drawing region (including adornment)
@@ -481,7 +481,7 @@ public:
const Rectangle& rControlRegion,
ControlState nState,
const ImplControlValue& aValue,
- const rtl::OUString& aCaption,
+ const OUString& aCaption,
Rectangle &rNativeBoundingRegion,
Rectangle &rNativeContentRegion,
const OutputDevice *pOutDev );
diff --git a/vcl/inc/salinst.hxx b/vcl/inc/salinst.hxx
index 47bc126f7190..1dc696eb99ba 100644
--- a/vcl/inc/salinst.hxx
+++ b/vcl/inc/salinst.hxx
@@ -154,7 +154,7 @@ public:
// this is a vehicle for PrintFontManager to bridge the gap between vcl and libvclplug_*
// this is only necessary because PrintFontManager is an exported vcl API and therefore
// needs to be in libvcl while libvclplug_* do not contain exported C++ API
- virtual void FillFontPathList( std::list< rtl::OString >& o_rFontPaths );
+ virtual void FillFontPathList( std::list< OString >& o_rFontPaths );
// dtrans implementation
virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface >
diff --git a/vcl/inc/salmenu.hxx b/vcl/inc/salmenu.hxx
index 77b1cd7986ef..addedfd4972b 100644
--- a/vcl/inc/salmenu.hxx
+++ b/vcl/inc/salmenu.hxx
@@ -36,7 +36,7 @@ struct SalItemParams
MenuItemType eType; // MenuItem-Type
MenuItemBits nBits; // MenuItem-Bits
Menu* pMenu; // Pointer to Menu
- rtl::OUString aText; // Menu-Text
+ OUString aText; // Menu-Text
Image aImage; // Image
};
@@ -45,10 +45,10 @@ struct SalMenuButtonItem
{
sal_uInt16 mnId;
Image maImage;
- rtl::OUString maToolTipText;
+ OUString maToolTipText;
SalMenuButtonItem() : mnId( 0 ) {}
- SalMenuButtonItem( sal_uInt16 i_nId, const Image& rImg, const rtl::OUString& i_rTTText = rtl::OUString() )
+ SalMenuButtonItem( sal_uInt16 i_nId, const Image& rImg, const OUString& i_rTTText = OUString() )
: mnId( i_nId ), maImage( rImg ), maToolTipText( i_rTTText ) {}
};
@@ -74,9 +74,9 @@ public:
virtual void SetFrame( const SalFrame* pFrame ) = 0;
virtual void CheckItem( unsigned nPos, sal_Bool bCheck ) = 0;
virtual void EnableItem( unsigned nPos, sal_Bool bEnable ) = 0;
- virtual void SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const rtl::OUString& rText )= 0;
+ virtual void SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const OUString& rText )= 0;
virtual void SetItemImage( unsigned nPos, SalMenuItem* pSalMenuItem, const Image& rImage ) = 0;
- virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const KeyCode& rKeyCode, const rtl::OUString& rKeyName ) = 0;
+ virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const KeyCode& rKeyCode, const OUString& rKeyName ) = 0;
virtual void GetSystemMenuData( SystemMenuData* pData ) = 0;
virtual bool ShowNativePopupMenu(FloatingWindow * pWin, const Rectangle& rRect, sal_uLong nFlags);
virtual bool AddMenuBarButton( const SalMenuButtonItem& ); // return false if not implemented or failure
diff --git a/vcl/inc/salprn.hxx b/vcl/inc/salprn.hxx
index 63fbbc494c9c..9a23731e9b8e 100644
--- a/vcl/inc/salprn.hxx
+++ b/vcl/inc/salprn.hxx
@@ -35,13 +35,13 @@ namespace vcl { class PrinterController; }
struct VCL_PLUGIN_PUBLIC SalPrinterQueueInfo
{
- rtl::OUString maPrinterName;
- rtl::OUString maDriver;
- rtl::OUString maLocation;
- rtl::OUString maComment;
+ OUString maPrinterName;
+ OUString maDriver;
+ OUString maLocation;
+ OUString maComment;
sal_uLong mnStatus;
sal_uLong mnJobs;
- rtl::OUString* mpSysData;
+ OUString* mpSysData;
SalPrinterQueueInfo();
~SalPrinterQueueInfo();
@@ -78,7 +78,7 @@ public:
long& rPageWidth, long& rPageHeight ) = 0;
virtual sal_uLong GetCapabilities( const ImplJobSetup* pSetupData, sal_uInt16 nType ) = 0;
virtual sal_uLong GetPaperBinCount( const ImplJobSetup* pSetupData ) = 0;
- virtual rtl::OUString GetPaperBinName( const ImplJobSetup* pSetupData, sal_uLong nPaperBin ) = 0;
+ virtual OUString GetPaperBinName( const ImplJobSetup* pSetupData, sal_uLong nPaperBin ) = 0;
// fills m_aPaperFormats and sets m_bPapersInit to true
virtual void InitPaperFormats( const ImplJobSetup* pSetupData ) = 0;
// returns angle that a landscape page will be turned counterclockwise wrt to portrait
@@ -91,9 +91,9 @@ public: // public for Sal Implementation
SalPrinter() {}
virtual ~SalPrinter();
- virtual sal_Bool StartJob( const rtl::OUString* pFileName,
- const rtl::OUString& rJobName,
- const rtl::OUString& rAppName,
+ virtual sal_Bool StartJob( const OUString* pFileName,
+ const OUString& rJobName,
+ const OUString& rAppName,
sal_uLong nCopies,
bool bCollate,
bool bDirect,
@@ -101,9 +101,9 @@ public: // public for Sal Implementation
// implement for pull model print systems only,
// default implementations (see salvtables.cxx) just returns sal_False
- virtual sal_Bool StartJob( const rtl::OUString* pFileName,
- const rtl::OUString& rJobName,
- const rtl::OUString& rAppName,
+ virtual sal_Bool StartJob( const OUString* pFileName,
+ const OUString& rJobName,
+ const OUString& rAppName,
ImplJobSetup* pSetupData,
vcl::PrinterController& rController );
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index 484205d223e9..629f10133f80 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -320,7 +320,7 @@ struct ImplSVData
::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > mxAccessBridge;
::vcl::SettingsConfigItem* mpSettingsConfigItem;
std::list< vcl::DeleteOnDeinitBase* >* mpDeinitDeleteList;
- boost::unordered_map< int, rtl::OUString >* mpPaperNames;
+ boost::unordered_map< int, OUString >* mpPaperNames;
};
void ImplInitSVData();
diff --git a/vcl/inc/toolbox.h b/vcl/inc/toolbox.h
index 7fa82d9da609..6a00fadf6d07 100644
--- a/vcl/inc/toolbox.h
+++ b/vcl/inc/toolbox.h
@@ -60,7 +60,7 @@ struct ImplToolItem
XubString maQuickHelpText;
XubString maHelpText;
String maCommandStr;
- rtl::OString maHelpId;
+ OString maHelpId;
Rectangle maRect;
Rectangle maCalcRect;
// the overall horizontal item size, including one or more of [image size + textlength + dropdown arrow]
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index 9cf14676ad68..210053883ecb 100644
--- a/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -201,8 +201,8 @@ class GtkSalFrame : public SalFrame
bool m_bSendModChangeOnRelease;
bool m_bWindowIsGtkPlug;
bool m_bSetFocusOnMap;
- rtl::OUString m_aTitle;
- rtl::OUString m_sWMClass;
+ OUString m_aTitle;
+ OUString m_sWMClass;
IMHandler* m_pIMHandler;
@@ -351,7 +351,7 @@ public:
// When Event is called, SalInstance::Yield() must be returned
virtual sal_Bool PostEvent( void* pData );
- virtual void SetTitle( const rtl::OUString& rTitle );
+ virtual void SetTitle( const OUString& rTitle );
virtual void SetIcon( sal_uInt16 nIcon );
virtual void SetMenu( SalMenu *pSalMenu );
virtual SalMenu* GetMenu( void );
@@ -397,7 +397,7 @@ public:
virtual void SetInputContext( SalInputContext* pContext );
virtual void EndExtTextInput( sal_uInt16 nFlags );
- virtual rtl::OUString GetKeyName( sal_uInt16 nKeyCode );
+ virtual OUString GetKeyName( sal_uInt16 nKeyCode );
virtual sal_Bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode );
// returns the input language used for the last key stroke
@@ -427,7 +427,7 @@ public:
virtual bool SetPluginParent( SystemParentData* pNewParent );
virtual void SetScreenNumber( unsigned int );
- virtual void SetApplicationID( const rtl::OUString &rWMClass );
+ virtual void SetApplicationID( const OUString &rWMClass );
// shaped system windows
// set clip region to none (-> rectangular windows, normal state)
diff --git a/vcl/inc/unx/gtk/gtkgdi.hxx b/vcl/inc/unx/gtk/gtkgdi.hxx
index 86003edd94b6..0edab313bd6a 100644
--- a/vcl/inc/unx/gtk/gtkgdi.hxx
+++ b/vcl/inc/unx/gtk/gtkgdi.hxx
@@ -45,13 +45,13 @@ public:
virtual sal_Bool drawNativeControl( ControlType nType, ControlPart nPart,
const Rectangle& rControlRegion,
ControlState nState, const ImplControlValue& aValue,
- const rtl::OUString& rCaption );
+ const OUString& rCaption );
virtual sal_Bool IsNativeControlSupported( ControlType nType, ControlPart nPart );
virtual sal_Bool getNativeControlRegion( ControlType nType, ControlPart nPart,
const Rectangle& rControlRegion,
ControlState nState,
const ImplControlValue& aValue,
- const rtl::OUString& rCaption,
+ const OUString& rCaption,
Rectangle &rNativeBoundingRegion,
Rectangle &rNativeContentRegion );
void updateSettings( AllSettings& rSettings );
@@ -132,9 +132,9 @@ public:
const Point& aPos, sal_Bool& rIsInside );
virtual sal_Bool drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
ControlState nState, const ImplControlValue& aValue,
- const rtl::OUString& rCaption );
+ const OUString& rCaption );
virtual sal_Bool getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState,
- const ImplControlValue& aValue, const rtl::OUString& rCaption,
+ const ImplControlValue& aValue, const OUString& rCaption,
Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion );
//helper methods for frame's UpdateSettings
diff --git a/vcl/inc/unx/gtk/gtkinst.hxx b/vcl/inc/unx/gtk/gtkinst.hxx
index 4ad13a60e1db..83ea84fc5f61 100644
--- a/vcl/inc/unx/gtk/gtkinst.hxx
+++ b/vcl/inc/unx/gtk/gtkinst.hxx
@@ -109,7 +109,7 @@ public:
virtual SalMenuItem* CreateMenuItem( const SalItemParams* );
virtual void DestroyMenuItem( SalMenuItem* pItem );
virtual SalTimer* CreateSalTimer();
- virtual void AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType);
+ virtual void AddToRecentDocumentList(const OUString& rFileUrl, const OUString& rMimeType);
virtual SalVirtualDevice* CreateVirtualDevice( SalGraphics*,
long nDX, long nDY,
sal_uInt16 nBitCount,
diff --git a/vcl/inc/unx/gtk/gtkprn.hxx b/vcl/inc/unx/gtk/gtkprn.hxx
index f24d2c2a1428..b90379ad806e 100644
--- a/vcl/inc/unx/gtk/gtkprn.hxx
+++ b/vcl/inc/unx/gtk/gtkprn.hxx
@@ -46,15 +46,15 @@ public:
using PspSalPrinter::StartJob;
virtual sal_Bool StartJob(
- const rtl::OUString* i_pFileName, const rtl::OUString& i_rJobName,
- const rtl::OUString& i_rAppName, ImplJobSetup* io_pSetupData,
+ const OUString* i_pFileName, const OUString& i_rJobName,
+ const OUString& i_rAppName, ImplJobSetup* io_pSetupData,
vcl::PrinterController& io_rController);
virtual sal_Bool EndJob();
private:
bool impl_doJob(
- const rtl::OUString* i_pFileName, const rtl::OUString& i_rJobName,
- const rtl::OUString& i_rAppName, ImplJobSetup* io_pSetupData,
+ const OUString* i_pFileName, const OUString& i_rJobName,
+ const OUString& i_rAppName, ImplJobSetup* io_pSetupData,
int i_nCopies, bool i_bCollate, vcl::PrinterController& io_rController);
private:
diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx
index fc0632ffb87d..35915d8198e4 100644
--- a/vcl/inc/unx/gtk/gtksalmenu.hxx
+++ b/vcl/inc/unx/gtk/gtksalmenu.hxx
@@ -68,9 +68,9 @@ public:
virtual void CheckItem( unsigned nPos, sal_Bool bCheck );
virtual void EnableItem( unsigned nPos, sal_Bool bEnable );
virtual void ShowItem( unsigned nPos, sal_Bool bShow );
- virtual void SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const rtl::OUString& rText );
+ virtual void SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const OUString& rText );
virtual void SetItemImage( unsigned nPos, SalMenuItem* pSalMenuItem, const Image& rImage);
- virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const KeyCode& rKeyCode, const rtl::OUString& rKeyName );
+ virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const KeyCode& rKeyCode, const OUString& rKeyName );
virtual void GetSystemMenuData( SystemMenuData* pData );
virtual void SetMenu( Menu* pMenu ) { mpVCLMenu = pMenu; }
@@ -84,7 +84,7 @@ public:
virtual GActionGroup* GetActionGroup() { return mpActionGroup; }
virtual sal_Bool IsItemVisible( unsigned nPos );
- void NativeSetItemText( unsigned nSection, unsigned nItemPos, const rtl::OUString& rText );
+ void NativeSetItemText( unsigned nSection, unsigned nItemPos, const OUString& rText );
void NativeSetItemCommand( unsigned nSection,
unsigned nItemPos,
sal_uInt16 nId,
@@ -94,7 +94,7 @@ public:
gboolean bIsSubmenu );
void NativeSetEnableItem( gchar* aCommand, gboolean bEnable );
void NativeCheckItem( unsigned nSection, unsigned nItemPos, MenuItemBits bits, gboolean bCheck );
- void NativeSetAccelerator( unsigned nSection, unsigned nItemPos, const KeyCode& rKeyCode, const rtl::OUString& rKeyName );
+ void NativeSetAccelerator( unsigned nSection, unsigned nItemPos, const KeyCode& rKeyCode, const OUString& rKeyName );
void DispatchCommand( gint itemId, const gchar* aCommand );
void Activate( const gchar* aMenuCommand );
diff --git a/vcl/inc/unx/gtk/gtksys.hxx b/vcl/inc/unx/gtk/gtksys.hxx
index 3bd7988b07e7..c36c51149528 100644
--- a/vcl/inc/unx/gtk/gtksys.hxx
+++ b/vcl/inc/unx/gtk/gtksys.hxx
@@ -50,12 +50,12 @@ public:
virtual bool IsUnifiedDisplay();
virtual unsigned int GetDisplayScreenCount();
virtual unsigned int GetDisplayBuiltInScreen();
- virtual rtl::OUString GetDisplayScreenName (unsigned int nScreen);
+ virtual OUString GetDisplayScreenName (unsigned int nScreen);
virtual Rectangle GetDisplayScreenPosSizePixel (unsigned int nScreen);
virtual Rectangle GetDisplayScreenWorkAreaPosSizePixel (unsigned int nScreen);
- virtual int ShowNativeDialog (const rtl::OUString& rTitle,
- const rtl::OUString& rMessage,
- const std::list< rtl::OUString >& rButtons,
+ virtual int ShowNativeDialog (const OUString& rTitle,
+ const OUString& rMessage,
+ const std::list< OUString >& rButtons,
int nDefButton);
SalX11Screen GetDisplayDefaultXScreen()
{ return getXScreenFromDisplayScreen( GetDisplayBuiltInScreen() ); }
diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx
index 2511495910b4..531c608327a0 100644
--- a/vcl/inc/unx/saldisp.hxx
+++ b/vcl/inc/unx/saldisp.hxx
@@ -310,8 +310,8 @@ public:
void ModifierMapping();
void SimulateKeyPress( sal_uInt16 nKeyCode );
sal_uInt16 GetIndicatorState() const;
- rtl::OUString GetKeyNameFromKeySym( KeySym keysym ) const;
- rtl::OUString GetKeyName( sal_uInt16 nKeyCode ) const;
+ OUString GetKeyNameFromKeySym( KeySym keysym ) const;
+ OUString GetKeyName( sal_uInt16 nKeyCode ) const;
sal_uInt16 GetKeyCode( KeySym keysym, char*pcPrintable ) const;
KeySym GetKeySym( XKeyEvent *pEvent,
unsigned char *pPrintable,
@@ -410,8 +410,8 @@ public:
// get foreign key names
namespace vcl_sal {
- rtl::OUString getKeysymReplacementName(
- rtl::OUString pLang,
+ OUString getKeysymReplacementName(
+ OUString pLang,
KeySym nSymbol );
}
diff --git a/vcl/inc/unx/salframe.h b/vcl/inc/unx/salframe.h
index 28a5446331ac..9c89af934873 100644
--- a/vcl/inc/unx/salframe.h
+++ b/vcl/inc/unx/salframe.h
@@ -114,9 +114,9 @@ class VCLPLUG_GEN_PUBLIC X11SalFrame : public SalFrame
// icon id
int mnIconID;
- rtl::OUString m_aTitle;
+ OUString m_aTitle;
- rtl::OUString m_sWMClass;
+ OUString m_sWMClass;
SystemChildData maSystemChildData;
@@ -208,7 +208,7 @@ public:
virtual sal_Bool PostEvent( void* pData );
- virtual void SetTitle( const rtl::OUString& rTitle );
+ virtual void SetTitle( const OUString& rTitle );
virtual void SetIcon( sal_uInt16 nIcon );
virtual void SetMenu( SalMenu* pMenu );
virtual void DrawMenuBar();
@@ -236,7 +236,7 @@ public:
virtual void Sync();
virtual void SetInputContext( SalInputContext* pContext );
virtual void EndExtTextInput( sal_uInt16 nFlags );
- virtual rtl::OUString GetKeyName( sal_uInt16 nKeyCode );
+ virtual OUString GetKeyName( sal_uInt16 nKeyCode );
virtual sal_Bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode );
virtual LanguageType GetInputLanguage();
virtual void UpdateSettings( AllSettings& rSettings );
@@ -249,7 +249,7 @@ public:
virtual bool SetPluginParent( SystemParentData* pNewParent );
virtual void SetScreenNumber( unsigned int );
- virtual void SetApplicationID( const rtl::OUString &rWMClass );
+ virtual void SetApplicationID( const OUString &rWMClass );
// shaped system windows
// set clip region to none (-> rectangular windows, normal state)
diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h
index 503872f973ad..c7c80913e368 100644
--- a/vcl/inc/unx/salgdi.h
+++ b/vcl/inc/unx/salgdi.h
@@ -233,8 +233,8 @@ public:
virtual void GetDevFontList( ImplDevFontList* );
virtual void ClearDevFontCache();
virtual void GetDevFontSubstList( OutputDevice* );
- virtual bool AddTempDevFont( ImplDevFontList*, const rtl::OUString& rFileURL, const rtl::OUString& rFontName );
- virtual sal_Bool CreateFontSubset( const rtl::OUString& rToFile,
+ virtual bool AddTempDevFont( ImplDevFontList*, const OUString& rFileURL, const OUString& rFontName );
+ virtual sal_Bool CreateFontSubset( const OUString& rToFile,
const PhysicalFontFace*,
sal_Int32* pGlyphIDs,
sal_uInt8* pEncoding,
diff --git a/vcl/inc/unx/salinst.h b/vcl/inc/unx/salinst.h
index ea41c55ccb5e..a997457e8a0d 100644
--- a/vcl/inc/unx/salinst.h
+++ b/vcl/inc/unx/salinst.h
@@ -61,7 +61,7 @@ public:
virtual bool AnyInput( sal_uInt16 nType );
virtual void* GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes );
- void FillFontPathList( std::list< rtl::OString >& o_rFontPaths );
+ void FillFontPathList( std::list< OString >& o_rFontPaths );
void SetLib( SalXLib *pXLib ) { mpXLib = pXLib; }
// dtrans implementation
@@ -69,7 +69,7 @@ public:
CreateClipboard( const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& i_rArguments );
virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > CreateDragSource();
virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > CreateDropTarget();
- virtual void AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType);
+ virtual void AddToRecentDocumentList(const OUString& rFileUrl, const OUString& rMimeType);
};
#endif // _SV_SALINST_H
diff --git a/vcl/inc/unx/salmenu.h b/vcl/inc/unx/salmenu.h
index 0daf6ebe591f..289b5dfb16bd 100644
--- a/vcl/inc/unx/salmenu.h
+++ b/vcl/inc/unx/salmenu.h
@@ -40,9 +40,9 @@ public:
virtual void SetFrame( const SalFrame* pFrame );
virtual void CheckItem( unsigned nPos, sal_Bool bCheck );
virtual void EnableItem( unsigned nPos, sal_Bool bEnable );
- virtual void SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const rtl::OUString& rText );
+ virtual void SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const OUString& rText );
virtual void SetItemImage( unsigned nPos, SalMenuItem* pSalMenuItem, const Image& rImage);
- virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const KeyCode& rKeyCode, const rtl::OUString& rKeyName );
+ virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const KeyCode& rKeyCode, const OUString& rKeyName );
virtual void GetSystemMenuData( SystemMenuData* pData );
};
diff --git a/vcl/inc/unx/sm.hxx b/vcl/inc/unx/sm.hxx
index 855edb75ed9e..29897289637e 100644
--- a/vcl/inc/unx/sm.hxx
+++ b/vcl/inc/unx/sm.hxx
@@ -25,13 +25,10 @@
#include "boost/scoped_ptr.hpp"
#include "tools/link.hxx"
+#include <rtl/ustring.hxx>
#include "vclpluginapi.h"
-namespace rtl {
- class OString;
- class OUString;
-}
class ICEConnectionObserver;
class SalSession;
@@ -40,7 +37,7 @@ class SessionManagerClient
static SalSession * m_pSession;
static boost::scoped_ptr< ICEConnectionObserver > m_pICEConnectionObserver;
static SmcConn m_pSmcConnection;
- static rtl::OString m_aClientID;
+ static OString m_aClientID;
static bool m_bDocSaveDone;
static void SaveYourselfProc( SmcConn connection,
@@ -58,7 +55,7 @@ class SessionManagerClient
static void InteractProc( SmcConn connection,
SmPointer clientData );
- static rtl::OString getPreviousSessionID();
+ static OString getPreviousSessionID();
DECL_STATIC_LINK( SessionManagerClient, ShutDownHdl, void* );
DECL_STATIC_LINK( SessionManagerClient, ShutDownCancelHdl, void* );
@@ -73,8 +70,8 @@ public:
static void saveDone();
static void interactionDone( bool bCancelShutdown );
- static rtl::OUString getExecName();
- static VCLPLUG_GEN_PUBLIC rtl::OString getSessionID();
+ static OUString getExecName();
+ static VCLPLUG_GEN_PUBLIC OString getSessionID();
};
#endif
diff --git a/vcl/inc/unx/x11/x11sys.hxx b/vcl/inc/unx/x11/x11sys.hxx
index f376743c321b..d3274645d219 100644
--- a/vcl/inc/unx/x11/x11sys.hxx
+++ b/vcl/inc/unx/x11/x11sys.hxx
@@ -38,10 +38,10 @@ public:
virtual unsigned int GetDisplayBuiltInScreen();
virtual Rectangle GetDisplayScreenPosSizePixel( unsigned int nScreen );
virtual Rectangle GetDisplayScreenWorkAreaPosSizePixel( unsigned int nScreen );
- virtual rtl::OUString GetDisplayScreenName( unsigned int nScreen );
- virtual int ShowNativeDialog( const rtl::OUString& rTitle,
- const rtl::OUString& rMessage,
- const std::list< rtl::OUString >& rButtons,
+ virtual OUString GetDisplayScreenName( unsigned int nScreen );
+ virtual int ShowNativeDialog( const OUString& rTitle,
+ const OUString& rMessage,
+ const std::list< OUString >& rButtons,
int nDefButton );
};
diff --git a/vcl/inc/vcl/button.hxx b/vcl/inc/vcl/button.hxx
index 349f9cc67cbb..71fffc718deb 100644
--- a/vcl/inc/vcl/button.hxx
+++ b/vcl/inc/vcl/button.hxx
@@ -190,7 +190,7 @@ public:
void SetToggleHdl( const Link& rLink ) { maToggleHdl = rLink; }
const Link& GetToggleHdl() const { return maToggleHdl; }
- virtual bool set_property(const rtl::OString &rKey, const rtl::OString &rValue);
+ virtual bool set_property(const OString &rKey, const OString &rValue);
};
inline void PushButton::Check( sal_Bool bCheck )
@@ -399,7 +399,7 @@ public:
*/
std::vector<RadioButton*> GetRadioButtonGroup(bool bIncludeThis = true) const;
- virtual bool set_property(const rtl::OString &rKey, const rtl::OString &rValue);
+ virtual bool set_property(const OString &rKey, const OString &rValue);
/*
* Group this RadioButton with another
@@ -500,7 +500,7 @@ public:
bool IsLegacyNoTextAlign() { return mbLegacyNoTextAlign; }
void SetLegacyNoTextAlign( bool bVal ) { mbLegacyNoTextAlign = bVal; }
- virtual bool set_property(const rtl::OString &rKey, const rtl::OString &rValue);
+ virtual bool set_property(const OString &rKey, const OString &rValue);
};
inline void CheckBox::Check( sal_Bool bCheck )
diff --git a/vcl/inc/vcl/combobox.hxx b/vcl/inc/vcl/combobox.hxx
index 22ee5709e07f..f0637109716a 100644
--- a/vcl/inc/vcl/combobox.hxx
+++ b/vcl/inc/vcl/combobox.hxx
@@ -219,7 +219,7 @@ public:
sal_Int32 getMaxWidthChars() const { return m_nMaxWidthChars; }
void setMaxWidthChars(sal_Int32 nWidth);
- virtual bool set_property(const rtl::OString &rKey, const rtl::OString &rValue);
+ virtual bool set_property(const OString &rKey, const OString &rValue);
};
#endif // _COMBOBOX_HXX
diff --git a/vcl/inc/vcl/configsettings.hxx b/vcl/inc/vcl/configsettings.hxx
index 3d8d5ace9b1f..47c96facd472 100644
--- a/vcl/inc/vcl/configsettings.hxx
+++ b/vcl/inc/vcl/configsettings.hxx
@@ -31,7 +31,7 @@ namespace vcl
{
//........................................................................
- typedef boost::unordered_map< rtl::OUString, rtl::OUString, rtl::OUStringHash > OUStrMap;
+ typedef boost::unordered_map< OUString, OUString, OUStringHash > OUStrMap;
class SmallOUStrMap : public OUStrMap { public: SmallOUStrMap() : OUStrMap(1) {} };
//====================================================================
@@ -40,9 +40,9 @@ namespace vcl
class VCL_DLLPUBLIC SettingsConfigItem : public ::utl::ConfigItem
{
- boost::unordered_map< rtl::OUString, SmallOUStrMap, rtl::OUStringHash > m_aSettings;
+ boost::unordered_map< OUString, SmallOUStrMap, OUStringHash > m_aSettings;
- virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& rPropertyNames );
+ virtual void Notify( const com::sun::star::uno::Sequence< OUString >& rPropertyNames );
void getValues();
SettingsConfigItem();
@@ -51,8 +51,8 @@ namespace vcl
static SettingsConfigItem* get();
- const rtl::OUString& getValue( const rtl::OUString& rGroup, const rtl::OUString& rKey ) const;
- void setValue( const rtl::OUString& rGroup, const rtl::OUString& rKey, const rtl::OUString& rValue );
+ const OUString& getValue( const OUString& rGroup, const OUString& rKey ) const;
+ void setValue( const OUString& rGroup, const OUString& rKey, const OUString& rValue );
virtual void Commit();
};
diff --git a/vcl/inc/vcl/dialog.hxx b/vcl/inc/vcl/dialog.hxx
index 4c7149a5493b..d7994c61580e 100644
--- a/vcl/inc/vcl/dialog.hxx
+++ b/vcl/inc/vcl/dialog.hxx
@@ -82,7 +82,7 @@ public:
protected:
Dialog( WindowType nType );
- Dialog( Window* pParent, const rtl::OString& rID, const rtl::OUString& rUIXMLDescription, WindowType nType );
+ Dialog( Window* pParent, const OString& rID, const OUString& rUIXMLDescription, WindowType nType );
virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags );
protected:
@@ -92,7 +92,7 @@ protected:
public:
Dialog( Window* pParent, WinBits nStyle = WB_STDDIALOG );
- Dialog( Window* pParent, const rtl::OString& rID, const rtl::OUString& rUIXMLDescription );
+ Dialog( Window* pParent, const OString& rID, const OUString& rUIXMLDescription );
virtual ~Dialog();
virtual long Notify( NotifyEvent& rNEvt );
@@ -105,7 +105,7 @@ public:
void setOptimalLayoutSize();
bool isCalculatingInitialLayoutSize() const { return mbIsCalculatingInitialLayoutSize; }
virtual void queue_layout();
- virtual bool set_property(const rtl::OString &rKey, const rtl::OString &rValue);
+ virtual bool set_property(const OString &rKey, const OString &rValue);
VclButtonBox* get_action_area();
VclBox* get_content_area();
@@ -153,7 +153,7 @@ class VCL_DLLPUBLIC ModelessDialog : public Dialog
public:
ModelessDialog( Window* pParent, const ResId& rResId );
- ModelessDialog( Window* pParent, const rtl::OString& rID, const rtl::OUString& rUIXMLDescription );
+ ModelessDialog( Window* pParent, const OString& rID, const OUString& rUIXMLDescription );
};
// ---------------
@@ -164,7 +164,7 @@ class VCL_DLLPUBLIC ModalDialog : public Dialog
{
public:
ModalDialog( Window* pParent, WinBits nStyle = WB_STDMODAL );
- ModalDialog( Window* pParent, const rtl::OString& rID, const rtl::OUString& rUIXMLDescription );
+ ModalDialog( Window* pParent, const OString& rID, const OUString& rUIXMLDescription );
ModalDialog( Window* pParent, const ResId& rResId );
protected:
diff --git a/vcl/inc/vcl/edit.hxx b/vcl/inc/vcl/edit.hxx
index aaa6e3a62f78..488758ab7d4a 100644
--- a/vcl/inc/vcl/edit.hxx
+++ b/vcl/inc/vcl/edit.hxx
@@ -87,7 +87,7 @@ private:
DECL_DLLPRIVATE_LINK( ImplUpdateDataHdl, void* );
- SAL_DLLPRIVATE bool ImplTruncateToMaxLen( rtl::OUString&, sal_uInt32 nSelectionLen ) const;
+ SAL_DLLPRIVATE bool ImplTruncateToMaxLen( OUString&, sal_uInt32 nSelectionLen ) const;
SAL_DLLPRIVATE void ImplInitEditData();
SAL_DLLPRIVATE void ImplModified();
SAL_DLLPRIVATE OUString ImplGetText() const;
@@ -227,7 +227,7 @@ public:
AutocompleteAction GetAutocompleteAction() const { return meAutocompleteAction; }
virtual Size CalcMinimumSize() const;
- virtual Size CalcMinimumSizeForText(const rtl::OUString &rString) const;
+ virtual Size CalcMinimumSizeForText(const OUString &rString) const;
virtual Size GetOptimalSize() const;
virtual Size CalcSize( sal_uInt16 nChars ) const;
virtual xub_StrLen GetMaxVisChars() const;
@@ -243,9 +243,9 @@ public:
static PopupMenu* CreatePopupMenu();
static void DeletePopupMenu( PopupMenu* pMenu );
- virtual rtl::OUString GetSurroundingText() const;
+ virtual OUString GetSurroundingText() const;
virtual Selection GetSurroundingTextSelection() const;
- virtual bool set_property(const rtl::OString &rKey, const rtl::OString &rValue);
+ virtual bool set_property(const OString &rKey, const OString &rValue);
// returns the minimum size a bordered Edit should have given the current
// global style settings (needed by sc's inputwin.cxx)
diff --git a/vcl/inc/vcl/field.hxx b/vcl/inc/vcl/field.hxx
index 50888c6472ab..babab8da29d2 100644
--- a/vcl/inc/vcl/field.hxx
+++ b/vcl/inc/vcl/field.hxx
@@ -518,7 +518,7 @@ public:
virtual void Down();
virtual void First();
virtual void Last();
- virtual bool set_property(const rtl::OString &rKey, const rtl::OString &rValue);
+ virtual bool set_property(const OString &rKey, const OString &rValue);
};
@@ -589,7 +589,7 @@ public:
MapUnit eInUnit, FieldUnit eOutUnit )
{ return ConvertDoubleValue( static_cast<double>(nValue), nDecDigits, eInUnit, eOutUnit ); }
- virtual bool set_property(const rtl::OString &rKey, const rtl::OString &rValue);
+ virtual bool set_property(const OString &rKey, const OString &rValue);
};
diff --git a/vcl/inc/vcl/fixed.hxx b/vcl/inc/vcl/fixed.hxx
index c45762f867d7..b592d98a48d2 100644
--- a/vcl/inc/vcl/fixed.hxx
+++ b/vcl/inc/vcl/fixed.hxx
@@ -77,7 +77,7 @@ public:
static Size getTextDimensions(Control const *pControl, const OUString &rTxt, long nMaxWidth);
Size CalcMinimumSize(long nMaxWidth = 0x7fffffff) const;
virtual Size GetOptimalSize() const;
- virtual bool set_property(const rtl::OString &rKey, const rtl::OString &rValue);
+ virtual bool set_property(const OString &rKey, const OString &rValue);
void set_mnemonic_widget(Window *pWindow);
Window* get_mnemonic_widget() const { return m_pMnemonicWindow; }
};
@@ -200,7 +200,7 @@ public:
sal_Bool SetModeImage( const Image& rImage );
const Image& GetModeImage( ) const;
- virtual bool set_property(const rtl::OString &rKey, const rtl::OString &rValue);
+ virtual bool set_property(const OString &rKey, const OString &rValue);
};
#endif // _SV_FIXED_HXX
diff --git a/vcl/inc/vcl/font.hxx b/vcl/inc/vcl/font.hxx
index 98226249843a..d886d48b9854 100644
--- a/vcl/inc/vcl/font.hxx
+++ b/vcl/inc/vcl/font.hxx
@@ -64,7 +64,7 @@ public:
void SetAlign( FontAlign );
FontAlign GetAlign() const;
- void SetName( const rtl::OUString& rFamilyName );
+ void SetName( const OUString& rFamilyName );
const String& GetName() const;
void SetStyleName( const String& rStyleName );
const String& GetStyleName() const;
diff --git a/vcl/inc/vcl/fontmanager.hxx b/vcl/inc/vcl/fontmanager.hxx
index 7490f018f174..05955f984710 100644
--- a/vcl/inc/vcl/fontmanager.hxx
+++ b/vcl/inc/vcl/fontmanager.hxx
@@ -76,9 +76,9 @@ struct FastPrintFontInfo
fonttype::type m_eType;
// font attributes
- rtl::OUString m_aFamilyName;
- rtl::OUString m_aStyleName;
- std::list< rtl::OUString > m_aAliases;
+ OUString m_aFamilyName;
+ OUString m_aStyleName;
+ std::list< OUString > m_aAliases;
FontFamily m_eFamilyStyle;
FontItalic m_eItalic;
FontWidth m_eWidth;
@@ -193,7 +193,7 @@ class VCL_PLUGIN_PUBLIC PrintFontManager
int m_nFamilyName; // atom
std::list< int > m_aAliases;
int m_nPSName; // atom
- rtl::OUString m_aStyleName;
+ OUString m_aStyleName;
FontItalic m_eItalic;
FontWidth m_eWidth;
FontWeight m_eWeight;
@@ -214,7 +214,7 @@ class VCL_PLUGIN_PUBLIC PrintFontManager
bool m_bUserOverride;
std::map< sal_Unicode, sal_Int32 > m_aEncodingVector;
- std::map< sal_Unicode, rtl::OString > m_aNonEncoded;
+ std::map< sal_Unicode, OString > m_aNonEncoded;
PrintFont( fonttype::type eType );
virtual ~PrintFont();
@@ -226,8 +226,8 @@ class VCL_PLUGIN_PUBLIC PrintFontManager
struct Type1FontFile : public PrintFont
{
int m_nDirectory; // atom containing system dependent path
- rtl::OString m_aFontFile; // relative to directory
- rtl::OString m_aMetricFile; // dito
+ OString m_aFontFile; // relative to directory
+ OString m_aMetricFile; // dito
/* note: m_aFontFile and Metric file are not atoms
because they should be fairly unique */
@@ -240,7 +240,7 @@ class VCL_PLUGIN_PUBLIC PrintFontManager
struct TrueTypeFontFile : public PrintFont
{
int m_nDirectory; // atom containing system dependent path
- rtl::OString m_aFontFile; // relative to directory
+ OString m_aFontFile; // relative to directory
int m_nCollectionEntry; // 0 for regular fonts, 0 to ... for fonts stemming from collections
unsigned int m_nTypeFlags; // copyright bits and PS-OpenType flag
@@ -252,7 +252,7 @@ class VCL_PLUGIN_PUBLIC PrintFontManager
struct BuiltinFont : public PrintFont
{
int m_nDirectory; // atom containing system dependent path
- rtl::OString m_aMetricFile;
+ OString m_aMetricFile;
BuiltinFont() : PrintFont( fonttype::Builtin ) {}
virtual ~BuiltinFont();
@@ -262,22 +262,22 @@ class VCL_PLUGIN_PUBLIC PrintFontManager
fontID m_nNextFontID;
boost::unordered_map< fontID, PrintFont* > m_aFonts;
boost::unordered_map< int, FontFamily > m_aFamilyTypes;
- std::list< rtl::OUString > m_aPrinterDrivers;
- std::list< rtl::OString > m_aFontDirectories;
+ std::list< OUString > m_aPrinterDrivers;
+ std::list< OString > m_aFontDirectories;
std::list< int > m_aPrivateFontDirectories;
utl::MultiAtomProvider* m_pAtoms;
// for speeding up findFontFileID
- boost::unordered_map< rtl::OString, std::set< fontID >, rtl::OStringHash >
+ boost::unordered_map< OString, std::set< fontID >, OStringHash >
m_aFontFileToFontID;
- boost::unordered_map< rtl::OString, int, rtl::OStringHash >
+ boost::unordered_map< OString, int, OStringHash >
m_aDirToAtom;
- boost::unordered_map< int, rtl::OString > m_aAtomToDir;
+ boost::unordered_map< int, OString > m_aAtomToDir;
int m_nNextDirAtom;
- boost::unordered_multimap< rtl::OString, sal_Unicode, rtl::OStringHash >
+ boost::unordered_multimap< OString, sal_Unicode, OStringHash >
m_aAdobenameToUnicode;
- boost::unordered_multimap< sal_Unicode, rtl::OString >
+ boost::unordered_multimap< sal_Unicode, OString >
m_aUnicodeToAdobename;
boost::unordered_multimap< sal_Unicode, sal_uInt8 > m_aUnicodeToAdobecode;
boost::unordered_multimap< sal_uInt8, sal_Unicode > m_aAdobecodeToUnicode;
@@ -286,28 +286,28 @@ class VCL_PLUGIN_PUBLIC PrintFontManager
mutable std::vector< fontID > m_aOverrideFonts;
- rtl::OString getAfmFile( PrintFont* pFont ) const;
- rtl::OString getFontFile( PrintFont* pFont ) const;
+ OString getAfmFile( PrintFont* pFont ) const;
+ OString getFontFile( PrintFont* pFont ) const;
- bool analyzeFontFile( int nDirID, const rtl::OString& rFileName, std::list< PrintFont* >& rNewFonts, const char *pFormat=NULL ) const;
- rtl::OUString convertTrueTypeName( void* pNameRecord ) const; // actually a NameRecord* formt font subsetting code
- void analyzeTrueTypeFamilyName( void* pTTFont, std::list< rtl::OUString >& rnames ) const; // actually a TrueTypeFont* from font subsetting code
+ bool analyzeFontFile( int nDirID, const OString& rFileName, std::list< PrintFont* >& rNewFonts, const char *pFormat=NULL ) const;
+ OUString convertTrueTypeName( void* pNameRecord ) const; // actually a NameRecord* formt font subsetting code
+ void analyzeTrueTypeFamilyName( void* pTTFont, std::list< OUString >& rnames ) const; // actually a TrueTypeFont* from font subsetting code
bool analyzeTrueTypeFile( PrintFont* pFont ) const;
// finds the font id for the nFaceIndex face in this font file
// There may be multiple font ids for TrueType collections
- fontID findFontFileID( int nDirID, const rtl::OString& rFile, int nFaceIndex ) const;
+ fontID findFontFileID( int nDirID, const OString& rFile, int nFaceIndex ) const;
// There may be multiple font ids for TrueType collections
- std::vector<fontID> findFontFileIDs( int nDirID, const rtl::OString& rFile ) const;
+ std::vector<fontID> findFontFileIDs( int nDirID, const OString& rFile ) const;
- bool knownFontFile( int nDirID, const rtl::OString& rFile ) const
+ bool knownFontFile( int nDirID, const OString& rFile ) const
{
return findFontFileID(nDirID, rFile, 0) != 0;
}
fontID findFontBuiltinID( int nPSNameAtom ) const;
- FontFamily matchFamilyName( const rtl::OUString& rFamily ) const;
+ FontFamily matchFamilyName( const OUString& rFamily ) const;
PrintFont* getFont( fontID nID ) const
{
@@ -318,15 +318,15 @@ class VCL_PLUGIN_PUBLIC PrintFontManager
void fillPrintFontInfo( PrintFont* pFont, FastPrintFontInfo& rInfo ) const;
void fillPrintFontInfo( PrintFont* pFont, PrintFontInfo& rInfo ) const;
- rtl::OString getDirectory( int nAtom ) const;
- int getDirectoryAtom( const rtl::OString& rDirectory, bool bCreate = false );
+ OString getDirectory( int nAtom ) const;
+ int getDirectoryAtom( const OString& rDirectory, bool bCreate = false );
/* try to initialize fonts from libfontconfig
called from <code>initialize()</code>
*/
void initFontconfig();
- void countFontconfigFonts( boost::unordered_map<rtl::OString, int, rtl::OStringHash>& o_rVisitedPaths );
+ void countFontconfigFonts( boost::unordered_map<OString, int, OStringHash>& o_rVisitedPaths );
/* deinitialize fontconfig
*/
void deinitFontconfig();
@@ -341,7 +341,7 @@ class VCL_PLUGIN_PUBLIC PrintFontManager
true if libfontconfig accepted the directory
false else (e.g. no libfontconfig found)
*/
- bool addFontconfigDir(const rtl::OString& rDirectory);
+ bool addFontconfigDir(const OString& rDirectory);
bool readOverrideMetrics();
@@ -357,7 +357,7 @@ public:
static PrintFontManager& get(); // one instance only
// There may be multiple font ids for TrueType collections
- std::vector<fontID> addFontFile( const rtl::OString& rFileName );
+ std::vector<fontID> addFontFile( const OString& rFileName );
void initialize();
@@ -383,7 +383,7 @@ public:
// routines to get font info in small pieces
// get a specific fonts PSName name
- const rtl::OUString& getPSName( fontID nFontID ) const;
+ const OUString& getPSName( fontID nFontID ) const;
// get a specific fonts family name aliases
void getFontFamilyAliases( fontID nFontID ) const;
@@ -438,7 +438,7 @@ public:
}
// get a specific fonts system dependent filename
- rtl::OString getFontFileSysPath( fontID nFontID ) const
+ OString getFontFileSysPath( fontID nFontID ) const
{
return getFontFile( getFont( nFontID ) );
}
@@ -473,7 +473,7 @@ public:
// builtin; if ppNonEncoded is set and non encoded type1 glyphs exist
// then *ppNonEncoded is set to the mapping for nonencoded glyphs.
// the encoding vector contains -1 for non encoded glyphs
- const std::map< sal_Unicode, sal_Int32 >* getEncodingMap( fontID nFontID, const std::map< sal_Unicode, rtl::OString >** ppNonEncoded ) const;
+ const std::map< sal_Unicode, sal_Int32 >* getEncodingMap( fontID nFontID, const std::map< sal_Unicode, OString >** ppNonEncoded ) const;
// to get font substitution transparently use the
// getKernPairs method of PrinterGfx
@@ -485,7 +485,7 @@ public:
bool isFontDownloadingAllowedForPrinting( fontID nFont ) const;
// helper for type 1 fonts
- std::list< rtl::OString > getAdobeNameFromUnicode( sal_Unicode aChar ) const;
+ std::list< OString > getAdobeNameFromUnicode( sal_Unicode aChar ) const;
std::pair< boost::unordered_multimap< sal_Unicode, sal_uInt8 >::const_iterator,
boost::unordered_multimap< sal_Unicode, sal_uInt8 >::const_iterator >
@@ -493,7 +493,7 @@ public:
{
return m_aUnicodeToAdobecode.equal_range( aChar );
}
- std::list< sal_Unicode > getUnicodeFromAdobeName( const rtl::OString& rName ) const;
+ std::list< sal_Unicode > getUnicodeFromAdobeName( const OString& rName ) const;
std::pair< boost::unordered_multimap< sal_uInt8, sal_Unicode >::const_iterator,
boost::unordered_multimap< sal_uInt8, sal_Unicode >::const_iterator >
getUnicodeFromAdobeCode( sal_uInt8 aChar ) const
@@ -515,7 +515,7 @@ public:
// TODO: callers of this method should use its FontSubsetInfo counterpart directly
bool createFontSubset( FontSubsetInfo&,
fontID nFont,
- const rtl::OUString& rOutFile,
+ const OUString& rOutFile,
sal_Int32* pGlyphIDs,
sal_uInt8* pNewEncoding,
sal_Int32* pWidths,
@@ -566,7 +566,7 @@ public:
bool matchFont( FastPrintFontInfo& rInfo, const com::sun::star::lang::Locale& rLocale );
ImplFontOptions* getFontOptions( const FastPrintFontInfo&, int nSize, void (*subcallback)(void*)) const;
- bool Substitute( FontSelectPattern &rPattern, rtl::OUString& rMissingCodes );
+ bool Substitute( FontSelectPattern &rPattern, OUString& rMissingCodes );
int FreeTypeCharIndex( void *pFace, sal_uInt32 aChar );
};
diff --git a/vcl/inc/vcl/gdimtf.hxx b/vcl/inc/vcl/gdimtf.hxx
index 51cff9fc4cb9..bbdf14177b3b 100644
--- a/vcl/inc/vcl/gdimtf.hxx
+++ b/vcl/inc/vcl/gdimtf.hxx
@@ -238,8 +238,8 @@ public:
@param nDataSize
Length, in byte, of raw data
*/
-MetaCommentAction* makePluggableRendererAction( const rtl::OUString& rRendererServiceName,
- const rtl::OUString& rGraphicServiceName,
+MetaCommentAction* makePluggableRendererAction( const OUString& rRendererServiceName,
+ const OUString& rGraphicServiceName,
const void* pData,
sal_uInt32 nDataSize );
diff --git a/vcl/inc/vcl/gfxlink.hxx b/vcl/inc/vcl/gfxlink.hxx
index 44a96cdb4c53..380298b500b8 100644
--- a/vcl/inc/vcl/gfxlink.hxx
+++ b/vcl/inc/vcl/gfxlink.hxx
@@ -51,7 +51,7 @@ struct ImpBuffer
struct ImpSwap
{
- rtl::OUString maURL;
+ OUString maURL;
sal_uLong mnDataSize;
sal_uLong mnRefCount;
diff --git a/vcl/inc/vcl/graphicfilter.hxx b/vcl/inc/vcl/graphicfilter.hxx
index b415d8fe7cb5..8f42119360d1 100644
--- a/vcl/inc/vcl/graphicfilter.hxx
+++ b/vcl/inc/vcl/graphicfilter.hxx
@@ -233,7 +233,7 @@ private:
protected:
- rtl::OUString aFilterPath;
+ OUString aFilterPath;
FilterConfigCache* pConfig;
FilterErrorEx* pErrorEx;
sal_Bool bAbort;
@@ -245,7 +245,7 @@ public:
GraphicFilter( sal_Bool bUseConfig = sal_True );
~GraphicFilter();
- void SetFilterPath( const rtl::OUString& rFilterPath ) { aFilterPath = rFilterPath; };
+ void SetFilterPath( const OUString& rFilterPath ) { aFilterPath = rFilterPath; };
sal_uInt16 GetImportFormatCount();
sal_uInt16 GetImportFormatNumber( const String& rFormatName );
diff --git a/vcl/inc/vcl/helper.hxx b/vcl/inc/vcl/helper.hxx
index 839bf6a840f2..295df4a1a5e7 100644
--- a/vcl/inc/vcl/helper.hxx
+++ b/vcl/inc/vcl/helper.hxx
@@ -33,25 +33,25 @@ namespace osl { class File; }
namespace psp {
typedef int fontID;
-void VCL_DLLPUBLIC getPrinterPathList( std::list< rtl::OUString >& rPathList, const char* pSubDir );
+void VCL_DLLPUBLIC getPrinterPathList( std::list< OUString >& rPathList, const char* pSubDir );
-// note: gcc 3.4.1 warns about visibility if we retunr a const rtl::OUString& here
+// note: gcc 3.4.1 warns about visibility if we retunr a const OUString& here
// seems to be a bug in gcc, now we return an object instead of a reference
-rtl::OUString VCL_DLLPUBLIC getFontPath();
+OUString VCL_DLLPUBLIC getFontPath();
bool VCL_DLLPUBLIC convertPfbToPfa( osl::File& rInFile, osl::File& rOutFile );
// normalized path (equivalent to realpath)
-void VCL_DLLPUBLIC normPath( rtl::OString& rPath );
+void VCL_DLLPUBLIC normPath( OString& rPath );
// splits rOrgPath into dirname and basename
// rOrgPath will be subject to normPath
-void VCL_DLLPUBLIC splitPath( rtl::OString& rOrgPath, rtl::OString& rDir, rtl::OString& rBase );
+void VCL_DLLPUBLIC splitPath( OString& rOrgPath, OString& rDir, OString& rBase );
enum whichOfficePath { InstallationRootPath, UserPath, ConfigPath };
-// note: gcc 3.4.1 warns about visibility if we retunr a const rtl::OUString& here
+// note: gcc 3.4.1 warns about visibility if we retunr a const OUString& here
// seems to be a bug in gcc, now we return an object instead of a reference
-rtl::OUString VCL_DLLPUBLIC getOfficePath( enum whichOfficePath ePath );
+OUString VCL_DLLPUBLIC getOfficePath( enum whichOfficePath ePath );
} // namespace
#endif // _PSPRINT_HELPER_HXX_
diff --git a/vcl/inc/vcl/i18nhelp.hxx b/vcl/inc/vcl/i18nhelp.hxx
index ae9a2d092627..8ece881a9b03 100644
--- a/vcl/inc/vcl/i18nhelp.hxx
+++ b/vcl/inc/vcl/i18nhelp.hxx
@@ -70,9 +70,9 @@ public:
I18nHelper( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, const LanguageTag& rLanguageTag );
~I18nHelper();
- sal_Int32 CompareString( const rtl::OUString& rStr1, const rtl::OUString& rStr2 ) const;
+ sal_Int32 CompareString( const OUString& rStr1, const OUString& rStr2 ) const;
- sal_Bool MatchString( const rtl::OUString& rStr1, const rtl::OUString& rStr2 ) const;
+ sal_Bool MatchString( const OUString& rStr1, const OUString& rStr2 ) const;
sal_Bool MatchMnemonic( const String& rString, sal_Unicode cMnemonicChar ) const;
String GetNum( long nNumber, sal_uInt16 nDecimals, sal_Bool bUseThousandSep = sal_True, sal_Bool bTrailingZeros = sal_True ) const;
diff --git a/vcl/inc/vcl/image.hxx b/vcl/inc/vcl/image.hxx
index 6c7ba0a70347..dc027f493a7f 100644
--- a/vcl/inc/vcl/image.hxx
+++ b/vcl/inc/vcl/image.hxx
@@ -84,14 +84,14 @@ class VCL_DLLPUBLIC ImageList
public:
ImageList( sal_uInt16 nInit = 8, sal_uInt16 nGrow = 4 );
ImageList( const ResId& rResId );
- ImageList( const ::std::vector< ::rtl::OUString >& rNameVector,
- const ::rtl::OUString& rPrefix,
+ ImageList( const ::std::vector< OUString >& rNameVector,
+ const OUString& rPrefix,
const Color* pMaskColor = NULL );
ImageList( const ImageList& rImageList );
~ImageList();
void InsertFromHorizontalStrip( const BitmapEx &rBitmapEx,
- const std::vector< rtl::OUString > &rNameVector );
+ const std::vector< OUString > &rNameVector );
void InsertFromHorizontalBitmap( const ResId& rResId,
sal_uInt16 nCount,
const Color *pNonAlphaMaskColor,
@@ -102,23 +102,23 @@ public:
sal_uInt16 GetImageCount() const;
Size GetImageSize() const;
- void AddImage( const ::rtl::OUString& rImageName, const Image& rImage );
+ void AddImage( const OUString& rImageName, const Image& rImage );
- void ReplaceImage( const ::rtl::OUString& rImageName, const Image& rImage );
+ void ReplaceImage( const OUString& rImageName, const Image& rImage );
void RemoveImage( sal_uInt16 nId );
Image GetImage( sal_uInt16 nId ) const;
- Image GetImage( const ::rtl::OUString& rImageName ) const;
+ Image GetImage( const OUString& rImageName ) const;
sal_uInt16 GetImagePos( sal_uInt16 nId ) const;
bool HasImageAtPos( sal_uInt16 nId ) const;
- sal_uInt16 GetImagePos( const ::rtl::OUString& rImageName ) const;
+ sal_uInt16 GetImagePos( const OUString& rImageName ) const;
sal_uInt16 GetImageId( sal_uInt16 nPos ) const;
- ::rtl::OUString GetImageName( sal_uInt16 nPos ) const;
- void GetImageNames( ::std::vector< ::rtl::OUString >& rNames ) const;
+ OUString GetImageName( sal_uInt16 nPos ) const;
+ void GetImageNames( ::std::vector< OUString >& rNames ) const;
ImageList& operator=( const ImageList& rImageList );
sal_Bool operator==( const ImageList& rImageList ) const;
@@ -130,13 +130,13 @@ private:
sal_uInt16 mnInitSize;
sal_uInt16 mnGrowSize;
- SAL_DLLPRIVATE void ImplInitBitmapEx( const ::rtl::OUString& rUserImageName,
- const ::std::vector< ::rtl::OUString >& rImageNames,
- const ::rtl::OUString& rSymbolsStyle,
+ SAL_DLLPRIVATE void ImplInitBitmapEx( const OUString& rUserImageName,
+ const ::std::vector< OUString >& rImageNames,
+ const OUString& rSymbolsStyle,
BitmapEx& rBmpEx,
const Color* pMaskColor ) const;
SAL_DLLPRIVATE void ImplInit( sal_uInt16 nItems, const Size &rSize );
- SAL_DLLPRIVATE sal_uInt16 ImplGetImageId( const ::rtl::OUString& rImageName ) const;
+ SAL_DLLPRIVATE sal_uInt16 ImplGetImageId( const OUString& rImageName ) const;
};
#endif // _SV_IMAGE_HXX
diff --git a/vcl/inc/vcl/imagerepository.hxx b/vcl/inc/vcl/imagerepository.hxx
index cf7c14861399..45ee445edcd6 100644
--- a/vcl/inc/vcl/imagerepository.hxx
+++ b/vcl/inc/vcl/imagerepository.hxx
@@ -48,7 +48,7 @@ namespace vcl
whether or not the image could be loaded successfully.
*/
static bool loadImage(
- const ::rtl::OUString& _rName,
+ const OUString& _rName,
BitmapEx& _out_rImage,
bool bSearchLanguageDependent,
bool loadMissing = false
diff --git a/vcl/inc/vcl/jobdata.hxx b/vcl/inc/vcl/jobdata.hxx
index 3f81877f230f..f6fb94fccab2 100644
--- a/vcl/inc/vcl/jobdata.hxx
+++ b/vcl/inc/vcl/jobdata.hxx
@@ -44,7 +44,7 @@ struct VCL_DLLPUBLIC JobData
int m_nColorDevice; // 0: no override, -1 grey scale, +1 color
int m_nPDFDevice; // 0: no override, -1 PostScript, +1: Automatically PDF, +2: Explicitly PDF
orientation::type m_eOrientation;
- ::rtl::OUString m_aPrinterName;
+ OUString m_aPrinterName;
const PPDParser* m_pParser;
PPDContext m_aContext;
diff --git a/vcl/inc/vcl/jobset.hxx b/vcl/inc/vcl/jobset.hxx
index a8cc29bb87ef..d8f489864297 100644
--- a/vcl/inc/vcl/jobset.hxx
+++ b/vcl/inc/vcl/jobset.hxx
@@ -53,15 +53,15 @@ public:
JobSetup( const JobSetup& rJob );
~JobSetup();
- rtl::OUString GetPrinterName() const;
- rtl::OUString GetDriverName() const;
+ OUString GetPrinterName() const;
+ OUString GetDriverName() const;
/* Get/SetValue are used to read/store additional
* Parameters in the job setup that may be used
* by the printer driver. One possible use are phone
* numbers for faxes (which disguise as printers)
*/
- void SetValue( const rtl::OUString& rKey, const rtl::OUString& rValue );
+ void SetValue( const OUString& rKey, const OUString& rValue );
JobSetup& operator=( const JobSetup& rJob );
diff --git a/vcl/inc/vcl/longcurr.hxx b/vcl/inc/vcl/longcurr.hxx
index e80ed7019f74..b0d57c392ab7 100644
--- a/vcl/inc/vcl/longcurr.hxx
+++ b/vcl/inc/vcl/longcurr.hxx
@@ -42,7 +42,7 @@ protected:
BigInt mnMin;
BigInt mnMax;
BigInt mnCorrectedValue;
- rtl::OUString maCurrencySymbol;
+ OUString maCurrencySymbol;
sal_uInt16 mnType;
sal_uInt16 mnDecimalDigits;
sal_Bool mbThousandSep;
diff --git a/vcl/inc/vcl/lstbox.hxx b/vcl/inc/vcl/lstbox.hxx
index 74dc854b8f44..79026116c473 100644
--- a/vcl/inc/vcl/lstbox.hxx
+++ b/vcl/inc/vcl/lstbox.hxx
@@ -223,7 +223,7 @@ public:
sal_Int32 getMaxWidthChars() const { return m_nMaxWidthChars; }
void setMaxWidthChars(sal_Int32 nWidth);
- virtual bool set_property(const rtl::OString &rKey, const rtl::OString &rValue);
+ virtual bool set_property(const OString &rKey, const OString &rValue);
};
// ----------------
diff --git a/vcl/inc/vcl/menu.hxx b/vcl/inc/vcl/menu.hxx
index ba6038de8bcd..c9bc3b538711 100644
--- a/vcl/inc/vcl/menu.hxx
+++ b/vcl/inc/vcl/menu.hxx
@@ -289,8 +289,8 @@ public:
void SetHelpCommand( sal_uInt16 nItemId, const XubString& rString );
const XubString& GetHelpCommand( sal_uInt16 nItemId ) const;
- void SetHelpId( sal_uInt16 nItemId, const rtl::OString& rHelpId );
- rtl::OString GetHelpId( sal_uInt16 nItemId ) const;
+ void SetHelpId( sal_uInt16 nItemId, const OString& rHelpId );
+ OString GetHelpId( sal_uInt16 nItemId ) const;
void SetActivateHdl( const Link& rLink ) { aActivateHdl = rLink; }
const Link& GetActivateHdl() const { return aActivateHdl; }
diff --git a/vcl/inc/vcl/metaact.hxx b/vcl/inc/vcl/metaact.hxx
index 4cad0a3fb8bf..961baaecd1ff 100644
--- a/vcl/inc/vcl/metaact.hxx
+++ b/vcl/inc/vcl/metaact.hxx
@@ -424,7 +424,7 @@ class VCL_DLLPUBLIC MetaTextAction : public MetaAction
private:
Point maPt;
- rtl::OUString maStr;
+ OUString maStr;
sal_uInt16 mnIndex;
sal_uInt16 mnLen;
@@ -433,14 +433,14 @@ private:
public:
DECL_META_ACTION( Text, META_TEXT_ACTION )
- MetaTextAction( const Point& rPt, const rtl::OUString& rStr,
+ MetaTextAction( const Point& rPt, const OUString& rStr,
sal_uInt16 nIndex, sal_uInt16 nLen );
virtual void Move( long nHorzMove, long nVertMove );
virtual void Scale( double fScaleX, double fScaleY );
const Point& GetPoint() const { return maPt; }
- const rtl::OUString& GetText() const { return maStr; }
+ const OUString& GetText() const { return maStr; }
sal_uInt16 GetIndex() const { return mnIndex; }
sal_uInt16 GetLen() const { return mnLen; }
};
@@ -450,7 +450,7 @@ class VCL_DLLPUBLIC MetaTextArrayAction : public MetaAction
private:
Point maStartPt;
- rtl::OUString maStr;
+ OUString maStr;
sal_Int32* mpDXAry;
sal_uInt16 mnIndex;
sal_uInt16 mnLen;
@@ -463,7 +463,7 @@ protected:
public:
MetaTextArrayAction();
MetaTextArrayAction( const MetaTextArrayAction& rAction );
- MetaTextArrayAction( const Point& rStartPt, const rtl::OUString& rStr,
+ MetaTextArrayAction( const Point& rStartPt, const OUString& rStr,
const sal_Int32* pDXAry, sal_uInt16 nIndex,
sal_uInt16 nLen );
@@ -478,7 +478,7 @@ public:
virtual void Read( SvStream& rIStm, ImplMetaReadData* pData );
const Point& GetPoint() const { return maStartPt; }
- const rtl::OUString& GetText() const { return maStr; }
+ const OUString& GetText() const { return maStr; }
sal_uInt16 GetIndex() const { return mnIndex; }
sal_uInt16 GetLen() const { return mnLen; }
sal_Int32* GetDXArray() const { return mpDXAry; }
@@ -489,7 +489,7 @@ class VCL_DLLPUBLIC MetaStretchTextAction : public MetaAction
private:
Point maPt;
- rtl::OUString maStr;
+ OUString maStr;
sal_uInt32 mnWidth;
sal_uInt16 mnIndex;
sal_uInt16 mnLen;
@@ -500,14 +500,14 @@ public:
DECL_META_ACTION( StretchText, META_STRETCHTEXT_ACTION )
MetaStretchTextAction( const Point& rPt, sal_uInt32 nWidth,
- const rtl::OUString& rStr,
+ const OUString& rStr,
sal_uInt16 nIndex, sal_uInt16 nLen );
virtual void Move( long nHorzMove, long nVertMove );
virtual void Scale( double fScaleX, double fScaleY );
const Point& GetPoint() const { return maPt; }
- const rtl::OUString& GetText() const { return maStr; }
+ const OUString& GetText() const { return maStr; }
sal_uInt32 GetWidth() const { return mnWidth; }
sal_uInt16 GetIndex() const { return mnIndex; }
sal_uInt16 GetLen() const { return mnLen; }
@@ -518,7 +518,7 @@ class VCL_DLLPUBLIC MetaTextRectAction : public MetaAction
private:
Rectangle maRect;
- rtl::OUString maStr;
+ OUString maStr;
sal_uInt16 mnStyle;
virtual sal_Bool Compare( const MetaAction& ) const;
@@ -527,13 +527,13 @@ public:
DECL_META_ACTION( TextRect, META_TEXTRECT_ACTION )
MetaTextRectAction( const Rectangle& rRect,
- const rtl::OUString& rStr, sal_uInt16 nStyle );
+ const OUString& rStr, sal_uInt16 nStyle );
virtual void Move( long nHorzMove, long nVertMove );
virtual void Scale( double fScaleX, double fScaleY );
const Rectangle& GetRect() const { return maRect; }
- const rtl::OUString& GetText() const { return maStr; }
+ const OUString& GetText() const { return maStr; }
sal_uInt16 GetStyle() const { return mnStyle; }
};
@@ -1254,7 +1254,7 @@ class VCL_DLLPUBLIC MetaCommentAction : public MetaAction
{
private:
- rtl::OString maComment;
+ OString maComment;
sal_Int32 mnValue;
sal_uInt32 mnDataSize;
sal_uInt8* mpData;
@@ -1268,7 +1268,7 @@ protected:
public:
MetaCommentAction( sal_Int32 nValue = 0L );
MetaCommentAction( const MetaCommentAction& rAct );
- MetaCommentAction( const rtl::OString& rComment, sal_Int32 nValue = 0L, const sal_uInt8* pData = NULL, sal_uInt32 nDataSize = 0UL );
+ MetaCommentAction( const OString& rComment, sal_Int32 nValue = 0L, const sal_uInt8* pData = NULL, sal_uInt32 nDataSize = 0UL );
virtual void Move( long nHorzMove, long nVertMove );
virtual void Scale( double fScaleX, double fScaleY );
@@ -1278,7 +1278,7 @@ public:
virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData );
virtual void Read( SvStream& rIStm, ImplMetaReadData* pData );
- const rtl::OString& GetComment() const { return maComment; }
+ const OString& GetComment() const { return maComment; }
sal_Int32 GetValue() const { return mnValue; }
sal_uInt32 GetDataSize() const { return mnDataSize; }
const sal_uInt8* GetData() const { return mpData; }
diff --git a/vcl/inc/vcl/outdev.hxx b/vcl/inc/vcl/outdev.hxx
index df433ff92e84..b0bb8e5c9389 100644
--- a/vcl/inc/vcl/outdev.hxx
+++ b/vcl/inc/vcl/outdev.hxx
@@ -1151,7 +1151,7 @@ public:
const Rectangle& rControlRegion,
ControlState nState,
const ImplControlValue& aValue,
- ::rtl::OUString aCaption );
+ OUString aCaption );
// Query the native control's actual drawing region (including adornment)
sal_Bool GetNativeControlRegion( ControlType nType,
@@ -1159,7 +1159,7 @@ public:
const Rectangle& rControlRegion,
ControlState nState,
const ImplControlValue& aValue,
- ::rtl::OUString aCaption,
+ OUString aCaption,
Rectangle &rNativeBoundingRegion,
Rectangle &rNativeContentRegion ) const;
diff --git a/vcl/inc/vcl/pdfextoutdevdata.hxx b/vcl/inc/vcl/pdfextoutdevdata.hxx
index 3a0be8c5c199..59a118945cd4 100644
--- a/vcl/inc/vcl/pdfextoutdevdata.hxx
+++ b/vcl/inc/vcl/pdfextoutdevdata.hxx
@@ -54,7 +54,7 @@ struct PDFExtOutDevBookmarkEntry
/** link target name, respectively destination name
*/
- rtl::OUString aBookmark;
+ OUString aBookmark;
PDFExtOutDevBookmarkEntry()
:nLinkId( -1 )
@@ -285,7 +285,7 @@ public :
0 for success
-1 in case the link id does not exist
*/
- sal_Int32 SetLinkURL( sal_Int32 nLinkId, const rtl::OUString& rURL );
+ sal_Int32 SetLinkURL( sal_Int32 nLinkId, const OUString& rURL );
/** Create a new outline item
@param nParent
@@ -302,7 +302,7 @@ public :
@returns
the outline item id of the new item
*/
- sal_Int32 CreateOutlineItem( sal_Int32 nParent = 0, const rtl::OUString& rText = rtl::OUString(), sal_Int32 nDestID = -1 );
+ sal_Int32 CreateOutlineItem( sal_Int32 nParent = 0, const OUString& rText = OUString(), sal_Int32 nDestID = -1 );
/** Create a new note on a page
@@ -354,7 +354,7 @@ public :
@returns
the id of the newly created structural element
*/
- sal_Int32 BeginStructureElement( PDFWriter::StructElement eType, const rtl::OUString& rAlias = rtl::OUString() );
+ sal_Int32 BeginStructureElement( PDFWriter::StructElement eType, const OUString& rAlias = OUString() );
/** end a logical structure element
@see BeginStructureElement
diff --git a/vcl/inc/vcl/pdfwriter.hxx b/vcl/inc/vcl/pdfwriter.hxx
index 4db5e293a5e5..3bfd5ed2f66f 100644
--- a/vcl/inc/vcl/pdfwriter.hxx
+++ b/vcl/inc/vcl/pdfwriter.hxx
@@ -224,9 +224,9 @@ public:
protected:
WidgetType Type; // primitive RTTI
public:
- rtl::OUString Name; // a distinct name to identify the control
- rtl::OUString Description;// descriptive text for the contro (e.g. for tool tip)
- rtl::OUString Text; // user text to appear on the control
+ OUString Name; // a distinct name to identify the control
+ OUString Description;// descriptive text for the contro (e.g. for tool tip)
+ OUString Text; // user text to appear on the control
sal_uInt16 TextStyle; // style flags
bool ReadOnly;
Rectangle Location; // describes the area filled by the control
@@ -319,7 +319,7 @@ public:
will appear literally in the PDF file produced
*/
sal_Int32 Dest;
- rtl::OUString URL;
+ OUString URL;
bool Submit;
bool SubmitGet;
@@ -356,7 +356,7 @@ public:
bool Selected;
sal_Int32 RadioGroup;
bool ButtonIsLeft;
- rtl::OUString OnValue; // the value of the radio button if it is selected
+ OUString OnValue; // the value of the radio button if it is selected
RadioButtonWidget()
: AnyWidget( vcl::PDFWriter::RadioButton ),
@@ -405,7 +405,7 @@ public:
bool DropDown;
bool Sort;
bool MultiSelect;
- std::vector<rtl::OUString> Entries;
+ std::vector<OUString> Entries;
std::vector<sal_Int32> SelectedEntries;
// if MultiSelect is false only the first entry of SelectedEntries
// will be taken into account. the same is implicit for PDF < 1.4
@@ -428,7 +428,7 @@ public:
struct ComboBoxWidget : public AnyWidget
{
bool Sort;
- std::vector<rtl::OUString> Entries;
+ std::vector<OUString> Entries;
// set the current value in AnyWidget::Text
ComboBoxWidget()
@@ -448,9 +448,9 @@ public:
// the Location member of the AnyWidget which spcifies the coordinates
// of the signature
- rtl::OUString SigLocation;
- rtl::OUString SigReason;
- rtl::OUString SigContactInfo;
+ OUString SigLocation;
+ OUString SigReason;
+ OUString SigContactInfo;
bool SigHidden;
SignatureWidget()
@@ -565,9 +565,9 @@ The following structure describes the permissions used in PDF security
struct PDFWriterContext
{
/* must be a valid file: URL usable by osl */
- rtl::OUString URL;
+ OUString URL;
/* the URL of the document being exported, used for relative links*/
- rtl::OUString BaseURL;
+ OUString BaseURL;
/*if relative to file system should be formed*/
bool RelFsys;//i56629, i49415?, i64585?
/*the action to set the PDF hyperlink to*/
@@ -622,10 +622,10 @@ The following structure describes the permissions used in PDF security
PDFWriter::PDFDocInfo DocumentInfo;
bool SignPDF;
- rtl::OUString SignLocation;
- rtl::OUString SignPassword;
- rtl::OUString SignReason;
- rtl::OUString SignContact;
+ OUString SignLocation;
+ OUString SignPassword;
+ OUString SignReason;
+ OUString SignContact;
com::sun::star::lang::Locale DocumentLocale; // defines the document default language
sal_uInt32 DPIx, DPIy; // how to handle MapMode( MAP_PIXEL )
// 0 here specifies a default handling
@@ -726,8 +726,8 @@ The following structure describes the permissions used in PDF security
std::set< ErrorCode > GetErrors();
static com::sun::star::uno::Reference< com::sun::star::beans::XMaterialHolder >
- InitEncryption( const rtl::OUString& i_rOwnerPassword,
- const rtl::OUString& i_rUserPassword,
+ InitEncryption( const OUString& i_rOwnerPassword,
+ const OUString& i_rUserPassword,
bool b128Bit
);
@@ -895,7 +895,7 @@ The following structure describes the permissions used in PDF security
the destination id (to be used in SetLinkDest) or
-1 if page id does not exist
*/
- sal_Int32 CreateNamedDest( const rtl::OUString& sDestName, const Rectangle& rRect, sal_Int32 nPageNr = -1, DestAreaType eType = XYZ );
+ sal_Int32 CreateNamedDest( const OUString& sDestName, const Rectangle& rRect, sal_Int32 nPageNr = -1, DestAreaType eType = XYZ );
/** Create a new destination to be used in a link
@param rRect
@@ -979,7 +979,7 @@ The following structure describes the permissions used in PDF security
0 for success
-1 in case the link id does not exist
*/
- sal_Int32 SetLinkURL( sal_Int32 nLinkId, const rtl::OUString& rURL );
+ sal_Int32 SetLinkURL( sal_Int32 nLinkId, const OUString& rURL );
/** Resolve link in logical structure
<p>
If a link is created after the corresponding visual appearance was drawn
@@ -1026,7 +1026,7 @@ The following structure describes the permissions used in PDF security
@returns
the outline item id of the new item
*/
- sal_Int32 CreateOutlineItem( sal_Int32 nParent = 0, const rtl::OUString& rText = rtl::OUString(), sal_Int32 nDestID = -1 );
+ sal_Int32 CreateOutlineItem( sal_Int32 nParent = 0, const OUString& rText = OUString(), sal_Int32 nDestID = -1 );
/** Set an outline item's parent
@@ -1055,7 +1055,7 @@ The following structure describes the permissions used in PDF security
0 if the item exists and the text was changed
-1 if the item does not exist
*/
- sal_Int32 SetOutlineItemText( sal_Int32 nItem, const rtl::OUString& rText );
+ sal_Int32 SetOutlineItemText( sal_Int32 nItem, const OUString& rText );
/** Set an outline item's destination
@@ -1137,7 +1137,7 @@ The following structure describes the permissions used in PDF security
@returns
the new structure element's id for use in <code>SetCurrentStructureElement</code>
*/
- sal_Int32 BeginStructureElement( enum StructElement eType, const rtl::OUString& rAlias = rtl::OUString() );
+ sal_Int32 BeginStructureElement( enum StructElement eType, const OUString& rAlias = OUString() );
/** end the current logical structure element
<p>
diff --git a/vcl/inc/vcl/ppdparser.hxx b/vcl/inc/vcl/ppdparser.hxx
index ec04b2481763..80fbeaf4728a 100644
--- a/vcl/inc/vcl/ppdparser.hxx
+++ b/vcl/inc/vcl/ppdparser.hxx
@@ -57,7 +57,7 @@ class VCL_DLLPUBLIC PPDKey
{
friend class PPDParser;
- typedef ::boost::unordered_map< ::rtl::OUString, PPDValue, ::rtl::OUStringHash > hash_type;
+ typedef ::boost::unordered_map< OUString, PPDValue, OUStringHash > hash_type;
typedef ::std::vector< PPDValue* > value_type;
String m_aKey;
@@ -121,7 +121,7 @@ class VCL_DLLPUBLIC PPDParser
friend class CUPSManager;
friend class PPDCache;
- typedef ::boost::unordered_map< ::rtl::OUString, PPDKey*, ::rtl::OUStringHash > hash_type;
+ typedef ::boost::unordered_map< OUString, PPDKey*, OUStringHash > hash_type;
typedef ::std::vector< PPDKey* > value_type;
void insertKey( const String& rKey, PPDKey* pKey );
@@ -178,12 +178,12 @@ private:
PPDParser( const String& rFile );
~PPDParser();
- void parseOrderDependency(const rtl::OString& rLine);
- void parseOpenUI(const rtl::OString& rLine);
- void parseConstraint(const rtl::OString& rLine);
- void parse( std::list< rtl::OString >& rLines );
+ void parseOrderDependency(const OString& rLine);
+ void parseOpenUI(const OString& rLine);
+ void parseConstraint(const OString& rLine);
+ void parse( std::list< OString >& rLines );
- String handleTranslation(const rtl::OString& i_rString, bool i_bIsGlobalized);
+ String handleTranslation(const OString& i_rString, bool i_bIsGlobalized);
static void scanPPDDir( const String& rDir );
static void initPPDFiles();
@@ -192,7 +192,7 @@ public:
static const PPDParser* getParser( const String& rFile );
static String getPPDPrinterName( const String& rFile );
static void freeAll();
- static void getKnownPPDDrivers( std::list< rtl::OUString >& o_rDrivers, bool bRefresh = false );
+ static void getKnownPPDDrivers( std::list< OUString >& o_rDrivers, bool bRefresh = false );
const String& getFilename() const { return m_aFile; }
@@ -250,10 +250,10 @@ public:
String getFont( int ) const;
- rtl::OUString translateKey( const rtl::OUString& i_rKey,
+ OUString translateKey( const OUString& i_rKey,
const com::sun::star::lang::Locale& i_rLocale = com::sun::star::lang::Locale() ) const;
- rtl::OUString translateOption( const rtl::OUString& i_rKey,
- const rtl::OUString& i_rOption,
+ OUString translateOption( const OUString& i_rKey,
+ const OUString& i_rOption,
const com::sun::star::lang::Locale& i_rLocale = com::sun::star::lang::Locale() ) const;
};
@@ -301,7 +301,7 @@ public:
// width, height in points, paper will contain the name of the selected
// paper after the call
- void getPageSize( rtl::OUString& rPaper, int& rWidth, int& rHeight ) const;
+ void getPageSize( OUString& rPaper, int& rWidth, int& rHeight ) const;
};
} // namespace
diff --git a/vcl/inc/vcl/print.hxx b/vcl/inc/vcl/print.hxx
index e0a87e9af088..c40e8bc4ab4d 100644
--- a/vcl/inc/vcl/print.hxx
+++ b/vcl/inc/vcl/print.hxx
@@ -93,10 +93,10 @@ class VCL_DLLPUBLIC QueueInfo
friend class Printer;
private:
- rtl::OUString maPrinterName;
- rtl::OUString maDriver;
- rtl::OUString maLocation;
- rtl::OUString maComment;
+ OUString maPrinterName;
+ OUString maDriver;
+ OUString maLocation;
+ OUString maComment;
sal_uInt32 mnStatus;
sal_uInt32 mnJobs;
@@ -105,10 +105,10 @@ public:
QueueInfo( const QueueInfo& rInfo );
~QueueInfo();
- const rtl::OUString& GetPrinterName() const { return maPrinterName; }
- const rtl::OUString& GetDriver() const { return maDriver; }
- const rtl::OUString& GetLocation() const { return maLocation; }
- const rtl::OUString& GetComment() const { return maComment; }
+ const OUString& GetPrinterName() const { return maPrinterName; }
+ const OUString& GetDriver() const { return maDriver; }
+ const OUString& GetLocation() const { return maLocation; }
+ const OUString& GetComment() const { return maComment; }
sal_uInt32 GetStatus() const { return mnStatus; }
sal_uInt32 GetJobs() const { return mnJobs; }
@@ -223,10 +223,10 @@ private:
Printer* mpNext;
VirtualDevice* mpDisplayDev;
PrinterOptions* mpPrinterOptions;
- rtl::OUString maPrinterName;
- rtl::OUString maDriver;
- rtl::OUString maPrintFile;
- rtl::OUString maJobName;
+ OUString maPrinterName;
+ OUString maDriver;
+ OUString maPrintFile;
+ OUString maJobName;
JobSetup maJobSetup;
Point maPageOffset;
Size maPaperSize;
@@ -250,13 +250,13 @@ private:
SAL_DLLPRIVATE void ImplInitData();
SAL_DLLPRIVATE void ImplInit( SalPrinterQueueInfo* pInfo );
SAL_DLLPRIVATE void ImplInitDisplay( const Window* pWindow );
- SAL_DLLPRIVATE static SalPrinterQueueInfo* ImplGetQueueInfo( const rtl::OUString& rPrinterName,
- const rtl::OUString* pDriver );
+ SAL_DLLPRIVATE static SalPrinterQueueInfo* ImplGetQueueInfo( const OUString& rPrinterName,
+ const OUString* pDriver );
SAL_DLLPRIVATE void ImplUpdatePageData();
SAL_DLLPRIVATE void ImplUpdateFontList();
SAL_DLLPRIVATE void ImplFindPaperFormatForUserSize( JobSetup&, bool bMatchNearest );
- SAL_DLLPRIVATE bool StartJob( const rtl::OUString& rJobName, boost::shared_ptr<vcl::PrinterController>& );
+ SAL_DLLPRIVATE bool StartJob( const OUString& rJobName, boost::shared_ptr<vcl::PrinterController>& );
static SAL_DLLPRIVATE sal_uLong ImplSalPrinterErrorCodeToVCL( sal_uLong nError );
@@ -279,17 +279,17 @@ public:
Printer();
Printer( const JobSetup& rJobSetup );
Printer( const QueueInfo& rQueueInfo );
- Printer( const rtl::OUString& rPrinterName );
+ Printer( const OUString& rPrinterName );
virtual ~Printer();
- static const std::vector< rtl::OUString >& GetPrinterQueues();
- static const QueueInfo* GetQueueInfo( const rtl::OUString& rPrinterName, bool bStatusUpdate );
- static rtl::OUString GetDefaultPrinterName();
+ static const std::vector< OUString >& GetPrinterQueues();
+ static const QueueInfo* GetQueueInfo( const OUString& rPrinterName, bool bStatusUpdate );
+ static OUString GetDefaultPrinterName();
virtual void Error();
- const rtl::OUString& GetName() const { return maPrinterName; }
- const rtl::OUString& GetDriverName() const { return maDriver; }
+ const OUString& GetName() const { return maPrinterName; }
+ const OUString& GetDriverName() const { return maDriver; }
sal_Bool IsDefPrinter() const { return mbDefPrinter; }
sal_Bool IsDisplayPrinter() const { return mpDisplayDev != NULL; }
sal_Bool IsValid() const { return !IsDisplayPrinter(); }
@@ -299,7 +299,7 @@ public:
sal_Bool SetJobSetup( const JobSetup& rSetup );
const JobSetup& GetJobSetup() const { return maJobSetup; }
- void SetJobValue( const rtl::OUString& rKey, const rtl::OUString& rValue ) { maJobSetup.SetValue( rKey, rValue ); }
+ void SetJobValue( const OUString& rKey, const OUString& rValue ) { maJobSetup.SetValue( rKey, rValue ); }
sal_Bool Setup( Window* pWindow = NULL );
sal_Bool SetPrinterProps( const Printer* pPrinter );
@@ -325,16 +325,16 @@ public:
sal_Bool SetPaperSizeUser( const Size& rSize );
sal_Bool SetPaperSizeUser( const Size& rSize, bool bMatchNearest );
Paper GetPaper() const;
- static rtl::OUString GetPaperName( Paper ePaper );
+ static OUString GetPaperName( Paper ePaper );
// return a UI string for the current paper; i_bPaperUser == false means an empty string for PAPER_USER
- rtl::OUString GetPaperName( bool i_bPaperUser = true ) const;
+ OUString GetPaperName( bool i_bPaperUser = true ) const;
// returns number of available paper formats
int GetPaperInfoCount() const;
// returns info about paper format nPaper
const PaperInfo& GetPaperInfo( int nPaper ) const;
sal_uInt16 GetPaperBinCount() const;
- rtl::OUString GetPaperBinName( sal_uInt16 nPaperBin ) const;
+ OUString GetPaperBinName( sal_uInt16 nPaperBin ) const;
const Size& GetPaperSizePixel() const { return maPaperSize; }
Size GetPaperSize() const { return PixelToLogic( maPaperSize ); }
@@ -347,7 +347,7 @@ public:
sal_Bool IsPrinting() const { return mbPrinting; }
- const rtl::OUString& GetCurJobName() const { return maJobName; }
+ const OUString& GetCurJobName() const { return maJobName; }
sal_uInt16 GetCurPage() const { return mnCurPage; }
sal_Bool IsJobActive() const { return mbJobActive; }
@@ -445,20 +445,20 @@ public:
/* get the PropertyValue of a Property
*/
- com::sun::star::beans::PropertyValue* getValue( const rtl::OUString& i_rPropertyName );
- const com::sun::star::beans::PropertyValue* getValue( const rtl::OUString& i_rPropertyName ) const;
+ com::sun::star::beans::PropertyValue* getValue( const OUString& i_rPropertyName );
+ const com::sun::star::beans::PropertyValue* getValue( const OUString& i_rPropertyName ) const;
/* get a bool property
in case the property is unknown or not convertible to bool, i_bFallback is returned
*/
- sal_Bool getBoolProperty( const rtl::OUString& i_rPropertyName, sal_Bool i_bFallback ) const;
+ sal_Bool getBoolProperty( const OUString& i_rPropertyName, sal_Bool i_bFallback ) const;
/* get an int property
in case the property is unknown or not convertible to bool, i_nFallback is returned
*/
- sal_Int32 getIntProperty( const rtl::OUString& i_rPropertyName, sal_Int32 i_nFallback ) const;
+ sal_Int32 getIntProperty( const OUString& i_rPropertyName, sal_Int32 i_nFallback ) const;
/* set a property value - can also be used to add another UI property
*/
- void setValue( const rtl::OUString& i_rPropertyName, const com::sun::star::uno::Any& i_rValue );
+ void setValue( const OUString& i_rPropertyName, const com::sun::star::uno::Any& i_rValue );
void setValue( const com::sun::star::beans::PropertyValue& i_rValue );
/* return the currently active UI options. These are the same that were passed to setUIOptions.
@@ -470,12 +470,12 @@ public:
void setUIOptions( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& );
/* enable/disable an option; this can be used to implement dialog logic.
*/
- bool isUIOptionEnabled( const rtl::OUString& rPropName ) const;
- bool isUIChoiceEnabled( const rtl::OUString& rPropName, sal_Int32 nChoice ) const;
+ bool isUIOptionEnabled( const OUString& rPropName ) const;
+ bool isUIChoiceEnabled( const OUString& rPropName, sal_Int32 nChoice ) const;
/* returns the property name rPropName depends on or an empty string
if no dependency exists.
*/
- rtl::OUString getDependency( const rtl::OUString& rPropName ) const;
+ OUString getDependency( const OUString& rPropName ) const;
/* makeEnabled will chage the property rPropName depends on to the value
that makes rPropName enabled. If the dependency itself is also disabled,
no action will be performed.
@@ -483,7 +483,7 @@ public:
returns the property name rPropName depends on or an empty string
if no change was made.
*/
- rtl::OUString makeEnabled( const rtl::OUString& rPropName );
+ OUString makeEnabled( const OUString& rPropName );
virtual int getPageCount() const = 0; // must be overloaded by the app
/* get the page parameters, namely the jobsetup that should be active for the page
@@ -537,7 +537,7 @@ public:
class VCL_DLLPUBLIC PrinterOptionsHelper
{
protected:
- boost::unordered_map< rtl::OUString, com::sun::star::uno::Any, rtl::OUStringHash > m_aPropertyMap;
+ boost::unordered_map< OUString, com::sun::star::uno::Any, OUStringHash > m_aPropertyMap;
com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > m_aUIProperties;
public:
@@ -553,7 +553,7 @@ class VCL_DLLPUBLIC PrinterOptionsHelper
* if the optional output set is not NULL then the names of the changed properties are returned
**/
bool processProperties( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& i_rNewProp,
- std::set< rtl::OUString >* o_pChangeProp = NULL );
+ std::set< OUString >* o_pChangeProp = NULL );
/* append to a sequence of property values the ui property sequence passed at creation
* as the "ExtraPrintUIOptions" property. if that sequence was empty, no "ExtraPrintUIOptions" property
* will be appended.
@@ -561,38 +561,38 @@ class VCL_DLLPUBLIC PrinterOptionsHelper
void appendPrintUIOptions( com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& io_rProps ) const;
// returns an empty Any for not existing properties
- com::sun::star::uno::Any getValue( const rtl::OUString& i_rPropertyName ) const;
+ com::sun::star::uno::Any getValue( const OUString& i_rPropertyName ) const;
- sal_Bool getBoolValue( const rtl::OUString& i_rPropertyName, sal_Bool i_bDefault = sal_False ) const;
+ sal_Bool getBoolValue( const OUString& i_rPropertyName, sal_Bool i_bDefault = sal_False ) const;
// convenience for fixed strings
sal_Bool getBoolValue( const char* i_pPropName, sal_Bool i_bDefault = sal_False ) const
- { return getBoolValue( rtl::OUString::createFromAscii( i_pPropName ), i_bDefault ); }
+ { return getBoolValue( OUString::createFromAscii( i_pPropName ), i_bDefault ); }
- sal_Int64 getIntValue( const rtl::OUString& i_rPropertyName, sal_Int64 i_nDefault = 0 ) const;
+ sal_Int64 getIntValue( const OUString& i_rPropertyName, sal_Int64 i_nDefault = 0 ) const;
// convenience for fixed strings
sal_Int64 getIntValue( const char* i_pPropName, sal_Int64 i_nDefault = 0 ) const
- { return getIntValue( rtl::OUString::createFromAscii( i_pPropName ), i_nDefault ); }
+ { return getIntValue( OUString::createFromAscii( i_pPropName ), i_nDefault ); }
- rtl::OUString getStringValue( const rtl::OUString& i_rPropertyName, const rtl::OUString& i_rDefault = rtl::OUString() ) const;
+ OUString getStringValue( const OUString& i_rPropertyName, const OUString& i_rDefault = OUString() ) const;
// convenience for fixed strings
- rtl::OUString getStringValue( const char* i_pPropName, const rtl::OUString& i_rDefault = rtl::OUString() ) const
- { return getStringValue( rtl::OUString::createFromAscii( i_pPropName ), i_rDefault ); }
+ OUString getStringValue( const char* i_pPropName, const OUString& i_rDefault = OUString() ) const
+ { return getStringValue( OUString::createFromAscii( i_pPropName ), i_rDefault ); }
// helper functions for user to create a single control
struct UIControlOptions
{
- rtl::OUString maDependsOnName;
+ OUString maDependsOnName;
sal_Int32 mnDependsOnEntry;
sal_Bool mbAttachToDependency;
- rtl::OUString maGroupHint;
+ OUString maGroupHint;
sal_Bool mbInternalOnly;
sal_Bool mbEnabled;
com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > maAddProps;
- UIControlOptions( const rtl::OUString& i_rDependsOnName = rtl::OUString(),
+ UIControlOptions( const OUString& i_rDependsOnName = OUString(),
sal_Int32 i_nDependsOnEntry = -1,
sal_Bool i_bAttachToDependency = sal_False,
- const rtl::OUString& i_rGroupHint = rtl::OUString(),
+ const OUString& i_rGroupHint = OUString(),
sal_Bool i_bInternalOnly = sal_False,
sal_Bool i_bEnabled = sal_True
)
@@ -604,56 +604,56 @@ class VCL_DLLPUBLIC PrinterOptionsHelper
, mbEnabled( i_bEnabled ) {}
};
- // note: in the following helper functions HelpIds are expected as an rtl::OUString
- // the normal HelpId form is rtl::OString (byte string instead of UTF16 string)
+ // note: in the following helper functions HelpIds are expected as an OUString
+ // the normal HelpId form is OString (byte string instead of UTF16 string)
// this is because the whole interface is base on UNO properties; in fact the structures
// are passed over UNO interfaces. UNO does not know a byte string, hence the string is
// transported via UTF16 strings.
// Show general control
- static com::sun::star::uno::Any setUIControlOpt( const com::sun::star::uno::Sequence< rtl::OUString >& i_rIDs,
- const rtl::OUString& i_rTitle,
- const com::sun::star::uno::Sequence< rtl::OUString >& i_rHelpId,
- const rtl::OUString& i_rType,
+ static com::sun::star::uno::Any setUIControlOpt( const com::sun::star::uno::Sequence< OUString >& i_rIDs,
+ const OUString& i_rTitle,
+ const com::sun::star::uno::Sequence< OUString >& i_rHelpId,
+ const OUString& i_rType,
const com::sun::star::beans::PropertyValue* i_pValue = NULL,
const UIControlOptions& i_rControlOptions = UIControlOptions()
);
// Show and set the title of a TagPage of id i_rID
- static com::sun::star::uno::Any setGroupControlOpt(const rtl::OUString& i_rID,
- const rtl::OUString& i_rTitle,
- const rtl::OUString& i_rHelpId);
+ static com::sun::star::uno::Any setGroupControlOpt(const OUString& i_rID,
+ const OUString& i_rTitle,
+ const OUString& i_rHelpId);
// Show and set the label of a VclFrame of id i_rID
- static com::sun::star::uno::Any setSubgroupControlOpt(const rtl::OUString& i_rID,
- const rtl::OUString& i_rTitle,
- const rtl::OUString& i_rHelpId,
+ static com::sun::star::uno::Any setSubgroupControlOpt(const OUString& i_rID,
+ const OUString& i_rTitle,
+ const OUString& i_rHelpId,
const UIControlOptions& i_rControlOptions = UIControlOptions());
// Show a bool option as a checkbox
- static com::sun::star::uno::Any setBoolControlOpt(const rtl::OUString& i_rID,
- const rtl::OUString& i_rTitle,
- const rtl::OUString& i_rHelpId,
- const rtl::OUString& i_rProperty,
+ static com::sun::star::uno::Any setBoolControlOpt(const OUString& i_rID,
+ const OUString& i_rTitle,
+ const OUString& i_rHelpId,
+ const OUString& i_rProperty,
sal_Bool i_bValue,
const UIControlOptions& i_rControlOptions = UIControlOptions());
// Show a set of choices in a list box
- static com::sun::star::uno::Any setChoiceListControlOpt(const rtl::OUString& i_rID,
- const rtl::OUString& i_rTitle,
- const com::sun::star::uno::Sequence< rtl::OUString >& i_rHelpId,
- const rtl::OUString& i_rProperty,
- const com::sun::star::uno::Sequence< rtl::OUString >& i_rChoices,
+ static com::sun::star::uno::Any setChoiceListControlOpt(const OUString& i_rID,
+ const OUString& i_rTitle,
+ const com::sun::star::uno::Sequence< OUString >& i_rHelpId,
+ const OUString& i_rProperty,
+ const com::sun::star::uno::Sequence< OUString >& i_rChoices,
sal_Int32 i_nValue,
const com::sun::star::uno::Sequence< sal_Bool >& i_rDisabledChoices = com::sun::star::uno::Sequence< sal_Bool >(),
const UIControlOptions& i_rControlOptions = UIControlOptions());
// show a set of choices as radio buttons
- static com::sun::star::uno::Any setChoiceRadiosControlOpt(const com::sun::star::uno::Sequence< rtl::OUString >& i_rIDs,
- const rtl::OUString& i_rTitle,
- const com::sun::star::uno::Sequence< rtl::OUString >& i_rHelpId,
- const rtl::OUString& i_rProperty,
- const com::sun::star::uno::Sequence< rtl::OUString >& i_rChoices,
+ static com::sun::star::uno::Any setChoiceRadiosControlOpt(const com::sun::star::uno::Sequence< OUString >& i_rIDs,
+ const OUString& i_rTitle,
+ const com::sun::star::uno::Sequence< OUString >& i_rHelpId,
+ const OUString& i_rProperty,
+ const com::sun::star::uno::Sequence< OUString >& i_rChoices,
sal_Int32 i_nValue,
const com::sun::star::uno::Sequence< sal_Bool >& i_rDisabledChoices = com::sun::star::uno::Sequence< sal_Bool >(),
const UIControlOptions& i_rControlOptions = UIControlOptions());
@@ -661,10 +661,10 @@ class VCL_DLLPUBLIC PrinterOptionsHelper
// show an integer range (e.g. a spin field)
// note: max value < min value means do not apply min/max values
- static com::sun::star::uno::Any setRangeControlOpt(const rtl::OUString& i_rID,
- const rtl::OUString& i_rTitle,
- const rtl::OUString& i_rHelpId,
- const rtl::OUString& i_rProperty,
+ static com::sun::star::uno::Any setRangeControlOpt(const OUString& i_rID,
+ const OUString& i_rTitle,
+ const OUString& i_rHelpId,
+ const OUString& i_rProperty,
sal_Int32 i_nValue,
sal_Int32 i_nMinValue = -1,
sal_Int32 i_nMaxValue = -2,
@@ -672,11 +672,11 @@ class VCL_DLLPUBLIC PrinterOptionsHelper
// show a string field
// note: max value < min value means do not apply min/max values
- static com::sun::star::uno::Any setEditControlOpt(const rtl::OUString& i_rID,
- const rtl::OUString& i_rTitle,
- const rtl::OUString& i_rHelpId,
- const rtl::OUString& i_rProperty,
- const rtl::OUString& i_rValue,
+ static com::sun::star::uno::Any setEditControlOpt(const OUString& i_rID,
+ const OUString& i_rTitle,
+ const OUString& i_rHelpId,
+ const OUString& i_rProperty,
+ const OUString& i_rValue,
const UIControlOptions& i_rControlOptions = UIControlOptions());
};
diff --git a/vcl/inc/vcl/printerinfomanager.hxx b/vcl/inc/vcl/printerinfomanager.hxx
index f45737930a02..108b31504de1 100644
--- a/vcl/inc/vcl/printerinfomanager.hxx
+++ b/vcl/inc/vcl/printerinfomanager.hxx
@@ -38,18 +38,18 @@ class SystemQueueInfo;
struct PrinterInfo : JobData
{
// basename of PPD
- rtl::OUString m_aDriverName;
+ OUString m_aDriverName;
// can be the queue
- rtl::OUString m_aLocation;
+ OUString m_aLocation;
// a user defined comment
- rtl::OUString m_aComment;
+ OUString m_aComment;
// a command line to pipe a PS-file to
- rtl::OUString m_aCommand;
+ OUString m_aCommand;
// a command line to pipe a PS-file to in case of direct print
- rtl::OUString m_aQuickCommand;
+ OUString m_aQuickCommand;
// a list of special features separated by ',' not used by psprint
// but assigned from the outside (currently for "fax","pdf=","autoqueue","external_dialog")
- rtl::OUString m_aFeatures;
+ OUString m_aFeatures;
// a mapping of fonts to other fonts.
// this provides a method for the user
// to replace arbitrary fonts by printer builtin fonts
@@ -60,7 +60,7 @@ struct PrinterInfo : JobData
// this vector is currently implicitly given by the adobe
// standard encoding
bool m_bPerformFontSubstitution;
- boost::unordered_map< rtl::OUString, rtl::OUString, rtl::OUStringHash >
+ boost::unordered_map< OUString, OUString, OUStringHash >
m_aFontSubstitutes;
boost::unordered_map< fontID, fontID >
m_aFontSubstitutions;
@@ -78,9 +78,9 @@ public:
struct SystemPrintQueue
{
- rtl::OUString m_aQueue;
- rtl::OUString m_aLocation;
- rtl::OUString m_aComment;
+ OUString m_aQueue;
+ OUString m_aLocation;
+ OUString m_aComment;
};
protected:
// needed for checkPrintersChanged: files (not necessarily existant)
@@ -88,7 +88,7 @@ protected:
struct WatchFile
{
// the file in question
- rtl::OUString m_aFilePath;
+ OUString m_aFilePath;
// the last know modification time or 0, if file did not exist
TimeValue m_aModified;
};
@@ -98,25 +98,25 @@ protected:
{
// configuration file containing this printer
// empty means a freshly added printer that has to be saved yet
- rtl::OUString m_aFile;
+ OUString m_aFile;
// details other config files that have this printer
// in case of removal all have to be removed
- std::list< rtl::OUString > m_aAlternateFiles;
+ std::list< OUString > m_aAlternateFiles;
// group in m_aFile containing the printer
// this must be unique over all configuration files
// it usually should be the printer name
- rtl::OString m_aGroup;
+ OString m_aGroup;
// whether changes need to be saved
bool m_bModified;
// the corresponding info and job data
PrinterInfo m_aInfo;
};
- boost::unordered_map< rtl::OUString, Printer, rtl::OUStringHash > m_aPrinters;
+ boost::unordered_map< OUString, Printer, OUStringHash > m_aPrinters;
PrinterInfo m_aGlobalDefaults;
std::list< WatchFile > m_aWatchFiles;
- rtl::OUString m_aDefaultPrinter;
- rtl::OUString m_aSystemPrintCommand;
+ OUString m_aDefaultPrinter;
+ OUString m_aSystemPrintCommand;
std::list< SystemPrintQueue > m_aSystemPrintQueues;
@@ -125,7 +125,7 @@ protected:
Type m_eType;
bool m_bUseIncludeFeature;
bool m_bUseJobPatch;
- rtl::OUString m_aSystemDefaultPaper;
+ OUString m_aSystemDefaultPaper;
bool m_bDisableCUPS;
@@ -154,21 +154,21 @@ public:
Type getType() const { return m_eType; }
// lists the names of all known printers
- void listPrinters( std::list< rtl::OUString >& rList ) const;
+ void listPrinters( std::list< OUString >& rList ) const;
// gets the number of known printers
int countPrinters() const { return m_aPrinters.size(); }
// gets info about a named printer
- const PrinterInfo& getPrinterInfo( const rtl::OUString& rPrinter ) const;
+ const PrinterInfo& getPrinterInfo( const OUString& rPrinter ) const;
// gets the name of the default printer
- const rtl::OUString& getDefaultPrinter() const { return m_aDefaultPrinter; }
+ const OUString& getDefaultPrinter() const { return m_aDefaultPrinter; }
virtual void setupJobContextData( JobData& rData );
// changes the info about a named printer
- virtual void changePrinterInfo( const rtl::OUString& rPrinter, const PrinterInfo& rNewInfo );
+ virtual void changePrinterInfo( const OUString& rPrinter, const PrinterInfo& rNewInfo );
// check if the printer configuration has changed
// if bwait is true, then this method waits for eventual asynchronous
@@ -180,14 +180,14 @@ public:
// add a named printer
// addPrinter fails if a printer with the same name already exists
// or the driver does not exist
- virtual bool addPrinter( const rtl::OUString& rPrinterName, const rtl::OUString& rDriverName );
+ virtual bool addPrinter( const OUString& rPrinterName, const OUString& rDriverName );
// remove a named printer
// this fails if the config file belonging to this printer
// is not writeable
// if bCheckOnly is true, the printer is not really removed;
// this is for checking if the removal would fail
- virtual bool removePrinter( const rtl::OUString& rPrinterName, bool bCheckOnly = false );
+ virtual bool removePrinter( const OUString& rPrinterName, bool bCheckOnly = false );
// save the changes to all printers. this fails if there
// is no writable config file at all
@@ -195,24 +195,24 @@ public:
// set a new default printer
// fails if the specified printer does not exist
- virtual bool setDefaultPrinter( const rtl::OUString& rPrinterName );
+ virtual bool setDefaultPrinter( const OUString& rPrinterName );
// primarily used internally but also by padmin
// returns the printer queue names
virtual const std::list< SystemPrintQueue >& getSystemPrintQueues();
// similar but returnse whole commandlines
- virtual void getSystemPrintCommands( std::list< rtl::OUString >& rCommands );
+ virtual void getSystemPrintCommands( std::list< OUString >& rCommands );
// abstract print command
// returns a stdio FILE* that a postscript file may be written to
// this may either be a regular file or the result of popen()
- virtual FILE* startSpool( const rtl::OUString& rPrinterName, bool bQuickCommand );
+ virtual FILE* startSpool( const OUString& rPrinterName, bool bQuickCommand );
// close the FILE* returned by startSpool and does the actual spooling
// set bBanner to "false" will attempt to suppress banner printing
// set bBanner to "true" will rely on the system default
// returns a numerical job id
- virtual int endSpool( const rtl::OUString& rPrinterName, const rtl::OUString& rJobTitle, FILE* pFile, const JobData& rDocumentJobData, bool bBanner );
+ virtual int endSpool( const OUString& rPrinterName, const OUString& rJobTitle, FILE* pFile, const JobData& rDocumentJobData, bool bBanner );
// for spadmin: whether adding or removing a printer is possible
virtual bool addOrRemovePossible() const;
@@ -221,7 +221,7 @@ public:
bool getUseJobPatch() const { return m_bUseJobPatch; }
// check whether a printer's feature string contains a subfeature
- bool checkFeatureToken( const rtl::OUString& rPrinterName, const char* pToken ) const;
+ bool checkFeatureToken( const OUString& rPrinterName, const char* pToken ) const;
// set m_bDisableCUPS and update printer config
void setCUPSDisabled( bool );
diff --git a/vcl/inc/vcl/settings.hxx b/vcl/inc/vcl/settings.hxx
index ebb42c365c4d..19dc20f3ba12 100644
--- a/vcl/inc/vcl/settings.hxx
+++ b/vcl/inc/vcl/settings.hxx
@@ -835,7 +835,7 @@ public:
void SetPreferredSymbolsStyle( sal_uLong nStyle )
{ CopyData(); mpData->mnPreferredSymbolsStyle = nStyle; }
- void SetPreferredSymbolsStyleName( const ::rtl::OUString &rName );
+ void SetPreferredSymbolsStyleName( const OUString &rName );
sal_uLong GetPreferredSymbolsStyle() const
{ return mpData->mnPreferredSymbolsStyle; }
// check whether the symbols style is supported (icons are installed)
@@ -844,11 +844,11 @@ public:
sal_uLong GetCurrentSymbolsStyle() const;
- void SetSymbolsStyleName( const ::rtl::OUString &rName )
+ void SetSymbolsStyleName( const OUString &rName )
{ return SetSymbolsStyle( ImplNameToSymbolsStyle( rName ) ); }
- ::rtl::OUString GetSymbolsStyleName() const
+ OUString GetSymbolsStyleName() const
{ return ImplSymbolsStyleToName( GetSymbolsStyle() ); }
- ::rtl::OUString GetCurrentSymbolsStyleName() const
+ OUString GetCurrentSymbolsStyleName() const
{ return ImplSymbolsStyleToName( GetCurrentSymbolsStyle() ); }
const Wallpaper& GetWorkspaceGradient() const
@@ -877,8 +877,8 @@ public:
{ return !(*this == rSet); }
protected:
- ::rtl::OUString ImplSymbolsStyleToName( sal_uLong nStyle ) const;
- sal_uLong ImplNameToSymbolsStyle( const ::rtl::OUString &rName ) const;
+ OUString ImplSymbolsStyleToName( sal_uLong nStyle ) const;
+ sal_uLong ImplNameToSymbolsStyle( const OUString &rName ) const;
};
// ----------------
diff --git a/vcl/inc/vcl/spinfld.hxx b/vcl/inc/vcl/spinfld.hxx
index 4d38a2ea9dc0..4a902d17aeaa 100644
--- a/vcl/inc/vcl/spinfld.hxx
+++ b/vcl/inc/vcl/spinfld.hxx
@@ -101,7 +101,7 @@ public:
const Link& GetLastHdl() const { return maLastHdlLink; }
virtual Size CalcMinimumSize() const;
- virtual Size CalcMinimumSizeForText(const rtl::OUString &rString) const;
+ virtual Size CalcMinimumSizeForText(const OUString &rString) const;
virtual Size GetOptimalSize() const;
virtual Size CalcSize( sal_uInt16 nChars ) const;
};
diff --git a/vcl/inc/vcl/status.hxx b/vcl/inc/vcl/status.hxx
index 70ea7d65a62a..91aa97113179 100644
--- a/vcl/inc/vcl/status.hxx
+++ b/vcl/inc/vcl/status.hxx
@@ -160,8 +160,8 @@ public:
using Window::GetQuickHelpText;
const XubString& GetQuickHelpText( sal_uInt16 nItemId ) const;
- void SetHelpId( sal_uInt16 nItemId, const rtl::OString& rHelpId );
- rtl::OString GetHelpId( sal_uInt16 nItemId ) const;
+ void SetHelpId( sal_uInt16 nItemId, const OString& rHelpId );
+ OString GetHelpId( sal_uInt16 nItemId ) const;
void StartProgressMode( const XubString& rText );
void SetProgressValue( sal_uInt16 nPercent );
@@ -175,9 +175,9 @@ public:
const XubString& GetHelpText() const
{ return Window::GetHelpText(); }
- void SetHelpId( const rtl::OString& rId )
+ void SetHelpId( const OString& rId )
{ Window::SetHelpId( rId ); }
- const rtl::OString& GetHelpId() const
+ const OString& GetHelpId() const
{ return Window::GetHelpId(); }
Size CalcWindowSizePixel() const;
diff --git a/vcl/inc/vcl/strhelper.hxx b/vcl/inc/vcl/strhelper.hxx
index 9a560d3b0bed..0d0949a3515f 100644
--- a/vcl/inc/vcl/strhelper.hxx
+++ b/vcl/inc/vcl/strhelper.hxx
@@ -29,16 +29,16 @@
namespace psp
{
VCL_DLLPUBLIC String GetCommandLineToken( int, const String& );
- VCL_DLLPUBLIC rtl::OString GetCommandLineToken(int, const rtl::OString&);
+ VCL_DLLPUBLIC OString GetCommandLineToken(int, const OString&);
// gets one token of a unix command line style string
// doublequote, singlequote and singleleftquote protect their respective
// contents
- VCL_DLLPUBLIC int GetCommandLineTokenCount(const rtl::OUString&);
+ VCL_DLLPUBLIC int GetCommandLineTokenCount(const OUString&);
// returns number of tokens (zero if empty or whitespace only)
VCL_DLLPUBLIC String WhitespaceToSpace( const String&, sal_Bool bProtect = sal_True );
- VCL_DLLPUBLIC rtl::OString WhitespaceToSpace(const rtl::OString&, sal_Bool bProtect = sal_True);
+ VCL_DLLPUBLIC OString WhitespaceToSpace(const OString&, sal_Bool bProtect = sal_True);
// returns a string with multiple adjacent occurrences of whitespace
// converted to a single space. if bProtect is sal_True (nonzero), then
// doublequote, singlequote and singleleftquote protect their respective
@@ -51,7 +51,7 @@ namespace psp
return rtl::math::stringToDouble(rStr, sal_Unicode('.'), sal_Unicode(0));
}
- VCL_DLLPUBLIC inline double StringToDouble(const rtl::OString& rStr)
+ VCL_DLLPUBLIC inline double StringToDouble(const OString& rStr)
{
return rtl::math::stringToDouble(rStr, '.', static_cast<sal_Char>(0));
}
@@ -61,7 +61,7 @@ namespace psp
// returns the string len
VCL_DLLPUBLIC inline int getValueOfDouble( char* pBuffer, double f, int nPrecision = 0)
{
- rtl::OString aStr( rtl::math::doubleToString( f, rtl_math_StringFormat_G, nPrecision, '.', true ) );
+ OString aStr( rtl::math::doubleToString( f, rtl_math_StringFormat_G, nPrecision, '.', true ) );
int nLen = aStr.getLength();
std::strncpy( pBuffer, aStr.getStr(), nLen+1 ); // copy string including terminating zero
return nLen;
diff --git a/vcl/inc/vcl/svapp.hxx b/vcl/inc/vcl/svapp.hxx
index e605f57e993c..3198a3d3be56 100644
--- a/vcl/inc/vcl/svapp.hxx
+++ b/vcl/inc/vcl/svapp.hxx
@@ -101,17 +101,17 @@ public:
ApplicationEvent() {}
explicit ApplicationEvent(
- Type rEvent, const rtl::OUString& rData = rtl::OUString()):
+ Type rEvent, const OUString& rData = OUString()):
aEvent(rEvent),
aData(rData)
{}
Type GetEvent() const { return aEvent; }
- const rtl::OUString& GetData() const { return aData; }
+ const OUString& GetData() const { return aData; }
private:
Type aEvent;
- rtl::OUString aData;
+ OUString aData;
};
@@ -348,7 +348,7 @@ public:
/** Returns a string representing the desktop environment
the process is currently running in.
*/
- static const ::rtl::OUString& GetDesktopEnvironment();
+ static const OUString& GetDesktopEnvironment();
/** Add a file to the system shells recent document list if there is any.
This function may have no effect under Unix because there is no
@@ -362,7 +362,7 @@ public:
If an empty string will be provided "application/octet-stream"
will be used.
*/
- static void AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType);
+ static void AddToRecentDocumentList(const OUString& rFileUrl, const OUString& rMimeType);
/** Do we have a native / system file selector available ?
*/
diff --git a/vcl/inc/vcl/svgdata.hxx b/vcl/inc/vcl/svgdata.hxx
index 8de8d3a6bfa1..dccb08f8c579 100644
--- a/vcl/inc/vcl/svgdata.hxx
+++ b/vcl/inc/vcl/svgdata.hxx
@@ -53,7 +53,7 @@ private:
sal_uInt32 mnSvgDataArrayLength;
// The absolute Path if available
- rtl::OUString maPath;
+ OUString maPath;
// on demand created content
basegfx::B2DRange maRange;
@@ -65,13 +65,13 @@ private:
void ensureSequenceAndRange();
public:
- SvgData(const SvgDataArray& rSvgDataArray, sal_uInt32 nSvgDataArrayLength, const rtl::OUString& rPath);
- SvgData(const rtl::OUString& rPath);
+ SvgData(const SvgDataArray& rSvgDataArray, sal_uInt32 nSvgDataArrayLength, const OUString& rPath);
+ SvgData(const OUString& rPath);
/// data read
const SvgDataArray& getSvgDataArray() const { return maSvgDataArray; }
sal_uInt32 getSvgDataArrayLength() const { return mnSvgDataArrayLength; }
- const rtl::OUString& getPath() const { return maPath; }
+ const OUString& getPath() const { return maPath; }
/// data read and evtl. on demand creation
const basegfx::B2DRange& getRange() const;
diff --git a/vcl/inc/vcl/syswin.hxx b/vcl/inc/vcl/syswin.hxx
index 1ec1f8876126..07661431a94a 100644
--- a/vcl/inc/vcl/syswin.hxx
+++ b/vcl/inc/vcl/syswin.hxx
@@ -188,7 +188,7 @@ public:
sal_uInt16 GetIcon() const { return mnIcon; }
// for systems like MacOSX which can display the URL a document is loaded from
// separately from the window title
- void SetRepresentedURL( const rtl::OUString& );
+ void SetRepresentedURL( const OUString& );
void EnableSaveBackground( sal_Bool bSave = sal_True );
sal_Bool IsSaveBackgroundEnabled() const;
@@ -212,8 +212,8 @@ public:
const Size& GetMaxOutputSizePixel() const;
Size GetResizeOutputSizePixel() const;
- void SetWindowState(const rtl::OString& rStr);
- rtl::OString GetWindowState(sal_uLong nMask = WINDOWSTATE_MASK_ALL) const;
+ void SetWindowState(const OString& rStr);
+ OString GetWindowState(sal_uLong nMask = WINDOWSTATE_MASK_ALL) const;
void SetMenuBar( MenuBar* pMenuBar );
MenuBar* GetMenuBar() const { return mpMenuBar; }
@@ -259,7 +259,7 @@ public:
*/
void SetScreenNumber( unsigned int nNewScreen );
- void SetApplicationID( const rtl::OUString &rApplicationID );
+ void SetApplicationID( const OUString &rApplicationID );
void SetCloseHdl(const Link& rLink);
const Link& GetCloseHdl() const;
diff --git a/vcl/inc/vcl/tabctrl.hxx b/vcl/inc/vcl/tabctrl.hxx
index f2928d9cadd9..05b8313b537b 100644
--- a/vcl/inc/vcl/tabctrl.hxx
+++ b/vcl/inc/vcl/tabctrl.hxx
@@ -167,9 +167,9 @@ public:
const XubString& GetHelpText() const
{ return Control::GetHelpText(); }
- void SetHelpId( const rtl::OString& rId )
+ void SetHelpId( const OString& rId )
{ Control::SetHelpId( rId ); }
- const rtl::OString& GetHelpId() const
+ const OString& GetHelpId() const
{ return Control::GetHelpId(); }
void SetActivatePageHdl( const Link& rLink ) { maActivateHdl = rLink; }
diff --git a/vcl/inc/vcl/tabdlg.hxx b/vcl/inc/vcl/tabdlg.hxx
index b6462b60b545..7555f3f01701 100644
--- a/vcl/inc/vcl/tabdlg.hxx
+++ b/vcl/inc/vcl/tabdlg.hxx
@@ -46,7 +46,7 @@ public:
TabDialog( Window* pParent,
WinBits nStyle = WB_STDTABDIALOG );
TabDialog( Window* pParent, const ResId& rResId );
- TabDialog( Window* pParent, const rtl::OString& rID, const rtl::OUString& rUIXMLDescription );
+ TabDialog( Window* pParent, const OString& rID, const OUString& rUIXMLDescription );
~TabDialog();
virtual void StateChanged( StateChangedType nStateChange );
diff --git a/vcl/inc/vcl/textview.hxx b/vcl/inc/vcl/textview.hxx
index e6147c0657f1..314e30fa4f1e 100644
--- a/vcl/inc/vcl/textview.hxx
+++ b/vcl/inc/vcl/textview.hxx
@@ -82,7 +82,7 @@ protected:
void ImpHideDDCursor();
void ImpShowDDCursor();
- bool ImplTruncateNewText( rtl::OUString& rNewText ) const;
+ bool ImplTruncateNewText( OUString& rNewText ) const;
sal_Bool ImplCheckTextLen( const String& rNewText );
VirtualDevice* GetVirtualDevice();
@@ -125,7 +125,7 @@ public:
String GetSelected( LineEnd aSeparator );
void DeleteSelected();
- void InsertNewText( const rtl::OUString& rNew, sal_Bool bSelect = sal_False );
+ void InsertNewText( const OUString& rNew, sal_Bool bSelect = sal_False );
// deprecated: use InsertNewText instead
void InsertText( const String& rNew, sal_Bool bSelect = sal_False );
diff --git a/vcl/inc/vcl/throbber.hxx b/vcl/inc/vcl/throbber.hxx
index c6563e44dd21..f2995d7555bc 100644
--- a/vcl/inc/vcl/throbber.hxx
+++ b/vcl/inc/vcl/throbber.hxx
@@ -66,7 +66,7 @@ public:
void setImageList( ::std::vector< Image > const& i_images );
// default images
- static ::std::vector< ::rtl::OUString >
+ static ::std::vector< OUString >
getDefaultImageURLs( const ImageSet i_imageSet );
protected:
diff --git a/vcl/inc/vcl/toolbox.hxx b/vcl/inc/vcl/toolbox.hxx
index e0c3635f631f..6106bb1bf0ba 100644
--- a/vcl/inc/vcl/toolbox.hxx
+++ b/vcl/inc/vcl/toolbox.hxx
@@ -225,7 +225,7 @@ private:
using Window::ImplInvalidate;
SAL_DLLPRIVATE void ImplInvalidate( sal_Bool bNewCalc = sal_False, sal_Bool bFullPaint = sal_False );
SAL_DLLPRIVATE void ImplUpdateItem( sal_uInt16 nIndex = 0xFFFF );
- SAL_DLLPRIVATE const rtl::OUString ImplConvertMenuString( const XubString& rStr );
+ SAL_DLLPRIVATE const OUString ImplConvertMenuString( const XubString& rStr );
SAL_DLLPRIVATE sal_Bool ImplHandleMouseMove( const MouseEvent& rMEvt, sal_Bool bRepeat = sal_False );
SAL_DLLPRIVATE sal_Bool ImplHandleMouseButtonUp( const MouseEvent& rMEvt, sal_Bool bCancel = sal_False );
SAL_DLLPRIVATE void ImplChangeHighlight( ImplToolItem* pItem, sal_Bool bNoGrabFocus = sal_False );
@@ -442,8 +442,8 @@ public:
void SetHelpText( sal_uInt16 nItemId, const XubString& rText );
const XubString& GetHelpText( sal_uInt16 nItemId ) const;
- void SetHelpId( sal_uInt16 nItemId, const rtl::OString& rHelpId );
- rtl::OString GetHelpId( sal_uInt16 nItemId ) const;
+ void SetHelpId( sal_uInt16 nItemId, const OString& rHelpId );
+ OString GetHelpId( sal_uInt16 nItemId ) const;
// window size according to current alignment, floating state and number of lines
Size CalcWindowSizePixel() const;
@@ -490,9 +490,9 @@ public:
const XubString& GetHelpText() const
{ return DockingWindow::GetHelpText(); }
- void SetHelpId( const rtl::OString& rId )
+ void SetHelpId( const OString& rId )
{ DockingWindow::SetHelpId( rId ); }
- const rtl::OString& GetHelpId() const
+ const OString& GetHelpId() const
{ return DockingWindow::GetHelpId(); }
void SetClickHdl( const Link& rLink ) { maClickHdl = rLink; }
diff --git a/vcl/inc/vcl/unohelp.hxx b/vcl/inc/vcl/unohelp.hxx
index abbece972bb6..91168436c3ad 100644
--- a/vcl/inc/vcl/unohelp.hxx
+++ b/vcl/inc/vcl/unohelp.hxx
@@ -54,7 +54,7 @@ VCL_DLLPUBLIC ::com::sun::star::uno::Reference < ::com::sun::star::i18n::XBreakI
VCL_DLLPUBLIC ::com::sun::star::uno::Reference < ::com::sun::star::i18n::XCharacterClassification> CreateCharacterClassification();
//Get access to singleton Natural String Sorter collating for Application::GetLocale
VCL_DLLPUBLIC const comphelper::string::NaturalStringSorter& getNaturalStringSorterForAppLocale();
-VCL_DLLPUBLIC ::rtl::OUString CreateLibraryName( const sal_Char* pModName, sal_Bool bSUPD );
+VCL_DLLPUBLIC OUString CreateLibraryName( const sal_Char* pModName, sal_Bool bSUPD );
VCL_DLLPUBLIC void NotifyAccessibleStateEventGlobally( const ::com::sun::star::accessibility::AccessibleEventObject& rEventObject );
}} // namespace vcl::unohelper
diff --git a/vcl/inc/vcl/vclmedit.hxx b/vcl/inc/vcl/vclmedit.hxx
index 353cc94f203c..63caa3b4c352 100644
--- a/vcl/inc/vcl/vclmedit.hxx
+++ b/vcl/inc/vcl/vclmedit.hxx
@@ -129,7 +129,7 @@ public:
void SetTextSelectable( sal_Bool bTextSelectable );
void EnableCursor( sal_Bool bEnable );
- virtual bool set_property(const rtl::OString &rKey, const rtl::OString &rValue);
+ virtual bool set_property(const OString &rKey, const OString &rValue);
};
inline sal_uLong VclMultiLineEdit::IsUpdateDataEnabled() const
diff --git a/vcl/inc/vcl/window.hxx b/vcl/inc/vcl/window.hxx
index fda621f83734..04bd8299a317 100644
--- a/vcl/inc/vcl/window.hxx
+++ b/vcl/inc/vcl/window.hxx
@@ -326,7 +326,7 @@ class VclSizeGroup;
struct WindowResHeader
{
sal_uLong nObjMask;
- rtl::OString aHelpId;
+ OString aHelpId;
sal_uLong nRSStyle;
};
@@ -929,11 +929,11 @@ public:
void SetQuickHelpText( const XubString& rHelpText );
const XubString& GetQuickHelpText() const;
- void SetHelpId( const rtl::OString& );
- const rtl::OString& GetHelpId() const;
+ void SetHelpId( const OString& );
+ const OString& GetHelpId() const;
- void SetUniqueId( const rtl::OString& );
- const rtl::OString& GetUniqueId() const;
+ void SetUniqueId( const OString& );
+ const OString& GetUniqueId() const;
Window* FindWindow( const Point& rPos ) const;
@@ -1210,14 +1210,14 @@ public:
*
* @return false if property is unknown
*/
- virtual bool set_property(const rtl::OString &rKey, const rtl::OString &rValue);
+ virtual bool set_property(const OString &rKey, const OString &rValue);
/*
* Sets a font attribute
*
* @return false if attribute is unknown
*/
- bool set_font_attribute(const rtl::OString &rKey, const rtl::OString &rValue);
+ bool set_font_attribute(const OString &rKey, const OString &rValue);
/*
* Adds this widget to the xGroup VclSizeGroup
@@ -1269,7 +1269,7 @@ public:
void SimulateKeyPress( sal_uInt16 nKeyCode ) const;
- virtual rtl::OUString GetSurroundingText() const;
+ virtual OUString GetSurroundingText() const;
virtual Selection GetSurroundingTextSelection() const;
};
diff --git a/vcl/inc/win/saldata.hxx b/vcl/inc/win/saldata.hxx
index b35e3be60044..436144833edb 100644
--- a/vcl/inc/win/saldata.hxx
+++ b/vcl/inc/win/saldata.hxx
@@ -160,7 +160,7 @@ void ImplClearHDCCache( SalData* pData );
HDC ImplGetCachedDC( sal_uLong nID, HBITMAP hBmp = 0 );
void ImplReleaseCachedDC( sal_uLong nID );
-bool ImplAddTempFont( SalData&, const rtl::OUString& rFontFileURL );
+bool ImplAddTempFont( SalData&, const OUString& rFontFileURL );
void ImplReleaseTempFonts( SalData& );
HCURSOR ImplLoadSalCursor( int nId );
diff --git a/vcl/inc/win/salframe.h b/vcl/inc/win/salframe.h
index 2a622195f37d..4076d61451d3 100644
--- a/vcl/inc/win/salframe.h
+++ b/vcl/inc/win/salframe.h
@@ -90,7 +90,7 @@ public:
virtual SalGraphics* GetGraphics();
virtual void ReleaseGraphics( SalGraphics* pGraphics );
virtual sal_Bool PostEvent( void* pData );
- virtual void SetTitle( const rtl::OUString& rTitle );
+ virtual void SetTitle( const OUString& rTitle );
virtual void SetIcon( sal_uInt16 nIcon );
virtual void SetMenu( SalMenu* pSalMenu );
virtual void DrawMenuBar();
@@ -117,7 +117,7 @@ public:
virtual void Sync();
virtual void SetInputContext( SalInputContext* pContext );
virtual void EndExtTextInput( sal_uInt16 nFlags );
- virtual rtl::OUString GetKeyName( sal_uInt16 nKeyCode );
+ virtual OUString GetKeyName( sal_uInt16 nKeyCode );
virtual sal_Bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode );
virtual LanguageType GetInputLanguage();
virtual void UpdateSettings( AllSettings& rSettings );
@@ -129,7 +129,7 @@ public:
virtual void SetParent( SalFrame* pNewParent );
virtual bool SetPluginParent( SystemParentData* pNewParent );
virtual void SetScreenNumber( unsigned int );
- virtual void SetApplicationID( const rtl::OUString &rApplicationID );
+ virtual void SetApplicationID( const OUString &rApplicationID );
virtual void ResetClipRegion();
virtual void BeginSetClipRegion( sal_uIntPtr nRects );
virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight );
@@ -140,8 +140,8 @@ void ImplSalGetWorkArea( HWND hWnd, RECT *pRect, const RECT *pParentRect );
// get foreign key names
namespace vcl_sal {
- rtl::OUString getKeysReplacementName(
- rtl::OUString pLang,
+ OUString getKeysReplacementName(
+ OUString pLang,
LONG nSymbol );
}
diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h
index dca9497efd3a..b26671b10985 100644
--- a/vcl/inc/win/salgdi.h
+++ b/vcl/inc/win/salgdi.h
@@ -241,9 +241,9 @@ protected:
const Point& aPos, sal_Bool& rIsInside );
virtual sal_Bool drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
ControlState nState, const ImplControlValue& aValue,
- const rtl::OUString& aCaption );
+ const OUString& aCaption );
virtual sal_Bool getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState,
- const ImplControlValue& aValue, const rtl::OUString& aCaption,
+ const ImplControlValue& aValue, const OUString& aCaption,
Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion );
virtual bool drawAlphaBitmap( const SalTwoRect&,
@@ -299,7 +299,7 @@ public:
// graphics should call ImplAddDevFontSubstitute on supplied
// OutputDevice for all its device specific preferred font substitutions
virtual void GetDevFontSubstList( OutputDevice* );
- virtual bool AddTempDevFont( ImplDevFontList*, const rtl::OUString& rFileURL, const rtl::OUString& rFontName );
+ virtual bool AddTempDevFont( ImplDevFontList*, const OUString& rFileURL, const OUString& rFontName );
// CreateFontSubset: a method to get a subset of glyhps of a font
// inside a new valid font file
// returns TRUE if creation of subset was successfull
@@ -312,7 +312,7 @@ public:
// rInfo: additional outgoing information
// implementation note: encoding 0 with glyph id 0 should be added implicitly
// as "undefined character"
- virtual sal_Bool CreateFontSubset( const rtl::OUString& rToFile,
+ virtual sal_Bool CreateFontSubset( const OUString& rToFile,
const PhysicalFontFace*,
long* pGlyphIDs,
sal_uInt8* pEncoding,
diff --git a/vcl/inc/win/salinst.h b/vcl/inc/win/salinst.h
index e73070020b8c..5c3b0382870c 100644
--- a/vcl/inc/win/salinst.h
+++ b/vcl/inc/win/salinst.h
@@ -54,7 +54,7 @@ public:
virtual void GetPrinterQueueInfo( ImplPrnQueueList* pList );
virtual void GetPrinterQueueState( SalPrinterQueueInfo* pInfo );
virtual void DeletePrinterQueueInfo( SalPrinterQueueInfo* pInfo );
- virtual rtl::OUString GetDefaultPrinter();
+ virtual OUString GetDefaultPrinter();
virtual SalTimer* CreateSalTimer();
virtual SalI18NImeStatus* CreateI18NImeStatus();
virtual SalSystem* CreateSalSystem();
@@ -72,7 +72,7 @@ public:
virtual void DestroyMenuItem( SalMenuItem* );
virtual SalSession* CreateSalSession();
virtual void* GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes );
- virtual void AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType);
+ virtual void AddToRecentDocumentList(const OUString& rFileUrl, const OUString& rMimeType);
static int WorkaroundExceptionHandlingInUSER32Lib(int nExcept, LPEXCEPTION_POINTERS pExceptionInfo);
};
diff --git a/vcl/inc/win/salmenu.h b/vcl/inc/win/salmenu.h
index ff31f0531de1..67cffcfdb1f7 100644
--- a/vcl/inc/win/salmenu.h
+++ b/vcl/inc/win/salmenu.h
@@ -37,9 +37,9 @@ public:
virtual void SetFrame( const SalFrame* pFrame );
virtual void CheckItem( unsigned nPos, sal_Bool bCheck );
virtual void EnableItem( unsigned nPos, sal_Bool bEnable );
- virtual void SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const rtl::OUString& rText );
+ virtual void SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const OUString& rText );
virtual void SetItemImage( unsigned nPos, SalMenuItem* pSalMenuItem, const Image& rImage );
- virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const KeyCode& rKeyCode, const rtl::OUString& rKeyName );
+ virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const KeyCode& rKeyCode, const OUString& rKeyName );
virtual void GetSystemMenuData( SystemMenuData* pData );
HMENU mhMenu; // the menu handle
diff --git a/vcl/inc/win/salprn.h b/vcl/inc/win/salprn.h
index 4911ce0f3d3a..d33716b9413d 100644
--- a/vcl/inc/win/salprn.h
+++ b/vcl/inc/win/salprn.h
@@ -50,9 +50,9 @@ class WinSalInfoPrinter : public SalInfoPrinter
{
public:
WinSalGraphics* mpGraphics; // current Printer graphics
- rtl::OUString maDriverName; // printer driver name
- rtl::OUString maDeviceName; // printer device name
- rtl::OUString maPortName; // printer port name
+ OUString maDriverName; // printer driver name
+ OUString maDeviceName; // printer device name
+ OUString maPortName; // printer port name
HDC mhDC; // printer hdc
sal_Bool mbGraphics; // is Graphics used
public:
@@ -70,7 +70,7 @@ public:
long& rPageWidth, long& rPageHeight );
virtual sal_uIntPtr GetCapabilities( const ImplJobSetup* pSetupData, sal_uInt16 nType );
virtual sal_uIntPtr GetPaperBinCount( const ImplJobSetup* pSetupData );
- virtual rtl::OUString GetPaperBinName( const ImplJobSetup* pSetupData, sal_uIntPtr nPaperBin );
+ virtual OUString GetPaperBinName( const ImplJobSetup* pSetupData, sal_uIntPtr nPaperBin );
virtual void InitPaperFormats( const ImplJobSetup* pSetupData );
virtual int GetLandscapeAngle( const ImplJobSetup* pSetupData );
};
@@ -98,9 +98,9 @@ public:
virtual ~WinSalPrinter();
using SalPrinter::StartJob;
- virtual sal_Bool StartJob( const rtl::OUString* pFileName,
- const rtl::OUString& rJobName,
- const rtl::OUString& rAppName,
+ virtual sal_Bool StartJob( const OUString* pFileName,
+ const OUString& rJobName,
+ const OUString& rAppName,
sal_uIntPtr nCopies,
bool bCollate,
bool bDirect,
diff --git a/vcl/inc/win/salsys.h b/vcl/inc/win/salsys.h
index 3c0bdeb7fe92..9c80b0641bc2 100644
--- a/vcl/inc/win/salsys.h
+++ b/vcl/inc/win/salsys.h
@@ -30,15 +30,15 @@ class WinSalSystem : public SalSystem
public:
struct DisplayMonitor
{
- rtl::OUString m_aName;
- rtl::OUString m_aDeviceName;
+ OUString m_aName;
+ OUString m_aDeviceName;
Rectangle m_aArea;
Rectangle m_aWorkArea;
sal_Int32 m_nStateFlags;
DisplayMonitor() : m_nStateFlags( 0 ) {}
- DisplayMonitor( const rtl::OUString& rName,
- const rtl::OUString& rDevName,
+ DisplayMonitor( const OUString& rName,
+ const OUString& rDevName,
const Rectangle& rArea,
const Rectangle& rWorkArea,
DWORD nStateFlags )
@@ -53,7 +53,7 @@ class WinSalSystem : public SalSystem
};
private:
std::vector<DisplayMonitor> m_aMonitors;
- std::map<rtl::OUString, unsigned int> m_aDeviceNameToMonitor;
+ std::map<OUString, unsigned int> m_aDeviceNameToMonitor;
unsigned int m_nPrimary;
public:
WinSalSystem() : m_nPrimary( 0 ) {}
@@ -63,9 +63,9 @@ public:
virtual unsigned int GetDisplayBuiltInScreen();
virtual Rectangle GetDisplayScreenPosSizePixel( unsigned int nScreen );
virtual Rectangle GetDisplayScreenWorkAreaPosSizePixel( unsigned int nScreen );
- virtual rtl::OUString GetDisplayScreenName( unsigned int nScreen );
- virtual int ShowNativeMessageBox( const rtl::OUString& rTitle,
- const rtl::OUString& rMessage,
+ virtual OUString GetDisplayScreenName( unsigned int nScreen );
+ virtual int ShowNativeMessageBox( const OUString& rTitle,
+ const OUString& rMessage,
int nButtonCombination,
int nDefaultButton, bool bUseResources);
bool initMonitors();
diff --git a/vcl/inc/window.h b/vcl/inc/window.h
index 55511918a635..97401f20d460 100644
--- a/vcl/inc/window.h
+++ b/vcl/inc/window.h
@@ -274,8 +274,8 @@ public:
long mnY;
long mnAbsScreenX;
Point maPos;
- rtl::OString maHelpId;
- rtl::OString maUniqId;
+ OString maHelpId;
+ OString maUniqId;
XubString maHelpText;
XubString maQuickHelpText;
InputContext maInputContext;
diff --git a/vcl/ios/iosinst.cxx b/vcl/ios/iosinst.cxx
index 5b695f22bc95..a0893af2716a 100644
--- a/vcl/ios/iosinst.cxx
+++ b/vcl/ios/iosinst.cxx
@@ -133,9 +133,9 @@ class IosSalSystem : public SvpSalSystem {
public:
IosSalSystem() : SvpSalSystem() {}
virtual ~IosSalSystem() {}
- virtual int ShowNativeDialog( const rtl::OUString& rTitle,
- const rtl::OUString& rMessage,
- const std::list< rtl::OUString >& rButtons,
+ virtual int ShowNativeDialog( const OUString& rTitle,
+ const OUString& rMessage,
+ const std::list< OUString >& rButtons,
int nDefButton );
};
@@ -176,7 +176,7 @@ public:
virtual void UpdateSettings( AllSettings &rSettings )
{
// Clobber the UI fonts
- Font aFont( rtl::OUString( "Helvetica" ), Size( 0, 14 ) );
+ Font aFont( OUString( "Helvetica" ), Size( 0, 14 ) );
StyleSettings aStyleSet = rSettings.GetStyleSettings();
aStyleSet.SetAppFont( aFont );
@@ -251,9 +251,9 @@ void DestroySalInstance( SalInstance *pInst )
delete pInst;
}
-int IosSalSystem::ShowNativeDialog( const rtl::OUString& rTitle,
- const rtl::OUString& rMessage,
- const std::list< rtl::OUString >& rButtons,
+int IosSalSystem::ShowNativeDialog( const OUString& rTitle,
+ const OUString& rMessage,
+ const std::list< OUString >& rButtons,
int nDefButton )
{
(void)rButtons;
diff --git a/vcl/null/printerinfomanager.cxx b/vcl/null/printerinfomanager.cxx
index 3af6955cbe7c..a480856a0fba 100644
--- a/vcl/null/printerinfomanager.cxx
+++ b/vcl/null/printerinfomanager.cxx
@@ -24,10 +24,6 @@
using namespace psp;
using namespace osl;
-using ::rtl::OUString;
-using ::rtl::OString;
-using ::rtl::OStringToOUString;
-using ::rtl::OUStringHash;
PrinterInfoManager& PrinterInfoManager::get()
{
@@ -141,7 +137,7 @@ const std::list< PrinterInfoManager::SystemPrintQueue >& PrinterInfoManager::get
return m_aSystemPrintQueues;
}
-bool PrinterInfoManager::checkFeatureToken( const rtl::OUString& /* rPrinterName */, const char* /* pToken */ ) const
+bool PrinterInfoManager::checkFeatureToken( const OUString& /* rPrinterName */, const char* /* pToken */ ) const
{
return false;
}
diff --git a/vcl/qa/cppunit/graphicfilter/filters-test.cxx b/vcl/qa/cppunit/graphicfilter/filters-test.cxx
index bec3cc0d9c6d..8c57bc4e924e 100644
--- a/vcl/qa/cppunit/graphicfilter/filters-test.cxx
+++ b/vcl/qa/cppunit/graphicfilter/filters-test.cxx
@@ -46,8 +46,8 @@ class VclFiltersTest
public:
VclFiltersTest() : BootstrapFixture(true, false) {}
- virtual bool load(const rtl::OUString &,
- const rtl::OUString &rURL, const rtl::OUString &,
+ virtual bool load(const OUString &,
+ const OUString &rURL, const OUString &,
unsigned int, unsigned int, unsigned int);
/**
@@ -60,8 +60,8 @@ public:
CPPUNIT_TEST_SUITE_END();
};
-bool VclFiltersTest::load(const rtl::OUString &,
- const rtl::OUString &rURL, const rtl::OUString &,
+bool VclFiltersTest::load(const OUString &,
+ const OUString &rURL, const OUString &,
unsigned int, unsigned int, unsigned int)
{
GraphicFilter aGraphicFilter(false);
@@ -73,33 +73,33 @@ bool VclFiltersTest::load(const rtl::OUString &,
void VclFiltersTest::testCVEs()
{
#ifndef DISABLE_CVE_TESTS
- testDir(rtl::OUString(),
+ testDir(OUString(),
getURLFromSrc("/vcl/qa/cppunit/graphicfilter/data/wmf/"),
- rtl::OUString());
+ OUString());
- testDir(rtl::OUString(),
+ testDir(OUString(),
getURLFromSrc("/vcl/qa/cppunit/graphicfilter/data/emf/"),
- rtl::OUString());
+ OUString());
- testDir(rtl::OUString(),
+ testDir(OUString(),
getURLFromSrc("/vcl/qa/cppunit/graphicfilter/data/sgv/"),
- rtl::OUString());
+ OUString());
- testDir(rtl::OUString(),
+ testDir(OUString(),
getURLFromSrc("/vcl/qa/cppunit/graphicfilter/data/png/"),
- rtl::OUString());
+ OUString());
- testDir(rtl::OUString(),
+ testDir(OUString(),
getURLFromSrc("/vcl/qa/cppunit/graphicfilter/data/jpg/"),
- rtl::OUString());
+ OUString());
- testDir(rtl::OUString(),
+ testDir(OUString(),
getURLFromSrc("/vcl/qa/cppunit/graphicfilter/data/gif/"),
- rtl::OUString());
+ OUString());
- testDir(rtl::OUString(),
+ testDir(OUString(),
getURLFromSrc("/vcl/qa/cppunit/graphicfilter/data/bmp/"),
- rtl::OUString());
+ OUString());
#endif
}
diff --git a/vcl/quartz/utils.cxx b/vcl/quartz/utils.cxx
index 8319752016b6..390692c0ffc8 100644
--- a/vcl/quartz/utils.cxx
+++ b/vcl/quartz/utils.cxx
@@ -25,44 +25,44 @@
#include "quartz/utils.h"
-rtl::OUString GetOUString( CFStringRef rStr )
+OUString GetOUString( CFStringRef rStr )
{
if( rStr == 0 )
- return rtl::OUString();
+ return OUString();
CFIndex nLength = CFStringGetLength( rStr );
if( nLength == 0 )
- return rtl::OUString();
+ return OUString();
const UniChar* pConstStr = CFStringGetCharactersPtr( rStr );
if( pConstStr )
- return rtl::OUString( pConstStr, nLength );
+ return OUString( pConstStr, nLength );
UniChar* pStr = reinterpret_cast<UniChar*>( rtl_allocateMemory( sizeof(UniChar)*nLength ) );
CFRange aRange = { 0, nLength };
CFStringGetCharacters( rStr, aRange, pStr );
- rtl::OUString aRet( pStr, nLength );
+ OUString aRet( pStr, nLength );
rtl_freeMemory( pStr );
return aRet;
}
-rtl::OUString GetOUString( NSString* pStr )
+OUString GetOUString( NSString* pStr )
{
if( ! pStr )
- return rtl::OUString();
+ return OUString();
int nLen = [pStr length];
if( nLen == 0 )
- return rtl::OUString();
+ return OUString();
- rtl::OUStringBuffer aBuf( nLen+1 );
+ OUStringBuffer aBuf( nLen+1 );
aBuf.setLength( nLen );
[pStr getCharacters: const_cast<sal_Unicode*>(aBuf.getStr())];
return aBuf.makeStringAndClear();
}
-CFStringRef CreateCFString( const rtl::OUString& rStr )
+CFStringRef CreateCFString( const OUString& rStr )
{
return CFStringCreateWithCharacters(kCFAllocatorDefault, rStr.getStr(), rStr.getLength() );
}
-NSString* CreateNSString( const rtl::OUString& rStr )
+NSString* CreateNSString( const OUString& rStr )
{
return [[NSString alloc] initWithCharacters: rStr.getStr() length: rStr.getLength()];
}
diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx
index 2729ae982263..00e3d031dd07 100644
--- a/vcl/source/app/dbggui.cxx
+++ b/vcl/source/app/dbggui.cxx
@@ -506,7 +506,7 @@ DbgWindow::DbgWindow() :
SetOutputSizePixel( Size( 600, 480 ) );
if ( pData->aDbgWinState )
{
- rtl::OString aState( pData->aDbgWinState );
+ OString aState( pData->aDbgWinState );
SetWindowState( aState );
}
@@ -520,7 +520,7 @@ DbgWindow::DbgWindow() :
sal_Bool DbgWindow::Close()
{
// remember window position
- rtl::OString aState( GetWindowState() );
+ OString aState( GetWindowState() );
DbgData* pData = DbgGetData();
size_t nCopy = (sizeof( pData->aDbgWinState ) < size_t(aState.getLength() + 1U ))
? sizeof( pData->aDbgWinState ) : size_t(aState.getLength() + 1U );
@@ -574,7 +574,7 @@ long DbgWindow::PreNotify( NotifyEvent& rNEvt )
if ( rCommand.GetCommand() == COMMAND_CONTEXTMENU )
{
PopupMenu aMenu;
- aMenu.InsertItem( 1, rtl::OUString("copy to clipboard") );
+ aMenu.InsertItem( 1, OUString("copy to clipboard") );
Point aPos;
if ( rCommand.IsMouseEvent() )
@@ -593,9 +593,9 @@ long DbgWindow::PreNotify( NotifyEvent& rNEvt )
GetAssertionEntryRange( maLstBox.GetSelectEntryPos(), nAssertionFirst, nAssertionLast );
// build the string to copy to the clipboard
- rtl::OUStringBuffer sAssertion;
- rtl::OUString sLineFeed = convertLineEnd(
- rtl::OUString("\n"),
+ OUStringBuffer sAssertion;
+ OUString sLineFeed = convertLineEnd(
+ OUString("\n"),
GetSystemLineEnd());
while ( nAssertionFirst < nAssertionLast )
{
@@ -782,7 +782,7 @@ DbgDialog::DbgDialog() :
{
maDebugName.Show();
- maDebugName.SetText(rtl::OStringToOUString(pData->aDebugName, RTL_TEXTENCODING_UTF8));
+ maDebugName.SetText(OStringToOUString(pData->aDebugName, RTL_TEXTENCODING_UTF8));
maDebugName.SetMaxTextLen( sizeof( pData->aDebugName ) );
maDebugName.SetPosSizePixel( LogicToPixel( Point( 10, 130 ), aAppMap ),
LogicToPixel( Size( 185, 14 ), aAppMap ) );
@@ -815,7 +815,7 @@ DbgDialog::DbgDialog() :
{
maInclClassFilter.Show();
- maInclClassFilter.SetText(rtl::OStringToOUString(pData->aInclClassFilter, RTL_TEXTENCODING_UTF8));
+ maInclClassFilter.SetText(OStringToOUString(pData->aInclClassFilter, RTL_TEXTENCODING_UTF8));
maInclClassFilter.SetMaxTextLen( sizeof( pData->aInclClassFilter ) );
maInclClassFilter.SetPosSizePixel( LogicToPixel( Point( 10, 160 ), aAppMap ),
LogicToPixel( Size( 95, 14 ), aAppMap ) );
@@ -830,7 +830,7 @@ DbgDialog::DbgDialog() :
{
maExclClassFilter.Show();
- maExclClassFilter.SetText(rtl::OStringToOUString(pData->aExclClassFilter, RTL_TEXTENCODING_UTF8));
+ maExclClassFilter.SetText(OStringToOUString(pData->aExclClassFilter, RTL_TEXTENCODING_UTF8));
maExclClassFilter.SetMaxTextLen( sizeof( pData->aExclClassFilter ) );
maExclClassFilter.SetPosSizePixel( LogicToPixel( Point( 115, 160 ), aAppMap ),
LogicToPixel( Size( 95, 14 ), aAppMap ) );
@@ -845,7 +845,7 @@ DbgDialog::DbgDialog() :
{
maInclFilter.Show();
- maInclFilter.SetText(rtl::OStringToOUString(pData->aInclFilter, RTL_TEXTENCODING_UTF8));
+ maInclFilter.SetText(OStringToOUString(pData->aInclFilter, RTL_TEXTENCODING_UTF8));
maInclFilter.SetMaxTextLen( sizeof( pData->aInclFilter ) );
maInclFilter.SetPosSizePixel( LogicToPixel( Point( 10, 190 ), aAppMap ),
LogicToPixel( Size( 95, 14 ), aAppMap ) );
@@ -860,7 +860,7 @@ DbgDialog::DbgDialog() :
{
maExclFilter.Show();
- maExclFilter.SetText(rtl::OStringToOUString(pData->aExclFilter, RTL_TEXTENCODING_UTF8));
+ maExclFilter.SetText(OStringToOUString(pData->aExclFilter, RTL_TEXTENCODING_UTF8));
maExclFilter.SetMaxTextLen( sizeof( pData->aExclFilter ) );
maExclFilter.SetPosSizePixel( LogicToPixel( Point( 115, 190 ), aAppMap ),
LogicToPixel( Size( 95, 14 ), aAppMap ) );
@@ -993,11 +993,11 @@ IMPL_LINK( DbgDialog, ClickHdl, Button*, pButton )
aData.nWarningOut = ImplGetChannelId( maWarningBox, 0 );
aData.nErrorOut = ImplGetChannelId( maErrorBox, mnErrorOff );
- strncpy( aData.aDebugName, rtl::OUStringToOString(maDebugName.GetText(), RTL_TEXTENCODING_UTF8).getStr(), sizeof( aData.aDebugName ) );
- strncpy( aData.aInclClassFilter, rtl::OUStringToOString(maInclClassFilter.GetText(), RTL_TEXTENCODING_UTF8).getStr(), sizeof( aData.aInclClassFilter ) );
- strncpy( aData.aExclClassFilter, rtl::OUStringToOString(maExclClassFilter.GetText(), RTL_TEXTENCODING_UTF8).getStr(), sizeof( aData.aExclClassFilter ) );
- strncpy( aData.aInclFilter, rtl::OUStringToOString(maInclFilter.GetText(), RTL_TEXTENCODING_UTF8).getStr(), sizeof( aData.aInclFilter ) );
- strncpy( aData.aExclFilter, rtl::OUStringToOString(maExclFilter.GetText(), RTL_TEXTENCODING_UTF8).getStr(), sizeof( aData.aExclFilter ) );
+ strncpy( aData.aDebugName, OUStringToOString(maDebugName.GetText(), RTL_TEXTENCODING_UTF8).getStr(), sizeof( aData.aDebugName ) );
+ strncpy( aData.aInclClassFilter, OUStringToOString(maInclClassFilter.GetText(), RTL_TEXTENCODING_UTF8).getStr(), sizeof( aData.aInclClassFilter ) );
+ strncpy( aData.aExclClassFilter, OUStringToOString(maExclClassFilter.GetText(), RTL_TEXTENCODING_UTF8).getStr(), sizeof( aData.aExclClassFilter ) );
+ strncpy( aData.aInclFilter, OUStringToOString(maInclFilter.GetText(), RTL_TEXTENCODING_UTF8).getStr(), sizeof( aData.aInclFilter ) );
+ strncpy( aData.aExclFilter, OUStringToOString(maExclFilter.GetText(), RTL_TEXTENCODING_UTF8).getStr(), sizeof( aData.aExclFilter ) );
aData.aDebugName[sizeof( aData.aDebugName )-1] = '\0';
aData.aInclClassFilter[sizeof( aData.aInclClassFilter )-1] = '\0';
aData.aExclClassFilter[sizeof( aData.aExclClassFilter )-1] = '\0';
@@ -1066,7 +1066,7 @@ IMPL_LINK( DbgDialog, ClickHdl, Button*, pButton )
}
if( (aData.nTestFlags & ~IMMEDIATE_FLAGS) != (pData->nTestFlags & ~IMMEDIATE_FLAGS) )
{
- InfoBox aBox( this, rtl::OUString(
+ InfoBox aBox( this, OUString(
"Some of the changed settings will only be active after "
"restarting the process"
) );
@@ -1296,7 +1296,7 @@ void DbgDialogTest( Window* pWindow )
DbgOutTypef( DBG_OUT_ERROR,
"%s should have a mnemonic char (~): %s",
pClass,
- rtl::OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() );
+ OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() );
// check text width
int aWidth=0;
@@ -1319,7 +1319,7 @@ void DbgDialogTest( Window* pWindow )
DbgOutTypef( DBG_OUT_ERROR,
"%s exceeds window width: %s",
pClass,
- rtl::OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() );
+ OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() );
}
}
@@ -1328,7 +1328,7 @@ void DbgDialogTest( Window* pWindow )
if ( pChild->GetSizePixel().Width() < pChild->GetTextWidth( aText ) )
DbgOutTypef( DBG_OUT_ERROR,
"FixedLine exceeds window width: %s",
- rtl::OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() );
+ OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() );
}
if ( pChild->GetType() == WINDOW_FIXEDTEXT )
@@ -1338,7 +1338,7 @@ void DbgDialogTest( Window* pWindow )
{
DbgOutTypef( DBG_OUT_ERROR,
"FixedText greater than one line, but WordBreak is not set: %s",
- rtl::OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() );
+ OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() );
}
if ( pChild->IsVisible() )
@@ -1356,7 +1356,7 @@ void DbgDialogTest( Window* pWindow )
{
DbgOutTypef( DBG_OUT_ERROR,
"FixedText exceeds window width: %s",
- rtl::OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() );
+ OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() );
}
}
@@ -1386,13 +1386,13 @@ void DbgDialogTest( Window* pWindow )
{
DbgOutTypef( DBG_OUT_ERROR,
"Labels befor Fields (Edit,ListBox,...) should have a mnemonic char (~): %s",
- rtl::OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() );
+ OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() );
}
if ( !pTempChild->IsEnabled() && pChild->IsEnabled() )
{
DbgOutTypef( DBG_OUT_ERROR,
"Labels befor Fields (Edit,ListBox,...) should be disabled, when the field is disabled: %s",
- rtl::OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() );
+ OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() );
}
}
}
@@ -1481,7 +1481,7 @@ void DbgDialogTest( Window* pWindow )
{
DbgOutTypef( DBG_OUT_ERROR,
"No Max-Value is set: %s",
- rtl::OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() );
+ OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() );
}
if ( (pChild->GetType() == WINDOW_RADIOBUTTON) ||
@@ -1524,7 +1524,7 @@ void DbgDialogTest( Window* pWindow )
{
DbgOutTypef( DBG_OUT_ERROR,
"Possible wrong childorder for dialogcontrol: %s",
- rtl::OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() );
+ OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() );
}
aTabPos = aNewPos;
}
@@ -1536,7 +1536,7 @@ void DbgDialogTest( Window* pWindow )
{
DbgOutTypef( DBG_OUT_ERROR,
"Window overlaps with sibling window: %s",
- rtl::OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() );
+ OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() );
}
}
pRectAry[i] = aChildRect;
@@ -1565,7 +1565,7 @@ class DbgMessageBox : public ErrorBox
m_aMessage( rMessage )
{
SetText("Debug Output");
- AddButton(rtl::OUString("Copy"), COPY_BUTTON_ID, 0);
+ AddButton(OUString("Copy"), COPY_BUTTON_ID, 0);
}
virtual void Click()
@@ -1737,7 +1737,7 @@ void DbgPrintWindow( const char* pLine )
void DbgAbort( char const * i_message )
{
- ::rtl::OUString const message( i_message, strlen( i_message ), osl_getThreadTextEncoding() );
+ OUString const message( i_message, strlen( i_message ), osl_getThreadTextEncoding() );
Application::Abort( message );
}
diff --git a/vcl/source/app/i18nhelp.cxx b/vcl/source/app/i18nhelp.cxx
index 1ed6efceaa48..95d1f5a32de9 100644
--- a/vcl/source/app/i18nhelp.cxx
+++ b/vcl/source/app/i18nhelp.cxx
@@ -100,7 +100,7 @@ inline bool is_formatting_mark( sal_Unicode c )
String vcl::I18nHelper::filterFormattingChars( const String& rStr )
{
sal_Int32 nUnicodes = rStr.Len();
- rtl::OUStringBuffer aBuf( nUnicodes );
+ OUStringBuffer aBuf( nUnicodes );
const sal_Unicode* pStr = rStr.GetBuffer();
while( nUnicodes-- )
{
@@ -111,7 +111,7 @@ String vcl::I18nHelper::filterFormattingChars( const String& rStr )
return aBuf.makeStringAndClear();
}
-sal_Int32 vcl::I18nHelper::CompareString( const rtl::OUString& rStr1, const rtl::OUString& rStr2 ) const
+sal_Int32 vcl::I18nHelper::CompareString( const OUString& rStr1, const OUString& rStr2 ) const
{
::osl::Guard< ::osl::Mutex > aGuard( ((vcl::I18nHelper*)this)->maMutex );
@@ -130,7 +130,7 @@ sal_Int32 vcl::I18nHelper::CompareString( const rtl::OUString& rStr1, const rtl:
return ImplGetTransliterationWrapper().compareString( aStr1, aStr2 );
}
-sal_Bool vcl::I18nHelper::MatchString( const rtl::OUString& rStr1, const rtl::OUString& rStr2 ) const
+sal_Bool vcl::I18nHelper::MatchString( const OUString& rStr1, const OUString& rStr2 ) const
{
::osl::Guard< ::osl::Mutex > aGuard( ((vcl::I18nHelper*)this)->maMutex );
@@ -157,7 +157,7 @@ sal_Bool vcl::I18nHelper::MatchMnemonic( const String& rString, sal_Unicode cMne
if ( n != STRING_NOTFOUND )
{
String aMatchStr( rString, n+1, STRING_LEN ); // not only one char, because of transliteration...
- bEqual = MatchString( rtl::OUString(cMnemonicChar), aMatchStr );
+ bEqual = MatchString( OUString(cMnemonicChar), aMatchStr );
}
return bEqual;
}
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 00baac95ac45..6601446e97f2 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -47,7 +47,7 @@ void SalFrame::Flush( const Rectangle& )
// -----------------------------------------------------------------------
-void SalFrame::SetRepresentedURL( const rtl::OUString& )
+void SalFrame::SetRepresentedURL( const OUString& )
{
// currently this is Mac only functionality
}
@@ -58,7 +58,7 @@ SalInstance::~SalInstance()
{
}
-void SalInstance::FillFontPathList( std::list< rtl::OString >& )
+void SalInstance::FillFontPathList( std::list< OString >& )
{
// do nothing
}
@@ -106,7 +106,7 @@ SalPrinter::~SalPrinter()
{
}
-sal_Bool SalPrinter::StartJob( const rtl::OUString*, const rtl::OUString&, const rtl::OUString&,
+sal_Bool SalPrinter::StartJob( const OUString*, const OUString&, const OUString&,
ImplJobSetup*, vcl::PrinterController& )
{
return sal_False;
diff --git a/vcl/source/app/session.cxx b/vcl/source/app/session.cxx
index 728a1df66ef2..9c0f30b84fbb 100644
--- a/vcl/source/app/session.cxx
+++ b/vcl/source/app/session.cxx
@@ -40,7 +40,6 @@ using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
using namespace com::sun::star::frame;
-using ::rtl::OUString;
SalSession::~SalSession()
{
@@ -341,7 +340,7 @@ OUString SAL_CALL vcl_session_getImplementationName()
return OUString( "com.sun.star.frame.VCLSessionManagerClient" );
}
-Sequence< rtl::OUString > SAL_CALL vcl_session_getSupportedServiceNames()
+Sequence< OUString > SAL_CALL vcl_session_getSupportedServiceNames()
{
Sequence< OUString > aRet(1);
aRet[0] = "com.sun.star.frame.SessionManagerClient";
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index adbadbe2ffb4..631b2e12f8a9 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -354,7 +354,7 @@ void ImplStyleData::SetStandardStyles()
Font aStdFont( FAMILY_SWISS, Size( 0, 8 ) );
aStdFont.SetCharSet( osl_getThreadTextEncoding() );
aStdFont.SetWeight( WEIGHT_NORMAL );
- aStdFont.SetName( utl::DefaultFontConfiguration::get().getUserInterfaceFont(com::sun::star::lang::Locale( rtl::OUString( "en" ), rtl::OUString(), rtl::OUString() ) ) );
+ aStdFont.SetName( utl::DefaultFontConfiguration::get().getUserInterfaceFont(com::sun::star::lang::Locale( OUString( "en" ), OUString(), OUString() ) ) );
maAppFont = aStdFont;
maHelpFont = aStdFont;
maMenuFont = aStdFont;
@@ -501,45 +501,45 @@ void StyleSettings::Set3DColors( const Color& rColor )
// -----------------------------------------------------------------------
-::rtl::OUString StyleSettings::ImplSymbolsStyleToName( sal_uLong nStyle ) const
+OUString StyleSettings::ImplSymbolsStyleToName( sal_uLong nStyle ) const
{
switch ( nStyle )
{
- case STYLE_SYMBOLS_DEFAULT: return ::rtl::OUString("default");
- case STYLE_SYMBOLS_HICONTRAST: return ::rtl::OUString("hicontrast");
- case STYLE_SYMBOLS_INDUSTRIAL: return ::rtl::OUString("tango"); // industrial is dead
- case STYLE_SYMBOLS_CRYSTAL: return ::rtl::OUString("crystal");
- case STYLE_SYMBOLS_TANGO: return ::rtl::OUString("tango");
- case STYLE_SYMBOLS_OXYGEN: return ::rtl::OUString("oxygen");
- case STYLE_SYMBOLS_CLASSIC: return ::rtl::OUString("classic");
- case STYLE_SYMBOLS_HUMAN: return ::rtl::OUString("human");
- case STYLE_SYMBOLS_TANGO_TESTING: return ::rtl::OUString("tango_testing");
+ case STYLE_SYMBOLS_DEFAULT: return OUString("default");
+ case STYLE_SYMBOLS_HICONTRAST: return OUString("hicontrast");
+ case STYLE_SYMBOLS_INDUSTRIAL: return OUString("tango"); // industrial is dead
+ case STYLE_SYMBOLS_CRYSTAL: return OUString("crystal");
+ case STYLE_SYMBOLS_TANGO: return OUString("tango");
+ case STYLE_SYMBOLS_OXYGEN: return OUString("oxygen");
+ case STYLE_SYMBOLS_CLASSIC: return OUString("classic");
+ case STYLE_SYMBOLS_HUMAN: return OUString("human");
+ case STYLE_SYMBOLS_TANGO_TESTING: return OUString("tango_testing");
}
- return ::rtl::OUString("auto");
+ return OUString("auto");
}
// -----------------------------------------------------------------------
-sal_uLong StyleSettings::ImplNameToSymbolsStyle( const ::rtl::OUString &rName ) const
+sal_uLong StyleSettings::ImplNameToSymbolsStyle( const OUString &rName ) const
{
- if ( rName == ::rtl::OUString("default") )
+ if ( rName == OUString("default") )
return STYLE_SYMBOLS_DEFAULT;
- else if ( rName == ::rtl::OUString("hicontrast") )
+ else if ( rName == OUString("hicontrast") )
return STYLE_SYMBOLS_HICONTRAST;
- else if ( rName == ::rtl::OUString("industrial") )
+ else if ( rName == OUString("industrial") )
return STYLE_SYMBOLS_TANGO; // industrial is dead
- else if ( rName == ::rtl::OUString("crystal") )
+ else if ( rName == OUString("crystal") )
return STYLE_SYMBOLS_CRYSTAL;
- else if ( rName == ::rtl::OUString("tango") )
+ else if ( rName == OUString("tango") )
return STYLE_SYMBOLS_TANGO;
- else if ( rName == ::rtl::OUString("oxygen") )
+ else if ( rName == OUString("oxygen") )
return STYLE_SYMBOLS_OXYGEN;
- else if ( rName == ::rtl::OUString("classic") )
+ else if ( rName == OUString("classic") )
return STYLE_SYMBOLS_CLASSIC;
- else if ( rName == ::rtl::OUString("human") )
+ else if ( rName == OUString("human") )
return STYLE_SYMBOLS_HUMAN;
- else if ( rName == ::rtl::OUString("tango_testing") )
+ else if ( rName == OUString("tango_testing") )
return STYLE_SYMBOLS_TANGO_TESTING;
return STYLE_SYMBOLS_AUTO;
@@ -553,11 +553,11 @@ sal_uLong StyleSettings::ImplNameToSymbolsStyle( const ::rtl::OUString &rName )
we check if any registered style name is a case-insensitive
substring of the preferred style name.
*/
-void StyleSettings::SetPreferredSymbolsStyleName( const ::rtl::OUString &rName )
+void StyleSettings::SetPreferredSymbolsStyleName( const OUString &rName )
{
if ( !rName.isEmpty() )
{
- ::rtl::OUString rNameLowCase( rName.toAsciiLowerCase() );
+ OUString rNameLowCase( rName.toAsciiLowerCase() );
for( sal_uInt32 n = 0; n <= STYLE_SYMBOLS_THEMES_MAX; n++ )
if ( rNameLowCase.indexOf( ImplSymbolsStyleToName( n ) ) != -1 )
@@ -621,7 +621,7 @@ sal_uLong StyleSettings::GetCurrentSymbolsStyle() const
sal_uLong StyleSettings::GetAutoSymbolsStyle() const
{
- rtl::OUString const & env = Application::GetDesktopEnvironment();
+ OUString const & env = Application::GetDesktopEnvironment();
sal_uLong nRet;
if ( env.equalsIgnoreAsciiCase("tde") ||
@@ -1047,10 +1047,10 @@ sal_Bool MiscSettings::GetDisablePrinting() const
{
if( mpData->mnDisablePrinting == (sal_uInt16)~0 )
{
- rtl::OUString aEnable =
+ OUString aEnable =
vcl::SettingsConfigItem::get()->
- getValue( rtl::OUString( "DesktopManagement" ),
- rtl::OUString( "DisablePrinting" ) );
+ getValue( OUString( "DesktopManagement" ),
+ OUString( "DisablePrinting" ) );
mpData->mnDisablePrinting = aEnable.equalsIgnoreAsciiCase("true") ? 1 : 0;
}
@@ -1103,10 +1103,10 @@ sal_Bool MiscSettings::GetEnableATToolSupport() const
static const char* pEnv = getenv("SAL_ACCESSIBILITY_ENABLED" );
if( !pEnv || !*pEnv )
{
- rtl::OUString aEnable =
+ OUString aEnable =
vcl::SettingsConfigItem::get()->
- getValue( rtl::OUString( "Accessibility" ),
- rtl::OUString( "EnableATToolSupport" ) );
+ getValue( OUString( "Accessibility" ),
+ OUString( "EnableATToolSupport" ) );
mpData->mnEnableATT = aEnable.equalsIgnoreAsciiCase("true") ? 1 : 0;
}
else
@@ -1164,9 +1164,9 @@ void MiscSettings::SetEnableATToolSupport( sal_Bool bEnable )
}
vcl::SettingsConfigItem::get()->
- setValue( rtl::OUString( "Accessibility" ),
- rtl::OUString( "EnableATToolSupport" ),
- bEnable ? rtl::OUString("true") : rtl::OUString("false" ) );
+ setValue( OUString( "Accessibility" ),
+ OUString( "EnableATToolSupport" ),
+ bEnable ? OUString("true") : OUString("false" ) );
mpData->mnEnableATT = bEnable ? 1 : 0;
}
}
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 1692170517f0..b5acabe1fcc7 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -211,7 +211,7 @@ Application* GetpApp()
Application::Application()
{
// useful for themes at least, perhaps extensions too
- rtl::OUString aVar("LIBO_VERSION"), aValue(LIBO_VERSION_DOTTED);
+ OUString aVar("LIBO_VERSION"), aValue(LIBO_VERSION_DOTTED);
osl_setEnvironment(aVar.pData, aValue.pData);
if( ! ImplGetSVData() )
@@ -289,7 +289,7 @@ sal_uInt16 Application::GetCommandLineParamCount()
XubString Application::GetCommandLineParam( sal_uInt16 nParam )
{
- rtl::OUString aParam;
+ OUString aParam;
osl_getCommandArg( nParam, &aParam.pData );
return aParam;
}
@@ -310,11 +310,11 @@ const XubString& Application::GetAppFileName()
static String aAppFileName;
if( !aAppFileName.Len() )
{
- rtl::OUString aExeFileName;
+ OUString aExeFileName;
osl_getExecutableFile( &aExeFileName.pData );
// convert path to native file format
- rtl::OUString aNativeFileName;
+ OUString aNativeFileName;
osl::FileBase::getSystemPathFromFileURL( aExeFileName, aNativeFileName );
aAppFileName = aNativeFileName;
}
@@ -338,17 +338,17 @@ sal_uInt16 Application::Exception( sal_uInt16 nError )
#ifdef DBG_UTIL
case EXC_RSCNOTLOADED:
- Abort(rtl::OUString("Resource not loaded"));
+ Abort(OUString("Resource not loaded"));
break;
case EXC_SYSOBJNOTCREATED:
- Abort(rtl::OUString("System Object not created"));
+ Abort(OUString("System Object not created"));
break;
default:
- Abort(rtl::OUString("Unknown Error"));
+ Abort(OUString("Unknown Error"));
break;
#else
default:
- Abort(rtl::OUString());
+ Abort(OUString());
break;
#endif
}
@@ -1600,7 +1600,7 @@ UnoWrapperBase* Application::GetUnoWrapper( sal_Bool bCreateIfNotExist )
if ( !pSVData->mpUnoWrapper && bCreateIfNotExist && !bAlreadyTriedToCreate )
{
#ifndef DISABLE_DYNLOADING
- ::rtl::OUString aLibName = ::vcl::unohelper::CreateLibraryName(
+ OUString aLibName = ::vcl::unohelper::CreateLibraryName(
#ifdef LIBO_MERGELIBS
"merged",
#else
@@ -1758,7 +1758,7 @@ bool Application::IsHeadlessModeRequested()
{
sal_uInt32 n = rtl_getAppCommandArgCount();
for (sal_uInt32 i = 0; i < n; ++i) {
- rtl::OUString arg;
+ OUString arg;
rtl_getAppCommandArg(i, &arg.pData);
if ( arg == "--headless" || arg == "-headless" ) {
return true;
@@ -1812,12 +1812,12 @@ bool Application::GetShowImeStatusWindowDefault()
&& aInfo.MaximumCharSize > 1;
}
-const ::rtl::OUString& Application::GetDesktopEnvironment()
+const OUString& Application::GetDesktopEnvironment()
{
return SalGetDesktopEnvironment();
}
-void Application::AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType)
+void Application::AddToRecentDocumentList(const OUString& rFileUrl, const OUString& rMimeType)
{
ImplSVData* pSVData = ImplGetSVData();
pSVData->mpDefInst->AddToRecentDocumentList(rFileUrl, rMimeType);
diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx
index f919af686e6d..feec982e32b4 100644
--- a/vcl/source/app/svdata.cxx
+++ b/vcl/source/app/svdata.cxx
@@ -57,7 +57,6 @@
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
using namespace com::sun::star::awt;
-using ::rtl::OUString;
// =======================================================================
@@ -79,7 +78,7 @@ SalSystem* ImplGetSalSystem()
}
-static rtl::OUString ReplaceJavaErrorMessages( const rtl::OUString& rString )
+static OUString ReplaceJavaErrorMessages( const OUString& rString )
{
return rString.replaceAll("%OK", Button::GetStandardText(BUTTON_OK)).
replaceAll("%IGNORE", Button::GetStandardText(BUTTON_IGNORE)).
@@ -186,7 +185,7 @@ ResMgr* ImplGetResMgr()
"Missing vcl resource. This indicates that files vital to localization are missing. "
"You might have a corrupt installation.";
fprintf( stderr, "%s\n", pMsg );
- ErrorBox aBox( NULL, WB_OK | WB_DEF_OK, rtl::OUString( pMsg, strlen( pMsg ), RTL_TEXTENCODING_ASCII_US ) );
+ ErrorBox aBox( NULL, WB_OK | WB_DEF_OK, OUString( pMsg, strlen( pMsg ), RTL_TEXTENCODING_ASCII_US ) );
aBox.Execute();
}
}
@@ -237,7 +236,7 @@ FieldUnitStringList* ImplGetCleanedFieldUnits()
pSVData->maCtrlData.mpCleanUnitStrings->reserve( nUnits );
for( size_t i = 0; i < nUnits; ++i )
{
- rtl::OUString aUnit( (*pUnits)[i].first );
+ OUString aUnit( (*pUnits)[i].first );
aUnit = comphelper::string::remove(aUnit, ' ');
aUnit = aUnit.toAsciiLowerCase();
std::pair< String, FieldUnit > aElement( aUnit, (*pUnits)[i].second );
@@ -265,13 +264,13 @@ public:
m_prevContext( context ) {}
// XCurrentContext
- virtual com::sun::star::uno::Any SAL_CALL getValueByName( const rtl::OUString& Name )
+ virtual com::sun::star::uno::Any SAL_CALL getValueByName( const OUString& Name )
throw (com::sun::star::uno::RuntimeException);
private:
com::sun::star::uno::Reference< com::sun::star::uno::XCurrentContext > m_prevContext;
};
-com::sun::star::uno::Any AccessBridgeCurrentContext::getValueByName( const rtl::OUString & Name )
+com::sun::star::uno::Any AccessBridgeCurrentContext::getValueByName( const OUString & Name )
throw (com::sun::star::uno::RuntimeException)
{
com::sun::star::uno::Any ret;
@@ -347,8 +346,8 @@ bool ImplInitAccessBridge(bool bAllowCancel, bool &rCancelled)
ResMgr *pResMgr = ImplGetResMgr();
if( bErrorMessage && bAllowCancel && pResMgr )
{
- rtl::OUString aTitle(ResId(SV_ACCESSERROR_JAVA_NOT_CONFIGURED, *pResMgr).toString());
- rtl::OUStringBuffer aMessage((ResId(SV_ACCESSERROR_JAVA_MSG, *pResMgr)).toString());
+ OUString aTitle(ResId(SV_ACCESSERROR_JAVA_NOT_CONFIGURED, *pResMgr).toString());
+ OUStringBuffer aMessage((ResId(SV_ACCESSERROR_JAVA_MSG, *pResMgr)).toString());
aMessage.append(' ').append(ResId(SV_ACCESSERROR_OK_CANCEL_MSG, *pResMgr).toString());
@@ -370,8 +369,8 @@ bool ImplInitAccessBridge(bool bAllowCancel, bool &rCancelled)
ResMgr *pResMgr = ImplGetResMgr();
if( bErrorMessage && bAllowCancel && pResMgr )
{
- rtl::OUString aTitle(ResId(SV_ACCESSERROR_FAULTY_JAVA, *pResMgr).toString());
- rtl::OUStringBuffer aMessage(ResId(SV_ACCESSERROR_JAVA_MSG, *pResMgr).toString());
+ OUString aTitle(ResId(SV_ACCESSERROR_FAULTY_JAVA, *pResMgr).toString());
+ OUStringBuffer aMessage(ResId(SV_ACCESSERROR_JAVA_MSG, *pResMgr).toString());
aMessage.append(' ').append(ResId(SV_ACCESSERROR_OK_CANCEL_MSG, *pResMgr).toString());
@@ -393,8 +392,8 @@ bool ImplInitAccessBridge(bool bAllowCancel, bool &rCancelled)
ResMgr *pResMgr = ImplGetResMgr();
if( bErrorMessage && bAllowCancel && pResMgr )
{
- rtl::OUString aTitle(ResId(SV_ACCESSERROR_MISSING_JAVA, *pResMgr).toString());
- rtl::OUStringBuffer aMessage(ResId(SV_ACCESSERROR_JAVA_MSG, *pResMgr).toString());
+ OUString aTitle(ResId(SV_ACCESSERROR_MISSING_JAVA, *pResMgr).toString());
+ OUStringBuffer aMessage(ResId(SV_ACCESSERROR_JAVA_MSG, *pResMgr).toString());
aMessage.append(' ').append(ResId(SV_ACCESSERROR_OK_CANCEL_MSG, *pResMgr).toString());
@@ -416,8 +415,8 @@ bool ImplInitAccessBridge(bool bAllowCancel, bool &rCancelled)
ResMgr *pResMgr = ImplGetResMgr();
if( bErrorMessage && bAllowCancel && pResMgr )
{
- rtl::OUString aTitle(ResId(SV_ACCESSERROR_JAVA_DISABLED, *pResMgr).toString());
- rtl::OUStringBuffer aMessage(ResId(SV_ACCESSERROR_JAVA_MSG, *pResMgr).toString());
+ OUString aTitle(ResId(SV_ACCESSERROR_JAVA_DISABLED, *pResMgr).toString());
+ OUStringBuffer aMessage(ResId(SV_ACCESSERROR_JAVA_MSG, *pResMgr).toString());
aMessage.append(' ').append(ResId(SV_ACCESSERROR_OK_CANCEL_MSG, *pResMgr).toString());
@@ -439,8 +438,8 @@ bool ImplInitAccessBridge(bool bAllowCancel, bool &rCancelled)
ResMgr *pResMgr = ImplGetResMgr();
if( bErrorMessage && pResMgr )
{
- rtl::OUString aTitle;
- rtl::OUStringBuffer aMessage(ResId(SV_ACCESSERROR_BRIDGE_MSG, *pResMgr).toString());
+ OUString aTitle;
+ OUStringBuffer aMessage(ResId(SV_ACCESSERROR_BRIDGE_MSG, *pResMgr).toString());
if( e.Message.startsWith("ClassNotFound") )
{
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index 303c0999d5f8..f7533fdb5f05 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -81,7 +81,6 @@
#include "rtl/strbuf.hxx"
#endif
-using ::rtl::OUString;
using namespace ::com::sun::star;
// =======================================================================
@@ -217,14 +216,14 @@ public:
: m_xNextContext( ctx ) {}
// XCurrentContext
- virtual com::sun::star::uno::Any SAL_CALL getValueByName( const rtl::OUString& Name )
+ virtual com::sun::star::uno::Any SAL_CALL getValueByName( const OUString& Name )
throw (com::sun::star::uno::RuntimeException);
private:
com::sun::star::uno::Reference< com::sun::star::uno::XCurrentContext > m_xNextContext;
};
-uno::Any SAL_CALL DesktopEnvironmentContext::getValueByName( const rtl::OUString& Name) throw (uno::RuntimeException)
+uno::Any SAL_CALL DesktopEnvironmentContext::getValueByName( const OUString& Name) throw (uno::RuntimeException)
{
uno::Any retVal;
@@ -284,11 +283,11 @@ sal_Bool InitVCL()
pSVData->mpApp->Init();
// Fetch AppFileName and make it absolute before the workdir changes...
- rtl::OUString aExeFileName;
+ OUString aExeFileName;
osl_getExecutableFile( &aExeFileName.pData );
// convert path to native file format
- rtl::OUString aNativeFileName;
+ OUString aNativeFileName;
osl::FileBase::getSystemPathFromFileURL( aExeFileName, aNativeFileName );
pSVData->maAppData.mpAppFileName = new String( aNativeFileName );
@@ -362,7 +361,7 @@ void DeInitVCL()
pSVData->mpImeStatus = NULL;
#if OSL_DEBUG_LEVEL > 0
- rtl::OStringBuffer aBuf( 256 );
+ OStringBuffer aBuf( 256 );
aBuf.append( "DeInitVCL: some top Windows are still alive\n" );
long nTopWindowCount = Application::GetTopWindowCount();
long nBadTopWindows = nTopWindowCount;
@@ -376,7 +375,7 @@ void DeInitVCL()
else
{
aBuf.append( "text = \"" );
- aBuf.append( rtl::OUStringToOString( pWin->GetText(), osl_getThreadTextEncoding() ) );
+ aBuf.append( OUStringToOString( pWin->GetText(), osl_getThreadTextEncoding() ) );
aBuf.append( "\" type = \"" );
aBuf.append( typeid(*pWin).name() );
aBuf.append( "\", ptr = 0x" );
diff --git a/vcl/source/app/unohelp.cxx b/vcl/source/app/unohelp.cxx
index 3b15d25bd521..e5187c1d1dcc 100644
--- a/vcl/source/app/unohelp.cxx
+++ b/vcl/source/app/unohelp.cxx
@@ -45,7 +45,7 @@ uno::Reference < i18n::XCharacterClassification > vcl::unohelper::CreateCharacte
return i18n::CharacterClassification::create( comphelper::getProcessComponentContext() );
}
-::rtl::OUString vcl::unohelper::CreateLibraryName( const sal_Char* pModName, sal_Bool bSUPD )
+OUString vcl::unohelper::CreateLibraryName( const sal_Char* pModName, sal_Bool bSUPD )
{
// create variable library name suffixes
OUString aDLLSuffix = OUString::createFromAscii( SAL_STRINGIFY( DLLPOSTFIX ) );
@@ -58,7 +58,7 @@ uno::Reference < i18n::XCharacterClassification > vcl::unohelper::CreateCharacte
{
aLibName += aDLLSuffix;
}
- aLibName += rtl::OUString( ".dll" );
+ aLibName += OUString( ".dll" );
#else
aLibName = OUString( "lib" );
aLibName += OUString::createFromAscii( pModName );
diff --git a/vcl/source/app/unohelp2.cxx b/vcl/source/app/unohelp2.cxx
index 9f1d9edf4df2..e2663669ef5c 100644
--- a/vcl/source/app/unohelp2.cxx
+++ b/vcl/source/app/unohelp2.cxx
@@ -77,7 +77,7 @@ namespace vcl { namespace unohelper {
sal_uLong nT = SotExchange::GetFormat( rFlavor );
if ( nT == SOT_FORMAT_STRING )
{
- aAny <<= (::rtl::OUString)GetString();
+ aAny <<= (OUString)GetString();
}
else
{
diff --git a/vcl/source/components/dtranscomp.cxx b/vcl/source/components/dtranscomp.cxx
index 18881de9e0cb..650fce07f7fc 100644
--- a/vcl/source/components/dtranscomp.cxx
+++ b/vcl/source/components/dtranscomp.cxx
@@ -43,7 +43,6 @@
#include "cppuhelper/compbase2.hxx"
#include "cppuhelper/implbase1.hxx"
-using rtl::OUString;
using namespace com::sun::star;
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
@@ -80,12 +79,12 @@ public:
* XServiceInfo
*/
- virtual rtl::OUString SAL_CALL getImplementationName() throw( RuntimeException );
- virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw( RuntimeException );
- virtual Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( RuntimeException );
+ virtual OUString SAL_CALL getImplementationName() throw( RuntimeException );
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( RuntimeException );
+ virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( RuntimeException );
- static rtl::OUString getImplementationName_static();
- static Sequence< rtl::OUString > getSupportedServiceNames_static();
+ static OUString getImplementationName_static();
+ static Sequence< OUString > getSupportedServiceNames_static();
/*
* XClipboard
@@ -99,7 +98,7 @@ public:
const Reference< ::com::sun::star::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner )
throw(RuntimeException);
- virtual ::rtl::OUString SAL_CALL getName()
+ virtual OUString SAL_CALL getName()
throw(RuntimeException);
/*
@@ -125,29 +124,29 @@ GenericClipboard::~GenericClipboard()
{
}
-rtl::OUString GenericClipboard::getImplementationName_static()
+OUString GenericClipboard::getImplementationName_static()
{
- return rtl::OUString( "com.sun.star.datatransfer.VCLGenericClipboard" );
+ return OUString( "com.sun.star.datatransfer.VCLGenericClipboard" );
}
-Sequence< rtl::OUString > GenericClipboard::getSupportedServiceNames_static()
+Sequence< OUString > GenericClipboard::getSupportedServiceNames_static()
{
Sequence< OUString > aRet(1);
aRet[0] = OUString("com.sun.star.datatransfer.clipboard.SystemClipboard");
return aRet;
}
-rtl::OUString GenericClipboard::getImplementationName() throw( RuntimeException )
+OUString GenericClipboard::getImplementationName() throw( RuntimeException )
{
return getImplementationName_static();
}
-Sequence< rtl::OUString > GenericClipboard::getSupportedServiceNames() throw( RuntimeException )
+Sequence< OUString > GenericClipboard::getSupportedServiceNames() throw( RuntimeException )
{
return getSupportedServiceNames_static();
}
-sal_Bool GenericClipboard::supportsService( const ::rtl::OUString& ServiceName ) throw( RuntimeException )
+sal_Bool GenericClipboard::supportsService( const OUString& ServiceName ) throw( RuntimeException )
{
Sequence< OUString > aServices( getSupportedServiceNames() );
sal_Int32 nServices = aServices.getLength();
@@ -190,9 +189,9 @@ void GenericClipboard::setContents(
}
}
-rtl::OUString GenericClipboard::getName() throw( RuntimeException )
+OUString GenericClipboard::getName() throw( RuntimeException )
{
- return rtl::OUString( "CLIPBOARD" );
+ return OUString( "CLIPBOARD" );
}
sal_Int8 GenericClipboard::getRenderingCapabilities() throw( RuntimeException )
diff --git a/vcl/source/components/factory.cxx b/vcl/source/components/factory.cxx
index 9fefd4ba7233..5218c28efe7b 100644
--- a/vcl/source/components/factory.cxx
+++ b/vcl/source/components/factory.cxx
@@ -25,8 +25,6 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <vcl/dllapi.h>
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
diff --git a/vcl/source/components/fontident.cxx b/vcl/source/components/fontident.cxx
index e4187ccf7325..87be8e0995df 100644
--- a/vcl/source/components/fontident.cxx
+++ b/vcl/source/components/fontident.cxx
@@ -35,7 +35,6 @@
#include <cppuhelper/implbase3.hxx>
-using ::rtl::OUString;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::beans;
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 29f98622dbf6..d21312d0d23f 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -1007,7 +1007,7 @@ void PushButton::ImplDrawPushButton( bool bLayout )
nState |= CTRL_STATE_ROLLOVER;
bNativeOK = DrawNativeControl( aCtrlType, PART_BUTTON_DOWN, aInRect, nState,
- aControlValue, rtl::OUString() );
+ aControlValue, OUString() );
}
}
}
@@ -1062,7 +1062,7 @@ void PushButton::ImplDrawPushButton( bool bLayout )
if( ((nState & CTRL_STATE_ROLLOVER)) || ! (GetStyle() & WB_FLATBUTTON) )
{
bNativeOK = DrawNativeControl( CTRL_PUSHBUTTON, PART_ENTIRE_CONTROL, aCtrlRegion, nState,
- aControlValue, rtl::OUString()/*PushButton::GetText()*/ );
+ aControlValue, OUString()/*PushButton::GetText()*/ );
}
else
{
@@ -1128,7 +1128,7 @@ void PushButton::ImplSetDefButton( sal_Bool bSet )
// get native size of a 'default' button
// and adjust the VCL button if more space for adornment is required
if( GetNativeControlRegion( CTRL_PUSHBUTTON, PART_ENTIRE_CONTROL, aCtrlRegion,
- nState, aControlValue, rtl::OUString(),
+ nState, aControlValue, OUString(),
aBound, aCont ) )
{
dLeft = aCont.Left() - aBound.Left();
@@ -1707,7 +1707,7 @@ Size PushButton::GetOptimalSize() const
return CalcMinimumSize();
}
-bool PushButton::set_property(const rtl::OString &rKey, const rtl::OString &rValue)
+bool PushButton::set_property(const OString &rKey, const OString &rValue)
{
if (rKey == "has-default")
{
@@ -2036,7 +2036,7 @@ void RadioButton::ImplDrawRadioButtonState()
nState |= CTRL_STATE_ROLLOVER;
bNativeOK = DrawNativeControl( CTRL_RADIOBUTTON, PART_ENTIRE_CONTROL, aCtrlRect, nState,
- aControlValue,rtl::OUString() );
+ aControlValue,OUString() );
}
@@ -2838,7 +2838,7 @@ void RadioButton::SetState( sal_Bool bCheck )
}
}
-bool RadioButton::set_property(const rtl::OString &rKey, const rtl::OString &rValue)
+bool RadioButton::set_property(const OString &rKey, const OString &rValue)
{
if (rKey == "active")
SetState(toBool(rValue));
@@ -2901,7 +2901,7 @@ Size RadioButton::ImplGetRadioImageSize() const
// get native size of a radio button
if( pThis->GetNativeControlRegion( CTRL_RADIOBUTTON, PART_ENTIRE_CONTROL, aCtrlRegion,
- nState, aControlValue, rtl::OUString(),
+ nState, aControlValue, OUString(),
aBoundingRgn, aContentRgn ) )
{
aSize = aContentRgn.GetSize();
@@ -3010,7 +3010,7 @@ void RadioButton::ImplSetMinimumNWFSize()
// get native size of a radiobutton
if( GetNativeControlRegion( CTRL_RADIOBUTTON, PART_ENTIRE_CONTROL, aCtrlRegion,
- CTRL_STATE_DEFAULT|CTRL_STATE_ENABLED, aControlValue, rtl::OUString(),
+ CTRL_STATE_DEFAULT|CTRL_STATE_ENABLED, aControlValue, OUString(),
aBoundingRgn, aContentRgn ) )
{
Size aSize = aContentRgn.GetSize();
@@ -3203,7 +3203,7 @@ void CheckBox::ImplDrawCheckBoxState()
nState |= CTRL_STATE_ROLLOVER;
bNativeOK = DrawNativeControl( CTRL_CHECKBOX, PART_ENTIRE_CONTROL, aCtrlRegion, nState,
- aControlValue, rtl::OUString() );
+ aControlValue, OUString() );
}
if ( bNativeOK == sal_False )
@@ -3786,7 +3786,7 @@ void CheckBox::SetState( TriState eState )
}
}
-bool CheckBox::set_property(const rtl::OString &rKey, const rtl::OString &rValue)
+bool CheckBox::set_property(const OString &rKey, const OString &rValue)
{
if (rKey == "active")
SetState(toBool(rValue) ? STATE_CHECK : STATE_NOCHECK);
@@ -3835,7 +3835,7 @@ Size CheckBox::ImplGetCheckImageSize() const
// get native size of a check box
if( pThis->GetNativeControlRegion( CTRL_CHECKBOX, PART_ENTIRE_CONTROL, aCtrlRegion,
- nState, aControlValue, rtl::OUString(),
+ nState, aControlValue, OUString(),
aBoundingRgn, aContentRgn ) )
{
aSize = aContentRgn.GetSize();
@@ -3923,7 +3923,7 @@ void CheckBox::ImplSetMinimumNWFSize()
// get native size of a radiobutton
if( GetNativeControlRegion( CTRL_CHECKBOX, PART_ENTIRE_CONTROL, aCtrlRegion,
- CTRL_STATE_DEFAULT|CTRL_STATE_ENABLED, aControlValue, rtl::OUString(),
+ CTRL_STATE_DEFAULT|CTRL_STATE_ENABLED, aControlValue, OUString(),
aBoundingRgn, aContentRgn ) )
{
Size aSize = aContentRgn.GetSize();
@@ -4123,7 +4123,7 @@ void DisclosureButton::ImplDrawCheckBoxState()
nState |= CTRL_STATE_ROLLOVER;
if( ! DrawNativeControl( CTRL_LISTNODE, PART_ENTIRE_CONTROL, aCtrlRegion, nState,
- aControlValue, rtl::OUString() ) )
+ aControlValue, OUString() ) )
{
ImplSVCtrlData& rCtrlData( ImplGetSVData()->maCtrlData );
if( ! rCtrlData.mpDisclosurePlus )
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index cc8282030c46..9c8e3b806754 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -130,7 +130,7 @@ void ComboBox::ImplCalcEditHeight()
if( GetNativeControlRegion( aType, PART_ENTIRE_CONTROL,
aCtrlRegion,
CTRL_STATE_ENABLED,
- aControlValue, rtl::OUString(),
+ aControlValue, OUString(),
aBoundRegion, aContentRegion ) )
{
const long nNCHeight = aBoundRegion.GetHeight();
@@ -1039,7 +1039,7 @@ long ComboBox::getMaxWidthScrollBarAndDownButton() const
Rectangle aArea( aPoint, pBorder->GetOutputSizePixel() );
if ( GetNativeControlRegion(CTRL_COMBOBOX, PART_BUTTON_DOWN,
- aArea, 0, aControlValue, rtl::OUString(), aBound, aContent) )
+ aArea, 0, aControlValue, OUString(), aBound, aContent) )
{
nButtonDownWidth = aContent.getWidth();
}
@@ -1156,7 +1156,7 @@ Size ComboBox::CalcSize( sal_uInt16 nColumns, sal_uInt16 nLines ) const
void ComboBox::GetMaxVisColumnsAndLines( sal_uInt16& rnCols, sal_uInt16& rnLines ) const
{
- long nCharWidth = GetTextWidth(rtl::OUString(static_cast<sal_Unicode>('x')));
+ long nCharWidth = GetTextWidth(OUString(static_cast<sal_Unicode>('x')));
if ( !IsDropDownBox() )
{
Size aOutSz = mpImplLB->GetMainWindow()->GetOutputSizePixel();
@@ -1514,7 +1514,7 @@ ComboBox::ComboBoxBounds ComboBox::calcComboBoxDropDownComponentBounds(const Siz
Rectangle aArea( aPoint, rBorderOutSz );
if ( GetNativeControlRegion(CTRL_COMBOBOX, PART_BUTTON_DOWN,
- aArea, 0, aControlValue, rtl::OUString(), aBound, aContent) )
+ aArea, 0, aControlValue, OUString(), aBound, aContent) )
{
// convert back from border space to local coordinates
aPoint = pBorder->ScreenToOutputPixel( OutputToScreenPixel( aPoint ) );
@@ -1525,7 +1525,7 @@ ComboBox::ComboBoxBounds ComboBox::calcComboBoxDropDownComponentBounds(const Siz
// adjust the size of the edit field
if ( GetNativeControlRegion(CTRL_COMBOBOX, PART_SUB_EDIT,
- aArea, 0, aControlValue, rtl::OUString(), aBound, aContent) )
+ aArea, 0, aControlValue, OUString(), aBound, aContent) )
{
// convert back from border space to local coordinates
aContent.Move(-aPoint.X(), -aPoint.Y());
@@ -1560,7 +1560,7 @@ void ComboBox::setMaxWidthChars(sal_Int32 nWidth)
}
}
-bool ComboBox::set_property(const rtl::OString &rKey, const rtl::OString &rValue)
+bool ComboBox::set_property(const OString &rKey, const OString &rValue)
{
if (rKey == "max-width-chars")
setMaxWidthChars(rValue.toInt32());
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index bde19723ca7b..ce26c501ad61 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -214,7 +214,7 @@ void Edit::SetWidthInChars(sal_Int32 nWidthInChars)
}
}
-bool Edit::set_property(const rtl::OString &rKey, const rtl::OString &rValue)
+bool Edit::set_property(const OString &rKey, const OString &rValue)
{
if (rKey == "width-chars")
SetWidthInChars(rValue.toInt32());
@@ -473,7 +473,7 @@ OUString Edit::ImplGetText() const
cEchoChar = mcEchoChar;
else
cEchoChar = '*';
- rtl::OUStringBuffer aText;
+ OUStringBuffer aText;
comphelper::string::padToLength(aText, maText.getLength(), cEchoChar);
return aText.makeStringAndClear();
}
@@ -808,7 +808,7 @@ void Edit::ImplDelete( const Selection& rSelection, sal_uInt8 nDirection, sal_uI
OUString Edit::ImplGetValidString( const OUString& rString ) const
{
- rtl::OUString aValidString( rString );
+ OUString aValidString( rString );
aValidString = comphelper::string::remove(aValidString, _LF);
aValidString = comphelper::string::remove(aValidString, _CR);
aValidString = aValidString.replace('\t', ' ');
@@ -854,7 +854,7 @@ void Edit::ShowTruncationWarning( Window* pParent )
// -----------------------------------------------------------------------
-bool Edit::ImplTruncateToMaxLen( rtl::OUString& rStr, sal_uInt32 nSelectionLen ) const
+bool Edit::ImplTruncateToMaxLen( OUString& rStr, sal_uInt32 nSelectionLen ) const
{
bool bWasTruncated = false;
const sal_uInt32 nMaxLen = mnMaxTextLen < 65534 ? mnMaxTextLen : 65534;
@@ -951,7 +951,7 @@ void Edit::ImplInsertText( const OUString& rStr, const Selection* pNewSel, sal_B
// the text that needs to be checked is only the one
// before the current cursor position
OUString aOldText( maText.getStr(), nTmpPos);
- rtl::OUString aTmpText( aOldText );
+ OUString aTmpText( aOldText );
if (bCTLSequenceCheckingTypeAndReplace)
{
xISC->correctInputSequence( aTmpText, nTmpPos - 1, cChar, nCheckMode );
@@ -1434,7 +1434,7 @@ void Edit::ImplPaste( uno::Reference< datatransfer::clipboard::XClipboard >& rxC
try
{
uno::Any aData = xDataObj->getTransferData( aFlavor );
- ::rtl::OUString aText;
+ OUString aText;
aData >>= aText;
if( ImplTruncateToMaxLen( aText, maSelection.Len() ) )
ShowTruncationWarning( const_cast<Edit*>(this) );
@@ -1853,7 +1853,7 @@ sal_Bool Edit::ImplHandleKeyEvent( const KeyEvent& rKEvt )
bDone = sal_True; // read characters also when in ReadOnly
if ( !mbReadOnly )
{
- ImplInsertText(rtl::OUString(rKEvt.GetCharCode()), 0, sal_True);
+ ImplInsertText(OUString(rKEvt.GetCharCode()), 0, sal_True);
if ( maAutocompleteHdl.IsSet() )
{
if ( (maSelection.Min() == maSelection.Max()) && (maSelection.Min() == maText.getLength()) )
@@ -2841,7 +2841,7 @@ void Edit::SetSubEdit( Edit* pEdit )
}
}
-Size Edit::CalcMinimumSizeForText(const rtl::OUString &rString) const
+Size Edit::CalcMinimumSizeForText(const OUString &rString) const
{
Size aSize;
if (mnWidthInChars != -1)
@@ -2870,7 +2870,7 @@ Size Edit::CalcMinimumSizeForText(const rtl::OUString &rString) const
Rectangle aContent, aBound;
if( const_cast<Edit*>(this)->GetNativeControlRegion(
CTRL_EDITBOX, PART_ENTIRE_CONTROL,
- aRect, 0, aControlValue, rtl::OUString(), aBound, aContent) )
+ aRect, 0, aControlValue, OUString(), aBound, aContent) )
{
if( aBound.GetHeight() > aSize.Height() )
aSize.Height() = aBound.GetHeight();
@@ -2904,7 +2904,7 @@ Size Edit::CalcSize( xub_StrLen nChars ) const
{
// width for N characters, independent from content.
// works only correct for fixed fonts, average otherwise
- Size aSz( GetTextWidth( rtl::OUString('x') ), GetTextHeight() );
+ Size aSz( GetTextWidth( OUString('x') ), GetTextHeight() );
aSz.Width() *= nChars;
aSz.Width() += ImplGetExtraOffset() * 2;
aSz = CalcWindowSize( aSz );
@@ -2917,7 +2917,7 @@ xub_StrLen Edit::GetMaxVisChars() const
{
const Window* pW = mpSubEdit ? mpSubEdit : this;
long nOutWidth = pW->GetOutputSizePixel().Width();
- long nCharWidth = GetTextWidth( rtl::OUString('x') );
+ long nCharWidth = GetTextWidth( OUString('x') );
return nCharWidth ? (xub_StrLen)(nOutWidth/nCharWidth) : 0;
}
@@ -3070,7 +3070,7 @@ void Edit::drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent&
if ( xDataObj->isDataFlavorSupported( aFlavor ) )
{
uno::Any aData = xDataObj->getTransferData( aFlavor );
- ::rtl::OUString aText;
+ OUString aText;
aData >>= aText;
ImplInsertText( aText );
bChanges = sal_True;
@@ -3101,7 +3101,7 @@ void Edit::dragEnter( const ::com::sun::star::datatransfer::dnd::DropTargetDragE
for( sal_Int32 i = 0; i < nEle; i++ )
{
sal_Int32 nIndex = 0;
- rtl::OUString aMimetype = rFlavors[i].MimeType.getToken( 0, ';', nIndex );
+ OUString aMimetype = rFlavors[i].MimeType.getToken( 0, ';', nIndex );
if ( aMimetype == "text/plain" )
{
mpDDInfo->bIsStringSupported = sal_True;
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index 3dead80ca9ed..1ee47e1dbf24 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -94,7 +94,7 @@ static sal_Bool ImplNumericGetValue( const OUString& rStr, sal_Int64& rValue,
sal_Bool bCurrency = sal_False )
{
OUString aStr = rStr;
- rtl::OUStringBuffer aStr1, aStr2;
+ OUStringBuffer aStr1, aStr2;
sal_Bool bNegative = sal_False;
sal_Int32 nDecPos;
@@ -226,7 +226,7 @@ static void ImplUpdateSeparatorString( String& io_rText,
const String& rOldDecSep, const String& rNewDecSep,
const String& rOldThSep, const String& rNewThSep )
{
- rtl::OUStringBuffer aBuf( io_rText.Len() );
+ OUStringBuffer aBuf( io_rText.Len() );
xub_StrLen nIndexDec = 0, nIndexTh = 0, nIndex = 0;
const sal_Unicode* pBuffer = io_rText.GetBuffer();
@@ -810,7 +810,7 @@ NumericField::NumericField( Window* pParent, const ResId& rResId ) :
Show();
}
-bool NumericField::set_property(const rtl::OString &rKey, const rtl::OString &rValue)
+bool NumericField::set_property(const OString &rKey, const OString &rValue)
{
if (rKey == "digits")
SetDecimalDigits(rValue.toInt32());
@@ -935,15 +935,15 @@ namespace
{
Size calcMinimumSize(const SpinField &rSpinField, const NumericFormatter &rFormatter)
{
- rtl::OUStringBuffer aBuf;
+ OUStringBuffer aBuf;
sal_Int32 nTextLen;
- nTextLen = rtl::OUString::valueOf(rFormatter.GetMin()).getLength();
+ nTextLen = OUString::valueOf(rFormatter.GetMin()).getLength();
string::padToLength(aBuf, nTextLen, '9');
Size aMinTextSize = rSpinField.CalcMinimumSizeForText(
rFormatter.CreateFieldText(aBuf.makeStringAndClear().toInt64()));
- nTextLen = rtl::OUString::valueOf(rFormatter.GetMax()).getLength();
+ nTextLen = OUString::valueOf(rFormatter.GetMax()).getLength();
string::padToLength(aBuf, nTextLen, '9');
Size aMaxTextSize = rSpinField.CalcMinimumSizeForText(
rFormatter.CreateFieldText(aBuf.makeStringAndClear().toInt64()));
@@ -1093,10 +1093,10 @@ static sal_Bool ImplMetricProcessKeyInput( Edit* pEdit, const KeyEvent& rKEvt,
// -----------------------------------------------------------------------
-static rtl::OUString ImplMetricGetUnitText(const rtl::OUString& rStr)
+static OUString ImplMetricGetUnitText(const OUString& rStr)
{
// fetch unit text
- rtl::OUStringBuffer aStr;
+ OUStringBuffer aStr;
for (sal_Int32 i = rStr.getLength()-1; i >= 0; --i)
{
sal_Unicode c = rStr[i];
@@ -1131,7 +1131,7 @@ static const OUString ImplMetricToString( FieldUnit rUnit )
return OUString();
}
-static FieldUnit ImplStringToMetric(const rtl::OUString &rMetricString)
+static FieldUnit ImplStringToMetric(const OUString &rMetricString)
{
FieldUnitStringList* pList = ImplGetCleanedFieldUnits();
if( pList )
@@ -1151,9 +1151,9 @@ static FieldUnit ImplStringToMetric(const rtl::OUString &rMetricString)
// -----------------------------------------------------------------------
-static FieldUnit ImplMetricGetUnit(const rtl::OUString& rStr)
+static FieldUnit ImplMetricGetUnit(const OUString& rStr)
{
- rtl::OUString aStr = ImplMetricGetUnitText( rStr );
+ OUString aStr = ImplMetricGetUnitText( rStr );
return ImplStringToMetric( aStr );
}
@@ -1714,11 +1714,11 @@ Size MetricField::CalcMinimumSize() const
return calcMinimumSize(*this, *this);
}
-bool MetricField::set_property(const rtl::OString &rKey, const rtl::OString &rValue)
+bool MetricField::set_property(const OString &rKey, const OString &rValue)
{
if (rKey == "format")
{
- maCustomUnitText = rtl::OStringToOUString(rValue, RTL_TEXTENCODING_UTF8);
+ maCustomUnitText = OStringToOUString(rValue, RTL_TEXTENCODING_UTF8);
meUnit = FUNIT_CUSTOM;
}
else if (rKey == "digits")
diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx
index 785358017e41..97ec32d6bb44 100644
--- a/vcl/source/control/field2.cxx
+++ b/vcl/source/control/field2.cxx
@@ -158,7 +158,7 @@ static int ImplIsPatternChar( sal_Unicode cChar, sal_Char cEditMask )
try
{
- rtl::OUString aCharStr(cChar);
+ OUString aCharStr(cChar);
nType = ImplGetCharClass()->getStringType( aCharStr, 0, aCharStr.getLength(),
Application::GetSettings().GetLanguageTag().getLocale() );
}
@@ -209,7 +209,7 @@ static sal_Unicode ImplPatternChar( sal_Unicode cChar, sal_Char cEditMask )
(cEditMask == EDITMASK_UPPERALPHANUM) ||
( cEditMask == EDITMASK_UPPERALLCHAR ) )
{
- cChar = ImplGetCharClass()->toUpper(rtl::OUString(cChar), 0, 1,
+ cChar = ImplGetCharClass()->toUpper(OUString(cChar), 0, 1,
Application::GetSettings().GetLanguageTag().getLocale())[0];
}
return cChar;
@@ -429,7 +429,7 @@ static void ImplPatternProcessStrictModify( Edit* pEdit,
// -----------------------------------------------------------------------
-static xub_StrLen ImplPatternLeftPos(const rtl::OString& rEditMask, xub_StrLen nCursorPos)
+static xub_StrLen ImplPatternLeftPos(const OString& rEditMask, xub_StrLen nCursorPos)
{
// search non-literal predecessor
xub_StrLen nNewPos = nCursorPos;
@@ -448,7 +448,7 @@ static xub_StrLen ImplPatternLeftPos(const rtl::OString& rEditMask, xub_StrLen n
// -----------------------------------------------------------------------
-static xub_StrLen ImplPatternRightPos( const OUString& rStr, const rtl::OString& rEditMask,
+static xub_StrLen ImplPatternRightPos( const OUString& rStr, const OString& rEditMask,
sal_uInt16 nFormatFlags, sal_Bool bSameMask,
sal_Int32 nCursorPos )
{
@@ -1304,7 +1304,7 @@ OUString DateFormatter::ImplGetDateAsText( const Date& rDate,
}
}
- return rtl::OUString(aBuf, pBuf-aBuf);
+ return OUString(aBuf, pBuf-aBuf);
}
// -----------------------------------------------------------------------
@@ -2236,7 +2236,7 @@ static sal_Bool ImplTimeGetValue( const OUString& rStr, Time& rTime,
// Search for separators
if (!rLocaleDataWrapper.getTimeSep().isEmpty())
{
- rtl::OUStringBuffer aSepStr(",.;:/");
+ OUStringBuffer aSepStr(",.;:/");
if ( !bDuration )
aSepStr.append('-');
diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx
index 35a47f323e5d..c92685696899 100644
--- a/vcl/source/control/fixed.cxx
+++ b/vcl/source/control/fixed.cxx
@@ -215,7 +215,7 @@ void FixedText::ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags,
{
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
WinBits nWinStyle = GetStyle();
- rtl::OUString aText( GetText() );
+ OUString aText( GetText() );
sal_uInt16 nTextStyle = FixedText::ImplGetTextStyle( nWinStyle );
Point aPos = rPos;
@@ -449,7 +449,7 @@ void FixedText::setMinWidthChars(sal_Int32 nWidth)
}
}
-bool FixedText::set_property(const rtl::OString &rKey, const rtl::OString &rValue)
+bool FixedText::set_property(const OString &rKey, const OString &rValue)
{
if (rKey == "max-width-chars")
setMaxWidthChars(rValue.toInt32());
@@ -1213,7 +1213,7 @@ const Image& FixedImage::GetModeImage( ) const
return maImage;
}
-bool FixedImage::set_property(const rtl::OString &rKey, const rtl::OString &rValue)
+bool FixedImage::set_property(const OString &rKey, const OString &rValue)
{
if (rKey == "pixbuf")
{
diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx
index 73e5c5d9a774..9ab5da4e8ef3 100644
--- a/vcl/source/control/ilstbox.cxx
+++ b/vcl/source/control/ilstbox.cxx
@@ -2662,7 +2662,7 @@ sal_Bool ImplListBox::HandleWheelAsCursorTravel( const CommandEvent& rCEvt )
// -----------------------------------------------------------------------
-void ImplListBox::SetMRUEntries( const rtl::OUString& rEntries, sal_Unicode cSep )
+void ImplListBox::SetMRUEntries( const OUString& rEntries, sal_Unicode cSep )
{
sal_Bool bChanges = GetEntryList()->GetMRUCount() ? sal_True : sal_False;
@@ -2695,7 +2695,7 @@ void ImplListBox::SetMRUEntries( const rtl::OUString& rEntries, sal_Unicode cSep
// -----------------------------------------------------------------------
-rtl::OUString ImplListBox::GetMRUEntries( sal_Unicode cSep ) const
+OUString ImplListBox::GetMRUEntries( sal_Unicode cSep ) const
{
OUStringBuffer aEntries;
for ( sal_uInt16 n = 0; n < GetEntryList()->GetMRUCount(); n++ )
@@ -2824,11 +2824,11 @@ void ImplWin::ImplDraw( bool bLayout )
{
Rectangle aParentRect( Point( 0, 0 ), pWin->GetSizePixel() );
pWin->DrawNativeControl( CTRL_LISTBOX, PART_ENTIRE_CONTROL, aParentRect,
- nState, aControlValue, rtl::OUString() );
+ nState, aControlValue, OUString() );
}
bNativeOK = DrawNativeControl( CTRL_LISTBOX, PART_ENTIRE_CONTROL, aCtrlRegion, nState,
- aControlValue, rtl::OUString() );
+ aControlValue, OUString() );
}
if( IsEnabled() )
diff --git a/vcl/source/control/longcurr.cxx b/vcl/source/control/longcurr.cxx
index 52f28e8cd470..73d164909495 100644
--- a/vcl/source/control/longcurr.cxx
+++ b/vcl/source/control/longcurr.cxx
@@ -123,7 +123,7 @@ static sal_Bool ImplNumericGetValue( const XubString& rStr, BigInt& rValue,
{
XubString aStr = rStr;
XubString aStr1;
- rtl::OUStringBuffer aStr2;
+ OUStringBuffer aStr2;
sal_uInt16 nDecPos;
sal_Bool bNegative = sal_False;
diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx
index 89de20bb4bcf..0ee0cfce13a5 100644
--- a/vcl/source/control/lstbox.cxx
+++ b/vcl/source/control/lstbox.cxx
@@ -121,7 +121,7 @@ void ListBox::ImplInit( Window* pParent, WinBits nStyle )
Rectangle aBoundingRgn( aCtrlRegion );
Rectangle aContentRgn( aCtrlRegion );
if( GetNativeControlRegion( CTRL_LISTBOX, PART_ENTIRE_CONTROL, aCtrlRegion,
- CTRL_STATE_ENABLED, aControlValue, rtl::OUString(),
+ CTRL_STATE_ENABLED, aControlValue, OUString(),
aBoundingRgn, aContentRgn ) )
{
sal_Int32 nHeight = aBoundingRgn.GetHeight();
@@ -630,7 +630,7 @@ void ListBox::Resize()
Rectangle aArea( aPoint, pBorder->GetOutputSizePixel() );
if ( GetNativeControlRegion( CTRL_LISTBOX, PART_BUTTON_DOWN,
- aArea, 0, aControlValue, rtl::OUString(), aBound, aContent) )
+ aArea, 0, aControlValue, OUString(), aBound, aContent) )
{
long nTop = 0;
// Convert back from border space to local coordinates
@@ -643,7 +643,7 @@ void ListBox::Resize()
// Adjust the size of the edit field
if ( GetNativeControlRegion( CTRL_LISTBOX, PART_SUB_EDIT,
- aArea, 0, aControlValue, rtl::OUString(), aBound, aContent) )
+ aArea, 0, aControlValue, OUString(), aBound, aContent) )
{
// Convert back from border space to local coordinates
aContent.Move( -aPoint.X(), -aPoint.Y() );
@@ -1243,7 +1243,7 @@ Size ListBox::CalcMinimumSize() const
Size aTestSize( 100, 20 );
Rectangle aArea( aPoint, aTestSize );
if( const_cast<ListBox*>(this)->GetNativeControlRegion(
- CTRL_LISTBOX, PART_SUB_EDIT, aArea, 0, aControlValue, rtl::OUString(), aBound, aContent) )
+ CTRL_LISTBOX, PART_SUB_EDIT, aArea, 0, aControlValue, OUString(), aBound, aContent) )
{
// use the themes drop down size
aSz.Width() += aTestSize.Width() - aContent.GetWidth();
@@ -1260,7 +1260,7 @@ Size ListBox::CalcMinimumSize() const
Rectangle aRect( Point( 0, 0 ), aSz );
Rectangle aContent, aBound;
if( const_cast<ListBox*>(this)->GetNativeControlRegion(
- CTRL_LISTBOX, PART_ENTIRE_CONTROL, aRect, 0, aControlValue, rtl::OUString(), aBound, aContent) )
+ CTRL_LISTBOX, PART_ENTIRE_CONTROL, aRect, 0, aControlValue, OUString(), aBound, aContent) )
{
if( aBound.GetHeight() > aSz.Height() )
aSz.Height() = aBound.GetHeight();
@@ -1352,7 +1352,7 @@ Size ListBox::CalcSize( sal_uInt16 nColumns, sal_uInt16 nLines ) const
// Width
if ( nColumns )
- aSz.Width() = nColumns * GetTextWidth( rtl::OUString('X') );
+ aSz.Width() = nColumns * GetTextWidth( OUString('X') );
else
aSz.Width() = aMinSz.Width();
@@ -1374,7 +1374,7 @@ Size ListBox::CalcSize( sal_uInt16 nColumns, sal_uInt16 nLines ) const
void ListBox::GetMaxVisColumnsAndLines( sal_uInt16& rnCols, sal_uInt16& rnLines ) const
{
- long nCharWidth = GetTextWidth( rtl::OUString(static_cast<sal_Unicode>('x')) );
+ long nCharWidth = GetTextWidth( OUString(static_cast<sal_Unicode>('x')) );
if ( !IsDropDownBox() )
{
Size aOutSz = mpImplLB->GetMainWindow()->GetOutputSizePixel();
@@ -1487,7 +1487,7 @@ void ListBox::setMaxWidthChars(sal_Int32 nWidth)
}
}
-bool ListBox::set_property(const rtl::OString &rKey, const rtl::OString &rValue)
+bool ListBox::set_property(const OString &rKey, const OString &rValue)
{
if (rKey == "active")
SelectEntryPos(rValue.toInt32());
diff --git a/vcl/source/control/quickselectionengine.cxx b/vcl/source/control/quickselectionengine.cxx
index 36d038e101cb..d00944a06fc7 100644
--- a/vcl/source/control/quickselectionengine.cxx
+++ b/vcl/source/control/quickselectionengine.cxx
@@ -125,7 +125,7 @@ namespace vcl
if ( ( c >= 32 ) && ( c != 127 ) && !_keyEvent.GetKeyCode().IsMod2() )
{
m_pData->sCurrentSearchString += c;
- OSL_TRACE( "QuickSelectionEngine::HandleKeyEvent: searching for %s", rtl::OUStringToOString(m_pData->sCurrentSearchString, RTL_TEXTENCODING_UTF8).getStr() );
+ OSL_TRACE( "QuickSelectionEngine::HandleKeyEvent: searching for %s", OUStringToOString(m_pData->sCurrentSearchString, RTL_TEXTENCODING_UTF8).getStr() );
if ( m_pData->sCurrentSearchString.Len() == 1 )
{ // first character in the search -> remmeber
diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx
index 8a85bb5c8874..b3bc40906139 100644
--- a/vcl/source/control/scrbar.cxx
+++ b/vcl/source/control/scrbar.cxx
@@ -28,7 +28,6 @@
#include "rtl/string.hxx"
#include "tools/rc.h"
-using ::rtl::OUString;
/* #i77549#
@@ -319,9 +318,9 @@ void ScrollBar::ImplCalc( sal_Bool bUpdate )
if ( GetStyle() & WB_HORZ )
{
if ( GetNativeControlRegion( CTRL_SCROLLBAR, PART_BUTTON_LEFT,
- aControlRegion, 0, ImplControlValue(), rtl::OUString(), aBoundingRegion, aBtn1Region ) &&
+ aControlRegion, 0, ImplControlValue(), OUString(), aBoundingRegion, aBtn1Region ) &&
GetNativeControlRegion( CTRL_SCROLLBAR, PART_BUTTON_RIGHT,
- aControlRegion, 0, ImplControlValue(), rtl::OUString(), aBoundingRegion, aBtn2Region ) )
+ aControlRegion, 0, ImplControlValue(), OUString(), aBoundingRegion, aBtn2Region ) )
{
maBtn1Rect = aBtn1Region;
maBtn2Rect = aBtn2Region;
@@ -336,7 +335,7 @@ void ScrollBar::ImplCalc( sal_Bool bUpdate )
}
if ( GetNativeControlRegion( CTRL_SCROLLBAR, PART_TRACK_HORZ_AREA,
- aControlRegion, 0, ImplControlValue(), rtl::OUString(), aBoundingRegion, aTrackRegion ) )
+ aControlRegion, 0, ImplControlValue(), OUString(), aBoundingRegion, aTrackRegion ) )
maTrackRect = aTrackRegion;
else
maTrackRect = Rectangle( maBtn1Rect.TopRight(), maBtn2Rect.BottomLeft() );
@@ -360,9 +359,9 @@ void ScrollBar::ImplCalc( sal_Bool bUpdate )
else
{
if ( GetNativeControlRegion( CTRL_SCROLLBAR, PART_BUTTON_UP,
- aControlRegion, 0, ImplControlValue(), rtl::OUString(), aBoundingRegion, aBtn1Region ) &&
+ aControlRegion, 0, ImplControlValue(), OUString(), aBoundingRegion, aBtn1Region ) &&
GetNativeControlRegion( CTRL_SCROLLBAR, PART_BUTTON_DOWN,
- aControlRegion, 0, ImplControlValue(), rtl::OUString(), aBoundingRegion, aBtn2Region ) )
+ aControlRegion, 0, ImplControlValue(), OUString(), aBoundingRegion, aBtn2Region ) )
{
maBtn1Rect = aBtn1Region;
maBtn2Rect = aBtn2Region;
@@ -377,7 +376,7 @@ void ScrollBar::ImplCalc( sal_Bool bUpdate )
}
if ( GetNativeControlRegion( CTRL_SCROLLBAR, PART_TRACK_VERT_AREA,
- aControlRegion, 0, ImplControlValue(), rtl::OUString(), aBoundingRegion, aTrackRegion ) )
+ aControlRegion, 0, ImplControlValue(), OUString(), aBoundingRegion, aTrackRegion ) )
maTrackRect = aTrackRegion;
else
maTrackRect = Rectangle( maBtn1Rect.BottomLeft()+Point(0,1), maBtn2Rect.TopRight() );
@@ -548,7 +547,7 @@ sal_Bool ScrollBar::ImplDrawNative( sal_uInt16 nDrawFlags )
aCtrlRegion.Union( maPage2Rect );
aCtrlRegion.Union( maThumbRect );
bNativeOK = DrawNativeControl( CTRL_SCROLLBAR, (bHorz ? PART_DRAW_BACKGROUND_HORZ : PART_DRAW_BACKGROUND_VERT),
- aCtrlRegion, nState, scrValue, rtl::OUString() );
+ aCtrlRegion, nState, scrValue, OUString() );
}
else
{
@@ -578,11 +577,11 @@ sal_Bool ScrollBar::ImplDrawNative( sal_uInt16 nDrawFlags )
if ( nDrawFlags & SCRBAR_DRAW_PAGE1 )
bNativeOK = DrawNativeControl( CTRL_SCROLLBAR, part1, aCtrlRegion1, nState1,
- scrValue, rtl::OUString() );
+ scrValue, OUString() );
if ( nDrawFlags & SCRBAR_DRAW_PAGE2 )
bNativeOK = DrawNativeControl( CTRL_SCROLLBAR, part2, aCtrlRegion2, nState2,
- scrValue, rtl::OUString() );
+ scrValue, OUString() );
}
if ( (nDrawFlags & SCRBAR_DRAW_BTN1) || (nDrawFlags & SCRBAR_DRAW_BTN2) )
{
@@ -620,11 +619,11 @@ sal_Bool ScrollBar::ImplDrawNative( sal_uInt16 nDrawFlags )
if ( nDrawFlags & SCRBAR_DRAW_BTN1 )
bNativeOK = DrawNativeControl( CTRL_SCROLLBAR, part1, aCtrlRegion1, nState1,
- scrValue, rtl::OUString() );
+ scrValue, OUString() );
if ( nDrawFlags & SCRBAR_DRAW_BTN2 )
bNativeOK = DrawNativeControl( CTRL_SCROLLBAR, part2, aCtrlRegion2, nState2,
- scrValue, rtl::OUString() );
+ scrValue, OUString() );
}
if ( (nDrawFlags & SCRBAR_DRAW_THUMB) && !maThumbRect.IsEmpty() )
{
@@ -648,7 +647,7 @@ sal_Bool ScrollBar::ImplDrawNative( sal_uInt16 nDrawFlags )
}
bNativeOK = DrawNativeControl( CTRL_SCROLLBAR, (bHorz ? PART_THUMB_HORZ : PART_THUMB_VERT),
- aCtrlRegion, nState, scrValue, rtl::OUString() );
+ aCtrlRegion, nState, scrValue, OUString() );
}
}
}
diff --git a/vcl/source/control/slider.cxx b/vcl/source/control/slider.cxx
index 6bfaa2a9fd91..5d1b7c8ebd47 100644
--- a/vcl/source/control/slider.cxx
+++ b/vcl/source/control/slider.cxx
@@ -144,7 +144,7 @@ void Slider::ImplUpdateRects( sal_Bool bUpdate )
const Rectangle aControlRegion( Rectangle( Point(0,0), Size( SLIDER_THUMB_SIZE, 10 ) ) );
Rectangle aThumbBounds, aThumbContent;
if ( GetNativeControlRegion( CTRL_SLIDER, PART_THUMB_HORZ,
- aControlRegion, 0, ImplControlValue(), rtl::OUString(),
+ aControlRegion, 0, ImplControlValue(), OUString(),
aThumbBounds, aThumbContent ) )
{
maThumbRect.Left() = mnThumbPixPos - aThumbBounds.GetWidth()/2;
@@ -178,7 +178,7 @@ void Slider::ImplUpdateRects( sal_Bool bUpdate )
const Rectangle aControlRegion( Rectangle( Point(0,0), Size( 10, SLIDER_THUMB_SIZE ) ) );
Rectangle aThumbBounds, aThumbContent;
if ( GetNativeControlRegion( CTRL_SLIDER, PART_THUMB_VERT,
- aControlRegion, 0, ImplControlValue(), rtl::OUString(),
+ aControlRegion, 0, ImplControlValue(), OUString(),
aThumbBounds, aThumbContent ) )
{
maThumbRect.Top() = mnThumbPixPos - aThumbBounds.GetHeight()/2;
@@ -347,7 +347,7 @@ void Slider::ImplDraw( sal_uInt16 nDrawFlags )
const Rectangle aCtrlRegion( Point(0,0), GetOutputSizePixel() );
bool bNativeOK = DrawNativeControl( CTRL_SLIDER, nPart,
- aCtrlRegion, nState, sldValue, rtl::OUString() );
+ aCtrlRegion, nState, sldValue, OUString() );
if( bNativeOK )
return;
diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx
index 0c58aee8e531..16dea7e8d30c 100644
--- a/vcl/source/control/spinfld.cxx
+++ b/vcl/source/control/spinfld.cxx
@@ -85,7 +85,7 @@ sal_Bool ImplDrawNativeSpinfield( Window *pWin, const SpinbuttonValue& rSpinbutt
{
// only paint the embedded spin buttons, all buttons are painted at once
bNativeOK = pWin->DrawNativeControl( CTRL_SPINBOX, PART_ALL_BUTTONS, Rectangle(), CTRL_STATE_ENABLED,
- rSpinbuttonValue, rtl::OUString() );
+ rSpinbuttonValue, OUString() );
}
else
{
@@ -108,14 +108,14 @@ sal_Bool ImplDrawNativeSpinfield( Window *pWin, const SpinbuttonValue& rSpinbutt
Rectangle aNatRgn( aPt, aSize );
if( ! ImplGetSVData()->maNWFData.mbCanDrawWidgetAnySize &&
pBorder->GetNativeControlRegion( CTRL_SPINBOX, PART_ENTIRE_CONTROL,
- aNatRgn, 0, rSpinbuttonValue, rtl::OUString(), aBound, aContent) )
+ aNatRgn, 0, rSpinbuttonValue, OUString(), aBound, aContent) )
{
aSize = aContent.GetSize();
}
Rectangle aRgn( aPt, aSize );
bNativeOK = pBorder->DrawNativeControl( CTRL_SPINBOX, PART_ENTIRE_CONTROL, aRgn, CTRL_STATE_ENABLED,
- rSpinbuttonValue, rtl::OUString() );
+ rSpinbuttonValue, OUString() );
pBorder->SetClipRegion(Region(oldRgn));
}
@@ -131,7 +131,7 @@ sal_Bool ImplDrawNativeSpinbuttons( Window *pWin, const SpinbuttonValue& rSpinbu
{
// only paint the standalone spin buttons, all buttons are painted at once
bNativeOK = pWin->DrawNativeControl( CTRL_SPINBUTTONS, PART_ALL_BUTTONS, Rectangle(), CTRL_STATE_ENABLED,
- rSpinbuttonValue, rtl::OUString() );
+ rSpinbuttonValue, OUString() );
}
return bNativeOK;
}
@@ -709,9 +709,9 @@ void SpinField::ImplCalcButtonAreas( OutputDevice* pDev, const Size& rOutSz, Rec
bNativeRegionOK =
pWin->GetNativeControlRegion(CTRL_SPINBOX, PART_BUTTON_UP,
- aArea, 0, aControlValue, rtl::OUString(), aBound, aContentUp) &&
+ aArea, 0, aControlValue, OUString(), aBound, aContentUp) &&
pWin->GetNativeControlRegion(CTRL_SPINBOX, PART_BUTTON_DOWN,
- aArea, 0, aControlValue, rtl::OUString(), aBound, aContentDown);
+ aArea, 0, aControlValue, OUString(), aBound, aContentDown);
if( bNativeRegionOK )
{
@@ -766,7 +766,7 @@ void SpinField::Resize()
// adjust position and size of the edit field
if ( GetNativeControlRegion(CTRL_SPINBOX, PART_SUB_EDIT,
- aArea, 0, aControlValue, rtl::OUString(), aBound, aContent) )
+ aArea, 0, aControlValue, OUString(), aBound, aContent) )
{
// convert back from border space to local coordinates
aPoint = pBorder->ScreenToOutputPixel( OutputToScreenPixel( aPoint ) );
@@ -958,7 +958,7 @@ sal_Bool SpinField::ShowDropDown( sal_Bool )
return sal_False;
}
-Size SpinField::CalcMinimumSizeForText(const rtl::OUString &rString) const
+Size SpinField::CalcMinimumSizeForText(const OUString &rString) const
{
Size aSz = Edit::CalcMinimumSizeForText(rString);
@@ -971,9 +971,9 @@ Size SpinField::CalcMinimumSizeForText(const rtl::OUString &rString) const
Rectangle aEntireBound, aEntireContent, aEditBound, aEditContent;
if (
GetNativeControlRegion(CTRL_SPINBOX, PART_ENTIRE_CONTROL,
- aArea, 0, aControlValue, rtl::OUString(), aEntireBound, aEntireContent) &&
+ aArea, 0, aControlValue, OUString(), aEntireBound, aEntireContent) &&
GetNativeControlRegion(CTRL_SPINBOX, PART_SUB_EDIT,
- aArea, 0, aControlValue, rtl::OUString(), aEditBound, aEditContent)
+ aArea, 0, aControlValue, OUString(), aEditBound, aEditContent)
)
{
aSz.Width() += (aEntireContent.GetWidth() - aEditContent.GetWidth());
diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index 3722f80505a7..fc5a4bf80d2c 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -299,7 +299,7 @@ Size TabControl::ImplGetItemSize( ImplTabItem* pItem, long nMaxWidth )
Rectangle aBoundingRgn, aContentRgn;
const ImplControlValue aControlValue;
if(GetNativeControlRegion( CTRL_TAB_ITEM, PART_ENTIRE_CONTROL, aCtrlRegion,
- CTRL_STATE_ENABLED, aControlValue, rtl::OUString(),
+ CTRL_STATE_ENABLED, aControlValue, OUString(),
aBoundingRgn, aContentRgn ) )
{
return aContentRgn.GetSize();
@@ -313,7 +313,7 @@ Size TabControl::ImplGetItemSize( ImplTabItem* pItem, long nMaxWidth )
// shorten Text if needed
if ( aSize.Width()+4 >= nMaxWidth )
{
- rtl::OUString aAppendStr("...");
+ OUString aAppendStr("...");
pItem->maFormatText += aAppendStr;
do
{
@@ -573,9 +573,9 @@ void TabControl::ImplChangeTabPage( sal_uInt16 nId, sal_uInt16 nOldId )
if ( pOldPage )
{
if ( mbRestoreHelpId )
- pCtrlParent->SetHelpId( rtl::OString() );
+ pCtrlParent->SetHelpId( OString() );
if ( mbRestoreUnqId )
- pCtrlParent->SetUniqueId( rtl::OString() );
+ pCtrlParent->SetUniqueId( OString() );
pOldPage->DeactivatePage();
}
@@ -830,7 +830,7 @@ void TabControl::ImplDrawItem( ImplTabItem* pItem, const Rectangle& rCurRect, bo
tiValue.mnAlignment |= TABITEM_LAST_IN_GROUP;
bNativeOK = DrawNativeControl( CTRL_TAB_ITEM, PART_ENTIRE_CONTROL, aCtrlRegion, nState,
- tiValue, rtl::OUString() );
+ tiValue, OUString() );
}
if( ! bLayout && !bNativeOK )
@@ -1096,7 +1096,7 @@ void TabControl::ImplPaint( const Rectangle& rRect, bool bLayout )
if( !aClipRgn.IsEmpty() )
bNativeOK = DrawNativeControl( CTRL_TAB_PANE, part, aRect, nState,
- aControlValue, rtl::OUString() );
+ aControlValue, OUString() );
}
else
{
@@ -1360,7 +1360,7 @@ void TabControl::RequestHelp( const HelpEvent& rHEvt )
}
else if ( rHEvt.GetMode() & HELPMODE_EXTENDED )
{
- rtl::OUString aHelpId( rtl::OStringToOUString( GetHelpId( nItemId ), RTL_TEXTENCODING_UTF8 ) );
+ OUString aHelpId( OStringToOUString( GetHelpId( nItemId ), RTL_TEXTENCODING_UTF8 ) );
if ( !aHelpId.isEmpty() )
{
// call Help if existing
@@ -2039,7 +2039,7 @@ const XubString& TabControl::GetHelpText( sal_uInt16 nPageId ) const
{
Help* pHelp = Application::GetHelp();
if ( pHelp )
- pItem->maHelpText = pHelp->GetHelpText( rtl::OStringToOUString( pItem->maHelpId, RTL_TEXTENCODING_UTF8 ), this );
+ pItem->maHelpText = pHelp->GetHelpText( OStringToOUString( pItem->maHelpId, RTL_TEXTENCODING_UTF8 ), this );
}
return pItem->maHelpText;
diff --git a/vcl/source/control/throbber.cxx b/vcl/source/control/throbber.cxx
index 7f5768056119..3197b257467c 100644
--- a/vcl/source/control/throbber.cxx
+++ b/vcl/source/control/throbber.cxx
@@ -88,11 +88,11 @@ namespace
const Reference< com::sun::star::uno::XComponentContext > aContext( ::comphelper::getProcessComponentContext() );
const Reference< XGraphicProvider > xGraphicProvider( com::sun::star::graphic::GraphicProvider::create(aContext) );
- ::std::vector< ::rtl::OUString > aImageURLs( Throbber::getDefaultImageURLs( i_imageSet ) );
+ ::std::vector< OUString > aImageURLs( Throbber::getDefaultImageURLs( i_imageSet ) );
aImages.reserve( aImageURLs.size() );
::comphelper::NamedValueCollection aMediaProperties;
- for ( ::std::vector< ::rtl::OUString >::const_iterator imageURL = aImageURLs.begin();
+ for ( ::std::vector< OUString >::const_iterator imageURL = aImageURLs.begin();
imageURL != aImageURLs.end();
++imageURL
)
@@ -220,9 +220,9 @@ void Throbber::setImageList( const Sequence< Reference< XGraphic > >& rImageList
}
//----------------------------------------------------------------------------------------------------------------------
-::std::vector< ::rtl::OUString > Throbber::getDefaultImageURLs( const ImageSet i_imageSet )
+::std::vector< OUString > Throbber::getDefaultImageURLs( const ImageSet i_imageSet )
{
- ::std::vector< ::rtl::OUString > aImageURLs;
+ ::std::vector< OUString > aImageURLs;
sal_Char const* const pResolutions[] = { "16", "32", "64" };
size_t const nImageCounts[] = { 6, 12, 12 };
@@ -242,7 +242,7 @@ void Throbber::setImageList( const Sequence< Reference< XGraphic > >& rImageList
aImageURLs.reserve( nImageCounts[index] );
for ( size_t i=0; i<nImageCounts[index]; ++i )
{
- ::rtl::OUStringBuffer aURL;
+ OUStringBuffer aURL;
aURL.appendAscii( "private:graphicrepository/vcl/res/spinner-" );
aURL.appendAscii( pResolutions[index] );
aURL.appendAscii( "-" );
diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx
index 7213ad1cbc3b..b03924c88d67 100644
--- a/vcl/source/edit/texteng.cxx
+++ b/vcl/source/edit/texteng.cxx
@@ -200,10 +200,10 @@ void TextEngine::SetFont( const Font& rFont )
maFont.SetAlign( ALIGN_TOP );
mpRefDev->SetFont( maFont);
Size aTextSize;
- aTextSize.Width() = mpRefDev->GetTextWidth(rtl::OUString(" "));
+ aTextSize.Width() = mpRefDev->GetTextWidth(OUString(" "));
aTextSize.Height() = mpRefDev->GetTextHeight();
if ( !aTextSize.Width() )
- aTextSize.Width() = mpRefDev->GetTextWidth(rtl::OUString("XXXX"));
+ aTextSize.Width() = mpRefDev->GetTextWidth(OUString("XXXX"));
mnDefTab = (sal_uInt16)aTextSize.Width();
if ( !mnDefTab )
@@ -658,7 +658,7 @@ sal_Bool TextEngine::IsInputSequenceCheckingRequired( sal_Unicode c, const TextS
aCTLOptions.IsCTLFontEnabled() &&
aCTLOptions.IsCTLSequenceChecking() &&
nFirstPos != 0 && /* first char needs not to be checked */
- xBI.is() && i18n::ScriptType::COMPLEX == xBI->getScriptType( rtl::OUString( c ), 0 );
+ xBI.is() && i18n::ScriptType::COMPLEX == xBI->getScriptType( OUString( c ), 0 );
return bIsSequenceChecking;
}
@@ -711,8 +711,8 @@ TextPaM TextEngine::ImpInsertText( sal_Unicode c, const TextSelection& rCurSel,
// the text that needs to be checked is only the one
// before the current cursor position
- rtl::OUString aOldText( mpDoc->GetText( aPaM.GetPara() ).Copy(0, nTmpPos) );
- rtl::OUString aNewText( aOldText );
+ OUString aOldText( mpDoc->GetText( aPaM.GetPara() ).Copy(0, nTmpPos) );
+ OUString aNewText( aOldText );
if (aCTLOptions.IsCTLSequenceCheckingTypeAndReplace())
{
xISC->correctInputSequence( aNewText, nTmpPos - 1, c, nCheckMode );
@@ -752,7 +752,7 @@ TextPaM TextEngine::ImpInsertText( sal_Unicode c, const TextSelection& rCurSel,
if ( IsUndoEnabled() && !IsInUndo() )
{
- TextUndoInsertChars* pNewUndo = new TextUndoInsertChars( this, aPaM, rtl::OUString(c) );
+ TextUndoInsertChars* pNewUndo = new TextUndoInsertChars( this, aPaM, OUString(c) );
sal_Bool bTryMerge = ( !bDoOverwrite && ( c != ' ' ) ) ? sal_True : sal_False;
InsertUndo( pNewUndo, bTryMerge );
}
@@ -2556,14 +2556,14 @@ sal_Bool TextEngine::Read( SvStream& rInput, const TextSelection* pSel )
if ( aSel.HasRange() )
aSel = ImpDeleteText( aSel );
- rtl::OString aLine;
+ OString aLine;
sal_Bool bDone = rInput.ReadLine( aLine );
- rtl::OUString aTmpStr(rtl::OStringToOUString(aLine, rInput.GetStreamCharSet()));
+ OUString aTmpStr(OStringToOUString(aLine, rInput.GetStreamCharSet()));
while ( bDone )
{
aSel = ImpInsertText( aSel, aTmpStr );
bDone = rInput.ReadLine( aLine );
- aTmpStr = rtl::OStringToOUString(aLine, rInput.GetStreamCharSet());
+ aTmpStr = OStringToOUString(aLine, rInput.GetStreamCharSet());
if ( bDone )
aSel = ImpInsertParaBreak( aSel.GetEnd() );
}
@@ -2657,7 +2657,7 @@ sal_Bool TextEngine::Write( SvStream& rOutput, const TextSelection* pSel, sal_Bo
aText.AppendAscii( "</P>" );
}
- rOutput.WriteLine(rtl::OUStringToOString(aText,
+ rOutput.WriteLine(OUStringToOString(aText,
rOutput.GetStreamCharSet()));
}
diff --git a/vcl/source/edit/textund2.hxx b/vcl/source/edit/textund2.hxx
index 153e3db8c323..17a29181134f 100644
--- a/vcl/source/edit/textund2.hxx
+++ b/vcl/source/edit/textund2.hxx
@@ -38,7 +38,7 @@ public:
virtual void Undo();
virtual void Redo();
- virtual rtl::OUString GetComment () const;
+ virtual OUString GetComment () const;
};
@@ -56,7 +56,7 @@ public:
virtual void Undo();
virtual void Redo();
- virtual rtl::OUString GetComment () const;
+ virtual OUString GetComment () const;
};
@@ -74,7 +74,7 @@ public:
virtual void Undo();
virtual void Redo();
- virtual rtl::OUString GetComment () const;
+ virtual OUString GetComment () const;
};
@@ -93,7 +93,7 @@ public:
virtual sal_Bool Merge( SfxUndoAction *pNextAction );
- virtual rtl::OUString GetComment () const;
+ virtual OUString GetComment () const;
};
@@ -110,7 +110,7 @@ public:
virtual void Undo();
virtual void Redo();
- virtual rtl::OUString GetComment () const;
+ virtual OUString GetComment () const;
};
@@ -127,7 +127,7 @@ public:
virtual void Undo();
virtual void Redo();
- virtual rtl::OUString GetComment () const;
+ virtual OUString GetComment () const;
};
#endif // _TEXTUND2_HXX
diff --git a/vcl/source/edit/textundo.cxx b/vcl/source/edit/textundo.cxx
index 2b38fc220090..3cbb85d6999c 100644
--- a/vcl/source/edit/textundo.cxx
+++ b/vcl/source/edit/textundo.cxx
@@ -41,7 +41,7 @@ namespace
{
// Shorten() -- inserts ellipsis (...) in the middle of a long text
-void Shorten (rtl::OUString& rString)
+void Shorten (OUString& rString)
{
unsigned nLen = rString.getLength();
if (nLen > 48)
@@ -149,9 +149,9 @@ TextUndo::~TextUndo()
{
}
-rtl::OUString TextUndo::GetComment() const
+OUString TextUndo::GetComment() const
{
- return rtl::OUString();
+ return OUString();
}
void TextUndo::SetSelection( const TextSelection& rSel )
@@ -214,7 +214,7 @@ void TextUndoDelPara::Redo()
SetSelection( aPaM );
}
-rtl::OUString TextUndoDelPara::GetComment () const
+OUString TextUndoDelPara::GetComment () const
{
return ResId(STR_TEXTUNDO_DELPARA, *ImplGetResMgr());
}
@@ -248,7 +248,7 @@ void TextUndoConnectParas::Redo()
SetSelection( aPaM );
}
-rtl::OUString TextUndoConnectParas::GetComment () const
+OUString TextUndoConnectParas::GetComment () const
{
return ResId(STR_TEXTUNDO_CONNECTPARAS, *ImplGetResMgr());
}
@@ -282,7 +282,7 @@ void TextUndoSplitPara::Redo()
SetSelection( aPaM );
}
-rtl::OUString TextUndoSplitPara::GetComment () const
+OUString TextUndoSplitPara::GetComment () const
{
return ResId(STR_TEXTUNDO_SPLITPARA, *ImplGetResMgr());
}
@@ -334,12 +334,12 @@ sal_Bool TextUndoInsertChars::Merge( SfxUndoAction* pNextAction )
return sal_False;
}
-rtl::OUString TextUndoInsertChars::GetComment () const
+OUString TextUndoInsertChars::GetComment () const
{
// multiple lines?
- rtl::OUString sText(maText);
+ OUString sText(maText);
Shorten(sText);
- return rtl::OUString(ResId(STR_TEXTUNDO_INSERTCHARS, *ImplGetResMgr())).replaceAll("$1", sText);
+ return OUString(ResId(STR_TEXTUNDO_INSERTCHARS, *ImplGetResMgr())).replaceAll("$1", sText);
}
@@ -371,12 +371,12 @@ void TextUndoRemoveChars::Redo()
SetSelection( aPaM );
}
-rtl::OUString TextUndoRemoveChars::GetComment () const
+OUString TextUndoRemoveChars::GetComment () const
{
// multiple lines?
- rtl::OUString sText(maText);
+ OUString sText(maText);
Shorten(sText);
- return rtl::OUString(ResId(STR_TEXTUNDO_REMOVECHARS, *ImplGetResMgr())).replaceAll("$1", sText);
+ return OUString(ResId(STR_TEXTUNDO_REMOVECHARS, *ImplGetResMgr())).replaceAll("$1", sText);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/edit/textundo.hxx b/vcl/source/edit/textundo.hxx
index 1474376f4464..a461bd78e7b0 100644
--- a/vcl/source/edit/textundo.hxx
+++ b/vcl/source/edit/textundo.hxx
@@ -73,7 +73,7 @@ public:
virtual void Undo() = 0;
virtual void Redo() = 0;
- virtual rtl::OUString GetComment() const;
+ virtual OUString GetComment() const;
};
#endif // _TEXTUNDO_HXX
diff --git a/vcl/source/edit/textview.cxx b/vcl/source/edit/textview.cxx
index ff061bbd9b69..05ea5f2e16dc 100644
--- a/vcl/source/edit/textview.cxx
+++ b/vcl/source/edit/textview.cxx
@@ -107,7 +107,7 @@ uno::Any TETextDataObject::getTransferData( const datatransfer::DataFlavor& rFla
sal_uLong nT = SotExchange::GetFormat( rFlavor );
if ( nT == SOT_FORMAT_STRING )
{
- aAny <<= (::rtl::OUString)GetText();
+ aAny <<= (OUString)GetText();
}
else if ( nT == SOT_FORMATSTR_ID_HTML )
{
@@ -706,7 +706,7 @@ sal_Bool TextView::KeyInput( const KeyEvent& rKeyEvent )
{
if ( !mpImpl->mbReadOnly && !rKeyEvent.GetKeyCode().IsShift() &&
!rKeyEvent.GetKeyCode().IsMod1() && !rKeyEvent.GetKeyCode().IsMod2() &&
- ImplCheckTextLen( rtl::OUString('x') ) )
+ ImplCheckTextLen( OUString('x') ) )
{
aCurSel = mpImpl->mpTextEngine->ImpInsertText( aCurSel, '\t', !IsInsertMode() );
bModified = sal_True;
@@ -720,7 +720,7 @@ sal_Bool TextView::KeyInput( const KeyEvent& rKeyEvent )
// Shift-RETURN darf nicht geschluckt werden, weil dann keine
// mehrzeilige Eingabe in Dialogen/Property-Editor moeglich.
if ( !mpImpl->mbReadOnly && !rKeyEvent.GetKeyCode().IsMod1() &&
- !rKeyEvent.GetKeyCode().IsMod2() && ImplCheckTextLen( rtl::OUString('x') ) )
+ !rKeyEvent.GetKeyCode().IsMod2() && ImplCheckTextLen( OUString('x') ) )
{
mpImpl->mpTextEngine->UndoActionStart();
aCurSel = mpImpl->mpTextEngine->ImpInsertParaBreak( aCurSel );
@@ -755,7 +755,7 @@ sal_Bool TextView::KeyInput( const KeyEvent& rKeyEvent )
if ( TextEngine::IsSimpleCharInput( rKeyEvent ) )
{
sal_Unicode nCharCode = rKeyEvent.GetCharCode();
- if ( !mpImpl->mbReadOnly && ImplCheckTextLen( rtl::OUString(nCharCode) ) ) // sonst trotzdem das Zeichen schlucken...
+ if ( !mpImpl->mbReadOnly && ImplCheckTextLen( OUString(nCharCode) ) ) // sonst trotzdem das Zeichen schlucken...
{
aCurSel = mpImpl->mpTextEngine->ImpInsertText( nCharCode, aCurSel, !IsInsertMode(), sal_True );
bModified = sal_True;
@@ -1176,7 +1176,7 @@ void TextView::Paste( uno::Reference< datatransfer::clipboard::XClipboard >& rxC
try
{
uno::Any aData = xDataObj->getTransferData( aFlavor );
- ::rtl::OUString aText;
+ OUString aText;
aData >>= aText;
bool bWasTruncated = false;
if( mpImpl->mpTextEngine->GetMaxTextLen() != 0 )
@@ -1342,7 +1342,7 @@ void TextView::InsertText( const XubString& rStr, sal_Bool bSelect )
InsertNewText( rStr, bSelect );
}
-void TextView::InsertNewText( const rtl::OUString& rStr, sal_Bool bSelect )
+void TextView::InsertNewText( const OUString& rStr, sal_Bool bSelect )
{
// HideSelection();
mpImpl->mpTextEngine->UndoActionStart();
@@ -1957,7 +1957,7 @@ sal_Bool TextView::Read( SvStream& rInput )
return bDone;
}
-bool TextView::ImplTruncateNewText( rtl::OUString& rNewText ) const
+bool TextView::ImplTruncateNewText( OUString& rNewText ) const
{
bool bTruncated = false;
@@ -2095,7 +2095,7 @@ void TextView::drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEv
if ( xDataObj->isDataFlavorSupported( aFlavor ) )
{
uno::Any aData = xDataObj->getTransferData( aFlavor );
- ::rtl::OUString aOUString;
+ OUString aOUString;
aData >>= aOUString;
aText = convertLineEnd(aOUString, LINEEND_LF);
}
diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx
index e7bc99cac493..c13fc5529e05 100644
--- a/vcl/source/edit/vclmedit.cxx
+++ b/vcl/source/edit/vclmedit.cxx
@@ -295,7 +295,7 @@ void ImpVclMEdit::ImpInitScrollBars()
{
ImpSetScrollBarRanges();
Size aCharBox;
- aCharBox.Width() = mpTextWindow->GetTextWidth( rtl::OUString(sampleChar) );
+ aCharBox.Width() = mpTextWindow->GetTextWidth( OUString(sampleChar) );
aCharBox.Height() = mpTextWindow->GetTextHeight();
Size aOutSz = mpTextWindow->GetOutputSizePixel();
if ( mpHScrollBar )
@@ -653,7 +653,7 @@ Size ImpVclMEdit::CalcSize( sal_uInt16 nColumns, sal_uInt16 nLines ) const
Size aSz;
Size aCharSz;
- aCharSz.Width() = mpTextWindow->GetTextWidth( rtl::OUString(sampleChar) );
+ aCharSz.Width() = mpTextWindow->GetTextWidth( OUString(sampleChar) );
aCharSz.Height() = mpTextWindow->GetTextHeight();
if ( nLines )
@@ -678,7 +678,7 @@ void ImpVclMEdit::GetMaxVisColumnsAndLines( sal_uInt16& rnCols, sal_uInt16& rnLi
{
static const sal_Unicode sampleChar = { 'x' };
Size aOutSz = mpTextWindow->GetOutputSizePixel();
- Size aCharSz( mpTextWindow->GetTextWidth( rtl::OUString(sampleChar) ), mpTextWindow->GetTextHeight() );
+ Size aCharSz( mpTextWindow->GetTextWidth( OUString(sampleChar) ), mpTextWindow->GetTextHeight() );
rnCols = (sal_uInt16) (aOutSz.Width()/aCharSz.Width());
rnLines = (sal_uInt16) (aOutSz.Height()/aCharSz.Height());
}
@@ -779,7 +779,7 @@ void TextWindow::KeyInput( const KeyEvent& rKEvent )
{
// Damit die Selektion erhalten bleibt
mbActivePopup = sal_True;
- rtl::OUString aChars = Edit::GetGetSpecialCharsFunction()( this, GetFont() );
+ OUString aChars = Edit::GetGetSpecialCharsFunction()( this, GetFont() );
if (!aChars.isEmpty())
{
mpExtTextView->InsertText( aChars );
@@ -880,7 +880,7 @@ void TextWindow::Command( const CommandEvent& rCEvt )
break;
case SV_MENU_EDIT_INSERTSYMBOL:
{
- rtl::OUString aChars = Edit::GetGetSpecialCharsFunction()( this, GetFont() );
+ OUString aChars = Edit::GetGetSpecialCharsFunction()( this, GetFont() );
if (!aChars.isEmpty())
{
mpExtTextView->InsertText( aChars );
@@ -1370,7 +1370,7 @@ void VclMultiLineEdit::Draw( OutputDevice* pDev, const Point& rPos, const Size&
}
}
- rtl::OUString aText = GetText();
+ OUString aText = GetText();
Size aTextSz( pDev->GetTextWidth( aText ), pDev->GetTextHeight() );
sal_uLong nLines = (sal_uLong) (aSize.Height() / aTextSz.Height());
if ( !nLines )
@@ -1565,7 +1565,7 @@ void VclMultiLineEdit::EnableCursor( sal_Bool bEnable )
GetTextView()->EnableCursor( bEnable );
}
-bool VclMultiLineEdit::set_property(const rtl::OString &rKey, const rtl::OString &rValue)
+bool VclMultiLineEdit::set_property(const OString &rKey, const OString &rValue)
{
if (rKey == "cursor-visible")
EnableCursor(toBool(rValue));
diff --git a/vcl/source/edit/xtextedt.cxx b/vcl/source/edit/xtextedt.cxx
index 4fe25637a86e..e9b4e73a27b4 100644
--- a/vcl/source/edit/xtextedt.cxx
+++ b/vcl/source/edit/xtextedt.cxx
@@ -31,7 +31,7 @@ using namespace ::com::sun::star;
// -------------------------------------------------------------------------
// class ExtTextEngine
// -------------------------------------------------------------------------
-ExtTextEngine::ExtTextEngine() : maGroupChars(rtl::OUString("(){}[]"))
+ExtTextEngine::ExtTextEngine() : maGroupChars(OUString("(){}[]"))
{
}
diff --git a/vcl/source/filter/FilterConfigCache.cxx b/vcl/source/filter/FilterConfigCache.cxx
index b0a8bcfa5ba9..e354457bf676 100644
--- a/vcl/source/filter/FilterConfigCache.cxx
+++ b/vcl/source/filter/FilterConfigCache.cxx
@@ -87,7 +87,7 @@ sal_Bool FilterConfigCache::FilterConfigCacheEntry::CreateFilterName( const OUSt
if ( sFilterName.EqualsIgnoreCaseAscii( *pPtr ) )
bIsPixelFormat = sal_True;
}
- rtl::OUString sTemp(SVLIBRARY("?"));
+ OUString sTemp(SVLIBRARY("?"));
sal_Int32 nIndex = sTemp.indexOf(static_cast<sal_Unicode>('?'));
sFilterName = sTemp.replaceAt(nIndex, 1, sFilterName);
}
@@ -194,7 +194,7 @@ void FilterConfigCache::ImplInit()
else if (lFlags[0].equalsIgnoreAsciiCase("export"))
aEntry.nFlags = 2;
- ::rtl::OUString sFormatName;
+ OUString sFormatName;
xFilterSet->getPropertyValue(SFORMATNAME) >>= sFormatName;
aEntry.CreateFilterName( sFormatName );
@@ -286,7 +286,7 @@ void FilterConfigCache::ImplInitSmart()
aEntry.sType = sExtension;
aEntry.sUIName = sExtension;
- rtl::OString sFlags( *pPtr++ );
+ OString sFlags( *pPtr++ );
aEntry.nFlags = sFlags.toInt32();
OUString sUserData( OUString::createFromAscii( *pPtr ) );
@@ -427,7 +427,7 @@ String FilterConfigCache::GetImportWildcard( sal_uInt16 nFormat, sal_Int32 nEntr
{
String aWildcard( GetImportFormatExtension( nFormat, nEntry ) );
if ( aWildcard.Len() )
- aWildcard.Insert( rtl::OUString("*."), 0 );
+ aWildcard.Insert( OUString("*."), 0 );
return aWildcard;
}
@@ -541,7 +541,7 @@ String FilterConfigCache::GetExportWildcard( sal_uInt16 nFormat, sal_Int32 nEntr
{
String aWildcard( GetExportFormatExtension( nFormat, nEntry ) );
if ( aWildcard.Len() )
- aWildcard.Insert( rtl::OUString("*."), 0 );
+ aWildcard.Insert( OUString("*."), 0 );
return aWildcard;
}
diff --git a/vcl/source/filter/FilterConfigItem.cxx b/vcl/source/filter/FilterConfigItem.cxx
index 6423a90073e0..ceafbdec57b9 100644
--- a/vcl/source/filter/FilterConfigItem.cxx
+++ b/vcl/source/filter/FilterConfigItem.cxx
@@ -29,7 +29,6 @@
#include <com/sun/star/beans/XPropertySetInfo.hpp>
#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
-using ::rtl::OUString;
using namespace ::utl ; // getProcessServiceFactory
using namespace ::com::sun::star::lang ; // XMultiServiceFactory
using namespace ::com::sun::star::beans ; // PropertyValue
@@ -40,7 +39,7 @@ using namespace ::com::sun::star::container ; //
using namespace ::com::sun::star::configuration; //
using namespace ::com::sun::star::task ; // XStatusIndicator
-static sal_Bool ImpIsTreeAvailable( Reference< XMultiServiceFactory >& rXCfgProv, const rtl::OUString& rTree )
+static sal_Bool ImpIsTreeAvailable( Reference< XMultiServiceFactory >& rXCfgProv, const OUString& rTree )
{
sal_Bool bAvailable = !rTree.isEmpty();
if ( bAvailable )
@@ -89,7 +88,7 @@ static sal_Bool ImpIsTreeAvailable( Reference< XMultiServiceFactory >& rXCfgProv
bAvailable = sal_False;
else
{
- rtl::OUString aNode( getToken(rTree, i, '/') );
+ OUString aNode( getToken(rTree, i, '/') );
if ( !xHierarchicalNameAccess->hasByHierarchicalName( aNode ) )
bAvailable = sal_False;
else
@@ -420,7 +419,7 @@ Sequence< PropertyValue > FilterConfigItem::GetFilterData() const
Reference< XStatusIndicator > FilterConfigItem::GetStatusIndicator() const
{
Reference< XStatusIndicator > xStatusIndicator;
- const rtl::OUString sStatusIndicator( "StatusIndicator" );
+ const OUString sStatusIndicator( "StatusIndicator" );
sal_Int32 i, nCount = aFilterData.getLength();
for ( i = 0; i < nCount; i++ )
diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx
index f031b550c159..ecfd46976800 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -335,7 +335,7 @@ static sal_Bool ImpPeekGraphicFormat( SvStream& rStream, String& rFormatExtensio
}
rStream.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
if (bOK && !rStream.GetError()) {
- rFormatExtension = rtl::OUString("MET");
+ rFormatExtension = OUString("MET");
return sal_True;
}
}
@@ -369,7 +369,7 @@ static sal_Bool ImpPeekGraphicFormat( SvStream& rStream, String& rFormatExtensio
sFirstBytes[14+nOffs] == 0x28 ||
sFirstBytes[14+nOffs] == 0x0c )
{
- rFormatExtension = rtl::OUString("BMP");
+ rFormatExtension = OUString("BMP");
return sal_True;
}
}
@@ -385,13 +385,13 @@ static sal_Bool ImpPeekGraphicFormat( SvStream& rStream, String& rFormatExtensio
if ( nFirstLong==0xd7cdc69a || nFirstLong==0x01000900 )
{
- rFormatExtension = rtl::OUString("WMF");
+ rFormatExtension = OUString("WMF");
return sal_True;
}
else if( nFirstLong == 0x01000000 && sFirstBytes[ 40 ] == 0x20 && sFirstBytes[ 41 ] == 0x45 &&
sFirstBytes[ 42 ] == 0x4d && sFirstBytes[ 43 ] == 0x46 )
{
- rFormatExtension = rtl::OUString("EMF");
+ rFormatExtension = OUString("EMF");
return sal_True;
}
}
@@ -406,7 +406,7 @@ static sal_Bool ImpPeekGraphicFormat( SvStream& rStream, String& rFormatExtensio
sal_uInt8 nEncoding=sFirstBytes[2];
if( ( nVersion==0 || nVersion==2 || nVersion==3 || nVersion==5 ) && nEncoding<=1 )
{
- rFormatExtension = rtl::OUString("PCX");
+ rFormatExtension = OUString("PCX");
return sal_True;
}
}
@@ -418,7 +418,7 @@ static sal_Bool ImpPeekGraphicFormat( SvStream& rStream, String& rFormatExtensio
bSomethingTested=sal_True;
if ( nFirstLong==0x49492a00 || nFirstLong==0x4d4d002a )
{
- rFormatExtension = rtl::OUString("TIF");
+ rFormatExtension = OUString("TIF");
return sal_True;
}
}
@@ -429,7 +429,7 @@ static sal_Bool ImpPeekGraphicFormat( SvStream& rStream, String& rFormatExtensio
bSomethingTested=sal_True;
if ( nFirstLong==0x47494638 && (sFirstBytes[4]==0x37 || sFirstBytes[4]==0x39) && sFirstBytes[5]==0x61 )
{
- rFormatExtension = rtl::OUString("GIF");
+ rFormatExtension = OUString("GIF");
return sal_True;
}
}
@@ -440,7 +440,7 @@ static sal_Bool ImpPeekGraphicFormat( SvStream& rStream, String& rFormatExtensio
bSomethingTested=sal_True;
if (nFirstLong==0x89504e47 && nSecondLong==0x0d0a1a0a)
{
- rFormatExtension = rtl::OUString("PNG");
+ rFormatExtension = OUString("PNG");
return sal_True;
}
}
@@ -452,7 +452,7 @@ static sal_Bool ImpPeekGraphicFormat( SvStream& rStream, String& rFormatExtensio
if ( ( nFirstLong==0xffd8ffe0 && sFirstBytes[6]==0x4a && sFirstBytes[7]==0x46 && sFirstBytes[8]==0x49 && sFirstBytes[9]==0x46 ) ||
( nFirstLong==0xffd8fffe ) || ( 0xffd8ff00 == ( nFirstLong & 0xffffff00 ) ) )
{
- rFormatExtension = rtl::OUString("JPG");
+ rFormatExtension = OUString("JPG");
return sal_True;
}
}
@@ -463,13 +463,13 @@ static sal_Bool ImpPeekGraphicFormat( SvStream& rStream, String& rFormatExtensio
bSomethingTested=sal_True;
if( nFirstLong==0x53564744 && sFirstBytes[4]==0x49 )
{
- rFormatExtension = rtl::OUString("SVM");
+ rFormatExtension = OUString("SVM");
return sal_True;
}
else if( sFirstBytes[0]==0x56 && sFirstBytes[1]==0x43 && sFirstBytes[2]==0x4C &&
sFirstBytes[3]==0x4D && sFirstBytes[4]==0x54 && sFirstBytes[5]==0x46 )
{
- rFormatExtension = rtl::OUString("SVM");
+ rFormatExtension = OUString("SVM");
return sal_True;
}
}
@@ -486,7 +486,7 @@ static sal_Bool ImpPeekGraphicFormat( SvStream& rStream, String& rFormatExtensio
if( strncmp( sBuf, "PCD_IPI", 7 ) == 0 )
{
- rFormatExtension = rtl::OUString("PCD");
+ rFormatExtension = OUString("PCD");
return sal_True;
}
}
@@ -498,7 +498,7 @@ static sal_Bool ImpPeekGraphicFormat( SvStream& rStream, String& rFormatExtensio
bSomethingTested = sal_True;
if ( ( nFirstLong == 0x38425053 ) && ( (nSecondLong >> 16 ) == 1 ) )
{
- rFormatExtension = rtl::OUString("PSD");
+ rFormatExtension = OUString("PSD");
return sal_True;
}
}
@@ -510,7 +510,7 @@ static sal_Bool ImpPeekGraphicFormat( SvStream& rStream, String& rFormatExtensio
if ( ( nFirstLong == 0xC5D0D3C6 ) || ( ImplSearchEntry( sFirstBytes, (sal_uInt8*)"%!PS-Adobe", 10, 10 ) &&
ImplSearchEntry( &sFirstBytes[15], (sal_uInt8*)"EPS", 3, 3 ) ) )
{
- rFormatExtension = rtl::OUString("EPS");
+ rFormatExtension = OUString("EPS");
return sal_True;
}
}
@@ -521,7 +521,7 @@ static sal_Bool ImpPeekGraphicFormat( SvStream& rStream, String& rFormatExtensio
//Binary DXF File Format
if( strncmp( (const char*) sFirstBytes, "AutoCAD Binary DXF", 18 ) == 0 )
{
- rFormatExtension = rtl::OUString("DXF");
+ rFormatExtension = OUString("DXF");
return sal_True;
}
@@ -543,7 +543,7 @@ static sal_Bool ImpPeekGraphicFormat( SvStream& rStream, String& rFormatExtensio
if (i+7<256 && (strncmp((const char*)(sFirstBytes+i),"SECTION",7)==0))
{
- rFormatExtension = rtl::OUString("DXF");
+ rFormatExtension = OUString("DXF");
return sal_True;
}
}
@@ -556,7 +556,7 @@ static sal_Bool ImpPeekGraphicFormat( SvStream& rStream, String& rFormatExtensio
bSomethingTested = sal_True;
if (isPCT(rStream, nStreamPos, nStreamLen))
{
- rFormatExtension = rtl::OUString("PCT");
+ rFormatExtension = OUString("PCT");
return sal_True;
}
}
@@ -574,17 +574,17 @@ static sal_Bool ImpPeekGraphicFormat( SvStream& rStream, String& rFormatExtensio
{
case '1' :
case '4' :
- rFormatExtension = rtl::OUString("PBM");
+ rFormatExtension = OUString("PBM");
return sal_True;
case '2' :
case '5' :
- rFormatExtension = rtl::OUString("PGM");
+ rFormatExtension = OUString("PGM");
return sal_True;
case '3' :
case '6' :
- rFormatExtension = rtl::OUString("PPM");
+ rFormatExtension = OUString("PPM");
return sal_True;
}
}
@@ -596,7 +596,7 @@ static sal_Bool ImpPeekGraphicFormat( SvStream& rStream, String& rFormatExtensio
bSomethingTested=sal_True;
if( nFirstLong == 0x59a66a95 )
{
- rFormatExtension = rtl::OUString("RAS");
+ rFormatExtension = OUString("RAS");
return sal_True;
}
}
@@ -607,7 +607,7 @@ static sal_Bool ImpPeekGraphicFormat( SvStream& rStream, String& rFormatExtensio
bSomethingTested = sal_True;
if( ImplSearchEntry( sFirstBytes, (sal_uInt8*)"/* XPM */", 256, 9 ) )
{
- rFormatExtension = rtl::OUString("XPM");
+ rFormatExtension = OUString("XPM");
return sal_True;
}
}
@@ -631,7 +631,7 @@ static sal_Bool ImpPeekGraphicFormat( SvStream& rStream, String& rFormatExtensio
{
if( ImplSearchEntry( pPtr, (sal_uInt8*)"_width", pBuf + nSize - pPtr, 6 ) )
{
- rFormatExtension = rtl::OUString("XBM");
+ rFormatExtension = OUString("XBM");
delete[] pBuf;
return sal_True;
}
@@ -763,7 +763,7 @@ static sal_Bool ImpPeekGraphicFormat( SvStream& rStream, String& rFormatExtensio
bSomethingTested=sal_True;
if( sFirstBytes[ 0 ] == 'J' && sFirstBytes[ 1 ] == 'J' )
{
- rFormatExtension = rtl::OUString("SGF");
+ rFormatExtension = OUString("SGF");
return sal_True;
}
}
@@ -925,14 +925,14 @@ static Graphic ImpGetScaledGraphic( const Graphic& rGraphic, FilterConfigItem& r
static String ImpCreateFullFilterPath( const String& rPath, const String& rFilterName )
{
- ::rtl::OUString aPathURL;
+ OUString aPathURL;
::osl::FileBase::getFileURLFromSystemPath( rPath, aPathURL );
- aPathURL += rtl::OUString( '/' );
+ aPathURL += OUString( '/' );
- ::rtl::OUString aSystemPath;
+ OUString aSystemPath;
::osl::FileBase::getSystemPathFromFileURL( aPathURL, aSystemPath );
- aSystemPath += ::rtl::OUString( rFilterName );
+ aSystemPath += OUString( rFilterName );
return String( aSystemPath );
}
@@ -990,7 +990,7 @@ PFilterCall ImpFilterLibCacheEntry::GetImportFunction()
if( !mpfnImport )
{
#ifndef DISABLE_DYNLOADING
- mpfnImport = (PFilterCall) maLibrary.getFunctionSymbol(rtl::OUString(IMPORT_FUNCTION_NAME));
+ mpfnImport = (PFilterCall) maLibrary.getFunctionSymbol(OUString(IMPORT_FUNCTION_NAME));
#else
if( maFiltername.EqualsAscii( "icd" ) )
mpfnImport = icdGraphicImport;
@@ -1136,7 +1136,7 @@ void GraphicFilter::ImplInit()
if( bUseConfig )
{
- rtl::OUString url("$BRAND_BASE_DIR/program");
+ OUString url("$BRAND_BASE_DIR/program");
rtl::Bootstrap::expandMacros(url); //TODO: detect failure
utl::LocalFileHelper::ConvertURLToPhysicalName(url, aFilterPath);
}
@@ -2108,7 +2108,7 @@ sal_uInt16 GraphicFilter::ExportGraphic( const Graphic& rGraphic, const String&
String aPhysicalName( ImpCreateFullFilterPath( getToken(aFilterPath, i, ';'), aFilterName ) );
osl::Module aLibrary( aPhysicalName );
- PFilterCall pFunc = (PFilterCall) aLibrary.getFunctionSymbol(rtl::OUString(EXPORT_FUNCTION_NAME));
+ PFilterCall pFunc = (PFilterCall) aLibrary.getFunctionSymbol(OUString(EXPORT_FUNCTION_NAME));
// Dialog in DLL ausfuehren
#else
PFilterCall pFunc = NULL;
@@ -2178,7 +2178,7 @@ IMPL_LINK( GraphicFilter, FilterCallback, ConvertData*, pData )
if( pData )
{
sal_uInt16 nFormat = GRFILTER_FORMAT_DONTKNOW;
- rtl::OString aShortName;
+ OString aShortName;
switch( pData->mnFormat )
{
case( CVT_BMP ): aShortName = BMP_SHORTNAME; break;
@@ -2199,14 +2199,14 @@ IMPL_LINK( GraphicFilter, FilterCallback, ConvertData*, pData )
if( GRAPHIC_NONE == pData->maGraphic.GetType() || pData->maGraphic.GetContext() ) // Import
{
// Import
- nFormat = GetImportFormatNumberForShortName( rtl::OStringToOUString( aShortName, RTL_TEXTENCODING_UTF8) );
+ nFormat = GetImportFormatNumberForShortName( OStringToOUString( aShortName, RTL_TEXTENCODING_UTF8) );
nRet = ImportGraphic( pData->maGraphic, String(), pData->mrStm, nFormat ) == 0;
}
#ifndef DISABLE_EXPORT
else if( !aShortName.isEmpty() )
{
// Export
- nFormat = GetExportFormatNumberForShortName( rtl::OStringToOUString(aShortName, RTL_TEXTENCODING_UTF8) );
+ nFormat = GetExportFormatNumberForShortName( OStringToOUString(aShortName, RTL_TEXTENCODING_UTF8) );
nRet = ExportGraphic( pData->maGraphic, String(), pData->mrStm, nFormat ) == 0;
}
#endif
diff --git a/vcl/source/filter/graphicfilter2.cxx b/vcl/source/filter/graphicfilter2.cxx
index 22bb1891bef4..24a182dd2435 100644
--- a/vcl/source/filter/graphicfilter2.cxx
+++ b/vcl/source/filter/graphicfilter2.cxx
@@ -1128,7 +1128,7 @@ String GraphicDescriptor::GetImportFormatShortName( sal_uInt16 nFormat )
case( GFF_SVG ) : pKeyName = "svg"; break;
}
- return rtl::OUString::createFromAscii(pKeyName);
+ return OUString::createFromAscii(pKeyName);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/filter/igif/gifread.cxx b/vcl/source/filter/igif/gifread.cxx
index fd231ff88fbb..baba25d5facd 100644
--- a/vcl/source/filter/igif/gifread.cxx
+++ b/vcl/source/filter/igif/gifread.cxx
@@ -45,7 +45,7 @@ GIFReader::GIFReader( SvStream& rStm ) :
bGCTransparent ( sal_False ),
bImGraphicReady ( sal_False )
{
- maUpperName = rtl::OUString("SVIGIF");
+ maUpperName = OUString("SVIGIF");
pSrcBuf = new sal_uInt8[ 256 ];
ClearImageExtensions();
}
@@ -249,8 +249,8 @@ sal_Bool GIFReader::ReadExtension()
// Appl.-Extension hat Laenge 11
if ( cSize == 0x0b )
{
- rtl::OString aAppId = read_uInt8s_ToOString(rIStm, 8);
- rtl::OString aAppCode = read_uInt8s_ToOString(rIStm, 3);
+ OString aAppId = read_uInt8s_ToOString(rIStm, 8);
+ OString aAppCode = read_uInt8s_ToOString(rIStm, 3);
rIStm >> cSize;
// NetScape-Extension
diff --git a/vcl/source/filter/ixbm/xbmread.cxx b/vcl/source/filter/ixbm/xbmread.cxx
index c3f83dfd79f9..fc725f00b096 100644
--- a/vcl/source/filter/ixbm/xbmread.cxx
+++ b/vcl/source/filter/ixbm/xbmread.cxx
@@ -36,7 +36,7 @@ XBMReader::XBMReader( SvStream& rStm ) :
bStatus ( sal_True )
{
pHexTable = new short[ 256 ];
- maUpperName = rtl::OUString("SVIXBM");
+ maUpperName = OUString("SVIXBM");
InitTable();
}
@@ -90,10 +90,10 @@ void XBMReader::InitTable()
// ------------------------------------------------------------------------
-rtl::OString XBMReader::FindTokenLine( SvStream* pInStm, const char* pTok1,
+OString XBMReader::FindTokenLine( SvStream* pInStm, const char* pTok1,
const char* pTok2, const char* pTok3 )
{
- rtl::OString aRet;
+ OString aRet;
sal_Int32 nPos1, nPos2, nPos3;
bStatus = sal_False;
@@ -186,9 +186,9 @@ long XBMReader::ParseDefine( const sal_Char* pDefine )
// ------------------------------------------------------------------------
-sal_Bool XBMReader::ParseData( SvStream* pInStm, const rtl::OString& aLastLine, XBMFormat eFormat )
+sal_Bool XBMReader::ParseData( SvStream* pInStm, const OString& aLastLine, XBMFormat eFormat )
{
- rtl::OString aLine;
+ OString aLine;
long nRow = 0;
long nCol = 0;
long nBits = ( eFormat == XBM10 ) ? 16 : 8;
@@ -218,7 +218,7 @@ sal_Bool XBMReader::ParseData( SvStream* pInStm, const rtl::OString& aLastLine,
for( sal_Int32 i = 0; ( i < nCount ) && ( nRow < nHeight ); ++i )
{
- const rtl::OString aToken(comphelper::string::getToken(aLine,i, ','));
+ const OString aToken(comphelper::string::getToken(aLine,i, ','));
const sal_Int32 nLen = aToken.getLength();
sal_Bool bProcessed = sal_False;
@@ -274,7 +274,7 @@ ReadState XBMReader::ReadXBM( Graphic& rGraphic )
{
rIStm.Seek( nLastPos );
bStatus = sal_False;
- rtl::OString aLine = FindTokenLine( &rIStm, "#define", "_width" );
+ OString aLine = FindTokenLine( &rIStm, "#define", "_width" );
if ( bStatus )
{
diff --git a/vcl/source/filter/ixbm/xbmread.hxx b/vcl/source/filter/ixbm/xbmread.hxx
index 387430887660..4b5b60124d19 100644
--- a/vcl/source/filter/ixbm/xbmread.hxx
+++ b/vcl/source/filter/ixbm/xbmread.hxx
@@ -52,10 +52,10 @@ class XBMReader : public GraphicReader
sal_Bool bStatus;
void InitTable();
- rtl::OString FindTokenLine( SvStream* pInStm, const char* pTok1,
+ OString FindTokenLine( SvStream* pInStm, const char* pTok1,
const char* pTok2 = NULL, const char* pTok3 = NULL );
long ParseDefine( const sal_Char* pDefine );
- sal_Bool ParseData( SvStream* pInStm, const rtl::OString& aLastLine, XBMFormat eFormat );
+ sal_Bool ParseData( SvStream* pInStm, const OString& aLastLine, XBMFormat eFormat );
public:
diff --git a/vcl/source/filter/sgvmain.cxx b/vcl/source/filter/sgvmain.cxx
index 6977ed2ca197..947e53d67ab8 100644
--- a/vcl/source/filter/sgvmain.cxx
+++ b/vcl/source/filter/sgvmain.cxx
@@ -941,7 +941,7 @@ sal_Bool SgfSDrwFilter(SvStream& rInp, GDIMetaFile& rMtf, INetURLObject aIniPath
sal_Bool bRdFlag=sal_False; // Grafikentry gelesen ?
sal_Bool bRet=sal_False; // Returncode
- aIniPath.Append(rtl::OUString("sgf.ini"));
+ aIniPath.Append(OUString("sgf.ini"));
pSgfFonts = new SgfFontLst;
diff --git a/vcl/source/filter/sgvmain.hxx b/vcl/source/filter/sgvmain.hxx
index 0d08ba310ef4..36564cc4fab3 100644
--- a/vcl/source/filter/sgvmain.hxx
+++ b/vcl/source/filter/sgvmain.hxx
@@ -327,7 +327,7 @@ public:
String SVFName; // z.B. "Times New Roman" = 15 Chars
sal_uInt16 SVWidth; // Durchschnittliche Zeichenbreite in %
SgfFontOne();
- void ReadOne(const rtl::OString& rID, rtl::OString& rDsc);
+ void ReadOne(const OString& rID, OString& rDsc);
};
class SgfFontLst {
diff --git a/vcl/source/filter/sgvtext.cxx b/vcl/source/filter/sgvtext.cxx
index b011da279064..e4a5f4429c59 100644
--- a/vcl/source/filter/sgvtext.cxx
+++ b/vcl/source/filter/sgvtext.cxx
@@ -545,32 +545,32 @@ sal_uInt16 SetTextContext(OutputDevice& rOut, ObjTextType& Atr, sal_Bool Kapt, s
case 92500: case 92501: case 92504: case 92505:
{
#if defined(WNT)
- FNam=rtl::OUString("Times New Roman"); // CG Times ist unter Windows Times New Roman
+ FNam=OUString("Times New Roman"); // CG Times ist unter Windows Times New Roman
#else
- FNam=rtl::OUString("Times"); // ansonsten ist das einfach Times
+ FNam=OUString("Times"); // ansonsten ist das einfach Times
#endif
StdBrei=40;
aFont.SetFamily(FAMILY_ROMAN);
} break;
case 94021: case 94022: case 94023: case 94024: {
#if defined(WNT)
- FNam=rtl::OUString("Arial"); // Univers ist unter Windows Arial
+ FNam=OUString("Arial"); // Univers ist unter Windows Arial
#else
- FNam=rtl::OUString("Helvetica"); // und ansonsten Helvetica
+ FNam=OUString("Helvetica"); // und ansonsten Helvetica
#endif
aFont.SetFamily(FAMILY_SWISS);
StdBrei=47;
} break;
case 93950: case 93951: case 93952: case 93953: {
#if defined(WNT)
- FNam=rtl::OUString("Courier New"); // Der Vector-Courierfont unter Windows heisst Courier New
+ FNam=OUString("Courier New"); // Der Vector-Courierfont unter Windows heisst Courier New
#else
- FNam=rtl::OUString("Courier"); // ansonsten ist und bleibt Courier immer Courier
+ FNam=OUString("Courier"); // ansonsten ist und bleibt Courier immer Courier
#endif
aFont.SetFamily(FAMILY_ROMAN);
aFont.SetPitch(PITCH_FIXED);
} break;
- default: FNam = rtl::OUString("Helvetica");
+ default: FNam = OUString("Helvetica");
}
aFont.SetName(FNam);
//aFont.SetCharSet(CHARSET_SYSTEM);
@@ -666,7 +666,7 @@ sal_uInt16 GetCharWidth(OutputDevice& rOut, UCHAR c)
if (c==' ')
{
- ChrWidth=(sal_uInt16)rOut.GetTextWidth( rtl::OUString('A') );
+ ChrWidth=(sal_uInt16)rOut.GetTextWidth( OUString('A') );
if (rOut.GetFont().GetPitch()!=PITCH_FIXED) {
ChrWidth=MulDiv(ChrWidth,DefaultSpace,100);
}
@@ -679,11 +679,11 @@ sal_uInt16 GetCharWidth(OutputDevice& rOut, UCHAR c)
BOOST_STATIC_ASSERT(sizeof(UCHAR) == 1);
if (c>=MinChar /*&& c<=MaxChar*/)
{
- ChrWidth=(sal_uInt16)rOut.GetTextWidth(rtl::OUString(reinterpret_cast<sal_Char*>(&c), 1, RTL_TEXTENCODING_IBM_437));
+ ChrWidth=(sal_uInt16)rOut.GetTextWidth(OUString(reinterpret_cast<sal_Char*>(&c), 1, RTL_TEXTENCODING_IBM_437));
}
else
{
- ChrWidth=(sal_uInt16)rOut.GetTextWidth(rtl::OUString(static_cast<sal_Unicode>('A')));
+ ChrWidth=(sal_uInt16)rOut.GetTextWidth(OUString(static_cast<sal_Unicode>('A')));
}
}
return ChrWidth;
@@ -951,7 +951,7 @@ void DrawChar(OutputDevice& rOut, UCHAR c, ObjTextType T, PointType Pos, sal_uIn
{
SetTextContext(rOut,T,UpcasePossible(c),DrehWink,FitXMul,FitXDiv,FitYMul,FitYDiv);
if ((T.Schnitt & TextKaptBit)!=0 && UpcasePossible(c)) c=Upcase(c);
- rtl::OUString s(reinterpret_cast<const sal_Char*>(&c), 1,
+ OUString s(reinterpret_cast<const sal_Char*>(&c), 1,
RTL_TEXTENCODING_IBM_437);
rOut.DrawText( Point( Pos.x, Pos.y ), s );
}
@@ -1130,7 +1130,7 @@ SgfFontOne::SgfFontOne()
SVWidth=40;
}
-void SgfFontOne::ReadOne( const rtl::OString& rID, rtl::OString& Dsc )
+void SgfFontOne::ReadOne( const OString& rID, OString& Dsc )
{
if ( Dsc.getLength() < 4 || ( Dsc[0] != '(' ) )
return;
@@ -1148,14 +1148,14 @@ void SgfFontOne::ReadOne( const rtl::OString& rID, rtl::OString& Dsc )
i--;
j++;
}
- SVFName = rtl::OStringToOUString(Dsc.copy(i+1,j), RTL_TEXTENCODING_IBM_437); // SV-Fontname rausholen
- Dsc = rtl::OStringBuffer(Dsc).remove(i,j).makeStringAndClear();
+ SVFName = OStringToOUString(Dsc.copy(i+1,j), RTL_TEXTENCODING_IBM_437); // SV-Fontname rausholen
+ Dsc = OStringBuffer(Dsc).remove(i,j).makeStringAndClear();
IFID = (sal_uInt32)rID.toInt32();
sal_Int32 nTokenCount = comphelper::string::getTokenCount(Dsc, ' ');
for (sal_Int32 nIdx = 0; nIdx < nTokenCount; ++nIdx)
{
- rtl::OString s(Dsc.getToken(nIdx, ' '));
+ OString s(Dsc.getToken(nIdx, ' '));
if (!s.isEmpty())
{
s = s.toAsciiUpperCase();
@@ -1227,8 +1227,8 @@ void SgfFontLst::ReadList()
aCfg.SetGroup("SGV Fonts fuer StarView");
sal_uInt16 Anz=aCfg.GetKeyCount();
sal_uInt16 i;
- rtl::OString FID;
- rtl::OString Dsc;
+ OString FID;
+ OString Dsc;
for (i=0;i<Anz;i++)
{
diff --git a/vcl/source/filter/wmf/emfwr.cxx b/vcl/source/filter/wmf/emfwr.cxx
index beed2a3b9471..e4e3e51afc68 100644
--- a/vcl/source/filter/wmf/emfwr.cxx
+++ b/vcl/source/filter/wmf/emfwr.cxx
@@ -895,7 +895,7 @@ void EMFWriter::ImplWriteTextRecord( const Point& rPos, const String rText, cons
if( nLen > 1 )
{
- nNormWidth = pDX[ nLen - 2 ] + maVDev.GetTextWidth( rtl::OUString(rText.GetChar( nLen - 1 )) );
+ nNormWidth = pDX[ nLen - 2 ] + maVDev.GetTextWidth( OUString(rText.GetChar( nLen - 1 )) );
if( nWidth && nNormWidth && ( nWidth != nNormWidth ) )
{
@@ -1507,7 +1507,7 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf )
break;
default:
- OSL_FAIL(rtl::OStringBuffer(
+ OSL_FAIL(OStringBuffer(
"EMFWriter::ImplWriteActions: unsupported MetaAction #" ).
append(static_cast<sal_Int32>(nType)).getStr());
break;
diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx
index ec9a1b10e031..c19e48efd95d 100644
--- a/vcl/source/filter/wmf/enhwmf.cxx
+++ b/vcl/source/filter/wmf/enhwmf.cxx
@@ -245,7 +245,7 @@ void EnhWMFReader::ReadEMFPlusComment(sal_uInt32 length, sal_Bool& bHaveDC)
// debug code - write the stream to debug file /tmp/emf-stream.emf
EMFP_DEBUG(int pos = pWMF->Tell();
pWMF->Seek(0);
- SvFileStream file( rtl::OUString( "/tmp/emf-stream.emf" ), STREAM_WRITE | STREAM_TRUNC );
+ SvFileStream file( OUString( "/tmp/emf-stream.emf" ), STREAM_WRITE | STREAM_TRUNC );
*pWMF >> file;
file.Flush();
@@ -1083,7 +1083,7 @@ sal_Bool EnhWMFReader::ReadEnhWMF()
*pWMF >> nChar;
lfFaceName[ i ] = nChar;
}
- aLogFont.alfFaceName = rtl::OUString( lfFaceName );
+ aLogFont.alfFaceName = OUString( lfFaceName );
pOut->CreateObject( nIndex, GDI_FONT, new WinMtfFontStyle( aLogFont ) );
}
}
@@ -1144,7 +1144,7 @@ sal_Bool EnhWMFReader::ReadEnhWMF()
for ( i = 0, j = 0; i < aText.Len(); i++ )
{
sal_Unicode cUniChar = aText.GetChar(i);
- rtl::OString aCharacter(&cUniChar, 1, pOut->GetCharSet());
+ OString aCharacter(&cUniChar, 1, pOut->GetCharSet());
pDX[ i ] = 0;
for (sal_Int32 k = 0; ( k < aCharacter.getLength() ) && ( j < nLen ) && ( i < aText.Len() ); ++k)
pDX[ i ] += pOldDx[ j++ ];
@@ -1168,7 +1168,7 @@ sal_Bool EnhWMFReader::ReadEnhWMF()
*pTmp = nTmp;
}
#endif
- aText = rtl::OUString(pBuf, nLen);
+ aText = OUString(pBuf, nLen);
delete[] pBuf;
}
}
diff --git a/vcl/source/filter/wmf/winmtf.cxx b/vcl/source/filter/wmf/winmtf.cxx
index 5e8f5f29a43b..63af42605fa3 100644
--- a/vcl/source/filter/wmf/winmtf.cxx
+++ b/vcl/source/filter/wmf/winmtf.cxx
@@ -283,7 +283,7 @@ void WinMtfAssertHandler( const sal_Char* pAction, sal_uInt32 nFlags )
{
if ( ( nAssertCount == 0 ) || ( bOnlyOnce == sal_False ) )
{
- rtl::OStringBuffer aText("WMF/EMF Import: ");
+ OStringBuffer aText("WMF/EMF Import: ");
if (pAction)
aText.append(pAction);
aText.append(" needs to be implemented");
@@ -321,7 +321,7 @@ WinMtf::WinMtf( WinMtfOutput* pWinMtfOutput, SvStream& rStreamWMF, FilterConfigI
xStatusIndicator = pFilterConfigItem->GetStatusIndicator();
if ( xStatusIndicator.is() )
{
- rtl::OUString aMsg;
+ OUString aMsg;
xStatusIndicator->start( aMsg, 100 );
}
}
@@ -1615,7 +1615,7 @@ void WinMtfOutput::DrawText( Point& rPosition, String& rText, sal_Int32* pDXArry
if( pDXArry )
{
sal_uInt32 nLen = rText.Len();
- nTextWidth = aVDev.GetTextWidth( rtl::OUString(rText.GetChar( (sal_uInt16)( nLen - 1 ) )) );
+ nTextWidth = aVDev.GetTextWidth( OUString(rText.GetChar( (sal_uInt16)( nLen - 1 ) )) );
if( nLen > 1 )
nTextWidth += pDXArry[ nLen - 2 ];
}
diff --git a/vcl/source/filter/wmf/winwmf.cxx b/vcl/source/filter/wmf/winwmf.cxx
index 133df403bc31..e1dfed1ea678 100644
--- a/vcl/source/filter/wmf/winwmf.cxx
+++ b/vcl/source/filter/wmf/winwmf.cxx
@@ -508,7 +508,7 @@ void WMFReader::ReadRecordParams( sal_uInt16 nFunc )
if ( nNewTextLen != nOriginalTextLen )
{
sal_Unicode nUniChar = aText.GetChar(i);
- rtl::OString aTmp(&nUniChar, 1, pOut->GetCharSet());
+ OString aTmp(&nUniChar, 1, pOut->GetCharSet());
if ( aTmp.getLength() > 1 )
{
sal_Int32 nDxCount = aTmp.getLength() - 1;
diff --git a/vcl/source/filter/wmf/wmfwr.cxx b/vcl/source/filter/wmf/wmfwr.cxx
index 4f10ee17828e..1b862bab8005 100644
--- a/vcl/source/filter/wmf/wmfwr.cxx
+++ b/vcl/source/filter/wmf/wmfwr.cxx
@@ -336,7 +336,7 @@ void WMFWriter::WMFRecord_CreateFontIndirect(const Font & rFont)
}
*pWMF << nPitchFamily;
- rtl::OString aFontName(rtl::OUStringToOString(rFont.GetName(), eFontNameEncoding));
+ OString aFontName(OUStringToOString(rFont.GetName(), eFontNameEncoding));
for ( i = 0; i < W_LF_FACESIZE; i++ )
{
sal_Char nChar = ( i < aFontName.getLength() ) ? aFontName[i] : 0;
@@ -438,8 +438,8 @@ sal_Bool WMFWriter::WMFRecord_Escape_Unicode( const Point& rPoint, const String&
{
const sal_Unicode* pBuf = rUniStr.GetBuffer();
const rtl_TextEncoding aTextEncodingOrg = aSrcFont.GetCharSet();
- rtl::OString aByteStr(rtl::OUStringToOString(rUniStr, aTextEncodingOrg));
- rtl::OUString aUniStr2(rtl::OStringToOUString(aByteStr, aTextEncodingOrg));
+ OString aByteStr(OUStringToOString(rUniStr, aTextEncodingOrg));
+ OUString aUniStr2(OStringToOUString(aByteStr, aTextEncodingOrg));
const sal_Unicode* pConversion = aUniStr2.getStr(); // this is the unicode array after bytestring <-> unistring conversion
for ( i = 0; i < nStringLen; i++ )
{
@@ -460,8 +460,8 @@ sal_Bool WMFWriter::WMFRecord_Escape_Unicode( const Point& rPoint, const String&
aTextEncoding = getBestMSEncodingByChar(*pCheckChar); // try the next character
}
- aByteStr = rtl::OUStringToOString(rUniStr, aTextEncoding);
- aUniStr2 = rtl::OStringToOUString(aByteStr, aTextEncoding);
+ aByteStr = OUStringToOString(rUniStr, aTextEncoding);
+ aUniStr2 = OStringToOUString(aByteStr, aTextEncoding);
pConversion = aUniStr2.getStr(); // this is the unicode array after bytestring <-> unistring conversion
for ( i = 0; i < nStringLen; i++ )
{
@@ -535,12 +535,12 @@ void WMFWriter::WMFRecord_ExtTextOut( const Point & rPoint,
return;
}
rtl_TextEncoding eChrSet = aSrcFont.GetCharSet();
- rtl::OString aByteString(rtl::OUStringToOString(rString, eChrSet));
+ OString aByteString(OUStringToOString(rString, eChrSet));
TrueExtTextOut(rPoint,rString,aByteString,pDXAry);
}
void WMFWriter::TrueExtTextOut( const Point & rPoint, const String & rString,
- const rtl::OString& rByteString, const sal_Int32 * pDXAry )
+ const OString& rByteString, const sal_Int32 * pDXAry )
{
WriteRecordHeader( 0, W_META_EXTTEXTOUT );
WritePointYX( rPoint );
@@ -565,7 +565,7 @@ void WMFWriter::TrueExtTextOut( const Point & rPoint, const String & rString,
if ( nOriginalTextLen < nNewTextLen )
{
sal_Unicode nUniChar = rString.GetChar(i);
- rtl::OString aTemp(&nUniChar, 1, aSrcFont.GetCharSet());
+ OString aTemp(&nUniChar, 1, aSrcFont.GetCharSet());
j = aTemp.getLength();
while ( --j > 0 )
*pWMF << (sal_uInt16)0;
@@ -822,11 +822,11 @@ void WMFWriter::WMFRecord_StretchDIB( const Point & rPoint, const Size & rSize,
void WMFWriter::WMFRecord_TextOut(const Point & rPoint, const String & rStr)
{
rtl_TextEncoding eChrSet = aSrcFont.GetCharSet();
- rtl::OString aString(rtl::OUStringToOString(rStr, eChrSet));
+ OString aString(OUStringToOString(rStr, eChrSet));
TrueTextOut(rPoint, aString);
}
-void WMFWriter::TrueTextOut(const Point & rPoint, const rtl::OString& rString)
+void WMFWriter::TrueTextOut(const Point & rPoint, const OString& rString)
{
WriteRecordHeader(0,W_META_TEXTOUT);
@@ -1730,7 +1730,7 @@ sal_Bool WMFWriter::WriteWMF( const GDIMetaFile& rMTF, SvStream& rTargetStream,
xStatusIndicator = pFilterConfigItem->GetStatusIndicator();
if ( xStatusIndicator.is() )
{
- rtl::OUString aMsg;
+ OUString aMsg;
xStatusIndicator->start( aMsg, 100 );
}
}
diff --git a/vcl/source/filter/wmf/wmfwr.hxx b/vcl/source/filter/wmf/wmfwr.hxx
index b05a8d217ec1..63c42ff31d27 100644
--- a/vcl/source/filter/wmf/wmfwr.hxx
+++ b/vcl/source/filter/wmf/wmfwr.hxx
@@ -158,8 +158,8 @@ private:
void WMFRecord_ExtTextOut(const Point & rPoint, const String & rString, const sal_Int32 * pDXAry);
void TrueExtTextOut(const Point & rPoint, const String & rString,
- const rtl::OString& rByteString, const sal_Int32 * pDXAry);
- void TrueTextOut(const Point & rPoint, const rtl::OString& rString);
+ const OString& rByteString, const sal_Int32 * pDXAry);
+ void TrueTextOut(const Point & rPoint, const OString& rString);
void WMFRecord_LineTo(const Point & rPoint);
void WMFRecord_MoveTo(const Point & rPoint);
void WMFRecord_Pie(const Rectangle & rRect, const Point & rStartPt, const Point & rEndPt);
diff --git a/vcl/source/gdi/animate.cxx b/vcl/source/gdi/animate.cxx
index 442af4ada75f..22f82249ef43 100644
--- a/vcl/source/gdi/animate.cxx
+++ b/vcl/source/gdi/animate.cxx
@@ -732,7 +732,7 @@ SvStream& operator<<( SvStream& rOStm, const Animation& rAnimation )
rOStm << nDummy32; // Unused
rOStm << nDummy32; // Unused
rOStm << nDummy32; // Unused
- write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rOStm, rtl::OString()); // dummy
+ write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rOStm, OString()); // dummy
rOStm << nRest; // Count of remaining structures
}
}
diff --git a/vcl/source/gdi/base14.cxx b/vcl/source/gdi/base14.cxx
index fe620e72367f..7f9165258944 100644
--- a/vcl/source/gdi/base14.cxx
+++ b/vcl/source/gdi/base14.cxx
@@ -23,8 +23,6 @@
using namespace vcl;
-using ::rtl::OString;
-using ::rtl::OStringBuffer;
OString PDFWriterImpl::BuiltinFont::getNameObject() const
{
diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx
index 6f7147792804..8ea7a832c4c8 100644
--- a/vcl/source/gdi/bitmapex.cxx
+++ b/vcl/source/gdi/bitmapex.cxx
@@ -89,14 +89,14 @@ BitmapEx::BitmapEx( const ResId& rResId ) :
pResMgr->ReadLong();
const String aFileName( pResMgr->ReadString() );
- ::rtl::OUString aCurrentSymbolsStyle = Application::GetSettings().GetStyleSettings().GetCurrentSymbolsStyleName();
+ OUString aCurrentSymbolsStyle = Application::GetSettings().GetStyleSettings().GetCurrentSymbolsStyleName();
if( !aImageTree->loadImage( aFileName, aCurrentSymbolsStyle, *this, true ) )
{
#ifdef DBG_UTIL
- rtl::OStringBuffer aErrorStr(
+ OStringBuffer aErrorStr(
"BitmapEx::BitmapEx( const ResId& rResId ): could not load image <");
- aErrorStr.append(rtl::OUStringToOString(aFileName, RTL_TEXTENCODING_ASCII_US)).append('>');
+ aErrorStr.append(OUStringToOString(aFileName, RTL_TEXTENCODING_ASCII_US)).append('>');
OSL_FAIL(aErrorStr.getStr());
#endif
}
diff --git a/vcl/source/gdi/bmpconv.cxx b/vcl/source/gdi/bmpconv.cxx
index f76035df87dc..e42a28e1c3b5 100644
--- a/vcl/source/gdi/bmpconv.cxx
+++ b/vcl/source/gdi/bmpconv.cxx
@@ -34,7 +34,6 @@ using namespace com::sun::star::beans;
using namespace com::sun::star::reflection;
using namespace com::sun::star::awt;
-using ::rtl::OUString;
namespace vcl {
diff --git a/vcl/source/gdi/configsettings.cxx b/vcl/source/gdi/configsettings.cxx
index e8614e028d96..30b6f463f38c 100644
--- a/vcl/source/gdi/configsettings.cxx
+++ b/vcl/source/gdi/configsettings.cxx
@@ -33,7 +33,6 @@ using namespace com::sun::star::lang;
using namespace com::sun::star::beans;
using namespace com::sun::star::container;
-using ::rtl::OUString;
#define SETTINGS_CONFIGNODE "VCL/Settings"
@@ -65,7 +64,7 @@ void SettingsConfigItem::Commit()
if( ! IsValidConfigMgr() )
return;
- boost::unordered_map< OUString, SmallOUStrMap, rtl::OUStringHash >::const_iterator group;
+ boost::unordered_map< OUString, SmallOUStrMap, OUStringHash >::const_iterator group;
for( group = m_aSettings.begin(); group != m_aSettings.end(); ++group )
{
@@ -145,7 +144,7 @@ void SettingsConfigItem::getValues()
const OUString& SettingsConfigItem::getValue( const OUString& rGroup, const OUString& rKey ) const
{
- ::boost::unordered_map< OUString, SmallOUStrMap, rtl::OUStringHash >::const_iterator group = m_aSettings.find( rGroup );
+ ::boost::unordered_map< OUString, SmallOUStrMap, OUStringHash >::const_iterator group = m_aSettings.find( rGroup );
if( group == m_aSettings.end() || group->second.find( rKey ) == group->second.end() )
{
static OUString aEmpty;
diff --git a/vcl/source/gdi/cvtsvm.cxx b/vcl/source/gdi/cvtsvm.cxx
index 0b669f10e28a..bdc23db0293a 100644
--- a/vcl/source/gdi/cvtsvm.cxx
+++ b/vcl/source/gdi/cvtsvm.cxx
@@ -199,7 +199,7 @@ void ImplWriteFont( SvStream& rOStm, const Font& rFont,
char aName[32];
short nWeight;
- rtl::OString aByteName(rtl::OUStringToOString(rFont.GetName(),
+ OString aByteName(OUStringToOString(rFont.GetName(),
rOStm.GetStreamCharSet()));
strncpy( aName, aByteName.getStr(), 32 );
@@ -849,12 +849,12 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
rIStm >> aPt >> nIndex >> nLen >> nTmp >> nAryLen;
if ( nTmp && ( static_cast< sal_uInt32 >( nTmp ) < ( SAL_MAX_UINT16 - 1 ) ) )
{
- rtl::OString aByteStr = read_uInt8s_ToOString(rIStm, nTmp);
+ OString aByteStr = read_uInt8s_ToOString(rIStm, nTmp);
sal_uInt8 nTerminator = 0;
rIStm >> nTerminator;
DBG_ASSERT( nTerminator == 0, "expected string to be NULL terminated" );
- OUString aStr(rtl::OStringToOUString(aByteStr, eActualCharSet));
+ OUString aStr(OStringToOUString(aByteStr, eActualCharSet));
if( nAryLen > 0L )
{
@@ -912,12 +912,12 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
rIStm >> aPt >> nIndex >> nLen >> nTmp >> nWidth;
if ( nTmp && ( static_cast< sal_uInt32 >( nTmp ) < ( SAL_MAX_INT16 - 1 ) ) )
{
- rtl::OString aByteStr = read_uInt8s_ToOString(rIStm, nTmp);
+ OString aByteStr = read_uInt8s_ToOString(rIStm, nTmp);
sal_uInt8 nTerminator = 0;
rIStm >> nTerminator;
DBG_ASSERT( nTerminator == 0, "expected string to be NULL terminated" );
- OUString aStr(rtl::OStringToOUString(aByteStr, eActualCharSet));
+ OUString aStr(OStringToOUString(aByteStr, eActualCharSet));
if ( nUnicodeCommentActionNumber == i )
ImplReadUnicodeComment( nUnicodeCommentStreamPos, rIStm, aStr );
rMtf.AddAction( new MetaStretchTextAction( aPt, nWidth, aStr, (sal_uInt16) nIndex, (sal_uInt16) nLen ) );
@@ -1278,7 +1278,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
sal_uInt8* pData;
sal_Int32 nFollowingActionCount;
- rtl::OString aComment = read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(rIStm);
+ OString aComment = read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(rIStm);
rIStm >> nValue >> nDataSize;
if( nDataSize )
@@ -1678,7 +1678,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
{
MetaTextAction* pAct = (MetaTextAction*) pAction;
String aUniText( pAct->GetText() );
- rtl::OString aText(rtl::OUStringToOString(aUniText,
+ OString aText(OUStringToOString(aUniText,
rActualCharSet));
const sal_uLong nStrLen = aText.getLength();
@@ -1699,7 +1699,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
case( META_TEXTARRAY_ACTION ):
{
MetaTextArrayAction* pAct = (MetaTextArrayAction*)pAction;
- rtl::OString aText(rtl::OUStringToOString(pAct->GetText(),
+ OString aText(OUStringToOString(pAct->GetText(),
rActualCharSet));
String aUniText( pAct->GetText(), pAct->GetIndex(), pAct->GetLen() );
sal_uLong nAryLen;
@@ -1743,7 +1743,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
{
MetaStretchTextAction* pAct = (MetaStretchTextAction*) pAction;
String aUniText( pAct->GetText() );
- rtl::OString aText(rtl::OUStringToOString(aUniText,
+ OString aText(OUStringToOString(aUniText,
rActualCharSet));
const sal_uLong nStrLen = aText.getLength();
@@ -2406,7 +2406,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
#ifdef DBG_UTIL
default:
{
- rtl::OStringBuffer aStr("Missing implementation for Action#: ");
+ OStringBuffer aStr("Missing implementation for Action#: ");
aStr.append(static_cast<sal_Int32>(pAction->GetType()));
aStr.append('!');
OSL_FAIL(aStr.getStr());
diff --git a/vcl/source/gdi/font.cxx b/vcl/source/gdi/font.cxx
index 50c105dc3ca9..4d313c5f1d43 100644
--- a/vcl/source/gdi/font.cxx
+++ b/vcl/source/gdi/font.cxx
@@ -334,7 +334,7 @@ void Font::SetAlign( FontAlign eAlign )
}
}
-void Font::SetName( const rtl::OUString& rFamilyName )
+void Font::SetName( const OUString& rFamilyName )
{
DBG_CHKTHIS( Font, NULL );
@@ -783,7 +783,7 @@ namespace
if( aInfo.ufamily )
o_rResult.SetName( aInfo.ufamily );
else if( aInfo.family )
- o_rResult.SetName( rtl::OStringToOUString( aInfo.family, RTL_TEXTENCODING_ASCII_US ) );
+ o_rResult.SetName( OStringToOUString( aInfo.family, RTL_TEXTENCODING_ASCII_US ) );
// set weight
if( aInfo.weight )
{
@@ -838,9 +838,9 @@ namespace
// set style name
if( aInfo.usubfamily )
- o_rResult.SetStyleName( rtl::OUString( aInfo.usubfamily ) );
+ o_rResult.SetStyleName( OUString( aInfo.usubfamily ) );
else if( aInfo.subfamily )
- o_rResult.SetStyleName( rtl::OUString::createFromAscii( aInfo.subfamily ) );
+ o_rResult.SetStyleName( OUString::createFromAscii( aInfo.subfamily ) );
// cleanup
CloseTTFont( pTTF );
@@ -898,7 +898,7 @@ namespace
pClose++;
if( pClose - pOpen > 1 )
{
- o_rResult.SetName( rtl::OStringToOUString( rtl::OString( pOpen+1, pClose-pOpen-1 ), RTL_TEXTENCODING_ASCII_US ) );
+ o_rResult.SetName( OStringToOUString( OString( pOpen+1, pClose-pOpen-1 ), RTL_TEXTENCODING_ASCII_US ) );
}
}
diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index da87d3174044..da38c34e68fc 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.cxx
@@ -417,7 +417,7 @@ bool GDIMetaFile::ImplPlayWithRenderer( OutputDevice* pOut, const Point& rPos, S
if( xBitmapCanvas.is() )
{
args[0] = uno::Any( xBitmapCanvas );
- xMtfRenderer.set( xFactory->createInstanceWithArguments( ::rtl::OUString("com.sun.star.rendering.MtfRenderer"),
+ xMtfRenderer.set( xFactory->createInstanceWithArguments( OUString("com.sun.star.rendering.MtfRenderer"),
args ), uno::UNO_QUERY );
if( xMtfRenderer.is() )
@@ -484,15 +484,15 @@ void GDIMetaFile::ImplDelegate2PluggableRenderer( const MetaCommentAction* pAct,
if( !pData )
return;
- ::rtl::OUStringBuffer aBuffer;
+ OUStringBuffer aBuffer;
while( pData<pEndData && *pData )
aBuffer.append(static_cast<sal_Unicode>(*pData++));
- const ::rtl::OUString aRendererServiceName=aBuffer.makeStringAndClear();
+ const OUString aRendererServiceName=aBuffer.makeStringAndClear();
++pData;
while( pData<pEndData && *pData )
aBuffer.append(static_cast<sal_Unicode>(*pData++));
- const ::rtl::OUString aGraphicServiceName=aBuffer.makeStringAndClear();
+ const OUString aGraphicServiceName=aBuffer.makeStringAndClear();
++pData;
uno::Reference< lang::XMultiServiceFactory > xFactory = comphelper::getProcessServiceFactory();
@@ -1602,7 +1602,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, Rectangle* pHai
MetaTextLineAction* pAct = (MetaTextLineAction*) pAction;
// measure a test string to get ascend and descent right
static const sal_Unicode pStr[] = { 0xc4, 0x67, 0 };
- rtl::OUString aStr( pStr );
+ OUString aStr( pStr );
Rectangle aRect;
aMapVDev.GetTextBoundRect( aRect, aStr, 0, 0, aStr.getLength(), 0, NULL );
@@ -3000,19 +3000,19 @@ void GDIMetaFile::UseCanvas( sal_Bool _bUseCanvas )
bUseCanvas = _bUseCanvas;
}
-MetaCommentAction* makePluggableRendererAction( const rtl::OUString& rRendererServiceName,
- const rtl::OUString& rGraphicServiceName,
+MetaCommentAction* makePluggableRendererAction( const OUString& rRendererServiceName,
+ const OUString& rGraphicServiceName,
const void* _pData,
sal_uInt32 nDataSize )
{
const sal_uInt8* pData=(sal_uInt8*)_pData;
// FIXME: Data gets copied twice, unfortunately
- rtl::OString aRendererServiceName(
+ OString aRendererServiceName(
rRendererServiceName.getStr(),
rRendererServiceName.getLength(),
RTL_TEXTENCODING_ASCII_US);
- rtl::OString aGraphicServiceName(
+ OString aGraphicServiceName(
rGraphicServiceName.getStr(),
rGraphicServiceName.getLength(),
RTL_TEXTENCODING_ASCII_US);
diff --git a/vcl/source/gdi/image.cxx b/vcl/source/gdi/image.cxx
index 415ae1413c88..11cb3b6c3268 100644
--- a/vcl/source/gdi/image.cxx
+++ b/vcl/source/gdi/image.cxx
@@ -329,7 +329,7 @@ ImageList::ImageList( const ResId& rResId ) :
BitmapEx aEmpty;
for( sal_Int32 i = 0; i < nCount; ++i )
{
- rtl::OUString aName = pResMgr->ReadString();
+ OUString aName = pResMgr->ReadString();
sal_uInt16 nId = static_cast< sal_uInt16 >( pResMgr->ReadLong() );
mpImplData->AddImage( aName, nId, aEmpty );
}
@@ -339,8 +339,8 @@ ImageList::ImageList( const ResId& rResId ) :
}
}
-ImageList::ImageList( const ::std::vector< ::rtl::OUString >& rNameVector,
- const ::rtl::OUString& rPrefix,
+ImageList::ImageList( const ::std::vector< OUString >& rNameVector,
+ const OUString& rPrefix,
const Color* ) :
mpImplData( NULL ),
mnInitSize( 1 ),
@@ -386,15 +386,15 @@ void ImageList::ImplInit( sal_uInt16 nItems, const Size &rSize )
mpImplData->maImageSize = rSize;
}
-void ImageAryData::Load(const rtl::OUString &rPrefix)
+void ImageAryData::Load(const OUString &rPrefix)
{
static ImplImageTreeSingletonRef aImageTree;
- ::rtl::OUString aSymbolsStyle = Application::GetSettings().GetStyleSettings().GetCurrentSymbolsStyleName();
+ OUString aSymbolsStyle = Application::GetSettings().GetStyleSettings().GetCurrentSymbolsStyleName();
BitmapEx aBmpEx;
- rtl::OUString aFileName = rPrefix;
+ OUString aFileName = rPrefix;
aFileName += maName;
#if OSL_DEBUG_LEVEL > 0
bool bSuccess =
@@ -403,9 +403,9 @@ void ImageAryData::Load(const rtl::OUString &rPrefix)
#if OSL_DEBUG_LEVEL > 0
if ( !bSuccess )
{
- ::rtl::OStringBuffer aMessage;
+ OStringBuffer aMessage;
aMessage.append( "ImageAryData::Load: failed to load image '" );
- aMessage.append( ::rtl::OUStringToOString( aFileName, RTL_TEXTENCODING_UTF8 ).getStr() );
+ aMessage.append( OUStringToOString( aFileName, RTL_TEXTENCODING_UTF8 ).getStr() );
aMessage.append( "'" );
OSL_FAIL( aMessage.makeStringAndClear().getStr() );
}
@@ -452,7 +452,7 @@ BitmapEx ImageList::GetAsHorizontalStrip() const
}
void ImageList::InsertFromHorizontalStrip( const BitmapEx &rBitmapEx,
- const std::vector< rtl::OUString > &rNameVector )
+ const std::vector< OUString > &rNameVector )
{
sal_uInt16 nItems = sal::static_int_cast< sal_uInt16 >( rNameVector.size() );
@@ -490,11 +490,11 @@ void ImageList::InsertFromHorizontalBitmap( const ResId& rResId,
if ( nColorCount && pSearchColors && pReplaceColors )
aBmpEx.Replace( pSearchColors, pReplaceColors, nColorCount );
- std::vector< rtl::OUString > aNames( nCount );
+ std::vector< OUString > aNames( nCount );
InsertFromHorizontalStrip( aBmpEx, aNames );
}
-sal_uInt16 ImageList::ImplGetImageId( const ::rtl::OUString& rImageName ) const
+sal_uInt16 ImageList::ImplGetImageId( const OUString& rImageName ) const
{
DBG_CHKTHIS( ImageList, NULL );
@@ -505,7 +505,7 @@ sal_uInt16 ImageList::ImplGetImageId( const ::rtl::OUString& rImageName ) const
return 0;
}
-void ImageList::AddImage( const ::rtl::OUString& rImageName, const Image& rImage )
+void ImageList::AddImage( const OUString& rImageName, const Image& rImage )
{
DBG_ASSERT( GetImagePos( rImageName ) == IMAGELIST_IMAGE_NOTFOUND, "ImageList::AddImage() - ImageName already exists" );
@@ -516,7 +516,7 @@ void ImageList::AddImage( const ::rtl::OUString& rImageName, const Image& rImage
rImage.GetBitmapEx() );
}
-void ImageList::ReplaceImage( const ::rtl::OUString& rImageName, const Image& rImage )
+void ImageList::ReplaceImage( const OUString& rImageName, const Image& rImage )
{
const sal_uInt16 nId = ImplGetImageId( rImageName );
@@ -577,7 +577,7 @@ Image ImageList::GetImage( sal_uInt16 nId ) const
return aRet;
}
-Image ImageList::GetImage( const ::rtl::OUString& rImageName ) const
+Image ImageList::GetImage( const OUString& rImageName ) const
{
if( mpImplData )
{
@@ -622,7 +622,7 @@ bool ImageList::HasImageAtPos( sal_uInt16 nId ) const
return GetImagePos( nId ) != IMAGELIST_IMAGE_NOTFOUND;
}
-sal_uInt16 ImageList::GetImagePos( const ::rtl::OUString& rImageName ) const
+sal_uInt16 ImageList::GetImagePos( const OUString& rImageName ) const
{
DBG_CHKTHIS( ImageList, NULL );
@@ -648,29 +648,29 @@ sal_uInt16 ImageList::GetImageId( sal_uInt16 nPos ) const
return 0;
}
-::rtl::OUString ImageList::GetImageName( sal_uInt16 nPos ) const
+OUString ImageList::GetImageName( sal_uInt16 nPos ) const
{
DBG_CHKTHIS( ImageList, NULL );
if( mpImplData && (nPos < GetImageCount()) )
return mpImplData->maImages[ nPos ]->maName;
- return ::rtl::OUString();
+ return OUString();
}
-void ImageList::GetImageNames( ::std::vector< ::rtl::OUString >& rNames ) const
+void ImageList::GetImageNames( ::std::vector< OUString >& rNames ) const
{
RTL_LOGFILE_CONTEXT( aLog, "vcl: ImageList::GetImageNames" );
DBG_CHKTHIS( ImageList, NULL );
- rNames = ::std::vector< ::rtl::OUString >();
+ rNames = ::std::vector< OUString >();
if( mpImplData )
{
for( sal_uInt32 i = 0; i < mpImplData->maImages.size(); i++ )
{
- const rtl::OUString& rName( mpImplData->maImages[ i ]->maName );
+ const OUString& rName( mpImplData->maImages[ i ]->maName );
if( !rName.isEmpty())
rNames.push_back( rName );
}
diff --git a/vcl/source/gdi/imagerepository.cxx b/vcl/source/gdi/imagerepository.cxx
index b201a263a70a..63aee8a202a0 100644
--- a/vcl/source/gdi/imagerepository.cxx
+++ b/vcl/source/gdi/imagerepository.cxx
@@ -32,9 +32,9 @@ namespace vcl
//= ImageRepository
//====================================================================
//--------------------------------------------------------------------
- bool ImageRepository::loadImage( const ::rtl::OUString& _rName, BitmapEx& _out_rImage, bool _bSearchLanguageDependent, bool loadMissing )
+ bool ImageRepository::loadImage( const OUString& _rName, BitmapEx& _out_rImage, bool _bSearchLanguageDependent, bool loadMissing )
{
- ::rtl::OUString sCurrentSymbolsStyle = Application::GetSettings().GetStyleSettings().GetCurrentSymbolsStyleName();
+ OUString sCurrentSymbolsStyle = Application::GetSettings().GetStyleSettings().GetCurrentSymbolsStyleName();
ImplImageTreeSingletonRef aImplImageTree;
return aImplImageTree->loadImage( _rName, sCurrentSymbolsStyle, _out_rImage, _bSearchLanguageDependent, loadMissing );
@@ -42,7 +42,7 @@ namespace vcl
bool ImageRepository::loadDefaultImage( BitmapEx& _out_rImage)
{
- ::rtl::OUString sCurrentSymbolsStyle = Application::GetSettings().GetStyleSettings().GetCurrentSymbolsStyleName();
+ OUString sCurrentSymbolsStyle = Application::GetSettings().GetStyleSettings().GetCurrentSymbolsStyleName();
ImplImageTreeSingletonRef aImplImageTree;
return aImplImageTree->loadDefaultImage( sCurrentSymbolsStyle,_out_rImage);
}
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index 2e90cf7d29a2..d980fc5f09c4 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -368,7 +368,7 @@ void ImpGraphic::ImplClear()
::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(),
comphelper::getProcessComponentContext() );
- aCnt.executeCommand( ::rtl::OUString("delete"),
+ aCnt.executeCommand( OUString("delete"),
::com::sun::star::uno::makeAny( sal_Bool( sal_True ) ) );
}
catch( const ::com::sun::star::ucb::ContentCreationException& )
@@ -1096,7 +1096,7 @@ sal_Bool ImpGraphic::ImplReadEmbedded( SvStream& rIStm, sal_Bool bSwap )
::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(),
comphelper::getProcessComponentContext() );
- aCnt.executeCommand( ::rtl::OUString("delete"),
+ aCnt.executeCommand( OUString("delete"),
::com::sun::star::uno::makeAny( sal_Bool( sal_True ) ) );
}
catch( const ::com::sun::star::ucb::ContentCreationException& )
@@ -1286,7 +1286,7 @@ sal_Bool ImpGraphic::ImplSwapOut()
::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(),
comphelper::getProcessComponentContext() );
- aCnt.executeCommand( ::rtl::OUString("delete"),
+ aCnt.executeCommand( OUString("delete"),
::com::sun::star::uno::makeAny( sal_Bool( sal_True ) ) );
}
catch( const ::com::sun::star::ucb::ContentCreationException& )
@@ -1392,7 +1392,7 @@ sal_Bool ImpGraphic::ImplSwapIn()
::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(),
comphelper::getProcessComponentContext() );
- aCnt.executeCommand( ::rtl::OUString("delete"),
+ aCnt.executeCommand( OUString("delete"),
::com::sun::star::uno::makeAny( sal_Bool( sal_True ) ) );
}
catch( const ::com::sun::star::ucb::ContentCreationException& )
@@ -1655,7 +1655,7 @@ SvStream& operator>>( SvStream& rIStm, ImpGraphic& rImpGraphic )
if(mnSvgDataArrayLength)
{
SvgDataArray aNewData(new sal_uInt8[mnSvgDataArrayLength]);
- rtl::OUString aPath;
+ OUString aPath;
rIStm.Read(aNewData.get(), mnSvgDataArrayLength);
aPath = rIStm.ReadUniOrByteString(rIStm.GetStreamCharSet());
@@ -1666,7 +1666,7 @@ SvStream& operator>>( SvStream& rIStm, ImpGraphic& rImpGraphic )
new SvgData(
aNewData,
mnSvgDataArrayLength,
- rtl::OUString(aPath)));
+ OUString(aPath)));
rImpGraphic = aSvgDataPtr;
}
diff --git a/vcl/source/gdi/impimage.cxx b/vcl/source/gdi/impimage.cxx
index 7bb76da3f510..f61a34588f27 100644
--- a/vcl/source/gdi/impimage.cxx
+++ b/vcl/source/gdi/impimage.cxx
@@ -38,7 +38,7 @@ ImageAryData::ImageAryData( const ImageAryData& rData ) :
{
}
-ImageAryData::ImageAryData( const rtl::OUString &aName,
+ImageAryData::ImageAryData( const OUString &aName,
sal_uInt16 nId, const BitmapEx &aBitmap )
: maName( aName ), mnId( nId ), maBitmapEx( aBitmap )
{
@@ -82,7 +82,7 @@ ImplImageList::~ImplImageList()
delete *aIt;
}
-void ImplImageList::AddImage( const ::rtl::OUString &aName,
+void ImplImageList::AddImage( const OUString &aName,
sal_uInt16 nId, const BitmapEx &aBitmapEx )
{
ImageAryData *pImg = new ImageAryData( aName, nId, aBitmapEx );
diff --git a/vcl/source/gdi/impimagetree.cxx b/vcl/source/gdi/impimagetree.cxx
index 4b4cc078558a..29f3e7a1e2a9 100644
--- a/vcl/source/gdi/impimagetree.cxx
+++ b/vcl/source/gdi/impimagetree.cxx
@@ -63,10 +63,10 @@
namespace {
-rtl::OUString createPath(
- rtl::OUString const & name, sal_Int32 pos, rtl::OUString const & locale)
+OUString createPath(
+ OUString const & name, sal_Int32 pos, OUString const & locale)
{
- rtl::OUStringBuffer b(name.copy(0, pos + 1));
+ OUStringBuffer b(name.copy(0, pos + 1));
b.append(locale);
b.append(name.copy(pos));
return b.makeStringAndClear();
@@ -94,7 +94,7 @@ boost::shared_ptr< SvStream > wrapFile(osl::File & file)
void loadFromFile(
osl::File & file,
- rtl::OUString const & path, BitmapEx & bitmap)
+ OUString const & path, BitmapEx & bitmap)
{
boost::shared_ptr< SvStream > s(wrapFile(file));
if (path.endsWith(".png"))
@@ -131,7 +131,7 @@ boost::shared_ptr< SvStream > wrapStream(
void loadFromStream(
css::uno::Reference< css::io::XInputStream > const & stream,
- rtl::OUString const & path, BitmapEx & bitmap)
+ OUString const & path, BitmapEx & bitmap)
{
boost::shared_ptr< SvStream > s(wrapStream(stream));
if (path.endsWith(".png"))
@@ -150,7 +150,7 @@ ImplImageTree::ImplImageTree() { m_cacheIcons = true; }
ImplImageTree::~ImplImageTree() {}
-bool ImplImageTree::checkStyle(rtl::OUString const & style)
+bool ImplImageTree::checkStyle(OUString const & style)
{
bool exists;
@@ -163,9 +163,9 @@ bool ImplImageTree::checkStyle(rtl::OUString const & style)
setStyle(style);
exists = false;
- const rtl::OUString sBrandURLSuffix("_brand");
+ const OUString sBrandURLSuffix("_brand");
for (Paths::iterator i(m_paths.begin()); i != m_paths.end() && !exists; ++i) {
- ::rtl::OUString aURL = i->first;
+ OUString aURL = i->first;
sal_Int32 nFromIndex = aURL.getLength() - sBrandURLSuffix.getLength();
// skip brand-specific icon themes; they are incomplete and thus not useful for this check
if (nFromIndex < 0 || !aURL.match(sBrandURLSuffix, nFromIndex)) {
@@ -190,7 +190,7 @@ bool ImplImageTree::checkStyle(rtl::OUString const & style)
}
bool ImplImageTree::loadImage(
- rtl::OUString const & name, rtl::OUString const & style, BitmapEx & bitmap,
+ OUString const & name, OUString const & style, BitmapEx & bitmap,
bool localized, bool loadMissing )
{
bool found = false;
@@ -210,17 +210,17 @@ bool ImplImageTree::loadImage(
}
bool ImplImageTree::loadDefaultImage(
- rtl::OUString const & style,
+ OUString const & style,
BitmapEx& bitmap)
{
return doLoadImage(
- rtl::OUString("res/grafikde.png"),
+ OUString("res/grafikde.png"),
style, bitmap, false);
}
bool ImplImageTree::doLoadImage(
- rtl::OUString const & name, rtl::OUString const & style, BitmapEx & bitmap,
+ OUString const & name, OUString const & style, BitmapEx & bitmap,
bool localized)
{
setStyle(style);
@@ -230,7 +230,7 @@ bool ImplImageTree::doLoadImage(
if (!bitmap.IsEmpty()) {
bitmap.SetEmpty();
}
- std::vector< rtl::OUString > paths;
+ std::vector< OUString > paths;
paths.push_back(name);
if (localized) {
sal_Int32 pos = name.lastIndexOf('/');
@@ -240,10 +240,10 @@ bool ImplImageTree::doLoadImage(
Application::GetSettings().GetUILanguageTag().getLocale();
paths.push_back(createPath(name, pos, loc.Language));
if (!loc.Country.isEmpty()) {
- rtl::OUStringBuffer b(loc.Language);
+ OUStringBuffer b(loc.Language);
b.append(sal_Unicode('-'));
b.append(loc.Country);
- rtl::OUString p(createPath(name, pos, b.makeStringAndClear()));
+ OUString p(createPath(name, pos, b.makeStringAndClear()));
paths.push_back(p);
if (!loc.Variant.isEmpty()) {
b.append(p);
@@ -270,14 +270,14 @@ bool ImplImageTree::doLoadImage(
}
void ImplImageTree::shutDown() {
- m_style = rtl::OUString();
+ m_style = OUString();
// for safety; empty m_style means "not initialized"
m_paths.clear();
m_iconCache.clear();
m_checkStyleCache.clear();
}
-void ImplImageTree::setStyle(rtl::OUString const & style) {
+void ImplImageTree::setStyle(OUString const & style) {
OSL_ASSERT(!style.isEmpty()); // empty m_style means "not initialized"
if (style != m_style) {
m_style = style;
@@ -289,7 +289,7 @@ void ImplImageTree::setStyle(rtl::OUString const & style) {
void ImplImageTree::resetPaths() {
m_paths.clear();
{
- rtl::OUString url(
+ OUString url(
"$BRAND_BASE_DIR/program/edition/images");
rtl::Bootstrap::expandMacros(url);
INetURLObject u(url);
@@ -300,12 +300,12 @@ void ImplImageTree::resetPaths() {
css::uno::Reference< css::container::XNameAccess >()));
}
{
- rtl::OUString url(
+ OUString url(
"$BRAND_BASE_DIR/share/config");
rtl::Bootstrap::expandMacros(url);
INetURLObject u(url);
OSL_ASSERT(!u.HasError());
- rtl::OUStringBuffer b;
+ OUStringBuffer b;
b.appendAscii("images_");
b.append(m_style);
b.appendAscii("_brand");
@@ -317,19 +317,19 @@ void ImplImageTree::resetPaths() {
css::uno::Reference< css::container::XNameAccess >()));
}
{
- rtl::OUString url( "$BRAND_BASE_DIR/share/config/images_brand");
+ OUString url( "$BRAND_BASE_DIR/share/config/images_brand");
rtl::Bootstrap::expandMacros(url);
m_paths.push_back(
std::make_pair(
url, css::uno::Reference< css::container::XNameAccess >()));
}
{
- rtl::OUString url(
+ OUString url(
"$BRAND_BASE_DIR/share/config");
rtl::Bootstrap::expandMacros(url);
INetURLObject u(url);
OSL_ASSERT(!u.HasError());
- rtl::OUStringBuffer b;
+ OUStringBuffer b;
b.appendAscii("images_");
b.append(m_style);
bool ok = u.Append(b.makeStringAndClear(), INetURLObject::ENCODE_ALL);
@@ -341,7 +341,7 @@ void ImplImageTree::resetPaths() {
}
if ( m_style == "default" )
{
- rtl::OUString url( "$BRAND_BASE_DIR/share/config/images");
+ OUString url( "$BRAND_BASE_DIR/share/config/images");
rtl::Bootstrap::expandMacros(url);
m_paths.push_back(
std::make_pair(
@@ -350,7 +350,7 @@ void ImplImageTree::resetPaths() {
}
bool ImplImageTree::checkStyleCacheLookup(
- rtl::OUString const & style, bool &exists)
+ OUString const & style, bool &exists)
{
CheckStyleCache::iterator i(m_checkStyleCache.find(style));
if (i != m_checkStyleCache.end()) {
@@ -362,7 +362,7 @@ bool ImplImageTree::checkStyleCacheLookup(
}
bool ImplImageTree::iconCacheLookup(
- rtl::OUString const & name, bool localized, BitmapEx & bitmap)
+ OUString const & name, bool localized, BitmapEx & bitmap)
{
IconCache::iterator i(m_iconCache.find(name));
if (i != m_iconCache.end() && i->second.first == localized) {
@@ -374,11 +374,11 @@ bool ImplImageTree::iconCacheLookup(
}
bool ImplImageTree::find(
- std::vector< rtl::OUString > const & paths, BitmapEx & bitmap)
+ std::vector< OUString > const & paths, BitmapEx & bitmap)
{
if (!m_cacheIcons) {
for (Paths::iterator i(m_paths.begin()); i != m_paths.end(); ++i) {
- for (std::vector< rtl::OUString >::const_reverse_iterator j(
+ for (std::vector< OUString >::const_reverse_iterator j(
paths.rbegin());
j != paths.rend(); ++j)
{
@@ -399,7 +399,7 @@ bool ImplImageTree::find(
try {
i->second.set(
comphelper::getProcessServiceFactory()->createInstanceWithArguments(
- rtl::OUString( "com.sun.star.packages.zip.ZipFileAccess"),
+ OUString( "com.sun.star.packages.zip.ZipFileAccess"),
args),
css::uno::UNO_QUERY_THROW);
} catch (css::uno::RuntimeException &) {
@@ -411,7 +411,7 @@ bool ImplImageTree::find(
continue;
}
}
- for (std::vector< rtl::OUString >::const_reverse_iterator j(
+ for (std::vector< OUString >::const_reverse_iterator j(
paths.rbegin());
j != paths.rend(); ++j)
{
diff --git a/vcl/source/gdi/jobset.cxx b/vcl/source/gdi/jobset.cxx
index 9b9b960c5cba..9ec7cf07f743 100644
--- a/vcl/source/gdi/jobset.cxx
+++ b/vcl/source/gdi/jobset.cxx
@@ -150,23 +150,23 @@ JobSetup::~JobSetup()
}
}
-rtl::OUString JobSetup::GetPrinterName() const
+OUString JobSetup::GetPrinterName() const
{
if ( mpData )
return mpData->maPrinterName;
else
- return rtl::OUString();
+ return OUString();
}
-rtl::OUString JobSetup::GetDriverName() const
+OUString JobSetup::GetDriverName() const
{
if ( mpData )
return mpData->maDriver;
else
- return rtl::OUString();
+ return OUString();
}
-void JobSetup::SetValue( const rtl::OUString& rKey, const rtl::OUString& rValue )
+void JobSetup::SetValue( const OUString& rKey, const OUString& rValue )
{
if( ! mpData )
mpData = new ImplJobSetup();
@@ -349,9 +349,9 @@ SvStream& operator<<( SvStream& rOStream, const JobSetup& rJobSetup )
ImplOldJobSetupData aOldData;
memset( &aOldData, 0, sizeof( aOldData ) );
- rtl::OString aPrnByteName(rtl::OUStringToOString(rJobSetup.GetPrinterName(), RTL_TEXTENCODING_UTF8));
+ OString aPrnByteName(OUStringToOString(rJobSetup.GetPrinterName(), RTL_TEXTENCODING_UTF8));
strncpy( aOldData.cPrinterName, aPrnByteName.getStr(), 63 );
- rtl::OString aDriverByteName(rtl::OUStringToOString(rJobSetup.GetDriverName(), RTL_TEXTENCODING_UTF8));
+ OString aDriverByteName(OUStringToOString(rJobSetup.GetDriverName(), RTL_TEXTENCODING_UTF8));
strncpy( aOldData.cDriverName, aDriverByteName.getStr(), 31 );
// nLen = sizeof( aOldData ) + 4 + nOldJobDataSize + pJobData->mnDriverDataLen;
int nPos = rOStream.Tell();
@@ -360,7 +360,7 @@ SvStream& operator<<( SvStream& rOStream, const JobSetup& rJobSetup )
rOStream.Write( (char*)&aOldData, sizeof( aOldData ) );
rOStream.Write( (char*)&aOldJobData, nOldJobDataSize );
rOStream.Write( (char*)pJobData->mpDriverData, pJobData->mnDriverDataLen );
- ::boost::unordered_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash >::const_iterator it;
+ ::boost::unordered_map< OUString, OUString, OUStringHash >::const_iterator it;
for( it = pJobData->maValueMap.begin(); it != pJobData->maValueMap.end(); ++it )
{
write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOStream, it->first, RTL_TEXTENCODING_UTF8);
diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx
index c9c5e086e170..ef702cc969cd 100644
--- a/vcl/source/gdi/metaact.cxx
+++ b/vcl/source/gdi/metaact.cxx
@@ -1181,7 +1181,7 @@ IMPL_META_ACTION( Text, META_TEXT_ACTION )
// ------------------------------------------------------------------------
-MetaTextAction::MetaTextAction( const Point& rPt, const rtl::OUString& rStr,
+MetaTextAction::MetaTextAction( const Point& rPt, const OUString& rStr,
sal_uInt16 nIndex, sal_uInt16 nLen ) :
MetaAction ( META_TEXT_ACTION ),
maPt ( rPt ),
@@ -1291,7 +1291,7 @@ MetaTextArrayAction::MetaTextArrayAction( const MetaTextArrayAction& rAction ) :
// ------------------------------------------------------------------------
MetaTextArrayAction::MetaTextArrayAction( const Point& rStartPt,
- const rtl::OUString& rStr,
+ const OUString& rStr,
const sal_Int32* pDXAry,
sal_uInt16 nIndex,
sal_uInt16 nLen ) :
@@ -1452,7 +1452,7 @@ IMPL_META_ACTION( StretchText, META_STRETCHTEXT_ACTION )
// ------------------------------------------------------------------------
MetaStretchTextAction::MetaStretchTextAction( const Point& rPt, sal_uInt32 nWidth,
- const rtl::OUString& rStr,
+ const OUString& rStr,
sal_uInt16 nIndex, sal_uInt16 nLen ) :
MetaAction ( META_STRETCHTEXT_ACTION ),
maPt ( rPt ),
@@ -1541,7 +1541,7 @@ IMPL_META_ACTION( TextRect, META_TEXTRECT_ACTION )
// ------------------------------------------------------------------------
MetaTextRectAction::MetaTextRectAction( const Rectangle& rRect,
- const rtl::OUString& rStr, sal_uInt16 nStyle ) :
+ const OUString& rStr, sal_uInt16 nStyle ) :
MetaAction ( META_TEXTRECT_ACTION ),
maRect ( rRect ),
maStr ( rStr ),
@@ -3956,7 +3956,7 @@ MetaCommentAction::MetaCommentAction( const MetaCommentAction& rAct ) :
// ------------------------------------------------------------------------
-MetaCommentAction::MetaCommentAction( const rtl::OString& rComment, sal_Int32 nValue, const sal_uInt8* pData, sal_uInt32 nDataSize ) :
+MetaCommentAction::MetaCommentAction( const OString& rComment, sal_Int32 nValue, const sal_uInt8* pData, sal_uInt32 nDataSize ) :
MetaAction ( META_COMMENT_ACTION ),
maComment ( rComment ),
mnValue ( nValue )
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index cfe02e9ea513..e47acb0afa66 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -1283,7 +1283,7 @@ void ImplDevFontList::InitGenericGlyphFallback( void ) const
}
ImplDevFontListData* ImplDevFontList::GetGlyphFallbackFont( FontSelectPattern& rFontSelData,
- rtl::OUString& rMissingCodes, int nFallbackLevel ) const
+ OUString& rMissingCodes, int nFallbackLevel ) const
{
ImplDevFontListData* pFallbackData = NULL;
@@ -1318,11 +1318,11 @@ ImplDevFontListData* ImplDevFontList::GetGlyphFallbackFont( FontSelectPattern& r
if( !bCached || (rFontSelData.maSearchName != aFontName) )
pRemainingCodes[ nRemainingLength++ ] = cChar;
}
- rMissingCodes = rtl::OUString( pRemainingCodes, nRemainingLength );
+ rMissingCodes = OUString( pRemainingCodes, nRemainingLength );
}
else
{
- rtl::OUString aOldMissingCodes = rMissingCodes;
+ OUString aOldMissingCodes = rMissingCodes;
// call the hook to query the best matching glyph fallback font
if( mpFallbackHook->FindFontSubstitute( rFontSelData, rMissingCodes ) )
// apply outdev3.cxx specific fontname normalization
@@ -1417,8 +1417,8 @@ ImplDevFontListData* ImplDevFontList::ImplFindBySearchName( const OUString& rSea
return pFoundData;
}
-ImplDevFontListData* ImplDevFontList::ImplFindByAliasName(const rtl::OUString& rSearchName,
- const rtl::OUString& rShortName) const
+ImplDevFontListData* ImplDevFontList::ImplFindByAliasName(const OUString& rSearchName,
+ const OUString& rShortName) const
{
// short circuit for impossible font name alias
if (rSearchName.isEmpty())
@@ -1462,7 +1462,7 @@ ImplDevFontListData* ImplDevFontList::FindFontFamily( const String& rFontName )
return pFound;
}
-ImplDevFontListData* ImplDevFontList::ImplFindByTokenNames(const rtl::OUString& rTokenStr) const
+ImplDevFontListData* ImplDevFontList::ImplFindByTokenNames(const OUString& rTokenStr) const
{
ImplDevFontListData* pFoundData = NULL;
@@ -1536,7 +1536,7 @@ void ImplDevFontList::InitMatchData() const
ImplDevFontListData* ImplDevFontList::ImplFindByAttributes( sal_uLong nSearchType,
FontWeight eSearchWeight, FontWidth eSearchWidth,
- FontItalic eSearchItalic, const rtl::OUString& rSearchFamilyName ) const
+ FontItalic eSearchItalic, const OUString& rSearchFamilyName ) const
{
if( (eSearchItalic != ITALIC_NONE) && (eSearchItalic != ITALIC_DONTKNOW) )
nSearchType |= IMPL_FONT_ATTR_ITALIC;
@@ -2316,7 +2316,7 @@ ImplFontEntry* ImplFontCache::GetFontEntry( ImplDevFontList* pFontList,
namespace
{
- rtl::OUString stripCharSetFromName(rtl::OUString aName)
+ OUString stripCharSetFromName(OUString aName)
{
//I worry that someone will have a font which *does* have
//e.g. "Greek" legitimately at the end of its name :-(
@@ -2439,7 +2439,7 @@ ImplDevFontListData* ImplDevFontList::ImplFindByFont( FontSelectPattern& rFSD,
//Win 3.1/Win95 style fontnames which attempt to put the
//charset encoding into the filename
//http://www.webcenter.ru/~kazarn/eng/fonts_ttf.htm
- rtl::OUString sStrippedName = stripCharSetFromName(rFSD.maTargetName);
+ OUString sStrippedName = stripCharSetFromName(rFSD.maTargetName);
if (!sStrippedName.equals(rFSD.maTargetName))
{
rFSD.maTargetName = sStrippedName;
@@ -2672,7 +2672,7 @@ ImplDevFontListData* ImplDevFontList::ImplFindByFont( FontSelectPattern& rFSD,
}
ImplFontEntry* ImplFontCache::GetGlyphFallbackFont( ImplDevFontList* pFontList,
- FontSelectPattern& rFontSelData, int nFallbackLevel, rtl::OUString& rMissingCodes )
+ FontSelectPattern& rFontSelData, int nFallbackLevel, OUString& rMissingCodes )
{
// get a candidate font for glyph fallback
// unless the previously selected font got a device specific substitution
@@ -3938,7 +3938,7 @@ void OutputDevice::ImplDrawStrikeoutChar( long nBaseX, long nBaseY,
sal_Unicode aChars[nMaxStrikeStrLen+1]; // +1 for valgrind...
for( int i = 0; i < nTestStrLen; ++i)
aChars[i] = cStrikeoutChar;
- const rtl::OUString aStrikeoutTest(aChars, nTestStrLen);
+ const OUString aStrikeoutTest(aChars, nTestStrLen);
// calculate approximation of strikeout atom size
long nStrikeoutWidth = 0;
@@ -3958,7 +3958,7 @@ void OutputDevice::ImplDrawStrikeoutChar( long nBaseX, long nBaseY,
// build the strikeout string
for( int i = nTestStrLen; i < nStrikeStrLen; ++i)
aChars[i] = cStrikeoutChar;
- const rtl::OUString aStrikeoutText(aChars, nStrikeStrLen);
+ const OUString aStrikeoutText(aChars, nStrikeStrLen);
if( mpFontEntry->mnOrientation )
ImplRotatePos( 0, 0, nDistX, nDistY, mpFontEntry->mnOrientation );
@@ -4699,7 +4699,7 @@ long OutputDevice::ImplGetTextLines( ImplMultiTextLineInfo& rLineInfo,
rLineInfo.Clear();
if ( !rStr.isEmpty() && (nWidth > 0) )
{
- ::rtl::OUString aText( rStr );
+ OUString aText( rStr );
uno::Reference < i18n::XBreakIterator > xBI;
// get service provider
uno::Reference< uno::XComponentContext > xContext( comphelper::getProcessComponentContext() );
@@ -5992,11 +5992,11 @@ SalLayout* OutputDevice::ImplGlyphFallbackLayout( SalLayout* pSalLayout, ImplLay
// get list of unicodes that need glyph fallback
int nCharPos = -1;
bool bRTL = false;
- rtl::OUStringBuffer aMissingCodeBuf;
+ OUStringBuffer aMissingCodeBuf;
while( rLayoutArgs.GetNextPos( &nCharPos, &bRTL) )
aMissingCodeBuf.append( rLayoutArgs.mpStr[ nCharPos ] );
rLayoutArgs.ResetPos();
- rtl::OUString aMissingCodes = aMissingCodeBuf.makeStringAndClear();
+ OUString aMissingCodes = aMissingCodeBuf.makeStringAndClear();
FontSelectPattern aFontSelData = mpFontEntry->maFontSelData;
@@ -6142,7 +6142,7 @@ xub_StrLen OutputDevice::GetTextBreak( const OUString& rStr, long nTextWidth,
xub_StrLen nRetVal = sal::static_int_cast<xub_StrLen>(pSalLayout->GetTextBreak( nTextPixelWidth, nExtraPixelWidth, nSubPixelFactor ));
// calculate hyphenated break position
- rtl::OUString aHyphenatorStr(nHyphenatorChar);
+ OUString aHyphenatorStr(nHyphenatorChar);
sal_Int32 nTempLen = 1;
SalLayout* pHyphenatorLayout = ImplLayout( aHyphenatorStr, 0, nTempLen );
if( pHyphenatorLayout )
@@ -6712,8 +6712,8 @@ OUString OutputDevice::ImplGetEllipsisString( const OutputDevice& rTargetDevice,
}
else if ( nStyle & TEXT_DRAW_PATHELLIPSIS )
{
- rtl::OUString aPath( rOrigStr );
- rtl::OUString aAbbreviatedPath;
+ OUString aPath( rOrigStr );
+ OUString aAbbreviatedPath;
osl_abbreviateSystemPath( aPath.pData, &aAbbreviatedPath.pData, nIndex, NULL );
aStr = aAbbreviatedPath;
}
diff --git a/vcl/source/gdi/outdev6.cxx b/vcl/source/gdi/outdev6.cxx
index 685f33e9f506..8e9535bece34 100644
--- a/vcl/source/gdi/outdev6.cxx
+++ b/vcl/source/gdi/outdev6.cxx
@@ -1126,7 +1126,7 @@ void OutputDevice::Erase()
if( pWindow->IsEnabled() ) nState |= CTRL_STATE_ENABLED;
bNativeOK = pWindow->DrawNativeControl( CTRL_WINDOW_BACKGROUND, aCtrlPart, aCtrlRegion,
- nState, aControlValue, rtl::OUString() );
+ nState, aControlValue, OUString() );
}
}
diff --git a/vcl/source/gdi/outdevnative.cxx b/vcl/source/gdi/outdevnative.cxx
index 449af1b598f0..4727ba6dedef 100644
--- a/vcl/source/gdi/outdevnative.cxx
+++ b/vcl/source/gdi/outdevnative.cxx
@@ -268,7 +268,7 @@ sal_Bool OutputDevice::DrawNativeControl( ControlType nType,
const Rectangle& rControlRegion,
ControlState nState,
const ImplControlValue& aValue,
- ::rtl::OUString aCaption )
+ OUString aCaption )
{
if( !lcl_enableNativeWidget( *this ) )
return sal_False;
@@ -310,7 +310,7 @@ sal_Bool OutputDevice::GetNativeControlRegion( ControlType nType,
const Rectangle& rControlRegion,
ControlState nState,
const ImplControlValue& aValue,
- ::rtl::OUString aCaption,
+ OUString aCaption,
Rectangle &rNativeBoundingRegion,
Rectangle &rNativeContentRegion ) const
{
diff --git a/vcl/source/gdi/pdfextoutdevdata.cxx b/vcl/source/gdi/pdfextoutdevdata.cxx
index 45eb7ed3de70..9895867062b4 100644
--- a/vcl/source/gdi/pdfextoutdevdata.cxx
+++ b/vcl/source/gdi/pdfextoutdevdata.cxx
@@ -81,7 +81,7 @@ struct SAL_DLLPRIVATE GlobalSyncData
std::deque< Rectangle > mParaRects;
std::deque< sal_Int32 > mParaInts;
std::deque< sal_uInt32 > mParauInts;
- std::deque< rtl::OUString > mParaOUStrings;
+ std::deque< OUString > mParaOUStrings;
std::deque< PDFWriter::DestAreaType > mParaDestAreaTypes;
std::deque< PDFNote > mParaPDFNotes;
std::deque< PDFWriter::PageTransition > mParaPageTransitions;
@@ -290,7 +290,7 @@ struct SAL_DLLPRIVATE PageSyncData
std::deque< PDFExtOutDevDataSync > mActions;
std::deque< Rectangle > mParaRects;
std::deque< sal_Int32 > mParaInts;
- std::deque< rtl::OUString > mParaOUStrings;
+ std::deque< OUString > mParaOUStrings;
std::deque< PDFWriter::StructElement > mParaStructElements;
std::deque< PDFWriter::StructAttribute > mParaStructAttributes;
std::deque< PDFWriter::StructAttributeValue > mParaStructAttributeValues;
@@ -691,14 +691,14 @@ sal_Int32 PDFExtOutDevData::SetLinkDest( sal_Int32 nLinkId, sal_Int32 nDestId )
mpGlobalSyncData->mParaInts.push_back( nDestId );
return 0;
}
-sal_Int32 PDFExtOutDevData::SetLinkURL( sal_Int32 nLinkId, const rtl::OUString& rURL )
+sal_Int32 PDFExtOutDevData::SetLinkURL( sal_Int32 nLinkId, const OUString& rURL )
{
mpGlobalSyncData->mActions.push_back( PDFExtOutDevDataSync::SetLinkURL );
mpGlobalSyncData->mParaInts.push_back( nLinkId );
mpGlobalSyncData->mParaOUStrings.push_back( rURL );
return 0;
}
-sal_Int32 PDFExtOutDevData::CreateOutlineItem( sal_Int32 nParent, const rtl::OUString& rText, sal_Int32 nDestID )
+sal_Int32 PDFExtOutDevData::CreateOutlineItem( sal_Int32 nParent, const OUString& rText, sal_Int32 nDestID )
{
mpGlobalSyncData->mActions.push_back( PDFExtOutDevDataSync::CreateOutlineItem );
mpGlobalSyncData->mParaInts.push_back( nParent );
@@ -724,7 +724,7 @@ void PDFExtOutDevData::SetPageTransition( PDFWriter::PageTransition eType, sal_u
/* local (page), actions have to be played synchroniously to the actions of
of the recorded metafile (created by each xRenderable->render()) */
- sal_Int32 PDFExtOutDevData::BeginStructureElement( PDFWriter::StructElement eType, const rtl::OUString& rAlias )
+ sal_Int32 PDFExtOutDevData::BeginStructureElement( PDFWriter::StructElement eType, const OUString& rAlias )
{
mpPageSyncData->PushAction( mrOutDev, PDFExtOutDevDataSync::BeginStructureElement );
mpPageSyncData->mParaStructElements.push_back( eType );
diff --git a/vcl/source/gdi/pdfwriter.cxx b/vcl/source/gdi/pdfwriter.cxx
index 855e844caa1b..21ed0cc8e664 100644
--- a/vcl/source/gdi/pdfwriter.cxx
+++ b/vcl/source/gdi/pdfwriter.cxx
@@ -326,7 +326,7 @@ sal_Int32 PDFWriter::RegisterDestReference( sal_Int32 nDestId, const Rectangle&
return pImplementation->registerDestReference( nDestId, rRect, nPageNr, eType );
}
//--->i56629
-sal_Int32 PDFWriter::CreateNamedDest( const rtl::OUString& sDestName, const Rectangle& rRect, sal_Int32 nPageNr, PDFWriter::DestAreaType eType )
+sal_Int32 PDFWriter::CreateNamedDest( const OUString& sDestName, const Rectangle& rRect, sal_Int32 nPageNr, PDFWriter::DestAreaType eType )
{
return pImplementation->createNamedDest( sDestName, rRect, nPageNr, eType );
}
@@ -340,7 +340,7 @@ sal_Int32 PDFWriter::SetLinkDest( sal_Int32 nLinkId, sal_Int32 nDestId )
return pImplementation->setLinkDest( nLinkId, nDestId );
}
-sal_Int32 PDFWriter::SetLinkURL( sal_Int32 nLinkId, const rtl::OUString& rURL )
+sal_Int32 PDFWriter::SetLinkURL( sal_Int32 nLinkId, const OUString& rURL )
{
return pImplementation->setLinkURL( nLinkId, rURL );
}
@@ -350,7 +350,7 @@ void PDFWriter::SetLinkPropertyID( sal_Int32 nLinkId, sal_Int32 nPropertyId )
pImplementation->setLinkPropertyId( nLinkId, nPropertyId );
}
-sal_Int32 PDFWriter::CreateOutlineItem( sal_Int32 nParent, const rtl::OUString& rText, sal_Int32 nDestID )
+sal_Int32 PDFWriter::CreateOutlineItem( sal_Int32 nParent, const OUString& rText, sal_Int32 nDestID )
{
return pImplementation->createOutlineItem( nParent, rText, nDestID );
}
@@ -360,7 +360,7 @@ sal_Int32 PDFWriter::SetOutlineItemParent( sal_Int32 nItem, sal_Int32 nNewParent
return pImplementation->setOutlineItemParent( nItem, nNewParent );
}
-sal_Int32 PDFWriter::SetOutlineItemText( sal_Int32 nItem, const rtl::OUString& rText )
+sal_Int32 PDFWriter::SetOutlineItemText( sal_Int32 nItem, const OUString& rText )
{
return pImplementation->setOutlineItemText( nItem, rText );
}
@@ -375,7 +375,7 @@ void PDFWriter::CreateNote( const Rectangle& rRect, const PDFNote& rNote, sal_In
pImplementation->createNote( rRect, rNote, nPageNr );
}
-sal_Int32 PDFWriter::BeginStructureElement( PDFWriter::StructElement eType, const rtl::OUString& rAlias )
+sal_Int32 PDFWriter::BeginStructureElement( PDFWriter::StructElement eType, const OUString& rAlias )
{
return pImplementation->beginStructureElement( eType, rAlias );
}
@@ -445,8 +445,8 @@ std::set< PDFWriter::ErrorCode > PDFWriter::GetErrors()
}
com::sun::star::uno::Reference< com::sun::star::beans::XMaterialHolder >
-PDFWriter::InitEncryption( const rtl::OUString& i_rOwnerPassword,
- const rtl::OUString& i_rUserPassword,
+PDFWriter::InitEncryption( const OUString& i_rOwnerPassword,
+ const OUString& i_rUserPassword,
bool b128Bit
)
{
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index c7cf75b32adf..6eefa3c1b5f7 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -85,13 +85,6 @@
using namespace vcl;
-using ::rtl::OUString;
-using ::rtl::OUStringToOString;
-using ::rtl::OString;
-using ::rtl::OStringHash;
-using ::rtl::OUStringHash;
-using ::rtl::OStringBuffer;
-using ::rtl::OUStringBuffer;
#if (OSL_DEBUG_LEVEL < 3)
#define COMPRESS_PAGES
@@ -129,9 +122,9 @@ void PDFTestOutputStream::write( const com::sun::star::uno::Reference< com::sun:
void doTestCode()
{
static const char* pHome = getenv( "HOME" );
- rtl::OUString aTestFile( "file://" );
- aTestFile += rtl::OUString( pHome, strlen( pHome ), RTL_TEXTENCODING_MS_1252 );
- aTestFile += rtl::OUString( "/pdf_export_test.pdf" );
+ OUString aTestFile( "file://" );
+ aTestFile += OUString( pHome, strlen( pHome ), RTL_TEXTENCODING_MS_1252 );
+ aTestFile += OUString( "/pdf_export_test.pdf" );
PDFWriter::PDFWriterContext aContext;
aContext.URL = aTestFile;
@@ -620,7 +613,7 @@ static void appendLiteralString( const sal_Char* pStr, sal_Int32 nLength, OStrin
* Fhurter limitation: it is advisable to use standard ASCII characters for
* OOo bookmarks.
*/
-static void appendDestinationName( const rtl::OUString& rString, OStringBuffer& rBuffer )
+static void appendDestinationName( const OUString& rString, OStringBuffer& rBuffer )
{
const sal_Unicode* pStr = rString.getStr();
sal_Int32 nLen = rString.getLength();
@@ -645,7 +638,7 @@ static void appendDestinationName( const rtl::OUString& rString, OStringBuffer&
}
//<--- i56629
-static void appendUnicodeTextString( const rtl::OUString& rString, OStringBuffer& rBuffer )
+static void appendUnicodeTextString( const OUString& rString, OStringBuffer& rBuffer )
{
rBuffer.append( "FEFF" );
const sal_Unicode* pStr = rString.getStr();
@@ -700,7 +693,7 @@ void PDFWriterImpl::createWidgetFieldName( sal_Int32 i_nWidgetIndex, const PDFWr
// find or create a hierarchical field
// first find the fully qualified name up to this field
aDomain = aFullName.copy( 0, nTokenIndex-1 );
- boost::unordered_map< rtl::OString, sal_Int32, rtl::OStringHash >::const_iterator it = m_aFieldNameMap.find( aDomain );
+ boost::unordered_map< OString, sal_Int32, OStringHash >::const_iterator it = m_aFieldNameMap.find( aDomain );
if( it == m_aFieldNameMap.end() )
{
// create new hierarchy field
@@ -761,7 +754,7 @@ void PDFWriterImpl::createWidgetFieldName( sal_Int32 i_nWidgetIndex, const PDFWr
// insert widget into its hierarchy field
if( !aDomain.isEmpty() )
{
- boost::unordered_map< rtl::OString, sal_Int32, rtl::OStringHash >::const_iterator it = m_aFieldNameMap.find( aDomain );
+ boost::unordered_map< OString, sal_Int32, OStringHash >::const_iterator it = m_aFieldNameMap.find( aDomain );
if( it != m_aFieldNameMap.end() )
{
OSL_ENSURE( it->second >= 0 && it->second < sal_Int32( m_aWidgets.size() ), "invalid field index" );
@@ -1874,14 +1867,14 @@ void PDFWriterImpl::setupDocInfo()
void PDFWriterImpl::computeDocumentIdentifier( std::vector< sal_uInt8 >& o_rIdentifier,
const vcl::PDFWriter::PDFDocInfo& i_rDocInfo,
- rtl::OString& o_rCString1,
- rtl::OString& o_rCString2
+ OString& o_rCString1,
+ OString& o_rCString2
)
{
o_rIdentifier.clear();
//build the document id
- rtl::OString aInfoValuesOut;
+ OString aInfoValuesOut;
OStringBuffer aID( 1024 );
if( i_rDocInfo.Title.Len() )
appendUnicodeTextString( i_rDocInfo.Title, aID );
@@ -1901,7 +1894,7 @@ void PDFWriterImpl::computeDocumentIdentifier( std::vector< sal_uInt8 >& o_rIden
osl_getSystemTime( &aGMT );
osl_getLocalTimeFromSystemTime( &aGMT, &aTVal );
osl_getDateTimeFromTimeValue( &aTVal, &aDT );
- rtl::OStringBuffer aCreationDateString(64), aCreationMetaDateString(64);
+ OStringBuffer aCreationDateString(64), aCreationMetaDateString(64);
aCreationDateString.append( "D:" );
aCreationDateString.append( (sal_Char)('0' + ((aDT.Year/1000)%10)) );
aCreationDateString.append( (sal_Char)('0' + ((aDT.Year/100)%10)) );
@@ -2006,7 +1999,7 @@ void PDFWriterImpl::computeDocumentIdentifier( std::vector< sal_uInt8 >& o_rIden
check if the Unicode string must be encrypted or not, perform the requested task,
append the string as unicode hex, encrypted if needed
*/
-inline void PDFWriterImpl::appendUnicodeTextStringEncrypt( const rtl::OUString& rInString, const sal_Int32 nInObjectNumber, OStringBuffer& rOutBuffer )
+inline void PDFWriterImpl::appendUnicodeTextStringEncrypt( const OUString& rInString, const sal_Int32 nInObjectNumber, OStringBuffer& rOutBuffer )
{
rOutBuffer.append( "<" );
if( m_aContext.Encryption.Encrypt() )
@@ -2041,7 +2034,7 @@ inline void PDFWriterImpl::appendUnicodeTextStringEncrypt( const rtl::OUString&
rOutBuffer.append( ">" );
}
-inline void PDFWriterImpl::appendLiteralStringEncrypt( rtl::OStringBuffer& rInString, const sal_Int32 nInObjectNumber, rtl::OStringBuffer& rOutBuffer )
+inline void PDFWriterImpl::appendLiteralStringEncrypt( OStringBuffer& rInString, const sal_Int32 nInObjectNumber, OStringBuffer& rOutBuffer )
{
rOutBuffer.append( "(" );
sal_Int32 nChars = rInString.getLength();
@@ -2058,17 +2051,17 @@ inline void PDFWriterImpl::appendLiteralStringEncrypt( rtl::OStringBuffer& rInSt
rOutBuffer.append( ")" );
}
-inline void PDFWriterImpl::appendLiteralStringEncrypt( const rtl::OString& rInString, const sal_Int32 nInObjectNumber, rtl::OStringBuffer& rOutBuffer )
+inline void PDFWriterImpl::appendLiteralStringEncrypt( const OString& rInString, const sal_Int32 nInObjectNumber, OStringBuffer& rOutBuffer )
{
- rtl::OStringBuffer aBufferString( rInString );
+ OStringBuffer aBufferString( rInString );
appendLiteralStringEncrypt( aBufferString, nInObjectNumber, rOutBuffer);
}
-void PDFWriterImpl::appendLiteralStringEncrypt( const rtl::OUString& rInString, const sal_Int32 nInObjectNumber, rtl::OStringBuffer& rOutBuffer, rtl_TextEncoding nEnc )
+void PDFWriterImpl::appendLiteralStringEncrypt( const OUString& rInString, const sal_Int32 nInObjectNumber, OStringBuffer& rOutBuffer, rtl_TextEncoding nEnc )
{
- rtl::OString aBufferString( rtl::OUStringToOString( rInString, nEnc ) );
+ OString aBufferString( OUStringToOString( rInString, nEnc ) );
sal_Int32 nLen = aBufferString.getLength();
- rtl::OStringBuffer aBuf( nLen );
+ OStringBuffer aBuf( nLen );
const sal_Char* pT = aBufferString.getStr();
for( sal_Int32 i = 0; i < nLen; i++, pT++ )
@@ -2247,8 +2240,8 @@ inline const ImplPdfBuiltinFontData* GetPdfFontData( const PhysicalFontFace* pFo
static ImplDevFontAttributes GetDevFontAttributes( const PDFWriterImpl::BuiltinFont& rBuiltin )
{
ImplDevFontAttributes aDFA;
- aDFA.SetFamilyName( rtl::OUString::createFromAscii( rBuiltin.m_pName ) );
- aDFA.SetStyleName( rtl::OUString::createFromAscii( rBuiltin.m_pStyleName ) );
+ aDFA.SetFamilyName( OUString::createFromAscii( rBuiltin.m_pName ) );
+ aDFA.SetStyleName( OUString::createFromAscii( rBuiltin.m_pStyleName ) );
aDFA.SetFamilyType( rBuiltin.m_eFamily );
aDFA.SetSymbolFlag( rBuiltin.m_eCharSet != RTL_TEXTENCODING_MS_1252 );
aDFA.SetPitch( rBuiltin.m_ePitch );
@@ -2336,7 +2329,7 @@ public:
const PDFWriterImpl::BuiltinFont&,
long nPixelPerEM, int nOrientation );
- void SetText( const rtl::OUString& rText ) { maOrigText = rText; }
+ void SetText( const OUString& rText ) { maOrigText = rText; }
virtual bool LayoutText( ImplLayoutArgs& );
virtual void InitFont() const;
virtual void DrawText( SalGraphics& ) const;
@@ -2361,7 +2354,7 @@ PDFSalLayout::PDFSalLayout( PDFWriterImpl& rPDFWriterImpl,
bool PDFSalLayout::LayoutText( ImplLayoutArgs& rArgs )
{
- const rtl::OUString aText(rArgs.mpStr+rArgs.mnMinCharPos, rArgs.mnEndCharPos-rArgs.mnMinCharPos);
+ const OUString aText(rArgs.mpStr+rArgs.mnMinCharPos, rArgs.mnEndCharPos-rArgs.mnMinCharPos);
SetText( aText );
SetUnitsPerPixel( 1000 );
@@ -3106,7 +3099,7 @@ std::map< sal_Int32, sal_Int32 > PDFWriterImpl::emitSystemFont( const PhysicalFo
}
sal_Int32 nFontDescriptor = 0;
- rtl::OString aSubType( "/Type1" );
+ OString aSubType( "/Type1" );
FontSubsetInfo aInfo;
// fill in dummy values
aInfo.m_nAscent = 1000;
@@ -3136,7 +3129,7 @@ std::map< sal_Int32, sal_Int32 > PDFWriterImpl::emitSystemFont( const PhysicalFo
}
else if( pFont->mbSubsettable )
{
- aSubType = rtl::OString( "/TrueType" );
+ aSubType = OString( "/TrueType" );
Int32Vector aGlyphWidths;
Ucs2UIntMap aUnicodeMap;
m_pReferenceDevice->mpGraphics->GetGlyphWidths( pFont, false, aGlyphWidths, aUnicodeMap );
@@ -3645,7 +3638,7 @@ std::map< sal_Int32, sal_Int32 > PDFWriterImpl::emitEmbeddedFont( const Physical
}
else
{
- rtl::OStringBuffer aErrorComment( 256 );
+ OStringBuffer aErrorComment( 256 );
aErrorComment.append( "GetEmbedFontData failed for font \"" );
aErrorComment.append( OUStringToOString( pFont->GetFamilyName(), RTL_TEXTENCODING_UTF8 ) );
aErrorComment.append( '\"' );
@@ -3732,7 +3725,7 @@ std::map< sal_Int32, sal_Int32 > PDFWriterImpl::emitEmbeddedFont( const Physical
aUnicodes.clear();
for( std::vector< EmbedCode >::iterator str_it = enc_it->m_aEncVector.begin(); str_it != enc_it->m_aEncVector.end(); ++str_it )
{
- rtl::OUString aStr( str_it->m_aUnicode );
+ OUString aStr( str_it->m_aUnicode );
aEncWidths[nEncoded] = pRef->GetTextWidth( aStr );
nEncodedCodes[nEncoded] = str_it->m_aUnicode;
nEncoding[nEncoded] = sal::static_int_cast<sal_uInt8>(nEncoded);
@@ -4234,7 +4227,7 @@ bool PDFWriterImpl::emitFonts()
else
{
const PhysicalFontFace* pFont = it->first;
- rtl::OStringBuffer aErrorComment( 256 );
+ OStringBuffer aErrorComment( 256 );
aErrorComment.append( "CreateFontSubset failed for font \"" );
aErrorComment.append( OUStringToOString( pFont->GetFamilyName(), RTL_TEXTENCODING_UTF8 ) );
aErrorComment.append( '\"' );
@@ -4617,7 +4610,7 @@ we check in the following sequence:
}
}
- rtl::OUString aFileExtension = aTargetURL.GetFileExtension();
+ OUString aFileExtension = aTargetURL.GetFileExtension();
// Check if the URL ends in '/': if yes it's a directory,
// it will be forced to a URI link.
@@ -4631,21 +4624,21 @@ we check in the following sequence:
{
sal_Int32 bChangeFileExtensionToPDF = false;
//examine the file type (.odm .odt. .odp, odg, ods)
- if( aFileExtension.equalsIgnoreAsciiCase(rtl::OUString( "odm" ) ) )
+ if( aFileExtension.equalsIgnoreAsciiCase(OUString( "odm" ) ) )
bChangeFileExtensionToPDF = true;
- if( aFileExtension.equalsIgnoreAsciiCase(rtl::OUString( "odt" ) ) )
+ if( aFileExtension.equalsIgnoreAsciiCase(OUString( "odt" ) ) )
bChangeFileExtensionToPDF = true;
- else if( aFileExtension.equalsIgnoreAsciiCase(rtl::OUString( "odp" ) ) )
+ else if( aFileExtension.equalsIgnoreAsciiCase(OUString( "odp" ) ) )
bChangeFileExtensionToPDF = true;
- else if( aFileExtension.equalsIgnoreAsciiCase(rtl::OUString( "odg" ) ) )
+ else if( aFileExtension.equalsIgnoreAsciiCase(OUString( "odg" ) ) )
bChangeFileExtensionToPDF = true;
- else if( aFileExtension.equalsIgnoreAsciiCase(rtl::OUString( "ods" ) ) )
+ else if( aFileExtension.equalsIgnoreAsciiCase(OUString( "ods" ) ) )
bChangeFileExtensionToPDF = true;
if( bChangeFileExtensionToPDF )
- aTargetURL.setExtension(rtl::OUString( "pdf" ) );
+ aTargetURL.setExtension(OUString( "pdf" ) );
}
//check if extension is pdf, see if GoToR should be forced
- bTargetHasPDFExtension = aTargetURL.GetFileExtension().equalsIgnoreAsciiCase(rtl::OUString( "pdf" ) );
+ bTargetHasPDFExtension = aTargetURL.GetFileExtension().equalsIgnoreAsciiCase(OUString( "pdf" ) );
if( m_aContext.ForcePDFAction && bTargetHasPDFExtension )
nSetGoToRMode++;
}
@@ -4668,7 +4661,7 @@ we check in the following sequence:
if( m_aContext.RelFsys && eBaseProtocol == eTargetProtocol && eTargetProtocol == INET_PROT_FILE )
bSetRelative = true;
- rtl::OUString aFragment = aTargetURL.GetMark( INetURLObject::NO_DECODE /*DECODE_WITH_CHARSET*/ ); //fragment as is,
+ OUString aFragment = aTargetURL.GetMark( INetURLObject::NO_DECODE /*DECODE_WITH_CHARSET*/ ); //fragment as is,
if( nSetGoToRMode == 0 )
{
switch( m_aContext.DefaultLinkAction )
@@ -4703,7 +4696,7 @@ we check in the following sequence:
if( nSetGoToRMode )
{
//add the fragment
- rtl::OUString aURLNoMark = aTargetURL.GetURLNoMark( INetURLObject::DECODE_WITH_CHARSET );
+ OUString aURLNoMark = aTargetURL.GetURLNoMark( INetURLObject::DECODE_WITH_CHARSET );
aLine.append("/GoToR");
aLine.append("/F");
bFileSpec = true;
@@ -4729,7 +4722,7 @@ we check in the following sequence:
//substitute the fragment
aTargetURL.SetMark( aLineLoc.getStr() );
}
- rtl::OUString aURL = aTargetURL.GetMainURL( bFileSpec ? INetURLObject::DECODE_WITH_CHARSET : INetURLObject::NO_DECODE );
+ OUString aURL = aTargetURL.GetMainURL( bFileSpec ? INetURLObject::DECODE_WITH_CHARSET : INetURLObject::NO_DECODE );
appendLiteralStringEncrypt(bSetRelative ? INetURLObject::GetRelURL( m_aContext.BaseURL, aURL,
INetURLObject::WAS_ENCODED,
bFileSpec ? INetURLObject::DECODE_WITH_CHARSET : INetURLObject::NO_DECODE
@@ -5329,7 +5322,7 @@ bool PDFWriterImpl::emitAppearances( PDFWidget& rWidget, OStringBuffer& rAnnotDi
{
// TODO: check and insert default streams
- rtl::OString aStandardAppearance;
+ OString aStandardAppearance;
switch( rWidget.m_eType )
{
case PDFWriter::CheckBox:
@@ -5502,7 +5495,7 @@ bool PDFWriterImpl::emitWidgetAnnotations()
appendUnicodeTextStringEncrypt( rWidget.m_aListEntries[ rWidget.m_aSelectedEntries[0] ], rWidget.m_nObject, aValue );
}
else
- appendUnicodeTextStringEncrypt( rtl::OUString(), rWidget.m_nObject, aValue );
+ appendUnicodeTextStringEncrypt( OUString(), rWidget.m_nObject, aValue );
aLine.append( "Ch" );
break;
case PDFWriter::ComboBox:
@@ -6416,7 +6409,7 @@ sal_Int32 PDFWriterImpl::emitNamedDestinations()
OUString( "http://ahost.ax" ) ); //dummy location, won't be used
aLocalURL.SetMark( rDest.m_aDestName );
- const rtl::OUString aName = aLocalURL.GetMark( INetURLObject::NO_DECODE ); //same coding as
+ const OUString aName = aLocalURL.GetMark( INetURLObject::NO_DECODE ); //same coding as
// in link creation ( see PDFWriterImpl::emitLinkAnnotations )
const PDFPage& rDestPage = m_aPages[ rDest.m_nPage ];
@@ -6554,7 +6547,7 @@ sal_Int32 PDFWriterImpl::emitOutputIntent()
aLine.append( " 0 obj\n"
"<</Type/OutputIntent/S/GTS_PDFA1/OutputConditionIdentifier");
- rtl::OUString aComment( "sRGB IEC61966-2.1" );
+ OUString aComment( "sRGB IEC61966-2.1" );
appendLiteralStringEncrypt( aComment ,nOIObject, aLine );
aLine.append("/DestOutputProfile ");
aLine.append( nICCObject );
@@ -6565,7 +6558,7 @@ sal_Int32 PDFWriterImpl::emitOutputIntent()
}
// formats the string for the XML stream
-static void escapeStringXML( const rtl::OUString& rStr, rtl::OUString &rValue)
+static void escapeStringXML( const OUString& rStr, OUString &rValue)
{
const sal_Unicode* pUni = rStr.getStr();
int nLen = rStr.getLength();
@@ -6574,22 +6567,22 @@ static void escapeStringXML( const rtl::OUString& rStr, rtl::OUString &rValue)
switch( *pUni )
{
case sal_Unicode('&'):
- rValue += rtl::OUString( "&amp;" );
+ rValue += OUString( "&amp;" );
break;
case sal_Unicode('<'):
- rValue += rtl::OUString( "&lt;" );
+ rValue += OUString( "&lt;" );
break;
case sal_Unicode('>'):
- rValue += rtl::OUString( "&gt;" );
+ rValue += OUString( "&gt;" );
break;
case sal_Unicode('\''):
- rValue += rtl::OUString( "&apos;" );
+ rValue += OUString( "&apos;" );
break;
case sal_Unicode('"'):
- rValue += rtl::OUString( "&quot;" );
+ rValue += OUString( "&quot;" );
break;<