xmlscript/qa/cppunit/test.cxx | 79 + xmlscript/source/xml_helper/xml_impctx.cxx | 12 xmlscript/source/xmldlg_imexp/imp_share.hxx | 6 xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx | 854 ++++++++++----------- xmlscript/source/xmldlg_imexp/xmldlg_export.cxx | 402 ++++----- xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx | 674 ++++++++-------- xmlscript/source/xmldlg_imexp/xmldlg_import.cxx | 244 +++--- xmlscript/source/xmlflat_imexp/xmlbas_export.cxx | 24 xmlscript/source/xmllib_imexp/xmllib_export.cxx | 42 - xmlscript/source/xmllib_imexp/xmllib_import.cxx | 32 xmlscript/source/xmlmod_imexp/xmlmod_export.cxx | 14 xmlscript/source/xmlmod_imexp/xmlmod_import.cxx | 10 12 files changed, 1202 insertions(+), 1191 deletions(-)
New commits: commit 28c64afa68f52fb847e9915cde108b856fa39987 Author: Noel Grandin <noel.gran...@collabora.co.uk> AuthorDate: Wed May 15 20:45:27 2024 +0200 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Thu May 16 08:50:01 2024 +0200 loplugin:ostr in xmlscript Change-Id: Iaa78cb8994fc1f1b40f02d26e4e1218882ac4b6a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167706 Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> Tested-by: Jenkins diff --git a/xmlscript/qa/cppunit/test.cxx b/xmlscript/qa/cppunit/test.cxx index 6db22be43738..f09bfac589dd 100644 --- a/xmlscript/qa/cppunit/test.cxx +++ b/xmlscript/qa/cppunit/test.cxx @@ -88,7 +88,7 @@ Reference<container::XNameContainer> XmlScriptTest::importFile(std::u16string_vi Reference<container::XNameContainer> xDialogModel( mxComponentContext->getServiceManager()->createInstanceWithContext( - "com.sun.star.awt.UnoControlDialogModel", mxComponentContext), + u"com.sun.star.awt.UnoControlDialogModel"_ustr, mxComponentContext), UNO_QUERY); ::xmlscript::importDialogModel(::xmlscript::createInputStream(std::move(bytes)), xDialogModel, @@ -146,55 +146,66 @@ void XmlScriptTest::testBasicElements() CPPUNIT_ASSERT(pXmlDoc); // Ensure we have all elements - assertXPath(pXmlDoc, "/dlg:window/dlg:bulletinboard/dlg:button[1]"_ostr, "id"_ostr, "button1"); - assertXPath(pXmlDoc, "/dlg:window/dlg:bulletinboard/dlg:button[2]"_ostr, "id"_ostr, "button3"); - assertXPath(pXmlDoc, "/dlg:window/dlg:bulletinboard/dlg:checkbox[1]"_ostr, "id"_ostr, "check1"); - assertXPath(pXmlDoc, "/dlg:window/dlg:bulletinboard/dlg:checkbox[2]"_ostr, "id"_ostr, "check2"); - assertXPath(pXmlDoc, "/dlg:window/dlg:bulletinboard/dlg:checkbox[3]"_ostr, "id"_ostr, "check3"); - assertXPath(pXmlDoc, "/dlg:window/dlg:bulletinboard/dlg:menulist[1]"_ostr, "id"_ostr, "list1"); - assertXPath(pXmlDoc, "/dlg:window/dlg:bulletinboard/dlg:menulist[2]"_ostr, "id"_ostr, "list2"); - assertXPath(pXmlDoc, "/dlg:window/dlg:bulletinboard/dlg:combobox[1]"_ostr, "id"_ostr, "combo1"); + assertXPath(pXmlDoc, "/dlg:window/dlg:bulletinboard/dlg:button[1]"_ostr, "id"_ostr, + u"button1"_ustr); + assertXPath(pXmlDoc, "/dlg:window/dlg:bulletinboard/dlg:button[2]"_ostr, "id"_ostr, + u"button3"_ustr); + assertXPath(pXmlDoc, "/dlg:window/dlg:bulletinboard/dlg:checkbox[1]"_ostr, "id"_ostr, + u"check1"_ustr); + assertXPath(pXmlDoc, "/dlg:window/dlg:bulletinboard/dlg:checkbox[2]"_ostr, "id"_ostr, + u"check2"_ustr); + assertXPath(pXmlDoc, "/dlg:window/dlg:bulletinboard/dlg:checkbox[3]"_ostr, "id"_ostr, + u"check3"_ustr); + assertXPath(pXmlDoc, "/dlg:window/dlg:bulletinboard/dlg:menulist[1]"_ostr, "id"_ostr, + u"list1"_ustr); + assertXPath(pXmlDoc, "/dlg:window/dlg:bulletinboard/dlg:menulist[2]"_ostr, "id"_ostr, + u"list2"_ustr); + assertXPath(pXmlDoc, "/dlg:window/dlg:bulletinboard/dlg:combobox[1]"_ostr, "id"_ostr, + u"combo1"_ustr); assertXPath(pXmlDoc, "/dlg:window/dlg:bulletinboard/dlg:radiogroup[1]/dlg:radio[1]"_ostr, - "id"_ostr, "radio1"); + "id"_ostr, u"radio1"_ustr); assertXPath(pXmlDoc, "/dlg:window/dlg:bulletinboard/dlg:radiogroup[1]/dlg:radio[2]"_ostr, - "id"_ostr, "radio2"); + "id"_ostr, u"radio2"_ustr); assertXPath(pXmlDoc, "/dlg:window/dlg:bulletinboard/dlg:radiogroup[1]/dlg:radio[3]"_ostr, - "id"_ostr, "radio3"); + "id"_ostr, u"radio3"_ustr); assertXPath(pXmlDoc, "/dlg:window/dlg:bulletinboard/dlg:titledbox[1]"_ostr, "id"_ostr, - "groupbox1"); + u"groupbox1"_ustr); assertXPath(pXmlDoc, "/dlg:window/dlg:bulletinboard/dlg:radiogroup[2]/dlg:radio[1]"_ostr, - "id"_ostr, "radio5"); + "id"_ostr, u"radio5"_ustr); assertXPath(pXmlDoc, "/dlg:window/dlg:bulletinboard/dlg:radiogroup[2]/dlg:radio[2]"_ostr, - "id"_ostr, "radio7"); + "id"_ostr, u"radio7"_ustr); assertXPath(pXmlDoc, "/dlg:window/dlg:bulletinboard/dlg:radiogroup[2]/dlg:radio[3]"_ostr, - "id"_ostr, "radio8"); - assertXPath(pXmlDoc, "/dlg:window/dlg:bulletinboard/dlg:text[1]"_ostr, "id"_ostr, "fixed1"); + "id"_ostr, u"radio8"_ustr); + assertXPath(pXmlDoc, "/dlg:window/dlg:bulletinboard/dlg:text[1]"_ostr, "id"_ostr, + u"fixed1"_ustr); assertXPath(pXmlDoc, "/dlg:window/dlg:bulletinboard/dlg:textfield[1]"_ostr, "id"_ostr, - "field1"); + u"field1"_ustr); assertXPath(pXmlDoc, "/dlg:window/dlg:bulletinboard/dlg:textfield[2]"_ostr, "id"_ostr, - "field2"); - assertXPath(pXmlDoc, "/dlg:window/dlg:bulletinboard/dlg:img[1]"_ostr, "id"_ostr, "image1"); + u"field2"_ustr); + assertXPath(pXmlDoc, "/dlg:window/dlg:bulletinboard/dlg:img[1]"_ostr, "id"_ostr, + u"image1"_ustr); assertXPath(pXmlDoc, "/dlg:window/dlg:bulletinboard/dlg:filecontrol[1]"_ostr, "id"_ostr, - "file1"); + u"file1"_ustr); assertXPath(pXmlDoc, "/dlg:window/dlg:bulletinboard/dlg:datefield[1]"_ostr, "id"_ostr, - "datefield1"); - assertXPath(pXmlDoc, "/dlg:window/dlg:bulletinboard/dlg:timefield[1]"_ostr, "id"_ostr, "time1"); + u"datefield1"_ustr); + assertXPath(pXmlDoc, "/dlg:window/dlg:bulletinboard/dlg:timefield[1]"_ostr, "id"_ostr, + u"time1"_ustr); assertXPath(pXmlDoc, "/dlg:window/dlg:bulletinboard/dlg:patternfield[1]"_ostr, "id"_ostr, - "pattern1"); + u"pattern1"_ustr); assertXPath(pXmlDoc, "/dlg:window/dlg:bulletinboard/dlg:currencyfield[1]"_ostr, "id"_ostr, - "currency1"); + u"currency1"_ustr); assertXPath(pXmlDoc, "/dlg:window/dlg:bulletinboard/dlg:numericfield[1]"_ostr, "id"_ostr, - "numeric1"); + u"numeric1"_ustr); assertXPath(pXmlDoc, "/dlg:window/dlg:bulletinboard/dlg:fixedline[1]"_ostr, "id"_ostr, - "fixedline1"); + u"fixedline1"_ustr); assertXPath(pXmlDoc, "/dlg:window/dlg:bulletinboard/dlg:progressmeter[1]"_ostr, "id"_ostr, - "progress1"); + u"progress1"_ustr); assertXPath(pXmlDoc, "/dlg:window/dlg:bulletinboard/dlg:scrollbar[1]"_ostr, "id"_ostr, - "scrollbar1"); + u"scrollbar1"_ustr); assertXPath(pXmlDoc, "/dlg:window/dlg:bulletinboard/dlg:formattedfield[1]"_ostr, "id"_ostr, - "ffield0"); + u"ffield0"_ustr); assertXPath(pXmlDoc, "/dlg:window/dlg:bulletinboard/dlg:formattedfield[2]"_ostr, "id"_ostr, - "ffield1"); + u"ffield1"_ustr); Reference<lang::XComponent> xDialogModelComp(xModel, UNO_QUERY); if (xDialogModelComp) @@ -219,13 +230,13 @@ void XmlScriptTest::testEmptyPopupItems() // Ensure we have 3 items in combobox after import/export and second one is empty assertXPath(pXmlDoc, "/dlg:window/dlg:bulletinboard/dlg:combobox/dlg:menupopup/dlg:menuitem[1]"_ostr, - "value"_ostr, "Eintrag1"); + "value"_ostr, u"Eintrag1"_ustr); assertXPath(pXmlDoc, "/dlg:window/dlg:bulletinboard/dlg:combobox/dlg:menupopup/dlg:menuitem[2]"_ostr, - "value"_ostr, ""); + "value"_ostr, u""_ustr); assertXPath(pXmlDoc, "/dlg:window/dlg:bulletinboard/dlg:combobox/dlg:menupopup/dlg:menuitem[3]"_ostr, - "value"_ostr, "Eintrag2"); + "value"_ostr, u"Eintrag2"_ustr); } CPPUNIT_TEST_SUITE_REGISTRATION(XmlScriptTest); diff --git a/xmlscript/source/xml_helper/xml_impctx.cxx b/xmlscript/source/xml_helper/xml_impctx.cxx index e9255e91a3bc..238a029a3fbc 100644 --- a/xmlscript/source/xml_helper/xml_impctx.cxx +++ b/xmlscript/source/xml_helper/xml_impctx.cxx @@ -171,9 +171,9 @@ DocumentHandlerImpl::DocumentHandlerImpl( : m_xRoot( xRoot ), m_uid_count( 0 ), m_nLastURI_lookup( UID_UNKNOWN ), - m_aLastURI_lookup( "<<< unknown URI >>>" ), + m_aLastURI_lookup( u"<<< unknown URI >>>"_ustr ), m_nLastPrefix_lookup( UID_UNKNOWN ), - m_aLastPrefix_lookup( "<<< unknown URI >>>" ), + m_aLastPrefix_lookup( u"<<< unknown URI >>>"_ustr ), m_nSkipElements( 0 ) { m_elements.reserve( 10 ); @@ -353,7 +353,7 @@ inline ExtendedAttributes::ExtendedAttributes( OUString DocumentHandlerImpl::getImplementationName() { - return "com.sun.star.comp.xml.input.SaxDocumentHandler"; + return u"com.sun.star.comp.xml.input.SaxDocumentHandler"_ustr; } sal_Bool DocumentHandlerImpl::supportsService( OUString const & servicename ) @@ -363,7 +363,7 @@ sal_Bool DocumentHandlerImpl::supportsService( OUString const & servicename ) Sequence< OUString > DocumentHandlerImpl::getSupportedServiceNames() { - return { "com.sun.star.xml.input.SaxDocumentHandler" }; + return { u"com.sun.star.xml.input.SaxDocumentHandler"_ustr }; } // XInitialization @@ -377,7 +377,7 @@ void DocumentHandlerImpl::initialize( !(arguments[ 0 ] >>= xRoot) || !xRoot.is()) { - throw RuntimeException( "missing root instance!" ); + throw RuntimeException( u"missing root instance!"_ustr ); } m_xRoot = xRoot; } @@ -399,7 +399,7 @@ OUString DocumentHandlerImpl::getUriByUid( sal_Int32 Uid ) if (rURIUid.second == Uid) return rURIUid.first; } - throw container::NoSuchElementException( "no such xmlns uid!" , getXWeak() ); + throw container::NoSuchElementException( u"no such xmlns uid!"_ustr , getXWeak() ); } // XDocumentHandler diff --git a/xmlscript/source/xmldlg_imexp/imp_share.hxx b/xmlscript/source/xmldlg_imexp/imp_share.hxx index 9eec588c48f3..b3ce62a111cc 100644 --- a/xmlscript/source/xmldlg_imexp/imp_share.hxx +++ b/xmlscript/source/xmldlg_imexp/imp_share.hxx @@ -493,7 +493,7 @@ public: } catch(const css::container::ElementExistException &e) { - throw css::lang::WrappedTargetRuntimeException("", e.Context, css::uno::Any(e)); + throw css::lang::WrappedTargetRuntimeException(u""_ustr, e.Context, css::uno::Any(e)); } } }; @@ -962,7 +962,7 @@ public: ElementBase * pParent, DialogImport * pImport ) : ControlElement( rLocalName, xAttributes, pParent, pImport ) { - m_xContainer.set( m_pImport->_xDialogModelFactory->createInstance( "com.sun.star.awt.UnoMultiPageModel" ), css::uno::UNO_QUERY ); + m_xContainer.set( m_pImport->_xDialogModelFactory->createInstance( u"com.sun.star.awt.UnoMultiPageModel"_ustr ), css::uno::UNO_QUERY ); } private: css::uno::Reference< css::container::XNameContainer > m_xContainer; @@ -1005,7 +1005,7 @@ public: ElementBase * pParent, DialogImport * pImport ) : ControlElement( rLocalName, xAttributes, pParent, pImport ) { - m_xContainer.set( m_pImport->_xDialogModelFactory->createInstance( "com.sun.star.awt.UnoPageModel" ), css::uno::UNO_QUERY ); + m_xContainer.set( m_pImport->_xDialogModelFactory->createInstance( u"com.sun.star.awt.UnoPageModel"_ustr ), css::uno::UNO_QUERY ); } private: css::uno::Reference< css::container::XNameContainer > m_xContainer; diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx index 261528b3d5a1..287d762db266 100644 --- a/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx +++ b/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx @@ -37,10 +37,10 @@ namespace xmlscript static bool readBorderProps( ElementDescriptor * element, Style & style ) { - if (element->readProp( &style._border, "Border" )) { + if (element->readProp( &style._border, u"Border"_ustr )) { if (style._border == BORDER_SIMPLE /* simple */) { - if (element->readProp( &style._borderColor, "BorderColor" )) + if (element->readProp( &style._borderColor, u"BorderColor"_ustr )) style._border = BORDER_SIMPLE_COLOR; } return true; @@ -51,11 +51,11 @@ static bool readBorderProps( static bool readFontProps( ElementDescriptor * element, Style & style ) { bool ret = element->readProp( - &style._descr, "FontDescriptor" ); + &style._descr, u"FontDescriptor"_ustr ); ret |= element->readProp( - &style._fontEmphasisMark, "FontEmphasisMark" ); + &style._fontEmphasisMark, u"FontEmphasisMark"_ustr ); ret |= element->readProp( - &style._fontRelief, "FontRelief" ); + &style._fontRelief, u"FontRelief"_ustr ); return ret; } @@ -63,32 +63,32 @@ void ElementDescriptor::readMultiPageModel( StyleBag * all_styles ) { // collect styles Style aStyle( 0x1 | 0x2 | 0x8 | 0x20 ); - if (readProp( "BackgroundColor" ) >>= aStyle._backgroundColor) + if (readProp( u"BackgroundColor"_ustr ) >>= aStyle._backgroundColor) aStyle._set |= 0x1; - if (readProp( "TextColor" ) >>= aStyle._textColor) + if (readProp( u"TextColor"_ustr ) >>= aStyle._textColor) aStyle._set |= 0x2; - if (readProp( "TextLineColor" ) >>= aStyle._textLineColor) + if (readProp( u"TextLineColor"_ustr ) >>= aStyle._textLineColor) aStyle._set |= 0x20; if (readFontProps( this, aStyle )) aStyle._set |= 0x8; if (aStyle._set) { - addAttribute( XMLNS_DIALOGS_PREFIX ":style-id" , all_styles->getStyleId( aStyle ) ); + addAttribute( u"" XMLNS_DIALOGS_PREFIX ":style-id"_ustr , all_styles->getStyleId( aStyle ) ); } // collect elements readDefaults(); - readLongAttr( "MultiPageValue", XMLNS_DIALOGS_PREFIX ":value" ); - Any aDecorationAny( _xProps->getPropertyValue( "Decoration" ) ); + readLongAttr( u"MultiPageValue"_ustr, u"" XMLNS_DIALOGS_PREFIX ":value"_ustr ); + Any aDecorationAny( _xProps->getPropertyValue( u"Decoration"_ustr ) ); bool bDecoration = true; if ( (aDecorationAny >>= bDecoration) && !bDecoration ) - addAttribute( XMLNS_DIALOGS_PREFIX ":withtabs", "false" ); + addAttribute( u"" XMLNS_DIALOGS_PREFIX ":withtabs"_ustr, u"false"_ustr ); readEvents(); uno::Reference< container::XNameContainer > xPagesContainer( _xProps, uno::UNO_QUERY ); if ( xPagesContainer.is() && xPagesContainer->getElementNames().hasElements() ) { - rtl::Reference<ElementDescriptor> pElem = new ElementDescriptor( _xProps, _xPropState, XMLNS_DIALOGS_PREFIX ":bulletinboard", _xDocument ); + rtl::Reference<ElementDescriptor> pElem = new ElementDescriptor( _xProps, _xPropState, u"" XMLNS_DIALOGS_PREFIX ":bulletinboard"_ustr, _xDocument ); pElem->readBullitinBoard( all_styles ); addSubElement( pElem ); } @@ -99,31 +99,31 @@ void ElementDescriptor::readFrameModel( StyleBag * all_styles ) // collect styles Style aStyle( 0x1 | 0x2 | 0x8 | 0x20 ); - if (readProp( "TextColor" ) >>= aStyle._textColor) + if (readProp( u"TextColor"_ustr ) >>= aStyle._textColor) aStyle._set |= 0x2; - if (readProp( "TextLineColor" ) >>= aStyle._textLineColor) + if (readProp( u"TextLineColor"_ustr ) >>= aStyle._textLineColor) aStyle._set |= 0x20; if (readFontProps( this, aStyle )) aStyle._set |= 0x8; if (aStyle._set) { - addAttribute( XMLNS_DIALOGS_PREFIX ":style-id", all_styles->getStyleId( aStyle ) ); + addAttribute( u"" XMLNS_DIALOGS_PREFIX ":style-id"_ustr, all_styles->getStyleId( aStyle ) ); } // collect elements readDefaults(); OUString aTitle; - if ( readProp( "Label" ) >>= aTitle) + if ( readProp( u"Label"_ustr ) >>= aTitle) { - rtl::Reference<ElementDescriptor> title = new ElementDescriptor( _xProps, _xPropState, XMLNS_DIALOGS_PREFIX ":title", _xDocument ); - title->addAttribute( XMLNS_DIALOGS_PREFIX ":value", aTitle ); + rtl::Reference<ElementDescriptor> title = new ElementDescriptor( _xProps, _xPropState, u"" XMLNS_DIALOGS_PREFIX ":title"_ustr, _xDocument ); + title->addAttribute( u"" XMLNS_DIALOGS_PREFIX ":value"_ustr, aTitle ); addSubElement( title ); } uno::Reference< container::XNameContainer > xControlContainer( _xProps, uno::UNO_QUERY ); if ( xControlContainer.is() && xControlContainer->getElementNames().hasElements() ) { - rtl::Reference<ElementDescriptor> pElem = new ElementDescriptor( _xProps, _xPropState, XMLNS_DIALOGS_PREFIX ":bulletinboard", _xDocument ); + rtl::Reference<ElementDescriptor> pElem = new ElementDescriptor( _xProps, _xPropState, u"" XMLNS_DIALOGS_PREFIX ":bulletinboard"_ustr, _xDocument ); pElem->readBullitinBoard( all_styles ); addSubElement( pElem ); } @@ -134,26 +134,26 @@ void ElementDescriptor::readPageModel( StyleBag * all_styles ) { // collect styles Style aStyle( 0x1 | 0x2 | 0x8 | 0x20 ); - if (readProp( "BackgroundColor" ) >>= aStyle._backgroundColor) + if (readProp( u"BackgroundColor"_ustr ) >>= aStyle._backgroundColor) aStyle._set |= 0x1; - if (readProp( "TextColor" ) >>= aStyle._textColor) + if (readProp( u"TextColor"_ustr ) >>= aStyle._textColor) aStyle._set |= 0x2; - if (readProp( "TextLineColor" ) >>= aStyle._textLineColor) + if (readProp( u"TextLineColor"_ustr ) >>= aStyle._textLineColor) aStyle._set |= 0x20; if (readFontProps( this, aStyle )) aStyle._set |= 0x8; if (aStyle._set) { - addAttribute( XMLNS_DIALOGS_PREFIX ":style-id", all_styles->getStyleId( aStyle ) ); + addAttribute( u"" XMLNS_DIALOGS_PREFIX ":style-id"_ustr, all_styles->getStyleId( aStyle ) ); } // collect elements readDefaults(); - readStringAttr( "Title", XMLNS_DIALOGS_PREFIX ":title" ); + readStringAttr( u"Title"_ustr, u"" XMLNS_DIALOGS_PREFIX ":title"_ustr ); uno::Reference< container::XNameContainer > xControlContainer( _xProps, uno::UNO_QUERY ); if ( xControlContainer.is() && xControlContainer->getElementNames().hasElements() ) { - rtl::Reference<ElementDescriptor> pElem = new ElementDescriptor( _xProps, _xPropState, XMLNS_DIALOGS_PREFIX ":bulletinboard", _xDocument ); + rtl::Reference<ElementDescriptor> pElem = new ElementDescriptor( _xProps, _xPropState, u"" XMLNS_DIALOGS_PREFIX ":bulletinboard"_ustr, _xDocument ); pElem->readBullitinBoard( all_styles ); addSubElement( pElem ); } @@ -164,51 +164,51 @@ void ElementDescriptor::readButtonModel( StyleBag * all_styles ) { // collect styles Style aStyle( 0x1 | 0x2 | 0x8 | 0x20 ); - if (readProp( "BackgroundColor" ) >>= aStyle._backgroundColor) + if (readProp( u"BackgroundColor"_ustr ) >>= aStyle._backgroundColor) aStyle._set |= 0x1; - if (readProp( "TextColor" ) >>= aStyle._textColor) + if (readProp( u"TextColor"_ustr ) >>= aStyle._textColor) aStyle._set |= 0x2; - if (readProp( "TextLineColor" ) >>= aStyle._textLineColor) + if (readProp( u"TextLineColor"_ustr ) >>= aStyle._textLineColor) aStyle._set |= 0x20; if (readFontProps( this, aStyle )) aStyle._set |= 0x8; if (aStyle._set) { - addAttribute( XMLNS_DIALOGS_PREFIX ":style-id", all_styles->getStyleId( aStyle ) ); + addAttribute( u"" XMLNS_DIALOGS_PREFIX ":style-id"_ustr, all_styles->getStyleId( aStyle ) ); } // collect elements readDefaults(); - readBoolAttr( "Tabstop", XMLNS_DIALOGS_PREFIX ":tabstop" ); - readBoolAttr( "DefaultButton", XMLNS_DIALOGS_PREFIX ":default" ); - readStringAttr( "Label", XMLNS_DIALOGS_PREFIX ":value" ); - readAlignAttr( "Align", XMLNS_DIALOGS_PREFIX ":align" ); - readVerticalAlignAttr( "VerticalAlign", XMLNS_DIALOGS_PREFIX ":valign" ); - readButtonTypeAttr( "PushButtonType", XMLNS_DIALOGS_PREFIX ":button-type" ); - readImageOrGraphicAttr(XMLNS_DIALOGS_PREFIX ":image-src"); - readImagePositionAttr( "ImagePosition", XMLNS_DIALOGS_PREFIX ":image-position" ); - readImageAlignAttr( "ImageAlign", XMLNS_DIALOGS_PREFIX ":image-align" ); + readBoolAttr( u"Tabstop"_ustr, u"" XMLNS_DIALOGS_PREFIX ":tabstop"_ustr ); + readBoolAttr( u"DefaultButton"_ustr, u"" XMLNS_DIALOGS_PREFIX ":default"_ustr ); + readStringAttr( u"Label"_ustr, u"" XMLNS_DIALOGS_PREFIX ":value"_ustr ); + readAlignAttr( u"Align"_ustr, u"" XMLNS_DIALOGS_PREFIX ":align"_ustr ); + readVerticalAlignAttr( u"VerticalAlign"_ustr, u"" XMLNS_DIALOGS_PREFIX ":valign"_ustr ); + readButtonTypeAttr( u"PushButtonType"_ustr, u"" XMLNS_DIALOGS_PREFIX ":button-type"_ustr ); + readImageOrGraphicAttr(u"" XMLNS_DIALOGS_PREFIX ":image-src"_ustr); + readImagePositionAttr( u"ImagePosition"_ustr, u"" XMLNS_DIALOGS_PREFIX ":image-position"_ustr ); + readImageAlignAttr( u"ImageAlign"_ustr, u"" XMLNS_DIALOGS_PREFIX ":image-align"_ustr ); - if (extract_throw<bool>( _xProps->getPropertyValue( "Repeat" ) )) - readLongAttr( "RepeatDelay", XMLNS_DIALOGS_PREFIX ":repeat", true /* force */ ); + if (extract_throw<bool>( _xProps->getPropertyValue( u"Repeat"_ustr ) )) + readLongAttr( u"RepeatDelay"_ustr, u"" XMLNS_DIALOGS_PREFIX ":repeat"_ustr, true /* force */ ); - if (extract_throw<bool>( _xProps->getPropertyValue( "Toggle" ) )) - addAttribute( XMLNS_DIALOGS_PREFIX ":toggled", "1" ); + if (extract_throw<bool>( _xProps->getPropertyValue( u"Toggle"_ustr ) )) + addAttribute( u"" XMLNS_DIALOGS_PREFIX ":toggled"_ustr, u"1"_ustr ); - readBoolAttr( "FocusOnClick", XMLNS_DIALOGS_PREFIX ":grab-focus" ); - readBoolAttr( "MultiLine",XMLNS_DIALOGS_PREFIX ":multiline" ); + readBoolAttr( u"FocusOnClick"_ustr, u"" XMLNS_DIALOGS_PREFIX ":grab-focus"_ustr ); + readBoolAttr( u"MultiLine"_ustr,u"" XMLNS_DIALOGS_PREFIX ":multiline"_ustr ); // State sal_Int16 nState = 0; - if (readProp( "State" ) >>= nState) + if (readProp( u"State"_ustr ) >>= nState) { switch (nState) { case 0: - addAttribute( XMLNS_DIALOGS_PREFIX ":checked", "false" ); + addAttribute( u"" XMLNS_DIALOGS_PREFIX ":checked"_ustr, u"false"_ustr ); break; case 1: - addAttribute( XMLNS_DIALOGS_PREFIX ":checked", "true" ); + addAttribute( u"" XMLNS_DIALOGS_PREFIX ":checked"_ustr, u"true"_ustr ); break; default: OSL_FAIL( "### unexpected radio state!" ); @@ -223,46 +223,46 @@ void ElementDescriptor::readCheckBoxModel( StyleBag * all_styles ) { // collect styles Style aStyle( 0x1 | 0x2 | 0x8 | 0x20 | 0x40 ); - if (readProp( "BackgroundColor" ) >>= aStyle._backgroundColor) + if (readProp( u"BackgroundColor"_ustr ) >>= aStyle._backgroundColor) aStyle._set |= 0x1; - if (readProp( "TextColor" ) >>= aStyle._textColor) + if (readProp( u"TextColor"_ustr ) >>= aStyle._textColor) aStyle._set |= 0x2; - if (readProp( "TextLineColor" ) >>= aStyle._textLineColor) + if (readProp( u"TextLineColor"_ustr ) >>= aStyle._textLineColor) aStyle._set |= 0x20; if (readFontProps( this, aStyle )) aStyle._set |= 0x8; - if (readProp( "VisualEffect" ) >>= aStyle._visualEffect) + if (readProp( u"VisualEffect"_ustr ) >>= aStyle._visualEffect) aStyle._set |= 0x40; if (aStyle._set) { - addAttribute( XMLNS_DIALOGS_PREFIX ":style-id", all_styles->getStyleId( aStyle ) ); + addAttribute( u"" XMLNS_DIALOGS_PREFIX ":style-id"_ustr, all_styles->getStyleId( aStyle ) ); } // collect elements readDefaults(); - readBoolAttr( "Tabstop", XMLNS_DIALOGS_PREFIX ":tabstop" ); - readStringAttr( "Label", XMLNS_DIALOGS_PREFIX ":value" ); - readAlignAttr( "Align", XMLNS_DIALOGS_PREFIX ":align" ); - readVerticalAlignAttr( "VerticalAlign", XMLNS_DIALOGS_PREFIX ":valign" ); - readImageOrGraphicAttr(XMLNS_DIALOGS_PREFIX ":image-src"); - readImagePositionAttr( "ImagePosition", XMLNS_DIALOGS_PREFIX ":image-position" ); - readBoolAttr( "MultiLine", XMLNS_DIALOGS_PREFIX ":multiline" ); + readBoolAttr( u"Tabstop"_ustr, u"" XMLNS_DIALOGS_PREFIX ":tabstop"_ustr ); + readStringAttr( u"Label"_ustr, u"" XMLNS_DIALOGS_PREFIX ":value"_ustr ); + readAlignAttr( u"Align"_ustr, u"" XMLNS_DIALOGS_PREFIX ":align"_ustr ); + readVerticalAlignAttr( u"VerticalAlign"_ustr, u"" XMLNS_DIALOGS_PREFIX ":valign"_ustr ); + readImageOrGraphicAttr(u"" XMLNS_DIALOGS_PREFIX ":image-src"_ustr); + readImagePositionAttr( u"ImagePosition"_ustr, u"" XMLNS_DIALOGS_PREFIX ":image-position"_ustr ); + readBoolAttr( u"MultiLine"_ustr, u"" XMLNS_DIALOGS_PREFIX ":multiline"_ustr ); bool bTriState = false; - if ((readProp( "TriState" ) >>= bTriState) && bTriState) + if ((readProp( u"TriState"_ustr ) >>= bTriState) && bTriState) { - addAttribute( XMLNS_DIALOGS_PREFIX ":tristate", "true" ); + addAttribute( u"" XMLNS_DIALOGS_PREFIX ":tristate"_ustr, u"true"_ustr ); } sal_Int16 nState = 0; - if (_xProps->getPropertyValue( "State" ) >>= nState) + if (_xProps->getPropertyValue( u"State"_ustr ) >>= nState) { switch (nState) { case 0: - addAttribute( XMLNS_DIALOGS_PREFIX ":checked", "false" ); + addAttribute( u"" XMLNS_DIALOGS_PREFIX ":checked"_ustr, u"false"_ustr ); break; case 1: - addAttribute( XMLNS_DIALOGS_PREFIX ":checked", "true" ); + addAttribute( u"" XMLNS_DIALOGS_PREFIX ":checked"_ustr, u"true"_ustr ); break; case 2: // tristate=true exported, checked omitted => don't know! OSL_ENSURE( bTriState, "### detected tristate value, but TriState is not set!" ); @@ -279,11 +279,11 @@ void ElementDescriptor::readComboBoxModel( StyleBag * all_styles ) { // collect styles Style aStyle( 0x1 | 0x2 | 0x4 | 0x8 | 0x20 ); - if (readProp( "BackgroundColor" ) >>= aStyle._backgroundColor) + if (readProp( u"BackgroundColor"_ustr ) >>= aStyle._backgroundColor) aStyle._set |= 0x1; - if (readProp( "TextColor" ) >>= aStyle._textColor) + if (readProp( u"TextColor"_ustr ) >>= aStyle._textColor) aStyle._set |= 0x2; - if (readProp( "TextLineColor" ) >>= aStyle._textLineColor) + if (readProp( u"TextLineColor"_ustr ) >>= aStyle._textLineColor) aStyle._set |= 0x20; if (readBorderProps( this, aStyle )) aStyle._set |= 0x4; @@ -291,34 +291,34 @@ void ElementDescriptor::readComboBoxModel( StyleBag * all_styles ) aStyle._set |= 0x8; if (aStyle._set) { - addAttribute( XMLNS_DIALOGS_PREFIX ":style-id", all_styles->getStyleId( aStyle ) ); + addAttribute( u"" XMLNS_DIALOGS_PREFIX ":style-id"_ustr, all_styles->getStyleId( aStyle ) ); } // collect elements readDefaults(); - readBoolAttr( "Tabstop", XMLNS_DIALOGS_PREFIX ":tabstop" ); - readStringAttr( "Text", XMLNS_DIALOGS_PREFIX ":value" ); - readAlignAttr( "Align", XMLNS_DIALOGS_PREFIX ":align" ); - readBoolAttr( "Autocomplete", XMLNS_DIALOGS_PREFIX ":autocomplete" ); - readBoolAttr( "ReadOnly", XMLNS_DIALOGS_PREFIX ":readonly" ); - readBoolAttr( "HideInactiveSelection", XMLNS_DIALOGS_PREFIX ":hide-inactive-selection" ); - readBoolAttr( "Dropdown", XMLNS_DIALOGS_PREFIX ":spin" ); - readShortAttr( "MaxTextLen", XMLNS_DIALOGS_PREFIX ":maxlength" ); - readShortAttr( "LineCount", XMLNS_DIALOGS_PREFIX ":linecount" ); + readBoolAttr( u"Tabstop"_ustr, u"" XMLNS_DIALOGS_PREFIX ":tabstop"_ustr ); + readStringAttr( u"Text"_ustr, u"" XMLNS_DIALOGS_PREFIX ":value"_ustr ); + readAlignAttr( u"Align"_ustr, u"" XMLNS_DIALOGS_PREFIX ":align"_ustr ); + readBoolAttr( u"Autocomplete"_ustr, u"" XMLNS_DIALOGS_PREFIX ":autocomplete"_ustr ); + readBoolAttr( u"ReadOnly"_ustr, u"" XMLNS_DIALOGS_PREFIX ":readonly"_ustr ); + readBoolAttr( u"HideInactiveSelection"_ustr, u"" XMLNS_DIALOGS_PREFIX ":hide-inactive-selection"_ustr ); + readBoolAttr( u"Dropdown"_ustr, u"" XMLNS_DIALOGS_PREFIX ":spin"_ustr ); + readShortAttr( u"MaxTextLen"_ustr, u"" XMLNS_DIALOGS_PREFIX ":maxlength"_ustr ); + readShortAttr( u"LineCount"_ustr, u"" XMLNS_DIALOGS_PREFIX ":linecount"_ustr ); // Cell Range, Ref Cell etc. - readDataAwareAttr( XMLNS_DIALOGS_PREFIX ":linked-cell" ); - readDataAwareAttr( XMLNS_DIALOGS_PREFIX ":source-cell-range" ); + readDataAwareAttr( u"" XMLNS_DIALOGS_PREFIX ":linked-cell"_ustr ); + readDataAwareAttr( u"" XMLNS_DIALOGS_PREFIX ":source-cell-range"_ustr ); // string item list Sequence< OUString > itemValues; - if ((readProp( "StringItemList" ) >>= itemValues) && itemValues.hasElements()) + if ((readProp( u"StringItemList"_ustr ) >>= itemValues) && itemValues.hasElements()) { - rtl::Reference<ElementDescriptor> popup = new ElementDescriptor( _xProps, _xPropState, XMLNS_DIALOGS_PREFIX ":menupopup", _xDocument ); + rtl::Reference<ElementDescriptor> popup = new ElementDescriptor( _xProps, _xPropState, u"" XMLNS_DIALOGS_PREFIX ":menupopup"_ustr, _xDocument ); for (const auto& rItemValue : itemValues) { - rtl::Reference<ElementDescriptor> item = new ElementDescriptor( _xProps, _xPropState, XMLNS_DIALOGS_PREFIX ":menuitem", _xDocument ); - item->addAttribute( XMLNS_DIALOGS_PREFIX ":value", rItemValue ); + rtl::Reference<ElementDescriptor> item = new ElementDescriptor( _xProps, _xPropState, u"" XMLNS_DIALOGS_PREFIX ":menuitem"_ustr, _xDocument ); + item->addAttribute( u"" XMLNS_DIALOGS_PREFIX ":value"_ustr, rItemValue ); popup->addSubElement( item ); } @@ -331,11 +331,11 @@ void ElementDescriptor::readListBoxModel( StyleBag * all_styles ) { // collect styles Style aStyle( 0x1 | 0x2 | 0x4 | 0x8 | 0x20 ); - if (readProp( "BackgroundColor" ) >>= aStyle._backgroundColor) + if (readProp( u"BackgroundColor"_ustr ) >>= aStyle._backgroundColor) aStyle._set |= 0x1; - if (readProp( "TextColor" ) >>= aStyle._textColor) + if (readProp( u"TextColor"_ustr ) >>= aStyle._textColor) aStyle._set |= 0x2; - if (readProp( "TextLineColor" ) >>= aStyle._textLineColor) + if (readProp( u"TextLineColor"_ustr ) >>= aStyle._textLineColor) aStyle._set |= 0x20; if (readBorderProps( this, aStyle )) aStyle._set |= 0x4; @@ -343,41 +343,41 @@ void ElementDescriptor::readListBoxModel( StyleBag * all_styles ) aStyle._set |= 0x8; if (aStyle._set) { - addAttribute( XMLNS_DIALOGS_PREFIX ":style-id", all_styles->getStyleId( aStyle ) ); + addAttribute( u"" XMLNS_DIALOGS_PREFIX ":style-id"_ustr, all_styles->getStyleId( aStyle ) ); } // collect elements readDefaults(); - readBoolAttr( "Tabstop", XMLNS_DIALOGS_PREFIX ":tabstop" ); - readBoolAttr( "MultiSelection", XMLNS_DIALOGS_PREFIX ":multiselection" ); - readBoolAttr( "ReadOnly", XMLNS_DIALOGS_PREFIX ":readonly" ); - readBoolAttr( "Dropdown", XMLNS_DIALOGS_PREFIX ":spin" ); - readShortAttr( "LineCount", XMLNS_DIALOGS_PREFIX ":linecount" ); - readAlignAttr( "Align", XMLNS_DIALOGS_PREFIX ":align" ); - readDataAwareAttr( XMLNS_DIALOGS_PREFIX ":linked-cell" ); - readDataAwareAttr( XMLNS_DIALOGS_PREFIX ":source-cell-range" ); + readBoolAttr( u"Tabstop"_ustr, u"" XMLNS_DIALOGS_PREFIX ":tabstop"_ustr ); + readBoolAttr( u"MultiSelection"_ustr, u"" XMLNS_DIALOGS_PREFIX ":multiselection"_ustr ); + readBoolAttr( u"ReadOnly"_ustr, u"" XMLNS_DIALOGS_PREFIX ":readonly"_ustr ); + readBoolAttr( u"Dropdown"_ustr, u"" XMLNS_DIALOGS_PREFIX ":spin"_ustr ); + readShortAttr( u"LineCount"_ustr, u"" XMLNS_DIALOGS_PREFIX ":linecount"_ustr ); + readAlignAttr( u"Align"_ustr, u"" XMLNS_DIALOGS_PREFIX ":align"_ustr ); + readDataAwareAttr( u"" XMLNS_DIALOGS_PREFIX ":linked-cell"_ustr ); + readDataAwareAttr( u"" XMLNS_DIALOGS_PREFIX ":source-cell-range"_ustr ); // string item list Sequence< OUString > itemValues; - if ((readProp( "StringItemList" ) >>= itemValues) && itemValues.hasElements()) + if ((readProp( u"StringItemList"_ustr ) >>= itemValues) && itemValues.hasElements()) { - rtl::Reference<ElementDescriptor> popup = new ElementDescriptor( _xProps, _xPropState, XMLNS_DIALOGS_PREFIX ":menupopup", _xDocument ); + rtl::Reference<ElementDescriptor> popup = new ElementDescriptor( _xProps, _xPropState, u"" XMLNS_DIALOGS_PREFIX ":menupopup"_ustr, _xDocument ); for (const auto& rItemValue : itemValues) { - rtl::Reference<ElementDescriptor> item = new ElementDescriptor(_xProps, _xPropState, XMLNS_DIALOGS_PREFIX ":menuitem", _xDocument ); - item->addAttribute( XMLNS_DIALOGS_PREFIX ":value", rItemValue ); + rtl::Reference<ElementDescriptor> item = new ElementDescriptor(_xProps, _xPropState, u"" XMLNS_DIALOGS_PREFIX ":menuitem"_ustr, _xDocument ); + item->addAttribute( u"" XMLNS_DIALOGS_PREFIX ":value"_ustr, rItemValue ); popup->addSubElement( item ); } Sequence< sal_Int16 > selected; - if (readProp( "SelectedItems" ) >>= selected) + if (readProp( u"SelectedItems"_ustr ) >>= selected) { sal_Int16 const * pSelected = selected.getConstArray(); for ( sal_Int32 nPos = selected.getLength(); nPos--; ) { ElementDescriptor * item = static_cast< ElementDescriptor * >( popup->getSubElement( pSelected[ nPos ] ).get() ); - item->addAttribute( XMLNS_DIALOGS_PREFIX ":selected", "true" ); + item->addAttribute( u"" XMLNS_DIALOGS_PREFIX ":selected"_ustr, u"true"_ustr ); } } @@ -390,49 +390,49 @@ void ElementDescriptor::readRadioButtonModel( StyleBag * all_styles ) { // collect styles Style aStyle( 0x1 | 0x2 | 0x8 | 0x20 | 0x40 ); - if (readProp( "BackgroundColor" ) >>= aStyle._backgroundColor) + if (readProp( u"BackgroundColor"_ustr ) >>= aStyle._backgroundColor) aStyle._set |= 0x1; - if (readProp( "TextColor" ) >>= aStyle._textColor) + if (readProp( u"TextColor"_ustr ) >>= aStyle._textColor) aStyle._set |= 0x2; - if (readProp( "TextLineColor" ) >>= aStyle._textLineColor) + if (readProp( u"TextLineColor"_ustr ) >>= aStyle._textLineColor) aStyle._set |= 0x20; if (readFontProps( this, aStyle )) aStyle._set |= 0x8; - if (readProp( "VisualEffect" ) >>= aStyle._visualEffect) + if (readProp( u"VisualEffect"_ustr ) >>= aStyle._visualEffect) aStyle._set |= 0x40; if (aStyle._set) { - addAttribute( XMLNS_DIALOGS_PREFIX ":style-id" , all_styles->getStyleId( aStyle ) ); + addAttribute( u"" XMLNS_DIALOGS_PREFIX ":style-id"_ustr , all_styles->getStyleId( aStyle ) ); } // collect elements readDefaults(); - readBoolAttr("Tabstop", XMLNS_DIALOGS_PREFIX ":tabstop" ); - readStringAttr( "Label", XMLNS_DIALOGS_PREFIX ":value" ); - readAlignAttr( "Align", XMLNS_DIALOGS_PREFIX ":align" ); - readVerticalAlignAttr( "VerticalAlign", XMLNS_DIALOGS_PREFIX ":valign" ); - readImageOrGraphicAttr(XMLNS_DIALOGS_PREFIX ":image-src"); - readImagePositionAttr( "ImagePosition", XMLNS_DIALOGS_PREFIX ":image-position" ); - readBoolAttr( "MultiLine", XMLNS_DIALOGS_PREFIX ":multiline" ); - readStringAttr( "GroupName", XMLNS_DIALOGS_PREFIX ":group-name" ); + readBoolAttr(u"Tabstop"_ustr, u"" XMLNS_DIALOGS_PREFIX ":tabstop"_ustr ); + readStringAttr( u"Label"_ustr, u"" XMLNS_DIALOGS_PREFIX ":value"_ustr ); + readAlignAttr( u"Align"_ustr, u"" XMLNS_DIALOGS_PREFIX ":align"_ustr ); + readVerticalAlignAttr( u"VerticalAlign"_ustr, u"" XMLNS_DIALOGS_PREFIX ":valign"_ustr ); + readImageOrGraphicAttr(u"" XMLNS_DIALOGS_PREFIX ":image-src"_ustr); + readImagePositionAttr( u"ImagePosition"_ustr, u"" XMLNS_DIALOGS_PREFIX ":image-position"_ustr ); + readBoolAttr( u"MultiLine"_ustr, u"" XMLNS_DIALOGS_PREFIX ":multiline"_ustr ); + readStringAttr( u"GroupName"_ustr, u"" XMLNS_DIALOGS_PREFIX ":group-name"_ustr ); sal_Int16 nState = 0; - if (readProp( "State" ) >>= nState) + if (readProp( u"State"_ustr ) >>= nState) { switch (nState) { case 0: - addAttribute(XMLNS_DIALOGS_PREFIX ":checked", "false" ); + addAttribute(u"" XMLNS_DIALOGS_PREFIX ":checked"_ustr, u"false"_ustr ); break; case 1: - addAttribute( XMLNS_DIALOGS_PREFIX ":checked", "true" ); + addAttribute( u"" XMLNS_DIALOGS_PREFIX ":checked"_ustr, u"true"_ustr ); break; default: OSL_FAIL( "### unexpected radio state!" ); break; } } - readDataAwareAttr( XMLNS_DIALOGS_PREFIX ":linked-cell" ); + readDataAwareAttr( u"" XMLNS_DIALOGS_PREFIX ":linked-cell"_ustr ); readEvents(); } @@ -440,25 +440,25 @@ void ElementDescriptor::readGroupBoxModel( StyleBag * all_styles ) { // collect styles Style aStyle( 0x2 | 0x8 | 0x20 ); - if (readProp( "TextColor" ) >>= aStyle._textColor) + if (readProp( u"TextColor"_ustr ) >>= aStyle._textColor) aStyle._set |= 0x2; - if (readProp( "TextLineColor" ) >>= aStyle._textLineColor) + if (readProp( u"TextLineColor"_ustr ) >>= aStyle._textLineColor) aStyle._set |= 0x20; if (readFontProps( this, aStyle )) aStyle._set |= 0x8; if (aStyle._set) { - addAttribute( XMLNS_DIALOGS_PREFIX ":style-id", all_styles->getStyleId( aStyle ) ); + addAttribute( u"" XMLNS_DIALOGS_PREFIX ":style-id"_ustr, all_styles->getStyleId( aStyle ) ); } // collect elements readDefaults(); OUString aTitle; - if (readProp( "Label" ) >>= aTitle) + if (readProp( u"Label"_ustr ) >>= aTitle) { - rtl::Reference<ElementDescriptor> title = new ElementDescriptor( _xProps, _xPropState, XMLNS_DIALOGS_PREFIX ":title", _xDocument ); - title->addAttribute( XMLNS_DIALOGS_PREFIX ":value", aTitle ); + rtl::Reference<ElementDescriptor> title = new ElementDescriptor( _xProps, _xPropState, u"" XMLNS_DIALOGS_PREFIX ":title"_ustr, _xDocument ); + title->addAttribute( u"" XMLNS_DIALOGS_PREFIX ":value"_ustr, aTitle ); addSubElement( title ); } @@ -469,11 +469,11 @@ void ElementDescriptor::readFixedTextModel( StyleBag * all_styles ) { // collect styles Style aStyle( 0x1 | 0x2 | 0x4 | 0x8 | 0x20 ); - if (readProp( "BackgroundColor" ) >>= aStyle._backgroundColor) + if (readProp( u"BackgroundColor"_ustr ) >>= aStyle._backgroundColor) aStyle._set |= 0x1; - if (readProp( "TextColor" ) >>= aStyle._textColor) + if (readProp( u"TextColor"_ustr ) >>= aStyle._textColor) aStyle._set |= 0x2; - if (readProp( "TextLineColor" ) >>= aStyle._textLineColor) + if (readProp( u"TextLineColor"_ustr ) >>= aStyle._textLineColor) aStyle._set |= 0x20; if (readBorderProps( this, aStyle )) aStyle._set |= 0x4; @@ -481,17 +481,17 @@ void ElementDescriptor::readFixedTextModel( StyleBag * all_styles ) aStyle._set |= 0x8; if (aStyle._set) { - addAttribute( XMLNS_DIALOGS_PREFIX ":style-id", all_styles->getStyleId( aStyle ) ); + addAttribute( u"" XMLNS_DIALOGS_PREFIX ":style-id"_ustr, all_styles->getStyleId( aStyle ) ); } // collect elements readDefaults(); - readStringAttr( "Label", XMLNS_DIALOGS_PREFIX ":value" ); - readAlignAttr( "Align", XMLNS_DIALOGS_PREFIX ":align" ); - readVerticalAlignAttr( "VerticalAlign", XMLNS_DIALOGS_PREFIX ":valign" ); - readBoolAttr( "MultiLine", XMLNS_DIALOGS_PREFIX ":multiline" ); - readBoolAttr( "Tabstop", XMLNS_DIALOGS_PREFIX ":tabstop" ); - readBoolAttr( "NoLabel", XMLNS_DIALOGS_PREFIX ":nolabel" ); + readStringAttr( u"Label"_ustr, u"" XMLNS_DIALOGS_PREFIX ":value"_ustr ); + readAlignAttr( u"Align"_ustr, u"" XMLNS_DIALOGS_PREFIX ":align"_ustr ); + readVerticalAlignAttr( u"VerticalAlign"_ustr, u"" XMLNS_DIALOGS_PREFIX ":valign"_ustr ); + readBoolAttr( u"MultiLine"_ustr, u"" XMLNS_DIALOGS_PREFIX ":multiline"_ustr ); + readBoolAttr( u"Tabstop"_ustr, u"" XMLNS_DIALOGS_PREFIX ":tabstop"_ustr ); + readBoolAttr( u"NoLabel"_ustr, u"" XMLNS_DIALOGS_PREFIX ":nolabel"_ustr ); readEvents(); } @@ -499,11 +499,11 @@ void ElementDescriptor::readFixedHyperLinkModel( StyleBag * all_styles ) { // collect styles Style aStyle( 0x1 | 0x2 | 0x4 | 0x8 | 0x20 ); - if (readProp( "BackgroundColor" ) >>= aStyle._backgroundColor) + if (readProp( u"BackgroundColor"_ustr ) >>= aStyle._backgroundColor) aStyle._set |= 0x1; - if (readProp( "TextColor" ) >>= aStyle._textColor) + if (readProp( u"TextColor"_ustr ) >>= aStyle._textColor) aStyle._set |= 0x2; - if (readProp( "TextLineColor" ) >>= aStyle._textLineColor) + if (readProp( u"TextLineColor"_ustr ) >>= aStyle._textLineColor) aStyle._set |= 0x20; if (readBorderProps( this, aStyle )) aStyle._set |= 0x4; @@ -511,18 +511,18 @@ void ElementDescriptor::readFixedHyperLinkModel( StyleBag * all_styles ) aStyle._set |= 0x8; if (aStyle._set) { - addAttribute( XMLNS_DIALOGS_PREFIX ":style-id", all_styles->getStyleId( aStyle ) ); + addAttribute( u"" XMLNS_DIALOGS_PREFIX ":style-id"_ustr, all_styles->getStyleId( aStyle ) ); } // collect elements readDefaults(); - readStringAttr( "Label",XMLNS_DIALOGS_PREFIX ":value" ); - readStringAttr( "URL", XMLNS_DIALOGS_PREFIX ":url" ); - readAlignAttr( "Align", XMLNS_DIALOGS_PREFIX ":align" ); - readVerticalAlignAttr( "VerticalAlign", XMLNS_DIALOGS_PREFIX ":valign" ); - readBoolAttr( "MultiLine", XMLNS_DIALOGS_PREFIX ":multiline" ); - readBoolAttr( "Tabstop", XMLNS_DIALOGS_PREFIX ":tabstop" ); - readBoolAttr( "NoLabel", XMLNS_DIALOGS_PREFIX ":nolabel" ); + readStringAttr( u"Label"_ustr,u"" XMLNS_DIALOGS_PREFIX ":value"_ustr ); + readStringAttr( u"URL"_ustr, u"" XMLNS_DIALOGS_PREFIX ":url"_ustr ); + readAlignAttr( u"Align"_ustr, u"" XMLNS_DIALOGS_PREFIX ":align"_ustr ); + readVerticalAlignAttr( u"VerticalAlign"_ustr, u"" XMLNS_DIALOGS_PREFIX ":valign"_ustr ); + readBoolAttr( u"MultiLine"_ustr, u"" XMLNS_DIALOGS_PREFIX ":multiline"_ustr ); + readBoolAttr( u"Tabstop"_ustr, u"" XMLNS_DIALOGS_PREFIX ":tabstop"_ustr ); + readBoolAttr( u"NoLabel"_ustr, u"" XMLNS_DIALOGS_PREFIX ":nolabel"_ustr ); readEvents(); } @@ -530,11 +530,11 @@ void ElementDescriptor::readEditModel( StyleBag * all_styles ) { // collect styles Style aStyle( 0x1 | 0x2 | 0x4 | 0x8 | 0x20 ); - if (readProp( "BackgroundColor" ) >>= aStyle._backgroundColor) + if (readProp( u"BackgroundColor"_ustr ) >>= aStyle._backgroundColor) aStyle._set |= 0x1; - if (readProp( "TextColor" ) >>= aStyle._textColor) + if (readProp( u"TextColor"_ustr ) >>= aStyle._textColor) aStyle._set |= 0x2; - if (readProp( "TextLineColor" ) >>= aStyle._textLineColor) + if (readProp( u"TextLineColor"_ustr ) >>= aStyle._textLineColor) aStyle._set |= 0x20; if (readBorderProps( this, aStyle )) aStyle._set |= 0x4; @@ -542,30 +542,30 @@ void ElementDescriptor::readEditModel( StyleBag * all_styles ) aStyle._set |= 0x8; if (aStyle._set) { - addAttribute( XMLNS_DIALOGS_PREFIX ":style-id", all_styles->getStyleId( aStyle ) ); + addAttribute( u"" XMLNS_DIALOGS_PREFIX ":style-id"_ustr, all_styles->getStyleId( aStyle ) ); } // collect elements readDefaults(); - readBoolAttr( "Tabstop", XMLNS_DIALOGS_PREFIX ":tabstop" ); - readBoolAttr( "HideInactiveSelection", XMLNS_DIALOGS_PREFIX ":hide-inactive-selection" ); - readAlignAttr( "Align", XMLNS_DIALOGS_PREFIX ":align" ); - readVerticalAlignAttr( "VerticalAlign", XMLNS_DIALOGS_PREFIX ":valign" ); - readBoolAttr( "HardLineBreaks", XMLNS_DIALOGS_PREFIX ":hard-linebreaks" ); - readBoolAttr( "HScroll", XMLNS_DIALOGS_PREFIX ":hscroll" ); - readBoolAttr( "VScroll", XMLNS_DIALOGS_PREFIX ":vscroll" ); - readShortAttr( "MaxTextLen", XMLNS_DIALOGS_PREFIX ":maxlength" ); - readBoolAttr( "MultiLine", XMLNS_DIALOGS_PREFIX ":multiline" ); - readBoolAttr( "ReadOnly", XMLNS_DIALOGS_PREFIX ":readonly" ); - readStringAttr( "Text", XMLNS_DIALOGS_PREFIX ":value" ); - readLineEndFormatAttr( "LineEndFormat", XMLNS_DIALOGS_PREFIX ":lineend-format" ); + readBoolAttr( u"Tabstop"_ustr, u"" XMLNS_DIALOGS_PREFIX ":tabstop"_ustr ); + readBoolAttr( u"HideInactiveSelection"_ustr, u"" XMLNS_DIALOGS_PREFIX ":hide-inactive-selection"_ustr ); + readAlignAttr( u"Align"_ustr, u"" XMLNS_DIALOGS_PREFIX ":align"_ustr ); + readVerticalAlignAttr( u"VerticalAlign"_ustr, u"" XMLNS_DIALOGS_PREFIX ":valign"_ustr ); + readBoolAttr( u"HardLineBreaks"_ustr, u"" XMLNS_DIALOGS_PREFIX ":hard-linebreaks"_ustr ); + readBoolAttr( u"HScroll"_ustr, u"" XMLNS_DIALOGS_PREFIX ":hscroll"_ustr ); + readBoolAttr( u"VScroll"_ustr, u"" XMLNS_DIALOGS_PREFIX ":vscroll"_ustr ); + readShortAttr( u"MaxTextLen"_ustr, u"" XMLNS_DIALOGS_PREFIX ":maxlength"_ustr ); + readBoolAttr( u"MultiLine"_ustr, u"" XMLNS_DIALOGS_PREFIX ":multiline"_ustr ); + readBoolAttr( u"ReadOnly"_ustr, u"" XMLNS_DIALOGS_PREFIX ":readonly"_ustr ); + readStringAttr( u"Text"_ustr, u"" XMLNS_DIALOGS_PREFIX ":value"_ustr ); + readLineEndFormatAttr( u"LineEndFormat"_ustr, u"" XMLNS_DIALOGS_PREFIX ":lineend-format"_ustr ); sal_Int16 nEcho = 0; - if (readProp( "EchoChar" ) >>= nEcho) + if (readProp( u"EchoChar"_ustr ) >>= nEcho) { sal_Unicode cEcho = static_cast<sal_Unicode>(nEcho); - addAttribute( XMLNS_DIALOGS_PREFIX ":echochar", OUString( &cEcho, 1 ) ); + addAttribute( u"" XMLNS_DIALOGS_PREFIX ":echochar"_ustr, OUString( &cEcho, 1 ) ); } - readDataAwareAttr( XMLNS_DIALOGS_PREFIX ":linked-cell" ); + readDataAwareAttr( u"" XMLNS_DIALOGS_PREFIX ":linked-cell"_ustr ); readEvents(); } @@ -573,21 +573,21 @@ void ElementDescriptor::readImageControlModel( StyleBag * all_styles ) { // collect styles Style aStyle( 0x1 | 0x4 ); - if (readProp( "BackgroundColor" ) >>= aStyle._backgroundColor) + if (readProp( u"BackgroundColor"_ustr ) >>= aStyle._backgroundColor) aStyle._set |= 0x1; if (readBorderProps( this, aStyle )) aStyle._set |= 0x4; if (aStyle._set) { - addAttribute( XMLNS_DIALOGS_PREFIX ":style-id", all_styles->getStyleId( aStyle ) ); + addAttribute( u"" XMLNS_DIALOGS_PREFIX ":style-id"_ustr, all_styles->getStyleId( aStyle ) ); } // collect elements readDefaults(); - readBoolAttr( "ScaleImage", XMLNS_DIALOGS_PREFIX ":scale-image" ); - readImageScaleModeAttr( "ScaleMode", XMLNS_DIALOGS_PREFIX ":scale-mode" ); - readBoolAttr( "Tabstop", XMLNS_DIALOGS_PREFIX ":tabstop" ); - readImageOrGraphicAttr(XMLNS_DIALOGS_PREFIX ":src"); + readBoolAttr( u"ScaleImage"_ustr, u"" XMLNS_DIALOGS_PREFIX ":scale-image"_ustr ); + readImageScaleModeAttr( u"ScaleMode"_ustr, u"" XMLNS_DIALOGS_PREFIX ":scale-mode"_ustr ); + readBoolAttr( u"Tabstop"_ustr, u"" XMLNS_DIALOGS_PREFIX ":tabstop"_ustr ); + readImageOrGraphicAttr(u"" XMLNS_DIALOGS_PREFIX ":src"_ustr); readEvents(); } @@ -595,11 +595,11 @@ void ElementDescriptor::readFileControlModel( StyleBag * all_styles ) { // collect styles Style aStyle( 0x1 | 0x2 | 0x4 | 0x8 | 0x20 ); - if (readProp( "BackgroundColor" ) >>= aStyle._backgroundColor) + if (readProp( u"BackgroundColor"_ustr ) >>= aStyle._backgroundColor) aStyle._set |= 0x1; - if (readProp( "TextColor" ) >>= aStyle._textColor) + if (readProp( u"TextColor"_ustr ) >>= aStyle._textColor) aStyle._set |= 0x2; - if (readProp( "TextLineColor" ) >>= aStyle._textLineColor) + if (readProp( u"TextLineColor"_ustr ) >>= aStyle._textLineColor) aStyle._set |= 0x20; if (readBorderProps( this, aStyle )) aStyle._set |= 0x4; @@ -607,15 +607,15 @@ void ElementDescriptor::readFileControlModel( StyleBag * all_styles ) aStyle._set |= 0x8; if (aStyle._set) { - addAttribute( XMLNS_DIALOGS_PREFIX ":style-id", all_styles->getStyleId( aStyle ) ); + addAttribute( u"" XMLNS_DIALOGS_PREFIX ":style-id"_ustr, all_styles->getStyleId( aStyle ) ); } // collect elements readDefaults(); - readBoolAttr( "Tabstop", XMLNS_DIALOGS_PREFIX ":tabstop" ); - readBoolAttr( "HideInactiveSelection", XMLNS_DIALOGS_PREFIX ":hide-inactive-selection" ); - readStringAttr( "Text", XMLNS_DIALOGS_PREFIX ":value" ); - readBoolAttr( "ReadOnly", XMLNS_DIALOGS_PREFIX ":readonly" ); + readBoolAttr( u"Tabstop"_ustr, u"" XMLNS_DIALOGS_PREFIX ":tabstop"_ustr ); + readBoolAttr( u"HideInactiveSelection"_ustr, u"" XMLNS_DIALOGS_PREFIX ":hide-inactive-selection"_ustr ); + readStringAttr( u"Text"_ustr, u"" XMLNS_DIALOGS_PREFIX ":value"_ustr ); + readBoolAttr( u"ReadOnly"_ustr, u"" XMLNS_DIALOGS_PREFIX ":readonly"_ustr ); readEvents(); } @@ -623,26 +623,26 @@ void ElementDescriptor::readTreeControlModel( StyleBag * all_styles ) { // collect styles Style aStyle( 0x1 | 0x2 | 0x4 | 0x8 | 0x20 ); - if (readProp( "BackgroundColor" ) >>= aStyle._backgroundColor) + if (readProp( u"BackgroundColor"_ustr ) >>= aStyle._backgroundColor) aStyle._set |= 0x1; if (readBorderProps( this, aStyle )) aStyle._set |= 0x4; if (aStyle._set) { - addAttribute( XMLNS_DIALOGS_PREFIX ":style-id", all_styles->getStyleId( aStyle ) ); + addAttribute( u"" XMLNS_DIALOGS_PREFIX ":style-id"_ustr, all_styles->getStyleId( aStyle ) ); } // collect elements readDefaults(); - readBoolAttr( "Tabstop", XMLNS_DIALOGS_PREFIX ":tabstop" ); - readSelectionTypeAttr( "SelectionType", XMLNS_DIALOGS_PREFIX ":selectiontype" ); - - readBoolAttr( "RootDisplayed", XMLNS_DIALOGS_PREFIX ":rootdisplayed" ); - readBoolAttr( "ShowsHandles", XMLNS_DIALOGS_PREFIX ":showshandles" ); - readBoolAttr( "ShowsRootHandles", XMLNS_DIALOGS_PREFIX ":showsroothandles" ); - readBoolAttr( "Editable", XMLNS_DIALOGS_PREFIX ":editable" ); - readBoolAttr( "InvokesStopNodeEditing", XMLNS_DIALOGS_PREFIX ":invokesstopnodeediting" ); - readLongAttr( "RowHeight", XMLNS_DIALOGS_PREFIX ":rowheight" ); + readBoolAttr( u"Tabstop"_ustr, u"" XMLNS_DIALOGS_PREFIX ":tabstop"_ustr ); + readSelectionTypeAttr( u"SelectionType"_ustr, u"" XMLNS_DIALOGS_PREFIX ":selectiontype"_ustr ); + + readBoolAttr( u"RootDisplayed"_ustr, u"" XMLNS_DIALOGS_PREFIX ":rootdisplayed"_ustr ); + readBoolAttr( u"ShowsHandles"_ustr, u"" XMLNS_DIALOGS_PREFIX ":showshandles"_ustr ); + readBoolAttr( u"ShowsRootHandles"_ustr, u"" XMLNS_DIALOGS_PREFIX ":showsroothandles"_ustr ); + readBoolAttr( u"Editable"_ustr, u"" XMLNS_DIALOGS_PREFIX ":editable"_ustr ); + readBoolAttr( u"InvokesStopNodeEditing"_ustr, u"" XMLNS_DIALOGS_PREFIX ":invokesstopnodeediting"_ustr ); + readLongAttr( u"RowHeight"_ustr, u"" XMLNS_DIALOGS_PREFIX ":rowheight"_ustr ); readEvents(); } @@ -650,11 +650,11 @@ void ElementDescriptor::readCurrencyFieldModel( StyleBag * all_styles ) { // collect styles Style aStyle( 0x1 | 0x2 | 0x4 | 0x8 | 0x20 ); - if (readProp( "BackgroundColor" ) >>= aStyle._backgroundColor) + if (readProp( u"BackgroundColor"_ustr ) >>= aStyle._backgroundColor) aStyle._set |= 0x1; - if (readProp( "TextColor" ) >>= aStyle._textColor) + if (readProp( u"TextColor"_ustr ) >>= aStyle._textColor) aStyle._set |= 0x2; - if (readProp( "TextLineColor" ) >>= aStyle._textLineColor) + if (readProp( u"TextLineColor"_ustr ) >>= aStyle._textLineColor) aStyle._set |= 0x20; if (readBorderProps( this, aStyle )) aStyle._set |= 0x4; @@ -662,29 +662,29 @@ void ElementDescriptor::readCurrencyFieldModel( StyleBag * all_styles ) aStyle._set |= 0x8; if (aStyle._set) { - addAttribute( XMLNS_DIALOGS_PREFIX ":style-id", all_styles->getStyleId( aStyle ) ); + addAttribute( u"" XMLNS_DIALOGS_PREFIX ":style-id"_ustr, all_styles->getStyleId( aStyle ) ); } // collect elements readDefaults(); - readAlignAttr( "Align", XMLNS_DIALOGS_PREFIX ":align" ); - readVerticalAlignAttr( "VerticalAlign", XMLNS_DIALOGS_PREFIX ":valign" ); - readBoolAttr( "Tabstop", XMLNS_DIALOGS_PREFIX ":tabstop" ); - readBoolAttr( "ReadOnly", XMLNS_DIALOGS_PREFIX ":readonly" ); - readBoolAttr( "HideInactiveSelection", XMLNS_DIALOGS_PREFIX ":hide-inactive-selection" ); - readBoolAttr( "StrictFormat", XMLNS_DIALOGS_PREFIX ":strict-format" ); - readStringAttr( "CurrencySymbol", XMLNS_DIALOGS_PREFIX ":currency-symbol" ); - readShortAttr( "DecimalAccuracy", XMLNS_DIALOGS_PREFIX ":decimal-accuracy" ); - readBoolAttr( "ShowThousandsSeparator", XMLNS_DIALOGS_PREFIX ":thousands-separator" ); - readDoubleAttr( "Value", XMLNS_DIALOGS_PREFIX ":value" ); - readDoubleAttr( "ValueMin", XMLNS_DIALOGS_PREFIX ":value-min" ); - readDoubleAttr( "ValueMax", XMLNS_DIALOGS_PREFIX ":value-max" ); - readDoubleAttr( "ValueStep", XMLNS_DIALOGS_PREFIX ":value-step" ); - readBoolAttr( "Spin", XMLNS_DIALOGS_PREFIX ":spin" ); - if (extract_throw<bool>( _xProps->getPropertyValue( "Repeat" ) )) - readLongAttr( "RepeatDelay", XMLNS_DIALOGS_PREFIX ":repeat", true /* force */ ); - readBoolAttr("PrependCurrencySymbol", XMLNS_DIALOGS_PREFIX ":prepend-symbol" ); - readBoolAttr( "EnforceFormat", XMLNS_DIALOGS_PREFIX ":enforce-format" ); + readAlignAttr( u"Align"_ustr, u"" XMLNS_DIALOGS_PREFIX ":align"_ustr ); + readVerticalAlignAttr( u"VerticalAlign"_ustr, u"" XMLNS_DIALOGS_PREFIX ":valign"_ustr ); + readBoolAttr( u"Tabstop"_ustr, u"" XMLNS_DIALOGS_PREFIX ":tabstop"_ustr ); + readBoolAttr( u"ReadOnly"_ustr, u"" XMLNS_DIALOGS_PREFIX ":readonly"_ustr ); + readBoolAttr( u"HideInactiveSelection"_ustr, u"" XMLNS_DIALOGS_PREFIX ":hide-inactive-selection"_ustr ); + readBoolAttr( u"StrictFormat"_ustr, u"" XMLNS_DIALOGS_PREFIX ":strict-format"_ustr ); + readStringAttr( u"CurrencySymbol"_ustr, u"" XMLNS_DIALOGS_PREFIX ":currency-symbol"_ustr ); + readShortAttr( u"DecimalAccuracy"_ustr, u"" XMLNS_DIALOGS_PREFIX ":decimal-accuracy"_ustr ); + readBoolAttr( u"ShowThousandsSeparator"_ustr, u"" XMLNS_DIALOGS_PREFIX ":thousands-separator"_ustr ); + readDoubleAttr( u"Value"_ustr, u"" XMLNS_DIALOGS_PREFIX ":value"_ustr ); + readDoubleAttr( u"ValueMin"_ustr, u"" XMLNS_DIALOGS_PREFIX ":value-min"_ustr ); + readDoubleAttr( u"ValueMax"_ustr, u"" XMLNS_DIALOGS_PREFIX ":value-max"_ustr ); + readDoubleAttr( u"ValueStep"_ustr, u"" XMLNS_DIALOGS_PREFIX ":value-step"_ustr ); + readBoolAttr( u"Spin"_ustr, u"" XMLNS_DIALOGS_PREFIX ":spin"_ustr ); + if (extract_throw<bool>( _xProps->getPropertyValue( u"Repeat"_ustr ) )) + readLongAttr( u"RepeatDelay"_ustr, u"" XMLNS_DIALOGS_PREFIX ":repeat"_ustr, true /* force */ ); + readBoolAttr(u"PrependCurrencySymbol"_ustr, u"" XMLNS_DIALOGS_PREFIX ":prepend-symbol"_ustr ); + readBoolAttr( u"EnforceFormat"_ustr, u"" XMLNS_DIALOGS_PREFIX ":enforce-format"_ustr ); readEvents(); } @@ -692,11 +692,11 @@ void ElementDescriptor::readDateFieldModel( StyleBag * all_styles ) { // collect styles Style aStyle( 0x1 | 0x2 | 0x4 | 0x8 | 0x20 ); - if (readProp( "BackgroundColor" ) >>= aStyle._backgroundColor) + if (readProp( u"BackgroundColor"_ustr ) >>= aStyle._backgroundColor) aStyle._set |= 0x1; - if (readProp( "TextColor" ) >>= aStyle._textColor) + if (readProp( u"TextColor"_ustr ) >>= aStyle._textColor) aStyle._set |= 0x2; - if (readProp( "TextLineColor" ) >>= aStyle._textLineColor) + if (readProp( u"TextLineColor"_ustr ) >>= aStyle._textLineColor) aStyle._set |= 0x20; if (readBorderProps( this, aStyle )) aStyle._set |= 0x4; @@ -704,28 +704,28 @@ void ElementDescriptor::readDateFieldModel( StyleBag * all_styles ) aStyle._set |= 0x8; if (aStyle._set) { - addAttribute( XMLNS_DIALOGS_PREFIX ":style-id", all_styles->getStyleId( aStyle ) ); + addAttribute( u"" XMLNS_DIALOGS_PREFIX ":style-id"_ustr, all_styles->getStyleId( aStyle ) ); } // collect elements readDefaults(); - readAlignAttr( "Align", XMLNS_DIALOGS_PREFIX ":align" ); - readVerticalAlignAttr( "VerticalAlign", XMLNS_DIALOGS_PREFIX ":valign" ); - readBoolAttr( "Tabstop", XMLNS_DIALOGS_PREFIX ":tabstop" ); - readBoolAttr( "ReadOnly", XMLNS_DIALOGS_PREFIX ":readonly" ); - readBoolAttr( "HideInactiveSelection", XMLNS_DIALOGS_PREFIX ":hide-inactive-selection" ); - readBoolAttr( "StrictFormat", XMLNS_DIALOGS_PREFIX ":strict-format" ); - readDateFormatAttr( "DateFormat", XMLNS_DIALOGS_PREFIX ":date-format" ); - readBoolAttr( "DateShowCentury", XMLNS_DIALOGS_PREFIX ":show-century" ); - readDateAttr( "Date", XMLNS_DIALOGS_PREFIX ":value" ); - readDateAttr( "DateMin", XMLNS_DIALOGS_PREFIX ":value-min" ); - readDateAttr( "DateMax", XMLNS_DIALOGS_PREFIX ":value-max" ); - readBoolAttr( "Spin", XMLNS_DIALOGS_PREFIX ":spin" ); - if (extract_throw<bool>( _xProps->getPropertyValue( "Repeat" ) )) - readLongAttr( "RepeatDelay", XMLNS_DIALOGS_PREFIX ":repeat", true /* force */ ); - readBoolAttr( "Dropdown", XMLNS_DIALOGS_PREFIX ":dropdown" ); - readStringAttr( "Text", XMLNS_DIALOGS_PREFIX ":text" ); - readBoolAttr( "EnforceFormat", XMLNS_DIALOGS_PREFIX ":enforce-format" ); + readAlignAttr( u"Align"_ustr, u"" XMLNS_DIALOGS_PREFIX ":align"_ustr ); + readVerticalAlignAttr( u"VerticalAlign"_ustr, u"" XMLNS_DIALOGS_PREFIX ":valign"_ustr ); + readBoolAttr( u"Tabstop"_ustr, u"" XMLNS_DIALOGS_PREFIX ":tabstop"_ustr ); + readBoolAttr( u"ReadOnly"_ustr, u"" XMLNS_DIALOGS_PREFIX ":readonly"_ustr ); + readBoolAttr( u"HideInactiveSelection"_ustr, u"" XMLNS_DIALOGS_PREFIX ":hide-inactive-selection"_ustr ); + readBoolAttr( u"StrictFormat"_ustr, u"" XMLNS_DIALOGS_PREFIX ":strict-format"_ustr ); + readDateFormatAttr( u"DateFormat"_ustr, u"" XMLNS_DIALOGS_PREFIX ":date-format"_ustr ); + readBoolAttr( u"DateShowCentury"_ustr, u"" XMLNS_DIALOGS_PREFIX ":show-century"_ustr ); + readDateAttr( u"Date"_ustr, u"" XMLNS_DIALOGS_PREFIX ":value"_ustr ); + readDateAttr( u"DateMin"_ustr, u"" XMLNS_DIALOGS_PREFIX ":value-min"_ustr ); + readDateAttr( u"DateMax"_ustr, u"" XMLNS_DIALOGS_PREFIX ":value-max"_ustr ); + readBoolAttr( u"Spin"_ustr, u"" XMLNS_DIALOGS_PREFIX ":spin"_ustr ); + if (extract_throw<bool>( _xProps->getPropertyValue( u"Repeat"_ustr ) )) + readLongAttr( u"RepeatDelay"_ustr, u"" XMLNS_DIALOGS_PREFIX ":repeat"_ustr, true /* force */ ); + readBoolAttr( u"Dropdown"_ustr, u"" XMLNS_DIALOGS_PREFIX ":dropdown"_ustr ); + readStringAttr( u"Text"_ustr, u"" XMLNS_DIALOGS_PREFIX ":text"_ustr ); + readBoolAttr( u"EnforceFormat"_ustr, u"" XMLNS_DIALOGS_PREFIX ":enforce-format"_ustr ); readEvents(); } @@ -733,11 +733,11 @@ void ElementDescriptor::readNumericFieldModel( StyleBag * all_styles ) { // collect styles Style aStyle( 0x1 | 0x2 | 0x4 | 0x8 | 0x20 ); - if (readProp( "BackgroundColor" ) >>= aStyle._backgroundColor) + if (readProp( u"BackgroundColor"_ustr ) >>= aStyle._backgroundColor) aStyle._set |= 0x1; - if (readProp( "TextColor" ) >>= aStyle._textColor) + if (readProp( u"TextColor"_ustr ) >>= aStyle._textColor) aStyle._set |= 0x2; - if (readProp( "TextLineColor" ) >>= aStyle._textLineColor) + if (readProp( u"TextLineColor"_ustr ) >>= aStyle._textLineColor) aStyle._set |= 0x20; if (readBorderProps( this, aStyle )) aStyle._set |= 0x4; @@ -745,27 +745,27 @@ void ElementDescriptor::readNumericFieldModel( StyleBag * all_styles ) aStyle._set |= 0x8; if (aStyle._set) { - addAttribute( XMLNS_DIALOGS_PREFIX ":style-id", all_styles->getStyleId( aStyle ) ); + addAttribute( u"" XMLNS_DIALOGS_PREFIX ":style-id"_ustr, all_styles->getStyleId( aStyle ) ); } // collect elements readDefaults(); - readAlignAttr( "Align", XMLNS_DIALOGS_PREFIX ":align" ); - readVerticalAlignAttr( "VerticalAlign", XMLNS_DIALOGS_PREFIX ":valign" ); - readBoolAttr( "Tabstop", XMLNS_DIALOGS_PREFIX ":tabstop" ); - readBoolAttr( "ReadOnly", XMLNS_DIALOGS_PREFIX ":readonly" ); - readBoolAttr( "HideInactiveSelection", XMLNS_DIALOGS_PREFIX ":hide-inactive-selection" ); - readBoolAttr( "StrictFormat", XMLNS_DIALOGS_PREFIX ":strict-format" ); - readShortAttr( "DecimalAccuracy", XMLNS_DIALOGS_PREFIX ":decimal-accuracy" ); - readBoolAttr( "ShowThousandsSeparator", XMLNS_DIALOGS_PREFIX ":thousands-separator" ); - readDoubleAttr( "Value", XMLNS_DIALOGS_PREFIX ":value" ); - readDoubleAttr( "ValueMin", XMLNS_DIALOGS_PREFIX ":value-min" ); - readDoubleAttr( "ValueMax", XMLNS_DIALOGS_PREFIX ":value-max" ); - readDoubleAttr( "ValueStep", XMLNS_DIALOGS_PREFIX ":value-step" ); - readBoolAttr( "Spin", XMLNS_DIALOGS_PREFIX ":spin" ); - if (extract_throw<bool>( _xProps->getPropertyValue( "Repeat" ) )) - readLongAttr( "RepeatDelay", XMLNS_DIALOGS_PREFIX ":repeat", true /* force */ ); - readBoolAttr( "EnforceFormat", XMLNS_DIALOGS_PREFIX ":enforce-format" ); + readAlignAttr( u"Align"_ustr, u"" XMLNS_DIALOGS_PREFIX ":align"_ustr ); + readVerticalAlignAttr( u"VerticalAlign"_ustr, u"" XMLNS_DIALOGS_PREFIX ":valign"_ustr ); + readBoolAttr( u"Tabstop"_ustr, u"" XMLNS_DIALOGS_PREFIX ":tabstop"_ustr ); + readBoolAttr( u"ReadOnly"_ustr, u"" XMLNS_DIALOGS_PREFIX ":readonly"_ustr ); + readBoolAttr( u"HideInactiveSelection"_ustr, u"" XMLNS_DIALOGS_PREFIX ":hide-inactive-selection"_ustr ); + readBoolAttr( u"StrictFormat"_ustr, u"" XMLNS_DIALOGS_PREFIX ":strict-format"_ustr ); + readShortAttr( u"DecimalAccuracy"_ustr, u"" XMLNS_DIALOGS_PREFIX ":decimal-accuracy"_ustr ); + readBoolAttr( u"ShowThousandsSeparator"_ustr, u"" XMLNS_DIALOGS_PREFIX ":thousands-separator"_ustr ); + readDoubleAttr( u"Value"_ustr, u"" XMLNS_DIALOGS_PREFIX ":value"_ustr ); + readDoubleAttr( u"ValueMin"_ustr, u"" XMLNS_DIALOGS_PREFIX ":value-min"_ustr ); + readDoubleAttr( u"ValueMax"_ustr, u"" XMLNS_DIALOGS_PREFIX ":value-max"_ustr ); + readDoubleAttr( u"ValueStep"_ustr, u"" XMLNS_DIALOGS_PREFIX ":value-step"_ustr ); + readBoolAttr( u"Spin"_ustr, u"" XMLNS_DIALOGS_PREFIX ":spin"_ustr ); + if (extract_throw<bool>( _xProps->getPropertyValue( u"Repeat"_ustr ) )) + readLongAttr( u"RepeatDelay"_ustr, u"" XMLNS_DIALOGS_PREFIX ":repeat"_ustr, true /* force */ ); + readBoolAttr( u"EnforceFormat"_ustr, u"" XMLNS_DIALOGS_PREFIX ":enforce-format"_ustr ); readEvents(); } @@ -773,11 +773,11 @@ void ElementDescriptor::readTimeFieldModel( StyleBag * all_styles ) { // collect styles Style aStyle( 0x1 | 0x2 | 0x4 | 0x8 | 0x20 ); - if (readProp( "BackgroundColor" ) >>= aStyle._backgroundColor) + if (readProp( u"BackgroundColor"_ustr ) >>= aStyle._backgroundColor) aStyle._set |= 0x1; - if (readProp( "TextColor" ) >>= aStyle._textColor) + if (readProp( u"TextColor"_ustr ) >>= aStyle._textColor) aStyle._set |= 0x2; - if (readProp( "TextLineColor" ) >>= aStyle._textLineColor) + if (readProp( u"TextLineColor"_ustr ) >>= aStyle._textLineColor) aStyle._set |= 0x20; if (readBorderProps( this, aStyle )) aStyle._set |= 0x4; @@ -785,24 +785,24 @@ void ElementDescriptor::readTimeFieldModel( StyleBag * all_styles ) aStyle._set |= 0x8; if (aStyle._set) { - addAttribute( XMLNS_DIALOGS_PREFIX ":style-id", all_styles->getStyleId( aStyle ) ); + addAttribute( u"" XMLNS_DIALOGS_PREFIX ":style-id"_ustr, all_styles->getStyleId( aStyle ) ); } // collect elements readDefaults(); - readBoolAttr( "Tabstop", XMLNS_DIALOGS_PREFIX ":tabstop"); - readBoolAttr( "ReadOnly", XMLNS_DIALOGS_PREFIX ":readonly" ); - readBoolAttr( "HideInactiveSelection", XMLNS_DIALOGS_PREFIX ":hide-inactive-selection" ); - readBoolAttr( "StrictFormat", XMLNS_DIALOGS_PREFIX ":strict-format" ); - readTimeFormatAttr( "TimeFormat", XMLNS_DIALOGS_PREFIX ":time-format" ); - readTimeAttr( "Time", XMLNS_DIALOGS_PREFIX ":value" ); - readTimeAttr( "TimeMin", XMLNS_DIALOGS_PREFIX ":value-min" ); - readTimeAttr( "TimeMax", XMLNS_DIALOGS_PREFIX ":value-max" ); - readBoolAttr( "Spin", XMLNS_DIALOGS_PREFIX ":spin" ); - if (extract_throw<bool>( _xProps->getPropertyValue( "Repeat" ) )) - readLongAttr( "RepeatDelay", XMLNS_DIALOGS_PREFIX ":repeat", true /* force */ ); - readStringAttr( "Text", XMLNS_DIALOGS_PREFIX ":text" ); - readBoolAttr( "EnforceFormat", XMLNS_DIALOGS_PREFIX ":enforce-format" ); + readBoolAttr( u"Tabstop"_ustr, u"" XMLNS_DIALOGS_PREFIX ":tabstop"_ustr); + readBoolAttr( u"ReadOnly"_ustr, u"" XMLNS_DIALOGS_PREFIX ":readonly"_ustr ); + readBoolAttr( u"HideInactiveSelection"_ustr, u"" XMLNS_DIALOGS_PREFIX ":hide-inactive-selection"_ustr ); + readBoolAttr( u"StrictFormat"_ustr, u"" XMLNS_DIALOGS_PREFIX ":strict-format"_ustr ); + readTimeFormatAttr( u"TimeFormat"_ustr, u"" XMLNS_DIALOGS_PREFIX ":time-format"_ustr ); + readTimeAttr( u"Time"_ustr, u"" XMLNS_DIALOGS_PREFIX ":value"_ustr ); + readTimeAttr( u"TimeMin"_ustr, u"" XMLNS_DIALOGS_PREFIX ":value-min"_ustr ); + readTimeAttr( u"TimeMax"_ustr, u"" XMLNS_DIALOGS_PREFIX ":value-max"_ustr ); + readBoolAttr( u"Spin"_ustr, u"" XMLNS_DIALOGS_PREFIX ":spin"_ustr ); + if (extract_throw<bool>( _xProps->getPropertyValue( u"Repeat"_ustr ) )) + readLongAttr( u"RepeatDelay"_ustr, u"" XMLNS_DIALOGS_PREFIX ":repeat"_ustr, true /* force */ ); + readStringAttr( u"Text"_ustr, u"" XMLNS_DIALOGS_PREFIX ":text"_ustr ); + readBoolAttr( u"EnforceFormat"_ustr, u"" XMLNS_DIALOGS_PREFIX ":enforce-format"_ustr ); readEvents(); } @@ -810,11 +810,11 @@ void ElementDescriptor::readPatternFieldModel( StyleBag * all_styles ) { // collect styles Style aStyle( 0x1 | 0x2 | 0x4 | 0x8 | 0x20 ); - if (readProp( "BackgroundColor" ) >>= aStyle._backgroundColor) + if (readProp( u"BackgroundColor"_ustr ) >>= aStyle._backgroundColor) aStyle._set |= 0x1; - if (readProp( "TextColor" ) >>= aStyle._textColor) + if (readProp( u"TextColor"_ustr ) >>= aStyle._textColor) aStyle._set |= 0x2; - if (readProp( "TextLineColor" ) >>= aStyle._textLineColor) + if (readProp( u"TextLineColor"_ustr ) >>= aStyle._textLineColor) aStyle._set |= 0x20; if (readBorderProps( this, aStyle )) aStyle._set |= 0x4; @@ -822,19 +822,19 @@ void ElementDescriptor::readPatternFieldModel( StyleBag * all_styles ) aStyle._set |= 0x8; if (aStyle._set) { - addAttribute( XMLNS_DIALOGS_PREFIX ":style-id", all_styles->getStyleId( aStyle ) ); + addAttribute( u"" XMLNS_DIALOGS_PREFIX ":style-id"_ustr, all_styles->getStyleId( aStyle ) ); } // collect elements readDefaults(); - readBoolAttr( "Tabstop", XMLNS_DIALOGS_PREFIX ":tabstop" ); - readBoolAttr( "ReadOnly", XMLNS_DIALOGS_PREFIX ":readonly" ); - readBoolAttr( "HideInactiveSelection", XMLNS_DIALOGS_PREFIX ":hide-inactive-selection" ); - readBoolAttr( "StrictFormat", XMLNS_DIALOGS_PREFIX ":strict-format" ); - readStringAttr( "Text", XMLNS_DIALOGS_PREFIX ":value" ); - readShortAttr( "MaxTextLen", XMLNS_DIALOGS_PREFIX ":maxlength" ); - readStringAttr( "EditMask", XMLNS_DIALOGS_PREFIX ":edit-mask" ); - readStringAttr( "LiteralMask", XMLNS_DIALOGS_PREFIX ":literal-mask" ); + readBoolAttr( u"Tabstop"_ustr, u"" XMLNS_DIALOGS_PREFIX ":tabstop"_ustr ); + readBoolAttr( u"ReadOnly"_ustr, u"" XMLNS_DIALOGS_PREFIX ":readonly"_ustr ); + readBoolAttr( u"HideInactiveSelection"_ustr, u"" XMLNS_DIALOGS_PREFIX ":hide-inactive-selection"_ustr ); + readBoolAttr( u"StrictFormat"_ustr, u"" XMLNS_DIALOGS_PREFIX ":strict-format"_ustr ); + readStringAttr( u"Text"_ustr, u"" XMLNS_DIALOGS_PREFIX ":value"_ustr ); + readShortAttr( u"MaxTextLen"_ustr, u"" XMLNS_DIALOGS_PREFIX ":maxlength"_ustr ); + readStringAttr( u"EditMask"_ustr, u"" XMLNS_DIALOGS_PREFIX ":edit-mask"_ustr ); + readStringAttr( u"LiteralMask"_ustr, u"" XMLNS_DIALOGS_PREFIX ":literal-mask"_ustr ); readEvents(); } @@ -842,11 +842,11 @@ void ElementDescriptor::readFormattedFieldModel( StyleBag * all_styles ) { // collect styles Style aStyle( 0x1 | 0x2 | 0x4 | 0x8 | 0x20 ); - if (readProp( "BackgroundColor" ) >>= aStyle._backgroundColor) + if (readProp( u"BackgroundColor"_ustr ) >>= aStyle._backgroundColor) aStyle._set |= 0x1; - if (readProp( "TextColor" ) >>= aStyle._textColor) + if (readProp( u"TextColor"_ustr ) >>= aStyle._textColor) aStyle._set |= 0x2; - if (readProp( "TextLineColor" ) >>= aStyle._textLineColor) + if (readProp( u"TextLineColor"_ustr ) >>= aStyle._textLineColor) aStyle._set |= 0x20; if (readBorderProps( this, aStyle )) aStyle._set |= 0x4; @@ -854,51 +854,51 @@ void ElementDescriptor::readFormattedFieldModel( StyleBag * all_styles ) aStyle._set |= 0x8; if (aStyle._set) { - addAttribute( XMLNS_DIALOGS_PREFIX ":style-id", all_styles->getStyleId( aStyle ) ); + addAttribute( u"" XMLNS_DIALOGS_PREFIX ":style-id"_ustr, all_styles->getStyleId( aStyle ) ); } // collect elements readDefaults(); - readBoolAttr( "Tabstop", XMLNS_DIALOGS_PREFIX ":tabstop" ); - readBoolAttr( "ReadOnly", XMLNS_DIALOGS_PREFIX ":readonly" ); - readBoolAttr( "HideInactiveSelection",XMLNS_DIALOGS_PREFIX ":hide-inactive-selection" ); - readBoolAttr( "StrictFormat", XMLNS_DIALOGS_PREFIX ":strict-format" ); - readStringAttr( "Text", XMLNS_DIALOGS_PREFIX ":text" ); - readAlignAttr( "Align", XMLNS_DIALOGS_PREFIX ":align" ); - readShortAttr( "MaxTextLen", XMLNS_DIALOGS_PREFIX ":maxlength" ); - readBoolAttr( "Spin", XMLNS_DIALOGS_PREFIX ":spin" ); - if (extract_throw<bool>( _xProps->getPropertyValue( "Repeat" ) )) - readLongAttr( "RepeatDelay",XMLNS_DIALOGS_PREFIX ":repeat", true /* force */ ); - - Any a( readProp( "EffectiveDefault" ) ); + readBoolAttr( u"Tabstop"_ustr, u"" XMLNS_DIALOGS_PREFIX ":tabstop"_ustr ); + readBoolAttr( u"ReadOnly"_ustr, u"" XMLNS_DIALOGS_PREFIX ":readonly"_ustr ); + readBoolAttr( u"HideInactiveSelection"_ustr,u"" XMLNS_DIALOGS_PREFIX ":hide-inactive-selection"_ustr ); + readBoolAttr( u"StrictFormat"_ustr, u"" XMLNS_DIALOGS_PREFIX ":strict-format"_ustr ); + readStringAttr( u"Text"_ustr, u"" XMLNS_DIALOGS_PREFIX ":text"_ustr ); + readAlignAttr( u"Align"_ustr, u"" XMLNS_DIALOGS_PREFIX ":align"_ustr ); + readShortAttr( u"MaxTextLen"_ustr, u"" XMLNS_DIALOGS_PREFIX ":maxlength"_ustr ); + readBoolAttr( u"Spin"_ustr, u"" XMLNS_DIALOGS_PREFIX ":spin"_ustr ); + if (extract_throw<bool>( _xProps->getPropertyValue( u"Repeat"_ustr ) )) + readLongAttr( u"RepeatDelay"_ustr,u"" XMLNS_DIALOGS_PREFIX ":repeat"_ustr, true /* force */ ); + + Any a( readProp( u"EffectiveDefault"_ustr ) ); switch (a.getValueTypeClass()) { case TypeClass_DOUBLE: - addAttribute( XMLNS_DIALOGS_PREFIX ":value-default", OUString::number( *o3tl::forceAccess<double>(a) ) ); + addAttribute( u"" XMLNS_DIALOGS_PREFIX ":value-default"_ustr, OUString::number( *o3tl::forceAccess<double>(a) ) ); break; case TypeClass_STRING: - addAttribute( XMLNS_DIALOGS_PREFIX ":value-default", *o3tl::forceAccess<OUString>(a) ); + addAttribute( u"" XMLNS_DIALOGS_PREFIX ":value-default"_ustr, *o3tl::forceAccess<OUString>(a) ); break; default: break; } - readDoubleAttr( "EffectiveMin", XMLNS_DIALOGS_PREFIX ":value-min" ); - readDoubleAttr( "EffectiveMax", XMLNS_DIALOGS_PREFIX ":value-max" ); - readDoubleAttr( "EffectiveValue", XMLNS_DIALOGS_PREFIX ":value" ); + readDoubleAttr( u"EffectiveMin"_ustr, u"" XMLNS_DIALOGS_PREFIX ":value-min"_ustr ); + readDoubleAttr( u"EffectiveMax"_ustr, u"" XMLNS_DIALOGS_PREFIX ":value-max"_ustr ); + readDoubleAttr( u"EffectiveValue"_ustr, u"" XMLNS_DIALOGS_PREFIX ":value"_ustr ); // format spec sal_Int32 nKey = 0; - if (readProp( "FormatKey" ) >>= nKey) + if (readProp( u"FormatKey"_ustr ) >>= nKey) { Reference< util::XNumberFormatsSupplier > xSupplier; - if (readProp( "FormatsSupplier" ) >>= xSupplier) + if (readProp( u"FormatsSupplier"_ustr ) >>= xSupplier) { addNumberFormatAttr( xSupplier->getNumberFormats()->getByKey( nKey ) ); } } - readBoolAttr( "TreatAsNumber", XMLNS_DIALOGS_PREFIX ":treat-as-number" ); - readBoolAttr( "EnforceFormat", XMLNS_DIALOGS_PREFIX ":enforce-format" ); + readBoolAttr( u"TreatAsNumber"_ustr, u"" XMLNS_DIALOGS_PREFIX ":treat-as-number"_ustr ); + readBoolAttr( u"EnforceFormat"_ustr, u"" XMLNS_DIALOGS_PREFIX ":enforce-format"_ustr ); readEvents(); } @@ -907,27 +907,27 @@ void ElementDescriptor::readSpinButtonModel( StyleBag * all_styles ) { // collect styles Style aStyle( 0x1 | 0x4 ); - if (readProp( "BackgroundColor" ) >>= aStyle._backgroundColor) + if (readProp( u"BackgroundColor"_ustr ) >>= aStyle._backgroundColor) aStyle._set |= 0x1; if (readBorderProps( this, aStyle )) aStyle._set |= 0x4; if (aStyle._set) { - addAttribute( XMLNS_DIALOGS_PREFIX ":style-id", all_styles->getStyleId( aStyle ) ); + addAttribute( u"" XMLNS_DIALOGS_PREFIX ":style-id"_ustr, all_styles->getStyleId( aStyle ) ); } // collect elements readDefaults(); - readOrientationAttr( "Orientation", XMLNS_DIALOGS_PREFIX ":align" ); - readLongAttr( "SpinIncrement", XMLNS_DIALOGS_PREFIX ":increment" ); - readLongAttr( "SpinValue", XMLNS_DIALOGS_PREFIX ":curval" ); - readLongAttr( "SpinValueMax", XMLNS_DIALOGS_PREFIX ":maxval" ); - readLongAttr( "SpinValueMin", XMLNS_DIALOGS_PREFIX ":minval" ); - readLongAttr( "Repeat", XMLNS_DIALOGS_PREFIX ":repeat" ); - readLongAttr( "RepeatDelay", XMLNS_DIALOGS_PREFIX ":repeat-delay" ); - readBoolAttr( "Tabstop", XMLNS_DIALOGS_PREFIX ":tabstop" ); - readHexLongAttr( "SymbolColor", XMLNS_DIALOGS_PREFIX ":symbol-color" ); - readDataAwareAttr( XMLNS_DIALOGS_PREFIX ":linked-cell" ); + readOrientationAttr( u"Orientation"_ustr, u"" XMLNS_DIALOGS_PREFIX ":align"_ustr ); + readLongAttr( u"SpinIncrement"_ustr, u"" XMLNS_DIALOGS_PREFIX ":increment"_ustr ); + readLongAttr( u"SpinValue"_ustr, u"" XMLNS_DIALOGS_PREFIX ":curval"_ustr ); + readLongAttr( u"SpinValueMax"_ustr, u"" XMLNS_DIALOGS_PREFIX ":maxval"_ustr ); + readLongAttr( u"SpinValueMin"_ustr, u"" XMLNS_DIALOGS_PREFIX ":minval"_ustr ); + readLongAttr( u"Repeat"_ustr, u"" XMLNS_DIALOGS_PREFIX ":repeat"_ustr ); + readLongAttr( u"RepeatDelay"_ustr, u"" XMLNS_DIALOGS_PREFIX ":repeat-delay"_ustr ); + readBoolAttr( u"Tabstop"_ustr, u"" XMLNS_DIALOGS_PREFIX ":tabstop"_ustr ); + readHexLongAttr( u"SymbolColor"_ustr, u"" XMLNS_DIALOGS_PREFIX ":symbol-color"_ustr ); + readDataAwareAttr( u"" XMLNS_DIALOGS_PREFIX ":linked-cell"_ustr ); readEvents(); } @@ -935,21 +935,21 @@ void ElementDescriptor::readFixedLineModel( StyleBag * all_styles ) { // collect styles Style aStyle( 0x2 | 0x8 | 0x20 ); - if (readProp( "TextColor" ) >>= aStyle._textColor) + if (readProp( u"TextColor"_ustr ) >>= aStyle._textColor) aStyle._set |= 0x2; - if (readProp( "TextLineColor" ) >>= aStyle._textLineColor) + if (readProp( u"TextLineColor"_ustr ) >>= aStyle._textLineColor) aStyle._set |= 0x20; if (readFontProps( this, aStyle )) aStyle._set |= 0x8; if (aStyle._set) { - addAttribute( XMLNS_DIALOGS_PREFIX ":style-id", all_styles->getStyleId( aStyle ) ); + addAttribute( u"" XMLNS_DIALOGS_PREFIX ":style-id"_ustr, all_styles->getStyleId( aStyle ) ); } // collect elements readDefaults(); - readStringAttr( "Label", XMLNS_DIALOGS_PREFIX ":value" ); - readOrientationAttr( "Orientation", XMLNS_DIALOGS_PREFIX ":align" ); + readStringAttr( u"Label"_ustr, u"" XMLNS_DIALOGS_PREFIX ":value"_ustr ); + readOrientationAttr( u"Orientation"_ustr, u"" XMLNS_DIALOGS_PREFIX ":align"_ustr ); readEvents(); } @@ -957,22 +957,22 @@ void ElementDescriptor::readProgressBarModel( StyleBag * all_styles ) { // collect styles Style aStyle( 0x1 | 0x4 | 0x10 ); - if (readProp( "BackgroundColor" ) >>= aStyle._backgroundColor) + if (readProp( u"BackgroundColor"_ustr ) >>= aStyle._backgroundColor) aStyle._set |= 0x1; if (readBorderProps( this, aStyle )) aStyle._set |= 0x4; - if (readProp( "FillColor" ) >>= aStyle._descr) + if (readProp( u"FillColor"_ustr ) >>= aStyle._descr) aStyle._set |= 0x10; if (aStyle._set) { - addAttribute( XMLNS_DIALOGS_PREFIX ":style-id", all_styles->getStyleId( aStyle ) ); + addAttribute( u"" XMLNS_DIALOGS_PREFIX ":style-id"_ustr, all_styles->getStyleId( aStyle ) ); } // collect elements readDefaults(); - readLongAttr( "ProgressValue", XMLNS_DIALOGS_PREFIX ":value" ); - readLongAttr( "ProgressValueMin", XMLNS_DIALOGS_PREFIX ":value-min" ); - readLongAttr( "ProgressValueMax", XMLNS_DIALOGS_PREFIX ":value-max" ); + readLongAttr( u"ProgressValue"_ustr, u"" XMLNS_DIALOGS_PREFIX ":value"_ustr ); + readLongAttr( u"ProgressValueMin"_ustr, u"" XMLNS_DIALOGS_PREFIX ":value-min"_ustr ); + readLongAttr( u"ProgressValueMax"_ustr, u"" XMLNS_DIALOGS_PREFIX ":value-max"_ustr ); readEvents(); } @@ -980,29 +980,29 @@ void ElementDescriptor::readScrollBarModel( StyleBag * all_styles ) { // collect styles Style aStyle( 0x1 | 0x4 ); - if (readProp( "BackgroundColor" ) >>= aStyle._backgroundColor) + if (readProp( u"BackgroundColor"_ustr ) >>= aStyle._backgroundColor) aStyle._set |= 0x1; if (readBorderProps( this, aStyle )) aStyle._set |= 0x4; if (aStyle._set) { - addAttribute( XMLNS_DIALOGS_PREFIX ":style-id", all_styles->getStyleId( aStyle ) ); + addAttribute( u"" XMLNS_DIALOGS_PREFIX ":style-id"_ustr, all_styles->getStyleId( aStyle ) ); } // collect elements readDefaults(); - readOrientationAttr( "Orientation", XMLNS_DIALOGS_PREFIX ":align" ); - readLongAttr( "BlockIncrement", XMLNS_DIALOGS_PREFIX ":pageincrement" ); - readLongAttr( "LineIncrement", XMLNS_DIALOGS_PREFIX ":increment" ); - readLongAttr( "ScrollValue", XMLNS_DIALOGS_PREFIX ":curpos" ); - readLongAttr( "ScrollValueMax", XMLNS_DIALOGS_PREFIX ":maxpos" ); - readLongAttr( "ScrollValueMin", XMLNS_DIALOGS_PREFIX ":minpos" ); - readLongAttr( "VisibleSize", XMLNS_DIALOGS_PREFIX ":visible-size" ); - readLongAttr( "RepeatDelay", XMLNS_DIALOGS_PREFIX ":repeat" ); - readBoolAttr( "Tabstop", XMLNS_DIALOGS_PREFIX ":tabstop" ); - readBoolAttr( "LiveScroll", XMLNS_DIALOGS_PREFIX ":live-scroll" ); - readHexLongAttr( "SymbolColor", XMLNS_DIALOGS_PREFIX ":symbol-color" ); - readDataAwareAttr( XMLNS_DIALOGS_PREFIX ":linked-cell" ); + readOrientationAttr( u"Orientation"_ustr, u"" XMLNS_DIALOGS_PREFIX ":align"_ustr ); + readLongAttr( u"BlockIncrement"_ustr, u"" XMLNS_DIALOGS_PREFIX ":pageincrement"_ustr ); + readLongAttr( u"LineIncrement"_ustr, u"" XMLNS_DIALOGS_PREFIX ":increment"_ustr ); + readLongAttr( u"ScrollValue"_ustr, u"" XMLNS_DIALOGS_PREFIX ":curpos"_ustr ); + readLongAttr( u"ScrollValueMax"_ustr, u"" XMLNS_DIALOGS_PREFIX ":maxpos"_ustr ); + readLongAttr( u"ScrollValueMin"_ustr, u"" XMLNS_DIALOGS_PREFIX ":minpos"_ustr ); + readLongAttr( u"VisibleSize"_ustr, u"" XMLNS_DIALOGS_PREFIX ":visible-size"_ustr ); + readLongAttr( u"RepeatDelay"_ustr, u"" XMLNS_DIALOGS_PREFIX ":repeat"_ustr ); + readBoolAttr( u"Tabstop"_ustr, u"" XMLNS_DIALOGS_PREFIX ":tabstop"_ustr ); + readBoolAttr( u"LiveScroll"_ustr, u"" XMLNS_DIALOGS_PREFIX ":live-scroll"_ustr ); + readHexLongAttr( u"SymbolColor"_ustr, u"" XMLNS_DIALOGS_PREFIX ":symbol-color"_ustr ); + readDataAwareAttr( u"" XMLNS_DIALOGS_PREFIX ":linked-cell"_ustr ); readEvents(); } @@ -1010,72 +1010,72 @@ void ElementDescriptor::readGridControlModel( StyleBag * all_styles ) { // collect styles Style aStyle( 0x1 | 0x2 | 0x4 | 0x8 | 0x20 ); - if (readProp("BackgroundColor") >>= aStyle._backgroundColor) + if (readProp(u"BackgroundColor"_ustr) >>= aStyle._backgroundColor) aStyle._set |= 0x1; if (readBorderProps( this, aStyle )) aStyle._set |= 0x4; - if (readProp("TextColor") >>= aStyle._textColor) + if (readProp(u"TextColor"_ustr) >>= aStyle._textColor) aStyle._set |= 0x2; - if (readProp("TextLineColor") >>= aStyle._textLineColor) + if (readProp(u"TextLineColor"_ustr) >>= aStyle._textLineColor) aStyle._set |= 0x20; if (readFontProps( this, aStyle )) aStyle._set |= 0x8; if (aStyle._set) { - addAttribute( XMLNS_DIALOGS_PREFIX ":style-id",all_styles->getStyleId( aStyle ) ); + addAttribute( u"" XMLNS_DIALOGS_PREFIX ":style-id"_ustr,all_styles->getStyleId( aStyle ) ); } // collect elements readDefaults(); - readBoolAttr("Tabstop", XMLNS_DIALOGS_PREFIX ":tabstop"); - readVerticalAlignAttr( "VerticalAlign", XMLNS_DIALOGS_PREFIX ":valign"); - readSelectionTypeAttr( "SelectionModel", XMLNS_DIALOGS_PREFIX ":selectiontype"); - readBoolAttr( "ShowColumnHeader", XMLNS_DIALOGS_PREFIX ":showcolumnheader"); - readBoolAttr( "ShowRowHeader", XMLNS_DIALOGS_PREFIX ":showrowheader"); - readHexLongAttr( "GridLineColor", XMLNS_DIALOGS_PREFIX ":gridline-color"); - readBoolAttr( "UseGridLines", XMLNS_DIALOGS_PREFIX ":usegridlines" ); - readHexLongAttr( "HeaderBackgroundColor", XMLNS_DIALOGS_PREFIX ":headerbackground-color"); - readHexLongAttr( "HeaderTextColor", XMLNS_DIALOGS_PREFIX ":headertext-color"); - readHexLongAttr( "ActiveSelectionBackgroundColor", XMLNS_DIALOGS_PREFIX ":activeselectionbackground-color"); - readHexLongAttr( "ActiveSelectionTextColor", XMLNS_DIALOGS_PREFIX ":activeselectiontext-color"); - readHexLongAttr( "InactiveSelectionBackgroundColor", XMLNS_DIALOGS_PREFIX ":inactiveselectionbackground-color"); - readHexLongAttr( "InactiveSelectionTextColor", XMLNS_DIALOGS_PREFIX ":inactiveselectiontext-color"); + readBoolAttr(u"Tabstop"_ustr, u"" XMLNS_DIALOGS_PREFIX ":tabstop"_ustr); + readVerticalAlignAttr( u"VerticalAlign"_ustr, u"" XMLNS_DIALOGS_PREFIX ":valign"_ustr); + readSelectionTypeAttr( u"SelectionModel"_ustr, u"" XMLNS_DIALOGS_PREFIX ":selectiontype"_ustr); + readBoolAttr( u"ShowColumnHeader"_ustr, u"" XMLNS_DIALOGS_PREFIX ":showcolumnheader"_ustr); + readBoolAttr( u"ShowRowHeader"_ustr, u"" XMLNS_DIALOGS_PREFIX ":showrowheader"_ustr); + readHexLongAttr( u"GridLineColor"_ustr, u"" XMLNS_DIALOGS_PREFIX ":gridline-color"_ustr); + readBoolAttr( u"UseGridLines"_ustr, u"" XMLNS_DIALOGS_PREFIX ":usegridlines"_ustr ); + readHexLongAttr( u"HeaderBackgroundColor"_ustr, u"" XMLNS_DIALOGS_PREFIX ":headerbackground-color"_ustr); + readHexLongAttr( u"HeaderTextColor"_ustr, u"" XMLNS_DIALOGS_PREFIX ":headertext-color"_ustr); + readHexLongAttr( u"ActiveSelectionBackgroundColor"_ustr, u"" XMLNS_DIALOGS_PREFIX ":activeselectionbackground-color"_ustr); + readHexLongAttr( u"ActiveSelectionTextColor"_ustr, u"" XMLNS_DIALOGS_PREFIX ":activeselectiontext-color"_ustr); + readHexLongAttr( u"InactiveSelectionBackgroundColor"_ustr, u"" XMLNS_DIALOGS_PREFIX ":inactiveselectionbackground-color"_ustr); + readHexLongAttr( u"InactiveSelectionTextColor"_ustr, u"" XMLNS_DIALOGS_PREFIX ":inactiveselectiontext-color"_ustr); readEvents(); } void ElementDescriptor::readDialogModel( StyleBag * all_styles ) { // collect elements - addAttribute( "xmlns:" XMLNS_DIALOGS_PREFIX, XMLNS_DIALOGS_URI ); - addAttribute( "xmlns:" XMLNS_SCRIPT_PREFIX, XMLNS_SCRIPT_URI ); + addAttribute( u"xmlns:" XMLNS_DIALOGS_PREFIX ""_ustr, XMLNS_DIALOGS_URI ); + addAttribute( u"xmlns:" XMLNS_SCRIPT_PREFIX ""_ustr, XMLNS_SCRIPT_URI ); // collect styles Style aStyle( 0x1 | 0x2 | 0x8 | 0x20 ); - if (readProp( "BackgroundColor" ) >>= aStyle._backgroundColor) + if (readProp( u"BackgroundColor"_ustr ) >>= aStyle._backgroundColor) aStyle._set |= 0x1; - if (readProp( "TextColor" ) >>= aStyle._textColor) + if (readProp( u"TextColor"_ustr ) >>= aStyle._textColor) aStyle._set |= 0x2; - if (readProp( "TextLineColor" ) >>= aStyle._textLineColor) + if (readProp( u"TextLineColor"_ustr ) >>= aStyle._textLineColor) aStyle._set |= 0x20; if (readFontProps( this, aStyle )) aStyle._set |= 0x8; if (aStyle._set) { - addAttribute( XMLNS_DIALOGS_PREFIX ":style-id", all_styles->getStyleId( aStyle ) ); + addAttribute( u"" XMLNS_DIALOGS_PREFIX ":style-id"_ustr, all_styles->getStyleId( aStyle ) ); } // collect elements readDefaults( false, false ); - readBoolAttr("Closeable", XMLNS_DIALOGS_PREFIX ":closeable" ); - readBoolAttr( "Moveable", XMLNS_DIALOGS_PREFIX ":moveable" ); - readBoolAttr( "Sizeable", XMLNS_DIALOGS_PREFIX ":resizeable" ); - readStringAttr( "Title", XMLNS_DIALOGS_PREFIX ":title" ); + readBoolAttr(u"Closeable"_ustr, u"" XMLNS_DIALOGS_PREFIX ":closeable"_ustr ); + readBoolAttr( u"Moveable"_ustr, u"" XMLNS_DIALOGS_PREFIX ":moveable"_ustr ); + readBoolAttr( u"Sizeable"_ustr, u"" XMLNS_DIALOGS_PREFIX ":resizeable"_ustr ); + readStringAttr( u"Title"_ustr, u"" XMLNS_DIALOGS_PREFIX ":title"_ustr ); readScrollableSettings(); - Any aDecorationAny( _xProps->getPropertyValue( "Decoration" ) ); + Any aDecorationAny( _xProps->getPropertyValue( u"Decoration"_ustr ) ); bool bDecoration = false; if ( (aDecorationAny >>= bDecoration) && !bDecoration ) - addAttribute( XMLNS_DIALOGS_PREFIX ":withtitlebar", "false" ); - readImageOrGraphicAttr(XMLNS_DIALOGS_PREFIX ":image-src"); + addAttribute( u"" XMLNS_DIALOGS_PREFIX ":withtitlebar"_ustr, u"false"_ustr ); + readImageOrGraphicAttr(u"" XMLNS_DIALOGS_PREFIX ":image-src"_ustr); readEvents(); } @@ -1110,15 +1110,15 @@ void ElementDescriptor::readBullitinBoard( StyleBag * all_styles ) rtl::Reference<ElementDescriptor> pElem; // group up radio buttons - if ( xServiceInfo->supportsService( "com.sun.star.awt.UnoControlRadioButtonModel" ) ) + if ( xServiceInfo->supportsService( u"com.sun.star.awt.UnoControlRadioButtonModel"_ustr ) ) { if (! pRadioGroup) // open radiogroup { - pRadioGroup = new ElementDescriptor( xProps, xPropState, XMLNS_DIALOGS_PREFIX ":radiogroup", _xDocument ); + pRadioGroup = new ElementDescriptor( xProps, xPropState, u"" XMLNS_DIALOGS_PREFIX ":radiogroup"_ustr, _xDocument ); all_elements.push_back( pRadioGroup ); } - pElem = new ElementDescriptor( xProps, xPropState, XMLNS_DIALOGS_PREFIX ":radio", _xDocument ); + pElem = new ElementDescriptor( xProps, xPropState, u"" XMLNS_DIALOGS_PREFIX ":radio"_ustr, _xDocument ); pElem->readRadioButtonModel( all_styles ); pRadioGroup->addSubElement( pElem ); } @@ -1126,130 +1126,130 @@ void ElementDescriptor::readBullitinBoard( StyleBag * all_styles ) { pRadioGroup = nullptr; // close radiogroup - if (xServiceInfo->supportsService( "com.sun.star.awt.UnoControlButtonModel" ) ) + if (xServiceInfo->supportsService( u"com.sun.star.awt.UnoControlButtonModel"_ustr ) ) { - pElem = new ElementDescriptor( xProps, xPropState, XMLNS_DIALOGS_PREFIX ":button", _xDocument ); + pElem = new ElementDescriptor( xProps, xPropState, u"" XMLNS_DIALOGS_PREFIX ":button"_ustr, _xDocument ); pElem->readButtonModel( all_styles ); } - else if (xServiceInfo->supportsService( "com.sun.star.awt.UnoControlCheckBoxModel" ) ) + else if (xServiceInfo->supportsService( u"com.sun.star.awt.UnoControlCheckBoxModel"_ustr ) ) { - pElem = new ElementDescriptor( xProps, xPropState, XMLNS_DIALOGS_PREFIX ":checkbox", _xDocument ); + pElem = new ElementDescriptor( xProps, xPropState, u"" XMLNS_DIALOGS_PREFIX ":checkbox"_ustr, _xDocument ); pElem->readCheckBoxModel( all_styles ); } - else if (xServiceInfo->supportsService( "com.sun.star.awt.UnoControlComboBoxModel" ) ) + else if (xServiceInfo->supportsService( u"com.sun.star.awt.UnoControlComboBoxModel"_ustr ) ) { - pElem = new ElementDescriptor( xProps, xPropState, XMLNS_DIALOGS_PREFIX ":combobox", _xDocument ); + pElem = new ElementDescriptor( xProps, xPropState, u"" XMLNS_DIALOGS_PREFIX ":combobox"_ustr, _xDocument ); pElem->readComboBoxModel( all_styles ); } - else if (xServiceInfo->supportsService( "com.sun.star.awt.UnoControlListBoxModel" ) ) + else if (xServiceInfo->supportsService( u"com.sun.star.awt.UnoControlListBoxModel"_ustr ) ) { - pElem = new ElementDescriptor( xProps, xPropState, XMLNS_DIALOGS_PREFIX ":menulist", _xDocument ); + pElem = new ElementDescriptor( xProps, xPropState, u"" XMLNS_DIALOGS_PREFIX ":menulist"_ustr, _xDocument ); pElem->readListBoxModel( all_styles ); } - else if (xServiceInfo->supportsService( "com.sun.star.awt.UnoControlGroupBoxModel" ) ) + else if (xServiceInfo->supportsService( u"com.sun.star.awt.UnoControlGroupBoxModel"_ustr ) ) { - pElem = new ElementDescriptor( xProps, xPropState, XMLNS_DIALOGS_PREFIX ":titledbox", _xDocument ); + pElem = new ElementDescriptor( xProps, xPropState, u"" XMLNS_DIALOGS_PREFIX ":titledbox"_ustr, _xDocument ); pElem->readGroupBoxModel( all_styles ); } - else if (xServiceInfo->supportsService( "com.sun.star.awt.UnoMultiPageModel" ) ) + else if (xServiceInfo->supportsService( u"com.sun.star.awt.UnoMultiPageModel"_ustr ) ) { - pElem = new ElementDescriptor( xProps, xPropState, XMLNS_DIALOGS_PREFIX ":multipage", _xDocument ); + pElem = new ElementDescriptor( xProps, xPropState, u"" XMLNS_DIALOGS_PREFIX ":multipage"_ustr, _xDocument ); pElem->readMultiPageModel( all_styles ); } - else if (xServiceInfo->supportsService( "com.sun.star.awt.UnoFrameModel" ) ) + else if (xServiceInfo->supportsService( u"com.sun.star.awt.UnoFrameModel"_ustr ) ) { - pElem = new ElementDescriptor( xProps, xPropState, XMLNS_DIALOGS_PREFIX ":frame", _xDocument ); + pElem = new ElementDescriptor( xProps, xPropState, u"" XMLNS_DIALOGS_PREFIX ":frame"_ustr, _xDocument ); pElem->readFrameModel( all_styles ); } - else if (xServiceInfo->supportsService( "com.sun.star.awt.UnoPageModel" ) ) + else if (xServiceInfo->supportsService( u"com.sun.star.awt.UnoPageModel"_ustr ) ) { - pElem = new ElementDescriptor( xProps, xPropState, XMLNS_DIALOGS_PREFIX ":page", _xDocument ); + pElem = new ElementDescriptor( xProps, xPropState, u"" XMLNS_DIALOGS_PREFIX ":page"_ustr, _xDocument ); pElem->readPageModel( all_styles ); } - else if (xServiceInfo->supportsService( "com.sun.star.awt.UnoControlFixedTextModel" ) ) + else if (xServiceInfo->supportsService( u"com.sun.star.awt.UnoControlFixedTextModel"_ustr ) ) { - pElem = new ElementDescriptor( xProps, xPropState, XMLNS_DIALOGS_PREFIX ":text", _xDocument ); + pElem = new ElementDescriptor( xProps, xPropState, u"" XMLNS_DIALOGS_PREFIX ":text"_ustr, _xDocument ); pElem->readFixedTextModel( all_styles ); } - else if (xServiceInfo->supportsService( "com.sun.star.awt.UnoControlEditModel" ) ) + else if (xServiceInfo->supportsService( u"com.sun.star.awt.UnoControlEditModel"_ustr ) ) { - pElem = new ElementDescriptor( xProps, xPropState, XMLNS_DIALOGS_PREFIX ":textfield", _xDocument ); + pElem = new ElementDescriptor( xProps, xPropState, u"" XMLNS_DIALOGS_PREFIX ":textfield"_ustr, _xDocument ); pElem->readEditModel( all_styles ); } // FixedHyperLink - else if (xServiceInfo->supportsService( "com.sun.star.awt.UnoControlFixedHyperlinkModel" ) ) + else if (xServiceInfo->supportsService( u"com.sun.star.awt.UnoControlFixedHyperlinkModel"_ustr ) ) { - pElem = new ElementDescriptor( xProps, xPropState, XMLNS_DIALOGS_PREFIX ":linklabel", _xDocument ); + pElem = new ElementDescriptor( xProps, xPropState, u"" XMLNS_DIALOGS_PREFIX ":linklabel"_ustr, _xDocument ); pElem->readFixedHyperLinkModel( all_styles ); } - else if (xServiceInfo->supportsService( "com.sun.star.awt.UnoControlImageControlModel" ) ) + else if (xServiceInfo->supportsService( u"com.sun.star.awt.UnoControlImageControlModel"_ustr ) ) { - pElem = new ElementDescriptor( xProps, xPropState, XMLNS_DIALOGS_PREFIX ":img", _xDocument ); + pElem = new ElementDescriptor( xProps, xPropState, u"" XMLNS_DIALOGS_PREFIX ":img"_ustr, _xDocument ); pElem->readImageControlModel( all_styles ); } - else if (xServiceInfo->supportsService( "com.sun.star.awt.UnoControlFileControlModel" ) ) + else if (xServiceInfo->supportsService( u"com.sun.star.awt.UnoControlFileControlModel"_ustr ) ) { - pElem = new ElementDescriptor( xProps, xPropState, XMLNS_DIALOGS_PREFIX ":filecontrol", _xDocument ); + pElem = new ElementDescriptor( xProps, xPropState, u"" XMLNS_DIALOGS_PREFIX ":filecontrol"_ustr, _xDocument ); pElem->readFileControlModel( all_styles ); } - else if (xServiceInfo->supportsService( "com.sun.star.awt.tree.TreeControlModel" ) ) + else if (xServiceInfo->supportsService( u"com.sun.star.awt.tree.TreeControlModel"_ustr ) ) { - pElem = new ElementDescriptor( xProps, xPropState, XMLNS_DIALOGS_PREFIX ":treecontrol", _xDocument ); + pElem = new ElementDescriptor( xProps, xPropState, u"" XMLNS_DIALOGS_PREFIX ":treecontrol"_ustr, _xDocument ); pElem->readTreeControlModel( all_styles ); } - else if (xServiceInfo->supportsService( "com.sun.star.awt.UnoControlCurrencyFieldModel" ) ) + else if (xServiceInfo->supportsService( u"com.sun.star.awt.UnoControlCurrencyFieldModel"_ustr ) ) { - pElem = new ElementDescriptor( xProps, xPropState, XMLNS_DIALOGS_PREFIX ":currencyfield", _xDocument ); + pElem = new ElementDescriptor( xProps, xPropState, u"" XMLNS_DIALOGS_PREFIX ":currencyfield"_ustr, _xDocument ); pElem->readCurrencyFieldModel( all_styles ); } - else if (xServiceInfo->supportsService( "com.sun.star.awt.UnoControlDateFieldModel" ) ) + else if (xServiceInfo->supportsService( u"com.sun.star.awt.UnoControlDateFieldModel"_ustr ) ) { - pElem = new ElementDescriptor( xProps, xPropState, XMLNS_DIALOGS_PREFIX ":datefield", _xDocument ); + pElem = new ElementDescriptor( xProps, xPropState, u"" XMLNS_DIALOGS_PREFIX ":datefield"_ustr, _xDocument ); pElem->readDateFieldModel( all_styles ); } - else if (xServiceInfo->supportsService( "com.sun.star.awt.UnoControlNumericFieldModel" ) ) + else if (xServiceInfo->supportsService( u"com.sun.star.awt.UnoControlNumericFieldModel"_ustr ) ) { - pElem = new ElementDescriptor( xProps, xPropState, XMLNS_DIALOGS_PREFIX ":numericfield", _xDocument ); + pElem = new ElementDescriptor( xProps, xPropState, u"" XMLNS_DIALOGS_PREFIX ":numericfield"_ustr, _xDocument ); pElem->readNumericFieldModel( all_styles ); } - else if (xServiceInfo->supportsService( "com.sun.star.awt.UnoControlTimeFieldModel" ) ) + else if (xServiceInfo->supportsService( u"com.sun.star.awt.UnoControlTimeFieldModel"_ustr ) ) { - pElem = new ElementDescriptor( xProps, xPropState, XMLNS_DIALOGS_PREFIX ":timefield", _xDocument); + pElem = new ElementDescriptor( xProps, xPropState, u"" XMLNS_DIALOGS_PREFIX ":timefield"_ustr, _xDocument); pElem->readTimeFieldModel( all_styles ); } - else if (xServiceInfo->supportsService( "com.sun.star.awt.UnoControlPatternFieldModel" ) ) + else if (xServiceInfo->supportsService( u"com.sun.star.awt.UnoControlPatternFieldModel"_ustr ) ) { - pElem = new ElementDescriptor( xProps, xPropState, XMLNS_DIALOGS_PREFIX ":patternfield", _xDocument ); + pElem = new ElementDescriptor( xProps, xPropState, u"" XMLNS_DIALOGS_PREFIX ":patternfield"_ustr, _xDocument ); pElem->readPatternFieldModel( all_styles ); } - else if (xServiceInfo->supportsService( "com.sun.star.awt.UnoControlFormattedFieldModel" ) ) + else if (xServiceInfo->supportsService( u"com.sun.star.awt.UnoControlFormattedFieldModel"_ustr ) ) { - pElem = new ElementDescriptor( xProps, xPropState, XMLNS_DIALOGS_PREFIX ":formattedfield", _xDocument ); + pElem = new ElementDescriptor( xProps, xPropState, u"" XMLNS_DIALOGS_PREFIX ":formattedfield"_ustr, _xDocument ); pElem->readFormattedFieldModel( all_styles ); } - else if (xServiceInfo->supportsService( "com.sun.star.awt.UnoControlFixedLineModel" ) ) + else if (xServiceInfo->supportsService( u"com.sun.star.awt.UnoControlFixedLineModel"_ustr ) ) { - pElem = new ElementDescriptor( xProps, xPropState, XMLNS_DIALOGS_PREFIX ":fixedline", _xDocument ); + pElem = new ElementDescriptor( xProps, xPropState, u"" XMLNS_DIALOGS_PREFIX ":fixedline"_ustr, _xDocument ); pElem->readFixedLineModel( all_styles ); } - else if (xServiceInfo->supportsService( "com.sun.star.awt.UnoControlScrollBarModel" ) ) + else if (xServiceInfo->supportsService( u"com.sun.star.awt.UnoControlScrollBarModel"_ustr ) ) { -e ... etc. - the rest is truncated