diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-03-28 22:19:30 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-03-29 12:44:23 +0100 |
| commit | 9ce98add53128716524ec06dd1f90548326adce0 (patch) | |
| tree | 5b5eba190310fa1f25b84af3f3af30b7894ae629 /vbahelper | |
| parent | 37d6ff0691f7be9fa4d742779fa59883de3586d9 (diff) | |
remove static OUStrings from static_initialization_and_destruction chain
Diffstat (limited to 'vbahelper')
| -rw-r--r-- | vbahelper/source/vbahelper/vbadocumentsbase.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vbahelper/source/vbahelper/vbadocumentsbase.cxx b/vbahelper/source/vbahelper/vbadocumentsbase.cxx index 261599da630b..f10c68285290 100644 --- a/vbahelper/source/vbahelper/vbadocumentsbase.cxx +++ b/vbahelper/source/vbahelper/vbadocumentsbase.cxx @@ -63,8 +63,8 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -static const rtl::OUString sSpreadsheetDocument( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.SpreadsheetDocument") ); -static const rtl::OUString sTextDocument( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextDocument") ); +static const char aSpreadsheetDocument[] = "com.sun.star.sheet.SpreadsheetDocument"; +static const char aTextDocument[] = "com.sun.star.text.TextDocument"; typedef boost::unordered_map< rtl::OUString, sal_Int32, ::rtl::OUStringHash, @@ -146,8 +146,8 @@ public: { uno::Reference< lang::XServiceInfo > xServiceInfo( xEnum->nextElement(), uno::UNO_QUERY ); if ( xServiceInfo.is() - && ( ( xServiceInfo->supportsService( sSpreadsheetDocument ) && meDocType == VbaDocumentsBase::EXCEL_DOCUMENT ) - || ( xServiceInfo->supportsService( sTextDocument ) && meDocType == VbaDocumentsBase::WORD_DOCUMENT ) ) ) + && ( ( xServiceInfo->supportsService( rtl::OUString(aSpreadsheetDocument) ) && meDocType == VbaDocumentsBase::EXCEL_DOCUMENT ) + || ( xServiceInfo->supportsService( rtl::OUString(aTextDocument) ) && meDocType == VbaDocumentsBase::WORD_DOCUMENT ) ) ) { uno::Reference< frame::XModel > xModel( xServiceInfo, uno::UNO_QUERY_THROW ); // that the spreadsheetdocument is a xmodel is a given m_documents.push_back( xModel ); |