Is it correct to have the RTL_CONSTASCII_USTRINGPARAM directly in the *.hxx
file.
If so, why not do that also at other places?
MPL 1.1 / GPLv3+ / LGPLv3+
Joost
diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx
index 4f1f256..c6e4117 100644
--- a/svx/source/inc/docrecovery.hxx
+++ b/svx/source/inc/docrecovery.hxx
@@ -48,47 +48,47 @@
//===============================================
// const
-#define RECOVERY_CMDPART_PROTOCOL
::rtl::OUString::createFromAscii("vnd.sun.star.autorecovery:")
-
-#define RECOVERY_CMDPART_DO_PREPARE_EMERGENCY_SAVE
::rtl::OUString::createFromAscii("/doPrepareEmergencySave" )
-#define RECOVERY_CMDPART_DO_EMERGENCY_SAVE
::rtl::OUString::createFromAscii("/doEmergencySave" )
-#define RECOVERY_CMDPART_DO_RECOVERY
::rtl::OUString::createFromAscii("/doAutoRecovery" )
-#define RECOVERY_CMDPART_DO_CRASHREPORT
::rtl::OUString::createFromAscii("/doCrashReport" )
-#define RECOVERY_CMDPART_DO_ENTRY_BACKUP
::rtl::OUString::createFromAscii("/doEntryBackup" )
-#define RECOVERY_CMDPART_DO_ENTRY_CLEANUP
::rtl::OUString::createFromAscii("/doEntryCleanUp" )
-
-#define RECOVERY_CMD_DO_PREPARE_EMERGENCY_SAVE
::rtl::OUString::createFromAscii("vnd.sun.star.autorecovery:/doPrepareEmergencySave")
-#define RECOVERY_CMD_DO_EMERGENCY_SAVE
::rtl::OUString::createFromAscii("vnd.sun.star.autorecovery:/doEmergencySave" )
-#define RECOVERY_CMD_DO_RECOVERY
::rtl::OUString::createFromAscii("vnd.sun.star.autorecovery:/doAutoRecovery" )
-#define RECOVERY_CMD_DO_CRASHREPORT
::rtl::OUString::createFromAscii("vnd.sun.star.autorecovery:/doCrashReport" )
-#define RECOVERY_CMD_DO_ENTRY_BACKUP
::rtl::OUString::createFromAscii("vnd.sun.star.autorecovery:/doEntryBackup" )
-#define RECOVERY_CMD_DO_ENTRY_CLEANUP
::rtl::OUString::createFromAscii("vnd.sun.star.autorecovery:/doEntryCleanUp" )
-
-#define SERVICENAME_PROGRESSFACTORY
::rtl::OUString::createFromAscii("com.sun.star.task.StatusIndicatorFactory")
-#define SERVICENAME_URLTRANSFORMER
::rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer" )
-#define SERVICENAME_RECOVERYCORE
::rtl::OUString::createFromAscii("com.sun.star.frame.AutoRecovery" )
-#define SERVICENAME_FOLDERPICKER
::rtl::OUString::createFromAscii("com.sun.star.ui.dialogs.FolderPicker" )
-#define SERVICENAME_DESKTOP
::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop" )
-
-#define PROP_PARENTWINDOW ::rtl::OUString::createFromAscii("Window"
)
-#define PROP_STATUSINDICATOR
::rtl::OUString::createFromAscii("StatusIndicator" )
-#define PROP_DISPATCHASYNCHRON
::rtl::OUString::createFromAscii("DispatchAsynchron")
-#define PROP_SAVEPATH
::rtl::OUString::createFromAscii("SavePath" )
-#define PROP_ENTRYID ::rtl::OUString::createFromAscii("EntryID"
)
-#define PROP_ALLOWPARENTSHOW
::rtl::OUString::createFromAscii("AllowParentShow" )
-
-#define STATEPROP_ID ::rtl::OUString::createFromAscii("ID"
)
-#define STATEPROP_STATE
::rtl::OUString::createFromAscii("DocumentState")
-#define STATEPROP_ORGURL
::rtl::OUString::createFromAscii("OriginalURL" )
-#define STATEPROP_TEMPURL ::rtl::OUString::createFromAscii("TempURL"
)
-#define STATEPROP_FACTORYURL
::rtl::OUString::createFromAscii("FactoryURL" )
-#define STATEPROP_TEMPLATEURL
::rtl::OUString::createFromAscii("TemplateURL" )
-#define STATEPROP_TITLE ::rtl::OUString::createFromAscii("Title"
)
-#define STATEPROP_MODULE ::rtl::OUString::createFromAscii("Module"
)
-
-#define RECOVERY_OPERATIONSTATE_START ::rtl::OUString::createFromAscii("start" )
-#define RECOVERY_OPERATIONSTATE_STOP ::rtl::OUString::createFromAscii("stop" )
-#define RECOVERY_OPERATIONSTATE_UPDATE ::rtl::OUString::createFromAscii("update")
+#define RECOVERY_CMDPART_PROTOCOL rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"vnd.sun.star.autorecovery:"))
+
+#define RECOVERY_CMDPART_DO_PREPARE_EMERGENCY_SAVE rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"/doPrepareEmergencySave" ))
+#define RECOVERY_CMDPART_DO_EMERGENCY_SAVE rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"/doEmergencySave" ))
+#define RECOVERY_CMDPART_DO_RECOVERY rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"/doAutoRecovery" ))
+#define RECOVERY_CMDPART_DO_CRASHREPORT rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"/doCrashReport" ))
+#define RECOVERY_CMDPART_DO_ENTRY_BACKUP rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"/doEntryBackup" ))
+#define RECOVERY_CMDPART_DO_ENTRY_CLEANUP rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"/doEntryCleanUp" ))
+
+#define RECOVERY_CMD_DO_PREPARE_EMERGENCY_SAVE rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"vnd.sun.star.autorecovery:/doPrepareEmergencySave"))
+#define RECOVERY_CMD_DO_EMERGENCY_SAVE rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"vnd.sun.star.autorecovery:/doEmergencySave" ))
+#define RECOVERY_CMD_DO_RECOVERY rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"vnd.sun.star.autorecovery:/doAutoRecovery" ))
+#define RECOVERY_CMD_DO_CRASHREPORT rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"vnd.sun.star.autorecovery:/doCrashReport" ))
+#define RECOVERY_CMD_DO_ENTRY_BACKUP rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"vnd.sun.star.autorecovery:/doEntryBackup" ))
+#define RECOVERY_CMD_DO_ENTRY_CLEANUP rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"vnd.sun.star.autorecovery:/doEntryCleanUp" ))
+
+#define SERVICENAME_PROGRESSFACTORY rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.task.StatusIndicatorFactory"))
+#define SERVICENAME_URLTRANSFORMER rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.util.URLTransformer" ))
+#define SERVICENAME_RECOVERYCORE rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.frame.AutoRecovery" ))
+#define SERVICENAME_FOLDERPICKER rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.ui.dialogs.FolderPicker" ))
+#define SERVICENAME_DESKTOP rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.frame.Desktop" ))
+
+#define PROP_PARENTWINDOW rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"Window" ))
+#define PROP_STATUSINDICATOR rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"StatusIndicator" ))
+#define PROP_DISPATCHASYNCHRON rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"DispatchAsynchron"))
+#define PROP_SAVEPATH rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"SavePath" ))
+#define PROP_ENTRYID rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"EntryID" ))
+#define PROP_ALLOWPARENTSHOW rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"AllowParentShow" ))
+
+#define STATEPROP_ID rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"ID" ))
+#define STATEPROP_STATE rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"DocumentState"))
+#define STATEPROP_ORGURL rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"OriginalURL" ))
+#define STATEPROP_TEMPURL rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"TempURL" ))
+#define STATEPROP_FACTORYURL rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"FactoryURL" ))
+#define STATEPROP_TEMPLATEURL rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"TemplateURL" ))
+#define STATEPROP_TITLE rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"Title" ))
+#define STATEPROP_MODULE rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"Module" ))
+
+#define RECOVERY_OPERATIONSTATE_START rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"start" ))
+#define RECOVERY_OPERATIONSTATE_STOP rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"stop" ))
+#define RECOVERY_OPERATIONSTATE_UPDATE rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"update"))
#define DLG_RET_UNKNOWN -1
#define DLG_RET_OK 1
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index 145a2ef..04e8ea1 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -46,16 +46,16 @@
namespace svx
{
-static const ::rtl::OUString SEARCHITEM_SEARCHSTRING =
::rtl::OUString::createFromAscii("SearchItem.SearchString");
-static const ::rtl::OUString SEARCHITEM_SEARCHBACKWARD =
::rtl::OUString::createFromAscii("SearchItem.Backward");
+static const ::rtl::OUString SEARCHITEM_SEARCHSTRING( RTL_CONSTASCII_USTRINGPARAM(
"SearchItem.SearchString" ) );
+static const ::rtl::OUString SEARCHITEM_SEARCHBACKWARD( RTL_CONSTASCII_USTRINGPARAM(
"SearchItem.Backward" ) );
-static const ::rtl::OUString COMMAND_EXECUTESEARCH =
::rtl::OUString::createFromAscii(".uno:ExecuteSearch");
-static const ::rtl::OUString COMMAND_FINDTEXT =
::rtl::OUString::createFromAscii(".uno:FindText") ;
-static const ::rtl::OUString COMMAND_DOWNSEARCH =
::rtl::OUString::createFromAscii(".uno:DownSearch");
-static const ::rtl::OUString COMMAND_UPSEARCH =
::rtl::OUString::createFromAscii(".uno:UpSearch") ;
-static const ::rtl::OUString COMMAND_APPENDSEARCHHISTORY =
::rtl::OUString::createFromAscii("AppendSearchHistory");
+static const ::rtl::OUString COMMAND_EXECUTESEARCH( RTL_CONSTASCII_USTRINGPARAM(
".uno:ExecuteSearch" ) );
+static const ::rtl::OUString COMMAND_FINDTEXT( RTL_CONSTASCII_USTRINGPARAM( ".uno:FindText" ) );
+static const ::rtl::OUString COMMAND_DOWNSEARCH( RTL_CONSTASCII_USTRINGPARAM(".uno:DownSearch") );
+static const ::rtl::OUString COMMAND_UPSEARCH( RTL_CONSTASCII_USTRINGPARAM(".uno:UpSearch") );
+static const ::rtl::OUString COMMAND_APPENDSEARCHHISTORY( RTL_CONSTASCII_USTRINGPARAM(
"AppendSearchHistory") );
-static const ::rtl::OUString SERVICENAME_URLTRANSFORMER =
::rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer");
+static const ::rtl::OUString SERVICENAME_URLTRANSFORMER( RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.util.URLTransformer") );
static const sal_Int32 REMEMBER_SIZE = 10;
void impl_executeSearch( const css::uno::Reference< css::lang::XMultiServiceFactory >& rSMgr,
const css::uno::Reference< css::frame::XFrame >& xFrame, const css::uno::Sequence<
css::beans::PropertyValue >& lArgs )
@@ -801,12 +801,12 @@ void SAL_CALL FindbarDispatcher::dispatch( const css::util::URL& aURL, const
css
return;
css::uno::Reference< css::frame::XLayoutManager > xLayoutManager;
- css::uno::Any aValue = xPropSet->getPropertyValue(
::rtl::OUString::createFromAscii("LayoutManager") );
+ css::uno::Any aValue = xPropSet->getPropertyValue(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" )) );
aValue >>= xLayoutManager;
if (!xLayoutManager.is())
return;
- const ::rtl::OUString sResourceURL =
::rtl::OUString::createFromAscii("private:resource/toolbar/findbar");
+ const ::rtl::OUString sResourceURL = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"private:resource/toolbar/findbar" ));
css::uno::Reference< css::ui::XUIElement > xUIElement =
xLayoutManager->getElement(sResourceURL);
if (!xUIElement.is())
return;
Context
- [Libreoffice] [PATCH] RTL_CONSTASCII_USTRINGPARAM in svx · Joost Eekhoorn
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.