diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2012-06-08 16:56:40 -0500 |
|---|---|---|
| committer | Darrell Anderson <humanreadable@yahoo.com> | 2012-06-08 16:56:40 -0500 |
| commit | 910a61f9423d69871c2ef9ca8a0d7ace32474f93 (patch) | |
| tree | 794bd468068d2616d05878f58b0786b07ceff8d9 /lib/kofficecore/KoDocument.cpp | |
| parent | 420112343c04d209e40c6f03f492cdb6154f70fb (diff) | |
| download | koffice-910a61f9423d69871c2ef9ca8a0d7ace32474f93.tar.gz koffice-910a61f9423d69871c2ef9ca8a0d7ace32474f93.zip | |
Update XDG information in support of bug report 892.
Diffstat (limited to 'lib/kofficecore/KoDocument.cpp')
| -rw-r--r-- | lib/kofficecore/KoDocument.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/kofficecore/KoDocument.cpp b/lib/kofficecore/KoDocument.cpp index f881293a9..a54cfc257 100644 --- a/lib/kofficecore/KoDocument.cpp +++ b/lib/kofficecore/KoDocument.cpp @@ -1268,7 +1268,7 @@ TQString KoDocument::autoSaveFile( const TQString & path ) const // Using the extension allows to avoid relying on the mime magic when opening KMimeType::Ptr mime = KMimeType::mimeType( nativeFormatMimeType() ); - TQString extension = mime->property( "X-KDE-NativeExtension" ).toString(); + TQString extension = mime->property( "X-TDE-NativeExtension" ).toString(); if ( path.isEmpty() ) { // Never saved? Use a temp file in $HOME then @@ -2196,7 +2196,7 @@ TQCString KoDocument::nativeFormatMimeType() const KService::Ptr service = const_cast<KoDocument *>(this)->nativeService(); if ( !service ) return TQCString(); - TQCString nativeMimeType = service->property( "X-KDE-NativeMimeType" ).toString().latin1(); + TQCString nativeMimeType = service->property( "X-TDE-NativeMimeType" ).toString().latin1(); if ( nativeMimeType.isEmpty() ) { // shouldn't happen, let's find out why it happened if ( !service->serviceTypes().contains( "KOfficePart" ) ) @@ -2212,7 +2212,7 @@ TQCString KoDocument::nativeOasisMimeType() const KService::Ptr service = const_cast<KoDocument *>(this)->nativeService(); if ( !service ) return TQCString(); - return service->property( "X-KDE-NativeOasisMimeType" ).toString().latin1(); + return service->property( "X-TDE-NativeOasisMimeType" ).toString().latin1(); } @@ -2247,7 +2247,7 @@ TQCString KoDocument::readNativeFormatMimeType( KInstance *instance ) //static if ( !service ) return TQCString(); - if ( service->property( "X-KDE-NativeMimeType" ).toString().isEmpty() ) + if ( service->property( "X-TDE-NativeMimeType" ).toString().isEmpty() ) { // It may be that the servicetype "KOfficePart" is missing, which leads to this property not being known if ( KServiceType::serviceType( "KOfficePart" ) == 0L ) @@ -2255,11 +2255,11 @@ TQCString KoDocument::readNativeFormatMimeType( KInstance *instance ) //static else { TQString instname = instance ? instance->instanceName() : kapp->instanceName(); if ( instname != "koshell" ) // hack for koshell - kdWarning(30003) << service->desktopEntryPath() << ": no X-KDE-NativeMimeType entry!" << endl; + kdWarning(30003) << service->desktopEntryPath() << ": no X-TDE-NativeMimeType entry!" << endl; } } - return service->property( "X-KDE-NativeMimeType" ).toString().latin1(); + return service->property( "X-TDE-NativeMimeType" ).toString().latin1(); } TQStringList KoDocument::readExtraNativeMimeTypes( KInstance *instance ) //static @@ -2267,7 +2267,7 @@ TQStringList KoDocument::readExtraNativeMimeTypes( KInstance *instance ) //stati KService::Ptr service = readNativeService( instance ); if ( !service ) return TQStringList(); - return service->property( "X-KDE-ExtraNativeMimeTypes" ).toStringList(); + return service->property( "X-TDE-ExtraNativeMimeTypes" ).toStringList(); } void KoDocument::setupXmlReader( TQXmlSimpleReader& reader, bool namespaceProcessing ) @@ -2302,7 +2302,7 @@ TQStringList KoDocument::extraNativeMimeTypes() const KService::Ptr service = const_cast<KoDocument *>(this)->nativeService(); if ( !service ) // can't happen return lst; - return service->property( "X-KDE-ExtraNativeMimeTypes" ).toStringList(); + return service->property( "X-TDE-ExtraNativeMimeTypes" ).toStringList(); } int KoDocument::supportedSpecialFormats() const |
