Merge branch 'master' into feature/killsdf

Conflicts:
Makefile.top
Module_tail_build.mk
RepositoryExternal.mk
RepositoryFixes.mk
accessibility/source/standard/vclxaccessibletoolbox.cxx
basic/source/uno/dlgcont.cxx
connectivity/Library_ado.mk
cross_tail_build/prj/build.lst
desktop/source/offacc/acceptor.cxx
filter/Library_PptImporter.mk
filter/source/t602/filterenv.cxx
i18npool/Library_textconv_dict.mk
ooo.lst.in
saxon/ExternalProject_saxon.mk
saxon/build.xml
sc/sdi/scalc.sdi
sc/source/filter/xml/xmlstyli.cxx
sc/source/ui/condformat/condformatdlg.cxx
sc/source/ui/condformat/condformatmgr.cxx
sc/source/ui/view/cellsh1.cxx
sdext/source/pdfimport/misc/pwdinteract.cxx
shell/qa/zip/makefile.mk
shell/qa/zip/testimpl/makefile.mk
solenv/gbuild/CppunitTest.mk
solenv/gbuild/gbuild.mk
solenv/gbuild/platform/android.mk
solenv/gbuild/platform/com_GCC_defs.mk
solenv/gbuild/platform/macosx.mk
soltools/Executable_adjustvisibility.mk
soltools/Executable_checkdll.mk
soltools/Executable_cpp.mk
soltools/Executable_javadep.mk
soltools/Executable_makedepend.mk
sw/qa/extras/rtfimport/rtfimport.cxx
tail_build/prj/build.lst
tomcat/ExternalProject_tomcat.mk
ucb/source/ucp/webdav/webdavcontent.cxx
xml2cmp/Executable_xml2cmp.mk

1 files changed, 14 insertions, 14 deletions

diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx
index 571c4c074db5..6636ad0330e4 100644
--- a/starmath/inc/dialog.hxx
+++ b/starmath/inc/dialog.hxx
@@ -44,7 +44,7 @@ class SubsetMap;
 
 /**************************************************************************/
 
-void            SetFontStyle(const XubString &rStyleName, Font &rFont);
+void SetFontStyle(const OUString &rStyleName, Font &rFont);
 
 /**************************************************************************/
 
@@ -382,7 +382,7 @@ public:
             SmSymbolManager &rSymbolMgr, SmViewShell &rViewShell, bool bFreeRes = true);
     virtual ~SmSymbolDialog();
 
-    bool    SelectSymbolSet(const XubString &rSymbolSetName);
+    bool    SelectSymbolSet(const OUString &rSymbolSetName);
     void    SelectSymbol(sal_uInt16 nSymbolPos);
     sal_uInt16  GetSelectedSymbol() const   { return aSymbolSetDisplay.GetSelectSymbol(); }
 };
@@ -462,16 +462,16 @@ class SmSymDefineDialog : public ModalDialog
     void    FillStyles(bool bDeleteText = true);
 
     void    SetSymbolSetManager(const SmSymbolManager &rMgr);
-    void    SetFont(const XubString &rFontName, const XubString &rStyleName);
-    void    SetOrigSymbol(const SmSym *pSymbol, const XubString &rSymbolSetName);
+    void    SetFont(const OUString &rFontName, const OUString &rStyleName);
+    void    SetOrigSymbol(const SmSym *pSymbol, const OUString &rSymbolSetName);
     void    UpdateButtons();
 
-    bool    SelectSymbolSet(ComboBox &rComboBox, const XubString &rSymbolSetName,
+    bool    SelectSymbolSet(ComboBox &rComboBox, const OUString &rSymbolSetName,
                             bool bDeleteText);
-    bool    SelectSymbol(ComboBox &rComboBox, const XubString &rSymbolName,
+    bool    SelectSymbol(ComboBox &rComboBox, const OUString &rSymbolName,
                             bool bDeleteText);
-    bool    SelectFont(const XubString &rFontName, bool bApplyFont);
-    bool    SelectStyle(const XubString &rStyleName, bool bApplyFont);
+    bool    SelectFont(const OUString &rFontName, bool bApplyFont);
+    bool    SelectStyle(const OUString &rStyleName, bool bApplyFont);
 
     SmSym       * GetSymbol(const ComboBox &rComboBox);
     const SmSym * GetSymbol(const ComboBox &rComboBox) const
@@ -492,28 +492,28 @@ public:
     // Dialog
     virtual short   Execute();
 
-    bool SelectOldSymbolSet(const XubString &rSymbolSetName)
+    bool SelectOldSymbolSet(const OUString &rSymbolSetName)
     {
         return SelectSymbolSet(aOldSymbolSets, rSymbolSetName, false);
     }
 
-    bool SelectOldSymbol(const XubString &rSymbolName)
+    bool SelectOldSymbol(const OUString &rSymbolName)
     {
         return SelectSymbol(aOldSymbols, rSymbolName, false);
     }
 
-    bool SelectSymbolSet(const XubString &rSymbolSetName)
+    bool SelectSymbolSet(const OUString &rSymbolSetName)
     {
         return SelectSymbolSet(aSymbolSets, rSymbolSetName, false);
     }
 
-    bool SelectSymbol(const XubString &rSymbolName)
+    bool SelectSymbol(const OUString &rSymbolName)
     {
         return SelectSymbol(aSymbols, rSymbolName, false);
     }
 
-    bool        SelectFont(const XubString &rFontName)   { return SelectFont(rFontName, true); }
-    bool        SelectStyle(const XubString &rStyleName) { return SelectStyle(rStyleName, true); };
+    bool        SelectFont(const OUString &rFontName)   { return SelectFont(rFontName, true); }
+    bool        SelectStyle(const OUString &rStyleName) { return SelectStyle(rStyleName, true); };
     void        SelectChar(xub_Unicode cChar);
 };