[Libreoffice-commits] .: 3 commits - comphelper/inc comphelper/Library_comphelp.mk comphelper/Package_inc.mk comphelper/source editeng/source offapi/com package/source starmath/source svx/source sw/source unoxml/Library_unordf.mk unoxml/source wizards/com xmloff/inc xmloff/source
Caolán McNamara
caolan at kemper.freedesktop.org
Thu Sep 8 08:36:50 PDT 2011
comphelper/Library_comphelp.mk | 1
comphelper/Package_inc.mk | 1
comphelper/inc/comphelper/xmltools.hxx | 46 +++
comphelper/source/xml/xmltools.cxx | 115 +++++++
editeng/source/misc/SvXMLAutoCorrectExport.cxx | 4
offapi/com/sun/star/embed/XEncryptionProtectedSource2.idl | 8
package/source/xstor/owriteablestream.cxx | 17 +
package/source/xstor/owriteablestream.hxx | 1
package/source/xstor/xstorage.cxx | 9
package/source/xstor/xstorage.hxx | 3
starmath/source/mathmlexport.cxx | 2
svx/source/xml/xmlxtexp.cxx | 2
sw/source/core/swg/SwXMLBlockExport.cxx | 4
unoxml/Library_unordf.mk | 1
unoxml/source/rdf/librdf_repository.cxx | 54 +++
wizards/com/sun/star/wizards/agenda/makefile.mk | 78 -----
wizards/com/sun/star/wizards/fax/makefile.mk | 69 ----
wizards/com/sun/star/wizards/form/makefile.mk | 70 ----
wizards/com/sun/star/wizards/letter/makefile.mk | 72 ----
wizards/com/sun/star/wizards/makefile.mk | 147 ----------
wizards/com/sun/star/wizards/query/makefile.mk | 64 ----
wizards/com/sun/star/wizards/reportbuilder/layout/makefile.mk | 65 ----
wizards/com/sun/star/wizards/table/makefile.mk | 68 ----
wizards/com/sun/star/wizards/web/data/makefile.mk | 70 ----
wizards/com/sun/star/wizards/web/export/makefile.mk | 59 ----
wizards/com/sun/star/wizards/web/makefile.mk | 93 ------
xmloff/inc/xmloff/xmlexp.hxx | 2
xmloff/source/core/xmlexp.cxx | 16 -
xmloff/source/meta/MetaExportComponent.cxx | 3
xmloff/source/meta/xmlversion.cxx | 2
xmloff/source/text/XMLAutoTextEventExport.cxx | 2
31 files changed, 287 insertions(+), 861 deletions(-)
New commits:
commit a90ab2d8a2fc3e8c0b2ae1d1d657305ad9ceaca5
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Sep 8 13:51:44 2011 +0100
fix comment typos
diff --git a/offapi/com/sun/star/embed/XEncryptionProtectedSource2.idl b/offapi/com/sun/star/embed/XEncryptionProtectedSource2.idl
index 7c28573..ea5a9fc 100644
--- a/offapi/com/sun/star/embed/XEncryptionProtectedSource2.idl
+++ b/offapi/com/sun/star/embed/XEncryptionProtectedSource2.idl
@@ -54,7 +54,7 @@ interface XEncryptionProtectedSource2: XEncryptionProtectedSource
raises( ::com::sun::star::io::IOException );
// -----------------------------------------------------------------------
- /** determing if an encryption data is set for this object.
+ /** determine if an encryption data is set for this object.
@return
true if some encryption data was set, false otherwise
commit f57baefbd3c4c5d8e5ec28e8702c91d60ffc5de2
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Sep 8 13:50:30 2011 +0100
add chaff to encrypted documents
diff --git a/comphelper/Library_comphelp.mk b/comphelper/Library_comphelp.mk
index ac1067b..ab67554 100644
--- a/comphelper/Library_comphelp.mk
+++ b/comphelper/Library_comphelp.mk
@@ -153,6 +153,7 @@ $(eval $(call gb_Library_add_exception_objects,comphelper,\
comphelper/source/streaming/streamsection \
comphelper/source/xml/attributelist \
comphelper/source/xml/ofopxmlhelper \
+ comphelper/source/xml/xmltools \
))
# vim: set noet sw=4 ts=4:
diff --git a/comphelper/Package_inc.mk b/comphelper/Package_inc.mk
index 3819721..df0c6c9 100644
--- a/comphelper/Package_inc.mk
+++ b/comphelper/Package_inc.mk
@@ -40,6 +40,7 @@ $(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/anycompare.hxx,c
$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/propagg.hxx,comphelper/propagg.hxx))
$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/scopeguard.hxx,comphelper/scopeguard.hxx))
$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/scoped_disposing_ptr.hxx,comphelper/scoped_disposing_ptr.hxx))
+$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/xmltools.hxx,comphelper/xmltools.hxx))
$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/asyncnotification.hxx,comphelper/asyncnotification.hxx))
$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/namedvaluecollection.hxx,comphelper/namedvaluecollection.hxx))
$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/composedprops.hxx,comphelper/composedprops.hxx))
diff --git a/comphelper/inc/comphelper/xmltools.hxx b/comphelper/inc/comphelper/xmltools.hxx
new file mode 100644
index 0000000..c18cc69
--- /dev/null
+++ b/comphelper/inc/comphelper/xmltools.hxx
@@ -0,0 +1,46 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ * Caolán McNamara <caolanm at redhat.com> (Red Hat, Inc.)
+ * Portions created by the Initial Developer are Copyright (C) 2011 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Caolán McNamara <caolanm at redhat.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+#ifndef _XMLCHAFF_HXX
+#define _XMLCHAFF_HXX
+
+#include <rtl/strbuf.hxx>
+#include <rtl/ustrbuf.hxx>
+#include <com/sun/star/uno/Sequence.hxx>
+#include <comphelper/comphelperdllapi.h>
+
+namespace comphelper
+{
+ namespace xml
+ {
+ COMPHELPER_DLLPUBLIC rtl::OString makeXMLChaff();
+ }
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/comphelper/source/xml/xmltools.cxx b/comphelper/source/xml/xmltools.cxx
new file mode 100644
index 0000000..c5a5a72
--- /dev/null
+++ b/comphelper/source/xml/xmltools.cxx
@@ -0,0 +1,115 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ * Caolán McNamara <caolanm at redhat.com> (Red Hat, Inc.)
+ * Portions created by the Initial Developer are Copyright (C) 2011 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Caolán McNamara <caolanm at redhat.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+#include <comphelper/xmltools.hxx>
+#include <rtl/random.h>
+#include <boost/static_assert.hpp>
+#include <vector>
+
+using namespace com::sun::star;
+
+namespace
+{
+ //Will be inside an xml comment, so can't use '-' in case '--' appears in
+ //output, etc. Despite what *is* legal in an xml comment, just using the
+ //base-64 subset to avoid pain with simplistic third-party parsers
+ static const sal_uInt8 aChaffEncoder[] =
+ {
+ 'A', 'Q', 'g', 'w', 'B', 'R', 'h', 'x',
+ 'C', 'S', 'i', 'y', 'D', 'T', 'j', 'z',
+ 'E', 'U', 'k', '0', 'F', 'V', 'l', '1',
+ 'G', 'W', 'm', '2', 'H', 'X', 'n', '3',
+ 'I', 'Y', 'o', '4', 'J', 'Z', 'p', '5',
+ 'K', 'a', 'q', '6', 'L', 'b', 'r', '7',
+ 'M', 'c', 's', '8', 'N', 'd', 't', '9',
+ 'O', 'e', 'u', '+', 'P', 'f', 'v', '/',
+
+ 'A', 'Q', 'g', 'w', 'B', 'R', 'h', 'x',
+ 'C', 'S', 'i', 'y', 'D', 'T', 'j', 'z',
+ 'E', 'U', 'k', '0', 'F', 'V', 'l', '1',
+ 'G', 'W', 'm', '2', 'H', 'X', 'n', '3',
+ 'I', 'Y', 'o', '4', 'J', 'Z', 'p', '5',
+ 'K', 'a', 'q', '6', 'L', 'b', 'r', '7',
+ 'M', 'c', 's', '8', 'N', 'd', 't', '9',
+ 'O', 'e', 'u', '+', 'P', 'f', 'v', '/',
+
+ 'A', 'Q', 'g', 'w', 'B', 'R', 'h', 'x',
+ 'C', 'S', 'i', 'y', 'D', 'T', 'j', 'z',
+ 'E', 'U', 'k', '0', 'F', 'V', 'l', '1',
+ 'G', 'W', 'm', '2', 'H', 'X', 'n', '3',
+ 'I', 'Y', 'o', '4', 'J', 'Z', 'p', '5',
+ 'K', 'a', 'q', '6', 'L', 'b', 'r', '7',
+ 'M', 'c', 's', '8', 'N', 'd', 't', '9',
+ 'O', 'e', 'u', '+', 'P', 'f', 'v', '/',
+
+ 'A', 'Q', 'g', 'w', 'B', 'R', 'h', 'x',
+ 'C', 'S', 'i', 'y', 'D', 'T', 'j', 'z',
+ 'E', 'U', 'k', '0', 'F', 'V', 'l', '1',
+ 'G', 'W', 'm', '2', 'H', 'X', 'n', '3',
+ 'I', 'Y', 'o', '4', 'J', 'Z', 'p', '5',
+ 'K', 'a', 'q', '6', 'L', 'b', 'r', '7',
+ 'M', 'c', 's', '8', 'N', 'd', 't', '9',
+ 'O', 'e', 'u', '+', 'P', 'f', 'v', '/'
+ };
+
+ void encodeChaff(std::vector<sal_uInt8> &rChaff)
+ {
+ BOOST_STATIC_ASSERT(sizeof(aChaffEncoder) == 256);
+
+ for (std::vector<sal_uInt8>::iterator aI = rChaff.begin(), aEnd = rChaff.end();
+ aI != aEnd; ++aI)
+ {
+ *aI = aChaffEncoder[*aI];
+ }
+ }
+}
+
+namespace comphelper
+{
+ namespace xml
+ {
+ rtl::OString makeXMLChaff()
+ {
+ rtlRandomPool pool = rtl_random_createPool();
+
+ sal_Int8 n;
+ rtl_random_getBytes(pool, &n, 1);
+
+ //1024 minus max -127/plus max 128
+ sal_Int32 nLength = 1024+n;
+ std::vector<sal_uInt8> aChaff(nLength);
+ rtl_random_getBytes(pool, &aChaff[0], nLength);
+
+ rtl_random_destroyPool(pool);
+
+ encodeChaff(aChaff);
+
+ return rtl::OString(reinterpret_cast<const sal_Char*>(&aChaff[0]), nLength);
+ }
+ }
+}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/editeng/source/misc/SvXMLAutoCorrectExport.cxx b/editeng/source/misc/SvXMLAutoCorrectExport.cxx
index ceada8a..2b01f03 100644
--- a/editeng/source/misc/SvXMLAutoCorrectExport.cxx
+++ b/editeng/source/misc/SvXMLAutoCorrectExport.cxx
@@ -56,6 +56,8 @@ sal_uInt32 SvXMLAutoCorrectExport::exportDoc(enum XMLTokenEnum /*eClass*/)
{
GetDocHandler()->startDocument();
+ addChaffWhenEncryptedStorage();
+
AddAttribute ( XML_NAMESPACE_NONE,
_GetNamespaceMap().GetAttrNameByKey ( XML_NAMESPACE_BLOCKLIST ),
_GetNamespaceMap().GetNameByKey ( XML_NAMESPACE_BLOCKLIST ) );
@@ -97,6 +99,8 @@ sal_uInt32 SvXMLExceptionListExport::exportDoc(enum XMLTokenEnum /*eClass*/)
{
GetDocHandler()->startDocument();
+ addChaffWhenEncryptedStorage();
+
AddAttribute ( XML_NAMESPACE_NONE,
_GetNamespaceMap().GetAttrNameByKey ( XML_NAMESPACE_BLOCKLIST ),
_GetNamespaceMap().GetNameByKey ( XML_NAMESPACE_BLOCKLIST ) );
diff --git a/offapi/com/sun/star/embed/XEncryptionProtectedSource2.idl b/offapi/com/sun/star/embed/XEncryptionProtectedSource2.idl
index f83937c..7c28573 100644
--- a/offapi/com/sun/star/embed/XEncryptionProtectedSource2.idl
+++ b/offapi/com/sun/star/embed/XEncryptionProtectedSource2.idl
@@ -52,6 +52,14 @@ interface XEncryptionProtectedSource2: XEncryptionProtectedSource
*/
void setEncryptionData( [in] sequence< ::com::sun::star::beans::NamedValue > aEncryptionData )
raises( ::com::sun::star::io::IOException );
+
+ // -----------------------------------------------------------------------
+ /** determing if an encryption data is set for this object.
+
+ @return
+ true if some encryption data was set, false otherwise
+ */
+ boolean hasEncryptionData();
};
//============================================================================
diff --git a/package/source/xstor/owriteablestream.cxx b/package/source/xstor/owriteablestream.cxx
index 56b308b..29afc86 100644
--- a/package/source/xstor/owriteablestream.cxx
+++ b/package/source/xstor/owriteablestream.cxx
@@ -2750,6 +2750,23 @@ void SAL_CALL OWriteStream::setEncryptionData( const uno::Sequence< beans::Named
}
//-----------------------------------------------
+sal_Bool SAL_CALL OWriteStream::hasEncryptionData()
+ throw (uno::RuntimeException)
+{
+ ::osl::ResettableMutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
+
+ if (!m_pImpl)
+ return sal_False;
+
+ sal_Bool bRet = m_pImpl->IsEncrypted();
+
+ if (!bRet && m_pImpl->m_bUseCommonEncryption && m_pImpl->m_pParent)
+ bRet = m_pImpl->m_pParent->m_bHasCommonEncryptionData;
+
+ return bRet;
+}
+
+//-----------------------------------------------
sal_Bool SAL_CALL OWriteStream::hasByID( const ::rtl::OUString& sID )
throw ( io::IOException,
uno::RuntimeException )
diff --git a/package/source/xstor/owriteablestream.hxx b/package/source/xstor/owriteablestream.hxx
index 0e9884b..aefe0b8 100644
--- a/package/source/xstor/owriteablestream.hxx
+++ b/package/source/xstor/owriteablestream.hxx
@@ -372,6 +372,7 @@ public:
//XEncryptionProtectedSource2
virtual void SAL_CALL setEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aEncryptionData ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
+ virtual sal_Bool SAL_CALL hasEncryptionData() throw (::com::sun::star::uno::RuntimeException);
//XRelationshipAccess
virtual ::sal_Bool SAL_CALL hasByID( const ::rtl::OUString& sID ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
diff --git a/package/source/xstor/xstorage.cxx b/package/source/xstor/xstorage.cxx
index 9c0c117..40b129f 100644
--- a/package/source/xstor/xstorage.cxx
+++ b/package/source/xstor/xstorage.cxx
@@ -4806,6 +4806,15 @@ void SAL_CALL OStorage::setEncryptionData( const uno::Sequence< beans::NamedValu
}
}
+sal_Bool SAL_CALL OStorage::hasEncryptionData()
+ throw ( uno::RuntimeException )
+{
+ ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
+
+ return m_pImpl && m_pImpl->m_bHasCommonEncryptionData;
+}
+
+
//____________________________________________________________________________________________________
// XEncryptionProtectedStorage
//____________________________________________________________________________________________________
diff --git a/package/source/xstor/xstorage.hxx b/package/source/xstor/xstorage.hxx
index f472444..f1770e5 100644
--- a/package/source/xstor/xstorage.hxx
+++ b/package/source/xstor/xstorage.hxx
@@ -647,6 +647,9 @@ public:
throw ( ::com::sun::star::io::IOException,
::com::sun::star::uno::RuntimeException );
+ virtual sal_Bool SAL_CALL hasEncryptionData()
+ throw ( ::com::sun::star::uno::RuntimeException );
+
//____________________________________________________________________________________________________
// XEncryptionProtectedStorage
//____________________________________________________________________________________________________
diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx
index fe8f77f..ae6e306 100644
--- a/starmath/source/mathmlexport.cxx
+++ b/starmath/source/mathmlexport.cxx
@@ -605,6 +605,8 @@ sal_uInt32 SmXMLExport::exportDoc(enum XMLTokenEnum eClass)
GetDocHandler()->startDocument();
+ addChaffWhenEncryptedStorage();
+
/*Add xmlns line*/
SvXMLAttributeList &rList = GetAttrList();
diff --git a/svx/source/xml/xmlxtexp.cxx b/svx/source/xml/xmlxtexp.cxx
index c170484..7f01b78 100644
--- a/svx/source/xml/xmlxtexp.cxx
+++ b/svx/source/xml/xmlxtexp.cxx
@@ -293,6 +293,8 @@ sal_Bool SvxXMLXTableExportComponent::exportTable() throw()
{
GetDocHandler()->startDocument();
+ addChaffWhenEncryptedStorage();
+
// export namespaces
sal_uInt16 nPos = GetNamespaceMap().GetFirstKey();
while( USHRT_MAX != nPos )
diff --git a/sw/source/core/swg/SwXMLBlockExport.cxx b/sw/source/core/swg/SwXMLBlockExport.cxx
index 674a33f..848bd6c 100644
--- a/sw/source/core/swg/SwXMLBlockExport.cxx
+++ b/sw/source/core/swg/SwXMLBlockExport.cxx
@@ -55,6 +55,8 @@ sal_uInt32 SwXMLBlockListExport::exportDoc(enum XMLTokenEnum )
{
GetDocHandler()->startDocument();
+ addChaffWhenEncryptedStorage();
+
AddAttribute ( XML_NAMESPACE_NONE,
_GetNamespaceMap().GetAttrNameByKey ( XML_NAMESPACE_BLOCKLIST ),
_GetNamespaceMap().GetNameByKey ( XML_NAMESPACE_BLOCKLIST ) );
@@ -110,6 +112,8 @@ sal_uInt32 SwXMLTextBlockExport::exportDoc(const String &rText)
{
GetDocHandler()->startDocument();
+ addChaffWhenEncryptedStorage();
+
AddAttribute ( XML_NAMESPACE_NONE,
_GetNamespaceMap().GetAttrNameByKey ( XML_NAMESPACE_BLOCKLIST ),
_GetNamespaceMap().GetNameByKey ( XML_NAMESPACE_BLOCKLIST ) );
diff --git a/unoxml/Library_unordf.mk b/unoxml/Library_unordf.mk
index 2d0276a..cb21c06 100644
--- a/unoxml/Library_unordf.mk
+++ b/unoxml/Library_unordf.mk
@@ -40,6 +40,7 @@ $(eval $(call gb_Library_add_api,unordf,\
))
$(eval $(call gb_Library_add_linked_libs,unordf,\
+ comphelper \
cppuhelper \
cppu \
sal \
diff --git a/unoxml/source/rdf/librdf_repository.cxx b/unoxml/source/rdf/librdf_repository.cxx
index 644d283..317ba30 100644
--- a/unoxml/source/rdf/librdf_repository.cxx
+++ b/unoxml/source/rdf/librdf_repository.cxx
@@ -67,7 +67,9 @@
#include <comphelper/stlunosequence.hxx>
#include <comphelper/sequenceasvector.hxx>
#include <comphelper/makesequence.hxx>
+#include <comphelper/xmltools.hxx>
+#include <com/sun/star/embed/XEncryptionProtectedSource2.hpp>
/**
Implementation of the service com.sun.star.rdf.Repository.
@@ -991,6 +993,53 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
return getGraph(i_xGraphName);
}
+void addChaffWhenEncryptedStorage(const uno::Reference< io::XOutputStream > &rStream, unsigned char* pBuffer, size_t length)
+{
+ if (!length)
+ return;
+
+ uno::Reference< embed::XEncryptionProtectedSource2 > xEncr(rStream,
+ uno::UNO_QUERY);
+
+ bool bAddChaff = xEncr.is() && xEncr->hasEncryptionData();
+
+ // exceptions are propagated
+ if (!bAddChaff)
+ {
+ const uno::Sequence<sal_Int8> buf(
+ reinterpret_cast<sal_Int8*>(pBuffer), length);
+ rStream->writeBytes(buf);
+ }
+ else
+ {
+ unsigned char *postcomment =
+ (unsigned char*)strchr((const char*)pBuffer, '\n');
+ if (postcomment != NULL)
+ {
+ ++postcomment;
+
+ size_t preamblelen = postcomment - pBuffer;
+
+ uno::Sequence<sal_Int8> buf(
+ reinterpret_cast<sal_Int8*>(pBuffer), preamblelen);
+ rStream->writeBytes(buf);
+
+ rtl::OStringBuffer aComment;
+ aComment.append(RTL_CONSTASCII_STRINGPARAM("<!--"));
+ aComment.append(comphelper::xml::makeXMLChaff());
+ aComment.append(RTL_CONSTASCII_STRINGPARAM("-->"));
+
+ buf = uno::Sequence<sal_Int8>(
+ reinterpret_cast<const sal_Int8*>(aComment.getStr()), aComment.getLength());
+ rStream->writeBytes(buf);
+
+ buf = uno::Sequence<sal_Int8>(
+ reinterpret_cast<sal_Int8*>(postcomment), length-preamblelen);
+ rStream->writeBytes(buf);
+ }
+ }
+}
+
void SAL_CALL
librdf_Repository::exportGraph(::sal_Int16 i_Format,
const uno::Reference< io::XOutputStream > & i_xOutStream,
@@ -1130,10 +1179,7 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
"librdf_serializer_serialize_stream_to_counted_string failed")),
*this);
}
- const uno::Sequence<sal_Int8> buf(
- reinterpret_cast<sal_Int8*>(pBuf.get()), length);
- // exceptions are propagated
- i_xOutStream->writeBytes(buf);
+ addChaffWhenEncryptedStorage(i_xOutStream, pBuf.get(), length);
}
uno::Sequence< uno::Reference< rdf::XURI > > SAL_CALL
diff --git a/xmloff/inc/xmloff/xmlexp.hxx b/xmloff/inc/xmloff/xmlexp.hxx
index 153065f..c1bb9c0 100644
--- a/xmloff/inc/xmloff/xmlexp.hxx
+++ b/xmloff/inc/xmloff/xmlexp.hxx
@@ -431,6 +431,8 @@ public:
SvXMLUnitConverter& GetMM100UnitConverter() { return *mpUnitConv; }
+ void addChaffWhenEncryptedStorage();
+
// Export the document.
virtual sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum eClass = ::xmloff::token::XML_TOKEN_INVALID );
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index 25f1e09..7b03fad 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -94,10 +94,11 @@
#include <tools/inetdef.hxx>
#include <com/sun/star/document/XDocumentProperties.hpp>
#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
-
+#include <com/sun/star/embed/XEncryptionProtectedSource2.hpp>
#include <com/sun/star/rdf/XMetadatable.hpp>
#include "RDFaExportHelper.hxx"
+#include <comphelper/xmltools.hxx>
using ::rtl::OUString;
@@ -1278,6 +1279,16 @@ lcl_AddGrddl(SvXMLExport & rExport, const sal_Int32 /*nExportMode*/)
#endif
}
+void SvXMLExport::addChaffWhenEncryptedStorage()
+{
+ uno::Reference< embed::XEncryptionProtectedSource2 > xEncr(mpImpl->mxTargetStorage, uno::UNO_QUERY);
+
+ if (xEncr.is() && xEncr->hasEncryptionData() && mxExtHandler.is())
+ {
+ mxExtHandler->comment(rtl::OStringToOUString(comphelper::xml::makeXMLChaff(), RTL_TEXTENCODING_ASCII_US));
+ }
+}
+
sal_uInt32 SvXMLExport::exportDoc( enum ::xmloff::token::XMLTokenEnum eClass )
{
bool bOwnGraphicResolver = false;
@@ -1366,9 +1377,10 @@ sal_uInt32 SvXMLExport::exportDoc( enum ::xmloff::token::XMLTokenEnum eClass )
}
}
-
mxHandler->startDocument();
+ addChaffWhenEncryptedStorage();
+
// <office:document ...>
CheckAttrList();
diff --git a/xmloff/source/meta/MetaExportComponent.cxx b/xmloff/source/meta/MetaExportComponent.cxx
index 37af37b..fac1984 100644
--- a/xmloff/source/meta/MetaExportComponent.cxx
+++ b/xmloff/source/meta/MetaExportComponent.cxx
@@ -135,6 +135,9 @@ sal_uInt32 XMLMetaExportComponent::exportDoc( enum XMLTokenEnum )
xDocHandler->startDocument();
+
+ addChaffWhenEncryptedStorage();
+
{
const SvXMLNamespaceMap& rMap = GetNamespaceMap();
diff --git a/xmloff/source/meta/xmlversion.cxx b/xmloff/source/meta/xmlversion.cxx
index 8163dd5..c80f5f7 100644
--- a/xmloff/source/meta/xmlversion.cxx
+++ b/xmloff/source/meta/xmlversion.cxx
@@ -75,6 +75,8 @@ sal_uInt32 XMLVersionListExport::exportDoc( enum ::xmloff::token::XMLTokenEnum )
{
GetDocHandler()->startDocument();
+ addChaffWhenEncryptedStorage();
+
sal_uInt16 nPos = _GetNamespaceMap().GetIndexByKey( XML_NAMESPACE_DC );
AddAttribute( XML_NAMESPACE_NONE, _GetNamespaceMap().GetAttrNameByIndex( nPos ),
diff --git a/xmloff/source/text/XMLAutoTextEventExport.cxx b/xmloff/source/text/XMLAutoTextEventExport.cxx
index 1b14c1f..30cc124 100644
--- a/xmloff/source/text/XMLAutoTextEventExport.cxx
+++ b/xmloff/source/text/XMLAutoTextEventExport.cxx
@@ -168,6 +168,8 @@ sal_uInt32 XMLAutoTextEventExport::exportDoc( enum XMLTokenEnum )
{
GetDocHandler()->startDocument();
+ addChaffWhenEncryptedStorage();
+
addNamespaces();
{
commit 4a90740fcee07996469ff702daa04953f39be191
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Sep 8 12:33:19 2011 +0100
drop dead dmake makefile.mks
diff --git a/wizards/com/sun/star/wizards/agenda/makefile.mk b/wizards/com/sun/star/wizards/agenda/makefile.mk
deleted file mode 100644
index 9b89c72..0000000
--- a/wizards/com/sun/star/wizards/agenda/makefile.mk
+++ /dev/null
@@ -1,78 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ = ..$/..$/..$/..$/..
-PRJNAME = wizards
-TARGET = agenda
-PACKAGE = com$/sun$/star$/wizards$/agenda
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-JARFILES= unoil.jar \
- jurt.jar \
- ridl.jar \
- juh.jar \
- java_uno.jar \
- java_uno_accessbridge \
- commonwizards.jar
-
-CUSTOMMANIFESTFILE= MANIFEST.MF
-
-JARCLASSDIRS = com$/sun$/star$/wizards$/agenda
-JARTARGET = $(TARGET).jar
-JARCLASSPATH = commonwizards.jar
-
-# --- Files --------------------------------------------------------
-
-JAVAFILES= \
- AgendaTemplate.java \
- AgendaWizardDialog.java \
- AgendaWizardDialogConst.java \
- AgendaWizardDialogImpl.java \
- AgendaWizardDialogResources.java \
- CGAgenda.java \
- CGTopic.java \
- CallWizard.java \
- TemplateConsts.java \
- TopicsControl.java
-
-
-JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-ALLTAR : $(MISC)/agenda.component
-
-$(MISC)/agenda.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
- agenda.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_JAVA)$(JARTARGET)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt agenda.component
diff --git a/wizards/com/sun/star/wizards/fax/makefile.mk b/wizards/com/sun/star/wizards/fax/makefile.mk
deleted file mode 100644
index 4ef4620..0000000
--- a/wizards/com/sun/star/wizards/fax/makefile.mk
+++ /dev/null
@@ -1,69 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ = ..$/..$/..$/..$/..
-PRJNAME = wizards
-TARGET = fax
-PACKAGE = com$/sun$/star$/wizards$/fax
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-JARFILES= unoil.jar jurt.jar ridl.jar juh.jar java_uno.jar java_uno_accessbridge commonwizards.jar
-
-CUSTOMMANIFESTFILE= MANIFEST.MF
-
-JARCLASSDIRS = com$/sun$/star$/wizards$/fax
-JARTARGET = $(TARGET).jar
-JARCLASSPATH = commonwizards.jar
-
-# --- Files --------------------------------------------------------
-
-JAVAFILES= \
- CallWizard.java \
- CGFax.java \
- FaxDocument.java \
- FaxWizardDialog.java \
- CGFaxWizard.java \
- FaxWizardDialogConst.java \
- FaxWizardDialogResources.java \
- FaxWizardDialogImpl.java
-
-JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-ALLTAR : $(MISC)/fax.component
-
-$(MISC)/fax.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
- fax.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_JAVA)$(JARTARGET)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt fax.component
diff --git a/wizards/com/sun/star/wizards/form/makefile.mk b/wizards/com/sun/star/wizards/form/makefile.mk
deleted file mode 100644
index abd6603..0000000
--- a/wizards/com/sun/star/wizards/form/makefile.mk
+++ /dev/null
@@ -1,70 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ = ..$/..$/..$/..$/..
-PRJNAME = wizards
-TARGET = form
-PACKAGE = com$/sun$/star$/wizards$/form
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-JARFILES= unoil.jar jurt.jar ridl.jar juh.jar java_uno.jar commonwizards.jar
-CUSTOMMANIFESTFILE= MANIFEST.MF
-
-JARCLASSDIRS = com$/sun$/star$/wizards$/form
-JARTARGET = $(TARGET).jar
-JARCLASSPATH = commonwizards.jar
-
-# --- Files --------------------------------------------------------
-
-JAVAFILES= \
- CallFormWizard.java \
- Finalizer.java \
- FormWizard.java \
- DataEntrySetter.java \
- FieldLinker.java \
- FormConfiguration.java \
- FormControlArranger.java\
- FormDocument.java \
- StyleApplier.java \
- UIControlArranger.java \
-
-JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-ALLTAR : $(MISC)/form.component
-
-$(MISC)/form.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
- form.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_JAVA)$(JARTARGET)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt form.component
diff --git a/wizards/com/sun/star/wizards/letter/makefile.mk b/wizards/com/sun/star/wizards/letter/makefile.mk
deleted file mode 100644
index 25d3883..0000000
--- a/wizards/com/sun/star/wizards/letter/makefile.mk
+++ /dev/null
@@ -1,72 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ = ..$/..$/..$/..$/..
-PRJNAME = wizards
-TARGET = letter
-PACKAGE = com$/sun$/star$/wizards$/letter
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-JARFILES= unoil.jar jurt.jar ridl.jar juh.jar java_uno.jar java_uno_accessbridge commonwizards.jar
-
-CUSTOMMANIFESTFILE= MANIFEST.MF
-
-JARCLASSDIRS = com$/sun$/star$/wizards$/letter
-JARTARGET = $(TARGET).jar
-JARCLASSPATH = commonwizards.jar
-
-# --- Files --------------------------------------------------------
-
-JAVAFILES= \
- LetterDocument.java \
- LetterWizardDialogConst.java \
- LetterWizardDialogImpl.java \
- CallWizard.java \
- LetterWizardDialog.java \
- LetterWizardDialogEvents.java \
- LetterWizardDialogResources.java \
- LocaleCodes.java \
- CGLetter.java \
- CGLetterWizard.java \
- CGPaperElementLocation.java
-
-JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-ALLTAR : $(MISC)/letter.component
-
-$(MISC)/letter.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
- letter.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_JAVA)$(JARTARGET)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt letter.component
diff --git a/wizards/com/sun/star/wizards/makefile.mk b/wizards/com/sun/star/wizards/makefile.mk
deleted file mode 100644
index c44b369..0000000
--- a/wizards/com/sun/star/wizards/makefile.mk
+++ /dev/null
@@ -1,147 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ = ..$/..$/..$/..
-PRJNAME = wizards
-TARGET = wizards_common
-PACKAGE = com$/sun$/star$/wizards
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-JARFILES= unoil.jar jurt.jar ridl.jar juh.jar jut.jar java_uno.jar java_uno_accessbridge
-
-.IF "$(SYSTEM_SAXON)" == "YES"
-EXTRAJARFILES = $(SAXON_JAR)
-.ELSE
-JARFILES += saxon9.jar
-.ENDIF
-
-
-JARCLASSDIRS = \
- com$/sun$/star$/wizards$/common \
- com$/sun$/star$/wizards$/db \
- com$/sun$/star$/wizards$/ui \
- com$/sun$/star$/wizards$/document \
- com$/sun$/star$/wizards$/text
-
-JARTARGET = commonwizards.jar
-
-# --- Files --------------------------------------------------------
-
-JAVAFILES= \
- common$/HelpIds.java \
- common$/Desktop.java \
- common$/NumberFormatter.java \
- common$/FileAccess.java \
- common$/Helper.java \
- common$/InvalidQueryException.java \
- common$/JavaTools.java \
- common$/NoValidPathException.java \
- common$/Properties.java \
- common$/PropertyNames.java \
- common$/Resource.java \
- common$/SystemDialog.java \
- common$/Configuration.java \
- common$/ConfigNode.java \
- common$/ConfigGroup.java \
- common$/ConfigSet.java \
- common$/XMLProvider.java \
- common$/XMLHelper.java \
- common$/IRenderer.java \
- common$/Indexable.java \
- common$/TerminateWizardException.java \
- common$/UCB.java \
- common$/DebugHelper.java \
- common$/PropertySetHelper.java \
- common$/NumericalHelper.java \
- common$/NamedValueCollection.java \
- db$/DBMetaData.java \
- db$/CommandMetaData.java \
- db$/QueryMetaData.java \
- db$/BlindtextCreator.java \
- db$/FieldColumn.java \
- db$/CommandName.java \
- db$/RecordParser.java \
- db$/TypeInspector.java \
- db$/ColumnPropertySet.java \
- db$/RelationController.java \
- db$/TableDescriptor.java \
- db$/SQLQueryComposer.java \
- db$/DatabaseObjectWizard.java \
- ui$/event$/AbstractListener.java \
- ui$/event$/CommonListener.java \
- ui$/event$/DataAware.java \
- ui$/event$/DataAwareFields.java \
- ui$/event$/EventNames.java \
- ui$/event$/ListModelBinder.java \
- ui$/event$/MethodInvocation.java \
- ui$/event$/RadioDataAware.java \
- ui$/event$/SimpleDataAware.java \
- ui$/event$/Task.java \
- ui$/event$/TaskEvent.java \
- ui$/event$/TaskListener.java \
- ui$/event$/UnoDataAware.java \
- ui$/AggregateComponent.java \
- ui$/CommandFieldSelection.java \
- ui$/ControlScroller.java \
- ui$/DBLimitedFieldSelection.java \
- ui$/DocumentPreview.java \
- ui$/FilterComponent.java \
- ui$/FieldSelection.java \
- ui$/ImageList.java \
- ui$/ButtonList.java \
- ui$/PathSelection.java \
- ui$/PeerConfig.java \
- ui$/SortingComponent.java \
- ui$/TitlesComponent.java \
- ui$/WizardDialog.java \
- ui$/UIConsts.java \
- ui$/UnoDialog.java \
- ui$/UnoDialog2.java \
- ui$/XCommandSelectionListener.java \
- ui$/XFieldSelectionListener.java \
- ui$/XPathSelectionListener.java \
- ui$/XCompletion.java \
- document$/Control.java \
- document$/DatabaseControl.java \
- document$/FormHandler.java \
- document$/GridControl.java \
- document$/OfficeDocument.java \
- document$/Shape.java \
- document$/TimeStampControl.java \
- text$/TextDocument.java \
- text$/TextFieldHandler.java \
- text$/TextFrameHandler.java \
- text$/TextSectionHandler.java \
- text$/TextStyleHandler.java \
- text$/TextTableHandler.java \
- text$/ViewHandler.java
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/wizards/com/sun/star/wizards/query/makefile.mk b/wizards/com/sun/star/wizards/query/makefile.mk
deleted file mode 100644
index 7a844f4..0000000
--- a/wizards/com/sun/star/wizards/query/makefile.mk
+++ /dev/null
@@ -1,64 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ = ..$/..$/..$/..$/..
-PRJNAME = wizards
-TARGET = query
-PACKAGE = com$/sun$/star$/wizards$/query
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-JARFILES= unoil.jar jurt.jar ridl.jar juh.jar jut.jar java_uno.jar commonwizards.jar
-CUSTOMMANIFESTFILE= MANIFEST.MF
-
-JARCLASSDIRS = com$/sun$/star$/wizards$/query
-JARTARGET = $(TARGET).jar
-JARCLASSPATH = commonwizards.jar
-
-# --- Files --------------------------------------------------------
-
-JAVAFILES= \
- CallQueryWizard.java \
- Finalizer.java \
- QueryWizard.java \
- QuerySummary.java\
-
-JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-ALLTAR : $(MISC)/query.component
-
-$(MISC)/query.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
- query.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_JAVA)$(JARTARGET)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt query.component
diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/makefile.mk b/wizards/com/sun/star/wizards/reportbuilder/layout/makefile.mk
deleted file mode 100644
index 3781f42..0000000
--- a/wizards/com/sun/star/wizards/reportbuilder/layout/makefile.mk
+++ /dev/null
@@ -1,65 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ = ..$/..$/..$/..$/..$/..
-PRJNAME = wizards
-TARGET = reportbuilderwizardlayouts
-PACKAGE = com$/sun$/star$/wizards$/reportbuilder$/layout
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-JARFILES= unoil.jar jurt.jar ridl.jar juh.jar java_uno.jar commonwizards.jar report.jar
-
-JARCLASSDIRS = \
- com$/sun$/star$/wizards$/reportbuilder$/layout \
- com$/sun$/star$/wizards$/report
-
-# --- Files --------------------------------------------------------
-
-JAVAFILES= \
- LayoutConstants.java \
- ReportBuilderLayouter.java \
- Tabular.java \
- ColumnarSingleColumn.java \
- ColumnarTwoColumns.java \
- ColumnarThreeColumns.java \
- InBlocksLabelsAbove.java \
- InBlocksLabelsLeft.java \
- SectionObject.java \
- SectionEmptyObject.java \
- SectionLabel.java \
- SectionTextField.java \
- DesignTemplate.java
-
-JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/wizards/com/sun/star/wizards/table/makefile.mk b/wizards/com/sun/star/wizards/table/makefile.mk
deleted file mode 100644
index fd2b09e..0000000
--- a/wizards/com/sun/star/wizards/table/makefile.mk
+++ /dev/null
@@ -1,68 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ = ..$/..$/..$/..$/..
-PRJNAME = wizards
-TARGET = table
-PACKAGE = com$/sun$/star$/wizards$/table
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-JARFILES= unoil.jar jurt.jar ridl.jar juh.jar java_uno.jar commonwizards.jar
-CUSTOMMANIFESTFILE= MANIFEST.MF
-
-JARCLASSDIRS = com$/sun$/star$/wizards$/table
-JARTARGET = $(TARGET).jar
-JARCLASSPATH = commonwizards.jar
-
-# --- Files --------------------------------------------------------
-
-JAVAFILES= \
- CallTableWizard.java \
- Finalizer.java \
- FieldDescription.java \
- CGCategory.java \
- CGTable.java \
- FieldFormatter.java \
- PrimaryKeyHandler.java \
- ScenarioSelector.java \
- TableWizard.java \
-
-JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-ALLTAR : $(MISC)/table.component
-
-$(MISC)/table.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
- table.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_JAVA)$(JARTARGET)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt table.component
diff --git a/wizards/com/sun/star/wizards/web/data/makefile.mk b/wizards/com/sun/star/wizards/web/data/makefile.mk
deleted file mode 100644
index 17a78f0..0000000
--- a/wizards/com/sun/star/wizards/web/data/makefile.mk
+++ /dev/null
@@ -1,70 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ = ..$/..$/..$/..$/..$/..
-PRJNAME = wizards
-TARGET = web_data
-PACKAGE = com$/sun$/star$/wizards$/web$/data
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-JARFILES= unoil.jar jurt.jar ridl.jar juh.jar jut.jar java_uno.jar java_uno_accessbridge commonwizards.jar
-
-.IF "$(SYSTEM_SAXON)" == "YES"
-EXTRAJARFILES = $(SAXON_JAR)
-.ELSE
-JARFILES += saxon9.jar
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-JAVAFILES= \
- CGArgument.java \
- CGContent.java \
- CGDesign.java \
- CGDocument.java \
- CGExporter.java \
- CGFilter.java \
- CGGeneralInfo.java \
- CGIconSet.java \
- CGImage.java \
- CGLayout.java \
- CGPublish.java \
- CGSession.java \
- CGSessionName.java \
- CGSettings.java \
- CGStyle.java \
- ConfigSetItem.java \
- TypeDetection.java
-
-JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/wizards/com/sun/star/wizards/web/export/makefile.mk b/wizards/com/sun/star/wizards/web/export/makefile.mk
deleted file mode 100644
index c898fdf..0000000
--- a/wizards/com/sun/star/wizards/web/export/makefile.mk
+++ /dev/null
@@ -1,59 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ = ..$/..$/..$/..$/..$/..
-PRJNAME = wizards
-TARGET = web_export
-PACKAGE = com$/sun$/star$/wizards$/web$/export
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-JARFILES= unoil.jar jurt.jar ridl.jar juh.jar java_uno.jar java_uno_accessbridge commonwizards.jar
-
-.IF "$(SYSTEM_SAXON)" == "YES"
-EXTRAJARFILES = $(SAXON_JAR)
-.ELSE
-JARFILES += saxon9.jar
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-JAVAFILES= \
- AbstractExporter.java \
- ConfiguredExporter.java \
- CopyExporter.java \
- Exporter.java \
- FilterExporter.java \
- ImpressHTMLExporter.java
-
-JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/wizards/com/sun/star/wizards/web/makefile.mk b/wizards/com/sun/star/wizards/web/makefile.mk
deleted file mode 100644
index e1be149..0000000
--- a/wizards/com/sun/star/wizards/web/makefile.mk
+++ /dev/null
@@ -1,93 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ = ..$/..$/..$/..$/..
-PRJNAME = wizards
-TARGET = web
-PACKAGE = com$/sun$/star$/wizards$/web
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-JARFILES= unoil.jar jurt.jar ridl.jar juh.jar jut.jar java_uno.jar java_uno_accessbridge commonwizards.jar
-
-.IF "$(SYSTEM_SAXON)" == "YES"
-EXTRAJARFILES = $(SAXON_JAR)
-.ELSE
-JARFILES += saxon9.jar
-.ENDIF
-
-CUSTOMMANIFESTFILE= MANIFEST.MF
-
-JARCLASSDIRS = com$/sun$/star$/wizards$/web
-JARTARGET = web.jar
-JARCLASSPATH = \
- commonwizards.jar saxon9.jar
-
-# --- Files --------------------------------------------------------
-
-JAVAFILES= \
- AbstractErrorHandler.java \
- BackgroundsDialog.java \
- CallWizard.java \
- ErrorHandler.java \
- ExtensionVerifier.java \
- FTPDialog.java \
- FTPDialogResources.java \
- IconsDialog.java \
- ImageListDialog.java \
- LogTaskListener.java \
- Process.java \
- ProcessErrorHandler.java \
- ProcessErrors.java \
- ProcessStatusRenderer.java \
- StatusDialog.java \
- StylePreview.java \
- TOCPreview.java \
- WebWizard.java \
- WebWizardConst.java \
- WebWizardDialog.java \
- WebWizardDialogResources.java \
- WWD_Events.java \
- WWD_General.java \
- WWD_Startup.java \
- WWHID.java
-
-JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-ALLTAR : $(MISC)/web.component
-
-$(MISC)/web.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
- web.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_JAVA)$(JARTARGET)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt web.component
More information about the Libreoffice-commits
mailing list