right paths in include statements

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@58832 954022d7-b5bf-4e40-9824-e11837661b57

ASCHTMLRenderer/CASCSVGRenderer.h

@@ -7,7 +7,7 @@
 #include <atlbase.h>
 #include <atlstr.h>
 #else
-#include "../../Common/DocxFormat/Source/Base/ASCString.h"
+#include "../Common/DocxFormat/Source/Base/ASCString.h"
 #endif
 
 namespace Aggplus
@@ -232,4 +232,4 @@ namespace NSHtmlRenderer
 		void _SetFont();
 	};
 }
-#endif
\ No newline at end of file
+#endif

ASCOfficePPTXFile/ASCOfficeDrawingConverter.cpp

-#include "stdafx.h"
+//#include "stdafx.h"
 #include "ASCOfficeDrawingConverter.h"
 
 #include "./PPTXFormat/Logic/SpTreeElem.h"
@@ -3898,4 +3898,4 @@ void CDrawingConverter::SetFontManager(CFontManager* pFontManager)
 {
 	if(NULL != m_pBinaryWriter && NULL != m_pBinaryWriter->m_pCommon && NULL != m_pBinaryWriter->m_pCommon->m_pImageManager)
 		m_pBinaryWriter->m_pCommon->m_pImageManager->SetFontManager(pFontManager);
-}
\ No newline at end of file
+}

ASCOfficePPTXFile/ASCOfficeDrawingConverter.h

@@ -2,8 +2,10 @@
 #define ASC_OFFICE_DRAWING_CONVERTER
 
 //todo ??
+#ifdef _WIN32
 #include <atlbase.h>
 #include <atlstr.h>
+#endif
 #include "../Common/DocxFormat/Source/Base/Base.h"
 #include "../ASCPresentationEditor/OfficeDrawing/Shapes/BaseShape/PPTShape/PPTShapeEnum.h"
 
@@ -222,4 +224,4 @@ namespace NSBinPptxRW
 		HRESULT SetCurrentRelsPath();
 	};
 }
-#endif //OOX_IFILE_CONTAINER_INCLUDE_H_
\ No newline at end of file
+#endif //OOX_IFILE_CONTAINER_INCLUDE_H_

ASCOfficePPTXFile/Editor/imagemanager.h

@@ -10,7 +10,7 @@ using namespace NSFontCutter;
 #define AVSINLINE __forceinline
 #endif
 
-#include "../../ASCPresentationEditor/PPTXWriter/FileDownloader.h"
+//#include "../../ASCPresentationEditor/PPTXWriter/FileDownloader.h"
 #include "WMFToImageConverter.h"
 #include "../../Common/MediaFormatDefine.h"
 #include "../../DesktopEditor/raster/ImageFileFormatChecker.h"

ASCOfficePPTXFile/PPTXFormat/Limit/SlideLayoutType.h

@@ -22,7 +22,7 @@ namespace PPTX
 				
 			virtual void set(const CString& strValue)
 			{
-				if ((_T("blank") == strValue) ||
+                if ((strValue == _T("blank")) ||
 					(_T("chart") == strValue) ||
 					(_T("chartAndTx") == strValue) ||
 					(_T("clipArtAndTx") == strValue) ||
@@ -107,4 +107,4 @@ namespace PPTX
 	} // namespace Limit
 } // namespace PPTX
 
-#endif // PPTX_LIMIT_SLIDELAYOUTTYPE_INCLUDE_H_
\ No newline at end of file
+#endif // PPTX_LIMIT_SLIDELAYOUTTYPE_INCLUDE_H_

ASCOfficePPTXFile/PPTXLib/Linux/PPTXFormatLib/PPTXFormatLib.pro.user

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 3.1.1, 2014-10-10T14:24:07. -->
+<!-- Written by QtCreator 3.1.1, 2014-10-10T19:44:34. -->
 <qtcreator>
  <data>
   <variable>ProjectExplorer.Project.ActiveTarget</variable>
@@ -228,7 +228,7 @@
      <value type="int">13</value>
      <value type="int">14</value>
     </valuelist>
-    <value type="int" key="PE.EnvironmentAspect.Base">-1</value>
+    <value type="int" key="PE.EnvironmentAspect.Base">2</value>
     <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
     <value type="QString" key="ProjectExplorer.CustomExecutableRunConfiguration.Arguments"></value>
     <value type="QString" key="ProjectExplorer.CustomExecutableRunConfiguration.Executable"></value>

ASCPresentationEditor/OfficeDrawing/Attributes.h

 #pragma once
 
+#ifdef _WIN32
 #include <atlcoll.h>
+#include "Gdiplus.h"
+#endif
+
 #include "Metric.h"
 #include "Effects.h"
-#include "../../Common/DocxFormat/Source/XML/XmlUtils.h"
+#include "../../Common/DocxFormat/Source/XML/xmlutils.h"
 #include "../../Common/ASCUtils.h"
 #include "XmlWriter.h"
 
-#include "Gdiplus.h"
 
-#include "../../desktopeditor/graphics/IRenderer.h"
-#include "../../desktopeditor/graphics/structures.h"
+
+#include "../../DesktopEditor/graphics/IRenderer.h"
+#include "../../DesktopEditor/graphics/structures.h"
 
 namespace NSPresentationEditor
 {
@@ -1253,4 +1257,4 @@ namespace NSPresentationEditor
 			resToken = strSource.Tokenize(strDelimeters, curPos);
 		};
 	}
