[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [calligra] /: Prefix also symbolexport tags/headers with "ko" of now ko-prefixed libs msooxml, odfre
From:       Friedrich W. H. Kossebau <kossebau () kde ! org>
Date:       2013-06-30 18:01:12
Message-ID: E1UtLw0-00036A-CS () scm ! kde ! org
[Download RAW message or body]

Git commit 6d5947a27d48adb286633a8b8860dad63cfe730c by Friedrich W. H. Kossebau.
Committed on 30/06/2013 at 17:57.
Pushed by kossebau into branch 'master'.

Prefix also symbolexport tags/headers with "ko" of now ko-prefixed libs msooxml, \
odfreader, vectorimage, textlayout

M  +1    -1    filters/libmsooxml/CMakeLists.txt
M  +2    -2    filters/libmsooxml/ComplexShapeHandler.h
M  +3    -3    filters/libmsooxml/KoOdfExporter.h
M  +1    -1    filters/libmsooxml/MsooXmlCommonReader.h
M  +1    -1    filters/libmsooxml/MsooXmlCommonReaderDrawingMLImpl.h
M  +2    -2    filters/libmsooxml/MsooXmlContentTypes.h
M  +3    -3    filters/libmsooxml/MsooXmlDiagramReader.h
M  +1    -1    filters/libmsooxml/MsooXmlDocPropertiesReader.h
M  +3    -3    filters/libmsooxml/MsooXmlDrawingTableStyle.h
M  +3    -3    filters/libmsooxml/MsooXmlDrawingTableStyleReader.h
M  +2    -2    filters/libmsooxml/MsooXmlGlobal.cpp
M  +3    -3    filters/libmsooxml/MsooXmlGlobal.h
M  +2    -2    filters/libmsooxml/MsooXmlImport.h
M  +4    -4    filters/libmsooxml/MsooXmlReader.h
M  +2    -2    filters/libmsooxml/MsooXmlRelationships.h
M  +4    -4    filters/libmsooxml/MsooXmlSchemas.h
M  +6    -6    filters/libmsooxml/MsooXmlTableStyle.h
M  +14   -14   filters/libmsooxml/MsooXmlThemesReader.h
M  +7    -7    filters/libmsooxml/MsooXmlUnits.h
M  +5    -5    filters/libmsooxml/MsooXmlUtils.cpp
M  +27   -27   filters/libmsooxml/MsooXmlUtils.h
M  +2    -2    filters/libmsooxml/VmlDrawingReader.h
R  +8    -8    filters/libmsooxml/komsooxml_export.h [from: \
filters/libmsooxml/msooxml_export.h - 078% similarity] M  +3    -3    \
filters/libmsooxml/ooxml_pole.h M  +1    -1    filters/libodfreader/CMakeLists.txt
M  +2    -2    filters/libodfreader/OdfReaderContext.h
M  +2    -2    filters/libodfreader/OdtReader.h
M  +2    -2    filters/libodfreader/OdtReaderBackend.h
R  +8    -8    filters/libodfreader/koodfreader_export.h [from: \
filters/libodfreader/odfreader_export.h - 078% similarity] M  +1    -1    \
libs/textlayout/CMakeLists.txt M  +2    -2    libs/textlayout/DummyDocumentLayout.h
M  +2    -2    libs/textlayout/KoPageProvider.h
M  +2    -2    libs/textlayout/KoPointedAt.h
M  +2    -2    libs/textlayout/KoStyleThumbnailer.h
M  +2    -2    libs/textlayout/KoTextBlockPaintStrategyBase.h
M  +3    -3    libs/textlayout/KoTextDocumentLayout.h
M  +2    -2    libs/textlayout/KoTextLayoutArea.h
M  +2    -2    libs/textlayout/KoTextLayoutCellHelper.h
M  +2    -2    libs/textlayout/KoTextLayoutEndNotesArea.h
M  +1    -1    libs/textlayout/KoTextLayoutNoteArea.h
M  +2    -2    libs/textlayout/KoTextLayoutObstruction.h
M  +2    -2    libs/textlayout/KoTextLayoutRootArea.h
M  +2    -2    libs/textlayout/KoTextLayoutRootAreaProvider.h
M  +2    -2    libs/textlayout/KoTextLayoutTableArea.h
M  +2    -2    libs/textlayout/KoTextShapeContainerModel.h
M  +2    -2    libs/textlayout/KoTextShapeData.h
M  +8    -8    libs/textlayout/ListItemsHelper.h
R  +13   -13   libs/textlayout/kotextlayout_export.h [from: \
libs/textlayout/textlayout_export.h - 071% similarity] R  +8    -8    \
libs/vectorimage/kovectorimage_export.h [from: libs/vectorimage/vectorimage_export.h \
- 080% similarity] M  +2    -2    libs/vectorimage/libemf/EmfOutput.h
M  +2    -2    libs/vectorimage/libemf/EmfOutputDebugStrategy.h
M  +2    -2    libs/vectorimage/libemf/EmfOutputPainterStrategy.h
M  +2    -2    libs/vectorimage/libemf/EmfParser.h
M  +2    -2    libs/vectorimage/libsvm/SvmAbstractBackend.h
M  +2    -2    libs/vectorimage/libsvm/SvmPainterBackend.h
M  +2    -2    libs/vectorimage/libsvm/SvmParser.h
M  +2    -2    libs/vectorimage/libwmf/WmfAbstractBackend.h
M  +2    -2    libs/vectorimage/libwmf/WmfPainterBackend.h
M  +2    -2    libs/vectorimage/libwmf/WmfWriter.h
M  +3    -3    libs/vectorimage/libwmf/kwmf.h

http://commits.kde.org/calligra/6d5947a27d48adb286633a8b8860dad63cfe730c

diff --git a/filters/libmsooxml/CMakeLists.txt b/filters/libmsooxml/CMakeLists.txt
index 28408d2..7dc2d7f 100644
--- a/filters/libmsooxml/CMakeLists.txt
+++ b/filters/libmsooxml/CMakeLists.txt
@@ -54,7 +54,7 @@ update_xdg_mimetypes(${XDG_MIME_INSTALL_DIR})
 
 if (FALSE) # these headers are private for now
 install( FILES
-    msooxml_export.h
+    komsooxml_export.h
     MsooXmlContentTypes.h
     MsooXmlReader.h
     MsooXmlReader_p.h
diff --git a/filters/libmsooxml/ComplexShapeHandler.h \
b/filters/libmsooxml/ComplexShapeHandler.h index 6409649..e1b6888 100644
--- a/filters/libmsooxml/ComplexShapeHandler.h
+++ b/filters/libmsooxml/ComplexShapeHandler.h
@@ -24,7 +24,7 @@
 #ifndef COMPLEXSHAPEHANDLER_H
 #define COMPLEXSHAPEHANDLER_H
 
-#include "msooxml_export.h"
+#include "komsooxml_export.h"
 
 #include <QXmlStreamReader>
 #include <QString>
@@ -32,7 +32,7 @@
 // This class is meant to be used as a helper class to understand
 // drawingML elements avLst, gdLst and pathLst and to help
 // create a custom-shape from them
-class MSOOXML_EXPORT ComplexShapeHandler {
+class KOMSOOXML_EXPORT ComplexShapeHandler {
 
 public:
 
diff --git a/filters/libmsooxml/KoOdfExporter.h b/filters/libmsooxml/KoOdfExporter.h
index 88ebac7..920c427 100644
--- a/filters/libmsooxml/KoOdfExporter.h
+++ b/filters/libmsooxml/KoOdfExporter.h
@@ -21,7 +21,7 @@
 #ifndef KOODFEXPORTER_H
 #define KOODFEXPORTER_H
 
-#include "msooxml_export.h"
+#include "komsooxml_export.h"
 #include <KoFilter.h>
 
 class KoXmlWriter;
@@ -31,7 +31,7 @@ class KoGenStyles;
 /**
  * @brief Convenience structure encapsulating XML writers used when writing ODF \
                document.
  */
-struct MSOOXML_EXPORT KoOdfWriters {
+struct KOMSOOXML_EXPORT KoOdfWriters {
     /**
     * Creates structure encapsulating XML writers. All members are set initially to \
                0.
     */
@@ -50,7 +50,7 @@ struct MSOOXML_EXPORT KoOdfWriters {
  *
  * @author Jarosław Staniek <staniek@kde.org>
  */
-class MSOOXML_EXPORT KoOdfExporter : public KoFilter
+class KOMSOOXML_EXPORT KoOdfExporter : public KoFilter
 {
     Q_OBJECT
 public:
diff --git a/filters/libmsooxml/MsooXmlCommonReader.h \
b/filters/libmsooxml/MsooXmlCommonReader.h index 0030af7..4ce59ef 100644
--- a/filters/libmsooxml/MsooXmlCommonReader.h
+++ b/filters/libmsooxml/MsooXmlCommonReader.h
@@ -35,7 +35,7 @@ namespace MSOOXML
 {
 
 //! A class reading generic parts of MSOOXML main document's markup.
-class MSOOXML_EXPORT MsooXmlCommonReader : public MsooXmlReader
+class KOMSOOXML_EXPORT MsooXmlCommonReader : public MsooXmlReader
 {
 protected:
     explicit MsooXmlCommonReader(KoOdfWriters *writers);
diff --git a/filters/libmsooxml/MsooXmlCommonReaderDrawingMLImpl.h \
b/filters/libmsooxml/MsooXmlCommonReaderDrawingMLImpl.h index 3f2387b..6e4f631 100644
--- a/filters/libmsooxml/MsooXmlCommonReaderDrawingMLImpl.h
+++ b/filters/libmsooxml/MsooXmlCommonReaderDrawingMLImpl.h
@@ -4007,7 +4007,7 @@ KoFilter::ConversionStatus \
MSOOXML_CURRENT_CLASS::read_fillRect()  TRY_READ_ATTR_WITHOUT_NS(l)
     TRY_READ_ATTR_WITHOUT_NS(r)
     TRY_READ_ATTR_WITHOUT_NS(t)
-//MSOOXML_EXPORT qreal ST_Percentage_withMsooxmlFix_to_double(const QString& val, \
bool& ok); +//KOMSOOXML_EXPORT qreal ST_Percentage_withMsooxmlFix_to_double(const \
QString& val, bool& ok);  
     if (!b.isEmpty() || !l.isEmpty() || !r.isEmpty() || !t.isEmpty()) {
         // TODO: One way to approach this would be to first scale the image to the \
                size of the slide
diff --git a/filters/libmsooxml/MsooXmlContentTypes.h \
b/filters/libmsooxml/MsooXmlContentTypes.h index 8e49c1f..88d8380 100644
--- a/filters/libmsooxml/MsooXmlContentTypes.h
+++ b/filters/libmsooxml/MsooXmlContentTypes.h
@@ -24,7 +24,7 @@
 #ifndef MSOOXMLCT_H
 #define MSOOXMLCT_H
 
-#include "msooxml_export.h"
+#include "komsooxml_export.h"
 
 #include <QString>
 #include <KoFilterChain.h>
@@ -40,7 +40,7 @@ namespace MSOOXML
 {
 
 //! Content type names for handling MSOOXML formats
-class MSOOXML_EXPORT ContentTypes
+class KOMSOOXML_EXPORT ContentTypes
 {
 public:
     // common officedocument namespaces
diff --git a/filters/libmsooxml/MsooXmlDiagramReader.h \
b/filters/libmsooxml/MsooXmlDiagramReader.h index d0cd310..85753fb 100644
--- a/filters/libmsooxml/MsooXmlDiagramReader.h
+++ b/filters/libmsooxml/MsooXmlDiagramReader.h
@@ -28,7 +28,7 @@
 #include <MsooXmlReader.h>
 #include <MsooXmlCommonReader.h>
 
-#include "msooxml_export.h"
+#include "komsooxml_export.h"
 
 namespace MSOOXML
 {
@@ -40,7 +40,7 @@ namespace Diagram
     class LayoutNode;
 }
 
-class MSOOXML_EXPORT MsooXmlDiagramReaderContext : public \
MSOOXML::MsooXmlReaderContext +class KOMSOOXML_EXPORT MsooXmlDiagramReaderContext : \
public MSOOXML::MsooXmlReaderContext  {
 public:
     KoGenStyles* m_styles;
@@ -53,7 +53,7 @@ public:
     void saveIndex(KoXmlWriter* xmlWriter, const QRect &rect);
 };
 
-class MSOOXML_EXPORT MsooXmlDiagramReader : public MSOOXML::MsooXmlCommonReader
+class KOMSOOXML_EXPORT MsooXmlDiagramReader : public MSOOXML::MsooXmlCommonReader
 {
 public:
     explicit MsooXmlDiagramReader(KoOdfWriters *writers);
diff --git a/filters/libmsooxml/MsooXmlDocPropertiesReader.h \
b/filters/libmsooxml/MsooXmlDocPropertiesReader.h index 3a02fb0..af1720b 100644
--- a/filters/libmsooxml/MsooXmlDocPropertiesReader.h
+++ b/filters/libmsooxml/MsooXmlDocPropertiesReader.h
@@ -32,7 +32,7 @@
 namespace MSOOXML
 {
 
-class MSOOXML_EXPORT MsooXmlDocPropertiesReader : public MsooXmlReader
+class KOMSOOXML_EXPORT MsooXmlDocPropertiesReader : public MsooXmlReader
 {
 public:
     explicit MsooXmlDocPropertiesReader(KoOdfWriters* writers);
diff --git a/filters/libmsooxml/MsooXmlDrawingTableStyle.h \
b/filters/libmsooxml/MsooXmlDrawingTableStyle.h index e1ed1f1..e32025a 100644
--- a/filters/libmsooxml/MsooXmlDrawingTableStyle.h
+++ b/filters/libmsooxml/MsooXmlDrawingTableStyle.h
@@ -57,7 +57,7 @@ namespace MSOOXML
 
 /// Reading and storage
 
-class MSOOXML_EXPORT DrawingTableStyle : public TableStyle
+class KOMSOOXML_EXPORT DrawingTableStyle : public TableStyle
 {
 public:
     enum Type {
@@ -92,7 +92,7 @@ private:
     //TODO: handle the table background stored in the element TblBg
 };
 
-class MSOOXML_EXPORT DrawingTableStyleConverterProperties : public \
TableStyleConverterProperties +class KOMSOOXML_EXPORT \
DrawingTableStyleConverterProperties : public TableStyleConverterProperties  {
 public:
     DrawingTableStyleConverterProperties();
@@ -120,7 +120,7 @@ private:
     Roles m_role;
 };
 
-class MSOOXML_EXPORT DrawingTableStyleConverter : public TableStyleConverter
+class KOMSOOXML_EXPORT DrawingTableStyleConverter : public TableStyleConverter
 {
 public:
     explicit DrawingTableStyleConverter(DrawingTableStyleConverterProperties const& \
                properties, DrawingTableStyle* style =0);
diff --git a/filters/libmsooxml/MsooXmlDrawingTableStyleReader.h \
b/filters/libmsooxml/MsooXmlDrawingTableStyleReader.h index 9347b83..e4af037 100644
--- a/filters/libmsooxml/MsooXmlDrawingTableStyleReader.h
+++ b/filters/libmsooxml/MsooXmlDrawingTableStyleReader.h
@@ -20,7 +20,7 @@
 #ifndef MSOOXMLDRAWINGTABLESTYLEREADER_H
 #define MSOOXMLDRAWINGTABLESTYLEREADER_H
 
-#include "msooxml_export.h"
+#include "komsooxml_export.h"
 
 #include "MsooXmlDrawingTableStyle.h"
 #include "MsooXmlCommonReader.h"
@@ -40,7 +40,7 @@ namespace MSOOXML
 class DrawingMLTheme;
 class MsooXmlImport;
 
-class MSOOXML_EXPORT MsooXmlDrawingTableStyleContext : public \
MSOOXML::MsooXmlReaderContext +class KOMSOOXML_EXPORT MsooXmlDrawingTableStyleContext \
: public MSOOXML::MsooXmlReaderContext  {
 public:
     MsooXmlDrawingTableStyleContext(MSOOXML::MsooXmlImport* _import, const QString& \
_path, @@ -59,7 +59,7 @@ public:
     QMap<QString, QString> colorMap;
 };
 
-class MSOOXML_EXPORT MsooXmlDrawingTableStyleReader : public MsooXmlCommonReader
+class KOMSOOXML_EXPORT MsooXmlDrawingTableStyleReader : public MsooXmlCommonReader
 {
 public:
     explicit MsooXmlDrawingTableStyleReader(KoOdfWriters *writers);
diff --git a/filters/libmsooxml/MsooXmlGlobal.cpp \
b/filters/libmsooxml/MsooXmlGlobal.cpp index 96bf646..4b151bc 100644
--- a/filters/libmsooxml/MsooXmlGlobal.cpp
+++ b/filters/libmsooxml/MsooXmlGlobal.cpp
@@ -25,12 +25,12 @@
 
 #include "MsooXmlGlobal.h"
 
-MSOOXML_EXPORT uint MSOOXML::maximumSpreadsheetColumns()
+KOMSOOXML_EXPORT uint MSOOXML::maximumSpreadsheetColumns()
 {
     return 0x7FFF;
 }
 
-MSOOXML_EXPORT uint MSOOXML::maximumSpreadsheetRows()
+KOMSOOXML_EXPORT uint MSOOXML::maximumSpreadsheetRows()
 {
     return 0xFFFFF;
 }
diff --git a/filters/libmsooxml/MsooXmlGlobal.h b/filters/libmsooxml/MsooXmlGlobal.h
index d023d29..0934548 100644
--- a/filters/libmsooxml/MsooXmlGlobal.h
+++ b/filters/libmsooxml/MsooXmlGlobal.h
@@ -26,7 +26,7 @@
 #ifndef MSOOXML_GLOBAL_H
 #define MSOOXML_GLOBAL_H
 
-#include "msooxml_export.h"
+#include "komsooxml_export.h"
 
 //! Common utilities for handling MSOOXML formats
 namespace MSOOXML
@@ -34,10 +34,10 @@ namespace MSOOXML
 
 //! @return maximum number of spreadsheet columns per worksheet. Currently set to \
32767, which is KSpread maximum.  //! See \
                http://en.wikipedia.org/wiki/OpenOffice.org_Calc#Specifications
-MSOOXML_EXPORT uint maximumSpreadsheetColumns();
+KOMSOOXML_EXPORT uint maximumSpreadsheetColumns();
 
 //! @return maximum number of spreadsheet rows per worksheet. Currently set to \
                32767, which is KSpread maximum.
-MSOOXML_EXPORT uint maximumSpreadsheetRows();
+KOMSOOXML_EXPORT uint maximumSpreadsheetRows();
 
 } // MSOOXML namespace
 
diff --git a/filters/libmsooxml/MsooXmlImport.h b/filters/libmsooxml/MsooXmlImport.h
index ba5b78a..aebac23 100644
--- a/filters/libmsooxml/MsooXmlImport.h
+++ b/filters/libmsooxml/MsooXmlImport.h
@@ -26,7 +26,7 @@
 #ifndef MSOOXMLIMPORT_H
 #define MSOOXMLIMPORT_H
 
-#include "msooxml_export.h"
+#include "komsooxml_export.h"
 
 #include <QByteArray>
 #include <QHash>
@@ -53,7 +53,7 @@ class MsooXmlRelationships;
 class DrawingMLTheme;
 
 //! A base class for MSOOXML-to-ODF import filters
-class MSOOXML_EXPORT MsooXmlImport : public KoOdfExporter
+class KOMSOOXML_EXPORT MsooXmlImport : public KoOdfExporter
 {
     Q_OBJECT
 public:
diff --git a/filters/libmsooxml/MsooXmlReader.h b/filters/libmsooxml/MsooXmlReader.h
index f658790..10d0769 100644
--- a/filters/libmsooxml/MsooXmlReader.h
+++ b/filters/libmsooxml/MsooXmlReader.h
@@ -24,7 +24,7 @@
 #ifndef MSOOXMLREADER_H
 #define MSOOXMLREADER_H
 
-#include "msooxml_export.h"
+#include "komsooxml_export.h"
 
 #include <QXmlStreamReader>
 #include <QStack>
@@ -44,7 +44,7 @@ namespace MSOOXML
 class MsooXmlRelationships;
 
 //! Context for MsooXmlReader::read()
-class MSOOXML_EXPORT MsooXmlReaderContext
+class KOMSOOXML_EXPORT MsooXmlReaderContext
 {
 protected:
     MsooXmlReaderContext(MsooXmlRelationships* _relationships = 0);
@@ -63,7 +63,7 @@ private:
 };
 
 //! A base class reading MSOOXML parts like document.xml or styles.xml.
-class MSOOXML_EXPORT MsooXmlReader : public QXmlStreamReader, public KoOdfWriters
+class KOMSOOXML_EXPORT MsooXmlReader : public QXmlStreamReader, public KoOdfWriters
 {
 public:
     explicit MsooXmlReader(KoOdfWriters *writers);
@@ -154,6 +154,6 @@ private:
 
 //! kDebug() stream operator. Writes this reader to the debug output in a nicely \
formatted way.  //! @todo add the same for QXmlStreamWriter
-MSOOXML_EXPORT QDebug operator<<(QDebug dbg, const QXmlStreamReader& reader);
+KOMSOOXML_EXPORT QDebug operator<<(QDebug dbg, const QXmlStreamReader& reader);
 
 #endif //MSOOXMLREADER_H
diff --git a/filters/libmsooxml/MsooXmlRelationships.h \
b/filters/libmsooxml/MsooXmlRelationships.h index a9d5288..0346c93 100644
--- a/filters/libmsooxml/MsooXmlRelationships.h
+++ b/filters/libmsooxml/MsooXmlRelationships.h
@@ -25,7 +25,7 @@
 #ifndef MSOOXMLRELATIONSHIPS_H
 #define MSOOXMLRELATIONSHIPS_H
 
-#include "msooxml_export.h"
+#include "komsooxml_export.h"
 
 struct KoOdfWriters;
 
@@ -36,7 +36,7 @@ class MsooXmlImport;
 //! Global document relationships handler.
 /*! It supports delayed loading of any *.xml.rels file. */
 //! @todo add write methods and saving support
-class MSOOXML_EXPORT MsooXmlRelationships
+class KOMSOOXML_EXPORT MsooXmlRelationships
 {
 public:
     explicit MsooXmlRelationships(MsooXmlImport& importer, KoOdfWriters *writers, \
                QString& errorMessage);
diff --git a/filters/libmsooxml/MsooXmlSchemas.h \
b/filters/libmsooxml/MsooXmlSchemas.h index dedce5b..d980d70 100644
--- a/filters/libmsooxml/MsooXmlSchemas.h
+++ b/filters/libmsooxml/MsooXmlSchemas.h
@@ -24,13 +24,13 @@
 #ifndef MSOOXMLNS_H
 #define MSOOXMLNS_H
 
-#include "msooxml_export.h"
+#include "komsooxml_export.h"
 
 namespace MSOOXML
 {
 
 //! MSOOXML Schemas
-class MSOOXML_EXPORT Schemas
+class KOMSOOXML_EXPORT Schemas
 {
 public:
     //! Content types
@@ -56,7 +56,7 @@ public:
     static const char* const presentationml;
 
     //! DrawingML
-    class MSOOXML_EXPORT drawingml
+    class KOMSOOXML_EXPORT drawingml
     {
     public:
         //! A.4 DrawingML - Framework
@@ -75,7 +75,7 @@ public:
 
 
     //! A.6 Shared MLs
-    class MSOOXML_EXPORT officeDocument
+    class KOMSOOXML_EXPORT officeDocument
     {
     public:
         static const char* const math;
diff --git a/filters/libmsooxml/MsooXmlTableStyle.h \
b/filters/libmsooxml/MsooXmlTableStyle.h index 4c8356b..015efa5 100644
--- a/filters/libmsooxml/MsooXmlTableStyle.h
+++ b/filters/libmsooxml/MsooXmlTableStyle.h
@@ -20,7 +20,7 @@
 #ifndef MSOOXMLTABLESTYLE_H
 #define MSOOXMLTABLESTYLE_H
 
-#include "msooxml_export.h"
+#include "komsooxml_export.h"
 
 #include <KoCellStyle.h>
 #include <KoBorder.h>
@@ -34,7 +34,7 @@ namespace MSOOXML {
 
 /// Reading and storage
 
-struct MSOOXML_EXPORT TableStyleProperties
+struct KOMSOOXML_EXPORT TableStyleProperties
 {
     TableStyleProperties()
     :    target(Table)
@@ -95,7 +95,7 @@ struct MSOOXML_EXPORT TableStyleProperties
     KoGenStyle paragraphStyle;
 };
 
-class MSOOXML_EXPORT TableStyle
+class KOMSOOXML_EXPORT TableStyle
 {
 public:
 
@@ -111,7 +111,7 @@ private:
 
 /// Instantiation classes
 
-class MSOOXML_EXPORT LocalTableStyles
+class KOMSOOXML_EXPORT LocalTableStyles
 {
 public:
     LocalTableStyles();
@@ -124,7 +124,7 @@ private:
     QMap<QPair<int,int>, TableStyleProperties*> m_properties;
 };
 
-class MSOOXML_EXPORT TableStyleConverterProperties
+class KOMSOOXML_EXPORT TableStyleConverterProperties
 {
 public:
     TableStyleConverterProperties();
@@ -159,7 +159,7 @@ private:
     MSOOXML::TableStyleProperties* m_localDefaultCellStyle;
 };
 
-class MSOOXML_EXPORT TableStyleConverter
+class KOMSOOXML_EXPORT TableStyleConverter
 {
 public:
     TableStyleConverter(int row, int column);
diff --git a/filters/libmsooxml/MsooXmlThemesReader.h \
b/filters/libmsooxml/MsooXmlThemesReader.h index 0df3f2a..9682c34 100644
--- a/filters/libmsooxml/MsooXmlThemesReader.h
+++ b/filters/libmsooxml/MsooXmlThemesReader.h
@@ -40,7 +40,7 @@ class DrawingMLColorSchemeItem;
 class DrawingMLColorSchemeSystemItem;
 
 //! @todo add other classes inheriting DrawingMLColorSchemeItemBase
-class MSOOXML_EXPORT DrawingMLColorSchemeItemBase
+class KOMSOOXML_EXPORT DrawingMLColorSchemeItemBase
 {
 public:
     DrawingMLColorSchemeItemBase();
@@ -51,7 +51,7 @@ public:
     virtual DrawingMLColorSchemeItemBase* clone() const = 0;
 };
 
-class MSOOXML_EXPORT DrawingMLColorSchemeItem : public DrawingMLColorSchemeItemBase
+class KOMSOOXML_EXPORT DrawingMLColorSchemeItem : public \
DrawingMLColorSchemeItemBase  {
 public:
     DrawingMLColorSchemeItem();
@@ -60,7 +60,7 @@ public:
     DrawingMLColorSchemeItem* clone() const { return new \
DrawingMLColorSchemeItem(*this); }  };
 
-class MSOOXML_EXPORT DrawingMLColorSchemeSystemItem : public \
DrawingMLColorSchemeItemBase +class KOMSOOXML_EXPORT DrawingMLColorSchemeSystemItem : \
public DrawingMLColorSchemeItemBase  {
 public:
     DrawingMLColorSchemeSystemItem();
@@ -74,7 +74,7 @@ public:
 typedef QHash<QString, DrawingMLColorSchemeItemBase*> DrawingMLColorSchemeItemHash;
 
 //! Implements color scheme, based on hash. All items are owned by this object.
-class MSOOXML_EXPORT DrawingMLColorScheme : public DrawingMLColorSchemeItemHash
+class KOMSOOXML_EXPORT DrawingMLColorScheme : public DrawingMLColorSchemeItemHash
 {
 public:
     DrawingMLColorScheme();
@@ -97,7 +97,7 @@ public:
 
 //! Font set for majorFont and minorFont.
 //! @todo add more support for latin, ea and cs: charser, panose, pitchfamily \
                attributes (21.1.2.3.3)
-class MSOOXML_EXPORT DrawingMLFontSet
+class KOMSOOXML_EXPORT DrawingMLFontSet
 {
 public:
     DrawingMLFontSet();
@@ -117,7 +117,7 @@ public:
 
 //! Defines the font scheme within the theme
 //! The font scheme consists of a pair of major and minor fonts for which to use in \
                a document.s
-class MSOOXML_EXPORT DrawingMLFontScheme
+class KOMSOOXML_EXPORT DrawingMLFontScheme
 {
 public:
     DrawingMLFontScheme();
@@ -127,7 +127,7 @@ public:
 };
 
 
-class MSOOXML_EXPORT DrawingMLFillBase
+class KOMSOOXML_EXPORT DrawingMLFillBase
 {
 public:
     virtual ~DrawingMLFillBase();
@@ -139,7 +139,7 @@ public:
     virtual DrawingMLFillBase* clone() const = 0;
 };
 
-class MSOOXML_EXPORT DrawingMLSolidFill : public DrawingMLFillBase
+class KOMSOOXML_EXPORT DrawingMLSolidFill : public DrawingMLFillBase
 {
 public:
     void writeStyles(KoGenStyles& styles, KoGenStyle *graphicStyle, QColor color);
@@ -147,7 +147,7 @@ public:
     DrawingMLSolidFill* clone() const { return new DrawingMLSolidFill(*this); }
 };
 
-class MSOOXML_EXPORT DrawingMLBlipFill : public DrawingMLFillBase
+class KOMSOOXML_EXPORT DrawingMLBlipFill : public DrawingMLFillBase
 {
 public:
     explicit DrawingMLBlipFill(const QString &filePath);
@@ -159,7 +159,7 @@ private:
     QString m_filePath;
 };
 
-class MSOOXML_EXPORT DrawingMLGradientFill : public DrawingMLFillBase
+class KOMSOOXML_EXPORT DrawingMLGradientFill : public DrawingMLFillBase
 {
 public:
     // Simplified gradient constructor
@@ -178,7 +178,7 @@ private:
     QString m_gradAngle;
 };
 
-class MSOOXML_EXPORT DrawingMLFormatScheme
+class KOMSOOXML_EXPORT DrawingMLFormatScheme
 {
 public:
 
@@ -197,7 +197,7 @@ public:
 
 //! Defines a single DrawingML theme.
 //! @todo support objectDefaults and extraClrSchemeLst
-class MSOOXML_EXPORT DrawingMLTheme
+class KOMSOOXML_EXPORT DrawingMLTheme
 {
 public:
     DrawingMLTheme();
@@ -208,7 +208,7 @@ public:
 };
 
 //! Context for MsooXmlThemesReader::read()
-class MSOOXML_EXPORT MsooXmlThemesReaderContext : public MsooXmlReaderContext
+class KOMSOOXML_EXPORT MsooXmlThemesReaderContext : public MsooXmlReaderContext
 {
 public:
     MsooXmlThemesReaderContext(DrawingMLTheme& t, MSOOXML::MsooXmlRelationships* \
rel, MSOOXML::MsooXmlImport* imp, @@ -223,7 +223,7 @@ public:
 //! A class reading MSOOXML themes markup - theme/theme1.xml.
 /*! @todo generalize for other MSOOXML subformats.
  */
-class MSOOXML_EXPORT MsooXmlThemesReader : public MSOOXML::MsooXmlCommonReader
+class KOMSOOXML_EXPORT MsooXmlThemesReader : public MSOOXML::MsooXmlCommonReader
 {
 public:
     //! Creates MsooXmlThemesReader object.
diff --git a/filters/libmsooxml/MsooXmlUnits.h b/filters/libmsooxml/MsooXmlUnits.h
index 3bfeca2..d655611 100644
--- a/filters/libmsooxml/MsooXmlUnits.h
+++ b/filters/libmsooxml/MsooXmlUnits.h
@@ -76,19 +76,19 @@ inline QString cmString(qreal cm)
     "0" and "" is converted to "0cm".
     @return empty string on error. */
 //! CASE #P505
-MSOOXML_EXPORT QString EMU_to_ODF(const QString& emuValue);
+KOMSOOXML_EXPORT QString EMU_to_ODF(const QString& emuValue);
 
 //! Converts TWIP Unit of Measurement to cm.
 /*! Converts value expressed in TWIPs  to ODF-compliant "0.000cm" unit.
     "0" and "" is converted to "0cm".
     @return empty string on error. */
-MSOOXML_EXPORT QString TWIP_to_ODF(const QString& twipValue);
+KOMSOOXML_EXPORT QString TWIP_to_ODF(const QString& twipValue);
 
 //! ECMA-376, 17.18.23 ST_EighthPointMeasure (Measurement in Eighths of a Point), p. \
1540  /*! Converts eighths of a point (equivalent to 1/576th of an inch) to point
     to ODF-compliant "0.000pt" unit.
     @return empty string on failure. */
-MSOOXML_EXPORT QString ST_EighthPointMeasure_to_ODF(const QString& value);
+KOMSOOXML_EXPORT QString ST_EighthPointMeasure_to_ODF(const QString& value);
 
 //! ECMA-376, 22.9.2.14 ST_TwipsMeasure (Measurement in Twentieths of a Point), p. \
4339  /*! Converts:
@@ -97,10 +97,10 @@ MSOOXML_EXPORT QString ST_EighthPointMeasure_to_ODF(const \
                QString& value);
     The conversion's target is ODF-compliant "0.000xx" unit, where xx is "mm", "cm", \
"pt", etc.  For case 1 it is always "pt".
     @return empty string on error. */
-MSOOXML_EXPORT QString ST_TwipsMeasure_to_pt(const QString& value);
+KOMSOOXML_EXPORT QString ST_TwipsMeasure_to_pt(const QString& value);
 
 //! Like ST_TwipsMeasure_to_pt() but for case 1 always converts to "cm".
-MSOOXML_EXPORT QString ST_TwipsMeasure_to_cm(const QString& value);
+KOMSOOXML_EXPORT QString ST_TwipsMeasure_to_cm(const QString& value);
 
 //! ECMA-376, 22.9.2.12 ST_PositiveUniversalMeasure (Positive Universal \
Measurement), p. 4340  /*! Converts number+unit of measurement into ODF-compliant \
number+unit. @@ -108,10 +108,10 @@ MSOOXML_EXPORT QString ST_TwipsMeasure_to_cm(const \
QString& value);  Values with units mm, cm, in, pt, pi are just copied.
     Values with "pc" (another name for Pica) are replaced with "pi".
     @return empty string on error. */
-MSOOXML_EXPORT QString ST_PositiveUniversalMeasure_to_ODF(const QString& value);
+KOMSOOXML_EXPORT QString ST_PositiveUniversalMeasure_to_ODF(const QString& value);
 
 //! Like ST_PositiveUniversalMeasure_to_ODF(const QString&) but always converts to \
                cm.
-MSOOXML_EXPORT QString ST_PositiveUniversalMeasure_to_cm(const QString& value);
+KOMSOOXML_EXPORT QString ST_PositiveUniversalMeasure_to_cm(const QString& value);
 
 } // Utils
 } // MSOOXML
diff --git a/filters/libmsooxml/MsooXmlUtils.cpp \
b/filters/libmsooxml/MsooXmlUtils.cpp index 7ab4e29..f40a25a 100644
--- a/filters/libmsooxml/MsooXmlUtils.cpp
+++ b/filters/libmsooxml/MsooXmlUtils.cpp
@@ -929,7 +929,7 @@ QColor Utils::colorForLuminance(const QColor& color, const \
DoubleModifier& modul  return color;
 }
 
-MSOOXML_EXPORT void Utils::modifyColor(QColor& color, qreal tint, qreal shade, qreal \
satMod) +KOMSOOXML_EXPORT void Utils::modifyColor(QColor& color, qreal tint, qreal \
shade, qreal satMod)  {
     int red = color.red();
     int green = color.green();
@@ -1437,7 +1437,7 @@ qreal twipToPt(qreal v)
     return TWIP_TO_POINT(v);
 }
 
-MSOOXML_EXPORT QString Utils::ST_TwipsMeasure_to_pt(const QString& value)
+KOMSOOXML_EXPORT QString Utils::ST_TwipsMeasure_to_pt(const QString& value)
 {
     return ST_TwipsMeasure_to_ODF_with_unit(value, twipToPt, "pt");
 }
@@ -1447,12 +1447,12 @@ qreal twipToCm(qreal v)
     return TWIP_TO_CM(v);
 }
 
-MSOOXML_EXPORT QString Utils::ST_TwipsMeasure_to_cm(const QString& value)
+KOMSOOXML_EXPORT QString Utils::ST_TwipsMeasure_to_cm(const QString& value)
 {
     return ST_TwipsMeasure_to_ODF_with_unit(value, twipToCm, "cm");
 }
 
-MSOOXML_EXPORT QString Utils::ST_PositiveUniversalMeasure_to_ODF(const QString& \
value) +KOMSOOXML_EXPORT QString Utils::ST_PositiveUniversalMeasure_to_ODF(const \
QString& value)  {
     // a positive decimal number immediately following by a unit identifier.
     qreal number(0.0);
@@ -1470,7 +1470,7 @@ MSOOXML_EXPORT QString \
Utils::ST_PositiveUniversalMeasure_to_ODF(const QString&  return value; // the \
original is OK  }
 
-MSOOXML_EXPORT QString Utils::ST_PositiveUniversalMeasure_to_cm(const QString& \
value) +KOMSOOXML_EXPORT QString Utils::ST_PositiveUniversalMeasure_to_cm(const \
QString& value)  {
     QString v(ST_PositiveUniversalMeasure_to_ODF(value));
     if (v.isEmpty())
diff --git a/filters/libmsooxml/MsooXmlUtils.h b/filters/libmsooxml/MsooXmlUtils.h
index a303675..055fa15 100644
--- a/filters/libmsooxml/MsooXmlUtils.h
+++ b/filters/libmsooxml/MsooXmlUtils.h
@@ -26,7 +26,7 @@
 #ifndef MSOOXML_UTILS_H
 #define MSOOXML_UTILS_H
 
-#include "msooxml_export.h"
+#include "komsooxml_export.h"
 
 #include <QSize>
 #include <QColor>
@@ -71,7 +71,7 @@ enum MSOOXMLFilter {
     DocxFilter, PptxFilter, XlsxFilter
 };
 
-class MSOOXML_EXPORT ParagraphBulletProperties
+class KOMSOOXML_EXPORT ParagraphBulletProperties
 {
 public:
 
@@ -244,38 +244,38 @@ private:
 
 //! Decodes boolean attribute @a value. If unspecified returns @a defaultValue.
 //! @return true unless @a value is equal to "false", "off" or "0".
-MSOOXML_EXPORT bool convertBooleanAttr(const QString& value, bool defaultValue = \
false); +KOMSOOXML_EXPORT bool convertBooleanAttr(const QString& value, bool \
defaultValue = false);  
 //! Loads content types from "[Content_Types].xml"
 /*! Based on information from ECMA-376, Part 1: "11.2 Package Structure".
  @return status: KoFilter::OK on success or KoFilter::WrongFormat when any \
                unexpected and critical incompatibility occurs.
 */
 //! @todo create whole class keeping the data
-MSOOXML_EXPORT KoFilter::ConversionStatus loadContentTypes(const KoXmlDocument& \
contentTypesXML, +KOMSOOXML_EXPORT KoFilter::ConversionStatus loadContentTypes(const \
KoXmlDocument& contentTypesXML,  QMultiHash<QByteArray, QByteArray>& contentTypes);
 
 //! Loads content types from "docProps/app.xml"
-MSOOXML_EXPORT KoFilter::ConversionStatus loadDocumentProperties(const \
KoXmlDocument& appXML, QMap<QString, QVariant>& properties); +KOMSOOXML_EXPORT \
KoFilter::ConversionStatus loadDocumentProperties(const KoXmlDocument& appXML, \
QMap<QString, QVariant>& properties);  
 //! @return device for file @a fileName of @a zip archive. Status @a status is \
written on error.  //! The device is already opened for reading and should be deleted \
                after use.
-MSOOXML_EXPORT QIODevice* openDeviceForFile(const KZip* zip,
+KOMSOOXML_EXPORT QIODevice* openDeviceForFile(const KZip* zip,
         QString& errorMessage,
         const QString& fileName,
         KoFilter::ConversionStatus& status);
 
 //! QXmlStreamReader-based generic loading/parsing into @a doc KoXmlDocument
-MSOOXML_EXPORT KoFilter::ConversionStatus loadAndParse(QIODevice* io, KoXmlDocument& \
doc, +KOMSOOXML_EXPORT KoFilter::ConversionStatus loadAndParse(QIODevice* io, \
KoXmlDocument& doc,  QString& errorMessage, const QString & fileName);
 
 //! @see KoOdfReadStore::loadAndParse(QIODevice* fileDevice, KoXmlDocument& doc, \
                QString& errorMessage, const QString& fileName)
-MSOOXML_EXPORT KoFilter::ConversionStatus loadAndParse(KoXmlDocument& doc,
+KOMSOOXML_EXPORT KoFilter::ConversionStatus loadAndParse(KoXmlDocument& doc,
         const KZip* zip,
         QString& errorMessage,
         const QString& fileName);
 
 //! QXmlStreamReader-based loading/parsing for document.xml
-MSOOXML_EXPORT KoFilter::ConversionStatus loadAndParseDocument(MsooXmlReader* \
reader, +KOMSOOXML_EXPORT KoFilter::ConversionStatus \
loadAndParseDocument(MsooXmlReader* reader,  const KZip* zip,
         KoOdfWriters* writers,
         QString& errorMessage,
@@ -306,7 +306,7 @@ KoFilter::ConversionStatus imageSize(const KZip* zip, QString& \
errorMessage,  /*! @return conversion status
     @todo Thumbnails are apparently used only by PowerPoint or templates for now.
           Implement it, for now this feature is not needed for docx. */
-MSOOXML_EXPORT KoFilter::ConversionStatus loadThumbnail(QImage& thumbnail, KZip* \
zip); +KOMSOOXML_EXPORT KoFilter::ConversionStatus loadThumbnail(QImage& thumbnail, \
KZip* zip);  
 // -- conversions ---
 
@@ -314,7 +314,7 @@ MSOOXML_EXPORT KoFilter::ConversionStatus loadThumbnail(QImage& \
thumbnail, KZip*  /*! The value specifies that its contents contains a language \
                identifier as defined by RFC 4646/BCP 47.
     Sets up @a language and @a country based on @a value that is of format \
{langugage}-{country}  @return true on success. */
-MSOOXML_EXPORT bool ST_Lang_to_languageAndCountry(const QString& value, QString& \
language, QString& country); +KOMSOOXML_EXPORT bool \
ST_Lang_to_languageAndCountry(const QString& value, QString& language, QString& \
country);  
 //! @return QColor value for ST_HexColorRGB (Hexadecimal Color Value) (SharedML, \
22.9.2.5)  //!         or invalid QColor if @a color is not in the expected format.
@@ -333,34 +333,34 @@ inline QColor ST_HexColorRGB_to_QColor(const QString& color)
 //! The brush is built out of solid color.
 //! If colorName is not supported by the standard, QBrush() is returned.
 //! @par colorName named text highlight color like "black", "blue" (17.18.40)
-MSOOXML_EXPORT QBrush ST_HighlightColor_to_QColor(const QString& colorName);
+KOMSOOXML_EXPORT QBrush ST_HighlightColor_to_QColor(const QString& colorName);
 
 //! @return QColor value for DefaultIndexColor
-MSOOXML_EXPORT QColor defaultIndexedColor( int index );
+KOMSOOXML_EXPORT QColor defaultIndexedColor( int index );
 
 //! @return QLocale for the give language id
-MSOOXML_EXPORT QLocale localeForLangId( int langid );
+KOMSOOXML_EXPORT QLocale localeForLangId( int langid );
 
 //! Converts value for 22.9.2.9 ST_Percentage (Percentage Value with Sign) from \
string  //! Sets @arg ok to true on success.
-MSOOXML_EXPORT qreal ST_Percentage_to_double(const QString& val, bool& ok);
+KOMSOOXML_EXPORT qreal ST_Percentage_to_double(const QString& val, bool& ok);
 
 //! Converts value for 22.9.2.9 ST_Percentage (Percentage Value with Sign) from \
string  //! If "%" suffix is not present (MSOOXML violation of OOXML), the format is \
expected to be int({ST_Percentage}*1000).  //! Sets @arg ok to true on success.
-MSOOXML_EXPORT qreal ST_Percentage_withMsooxmlFix_to_double(const QString& val, \
bool& ok); +KOMSOOXML_EXPORT qreal ST_Percentage_withMsooxmlFix_to_double(const \
QString& val, bool& ok);  
-struct MSOOXML_EXPORT DoubleModifier {
+struct KOMSOOXML_EXPORT DoubleModifier {
     DoubleModifier(qreal v) : value(v), valid(true) {}
     DoubleModifier() : value(0.0), valid(false) {}
     qreal value;
     bool valid;
 };
 
-MSOOXML_EXPORT QColor colorForLuminance(const QColor& color,
+KOMSOOXML_EXPORT QColor colorForLuminance(const QColor& color,
     const DoubleModifier& modulation, const DoubleModifier& offset);
 
-MSOOXML_EXPORT void modifyColor(QColor& color, qreal tint, qreal shade, qreal \
satMod); +KOMSOOXML_EXPORT void modifyColor(QColor& color, qreal tint, qreal shade, \
qreal satMod);  
 //! Converts shape types from ECMA-376 to ODF.
 /*! @return "Common Presentation Shape Attribute" value (ODF 1.1., 9.6.1)
@@ -373,27 +373,27 @@ MSOOXML_EXPORT void modifyColor(QColor& color, qreal tint, \
                qreal shade, qreal sa
 */
 //! @todo or "object"?  ST_PlaceholderType docs day the default is "obj".
 //! CASE #P500
-MSOOXML_EXPORT QString ST_PlaceholderType_to_ODF(const QString& ecmaType);
+KOMSOOXML_EXPORT QString ST_PlaceholderType_to_ODF(const QString& ecmaType);
 
 //! Sets up @a textStyleProperties with underline style matching MSOOXML name @a \
msooxmlName.  //! Based on 17.18.99 ST_Underline (Underline Patterns), WML ECMA-376 \
p.1681  //! and on 20.1.10.82 ST_TextUnderlineType (Text Underline Types), DrawingML \
                ECMA-376 p.3450 (merged)
-MSOOXML_EXPORT void setupUnderLineStyle(const QString& msooxmlName, \
KoCharacterStyle* textStyleProperties); +KOMSOOXML_EXPORT void \
setupUnderLineStyle(const QString& msooxmlName, KoCharacterStyle* \
textStyleProperties);  
 //! @return the symbolic name of column @a column (counted from 0)
 //! This is similar to the notation of spreadsheet's column, e.g. 0th column is "A", \
                1st is "B", 26th is "AA".
-MSOOXML_EXPORT QString columnName(uint column);
+KOMSOOXML_EXPORT QString columnName(uint column);
 
 //! Splits @a pathAndFile into path and file parts. Path does not end with '/'.
-MSOOXML_EXPORT void splitPathAndFile(const QString& pathAndFile, QString* path, \
QString* file); +KOMSOOXML_EXPORT void splitPathAndFile(const QString& pathAndFile, \
QString* path, QString* file);  
 //! Returns calculated angle and xDiff, yDiff, caller has to apply these to style
-MSOOXML_EXPORT void rotateString(const qreal rotation, const qreal width, const \
qreal height, qreal& angle, qreal& xDiff, qreal& yDiff); +KOMSOOXML_EXPORT void \
rotateString(const qreal rotation, const qreal width, const qreal height, qreal& \
angle, qreal& xDiff, qreal& yDiff);  
 //! Marker related utils
-MSOOXML_EXPORT QString defineMarkerStyle(KoGenStyles& mainStyles, const QString& \
markerType); +KOMSOOXML_EXPORT QString defineMarkerStyle(KoGenStyles& mainStyles, \
const QString& markerType);  
-MSOOXML_EXPORT qreal defineMarkerWidth(const QString &markerWidth, const qreal \
lineWidth); +KOMSOOXML_EXPORT qreal defineMarkerWidth(const QString &markerWidth, \
const qreal lineWidth);  
 //! A helper allowing to buffer xml streams and writing them back later
 /*! This class is useful when information that has to be written in advance is
@@ -425,7 +425,7 @@ MSOOXML_EXPORT qreal defineMarkerWidth(const QString \
&markerWidth, const qreal l  
      body = buf.releaseWriter();
      @endcode */
-class MSOOXML_EXPORT XmlWriteBuffer
+class KOMSOOXML_EXPORT XmlWriteBuffer
 {
 public:
     //! Constructor; no writer is set initially.
diff --git a/filters/libmsooxml/VmlDrawingReader.h \
b/filters/libmsooxml/VmlDrawingReader.h index 9c6d88f..406518c 100644
--- a/filters/libmsooxml/VmlDrawingReader.h
+++ b/filters/libmsooxml/VmlDrawingReader.h
@@ -27,7 +27,7 @@
 #include <MsooXmlCommonReader.h>
 #include <MsooXmlImport.h>
 
-class MSOOXML_EXPORT VmlDrawingReaderContext : public MSOOXML::MsooXmlReaderContext
+class KOMSOOXML_EXPORT VmlDrawingReaderContext : public \
MSOOXML::MsooXmlReaderContext  {
 public:
     //! Creates the context object.
@@ -40,7 +40,7 @@ public:
 };
 
 //! A class reading headers
-class MSOOXML_EXPORT VmlDrawingReader : public MSOOXML::MsooXmlCommonReader
+class KOMSOOXML_EXPORT VmlDrawingReader : public MSOOXML::MsooXmlCommonReader
 {
 public:
     explicit VmlDrawingReader(KoOdfWriters *writers);
diff --git a/filters/libmsooxml/msooxml_export.h \
b/filters/libmsooxml/komsooxml_export.h similarity index 78%
rename from filters/libmsooxml/msooxml_export.h
rename to filters/libmsooxml/komsooxml_export.h
index c533ef7..427bea5 100644
--- a/filters/libmsooxml/msooxml_export.h
+++ b/filters/libmsooxml/komsooxml_export.h
@@ -21,24 +21,24 @@
  *
  */
 
-#ifndef MSOOXML_EXPORT_H
-#define MSOOXML_EXPORT_H
+#ifndef KOMSOOXML_EXPORT_H
+#define KOMSOOXML_EXPORT_H
 
 /* needed for KDE_EXPORT and KDE_IMPORT macros */
 #include <kdemacros.h>
 
-#ifndef MSOOXML_EXPORT
-# if defined(MAKE_MSOOXML_LIB)
+#ifndef KOMSOOXML_EXPORT
+# if defined(MAKE_KOMSOOXML_LIB)
 /* We are building this library */
-#  define MSOOXML_EXPORT KDE_EXPORT
+#  define KOMSOOXML_EXPORT KDE_EXPORT
 # else
 /* We are using this library */
-#  define MSOOXML_EXPORT KDE_IMPORT
+#  define KOMSOOXML_EXPORT KDE_IMPORT
 # endif
 #endif
 
-# ifndef MSOOXML_EXPORT_DEPRECATED
-#  define MSOOXML_EXPORT_DEPRECATED KDE_DEPRECATED MSOOXML_EXPORT
+# ifndef KOMSOOXML_EXPORT_DEPRECATED
+#  define KOMSOOXML_EXPORT_DEPRECATED KDE_DEPRECATED KOMSOOXML_EXPORT
 # endif
 
 #endif
diff --git a/filters/libmsooxml/ooxml_pole.h b/filters/libmsooxml/ooxml_pole.h
index 706fb4b..b1815cc 100644
--- a/filters/libmsooxml/ooxml_pole.h
+++ b/filters/libmsooxml/ooxml_pole.h
@@ -29,7 +29,7 @@
 #ifndef OOXML_POLE_H
 #define OOXML_POLE_H
 
-#include "msooxml_export.h"
+#include "komsooxml_export.h"
 
 class QIODevice;
 
@@ -43,7 +43,7 @@ class StorageIO;
 class Stream;
 class StreamIO;
 
-class MSOOXML_EXPORT Storage
+class KOMSOOXML_EXPORT Storage
 {
     friend class Stream;
     friend class StreamOut;
@@ -110,7 +110,7 @@ private:
 
 };
 
-class MSOOXML_EXPORT Stream
+class KOMSOOXML_EXPORT Stream
 {
     friend class Storage;
     friend class StorageIO;
diff --git a/filters/libodfreader/CMakeLists.txt \
b/filters/libodfreader/CMakeLists.txt index fa9b52e..1e7ec60 100644
--- a/filters/libodfreader/CMakeLists.txt
+++ b/filters/libodfreader/CMakeLists.txt
@@ -24,7 +24,7 @@ install(TARGETS koodfreader ${INSTALL_TARGETS_DEFAULT_ARGS} )
 
 
 #install( FILES
-         # odfreader_export.h
+         # koodfreader_export.h
          # OdfReaderContext.h
          # OdtReaderBackend.h
          # OdfTextReaderBackend.h
diff --git a/filters/libodfreader/OdfReaderContext.h \
b/filters/libodfreader/OdfReaderContext.h index 5181cb5..8db7fdc 100644
--- a/filters/libodfreader/OdfReaderContext.h
+++ b/filters/libodfreader/OdfReaderContext.h
@@ -28,7 +28,7 @@
 #include <KoFilter.h>
 
 // this library
-#include "odfreader_export.h"
+#include "koodfreader_export.h"
 
 
 class QByteArray;
@@ -67,7 +67,7 @@ class KoStore;
  * @see OdtReaderBackend
  */
 
-class ODFREADER_EXPORT OdfReaderContext 
+class KOODFREADER_EXPORT OdfReaderContext
 {
  public: 
     OdfReaderContext(KoStore *store);
diff --git a/filters/libodfreader/OdtReader.h b/filters/libodfreader/OdtReader.h
index f583340..1d4f4fd 100644
--- a/filters/libodfreader/OdtReader.h
+++ b/filters/libodfreader/OdtReader.h
@@ -29,7 +29,7 @@
 #include <KoXmlStreamReader.h>
 
 // this library
-#include "odfreader_export.h"
+#include "koodfreader_export.h"
 
 
 class QSizeF;
@@ -62,7 +62,7 @@ class OdfReaderContext;
  * processing such as internal links, lists of embedded data such as
  * pictures.
  */
-class ODFREADER_EXPORT OdtReader
+class KOODFREADER_EXPORT OdtReader
 {
  public:
     OdtReader();
diff --git a/filters/libodfreader/OdtReaderBackend.h \
b/filters/libodfreader/OdtReaderBackend.h index 6283bf7..a0168e6 100644
--- a/filters/libodfreader/OdtReaderBackend.h
+++ b/filters/libodfreader/OdtReaderBackend.h
@@ -26,7 +26,7 @@
 #include <KoFilter.h>
 
 // this library
-#include "odfreader_export.h"
+#include "koodfreader_export.h"
 #include "OdtReader.h"
 
 
@@ -67,7 +67,7 @@ class OdfReaderContext;
  * inherit this class and only reimplement those functions that are
  * actually needed.
  */
-class ODFREADER_EXPORT OdtReaderBackend
+class KOODFREADER_EXPORT OdtReaderBackend
 {
  public:
     explicit OdtReaderBackend(OdfReaderContext *context);
diff --git a/filters/libodfreader/odfreader_export.h \
b/filters/libodfreader/koodfreader_export.h similarity index 78%
rename from filters/libodfreader/odfreader_export.h
rename to filters/libodfreader/koodfreader_export.h
index 976a7ac..f007653 100644
--- a/filters/libodfreader/odfreader_export.h
+++ b/filters/libodfreader/koodfreader_export.h
@@ -18,24 +18,24 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef ODFREADER_EXPORT_H
-#define ODFREADER_EXPORT_H
+#ifndef KOODFREADER_EXPORT_H
+#define KOODFREADER_EXPORT_H
 
 /* needed for KDE_EXPORT and KDE_IMPORT macros */
 #include <kdemacros.h>
 
-#ifndef ODFREADER_EXPORT
-# if defined(MAKE_ODFREADER_LIB)
+#ifndef KOODFREADER_EXPORT
+# if defined(MAKE_KOODFREADER_LIB)
 /* We are building this library */
-#  define ODFREADER_EXPORT KDE_EXPORT
+#  define KOODFREADER_EXPORT KDE_EXPORT
 # else
 /* We are using this library */
-#  define ODFREADER_EXPORT KDE_IMPORT
+#  define KOODFREADER_EXPORT KDE_IMPORT
 # endif
 #endif
 
-# ifndef ODFREADER_EXPORT_DEPRECATED
-#  define ODFREADER_EXPORT_DEPRECATED KDE_DEPRECATED ODFREADER_EXPORT
+# ifndef KOODFREADER_EXPORT_DEPRECATED
+#  define KOODFREADER_EXPORT_DEPRECATED KDE_DEPRECATED KOODFREADER_EXPORT
 # endif
 
 #endif
diff --git a/libs/textlayout/CMakeLists.txt b/libs/textlayout/CMakeLists.txt
index cf2b83b..903779f 100644
--- a/libs/textlayout/CMakeLists.txt
+++ b/libs/textlayout/CMakeLists.txt
@@ -53,7 +53,7 @@ install(
     KoTextShapeData.h
     KoPointedAt.h
     KoStyleThumbnailer.h
-    textlayout_export.h
+    kotextlayout_export.h
     DESTINATION
     ${INCLUDE_INSTALL_DIR} COMPONENT Devel
 )
diff --git a/libs/textlayout/DummyDocumentLayout.h \
b/libs/textlayout/DummyDocumentLayout.h index d9f38cf..b52d93e 100644
--- a/libs/textlayout/DummyDocumentLayout.h
+++ b/libs/textlayout/DummyDocumentLayout.h
@@ -20,7 +20,7 @@
 #ifndef DUMMYDOCUMENTLAYOUT_H
 #define DUMMYDOCUMENTLAYOUT_H
 
-#include "textlayout_export.h"
+#include "kotextlayout_export.h"
 
 #include <QAbstractTextDocumentLayout>
 
@@ -34,7 +34,7 @@
  * You really shouldn't add anything to this class
  */
 
-class TEXTLAYOUT_EXPORT DummyDocumentLayout : public QAbstractTextDocumentLayout
+class KOTEXTLAYOUT_EXPORT DummyDocumentLayout : public QAbstractTextDocumentLayout
 {
     Q_OBJECT
 public:
diff --git a/libs/textlayout/KoPageProvider.h b/libs/textlayout/KoPageProvider.h
index 4e7a289..a53f038 100644
--- a/libs/textlayout/KoPageProvider.h
+++ b/libs/textlayout/KoPageProvider.h
@@ -21,13 +21,13 @@
 #ifndef KOPAGEPROVIDER_H
 #define KOPAGEPROVIDER_H
 
-#include "textlayout_export.h"
+#include "kotextlayout_export.h"
 
 class KoShape;
 class KoTextPage;
 
 /// \internal  this is a hack for kpresenter
-class TEXTLAYOUT_EXPORT KoPageProvider
+class KOTEXTLAYOUT_EXPORT KoPageProvider
 {
 public:
     KoPageProvider();
diff --git a/libs/textlayout/KoPointedAt.h b/libs/textlayout/KoPointedAt.h
index 6e65eeb..1f3c09b 100644
--- a/libs/textlayout/KoPointedAt.h
+++ b/libs/textlayout/KoPointedAt.h
@@ -20,7 +20,7 @@
 #ifndef KOPOINTEDAT_H
 #define KOPOINTEDAT_H
 
-#include "textlayout_export.h"
+#include "kotextlayout_export.h"
 
 #include <QString>
 #include <QTextCursor>
@@ -33,7 +33,7 @@ class KoInlineTextObjectManager;
 class KoTextRangeManager;
 class KoInlineNote;
 
-class TEXTLAYOUT_EXPORT KoPointedAt
+class KOTEXTLAYOUT_EXPORT KoPointedAt
 {
 public:
     KoPointedAt();
diff --git a/libs/textlayout/KoStyleThumbnailer.h \
b/libs/textlayout/KoStyleThumbnailer.h index a7694a0..4ab060b 100644
--- a/libs/textlayout/KoStyleThumbnailer.h
+++ b/libs/textlayout/KoStyleThumbnailer.h
@@ -26,7 +26,7 @@
 #ifndef KOSTYLETHUMBNAILER_H
 #define KOSTYLETHUMBNAILER_H
 
-#include "textlayout_export.h"
+#include "kotextlayout_export.h"
 
 #include <QSize>
 
@@ -39,7 +39,7 @@ class QTextDocument;
 /**
  * Helper class to create (and cache) thumbnails of styles
  */
-class TEXTLAYOUT_EXPORT KoStyleThumbnailer
+class KOTEXTLAYOUT_EXPORT KoStyleThumbnailer
 {
 public:
     enum KoStyleThumbnailerFlag {
diff --git a/libs/textlayout/KoTextBlockPaintStrategyBase.h \
b/libs/textlayout/KoTextBlockPaintStrategyBase.h index 5c7498c..5d7836f 100644
--- a/libs/textlayout/KoTextBlockPaintStrategyBase.h
+++ b/libs/textlayout/KoTextBlockPaintStrategyBase.h
@@ -21,7 +21,7 @@
 #ifndef KOTEXTBLOCKPAINTSTRATEGYBASE_H
 #define KOTEXTBLOCKPAINTSTRATEGYBASE_H
 
-#include "textlayout_export.h"
+#include "kotextlayout_export.h"
 
 #include <QBrush>
 
@@ -31,7 +31,7 @@ class QPainter;
  * This class is used to control aspects of textblock painting
  * Which is used when KPresenter animates text.
  */
-class TEXTLAYOUT_EXPORT KoTextBlockPaintStrategyBase
+class KOTEXTLAYOUT_EXPORT KoTextBlockPaintStrategyBase
 {
 public:
     KoTextBlockPaintStrategyBase();
diff --git a/libs/textlayout/KoTextDocumentLayout.h \
b/libs/textlayout/KoTextDocumentLayout.h index eb5f327..a0fabcf 100644
--- a/libs/textlayout/KoTextDocumentLayout.h
+++ b/libs/textlayout/KoTextDocumentLayout.h
@@ -22,7 +22,7 @@
 #ifndef KOTEXTDOCUMENTLAYOUT_H
 #define KOTEXTDOCUMENTLAYOUT_H
 
-#include "textlayout_export.h"
+#include "kotextlayout_export.h"
 
 #include "KoTextDocument.h"
 #include <QAbstractTextDocumentLayout>
@@ -47,7 +47,7 @@ class KoTextLayoutRootAreaProvider;
 class KoTextLayoutObstruction;
 class KoAnchorTextRange;
 
-class TEXTLAYOUT_EXPORT KoInlineObjectExtent
+class KOTEXTLAYOUT_EXPORT KoInlineObjectExtent
 {
 public:
     explicit KoInlineObjectExtent(qreal ascent = 0, qreal descent = 0);
@@ -60,7 +60,7 @@ public:
  * Text layouter that allows text to flow in multiple root area and around
  * obstructions.
  */
-class TEXTLAYOUT_EXPORT KoTextDocumentLayout : public QAbstractTextDocumentLayout
+class KOTEXTLAYOUT_EXPORT KoTextDocumentLayout : public QAbstractTextDocumentLayout
 {
     Q_OBJECT
 public:
diff --git a/libs/textlayout/KoTextLayoutArea.h b/libs/textlayout/KoTextLayoutArea.h
index 91c7473..ee1cae4 100644
--- a/libs/textlayout/KoTextLayoutArea.h
+++ b/libs/textlayout/KoTextLayoutArea.h
@@ -20,7 +20,7 @@
 #ifndef KOTEXTLAYOUTAREA_H
 #define KOTEXTLAYOUTAREA_H
 
-#include "textlayout_export.h"
+#include "kotextlayout_export.h"
 
 #include "KoPointedAt.h"
 
@@ -59,7 +59,7 @@ class FrameIterator;
  * the RootArea, but it may also be set by, for example, a row in a table with
  * fixed height.
  */
-class TEXTLAYOUT_EXPORT KoTextLayoutArea
+class KOTEXTLAYOUT_EXPORT KoTextLayoutArea
 {
 public:
     /// constructor
diff --git a/libs/textlayout/KoTextLayoutCellHelper.h \
b/libs/textlayout/KoTextLayoutCellHelper.h index 56e63d1..34b234d 100644
--- a/libs/textlayout/KoTextLayoutCellHelper.h
+++ b/libs/textlayout/KoTextLayoutCellHelper.h
@@ -25,7 +25,7 @@
 #ifndef KOTEXTLAYOUTCELLHELPER_H
 #define KOTEXTLAYOUTCELLHELPER_H
 
-#include "textlayout_export.h"
+#include "kotextlayout_export.h"
 
 #include <KoBorder.h>
 #include <KoTableCellStyle.h>
@@ -34,7 +34,7 @@
 
 class QPainter;
 
-class TEXTLAYOUT_EXPORT KoTextLayoutCellHelper : public QObject
+class KOTEXTLAYOUT_EXPORT KoTextLayoutCellHelper : public QObject
 {
     Q_OBJECT
 public:
diff --git a/libs/textlayout/KoTextLayoutEndNotesArea.h \
b/libs/textlayout/KoTextLayoutEndNotesArea.h index 6e1161c..59e9e5d 100644
--- a/libs/textlayout/KoTextLayoutEndNotesArea.h
+++ b/libs/textlayout/KoTextLayoutEndNotesArea.h
@@ -20,7 +20,7 @@
 #ifndef KOTEXTLAYOUTENDNOTESAREA_H
 #define KOTEXTLAYOUTENDNOTESAREA_H
 
-#include "textlayout_export.h"
+#include "kotextlayout_export.h"
 
 #include "KoTextLayoutArea.h"
 
@@ -30,7 +30,7 @@
 /**
  * When laying out text it happens in areas that can occupy space of various size.
  */
-class TEXTLAYOUT_EXPORT KoTextLayoutEndNotesArea : public KoTextLayoutArea
+class KOTEXTLAYOUT_EXPORT KoTextLayoutEndNotesArea : public KoTextLayoutArea
 {
 public:
     /// constructor
diff --git a/libs/textlayout/KoTextLayoutNoteArea.h \
b/libs/textlayout/KoTextLayoutNoteArea.h index bcb51b1..8589874 100644
--- a/libs/textlayout/KoTextLayoutNoteArea.h
+++ b/libs/textlayout/KoTextLayoutNoteArea.h
@@ -25,7 +25,7 @@
 #include <KoTextDocumentLayout.h>
 #include <KoInlineNote.h>
 
-class TEXTLAYOUT_EXPORT KoTextLayoutNoteArea : public KoTextLayoutArea
+class KOTEXTLAYOUT_EXPORT KoTextLayoutNoteArea : public KoTextLayoutArea
 {
 public:
     explicit KoTextLayoutNoteArea(KoInlineNote *note, KoTextLayoutArea *parent, \
                KoTextDocumentLayout *documentLayout);
diff --git a/libs/textlayout/KoTextLayoutObstruction.h \
b/libs/textlayout/KoTextLayoutObstruction.h index 0de40a1..0e7e257 100644
--- a/libs/textlayout/KoTextLayoutObstruction.h
+++ b/libs/textlayout/KoTextLayoutObstruction.h
@@ -21,7 +21,7 @@
 #ifndef KOTEXTLAYOUTOBSTRUCTION_H
 #define KOTEXTLAYOUTOBSTRUCTION_H
 
-#include "textlayout_export.h"
+#include "kotextlayout_export.h"
 
 #include <QTransform>
 #include <QMultiMap>
@@ -30,7 +30,7 @@
 class KoShape;
 
 ///  Class that allows us with the runaround of QPainterPaths
-class TEXTLAYOUT_EXPORT KoTextLayoutObstruction
+class KOTEXTLAYOUT_EXPORT KoTextLayoutObstruction
 {
 public:
     KoTextLayoutObstruction(KoShape *shape, const QTransform &matrix);
diff --git a/libs/textlayout/KoTextLayoutRootArea.h \
b/libs/textlayout/KoTextLayoutRootArea.h index 87a2941..53cf244 100644
--- a/libs/textlayout/KoTextLayoutRootArea.h
+++ b/libs/textlayout/KoTextLayoutRootArea.h
@@ -20,7 +20,7 @@
 #ifndef KOTEXTLAYOUTROOTAREA_H
 #define KOTEXTLAYOUTROOTAREA_H
 
-#include "textlayout_export.h"
+#include "kotextlayout_export.h"
 
 #include "KoTextLayoutArea.h"
 
@@ -32,7 +32,7 @@ class KoTextPage;
 /**
  * When laying out text it happens in areas that can occupy space of various size.
  */
-class TEXTLAYOUT_EXPORT KoTextLayoutRootArea : public KoTextLayoutArea
+class KOTEXTLAYOUT_EXPORT KoTextLayoutRootArea : public KoTextLayoutArea
 {
 public:
     /// constructor
diff --git a/libs/textlayout/KoTextLayoutRootAreaProvider.h \
b/libs/textlayout/KoTextLayoutRootAreaProvider.h index 60561d6..d8c7ac3 100644
--- a/libs/textlayout/KoTextLayoutRootAreaProvider.h
+++ b/libs/textlayout/KoTextLayoutRootAreaProvider.h
@@ -20,7 +20,7 @@
 #ifndef KOTEXTLAYOUTROOTAREAPROVIDER_H
 #define KOTEXTLAYOUTROOTAREAPROVIDER_H
 
-#include "textlayout_export.h"
+#include "kotextlayout_export.h"
 
 #include <QSizeF>
 #include <QRectF>
@@ -34,7 +34,7 @@ class KoTextLayoutObstruction;
  * When laying out text we need an area where upon the text will be placed.
  * A KoTextLayoutRootAreaProvider provides the layout process with such areas
  */
-class TEXTLAYOUT_EXPORT KoTextLayoutRootAreaProvider
+class KOTEXTLAYOUT_EXPORT KoTextLayoutRootAreaProvider
 {
 public:
     /// constructor
diff --git a/libs/textlayout/KoTextLayoutTableArea.h \
b/libs/textlayout/KoTextLayoutTableArea.h index 50d259a..8aee037 100644
--- a/libs/textlayout/KoTextLayoutTableArea.h
+++ b/libs/textlayout/KoTextLayoutTableArea.h
@@ -20,7 +20,7 @@
 #ifndef KOTEXTLAYOUTTABLEAREA_H
 #define KOTEXTLAYOUTTABLEAREA_H
 
-#include "textlayout_export.h"
+#include "kotextlayout_export.h"
 
 #include "KoTextLayoutArea.h"
 #include "KoPointedAt.h"
@@ -33,7 +33,7 @@ class TableIterator;
 /**
  * This class represent a (full width) piece of a table
  */
-class TEXTLAYOUT_EXPORT KoTextLayoutTableArea : public KoTextLayoutArea
+class KOTEXTLAYOUT_EXPORT KoTextLayoutTableArea : public KoTextLayoutArea
 {
 public:
     /// constructor
diff --git a/libs/textlayout/KoTextShapeContainerModel.h \
b/libs/textlayout/KoTextShapeContainerModel.h index 99e5a5e..8617127 100644
--- a/libs/textlayout/KoTextShapeContainerModel.h
+++ b/libs/textlayout/KoTextShapeContainerModel.h
@@ -22,7 +22,7 @@
 #include <KoShapeContainerModel.h>
 #include <KoShapeContainer.h>
 
-#include "textlayout_export.h"
+#include "kotextlayout_export.h"
 
 class KoShapeAnchor;
 
@@ -31,7 +31,7 @@ class KoShapeAnchor;
  * All anchored frames are children of the text shape, and they get positioned
  * by the text layouter.
  */
-class TEXTLAYOUT_EXPORT KoTextShapeContainerModel : public KoShapeContainerModel
+class KOTEXTLAYOUT_EXPORT KoTextShapeContainerModel : public KoShapeContainerModel
 {
 public:
     /// constructor
diff --git a/libs/textlayout/KoTextShapeData.h b/libs/textlayout/KoTextShapeData.h
index c2a1c30..00e1682 100644
--- a/libs/textlayout/KoTextShapeData.h
+++ b/libs/textlayout/KoTextShapeData.h
@@ -21,7 +21,7 @@
 #define KOTEXTSHAPEDATA_H
 
 #include "KoText.h"
-#include "textlayout_export.h"
+#include "kotextlayout_export.h"
 
 #include <KoTextShapeDataBase.h>
 #include <KoInsets.h>
@@ -46,7 +46,7 @@ class KoTextLayoutRootArea;
  * multiple instances of this shape data) can share one QTextDocument by providing a
  * different view on (a different part of) the QTextDocument.
  */
-class TEXTLAYOUT_EXPORT KoTextShapeData : public KoTextShapeDataBase
+class KOTEXTLAYOUT_EXPORT KoTextShapeData : public KoTextShapeDataBase
 {
     Q_OBJECT
 public:
diff --git a/libs/textlayout/ListItemsHelper.h b/libs/textlayout/ListItemsHelper.h
index f133c3c..4d64394 100644
--- a/libs/textlayout/ListItemsHelper.h
+++ b/libs/textlayout/ListItemsHelper.h
@@ -20,7 +20,7 @@
 #ifndef LISTITEMSHELPER_H
 #define LISTITEMSHELPER_H
 
-#include "textlayout_export.h"
+#include "kotextlayout_export.h"
 
 #include <KoListStyle.h>
 
@@ -41,16 +41,16 @@ struct ListStyleItem {
     QString name;
 };
 
-TEXTLAYOUT_EXPORT QString intToRoman(int n);
-TEXTLAYOUT_EXPORT QString intToAlpha(int n, Capitalisation caps, bool \
                letterSynchronization);
-TEXTLAYOUT_EXPORT QString intToScript(int n, KoListStyle::Style type);
-TEXTLAYOUT_EXPORT QString intToScriptList(int n, KoListStyle::Style type);
-TEXTLAYOUT_EXPORT QString intToNumberingStyle(int index, KoListStyle::Style \
listStyle, bool letterSynchronizations); +KOTEXTLAYOUT_EXPORT QString intToRoman(int \
n); +KOTEXTLAYOUT_EXPORT QString intToAlpha(int n, Capitalisation caps, bool \
letterSynchronization); +KOTEXTLAYOUT_EXPORT QString intToScript(int n, \
KoListStyle::Style type); +KOTEXTLAYOUT_EXPORT QString intToScriptList(int n, \
KoListStyle::Style type); +KOTEXTLAYOUT_EXPORT QString intToNumberingStyle(int index, \
KoListStyle::Style listStyle, bool letterSynchronizations);  
 /// return international list items (bullets/arabic/roman)
-TEXTLAYOUT_EXPORT QList<ListStyleItem> genericListStyleItems();
+KOTEXTLAYOUT_EXPORT QList<ListStyleItem> genericListStyleItems();
 /// return non-latin list items (bullets/arabic/roman)
-TEXTLAYOUT_EXPORT QList<ListStyleItem> otherListStyleItems(); // we may want to \
split this method up into different world regions. +KOTEXTLAYOUT_EXPORT \
QList<ListStyleItem> otherListStyleItems(); // we may want to split this method up \
into different world regions.  }
 
 /// \internal helper class for calculating text-lists prefixes and indents
diff --git a/libs/textlayout/textlayout_export.h \
b/libs/textlayout/kotextlayout_export.h similarity index 71%
rename from libs/textlayout/textlayout_export.h
rename to libs/textlayout/kotextlayout_export.h
index 807f69c..1a6b4eb 100644
--- a/libs/textlayout/textlayout_export.h
+++ b/libs/textlayout/kotextlayout_export.h
@@ -17,8 +17,8 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef TEXTLAYOUT_EXPORT_H
-#define TEXTLAYOUT_EXPORT_H
+#ifndef KOTEXTLAYOUT_EXPORT_H
+#define KOTEXTLAYOUT_EXPORT_H
 
 /* needed for KDE_EXPORT and KDE_IMPORT macros */
 #include <kdemacros.h>
@@ -26,36 +26,36 @@
 /* We use _WIN32/_WIN64 instead of Q_OS_WIN so that this header can be used from C \
files too */  #if defined _WIN32 || defined _WIN64
 
-#ifndef TEXTLAYOUT_EXPORT
-# if defined(MAKE_TEXTLAYOUT_LIB)
+#ifndef KOTEXTLAYOUT_EXPORT
+# if defined(MAKE_KOTEXTLAYOUT_LIB)
 /* We are building this library */
-#  define TEXTLAYOUT_EXPORT KDE_EXPORT
+#  define KOTEXTLAYOUT_EXPORT KDE_EXPORT
 # else
 /* We are using this library */
-#  define TEXTLAYOUT_EXPORT KDE_IMPORT
+#  define KOTEXTLAYOUT_EXPORT KDE_IMPORT
 # endif
 #endif
 
 #else /* UNIX */
 
-#define TEXTLAYOUT_EXPORT KDE_EXPORT
+#define KOTEXTLAYOUT_EXPORT KDE_EXPORT
 
 #endif
 
-/* Now the same for TEXTLAYOUT_TEST_EXPORT, if compiling with unit tests enabled */
+/* Now the same for KOTEXTLAYOUT_TEST_EXPORT, if compiling with unit tests enabled \
*/  
 #ifdef COMPILING_TESTS
 #if defined _WIN32 || defined _WIN64
-# if defined(MAKE_TEXTLAYOUT_LIB)
-#       define TEXTLAYOUT_TEST_EXPORT KDE_EXPORT
+# if defined(MAKE_KOTEXTLAYOUT_LIB)
+#       define KOTEXTLAYOUT_TEST_EXPORT KDE_EXPORT
 #   else
-#       define TEXTLAYOUT_TEST_EXPORT KDE_IMPORT
+#       define KOTEXTLAYOUT_TEST_EXPORT KDE_IMPORT
 #   endif
 # else /* not windows */
-#   define TEXTLAYOUT_TEST_EXPORT KDE_EXPORT
+#   define KOTEXTLAYOUT_TEST_EXPORT KDE_EXPORT
 # endif
 #else /* not compiling tests */
-#   define TEXTLAYOUT_TEST_EXPORT
+#   define KOTEXTLAYOUT_TEST_EXPORT
 #endif
 
 #endif
diff --git a/libs/vectorimage/vectorimage_export.h \
b/libs/vectorimage/kovectorimage_export.h similarity index 80%
rename from libs/vectorimage/vectorimage_export.h
rename to libs/vectorimage/kovectorimage_export.h
index 8de56d8..a2c1d55 100644
--- a/libs/vectorimage/vectorimage_export.h
+++ b/libs/vectorimage/kovectorimage_export.h
@@ -19,27 +19,27 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-#ifndef VECTORIMAGE_EXPORT_H
-#define VECTORIMAGE_EXPORT_H
+#ifndef KOVECTORIMAGE_EXPORT_H
+#define KOVECTORIMAGE_EXPORT_H
 
 #include <kdemacros.h>
 
 /* We use _WIN32/_WIN64 instead of Q_OS_WIN so that this header can be used from C \
files too */  #if defined _WIN32 || defined _WIN64
 
-# ifndef VECTORIMAGE_EXPORT
+# ifndef KOVECTORIMAGE_EXPORT
 #  if defined(KDELIBS_STATIC_LIBS)
    /* No export/import for static libraries */
-#   define VECTORIMAGE_EXPORT
-#  elif defined(MAKE_VECTORIMAGE_LIB)
-#   define VECTORIMAGE_EXPORT KDE_EXPORT
+#   define KOVECTORIMAGE_EXPORT
+#  elif defined(MAKE_KOVECTORIMAGE_LIB)
+#   define KOVECTORIMAGE_EXPORT KDE_EXPORT
 #  else
-#   define VECTORIMAGE_EXPORT KDE_IMPORT
+#   define KOVECTORIMAGE_EXPORT KDE_IMPORT
 #  endif
 # endif
 #else /* UNIX */
 
-#define VECTORIMAGE_EXPORT KDE_EXPORT
+#define KOVECTORIMAGE_EXPORT KDE_EXPORT
 
 #endif
 
diff --git a/libs/vectorimage/libemf/EmfOutput.h \
b/libs/vectorimage/libemf/EmfOutput.h index 57592d9..490e0e4 100644
--- a/libs/vectorimage/libemf/EmfOutput.h
+++ b/libs/vectorimage/libemf/EmfOutput.h
@@ -19,7 +19,7 @@
 #ifndef EMFOUTPUT_H
 #define EMFOUTPUT_H
 
-#include "vectorimage_export.h"
+#include "kovectorimage_export.h"
 
 #include <QList>
 #include <QPainter>
@@ -46,7 +46,7 @@ namespace Libemf
 /**
     Abstract output strategy for EMF Parser
 */
-class VECTORIMAGE_EXPORT AbstractOutput
+class KOVECTORIMAGE_EXPORT AbstractOutput
 {
 public:
     AbstractOutput() {};
diff --git a/libs/vectorimage/libemf/EmfOutputDebugStrategy.h \
b/libs/vectorimage/libemf/EmfOutputDebugStrategy.h index e4cc24a..8e2747d 100644
--- a/libs/vectorimage/libemf/EmfOutputDebugStrategy.h
+++ b/libs/vectorimage/libemf/EmfOutputDebugStrategy.h
@@ -19,7 +19,7 @@
 #ifndef EMFOUTPUTDEBUGSTRATEGY_H
 #define EMFOUTPUTDEBUGSTRATEGY_H
 
-#include "vectorimage_export.h"
+#include "kovectorimage_export.h"
 
 #include <QList>
 #include <QPainter>
@@ -48,7 +48,7 @@ namespace Libemf
 /**
     Debug (text dump) output strategy for EMF Parser
 */
-class VECTORIMAGE_EXPORT OutputDebugStrategy : public AbstractOutput
+class KOVECTORIMAGE_EXPORT OutputDebugStrategy : public AbstractOutput
 {
 public:
     OutputDebugStrategy();
diff --git a/libs/vectorimage/libemf/EmfOutputPainterStrategy.h \
b/libs/vectorimage/libemf/EmfOutputPainterStrategy.h index 712cd55..773320d 100644
--- a/libs/vectorimage/libemf/EmfOutputPainterStrategy.h
+++ b/libs/vectorimage/libemf/EmfOutputPainterStrategy.h
@@ -19,7 +19,7 @@
 #ifndef EMFOUTPUTPAINTERSTRATEGY_H
 #define EMFOUTPUTPAINTERSTRATEGY_H
 
-#include "vectorimage_export.h"
+#include "kovectorimage_export.h"
 
 #include <QList>
 #include <QPainter>
@@ -52,7 +52,7 @@ class EmrTextObject;
 
     This class allows rendering of an EMF file to a QPixmap or any other \
                QPaintDevice.
 */
-class VECTORIMAGE_EXPORT OutputPainterStrategy : public AbstractOutput
+class KOVECTORIMAGE_EXPORT OutputPainterStrategy : public AbstractOutput
 {
 public:
     /**
diff --git a/libs/vectorimage/libemf/EmfParser.h \
b/libs/vectorimage/libemf/EmfParser.h index 25989b6..807253a 100644
--- a/libs/vectorimage/libemf/EmfParser.h
+++ b/libs/vectorimage/libemf/EmfParser.h
@@ -19,7 +19,7 @@
 #ifndef EMFPARSER_H
 #define EMFPARSER_H
 
-#include "vectorimage_export.h"
+#include "kovectorimage_export.h"
 
 #include "EmfOutput.h"
 
@@ -41,7 +41,7 @@ namespace Libemf
 /**
     %Parser for an EMF format file
  */
-class VECTORIMAGE_EXPORT Parser
+class KOVECTORIMAGE_EXPORT Parser
 {
 public:
     Parser();
diff --git a/libs/vectorimage/libsvm/SvmAbstractBackend.h \
b/libs/vectorimage/libsvm/SvmAbstractBackend.h index 38c9616..e2b2e85 100644
--- a/libs/vectorimage/libsvm/SvmAbstractBackend.h
+++ b/libs/vectorimage/libsvm/SvmAbstractBackend.h
@@ -18,7 +18,7 @@
 #ifndef SVMABSTRACTBACKEND_H
 #define SVMABSTRACTBACKEND_H
 
-#include "vectorimage_export.h"
+#include "kovectorimage_export.h"
 
 #include "SvmEnums.h"
 #include "SvmStructs.h"
@@ -46,7 +46,7 @@ namespace Libsvm
 /**
     Abstract output strategy for SVM Parser
 */
-class VECTORIMAGE_EXPORT SvmAbstractBackend
+class KOVECTORIMAGE_EXPORT SvmAbstractBackend
 {
 public:
     SvmAbstractBackend() {};
diff --git a/libs/vectorimage/libsvm/SvmPainterBackend.h \
b/libs/vectorimage/libsvm/SvmPainterBackend.h index 4004017..33b274a 100644
--- a/libs/vectorimage/libsvm/SvmPainterBackend.h
+++ b/libs/vectorimage/libsvm/SvmPainterBackend.h
@@ -19,7 +19,7 @@
 #define SVMPAINTERBACKEND_H
 
 #include "SvmAbstractBackend.h"
-#include "vectorimage_export.h"
+#include "kovectorimage_export.h"
 
 #include <QSize>
 #include <QTransform>
@@ -48,7 +48,7 @@ namespace Libsvm
 /**
     Painter output strategy for SVM Parser
 */
-class VECTORIMAGE_EXPORT SvmPainterBackend : public SvmAbstractBackend
+class KOVECTORIMAGE_EXPORT SvmPainterBackend : public SvmAbstractBackend
 {
 public:
     SvmPainterBackend(QPainter *painter, const QSize &outputSize);
diff --git a/libs/vectorimage/libsvm/SvmParser.h \
b/libs/vectorimage/libsvm/SvmParser.h index 6e95e07..e393364 100644
--- a/libs/vectorimage/libsvm/SvmParser.h
+++ b/libs/vectorimage/libsvm/SvmParser.h
@@ -22,7 +22,7 @@
 
 #include "SvmGraphicsContext.h"
 #include "SvmAbstractBackend.h"
-#include "vectorimage_export.h"
+#include "kovectorimage_export.h"
 
 class QByteArray;
 class QDataStream;
@@ -32,7 +32,7 @@ namespace Libsvm
 {
 
 
-class VECTORIMAGE_EXPORT SvmParser
+class KOVECTORIMAGE_EXPORT SvmParser
 {
  public:
     SvmParser();
diff --git a/libs/vectorimage/libwmf/WmfAbstractBackend.h \
b/libs/vectorimage/libwmf/WmfAbstractBackend.h index 653bd1d..96a1295 100644
--- a/libs/vectorimage/libwmf/WmfAbstractBackend.h
+++ b/libs/vectorimage/libwmf/WmfAbstractBackend.h
@@ -21,7 +21,7 @@
 #ifndef _WMFABSTRACTBACKEND_H_
 #define _WMFABSTRACTBACKEND_H_
 
-#include "vectorimage_export.h"
+#include "kovectorimage_export.h"
 
 #include <QRect>
 #include <QRegion>
@@ -57,7 +57,7 @@ class WmfDeviceContext;
  *
  */
 
-class VECTORIMAGE_EXPORT WmfAbstractBackend
+class KOVECTORIMAGE_EXPORT WmfAbstractBackend
 {
 public:
     WmfAbstractBackend();
diff --git a/libs/vectorimage/libwmf/WmfPainterBackend.h \
b/libs/vectorimage/libwmf/WmfPainterBackend.h index 4c896c6..9efbfbe 100644
--- a/libs/vectorimage/libwmf/WmfPainterBackend.h
+++ b/libs/vectorimage/libwmf/WmfPainterBackend.h
@@ -20,7 +20,7 @@
 #ifndef _WMFPAINTERBACKEND_H_
 #define _WMFPAINTERPACKEND_H_
 
-#include "vectorimage_export.h"
+#include "kovectorimage_export.h"
 #include "WmfAbstractBackend.h"
 
 #include <QPainter>
@@ -55,7 +55,7 @@ class WmfDeviceContext;
  *
  */
 
-class VECTORIMAGE_EXPORT WmfPainterBackend : public WmfAbstractBackend
+class KOVECTORIMAGE_EXPORT WmfPainterBackend : public WmfAbstractBackend
 {
 public:
     WmfPainterBackend(QPainter *painter, const QSizeF &outputSize);
diff --git a/libs/vectorimage/libwmf/WmfWriter.h \
b/libs/vectorimage/libwmf/WmfWriter.h index 1e546e1..9d17f49 100644
--- a/libs/vectorimage/libwmf/WmfWriter.h
+++ b/libs/vectorimage/libwmf/WmfWriter.h
@@ -20,7 +20,7 @@
 #ifndef _WMFWRITER_H_
 #define _WMFWRITER_H_
 
-#include "vectorimage_export.h"
+#include "kovectorimage_export.h"
 
 #include <QPainter>
 
@@ -53,7 +53,7 @@ class WmfWriterPrivate;
  *   wmf.end();
  *   </pre>
  */
-class VECTORIMAGE_EXPORT WmfWriter
+class KOVECTORIMAGE_EXPORT WmfWriter
 {
 public:
     explicit WmfWriter(const QString& fileName);
diff --git a/libs/vectorimage/libwmf/kwmf.h b/libs/vectorimage/libwmf/kwmf.h
index d2cf578..aab4c91 100644
--- a/libs/vectorimage/libwmf/kwmf.h
+++ b/libs/vectorimage/libwmf/kwmf.h
@@ -30,7 +30,7 @@ DESCRIPTION
 #ifndef KWMF_H
 #define KWMF_H
 
-#include <vectorimage_export.h>
+#include <kovectorimage_export.h>
 
 #include <QLinkedList>
 #include <QList>
@@ -40,7 +40,7 @@ DESCRIPTION
 class QDataStream;
 class QPolygon;
 
-class VECTORIMAGE_EXPORT KWmf
+class KOVECTORIMAGE_EXPORT KWmf
 {
 public:
 
@@ -58,7 +58,7 @@ public:
         QDataStream &stream,
         unsigned size);
 
-    class VECTORIMAGE_EXPORT DrawContext
+    class KOVECTORIMAGE_EXPORT DrawContext
     {
     public:
         DrawContext();


[prev in list] [next in list] [prev in thread] [next in thread]