summaryrefslogtreecommitdiff
path: root/sw/source/ui
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/ui')
-rw-r--r--sw/source/ui/app/docsh2.cxx6
-rw-r--r--sw/source/ui/dbui/swdbtoolsclient.cxx2
-rw-r--r--sw/source/ui/docvw/edtwin.cxx2
-rw-r--r--sw/source/ui/envelp/mailmrge.cxx2
-rw-r--r--sw/source/ui/ribbar/workctrl.cxx8
-rw-r--r--sw/source/ui/uno/unoatxt.cxx2
-rw-r--r--sw/source/ui/vba/vbaapplication.cxx2
-rw-r--r--sw/source/ui/vba/vbaborders.cxx2
-rw-r--r--sw/source/ui/vba/vbafont.cxx2
-rw-r--r--sw/source/ui/vba/vbaglobals.cxx2
-rw-r--r--sw/source/ui/vba/vbatemplate.cxx2
-rw-r--r--sw/source/ui/wrtsh/navmgr.cxx2
12 files changed, 17 insertions, 17 deletions
diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx
index 9ea1aa725171..483e647e5217 100644
--- a/sw/source/ui/app/docsh2.cxx
+++ b/sw/source/ui/app/docsh2.cxx
@@ -986,7 +986,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
uno::Reference< uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext();
uno::Reference< frame::XDispatchProvider > xProv = drawing::ModuleDispatcher::create( xContext );
- ::rtl::OUString aCmd(RTL_CONSTASCII_USTRINGPARAM("SendOutlineToImpress"));
+ ::rtl::OUString aCmd("SendOutlineToImpress");
uno::Reference< frame::XDispatchHelper > xHelper( frame::DispatchHelper::create(xContext) );
pStrm->Seek( STREAM_SEEK_TO_END );
*pStrm << '\0';
@@ -1053,7 +1053,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
uno::Reference< uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext();
uno::Reference< frame::XDispatchProvider > xProv = drawing::ModuleDispatcher::create( xContext );
- ::rtl::OUString aCmd(RTL_CONSTASCII_USTRINGPARAM("SendOutlineToImpress"));
+ ::rtl::OUString aCmd("SendOutlineToImpress");
uno::Reference< frame::XDispatchHelper > xHelper( frame::DispatchHelper::create(xContext) );
pStrm->Seek( STREAM_SEEK_TO_END );
*pStrm << '\0';
@@ -1702,7 +1702,7 @@ sal_uLong SwDocShell::LoadStylesFromFile( const String& rURL,
try
{
uno::Reference< beans::XPropertySet > xProps( xStorage, uno::UNO_QUERY_THROW );
- const ::rtl::OUString aMediaTypePropName( RTL_CONSTASCII_USTRINGPARAM( "MediaType" ) );
+ const ::rtl::OUString aMediaTypePropName( "MediaType" );
xProps->getPropertyValue( aMediaTypePropName );
bImport = true;
}
diff --git a/sw/source/ui/dbui/swdbtoolsclient.cxx b/sw/source/ui/dbui/swdbtoolsclient.cxx
index fcb6728c2903..4a9e97b168d0 100644
--- a/sw/source/ui/dbui/swdbtoolsclient.cxx
+++ b/sw/source/ui/dbui/swdbtoolsclient.cxx
@@ -113,7 +113,7 @@ void SwDbtoolsClient::registerClient()
if (NULL != getDbToolsClientModule())
{
// get the symbol for the method creating the factory
- const ::rtl::OUString sFactoryCreationFunc(RTL_CONSTASCII_USTRINGPARAM("createDataAccessToolsFactory"));
+ const ::rtl::OUString sFactoryCreationFunc("createDataAccessToolsFactory");
// reinterpret_cast<createDataAccessToolsFactoryFunction> removed for gcc permissive
getDbToolsClientFactoryFunction() = reinterpret_cast< createDataAccessToolsFactoryFunction >(
osl_getFunctionSymbol(getDbToolsClientModule(), sFactoryCreationFunc.pData));
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index 63e46bcce5b7..226fd98613b4 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -5017,7 +5017,7 @@ void SwEditWin::Command( const CommandEvent& rCEvt )
aEvent.ExecutePosition.X = aPixPos.X();
aEvent.ExecutePosition.Y = aPixPos.Y();
Menu* pMenu = 0;
- ::rtl::OUString sMenuName(RTL_CONSTASCII_USTRINGPARAM("private:resource/ReadonlyContextMenu"));
+ ::rtl::OUString sMenuName("private:resource/ReadonlyContextMenu");
if( GetView().TryContextMenuInterception( *pROPopup, sMenuName, pMenu, aEvent ) )
{
if ( pMenu )
diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx
index 7880452389ce..c7dba1a214f6 100644
--- a/sw/source/ui/envelp/mailmrge.cxx
+++ b/sw/source/ui/envelp/mailmrge.cxx
@@ -416,7 +416,7 @@ SwMailMergeDlg::SwMailMergeDlg(Window* pParent, SwWrtShell& rShell,
sCommand += OUString::number(SFX_FILTER_NOTINFILEDLG);
sCommand += ":default_first";
uno::Reference< container::XEnumeration > xList = xQuery->createSubSetEnumerationByQuery(sCommand);
- const ::rtl::OUString sName(RTL_CONSTASCII_USTRINGPARAM("Name"));
+ const ::rtl::OUString sName("Name");
sal_uInt16 nODT = USHRT_MAX;
while(xList->hasMoreElements())
{
diff --git a/sw/source/ui/ribbar/workctrl.cxx b/sw/source/ui/ribbar/workctrl.cxx
index 018182f80159..cb8fbe4996e3 100644
--- a/sw/source/ui/ribbar/workctrl.cxx
+++ b/sw/source/ui/ribbar/workctrl.cxx
@@ -77,7 +77,7 @@ SwTbxInsertCtrl::~SwTbxInsertCtrl()
void SAL_CALL SwTbxInsertCtrl::update() throw (uno::RuntimeException)
{
ToolBox& rTbx = GetToolBox();
- rtl::OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" ));
+ rtl::OUString aSlotURL( "slot:" );
aSlotURL += rtl::OUString::valueOf( sal_Int32( nLastSlotId ));
Image aImage = GetImage( m_xFrame, aSlotURL, hasBigImages() );
@@ -103,7 +103,7 @@ void SwTbxInsertCtrl::StateChanged( sal_uInt16 /*nSID*/,
if( nLastSlotId )
nId = nLastSlotId;
- rtl::OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" ));
+ rtl::OUString aSlotURL( "slot:" );
aSlotURL += rtl::OUString::valueOf( sal_Int32( nId ));
ToolBox& rBox = GetToolBox();
Image aImage = GetImage( m_xFrame, aSlotURL, hasBigImages() );
@@ -120,12 +120,12 @@ SfxPopupWindow* SwTbxInsertCtrl::CreatePopupWindow()
{
if(GetSlotId() == FN_INSERT_CTRL)
{
- OUString aToolBarResStr( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/insertbar" ));
+ OUString aToolBarResStr( "private:resource/toolbar/insertbar" );
createAndPositionSubToolBar( aToolBarResStr );
}
else /* FN_INSERT_OBJ_CTRL */
{
- OUString aToolBarResStr( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/insertobjectbar" ));
+ OUString aToolBarResStr( "private:resource/toolbar/insertobjectbar" );
createAndPositionSubToolBar( aToolBarResStr );
}
return NULL;
diff --git a/sw/source/ui/uno/unoatxt.cxx b/sw/source/ui/uno/unoatxt.cxx
index ae971d0692c6..11e38933c003 100644
--- a/sw/source/ui/uno/unoatxt.cxx
+++ b/sw/source/ui/uno/unoatxt.cxx
@@ -66,7 +66,7 @@ uno::Reference< uno::XInterface > SAL_CALL SwXAutoTextContainer_createInstance(
uno::Sequence< OUString > SAL_CALL SwXAutoTextContainer_getSupportedServiceNames() throw()
{
- OUString sService( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.AutoTextContainer"));
+ OUString sService("com.sun.star.text.AutoTextContainer");
const uno::Sequence< OUString > aSeq( &sService, 1 );
return aSeq;
}
diff --git a/sw/source/ui/vba/vbaapplication.cxx b/sw/source/ui/vba/vbaapplication.cxx
index 018c9214a11e..918b11efe1d4 100644
--- a/sw/source/ui/vba/vbaapplication.cxx
+++ b/sw/source/ui/vba/vbaapplication.cxx
@@ -70,7 +70,7 @@ SfxObjectShell* SwVbaApplication::GetDocShell( const uno::Reference< frame::XMod
rtl::OUString SAL_CALL
SwVbaApplication::getName() throw (uno::RuntimeException)
{
- static rtl::OUString appName( RTL_CONSTASCII_USTRINGPARAM("Microsoft Word" ) );
+ static rtl::OUString appName("Microsoft Word" );
return appName;
}
diff --git a/sw/source/ui/vba/vbaborders.cxx b/sw/source/ui/vba/vbaborders.cxx
index c6b89b38fa4d..293b56189f20 100644
--- a/sw/source/ui/vba/vbaborders.cxx
+++ b/sw/source/ui/vba/vbaborders.cxx
@@ -39,7 +39,7 @@ typedef InheritedHelperInterfaceImpl1<word::XBorder > SwVbaBorder_Base;
// borders, the enumeration will match the order in this list
static const sal_Int16 supportedIndexTable[] = { word::WdBorderType::wdBorderBottom, word::WdBorderType::wdBorderDiagonalDown, word::WdBorderType::wdBorderDiagonalUp, word::WdBorderType::wdBorderHorizontal, word::WdBorderType::wdBorderLeft, word::WdBorderType::wdBorderRight, word::WdBorderType::wdBorderTop, word::WdBorderType::wdBorderVertical };
-const static rtl::OUString sTableBorder( RTL_CONSTASCII_USTRINGPARAM("TableBorder") );
+const static rtl::OUString sTableBorder("TableBorder");
// Equiv widths in in 1/100 mm
const static sal_Int32 OOLineThin = 35;
diff --git a/sw/source/ui/vba/vbafont.cxx b/sw/source/ui/vba/vbafont.cxx
index 5839100993a8..ac74b19eebad 100644
--- a/sw/source/ui/vba/vbafont.cxx
+++ b/sw/source/ui/vba/vbafont.cxx
@@ -76,7 +76,7 @@ private:
public:
static rtl::OUString propName()
{
- static rtl::OUString sPropName( RTL_CONSTASCII_USTRINGPARAM("CharUnderline") );
+ static rtl::OUString sPropName("CharUnderline");
return sPropName;
}
diff --git a/sw/source/ui/vba/vbaglobals.cxx b/sw/source/ui/vba/vbaglobals.cxx
index b9387680469f..3088dd116542 100644
--- a/sw/source/ui/vba/vbaglobals.cxx
+++ b/sw/source/ui/vba/vbaglobals.cxx
@@ -31,7 +31,7 @@ using namespace ::com::sun::star::uno;
using namespace ::ooo::vba;
-rtl::OUString sDocCtxName( RTL_CONSTASCII_USTRINGPARAM("WordDocumentContext") );
+rtl::OUString sDocCtxName("WordDocumentContext");
// =============================================================================
// SwVbaGlobals
diff --git a/sw/source/ui/vba/vbatemplate.cxx b/sw/source/ui/vba/vbatemplate.cxx
index 8f9b24fa86cf..8a01bc26dfdb 100644
--- a/sw/source/ui/vba/vbatemplate.cxx
+++ b/sw/source/ui/vba/vbatemplate.cxx
@@ -89,7 +89,7 @@ SwVbaTemplate::AutoTextEntries( const uno::Any& index ) throw (uno::RuntimeExcep
uno::Reference< text::XAutoTextContainer > xAutoTextContainer( xMgr->createInstance( rtl::OUString("com.sun.star.text.AutoTextContainer") ), uno::UNO_QUERY_THROW );
// the default template is "Normal.dot" in Word.
- rtl::OUString sGroup( RTL_CONSTASCII_USTRINGPARAM("Normal") );
+ rtl::OUString sGroup("Normal");
rtl::OUString sName = getName();
sal_Int32 nIndex = sName.lastIndexOf( sal_Unicode('.') );
if( nIndex > 0 )
diff --git a/sw/source/ui/wrtsh/navmgr.cxx b/sw/source/ui/wrtsh/navmgr.cxx
index 5f30c11f7fbe..fe43439f7b3d 100644
--- a/sw/source/ui/wrtsh/navmgr.cxx
+++ b/sw/source/ui/wrtsh/navmgr.cxx
@@ -232,7 +232,7 @@ bool SwNavigationMgr::addEntry(const SwPosition& rPos) {
aValue >>= xLayoutManager;
if (xLayoutManager.is())
{
- const ::rtl::OUString sResourceURL( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/navigationobjectbar" ) );
+ const ::rtl::OUString sResourceURL( "private:resource/toolbar/navigationobjectbar" );
css::uno::Reference< css::ui::XUIElement > xUIElement = xLayoutManager->getElement(sResourceURL);
if (!xUIElement.is())
{
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-01 22:53:31 +0000