fix color alpha

* 'develop' of https://github.com/ONLYOFFICE/core:
  pivotButton; AddNoWrite defDir
  OdfFormat - fix after testing
  save pivotTables to xlsx
  windows sign (worked version)
  .

ASCOfficeOdfFileW/source/Oox2OdfConverter/ConvertDrawing.cpp

@@ -918,7 +918,7 @@ void OoxConverter::convert(PPTX::Logic::UniColor * color, std::wstring & hexStri
 
 		if ((nARGB >> 24) != 0xff)
 		{
-			opacity = ((nARGB >> 24) /255.) * 100.;
+			opacity = 100 - ((nARGB >> 24) /255.) * 100.;
 		}
 	}
 	else 

ASCOfficePPTXFile/PPTXFormat/Logic/Colors/ColorModifier.h

@@ -53,12 +53,14 @@ namespace PPTX
 			{
 				name = oReader.GetName();
 
-				ReadAttributes( oReader );
-
 				if (XmlUtils::GetNameNoNS(name) == _T("alpha"))
 				{
 					ReadAttributes2( oReader );
 				}
+				else
+				{
+					ReadAttributes( oReader );
+				}
 			}
 			void ReadAttributes2(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -67,8 +69,14 @@ namespace PPTX
 					WritingElement_ReadAttributes_ReadSingle ( oReader, _T("val"), sTmp)
 				WritingElement_ReadAttributes_End( oReader )
 
-                if (val.is_init() && sTmp.is_init() && sTmp->find(wchar_t('%')) != -1)
-					*val = (*val) * 1000; 
+				if (sTmp.is_init())
+				{
+					val = sTmp.get();
+					if (val.is_init() && std::wstring::npos != sTmp->find(L"%"))
+					{
+						*val = (*val) * 1000; 
+					}
+				}
 			}
 			void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
 			{
@@ -86,7 +94,7 @@ namespace PPTX
 					nullable_string sTmp;
 					node.ReadAttributeBase(L"val", sTmp);
 
-                    if (val.is_init() && sTmp.is_init() && sTmp->find(wchar_t('%')) != -1)
+                    if (val.is_init() && sTmp.is_init() && std::wstring::npos != sTmp->find(L"%"))
 						*val = (*val) * 1000;
 				}
 			}

ASCOfficePPTXFile/PPTXLib/Mac/PPTXFormatLib.xcodeproj/project.pbxproj

@@ -26,10 +26,8 @@
 		17C1FCBE1ACC429D006B99B3 /* EffectProperties.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 179A443D1AC57B83005A27F7 /* EffectProperties.cpp */; };
 		17C1FCBF1ACC429D006B99B3 /* EffectLst.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 179A443B1AC57B83005A27F7 /* EffectLst.cpp */; };
 		17C1FCC11ACC429D006B99B3 /* FileMap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 179A43A31AC57B83005A27F7 /* FileMap.cpp */; };
-		17C1FCC21ACC429D006B99B3 /* ShapeTextProperties.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 179A44AC1AC57B83005A27F7 /* ShapeTextProperties.cpp */; };
 		17C1FCC31ACC429D006B99B3 /* TransitionBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 179A45051AC57B83005A27F7 /* TransitionBase.cpp */; };
 		17C1FCC51ACC429D006B99B3 /* Shape.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 179A44A71AC57B83005A27F7 /* Shape.cpp */; };
-		17C1FCC61ACC429D006B99B3 /* ShapeProperties.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 179A44A91AC57B83005A27F7 /* ShapeProperties.cpp */; };
 		17C1FCC71ACC429D006B99B3 /* BuildNodeBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 179A44DE1AC57B83005A27F7 /* BuildNodeBase.cpp */; };
 		17C1FCC81ACC429D006B99B3 /* ContentPart.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 179A44311AC57B83005A27F7 /* ContentPart.cpp */; };
 		17C1FCC91ACC429D006B99B3 /* CNvGrpSpPr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 179A44241AC57B83005A27F7 /* CNvGrpSpPr.cpp */; };
@@ -306,7 +304,6 @@
 		17C1FDFE1ACC429D006B99B3 /* XfrmEffect.h in Headers */ = {isa = PBXBuildFile; fileRef = 179A445C1AC57B83005A27F7 /* XfrmEffect.h */; };
 		17C1FDFF1ACC429D006B99B3 /* ChartBuildType.h in Headers */ = {isa = PBXBuildFile; fileRef = 179A43B51AC57B83005A27F7 /* ChartBuildType.h */; };
 		17C1FE001ACC429D006B99B3 /* SndAc.h in Headers */ = {isa = PBXBuildFile; fileRef = 179A45011AC57B83005A27F7 /* SndAc.h */; };
-		17C1FE011ACC429D006B99B3 /* ShapeProperties.h in Headers */ = {isa = PBXBuildFile; fileRef = 179A44AA1AC57B83005A27F7 /* ShapeProperties.h */; };
 		17C1FE021ACC429D006B99B3 /* AlphaModFix.h in Headers */ = {isa = PBXBuildFile; fileRef = 179A44451AC57B83005A27F7 /* AlphaModFix.h */; };
 		17C1FE041ACC429D006B99B3 /* Duotone.h in Headers */ = {isa = PBXBuildFile; fileRef = 179A444D1AC57B83005A27F7 /* Duotone.h */; };
 		17C1FE061ACC429D006B99B3 /* ColorBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 179A442A1AC57B83005A27F7 /* ColorBase.h */; };
@@ -396,7 +393,6 @@
 		17C1FE601ACC429D006B99B3 /* Set.h in Headers */ = {isa = PBXBuildFile; fileRef = 179A44EB1AC57B83005A27F7 /* Set.h */; };
 		17C1FE611ACC429D006B99B3 /* ShapeStyle.h in Headers */ = {isa = PBXBuildFile; fileRef = 179A44AB1AC57B83005A27F7 /* ShapeStyle.h */; };
 		17C1FE621ACC429D006B99B3 /* BaseLimit.h in Headers */ = {isa = PBXBuildFile; fileRef = 179A43AE1AC57B83005A27F7 /* BaseLimit.h */; };
-		17C1FE631ACC429D006B99B3 /* ShapeTextProperties.h in Headers */ = {isa = PBXBuildFile; fileRef = 179A44AD1AC57B83005A27F7 /* ShapeTextProperties.h */; };
 		17C1FE641ACC429D006B99B3 /* BinReaderWriterDefines.h in Headers */ = {isa = PBXBuildFile; fileRef = 17D91A171AC5A4DF0096D788 /* BinReaderWriterDefines.h */; };
 		17C1FE651ACC429D006B99B3 /* ClrMapOvr.h in Headers */ = {isa = PBXBuildFile; fileRef = 179A44211AC57B83005A27F7 /* ClrMapOvr.h */; };
 		17C1FE661ACC429D006B99B3 /* Glow.h in Headers */ = {isa = PBXBuildFile; fileRef = 179A44511AC57B83005A27F7 /* Glow.h */; };
@@ -705,11 +701,7 @@
 		179A44A61AC57B83005A27F7 /* Scene3d.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Scene3d.h; sourceTree = "<group>"; };
 		179A44A71AC57B83005A27F7 /* Shape.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Shape.cpp; sourceTree = "<group>"; };
 		179A44A81AC57B83005A27F7 /* Shape.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Shape.h; sourceTree = "<group>"; };
-		179A44A91AC57B83005A27F7 /* ShapeProperties.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ShapeProperties.cpp; sourceTree = "<group>"; };
-		179A44AA1AC57B83005A27F7 /* ShapeProperties.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShapeProperties.h; sourceTree = "<group>"; };
 		179A44AB1AC57B83005A27F7 /* ShapeStyle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShapeStyle.h; sourceTree = "<group>"; };
-		179A44AC1AC57B83005A27F7 /* ShapeTextProperties.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ShapeTextProperties.cpp; sourceTree = "<group>"; };
-		179A44AD1AC57B83005A27F7 /* ShapeTextProperties.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShapeTextProperties.h; sourceTree = "<group>"; };
 		179A44AE1AC57B83005A27F7 /* SmartArt.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SmartArt.cpp; sourceTree = "<group>"; };
 		179A44AF1AC57B83005A27F7 /* SmartArt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SmartArt.h; sourceTree = "<group>"; };
 		179A44B01AC57B83005A27F7 /* Sp3d.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Sp3d.h; sourceTree = "<group>"; };
@@ -1176,11 +1168,7 @@
 				179A44A61AC57B83005A27F7 /* Scene3d.h */,
 				179A44A71AC57B83005A27F7 /* Shape.cpp */,
 				179A44A81AC57B83005A27F7 /* Shape.h */,
-				179A44A91AC57B83005A27F7 /* ShapeProperties.cpp */,
-				179A44AA1AC57B83005A27F7 /* ShapeProperties.h */,
 				179A44AB1AC57B83005A27F7 /* ShapeStyle.h */,
-				179A44AC1AC57B83005A27F7 /* ShapeTextProperties.cpp */,
-				179A44AD1AC57B83005A27F7 /* ShapeTextProperties.h */,
 				179A44AE1AC57B83005A27F7 /* SmartArt.cpp */,
 				179A44AF1AC57B83005A27F7 /* SmartArt.h */,
 				179A44B01AC57B83005A27F7 /* Sp3d.h */,
@@ -1783,7 +1771,6 @@
 				17C1FDFE1ACC429D006B99B3 /* XfrmEffect.h in Headers */,
 				17C1FDFF1ACC429D006B99B3 /* ChartBuildType.h in Headers */,
 				17C1FE001ACC429D006B99B3 /* SndAc.h in Headers */,
-				17C1FE011ACC429D006B99B3 /* ShapeProperties.h in Headers */,
 				17C1FE021ACC429D006B99B3 /* AlphaModFix.h in Headers */,
 				17C1FE041ACC429D006B99B3 /* Duotone.h in Headers */,
 				17C1FE061ACC429D006B99B3 /* ColorBase.h in Headers */,
@@ -1873,7 +1860,6 @@
 				17C1FE601ACC429D006B99B3 /* Set.h in Headers */,
 				17C1FE611ACC429D006B99B3 /* ShapeStyle.h in Headers */,
 				17C1FE621ACC429D006B99B3 /* BaseLimit.h in Headers */,
-				17C1FE631ACC429D006B99B3 /* ShapeTextProperties.h in Headers */,
 				17C1FE641ACC429D006B99B3 /* BinReaderWriterDefines.h in Headers */,
 				17C1FE651ACC429D006B99B3 /* ClrMapOvr.h in Headers */,
 				17C1FE661ACC429D006B99B3 /* Glow.h in Headers */,
@@ -1981,11 +1967,9 @@
 				17C1FCBF1ACC429D006B99B3 /* EffectLst.cpp in Sources */,
 				695BC03A1C070DEF00817D7E /* ASCSVGWriter.cpp in Sources */,
 				17C1FCC11ACC429D006B99B3 /* FileMap.cpp in Sources */,
-				17C1FCC21ACC429D006B99B3 /* ShapeTextProperties.cpp in Sources */,
 				696791821D9E8B81002CA4BA /* MathParaWrapper.cpp in Sources */,
 				17C1FCC31ACC429D006B99B3 /* TransitionBase.cpp in Sources */,
 				17C1FCC51ACC429D006B99B3 /* Shape.cpp in Sources */,
-				17C1FCC61ACC429D006B99B3 /* ShapeProperties.cpp in Sources */,
 				17C1FCC71ACC429D006B99B3 /* BuildNodeBase.cpp in Sources */,
 				17C1FCC81ACC429D006B99B3 /* ContentPart.cpp in Sources */,
 				17C1FCC91ACC429D006B99B3 /* CNvGrpSpPr.cpp in Sources */,

Common/DocxFormat/Source/DocxFormat/IFileContainer.cpp

@@ -110,10 +110,15 @@ namespace OOX
 				OOX::CPath oName   = pFile->DefaultFileName();
 				if(false == pFile->m_sOutputFilename.empty())
 					oName.SetName(pFile->m_sOutputFilename, false);
-				if(m_mNoWriteContainer.end() == m_mNoWriteContainer.find(pPair->first))
+				std::map<std::wstring, std::wstring>::const_iterator itFind = m_mNoWriteContainer.find(pPair->first);
+				if(m_mNoWriteContainer.end() == itFind)
 				{
 					OOX::CSystemUtility::CreateDirectories( oCurrent / oDefDir );
 					pFile->write( oCurrent / oDefDir / oName, oDir / oDefDir, oContent );
+				}
+				else if(itFind->second.length() > 0)
+				{
+					oDefDir = itFind->second;
 				}
 					if(true != pFile->m_bDoNotAddRels)
                     {
@@ -189,7 +194,8 @@ namespace OOX
 					mNamepair [oName.m_strFilename] = 1;
 				else
 					oName = oName + pNamePair->first;
-				if(m_mNoWriteContainer.end() == m_mNoWriteContainer.find(it->first))
+				std::map<std::wstring, std::wstring>::const_iterator itFind = m_mNoWriteContainer.find(it->first);
+				if(m_mNoWriteContainer.end() == itFind)
 				{
 					OOX::CSystemUtility::CreateDirectories( oCurrent / oDefDir );
 					smart_ptr<OOX::IFileBuilder> pFileBuilder = pFile.smart_dynamic_cast<OOX::IFileBuilder>();
@@ -202,6 +208,10 @@ namespace OOX
 						pFile->write( oCurrent / oDefDir / oName, oDir / oDefDir, oContent );
 					}
 				}
+				else if(itFind->second.length() > 0)
+				{
+					oDefDir = itFind->second;
+				}
 
 				oRels.Registration( it->first, pFile->type(), oDefDir / oName );
 			}
@@ -390,18 +400,18 @@ namespace OOX
 		m_mContainer [rId.get()] = pFile;
 	}
 
-	const RId IFileContainer::AddNoWrite(const smart_ptr<OOX::File>& pFile)
+	const RId IFileContainer::AddNoWrite(const smart_ptr<OOX::File>& pFile, const std::wstring& oDefDir)
 	{
 		const RId rId = GetMaxRId().next();
-		AddNoWrite( rId, pFile );
+		AddNoWrite( rId, pFile, oDefDir );
 		return rId;
 	}
 
-	void IFileContainer::AddNoWrite (const OOX::RId& rId, const smart_ptr<OOX::File>& pFile)
+	void IFileContainer::AddNoWrite (const OOX::RId& rId, const smart_ptr<OOX::File>& pFile, const std::wstring& oDefDir)
 	{
 		m_lMaxRid = (std::max)( m_lMaxRid, rId.getNumber() );
 		m_mContainer [rId.get()] = pFile;
-		m_mNoWriteContainer[rId.get()] = true;
+		m_mNoWriteContainer[rId.get()] = oDefDir;
 	}
 
 	smart_ptr<OOX::File> IFileContainer::Find(const FileType& oType) const

Common/DocxFormat/Source/DocxFormat/IFileContainer.h

@@ -67,7 +67,7 @@ namespace OOX
 		static std::map<std::wstring, size_t>			m_mapEnumeratedGlobal;
 	protected:
         std::map<std::wstring, smart_ptr<OOX::File>>	m_mContainer;
-		std::map<std::wstring, bool>	m_mNoWriteContainer;
+		std::map<std::wstring, std::wstring>	m_mNoWriteContainer;
 		size_t											m_lMaxRid;
 
 		void Read (const OOX::CRels& oRels, const OOX::CPath& oRootPath, const CPath& oPath);
@@ -104,8 +104,8 @@ namespace OOX
 
 		const RId Add(smart_ptr<OOX::File>& pFile);
 		void      Add(const OOX::RId& rId, smart_ptr<OOX::File>& pFile);
-		const RId AddNoWrite(const smart_ptr<OOX::File>& pFile);
-		void      AddNoWrite(const OOX::RId& rId, const smart_ptr<OOX::File>& pFile);
+		const RId AddNoWrite(const smart_ptr<OOX::File>& pFile, const std::wstring& oDefDir);
+		void      AddNoWrite(const OOX::RId& rId, const smart_ptr<OOX::File>& pFile, const std::wstring& oDefDir);
 
 		template<typename T> 
         T&                   Find();

Common/DocxFormat/Source/XlsxFormat/Styles/Xfs.h

@@ -198,6 +198,7 @@ namespace OOX
 				WritingStringNullableAttrBool(L"applyBorder", m_oApplyBorder);
 				WritingStringNullableAttrBool(L"applyAlignment", m_oApplyAlignment);
 				WritingStringNullableAttrBool(L"quotePrefix", m_oQuotePrefix);
+				WritingStringNullableAttrBool(L"pivotButton", m_oPivotButton);
 				if(m_oAligment.IsInit())
 				{
 					writer.WriteString(_T(">"));

XlsxSerializerCom/Reader/BinaryWriter.h

@@ -863,6 +863,13 @@ namespace BinXlsxRW
 				m_oBcw.m_oStream.WriteBYTE(c_oSerPropLenType::Byte);
 				m_oBcw.m_oStream.WriteBOOL(xfs.m_oQuotePrefix->ToBool());
 			}
+			//PivotButton
+			if(false != xfs.m_oPivotButton.IsInit())
+			{
+				m_oBcw.m_oStream.WriteBYTE(c_oSerXfsTypes::PivotButton);
+				m_oBcw.m_oStream.WriteBYTE(c_oSerPropLenType::Byte);
+				m_oBcw.m_oStream.WriteBOOL(xfs.m_oPivotButton->ToBool());
+			}
 			//XfId
 			if (false != xfs.m_oXfId.IsInit())
 			{

XlsxSerializerCom/Writer/BinaryReader.h

@@ -1233,6 +1233,11 @@ namespace BinXlsxRW {
 				pXfs->m_oQuotePrefix.Init();
 				pXfs->m_oQuotePrefix->SetValue(false != m_oBufferedStream.GetBool() ? SimpleTypes::onoffTrue : SimpleTypes::onoffFalse);
 			}
+			else if(c_oSerXfsTypes::PivotButton == type)
+			{
+				pXfs->m_oPivotButton.Init();
+				pXfs->m_oPivotButton->SetValue(false != m_oBufferedStream.GetBool() ? SimpleTypes::onoffTrue : SimpleTypes::onoffFalse);
+			}
 			else if(c_oSerXfsTypes::Aligment == type)
 			{
 				pXfs->m_oAligment.Init();
@@ -2208,7 +2213,7 @@ namespace BinXlsxRW {
 				if(m_mapPivotCacheDefinitions.end() != pair && NULL != oPivotCachesTemp.pTable)
 				{
 					NSCommon::smart_ptr<OOX::File> pFileTable(oPivotCachesTemp.pTable);
-					oPivotCachesTemp.pTable->AddNoWrite(pair->second);
+					oPivotCachesTemp.pTable->AddNoWrite(pair->second, L"../pivotCache");
 					m_pCurWorksheet->Add(pFileTable);
 				}
 				else