@ -1268,7 +1268,7 @@ TQString KoDocument::autoSaveFile( const TQString & path ) const
// Using the extension allows to avoid relying on the mime magic when opening
// Using the extension allows to avoid relying on the mime magic when opening
KMimeType : : Ptr mime = KMimeType : : mimeType ( nativeFormatMimeType ( ) ) ;
KMimeType : : Ptr mime = KMimeType : : mimeType ( nativeFormatMimeType ( ) ) ;
TQString extension = mime - > property ( " X- K DE-NativeExtension" ) . toString ( ) ;
TQString extension = mime - > property ( " X- T DE-NativeExtension" ) . toString ( ) ;
if ( path . isEmpty ( ) )
if ( path . isEmpty ( ) )
{
{
// Never saved? Use a temp file in $HOME then
// 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 ( ) ;
KService : : Ptr service = const_cast < KoDocument * > ( this ) - > nativeService ( ) ;
if ( ! service )
if ( ! service )
return TQCString ( ) ;
return TQCString ( ) ;
TQCString nativeMimeType = service - > property ( " X- K DE-NativeMimeType" ) . toString ( ) . latin1 ( ) ;
TQCString nativeMimeType = service - > property ( " X- T DE-NativeMimeType" ) . toString ( ) . latin1 ( ) ;
if ( nativeMimeType . isEmpty ( ) ) {
if ( nativeMimeType . isEmpty ( ) ) {
// shouldn't happen, let's find out why it happened
// shouldn't happen, let's find out why it happened
if ( ! service - > serviceTypes ( ) . contains ( " KOfficePart " ) )
if ( ! service - > serviceTypes ( ) . contains ( " KOfficePart " ) )
@ -2212,7 +2212,7 @@ TQCString KoDocument::nativeOasisMimeType() const
KService : : Ptr service = const_cast < KoDocument * > ( this ) - > nativeService ( ) ;
KService : : Ptr service = const_cast < KoDocument * > ( this ) - > nativeService ( ) ;
if ( ! service )
if ( ! service )
return TQCString ( ) ;
return TQCString ( ) ;
return service - > property ( " X- K DE-NativeOasisMimeType" ) . toString ( ) . latin1 ( ) ;
return service - > property ( " X- T DE-NativeOasisMimeType" ) . toString ( ) . latin1 ( ) ;
} }
@ -2247,7 +2247,7 @@ TQCString KoDocument::readNativeFormatMimeType( KInstance *instance ) //static
if ( ! service )
if ( ! service )
return TQCString ( ) ;
return TQCString ( ) ;
if ( service - > property ( " X- K DE-NativeMimeType" ) . toString ( ) . isEmpty ( ) )
if ( service - > property ( " X- T DE-NativeMimeType" ) . toString ( ) . isEmpty ( ) )
{
{
// It may be that the servicetype "KOfficePart" is missing, which leads to this property not being known
// It may be that the servicetype "KOfficePart" is missing, which leads to this property not being known
if ( KServiceType : : serviceType ( " KOfficePart " ) = = 0L )
if ( KServiceType : : serviceType ( " KOfficePart " ) = = 0L )
@ -2255,11 +2255,11 @@ TQCString KoDocument::readNativeFormatMimeType( KInstance *instance ) //static
else {
else {
TQString instname = instance ? instance - > instanceName ( ) : kapp - > instanceName ( ) ;
TQString instname = instance ? instance - > instanceName ( ) : kapp - > instanceName ( ) ;
if ( instname ! = " koshell " ) // hack for koshell
if ( instname ! = " koshell " ) // hack for koshell
kdWarning ( 30003 ) < < service - > desktopEntryPath ( ) < < " : no X- K DE-NativeMimeType entry!" < < endl ;
kdWarning ( 30003 ) < < service - > desktopEntryPath ( ) < < " : no X- T DE-NativeMimeType entry!" < < endl ;
}
}
}
}
return service - > property ( " X- K DE-NativeMimeType" ) . toString ( ) . latin1 ( ) ;
return service - > property ( " X- T DE-NativeMimeType" ) . toString ( ) . latin1 ( ) ;
} }
TQStringList KoDocument : : readExtraNativeMimeTypes ( KInstance * instance ) //static
TQStringList KoDocument : : readExtraNativeMimeTypes ( KInstance * instance ) //static
@ -2267,7 +2267,7 @@ TQStringList KoDocument::readExtraNativeMimeTypes( KInstance *instance ) //stati
KService : : Ptr service = readNativeService ( instance ) ;
KService : : Ptr service = readNativeService ( instance ) ;
if ( ! service )
if ( ! service )
return TQStringList ( ) ;
return TQStringList ( ) ;
return service - > property ( " X- K DE-ExtraNativeMimeTypes" ) . toStringList ( ) ;
return service - > property ( " X- T DE-ExtraNativeMimeTypes" ) . toStringList ( ) ;
} }
void KoDocument : : setupXmlReader ( TQXmlSimpleReader & reader , bool namespaceProcessing ) void KoDocument : : setupXmlReader ( TQXmlSimpleReader & reader , bool namespaceProcessing )
@ -2302,7 +2302,7 @@ TQStringList KoDocument::extraNativeMimeTypes() const
KService : : Ptr service = const_cast < KoDocument * > ( this ) - > nativeService ( ) ;
KService : : Ptr service = const_cast < KoDocument * > ( this ) - > nativeService ( ) ;
if ( ! service ) // can't happen
if ( ! service ) // can't happen
return lst ;
return lst ;
return service - > property ( " X- K DE-ExtraNativeMimeTypes" ) . toStringList ( ) ;
return service - > property ( " X- T DE-ExtraNativeMimeTypes" ) . toStringList ( ) ;
} }
int KoDocument : : supportedSpecialFormats ( ) const int KoDocument : : supportedSpecialFormats ( ) const
Darrell Anderson
12 years ago