-}
\ No newline at end of file
+}

ASCPresentationEditor/OfficeDrawing/Elements.h

 #pragma once
 #include "Theme.h"
-#include "Shapes\Shape.h"
+#include "Shapes/Shape.h"
 #include "../../ASCHTMLRenderer/CASCSVGRenderer.h"
 
 #ifdef _PRESENTATION_WRITER_
@@ -1896,4 +1896,4 @@ namespace NSStrings
 			CTextItem::WriteString(oWriter.m_pData, oWriter.m_lSizeCur);
 		}
 	};
-}
\ No newline at end of file
+}

ASCPresentationEditor/OfficeDrawing/Shapes/BaseShape/Common.h

 #pragma once
 //todo  include
+
+#include "../../../../DesktopEditor/graphics/GraphicsPath.h"
+
+#ifdef _WIN32
 #include <atlbase.h>
 #include <atlcom.h>
 #include "../../../../Common/atldefine.h"
-#include "../../../../DesktopEditor/graphics/GraphicsPath.h"
+#endif
 
 const double ShapeSize		= 43200.0;
 const LONG ShapeSizeVML		= 21600;
@@ -866,4 +870,4 @@ private:
 	}	
 };
 
-#endif
\ No newline at end of file
+#endif

ASCPresentationEditor/OfficeDrawing/Shapes/BaseShape/GraphicsPath.h

 #pragma once
 #include "../../../../DesktopEditor/graphics/GraphicsPath.h"
 
-#include "..\..\Metric.h"
-#include "..\..\Attributes.h"
+#include "../../Metric.h"
+#include "../../Attributes.h"
 
 namespace NSPresentationEditor
 {
@@ -862,4 +862,4 @@ namespace NSPresentationEditor
 		CPen	Pen;
 		CBrush	Brush;
 	};
-}
\ No newline at end of file
+}

ASCPresentationEditor/OfficeDrawing/TextStructures.h

