summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sc/inc/unonames.hxx2
-rw-r--r--sc/source/filter/xml/xmlimprt.cxx5
-rw-r--r--sc/source/filter/xml/xmlwrap.cxx5
3 files changed, 8 insertions, 4 deletions
diff --git a/sc/inc/unonames.hxx b/sc/inc/unonames.hxx
index 1cc71a9f9584..689dceac66fd 100644
--- a/sc/inc/unonames.hxx
+++ b/sc/inc/unonames.hxx
@@ -668,6 +668,8 @@
#define SC_UNO_EMBED_FONTS "EmbedFonts"
+#define SC_UNO_ODS_LOCK_SOLAR_MUTEX "LockSolarMutex"
+
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx
index 2aa6c1473d03..813190d6f62a 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -69,6 +69,7 @@
#include "editattributemap.hxx"
#include "documentimport.hxx"
#include "pivotsource.hxx"
+#include <unonames.hxx>
#include <comphelper/extract.hxx>
@@ -2253,8 +2254,8 @@ void ScXMLImport::initialize( const css::uno::Sequence<css::uno::Any>& aArgument
if (!xInfoSetInfo.is())
return;
- if (xInfoSetInfo->hasPropertyByName("LockSolarMutex"))
- xInfoSet->getPropertyValue("LockSolarMutex") >>= mbLockSolarMutex;
+ if (xInfoSetInfo->hasPropertyByName(SC_UNO_ODS_LOCK_SOLAR_MUTEX))
+ xInfoSet->getPropertyValue(SC_UNO_ODS_LOCK_SOLAR_MUTEX) >>= mbLockSolarMutex;
}
SvXMLImportContext *ScXMLImport::CreateFontDeclsContext(const sal_uInt16 nPrefix, const OUString& rLocalName,
diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx
index 6282b9ff9566..cc1cbff2b4a0 100644
--- a/sc/source/filter/xml/xmlwrap.cxx
+++ b/sc/source/filter/xml/xmlwrap.cxx
@@ -71,6 +71,7 @@
#include "sheetdata.hxx"
#include "XMLCodeNameProvider.hxx"
#include <docsh.hxx>
+#include <unonames.hxx>
using namespace com::sun::star;
@@ -343,12 +344,12 @@ bool ScXMLImportWrapper::Import(bool bStylesOnly, ErrCode& nError)
{ OUString("OrganizerMode"), 0, ::getBooleanCppuType(),
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
{ OUString("SourceStorage"), 0, cppu::UnoType<embed::XStorage>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
- { OUString("LockSolarMutex"), 0, getBooleanCppuType(), css::beans::PropertyAttribute::MAYBEVOID, 0 },
+ { OUString(SC_UNO_ODS_LOCK_SOLAR_MUTEX), 0, getBooleanCppuType(), css::beans::PropertyAttribute::MAYBEVOID, 0 },
{ OUString(), 0, css::uno::Type(), 0, 0 }
};
uno::Reference< beans::XPropertySet > xInfoSet( comphelper::GenericPropertySet_CreateInstance( new comphelper::PropertySetInfo( aImportInfoMap ) ) );
- xInfoSet->setPropertyValue("LockSolarMutex", uno::makeAny(false));
+ xInfoSet->setPropertyValue(SC_UNO_ODS_LOCK_SOLAR_MUTEX, uno::makeAny(false));
// ---- get BuildId from parent container if available