Kaydet (Commit) 207bbf87 authored tarafından Xisco Fauli's avatar Xisco Fauli Kaydeden (comit) Tor Lillqvist

use RTL_CONSTASCII_USTRINGPARAM

üst 265a8353
......@@ -651,7 +651,7 @@ namespace framework
? rUndoManager.GetUndoActionCount( IUndoManager::TopLevel )
: rUndoManager.GetRedoActionCount( IUndoManager::TopLevel );
if ( nElements == 0 )
throw EmptyUndoStackException( ::rtl::OUString::createFromAscii( "stack is empty" ), getXUndoManager() );
throw EmptyUndoStackException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "stack is empty" )), getXUndoManager() );
aGuard.clear();
// <--- SYNCHRONIZED
......@@ -1116,7 +1116,7 @@ namespace framework
IUndoManager& rUndoManager = m_pImpl->getUndoManager();
if ( rUndoManager.IsUndoEnabled() )
throw NotLockedException( ::rtl::OUString::createFromAscii( "Undo manager is not locked" ), m_pImpl->getXUndoManager() );
throw NotLockedException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Undo manager is not locked" )), m_pImpl->getXUndoManager() );
rUndoManager.EnableUndo( true );
// <--- SYNCHRONIZED
}
......
......@@ -381,7 +381,7 @@ void impl_setDockingWindowVisibility( const css::uno::Reference< css::lang::XMul
xDispatcher->executeDispatch(
xProvider,
aDockWinCommand,
::rtl::OUString::createFromAscii("_self"),
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_self")),
0,
aArgs);
}
......
......@@ -190,9 +190,9 @@ on_registrar_available (GDBusConnection * /*connection*/,
//Hide menubar
Reference < XFrame > xFrame = helper->getFrame ();
Reference< XPropertySet > frameProps (xFrame, UNO_QUERY);
Reference < XLayoutManager > xLayoutManager(frameProps->getPropertyValue(OUString::createFromAscii("LayoutManager")),
Reference < XLayoutManager > xLayoutManager(frameProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("LayoutManager"))),
UNO_QUERY);
xLayoutManager->hideElement (OUString::createFromAscii("private:resource/menubar/menubar"));
xLayoutManager->hideElement (OUString(RTL_CONSTASCII_USTRINGPARAM("private:resource/menubar/menubar")));
return;
}
......@@ -209,9 +209,9 @@ on_registrar_unavailable (GDBusConnection * /*connection*/,
FrameHelper *helper = (FrameHelper*)user_data;
Reference < XFrame > xFrame = helper->getFrame ();
Reference< XPropertySet > frameProps (xFrame, UNO_QUERY);
Reference < XLayoutManager > xLayoutManager(frameProps->getPropertyValue(OUString::createFromAscii("LayoutManager")),
Reference < XLayoutManager > xLayoutManager(frameProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("LayoutManager"))),
UNO_QUERY);
xLayoutManager->showElement (OUString::createFromAscii("private:resource/menubar/menubar"));
xLayoutManager->showElement (OUString(RTL_CONSTASCII_USTRINGPARAM("private:resource/menubar/menubar")));
return;
}
// ------------------------------- FrameJob --------------------------------------------
......@@ -270,7 +270,7 @@ FrameJob::exportMenus (Reference < XFrame > xFrame)
Reference< XPropertySet > frameProps (xFrame, UNO_QUERY);
Reference < XLayoutManager > xLayoutManager(frameProps->getPropertyValue(OUString::createFromAscii("LayoutManager")),
Reference < XLayoutManager > xLayoutManager(frameProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("LayoutManager"))),
UNO_QUERY);
if (!xLayoutManager.is())
{
......@@ -278,7 +278,7 @@ FrameJob::exportMenus (Reference < XFrame > xFrame)
return;
}
Reference < XUIElement > menuBar(xLayoutManager->getElement (OUString::createFromAscii("private:resource/menubar/menubar")),
Reference < XUIElement > menuBar(xLayoutManager->getElement (OUString(RTL_CONSTASCII_USTRINGPARAM("private:resource/menubar/menubar"))),
UNO_QUERY);
Reference < XPropertySet > menuPropSet (menuBar, UNO_QUERY);
......@@ -288,7 +288,7 @@ FrameJob::exportMenus (Reference < XFrame > xFrame)
return;
}
Reference < XMenu > xMenu (menuPropSet->getPropertyValue(OUString::createFromAscii("XMenuBar")),
Reference < XMenu > xMenu (menuPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("XMenuBar"))),
UNO_QUERY);
if (!xMenu.is ())
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment