diff options
Diffstat (limited to 'dbaccess/source/ui/uno/composerdialogs.cxx')
| -rw-r--r-- | dbaccess/source/ui/uno/composerdialogs.cxx | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/dbaccess/source/ui/uno/composerdialogs.cxx b/dbaccess/source/ui/uno/composerdialogs.cxx index 4040aea94ca7..7af65ef8ebbe 100644 --- a/dbaccess/source/ui/uno/composerdialogs.cxx +++ b/dbaccess/source/ui/uno/composerdialogs.cxx @@ -24,8 +24,9 @@ #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> #include <queryfilter.hxx> #include <queryorder.hxx> +#include <strings.hxx> #include <connectivity/dbtools.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <osl/diagnose.h> #include <vcl/svapp.hxx> @@ -52,7 +53,6 @@ constexpr OUStringLiteral PROPERTY_QUERYCOMPOSER = u"QueryComposer"; constexpr OUStringLiteral PROPERTY_ROWSET = u"RowSet"; using namespace ::com::sun::star::uno; - using namespace ::com::sun::star::lang; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; using namespace ::com::sun::star::sdbcx; @@ -153,7 +153,7 @@ constexpr OUStringLiteral PROPERTY_ROWSET = u"RowSet"; OUString SAL_CALL RowsetFilterDialog::getImplementationName() { - return "com.sun.star.uno.comp.sdb.RowsetFilterDialog"; + return u"com.sun.star.uno.comp.sdb.RowsetFilterDialog"_ustr; } sal_Bool SAL_CALL RowsetFilterDialog::supportsService(const OUString& _rServiceName) { @@ -166,7 +166,7 @@ constexpr OUStringLiteral PROPERTY_ROWSET = u"RowSet"; } css::uno::Sequence< OUString > SAL_CALL RowsetFilterDialog::getSupportedServiceNames() { - return { "com.sun.star.sdb.FilterDialog" }; + return { u"com.sun.star.sdb.FilterDialog"_ustr }; } std::unique_ptr<weld::GenericDialogController> RowsetFilterDialog::createComposerDialog(weld::Window* _pParent, const Reference< XConnection >& _rxConnection, const Reference< XNameAccess >& _rxColumns ) @@ -185,9 +185,9 @@ constexpr OUStringLiteral PROPERTY_ROWSET = u"RowSet"; aArguments[1] >>= xRowSet; Reference<css::awt::XWindow> xParentWindow; aArguments[2] >>= xParentWindow; - setPropertyValue( "QueryComposer", makeAny( xQueryComposer ) ); - setPropertyValue( "RowSet", makeAny( xRowSet ) ); - setPropertyValue( "ParentWindow", makeAny( xParentWindow ) ); + setPropertyValue( u"QueryComposer"_ustr, Any( xQueryComposer ) ); + setPropertyValue( u"RowSet"_ustr, Any( xRowSet ) ); + setPropertyValue( u"ParentWindow"_ustr, Any( xParentWindow ) ); } else ComposerDialog::initialize(aArguments); @@ -209,7 +209,7 @@ constexpr OUStringLiteral PROPERTY_ROWSET = u"RowSet"; OUString SAL_CALL RowsetOrderDialog::getImplementationName() { - return "com.sun.star.uno.comp.sdb.RowsetOrderDialog"; + return u"com.sun.star.uno.comp.sdb.RowsetOrderDialog"_ustr; } sal_Bool SAL_CALL RowsetOrderDialog::supportsService(const OUString& _rServiceName) { @@ -222,7 +222,7 @@ constexpr OUStringLiteral PROPERTY_ROWSET = u"RowSet"; } css::uno::Sequence< OUString > SAL_CALL RowsetOrderDialog::getSupportedServiceNames() { - return { "com.sun.star.sdb.OrderDialog" }; + return { u"com.sun.star.sdb.OrderDialog"_ustr }; } std::unique_ptr<weld::GenericDialogController> RowsetOrderDialog::createComposerDialog(weld::Window* pParent, const Reference< XConnection >& rxConnection, const Reference< XNameAccess >& rxColumns) @@ -238,13 +238,13 @@ constexpr OUStringLiteral PROPERTY_ROWSET = u"RowSet"; aArguments[0] >>= xQueryComposer; Reference<css::beans::XPropertySet> xRowSet; aArguments[1] >>= xRowSet; - setPropertyValue( "QueryComposer", makeAny( xQueryComposer ) ); - setPropertyValue( "RowSet", makeAny( xRowSet ) ); + setPropertyValue( u"QueryComposer"_ustr, Any( xQueryComposer ) ); + setPropertyValue( u"RowSet"_ustr, Any( xRowSet ) ); if (aArguments.getLength() == 3) { Reference<css::awt::XWindow> xParentWindow; aArguments[2] >>= xParentWindow; - setPropertyValue("ParentWindow", makeAny(xParentWindow)); + setPropertyValue(u"ParentWindow"_ustr, Any(xParentWindow)); } } else |