@@ -4,6 +4,7 @@
 
 namespace NSPresentationEditor
 {
+
 	#define DEFAULT_BEFORE(EXIST_PARAM, PARAM)  \
 	if (!EXIST_PARAM && oSrc.##EXIST_PARAM)     \
 	{										    \
@@ -1049,11 +1050,41 @@ namespace NSPresentationEditor
 		
 		void ApplyBefore(const CTextSIRun& oSrc)
 		{
-			DEFAULT_BEFORE(bSpell, Spell);
-			DEFAULT_BEFORE(bLang, Lang);
-			DEFAULT_BEFORE(bAltLang, AltLang);
-			DEFAULT_BEFORE(bBidi, Bidi);
-			DEFAULT_BEFORE(bPp10ext, pp10runid);
+            /*
+             * gcc 4.8 doesn't understand this construction:
+             *
+                        DEFAULT_BEFORE(bSpell, Spell);
+                        DEFAULT_BEFORE(bLang, Lang);
+                        DEFAULT_BEFORE(bAltLang, AltLang);
+                        DEFAULT_BEFORE(bBidi, Bidi);
+                        DEFAULT_BEFORE(bPp10ext, pp10runid);
+            */
+            if (!bSpell && oSrc.bSpell)
+            {
+                bSpell = true;
+                Spell = oSrc.Spell;
+            }
+            if (!bLang && oSrc.bLang)
+            {
+                bLang = true;
+                Lang = oSrc.Lang;
+            }
+            if (!bAltLang && oSrc.bAltLang)
+            {
+                bAltLang = true;
+                AltLang = oSrc.AltLang;
+            }
+            if (!bBidi && oSrc.bBidi)
+            {
+                bBidi = true;
+                Bidi = oSrc.Bidi;
+            }
+            if (!bPp10ext && oSrc.bPp10ext)
+            {
+                bPp10ext = true;
+                pp10runid = oSrc.pp10runid;
+            }
+
 
 			if (!bGramma)
 			{
@@ -1554,4 +1585,4 @@ namespace NSPresentationEditor
 			return true;
 		}
 	};
-}
\ No newline at end of file
+}

Common/DocxFormat/DocxFormatLib/DocxFormatLib.pro

@@ -9,7 +9,7 @@ QT       -= core gui
 TARGET = DocxFormatLib
 TEMPLATE = lib
 CONFIG += staticlib
-QMAKE_CXXFLAGS += -std=c++11 -Wall -Wno-ignored-qualifiers
+QMAKE_CXXFLAGS += -std=c++11 -Wall -Wno-ignored-qualifiers -g
 
 DEFINES += UNICODE _UNICODE _USE_LIBXML2_READER_ _LINUX_QT _USE_XMLLITE_READER_
 

Common/DocxFormat/DocxFormatLib/DocxFormatLib.pro.user

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 3.1.1, 2014-10-01T19:43:27. -->
+<!-- Written by QtCreator 3.1.1, 2014-10-10T19:44:34. -->
 <qtcreator>
  <data>
   <variable>ProjectExplorer.Project.ActiveTarget</variable>
@@ -57,7 +57,7 @@
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 5.3.0 GCC 32bit</value>
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 5.3.0 GCC 32bit</value>
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.53.gcc_kit</value>
-   <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">1</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
    <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
    <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">

Common/DocxFormat/Source/Base/ASCString.h

@@ -45,6 +45,8 @@ static bool caseInsensitiveStringCompare(const std::wstring& str1, const std::ws
     }
     return true;
 }
+
+/*
 static std::wstring stringUtf16ToWString (const UTF16 *pStr, uint32_t nLength)
 {
 #ifdef _WIN32
@@ -77,6 +79,7 @@ static std::wstring stringUtf16ToWString (const UTF16 *pStr, uint32_t nLength)
             return wsEntryName;
 #endif
 }
+*/
 
 static std::string stringWstingToUtf8String (const std::wstring& aaSrc)
 {

Common/DocxFormat/Source/SystemUtility/SystemUtility.cpp

@@ -68,6 +68,7 @@ namespace OOX
         return *this;
     }
 
+    /*
 	AVSINLINE CString CPath::GetExtention(bool bIsPoint) const
     {
         int nFind = m_strFilename.ReverseFind('.');
@@ -79,6 +80,8 @@ namespace OOX
 
         return m_strFilename.Mid(nFind);
     }
+    */
+    /*
     AVSINLINE CString CPath::GetDirectory(bool bIsSlash) const
     {
         int nPos = m_strFilename.ReverseFind('\\');
@@ -93,10 +96,13 @@ namespace OOX
             return m_strFilename.Mid(0, nPos);
         }
     }
+    */
+    /*
     AVSINLINE CString CPath::GetPath() const
     {
         return m_strFilename;
     }
+    */
 }
 
 namespace OOX

Common/DocxFormat/Source/SystemUtility/SystemUtility.h

@@ -56,9 +56,35 @@ namespace OOX
 			return path;
 		}
 
-		AVSINLINE CString GetExtention(bool bIsPoint = true) const;
-		AVSINLINE CString GetDirectory(bool bIsSlash = true) const;
-        AVSINLINE CString GetPath() const;
+        AVSINLINE CString GetExtention(bool bIsPoint = true) const
+        {
+            int nFind = m_strFilename.ReverseFind('.');
+            if (-1 == nFind)
+                return _T("");
+
+            if (!bIsPoint)
+                ++nFind;
+
+            return m_strFilename.Mid(nFind);
+        }
+        AVSINLINE CString GetDirectory(bool bIsSlash = true) const
+        {
+                int nPos = m_strFilename.ReverseFind('\\');
+                if (-1 == nPos)
+                {
+                    return m_strFilename;
+                }
+                else
+                {
+                    if (bIsSlash)
+                        ++nPos;
+                    return m_strFilename.Mid(0, nPos);
+                }
+        }
+        AVSINLINE CString GetPath() const
+        {
+            return m_strFilename;
+        }
         AVSINLINE CString GetFilename() const
 		{
 			int nPos = m_strFilename.ReverseFind('\\');