[Libreoffice-commits] core.git: sfx2/source
Noel Grandin
noel at peralex.com
Wed Nov 4 02:59:45 PST 2015
sfx2/source/appl/appopen.cxx | 2 -
sfx2/source/appl/appserv.cxx | 2 -
sfx2/source/appl/imestatuswindow.cxx | 10 +++----
sfx2/source/appl/sfxhelp.cxx | 4 +--
sfx2/source/appl/shutdownicon.cxx | 2 -
sfx2/source/appl/workwin.cxx | 3 --
sfx2/source/doc/DocumentMetadataAccess.cxx | 2 -
sfx2/source/doc/SfxDocumentMetaData.cxx | 38 ++++++++++++-----------------
sfx2/source/doc/docfile.cxx | 2 -
sfx2/source/doc/doctempl.cxx | 2 -
sfx2/source/doc/guisaveas.cxx | 2 -
sfx2/source/doc/objstor.cxx | 10 +++----
sfx2/source/menu/thessubmenu.cxx | 2 -
sfx2/source/sidebar/EnumContext.cxx | 34 ++++++++++++-------------
sfx2/source/sidebar/SidebarController.cxx | 4 +--
sfx2/source/view/frame2.cxx | 2 -
sfx2/source/view/viewfrm.cxx | 9 +++---
17 files changed, 62 insertions(+), 68 deletions(-)
New commits:
commit b2459b05b4a4e9f79ae94260d4e210d3419fa9a0
Author: Noel Grandin <noel at peralex.com>
Date: Wed Nov 4 12:58:45 2015 +0200
loplugin:stringconstant
Change-Id: I9dde988e95e3c574c6643c4e008a1090270bad5f
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index 9e95bf6..73157a5 100644
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.cxx
@@ -157,7 +157,7 @@ private:
::comphelper::OStorageHelper::SetCommonStorageEncryptionData( mxStorage, rEncryptionData );
mxStorage->openStreamElement(
- OUString( "content.xml" ),
+ "content.xml",
embed::ElementModes::READ | embed::ElementModes::NOCREATE );
// no exception -> success
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 356d928..e83d4dc 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -231,7 +231,7 @@ static void showDocument( const char* pBaseName )
if ( checkURL ( pBaseName, ".fodt", aURL ) ||
checkURL ( pBaseName, ".html", aURL ) ||
checkURL ( pBaseName, "", aURL ) ) {
- xDesktop->loadComponentFromURL( aURL, OUString("_blank"), 0, args );
+ xDesktop->loadComponentFromURL( aURL, "_blank", 0, args );
}
} catch (const css::uno::Exception &) {
}
diff --git a/sfx2/source/appl/imestatuswindow.cxx b/sfx2/source/appl/imestatuswindow.cxx
index 6163ccc..b8153e9 100644
--- a/sfx2/source/appl/imestatuswindow.cxx
+++ b/sfx2/source/appl/imestatuswindow.cxx
@@ -95,7 +95,7 @@ void ImeStatusWindow::init()
try
{
bool bShow;
- if (getConfig()->getPropertyValue(OUString("ShowStatusWindow")) >>= bShow)
+ if (getConfig()->getPropertyValue("ShowStatusWindow") >>= bShow)
Application::ShowImeStatusWindow(bShow);
}
catch (css::uno::Exception &)
@@ -111,7 +111,7 @@ bool ImeStatusWindow::isShowing()
try
{
bool bShow(false);
- if (getConfig()->getPropertyValue(OUString("ShowStatusWindow")) >>= bShow)
+ if (getConfig()->getPropertyValue("ShowStatusWindow") >>= bShow)
return bShow;
}
catch (css::uno::Exception &)
@@ -129,7 +129,7 @@ void ImeStatusWindow::show(bool bShow)
{
css::uno::Reference< css::beans::XPropertySet > xConfig(getConfig());
xConfig->setPropertyValue(
- OUString("ShowStatusWindow"),
+ "ShowStatusWindow",
css::uno::makeAny(bShow));
css::uno::Reference< css::util::XChangesBatch > xCommit(
xConfig, css::uno::UNO_QUERY);
@@ -158,7 +158,7 @@ ImeStatusWindow::~ImeStatusWindow()
try
{
m_xConfig->removePropertyChangeListener(
- OUString("ShowStatusWindow"),
+ "ShowStatusWindow",
m_xConfigListener);
}
catch (css::uno::Exception &)
@@ -232,7 +232,7 @@ css::uno::Reference< css::beans::XPropertySet > ImeStatusWindow::getConfig()
// no dispose notifications):
m_xConfigListener = new WeakPropertyChangeListener(this);
xConfig->addPropertyChangeListener(
- OUString("ShowStatusWindow"),
+ "ShowStatusWindow",
m_xConfigListener);
}
return xConfig;
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index 1032d95..5495437 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -424,7 +424,7 @@ SfxHelpWindow_Impl* impl_createHelp(Reference< XFrame2 >& rHelpTask ,
// This sub frame is created internally (if we called new SfxHelpWindow_Impl() ...)
// It should exist :-)
- xHelpContent = xHelpTask->findFrame(OUString("OFFICE_HELP"), FrameSearchFlag::CHILDREN);
+ xHelpContent = xHelpTask->findFrame("OFFICE_HELP", FrameSearchFlag::CHILDREN);
}
if (!xHelpContent.is())
@@ -619,7 +619,7 @@ bool SfxHelp::Start_Impl(const OUString& rURL, const vcl::Window* pWindow, const
xDesktop->findFrame( "OFFICE_HELP_TASK", FrameSearchFlag::CHILDREN),
UNO_QUERY);
Reference< XFrame > xHelpContent = xDesktop->findFrame(
- OUString("OFFICE_HELP"),
+ "OFFICE_HELP",
FrameSearchFlag::CHILDREN);
SfxHelpWindow_Impl* pHelpWindow = 0;
diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx
index c108c90..cfc6344 100644
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.cxx
@@ -295,7 +295,7 @@ void ShutdownIcon::FromTemplate()
css::uno::Reference < css::frame::XDispatch > xDisp;
if ( xProv.is() )
{
- xDisp = xProv->queryDispatch( aTargetURL, OUString("_self"), 0 );
+ xDisp = xProv->queryDispatch( aTargetURL, "_self", 0 );
}
if ( xDisp.is() )
{
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index d157fa9..8789a3e 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -190,8 +190,7 @@ void LayoutManagerListener::setFrame( const css::uno::Reference< css::frame::XFr
xPropSet = css::uno::Reference< css::beans::XPropertySet >( xLayoutManager, UNO_QUERY );
if ( xPropSet.is() )
{
- aValue = xPropSet->getPropertyValue(
- OUString( "LockCount" ) );
+ aValue = xPropSet->getPropertyValue( "LockCount" );
aValue >>= m_pWrkWin->m_nLock;
}
}
diff --git a/sfx2/source/doc/DocumentMetadataAccess.cxx b/sfx2/source/doc/DocumentMetadataAccess.cxx
index 385cf2a..9b0256b 100644
--- a/sfx2/source/doc/DocumentMetadataAccess.cxx
+++ b/sfx2/source/doc/DocumentMetadataAccess.cxx
@@ -609,7 +609,7 @@ exportStream(struct DocumentMetadataAccess_Impl & i_rImpl,
uno::UNO_QUERY);
if (xStreamProps.is()) { // this is NOT supported in FileSystemStorage
xStreamProps->setPropertyValue(
- OUString("MediaType"),
+ "MediaType",
uno::makeAny(OUString(s_rdfxml)));
}
const uno::Reference<io::XOutputStream> xOutStream(
diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx b/sfx2/source/doc/SfxDocumentMetaData.cxx
index bfb31ee..f123841 100644
--- a/sfx2/source/doc/SfxDocumentMetaData.cxx
+++ b/sfx2/source/doc/SfxDocumentMetaData.cxx
@@ -644,7 +644,7 @@ SfxDocumentMetaData::getURLProperties(
}
} else if (i_rMedium[i].Name == "HierarchicalDocumentName") {
xPropArg->addProperty(
- OUString("StreamRelPath"),
+ "StreamRelPath",
css::beans::PropertyAttribute::MAYBEVOID,
i_rMedium[i].Value);
}
@@ -654,7 +654,7 @@ SfxDocumentMetaData::getURLProperties(
"BaseURI", css::beans::PropertyAttribute::MAYBEVOID,
baseUri);
}
- xPropArg->addProperty(OUString("StreamName"),
+ xPropArg->addProperty("StreamName",
css::beans::PropertyAttribute::MAYBEVOID,
css::uno::makeAny(OUString(s_meta)));
} catch (const css::uno::Exception &) {
@@ -1144,14 +1144,10 @@ void SAL_CALL SfxDocumentMetaData::init(
m_xDoc = i_xDoc;
// select nodes for standard meta data stuff
- xPath->registerNS(OUString("xlink"),
- OUString::createFromAscii(s_nsXLink));
- xPath->registerNS(OUString("dc"),
- OUString::createFromAscii(s_nsDC));
- xPath->registerNS(OUString("office"),
- OUString::createFromAscii(s_nsODF));
- xPath->registerNS(OUString("meta"),
- OUString::createFromAscii(s_nsODFMeta));
+ xPath->registerNS("xlink", OUString::createFromAscii(s_nsXLink));
+ xPath->registerNS("dc", OUString::createFromAscii(s_nsDC));
+ xPath->registerNS("office", OUString::createFromAscii(s_nsODF));
+ xPath->registerNS("meta", OUString::createFromAscii(s_nsODFMeta));
// NB: we do not handle the single-XML-file ODF variant, which would
// have the root element office:document.
// The root of such documents must be converted in the importer!
@@ -1195,19 +1191,19 @@ void SAL_CALL SfxDocumentMetaData::init(
if (!xRElem.is()) {
xRElem = i_xDoc->createElementNS(
OUString::createFromAscii(s_nsODF),
- OUString("office:document-meta"));
+ "office:document-meta");
css::uno::Reference<css::xml::dom::XNode> xRNode(xRElem,
css::uno::UNO_QUERY_THROW);
i_xDoc->appendChild(xRNode);
}
xRElem->setAttributeNS(OUString::createFromAscii(s_nsODF),
- OUString("office:version"),
- OUString("1.0"));
+ "office:version",
+ "1.0");
// does not exist, otherwise m_xParent would not be null
css::uno::Reference<css::xml::dom::XNode> xParent (
i_xDoc->createElementNS(
OUString::createFromAscii(s_nsODF),
- OUString("office:meta")),
+ "office:meta"),
css::uno::UNO_QUERY_THROW);
xRElem->appendChild(xParent);
m_xParent = xParent;
@@ -1276,10 +1272,10 @@ void SAL_CALL SfxDocumentMetaData::init(
css::uno::Any any;
OUString name = xElem->getAttributeNS(
OUString::createFromAscii(s_nsODFMeta),
- OUString("name"));
+ "name");
OUString type = xElem->getAttributeNS(
OUString::createFromAscii(s_nsODFMeta),
- OUString("value-type"));
+ "value-type");
OUString text = getNodeText(*it);
if ( type == "float" ) {
double d;
@@ -1870,7 +1866,7 @@ SfxDocumentMetaData::loadFromStorage(
// open meta data file
css::uno::Reference<css::io::XStream> xStream(
xStorage->openStreamElement(
- OUString(s_meta),
+ s_meta,
css::embed::ElementModes::READ) );
if (!xStream.is()) throw css::uno::RuntimeException();
css::uno::Reference<css::io::XInputStream> xInStream =
@@ -1944,20 +1940,20 @@ SfxDocumentMetaData::storeToStorage(
// write into storage
css::uno::Reference<css::io::XStream> xStream =
- xStorage->openStreamElement(OUString(s_meta),
+ xStorage->openStreamElement(s_meta,
css::embed::ElementModes::WRITE
| css::embed::ElementModes::TRUNCATE);
if (!xStream.is()) throw css::uno::RuntimeException();
css::uno::Reference< css::beans::XPropertySet > xStreamProps(xStream,
css::uno::UNO_QUERY_THROW);
xStreamProps->setPropertyValue(
- OUString("MediaType"),
+ "MediaType",
css::uno::makeAny(OUString("text/xml")));
xStreamProps->setPropertyValue(
- OUString("Compressed"),
+ "Compressed",
css::uno::makeAny(false));
xStreamProps->setPropertyValue(
- OUString("UseCommonStoragePasswordEncryption"),
+ "UseCommonStoragePasswordEncryption",
css::uno::makeAny(false));
css::uno::Reference<css::io::XOutputStream> xOutStream =
xStream->getOutputStream();
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 051e5fe..f6a641b 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -3536,7 +3536,7 @@ bool SfxMedium::SignContents_Impl( bool bScriptingContent, const OUString& aODFV
throw uno::RuntimeException();
uno::Reference< embed::XStorage > xMetaInf = xWriteableZipStor->openStorageElement(
- OUString( "META-INF" ),
+ "META-INF",
embed::ElementModes::READWRITE );
if ( !xMetaInf.is() )
throw uno::RuntimeException();
diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx
index 402db40..1910068 100644
--- a/sfx2/source/doc/doctempl.cxx
+++ b/sfx2/source/doc/doctempl.cxx
@@ -833,7 +833,7 @@ bool SfxDocumentTemplates::CopyFrom
{
xStorable = uno::Reference< XStorable >(
xDesktop->loadComponentFromURL( aTemplURL.GetMainURL(INetURLObject::NO_DECODE),
- OUString("_blank"),
+ "_blank",
0,
aArgs ),
UNO_QUERY );
diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
index 153c320..0062a93 100644
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -1157,7 +1157,7 @@ bool ModelData_Impl::ShowDocumentInfoDialog()
{
uno::Reference< frame::XDispatch > xDispatch = xFrameDispatch->queryDispatch(
aURL,
- OUString("_self"),
+ "_self",
0 );
if ( xDispatch.is() )
{
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 8b2916c..7f0a94c 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -219,7 +219,7 @@ bool SfxObjectShell::PutURLContentsToVersionStream_Impl(
try
{
uno::Reference< embed::XStorage > xVersion = xDocStorage->openStorageElement(
- OUString("Versions"),
+ "Versions",
embed::ElementModes::READWRITE );
DBG_ASSERT( xVersion.is(),
@@ -1606,14 +1606,14 @@ bool SfxObjectShell::SaveTo_Impl
if ( !xReadOrig.is() )
throw uno::RuntimeException();
uno::Reference< embed::XStorage > xMetaInf = xReadOrig->openStorageElement(
- OUString( "META-INF" ),
+ "META-INF",
embed::ElementModes::READ );
uno::Reference< embed::XStorage > xTarget = rMedium.GetZipStorageToSign_Impl( false );
if ( !xTarget.is() )
throw uno::RuntimeException();
uno::Reference< embed::XStorage > xTargetMetaInf = xTarget->openStorageElement(
- OUString( "META-INF" ),
+ "META-INF",
embed::ElementModes::READWRITE );
if ( xMetaInf.is() && xTargetMetaInf.is() )
@@ -3491,11 +3491,11 @@ bool SfxObjectShell::GenerateAndStoreThumbnail(bool bEncrypted, bool bIsTemplate
try
{
- uno::Reference<embed::XStorage> xThumbnailStorage = xStorage->openStorageElement(OUString("Thumbnails"), embed::ElementModes::READWRITE);
+ uno::Reference<embed::XStorage> xThumbnailStorage = xStorage->openStorageElement("Thumbnails", embed::ElementModes::READWRITE);
if (xThumbnailStorage.is())
{
- uno::Reference<io::XStream> xStream = xThumbnailStorage->openStreamElement(OUString("thumbnail.png"), embed::ElementModes::READWRITE);
+ uno::Reference<io::XStream> xStream = xThumbnailStorage->openStreamElement("thumbnail.png", embed::ElementModes::READWRITE);
if (xStream.is() && WriteThumbnail(bEncrypted, bIsTemplate, xStream))
{
diff --git a/sfx2/source/menu/thessubmenu.cxx b/sfx2/source/menu/thessubmenu.cxx
index 9ee51c4..f1548fe 100644
--- a/sfx2/source/menu/thessubmenu.cxx
+++ b/sfx2/source/menu/thessubmenu.cxx
@@ -127,7 +127,7 @@ OUString SfxThesSubMenuHelper::GetThesImplName( const lang::Locale &rLocale ) co
{
OUString aRes;
uno::Sequence< OUString > aServiceNames = m_xLngMgr->getConfiguredServices(
- OUString("com.sun.star.linguistic2.Thesaurus"), rLocale );
+ "com.sun.star.linguistic2.Thesaurus", rLocale );
// there should be at most one thesaurus configured for each language
DBG_ASSERT( aServiceNames.getLength() <= 1, "more than one thesaurus found. Should not be possible" );
if (aServiceNames.getLength() == 1)
diff --git a/sfx2/source/sidebar/EnumContext.cxx b/sfx2/source/sidebar/EnumContext.cxx
index 7af70d9..db80700 100644
--- a/sfx2/source/sidebar/EnumContext.cxx
+++ b/sfx2/source/sidebar/EnumContext.cxx
@@ -115,19 +115,19 @@ void EnumContext::ProvideApplicationContainers()
if (maApplicationMap.empty())
{
maApplicationVector.resize(static_cast<size_t>(EnumContext::__LastApplicationEnum)+1);
- AddEntry(OUString("com.sun.star.text.TextDocument"), EnumContext::Application_Writer);
- AddEntry(OUString("com.sun.star.text.GlobalDocument"), EnumContext::Application_WriterGlobal);
- AddEntry(OUString("com.sun.star.text.WebDocument"), EnumContext::Application_WriterWeb);
- AddEntry(OUString("com.sun.star.xforms.XMLFormDocument"), EnumContext::Application_WriterXML);
- AddEntry(OUString("com.sun.star.sdb.FormDesign"), EnumContext::Application_WriterForm);
- AddEntry(OUString("com.sun.star.sdb.TextReportDesign"), EnumContext::Application_WriterReport);
- AddEntry(OUString("com.sun.star.sheet.SpreadsheetDocument"), EnumContext::Application_Calc);
- AddEntry(OUString("com.sun.star.chart2.ChartDocument"), EnumContext::Application_Chart);
- AddEntry(OUString("com.sun.star.drawing.DrawingDocument"), EnumContext::Application_Draw);
- AddEntry(OUString("com.sun.star.presentation.PresentationDocument"), EnumContext::Application_Impress);
-
- AddEntry(OUString("any"), EnumContext::Application_Any);
- AddEntry(OUString("none"), EnumContext::Application_None);
+ AddEntry("com.sun.star.text.TextDocument", EnumContext::Application_Writer);
+ AddEntry("com.sun.star.text.GlobalDocument", EnumContext::Application_WriterGlobal);
+ AddEntry("com.sun.star.text.WebDocument", EnumContext::Application_WriterWeb);
+ AddEntry("com.sun.star.xforms.XMLFormDocument", EnumContext::Application_WriterXML);
+ AddEntry("com.sun.star.sdb.FormDesign", EnumContext::Application_WriterForm);
+ AddEntry("com.sun.star.sdb.TextReportDesign", EnumContext::Application_WriterReport);
+ AddEntry("com.sun.star.sheet.SpreadsheetDocument", EnumContext::Application_Calc);
+ AddEntry("com.sun.star.chart2.ChartDocument", EnumContext::Application_Chart);
+ AddEntry("com.sun.star.drawing.DrawingDocument", EnumContext::Application_Draw);
+ AddEntry("com.sun.star.presentation.PresentationDocument", EnumContext::Application_Impress);
+
+ AddEntry("any", EnumContext::Application_Any);
+ AddEntry("none", EnumContext::Application_None);
}
}
@@ -168,10 +168,10 @@ void EnumContext::ProvideContextContainers()
if (maContextMap.empty())
{
maContextVector.resize(static_cast<size_t>(__LastContextEnum)+1);
- AddEntry(OUString("any"), Context_Any);
- AddEntry(OUString("default"), Context_Default);
- AddEntry(OUString("empty"), Context_Empty);
-#define AddContext(context) AddEntry(OUString(#context), Context_##context);
+ AddEntry("any", Context_Any);
+ AddEntry("default", Context_Default);
+ AddEntry("empty", Context_Empty);
+#define AddContext(context) AddEntry(#context, Context_##context);
AddContext(3DObject);
AddContext(Annotation);
AddContext(Auditing);
diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx
index 1d88286..7c4ef5a 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -125,7 +125,7 @@ SidebarController::SidebarController (
// Listen for theme property changes.
Theme::GetPropertySet()->addPropertyChangeListener(
- OUString(""),
+ "",
static_cast<css::beans::XPropertyChangeListener*>(this));
// Get the dispatch object as preparation to listen for changes of
@@ -219,7 +219,7 @@ void SAL_CALL SidebarController::disposing()
}
Theme::GetPropertySet()->removePropertyChangeListener(
- OUString(""),
+ "",
static_cast<css::beans::XPropertyChangeListener*>(this));
maContextChangeUpdate.CancelRequest();
diff --git a/sfx2/source/view/frame2.cxx b/sfx2/source/view/frame2.cxx
index afb839e..f44bf91 100644
--- a/sfx2/source/view/frame2.cxx
+++ b/sfx2/source/view/frame2.cxx
@@ -255,7 +255,7 @@ SfxFrame* SfxFrame::Create( SfxObjectShell& rDoc, vcl::Window& rWindow, sal_uInt
Reference< XComponentLoader > xLoader( xFrame, UNO_QUERY_THROW );
xLoader->loadComponentFromURL(
sLoaderURL,
- OUString( "_self" ),
+ "_self",
0,
aLoadArgs
);
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 7743481..41edaed 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -1911,7 +1911,7 @@ SfxViewShell* SfxViewFrame::LoadViewIntoFrame_Impl( const SfxObjectShell& i_rDoc
sURL = i_rDoc.GetFactory().GetFactoryURL();
Reference< XComponentLoader > xLoader( i_rFrame, UNO_QUERY_THROW );
- xLoader->loadComponentFromURL( sURL, OUString("_self"), 0,
+ xLoader->loadComponentFromURL( sURL, "_self", 0,
aTransformLoadArgs.getPropertyValues() );
SfxViewShell* pViewShell = SfxViewShell::Get( i_rFrame->getController() );
@@ -2841,7 +2841,7 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq )
try
{
xLMPropSet->setPropertyValue(
- OUString( "HideCurrentUI" ),
+ "HideCurrentUI",
makeAny( bNewFullScreenMode ));
}
catch ( css::beans::UnknownPropertyException& )
@@ -2943,8 +2943,7 @@ void SfxViewFrame::MiscState_Impl(SfxItemSet &rSet)
css::uno::Reference< css::beans::XPropertySet > xSet(
GetFrame().GetFrameInterface(),
css::uno::UNO_QUERY);
- css::uno::Any aProp = xSet->getPropertyValue(
- OUString( "LayoutManager" ) );
+ css::uno::Any aProp = xSet->getPropertyValue( "LayoutManager" );
if ( !( aProp >>= xLayoutManager ))
rSet.Put( SfxBoolItem( nWhich, false ));
@@ -3035,7 +3034,7 @@ void SfxViewFrame::ChildWindowExecute( SfxRequest &rReq )
Reference < XDispatchProvider > xProv( xFrame, UNO_QUERY );
Reference < css::frame::XDispatch > xDisp;
if ( xProv.is() )
- xDisp = xProv->queryDispatch( aTargetURL, OUString("_beamer"), 31 );
+ xDisp = xProv->queryDispatch( aTargetURL, "_beamer", 31 );
if ( xDisp.is() )
{
Sequence < css::beans::PropertyValue > aArgs(1);
More information about the Libreoffice-commits
mailing list