Commit 21560812 authored by Thorsten Zachmann's avatar Thorsten Zachmann

o rename KoOasisLoadingContext -> KoOdfLoadingContext

o remove KoDocument parameter

svn path=/trunk/koffice/; revision=770241
parent 5c437d73
......@@ -33,7 +33,7 @@
#include <KoCompositeOp.h>
#include <KoDocument.h>
#include <KoEmbeddedDocumentSaver.h>
#include <KoOasisLoadingContext.h>
#include <KoOdfLoadingContext.h>
#include <KoOdfStylesReader.h>
#include <KoOdfWriteStore.h>
#include <KoPageLayout.h>
......
......@@ -34,7 +34,7 @@
#include <KoUnit.h>
#include <KoGenStyle.h>
#include <KoStyleStack.h>
#include <KoOasisLoadingContext.h>
#include <KoOdfLoadingContext.h>
#include <KDebug>
#include <QtGui/QPainter>
......
......@@ -45,7 +45,7 @@
#include <KoUnit.h>
#include <KoOdfStylesReader.h>
#include <KoOdfGraphicStyles.h>
#include <KoOasisLoadingContext.h>
#include <KoOdfLoadingContext.h>
#include <QPainter>
#include <QVariant>
......
......@@ -27,7 +27,7 @@
class KoShapeLoadingContext::Private {
public:
Private( KoOasisLoadingContext &c, KoShapeControllerBase * sc )
Private( KoOdfLoadingContext &c, KoShapeControllerBase * sc )
: context( c )
, imageCollection( 0 )
, zIndex( 0 )
......@@ -40,7 +40,7 @@ public:
delete data;
}
}
KoOasisLoadingContext &context;
KoOdfLoadingContext &context;
QMap<QString, KoShapeLayer*> layers;
QMap<QString, KoShape*> drawIds;
KoImageCollection * imageCollection;
......@@ -50,7 +50,7 @@ public:
KoShapeControllerBase * shapeController;
};
KoShapeLoadingContext::KoShapeLoadingContext( KoOasisLoadingContext & context, KoShapeControllerBase * shapeController )
KoShapeLoadingContext::KoShapeLoadingContext( KoOdfLoadingContext & context, KoShapeControllerBase * shapeController )
: d( new Private( context, shapeController ) )
{
}
......@@ -60,7 +60,7 @@ KoShapeLoadingContext::~KoShapeLoadingContext()
delete d;
}
KoOasisLoadingContext & KoShapeLoadingContext::koLoadingContext()
KoOdfLoadingContext & KoShapeLoadingContext::koLoadingContext()
{
return d->context;
}
......
......@@ -26,7 +26,7 @@
#include <flake_export.h>
class KoOasisLoadingContext;
class KoOdfLoadingContext;
class KoShapeLayer;
class KoShape;
class KoShapeControllerBase;
......@@ -47,13 +47,13 @@ public:
* @param shapeController the shape controller. This is used to call KoShapeControllerBase::shapeCreated
* during loading. Please leave 0 only when you are 100% sure you don't need it.
*/
KoShapeLoadingContext( KoOasisLoadingContext & context, KoShapeControllerBase * shapeController );
KoShapeLoadingContext( KoOdfLoadingContext & context, KoShapeControllerBase * shapeController );
/// destructor
~KoShapeLoadingContext();
/// return the embedded loading context
KoOasisLoadingContext & koLoadingContext();
KoOdfLoadingContext & koLoadingContext();
/// Returns layer referenced by given name
KoShapeLayer * layer( const QString & layerName );
......
......@@ -22,7 +22,7 @@
#include <kdebug.h>
#include <klocale.h>
#include <KoOasisLoadingContext.h>
#include <KoOdfLoadingContext.h>
#include <KoOdfReadStore.h>
#include "KoCanvasBase.h"
......@@ -61,7 +61,7 @@ KoShapePaste::~KoShapePaste()
bool KoShapePaste::process( const KoXmlElement & body, KoOdfReadStore & odfStore )
{
KoOasisLoadingContext loadingContext( d->doc, odfStore.styles(), odfStore.store() );
KoOdfLoadingContext loadingContext( odfStore.styles(), odfStore.store() );
KoShapeLoadingContext context( loadingContext, d->canvas->shapeController()->shapeControllerBase() );
context.setZIndex( d->zIndex );
......
......@@ -29,7 +29,7 @@
#include <KoPluginLoader.h>
#include <KoXmlReader.h>
#include <KoXmlNS.h>
#include <KoOasisLoadingContext.h>
#include <KoOdfLoadingContext.h>
#include <KoStyleStack.h>
#include <QString>
......
......@@ -19,7 +19,7 @@
#include "TestKoShapeFactory.h"
#include <qtest_kde.h>
#include <KoOasisLoadingContext.h>
#include <KoOdfLoadingContext.h>
#include <KoOdfStylesReader.h>
#include <KoShapeLoadingContext.h>
#include <KoPathShapeFactory.h>
......@@ -115,8 +115,8 @@ void TestKoShapeFactory::testOdfElement()
// XXX: When loading is implemented, these no doubt have to be
// sensibly filled.
KoOdfStylesReader stylesReader;
KoOasisLoadingContext oasisContext(0, stylesReader, 0);
KoShapeLoadingContext shapeContext( oasisContext, 0 );
KoOdfLoadingContext odfContext(stylesReader, 0);
KoShapeLoadingContext shapeContext( odfContext, 0 );
QVERIFY( shape->loadOdf( pathElement, shapeContext ) );
......
......@@ -26,7 +26,7 @@
#include <QTextStream>
#include <QtXml>
#include <KoOasisLoadingContext.h>
#include <KoOdfLoadingContext.h>
#include <KoOdfStylesReader.h>
#include "KoShapeRegistry.h"
......@@ -78,8 +78,8 @@ void TestKoShapeRegistry::testCreateShapes()
// XXX: When loading is implemented, these no doubt have to be
// sensibly filled.
KoOdfStylesReader stylesReader;
KoOasisLoadingContext oasisContext(0, stylesReader, 0);
KoShapeLoadingContext shapeContext( oasisContext, 0 );
KoOdfLoadingContext odfContext(stylesReader, 0);
KoShapeLoadingContext shapeContext( odfContext, 0 );
KoShape * shape = registry->createShapeFromOdf(bodyElement, shapeContext);
QVERIFY( shape == 0 );
......@@ -125,8 +125,8 @@ void TestKoShapeRegistry::testCreateFramedShapes()
// XXX: When loading is implemented, these no doubt have to be
// sensibly filled.
KoOdfStylesReader stylesReader;
KoOasisLoadingContext oasisContext(0, stylesReader, 0);
KoShapeLoadingContext shapeContext( oasisContext, 0 );
KoOdfLoadingContext odfContext(stylesReader, 0);
KoShapeLoadingContext shapeContext( odfContext, 0 );
KoShape * shape = registry->createShapeFromOdf(bodyElement, shapeContext);
QVERIFY( shape == 0 );
......
......@@ -26,7 +26,7 @@
#include <KoOdfStylesReader.h>
#include <KoOdfReadStore.h>
#include <KoOdfWriteStore.h>
#include <KoOasisLoadingContext.h>
#include <KoOdfLoadingContext.h>
#include <KoShapeManager.h>
#include <KoShapeLayer.h>
#include <KoTextShapeData.h>
......@@ -93,7 +93,7 @@ bool KoPADocument::loadXML( QIODevice *, const KoXmlDocument & doc )
bool KoPADocument::loadOdf( KoOdfReadStore & odfStore )
{
emit sigProgress( 0 );
KoOasisLoadingContext loadingContext( this, odfStore.styles(), odfStore.store() );
KoOdfLoadingContext loadingContext( odfStore.styles(), odfStore.store() );
KoPALoadingContext paContext( loadingContext, this );
KoXmlElement content = odfStore.contentDoc().documentElement();
......
......@@ -23,7 +23,7 @@
#include "KoPAMasterPage.h"
KoPALoadingContext::KoPALoadingContext( KoOasisLoadingContext &context, KoShapeControllerBase * shapeController )
KoPALoadingContext::KoPALoadingContext( KoOdfLoadingContext &context, KoShapeControllerBase * shapeController )
: KoShapeLoadingContext( context, shapeController )
{
}
......
......@@ -38,7 +38,7 @@ public:
* @param context Context for loading oasis docs.
* @param context The shape contoller.
*/
KoPALoadingContext( KoOasisLoadingContext &context, KoShapeControllerBase * shapeController );
KoPALoadingContext( KoOdfLoadingContext &context, KoShapeControllerBase * shapeController );
/**
* Get the master page with the name @p name.
......
......@@ -24,7 +24,7 @@
#include <KoXmlWriter.h>
#include <KoXmlNS.h>
#include <KoOdfStylesReader.h>
#include <KoOasisLoadingContext.h>
#include <KoOdfLoadingContext.h>
#include "KoPASavingContext.h"
#include "KoPALoadingContext.h"
......
......@@ -26,7 +26,7 @@
#include <kdebug.h>
#include <KoShapeSavingContext.h>
#include <KoOasisLoadingContext.h>
#include <KoOdfLoadingContext.h>
#include <KoShapeLayer.h>
#include <KoShapeRegistry.h>
#include <KoGenStyle.h>
......
......@@ -31,7 +31,7 @@
#include "kopageapp_export.h"
struct KoPageLayout;
class KoOasisLoadingContext;
class KoOdfLoadingContext;
class KoGenStyle;
class KoShape;
class KoPALoadingContext;
......
......@@ -23,7 +23,7 @@
#include <QString>
#include <KoOdfReadStore.h>
#include <KoXmlWriter.h>
#include <KoOasisLoadingContext.h>
#include <KoOdfLoadingContext.h>
#include <KoOdfStylesReader.h>
#include <KoEmbeddedDocumentSaver.h>
#include "KoPALoadingContext.h"
......@@ -41,7 +41,7 @@ KoPAPastePage::KoPAPastePage( KoPADocument * doc, KoPAPageBase * activePage )
bool KoPAPastePage::process( const KoXmlElement & body, KoOdfReadStore & odfStore )
{
KoOasisLoadingContext loadingContext( m_doc, odfStore.styles(), odfStore.store() );
KoOdfLoadingContext loadingContext( odfStore.styles(), odfStore.store() );
KoPALoadingContext paContext( loadingContext, m_doc );
QList<KoPAPageBase *> masterPages( m_doc->loadOdfMasterPages( odfStore.styles().masterPages(), paContext ) );
......
......@@ -29,7 +29,7 @@
#include <KoGenStyle.h>
#include <KoGenStyles.h>
#include <KoShapeLoadingContext.h>
#include <KoOasisLoadingContext.h>
#include <KoOdfLoadingContext.h>
#include <KoShapeSavingContext.h>
#include "KoInlineObject.h"
......
......@@ -34,7 +34,7 @@
#include <KoShapeRegistry.h>
#include <KoShapeFactory.h>
#include <KoShape.h>
#include <KoOasisLoadingContext.h>
#include <KoOdfLoadingContext.h>
#include <KoShapeLoadingContext.h>
#include <KoImageData.h>
#include <KoTextAnchor.h>
......@@ -70,7 +70,7 @@ class KoTextLoader::Private
KoShapeLoadingContext & context;
KoTextSharedLoadingData * textSharedData;
// store it here so that you don't need to get it all the time from
// the KoOasisLoadingContext.
// the KoOdfLoadingContext.
bool stylesDotXml;
int bodyProgressTotal;
......
......@@ -39,7 +39,7 @@ class QTextCursor;
* KoTextLoader are used for that. Also if you have a frame with text inside a text a new
* KoTextLoader is used.
* If you want to use the KoTextLoader for text that needs styles from styles.xml. e.g.
* test shapes on master pages, you need to set KoOasisLoadingContext::setUseStylesAutoStyles( true ).
* test shapes on master pages, you need to set KoOdfLoadingContext::setUseStylesAutoStyles( true ).
* Don't forget to unset it if´you later want to load text that needs content.xml.
*/
class KOTEXT_EXPORT KoTextLoader : public QObject
......
......@@ -22,7 +22,7 @@
#include "KoTextLoadingContext.h"
#include "KoTextLoader.h"
#include <KoOasisLoadingContext.h>
#include <KoOdfLoadingContext.h>
/// \internal d-pointer class.
class KoTextLoadingContext::Private
......@@ -31,8 +31,8 @@ class KoTextLoadingContext::Private
KoTextLoader* loader;
};
KoTextLoadingContext::KoTextLoadingContext( KoTextLoader* loader, KoDocument* doc, KoOdfStylesReader& stylesReader, KoStore* store )
: KoOasisLoadingContext( doc, stylesReader, store ), d(new Private())
KoTextLoadingContext::KoTextLoadingContext( KoTextLoader* loader, KoOdfStylesReader& stylesReader, KoStore* store )
: KoOdfLoadingContext( stylesReader, store ), d(new Private())
{
d->loader = loader;
}
......
......@@ -25,14 +25,14 @@
#include "kotext_export.h"
#include <KoOasisLoadingContext.h>
#include <KoOdfLoadingContext.h>
class KoTextLoader;
/**
* Used during loading of Oasis format (and discarded at the end of the loading).
*
* This class extends the \a KoOasisLoadingContext class with KoText specific
* This class extends the \a KoOdfLoadingContext class with KoText specific
* functionality like for example handling of lists.
*
* The context is used within the \a KoTextLoader class to provide additional
......@@ -44,15 +44,15 @@ class KoTextLoader;
* \code
* KoStyleManager *stylemanager = new KoStyleManager();
* KoTextLoader *loader = new KoTextLoader(stylemanager);
* KoDocument* doc = oasisContext.koDocument();
* KoOdfStylesReader& styles = oasisContext.stylesReader();
* KoStore *store = oasisContext.store()
* KoDocument* doc = odfContext.koDocument();
* KoOdfStylesReader& styles = odfContext.stylesReader();
* KoStore *store = odfContext.store()
* KoTextLoadingContext *loaderContext = new KoTextLoadingContext(loader, doc, styles, store);
* QTextCursor cursor( document() );
* loader->loadBody(*loaderContext, element, cursor); // load the body from the ODF KoXmlElement.
* \endcode
*/
class KOTEXT_EXPORT KoTextLoadingContext : public KoOasisLoadingContext
class KOTEXT_EXPORT KoTextLoadingContext : public KoOdfLoadingContext
{
public:
......@@ -62,14 +62,14 @@ public:
* \param loader The KoTextLoader instance the context belongs to.
* We need to pass on the \a TextLoader instance here since the loader need to be passed
* around between the different loadOdf(const KoXmlElement&, KoShapeLoadingContext&) calls.
* For that case the \a TextLoaderContext that inherits the \a KoOasisLoadingContext class
* For that case the \a TextLoaderContext that inherits the \a KoOdfLoadingContext class
* got introduced and holds a pointer to the \a KoTextLoader and to the needed
* \a KoStyleManager instance.
* \param doc The document we are loading the content into.
* \param loader The loader used for loading the content.
* \param styles The styles used for loading.
* \param store The storage backend we are reading from.
*/
explicit KoTextLoadingContext( KoTextLoader* loader, KoDocument* doc, KoOdfStylesReader& stylesReader, KoStore* store );
explicit KoTextLoadingContext( KoTextLoader* loader, KoOdfStylesReader& stylesReader, KoStore* store );
/**
* Destructor.
......
......@@ -31,7 +31,7 @@
#include <KoDom.h>
#include <KoXmlNS.h>
#include <KoOdfStylesReader.h>
#include <KoOasisLoadingContext.h>
#include <KoOdfLoadingContext.h>
#include "styles/KoStyleManager.h"
#include "styles/KoParagraphStyle.h"
......@@ -75,7 +75,7 @@ KoTextSharedLoadingData::~KoTextSharedLoadingData()
delete d;
}
void KoTextSharedLoadingData::loadOdfStyles( KoOasisLoadingContext & context, KoStyleManager * styleManager, bool insertOfficeStyles )
void KoTextSharedLoadingData::loadOdfStyles( KoOdfLoadingContext & context, KoStyleManager * styleManager, bool insertOfficeStyles )
{
// add paragraph styles
addParagraphStyles( context, context.stylesReader().autoStyles( "paragraph" ).values(), ContextDotXml, styleManager );
......@@ -95,7 +95,7 @@ void KoTextSharedLoadingData::loadOdfStyles( KoOasisLoadingContext & context, Ko
kDebug(32500) << "styles.xml: paragraph styles" << d->paragraphStylesDotXmlStyles.count() << "character styles" << d->characterStylesDotXmlStyles.count();
}
void KoTextSharedLoadingData::addParagraphStyles( KoOasisLoadingContext & context, QList<KoXmlElement*> styleElements,
void KoTextSharedLoadingData::addParagraphStyles( KoOdfLoadingContext & context, QList<KoXmlElement*> styleElements,
int styleTypes, KoStyleManager * styleManager, bool insertOfficeStyles )
{
QList<QPair<QString, KoParagraphStyle *> > paragraphStyles( loadParagraphStyles( context, styleElements ) );
......@@ -121,7 +121,7 @@ void KoTextSharedLoadingData::addParagraphStyles( KoOasisLoadingContext & contex
}
}
QList<QPair<QString, KoParagraphStyle *> > KoTextSharedLoadingData::loadParagraphStyles( KoOasisLoadingContext & context, QList<KoXmlElement*> styleElements )
QList<QPair<QString, KoParagraphStyle *> > KoTextSharedLoadingData::loadParagraphStyles( KoOdfLoadingContext & context, QList<KoXmlElement*> styleElements )
{
QList<QPair<QString, KoParagraphStyle *> > paragraphStyles;
......@@ -167,7 +167,7 @@ QList<QPair<QString, KoParagraphStyle *> > KoTextSharedLoadingData::loadParagrap
return paragraphStyles;
}
void KoTextSharedLoadingData::addCharacterStyles( KoOasisLoadingContext & context, QList<KoXmlElement*> styleElements,
void KoTextSharedLoadingData::addCharacterStyles( KoOdfLoadingContext & context, QList<KoXmlElement*> styleElements,
int styleTypes, KoStyleManager *styleManager, bool insertOfficeStyles )
{
QList<QPair<QString, KoCharacterStyle *> > characterStyles( loadCharacterStyles( context, styleElements ) );
......@@ -193,7 +193,7 @@ void KoTextSharedLoadingData::addCharacterStyles( KoOasisLoadingContext & contex
}
}
QList<QPair<QString, KoCharacterStyle *> > KoTextSharedLoadingData::loadCharacterStyles( KoOasisLoadingContext & context, QList<KoXmlElement*> styleElements )
QList<QPair<QString, KoCharacterStyle *> > KoTextSharedLoadingData::loadCharacterStyles( KoOdfLoadingContext & context, QList<KoXmlElement*> styleElements )
{
QList<QPair<QString, KoCharacterStyle *> > characterStyles;
......@@ -225,7 +225,7 @@ QList<QPair<QString, KoCharacterStyle *> > KoTextSharedLoadingData::loadCharacte
return characterStyles;
}
void KoTextSharedLoadingData::addListStyles( KoOasisLoadingContext & context )
void KoTextSharedLoadingData::addListStyles( KoOdfLoadingContext & context )
{
QHash<QString, KoXmlElement *> listStyles = context.stylesReader().listStyles();
QHash<QString, KoXmlElement*>::iterator it( listStyles.begin() );
......@@ -239,7 +239,7 @@ void KoTextSharedLoadingData::addListStyles( KoOasisLoadingContext & context )
}
}
void KoTextSharedLoadingData::addOutlineStyles( KoOasisLoadingContext & context )
void KoTextSharedLoadingData::addOutlineStyles( KoOdfLoadingContext & context )
{
// outline-styles used e.g. for headers
KoXmlElement outlineStyle = KoDom::namedItemNS( context.stylesReader().officeStyle(), KoXmlNS::text, "outline-style" );
......
......@@ -27,7 +27,7 @@
#include "kotext_export.h"
class QString;
class KoOasisLoadingContext;
class KoOdfLoadingContext;
class KoParagraphStyle;
class KoCharacterStyle;
class KoListStyle;
......@@ -57,7 +57,7 @@ public:
* @param styleManager The style manager too use or 0 if you don't have a style manager.
* @param insertOfficeStyles If true the office:styles are inserted into the style manager.
*/
void loadOdfStyles( KoOasisLoadingContext & context, KoStyleManager * styleManager, bool insertOfficeStyles = false );
void loadOdfStyles( KoOdfLoadingContext & context, KoStyleManager * styleManager, bool insertOfficeStyles = false );
/**
* Get the paragraph style for the given name
......@@ -91,18 +91,18 @@ private:
StylesDotXml = 2
};
// helper functions for loading of paragraph styles
void addParagraphStyles( KoOasisLoadingContext & context, QList<KoXmlElement*> styleElements, int styleTypes,
void addParagraphStyles( KoOdfLoadingContext & context, QList<KoXmlElement*> styleElements, int styleTypes,
KoStyleManager *styleManager, bool insertOfficeStyles = false );
QList<QPair<QString, KoParagraphStyle *> > loadParagraphStyles( KoOasisLoadingContext & context, QList<KoXmlElement*> styleElements );
QList<QPair<QString, KoParagraphStyle *> > loadParagraphStyles( KoOdfLoadingContext & context, QList<KoXmlElement*> styleElements );
// helper functions for loading of character styles
void addCharacterStyles( KoOasisLoadingContext & context, QList<KoXmlElement*> styleElements, int styleTypes,
void addCharacterStyles( KoOdfLoadingContext & context, QList<KoXmlElement*> styleElements, int styleTypes,
KoStyleManager *styleManager, bool insertOfficeStyles = false );
QList<QPair<QString, KoCharacterStyle *> > loadCharacterStyles( KoOasisLoadingContext & context, QList<KoXmlElement*> styleElements );
QList<QPair<QString, KoCharacterStyle *> > loadCharacterStyles( KoOdfLoadingContext & context, QList<KoXmlElement*> styleElements );
// helper functions for loading of list styles
void addListStyles( KoOasisLoadingContext & context );
void addOutlineStyles( KoOasisLoadingContext & context );
void addListStyles( KoOdfLoadingContext & context );
void addOutlineStyles( KoOdfLoadingContext & context );
class Private;
Private * const d;
......
......@@ -23,7 +23,7 @@
#include <QTextBlock>
#include <QTextCursor>
#include <KoOasisLoadingContext.h>
#include <KoOdfLoadingContext.h>
#include <KoOdfStylesReader.h>
#include <KoXmlNS.h>
#include <KoXmlReader.h>
......@@ -477,7 +477,7 @@ bool KoCharacterStyle::hasProperty(int key) const {
}
//in 1.6 this was defined in KoTextFormat::load(KoOasisContext& context)
void KoCharacterStyle::loadOasis(KoOasisLoadingContext& context) {
void KoCharacterStyle::loadOasis(KoOdfLoadingContext& context) {
KoStyleStack &styleStack = context.styleStack();
// The fo:color attribute specifies the foreground color of text.
......
......@@ -29,7 +29,7 @@
class StylePrivate;
class QTextBlock;
class KoStyleStack;
class KoOasisLoadingContext;
class KoOdfLoadingContext;
class KoGenStyle;
/**
......@@ -228,7 +228,7 @@ public:
* Load the style from the \a KoStyleStack style stack using the
* OpenDocument format.
*/
void loadOasis(KoOasisLoadingContext& context);
void loadOasis(KoOdfLoadingContext& context);
/// return true if this style has a non-default value set for the Property
bool hasProperty(int key) const;
......
......@@ -257,7 +257,7 @@ KoListLevelProperties KoListLevelProperties::fromTextList(QTextList *list) {
return llp;
}
void KoListLevelProperties::loadOasis(KoOasisLoadingContext& context, const KoXmlElement& style)
void KoListLevelProperties::loadOasis(KoOdfLoadingContext& context, const KoXmlElement& style)
{
Q_UNUSED( context );
......
......@@ -28,7 +28,7 @@
#include <KoXmlReader.h>
class KoListStyle;
class KoOasisLoadingContext;
class KoOdfLoadingContext;
class KOTEXT_EXPORT KoListLevelProperties {
public:
......@@ -117,7 +117,7 @@ public:
/**
* Load the properties from the \p style using the OpenDocument format.
*/
void loadOasis(KoOasisLoadingContext& context, const KoXmlElement& style);
void loadOasis(KoOdfLoadingContext& context, const KoXmlElement& style);
private:
void setProperty(int key, const QVariant &value);
......
......@@ -201,7 +201,7 @@ KoListStyle* KoListStyle::fromTextList(QTextList *list) {
return answer;
}
void KoListStyle::loadOasis(KoOasisLoadingContext& context, const KoXmlElement& style)
void KoListStyle::loadOasis(KoOdfLoadingContext& context, const KoXmlElement& style)
{
//kDebug(32500)<<"KoListStyle::loadOasis style.localName="<<style.localName();
//KoStyleStack &styleStack = context.styleStack();
......
......@@ -29,7 +29,7 @@
#include <KoXmlReader.h>
class KoListLevelProperties;
class KoOasisLoadingContext;
class KoOdfLoadingContext;
/**
* This class groups all styling-options for lists.
......@@ -179,7 +179,7 @@ public:
* Load the style from the \a KoStyleStack style stack using the
* OpenDocument format.
*/
void loadOasis(KoOasisLoadingContext& context, const KoXmlElement& style = KoXmlElement());
void loadOasis(KoOdfLoadingContext& context, const KoXmlElement& style = KoXmlElement());
protected:
friend class KoParagraphStyle;
......
......@@ -35,7 +35,7 @@
#include <KoXmlNS.h>
#include <KoXmlWriter.h>
#include "KoOasisLoadingContext.h"
#include "KoOdfLoadingContext.h"
#include "KoOdfStylesReader.h"
#include "KoPictureShared.h"
......@@ -320,7 +320,7 @@ QBrush KoOdfGraphicStyles::loadOasisGradientStyle( const KoStyleStack &styleStac
return resultBrush;
}
QBrush KoOdfGraphicStyles::loadOasisPatternStyle( const KoStyleStack &styleStack, KoOasisLoadingContext & context, const QSizeF &size )
QBrush KoOdfGraphicStyles::loadOasisPatternStyle( const KoStyleStack &styleStack, KoOdfLoadingContext & context, const QSizeF &size )
{
QString styleName = styleStack.property( KoXmlNS::draw, "fill-image-name" );
......
......@@ -35,7 +35,7 @@ class KoGenStyles;
class KoStyleStack;
class KoOdfStylesReader;
class KoOasisLoadingContext;
class KoOdfLoadingContext;
class KOMAIN_EXPORT KoOdfGraphicStyles
{
......@@ -51,7 +51,7 @@ public:
static QBrush loadOasisGradientStyle( const KoStyleStack &styleStack, const KoOdfStylesReader & stylesReader, const QSizeF &size );
/// Loads pattern style from style stack and oasisstyle adapted to the given size
static QBrush loadOasisPatternStyle( const KoStyleStack &styleStack, KoOasisLoadingContext & context, const QSizeF &size );
static QBrush loadOasisPatternStyle( const KoStyleStack &styleStack, KoOdfLoadingContext & context, const QSizeF &size );
static QBrush loadOasisFillStyle( const KoStyleStack &styleStack, const QString & fill, const KoOdfStylesReader & stylesReader );
......
......@@ -15,7 +15,7 @@ set(koodf_LIB_SRCS
KoUnit.cpp
KoGenStyle.cpp
KoGenStyles.cpp
KoOasisLoadingContext.cpp
KoOdfLoadingContext.cpp
KoOasisSettings.cpp
KoOdfStylesReader.cpp
KoOdfNumberStyles.cpp
......@@ -40,7 +40,7 @@ install( FILES
KoUnit.h
KoGenStyle.h
KoGenStyles.h
KoOasisLoadingContext.h
KoOdfLoadingContext.h
KoOasisSettings.h
KoOdfStylesReader.h
KoOdfNumberStyles.h
......
......@@ -16,7 +16,7 @@
Boston, MA 02110-1301, USA.
*/
#include "KoOasisLoadingContext.h"
#include "KoOdfLoadingContext.h"
#include <KoOdfReadStore.h>
#include <KoOdfStylesReader.h>
#include <KoStore.h>
......@@ -24,14 +24,16 @@