diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:56:31 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:56:31 -0600 |
| commit | c9cb4f487428aad5d8cda5e3a4b9ad87390d7e54 (patch) | |
| tree | 1ee1912ac4bb966475f0db0f2a78678661b4b4a5 /lib/kofficecore/KoOasisStyles.cpp | |
| parent | 94844816550ad672ccfcdc25659c625546239998 (diff) | |
| download | koffice-c9cb4f487428aad5d8cda5e3a4b9ad87390d7e54.tar.gz koffice-c9cb4f487428aad5d8cda5e3a4b9ad87390d7e54.zip | |
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 94844816550ad672ccfcdc25659c625546239998.
Diffstat (limited to 'lib/kofficecore/KoOasisStyles.cpp')
| -rw-r--r-- | lib/kofficecore/KoOasisStyles.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/kofficecore/KoOasisStyles.cpp b/lib/kofficecore/KoOasisStyles.cpp index 04a0eb208..fe88a11b2 100644 --- a/lib/kofficecore/KoOasisStyles.cpp +++ b/lib/kofficecore/KoOasisStyles.cpp @@ -26,7 +26,7 @@ #include <tqbuffer.h> #include <kglobal.h> #include <klocale.h> -#include <brush.h> +#include <tqbrush.h> #include <KoStyleStack.h> class KoOasisStyles::Private @@ -194,9 +194,9 @@ void KoOasisStyles::insertStyle( const TQDomElement& e, bool styleAutoStyles ) //kdDebug(30003) << "Style: '" << name << "' loaded " << endl; } } else if ( ns == KoXmlNS::style && ( - localName == "page-layout" + localName == "page-tqlayout" || localName == "font-decl" - || localName == "presentation-page-layout" ) ) + || localName == "presentation-page-tqlayout" ) ) { if ( m_styles.find( name ) != 0 ) kdDebug(30003) << "Style: '" << name << "' already exists" << endl; |