diff options
| author | Release Engineers <releng@openoffice.org> | 2009-05-06 13:20:55 +0000 |
|---|---|---|
| committer | Release Engineers <releng@openoffice.org> | 2009-05-06 13:20:55 +0000 |
| commit | b5e71889328dfd334f73b262388d3bae0b6ece0c (patch) | |
| tree | 9de7d4def8a6518e4bd7e58c2cc90fe2b05e0d28 /writerfilter/source/filter/WriterFilterDetection.cxx | |
| parent | 61f0de3924956137216e211858be641eb7cb31bf (diff) | |
CWS-TOOLING: integrate CWS os127
2009-04-27 15:37:53 +0200 hde r271284 : i101363
2009-04-27 11:21:04 +0200 hde r271256 : #i101363
2009-03-26 12:56:13 +0100 os r270070 : #i97437# call ErrorHandler if necessary
2009-03-17 14:47:12 +0100 os r269609 : CWS-TOOLING: rebase CWS os127 to trunk@269297 (milestone: DEV300:m43)
2009-03-16 11:45:30 +0100 os r269516 : #i97471# SwDrawTextShell::Init(): mouse double click and key input in group objects at the same time: prevent crash
2009-03-12 12:02:45 +0100 os r269381 : #i100069# label Herma 5116 added
2009-03-12 12:01:21 +0100 os r269380 : #i100069# label description fixed
2009-02-16 15:10:22 +0100 os r267817 : #i96791# mark label names with x-no-translate
2009-01-26 15:41:13 +0100 os r266932 : #i97572# selection should not be kill in update of a TOX
2009-01-22 15:17:37 +0100 os r266719 : #i97850# reconversion patch applied
2009-01-22 15:01:00 +0100 os r266717 : #i98023# enable loading from InputStream
2009-01-21 16:04:52 +0100 os r266679 : #97667# names from database column: keep dots and extensions
2009-01-21 15:58:03 +0100 os r266678 : #i97577# disable address list access if csv-file has been removed
2009-01-21 12:47:19 +0100 os r266658 : #i97577# disable address list access if csv-file has been removed
2009-01-19 14:37:03 +0100 os r266499 : #i97437# catch exceptions in storeToURL
2009-01-19 13:54:44 +0100 os r266494 : #i98237# SwRVPMark removed
Diffstat (limited to 'writerfilter/source/filter/WriterFilterDetection.cxx')
| -rw-r--r-- | writerfilter/source/filter/WriterFilterDetection.cxx | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/writerfilter/source/filter/WriterFilterDetection.cxx b/writerfilter/source/filter/WriterFilterDetection.cxx index d47447e4ea4e..4be325b74945 100644 --- a/writerfilter/source/filter/WriterFilterDetection.cxx +++ b/writerfilter/source/filter/WriterFilterDetection.cxx @@ -121,7 +121,11 @@ OUString WriterFilterDetection::detect( uno::Sequence< beans::PropertyValue >& r } else { - uno::Reference< embed::XStorage > xDocStorage = comphelper::OStorageHelper::GetStorageFromURL( + uno::Reference< embed::XStorage > xDocStorage; + if( sURL.equalsAscii( "private:stream" ) ) + xDocStorage = comphelper::OStorageHelper::GetStorageFromInputStream( xInputStream ); + else + xDocStorage = comphelper::OStorageHelper::GetStorageFromURL( sURL, embed::ElementModes::READ ); if( xDocStorage.is() ) { @@ -132,6 +136,9 @@ OUString WriterFilterDetection::detect( uno::Sequence< beans::PropertyValue >& r if(pNames[nName].equalsAsciiL(RTL_CONSTASCII_STRINGPARAM ( "word" ))) { bWord = true; + if( !sTypeName.getLength() ) + sTypeName = ::rtl::OUString( + RTL_CONSTASCII_STRINGPARAM( "writer_MS_Word_2007" ), RTL_TEXTENCODING_ASCII_US); break; } } |