Kaydet (Commit) 725b64a7 authored tarafından Vladimir Glazunov's avatar Vladimir Glazunov

CWS-TOOLING: integrate CWS killnonpro

ac apache-commons : solenv TOMCAT:tomcat NULL
ac apache-commons : solenv TOMCAT:tomcat NULL
ac apache-commons usr1 - all ac_mkout NULL
ac apache-commons\java\codec nmake - all ac_codec NULL
ac apache-commons\java\lang nmake - all ac_lang NULL
......
......@@ -37,7 +37,7 @@ TARGET=rpt_templates
no_common_build_zip=true
EXTENSION_VERSION_BASE=1.0.0
.IF "$(PRODUCT)" != ""
.IF "$(DBG_LEVEL)" == "0"
EXTENSION_VERSION=$(EXTENSION_VERSION_BASE)
.ELSE
EXTENSION_VERSION=$(EXTENSION_VERSION_BASE).$(BUILD)
......
......@@ -33,7 +33,6 @@
#include "precompiled_sdext.hxx"
#include "configurationaccess.hxx"
#include <comphelper/processfactory.hxx>
#include <com/sun/star/frame/XComponentLoader.hpp>
#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
#include <com/sun/star/util/XChangesBatch.hpp>
......
......@@ -60,7 +60,6 @@
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/container/XContainerQuery.hpp>
#include <com/sun/star/ucb/InteractiveAugmentedIOException.hpp>
#include <comphelper/types.hxx>
using namespace ::rtl;
......
......@@ -33,10 +33,10 @@
#define _FILEOPEN_DIALOG_HXX_
#include <vector>
#include <comphelper/processfactory.hxx>
#include <com/sun/star/beans/StringPair.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/ui/dialogs/XFilePicker.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
class FileOpenDialog
{
......
......@@ -36,6 +36,8 @@
#include "impoptimizer.hxx"
#include <osl/file.hxx>
#include <com/sun/star/lang/IllegalArgumentException.hpp>
using namespace ::rtl;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::util;
......
......@@ -39,7 +39,6 @@
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/frame/XController.hpp>
#include <comphelper/property.hxx>
// ----------------
// - PPPOptimizer -
......
......@@ -42,7 +42,6 @@
#include <cppuhelper/exc_hlp.hxx>
#include <cppuhelper/compbase2.hxx>
#include <cppuhelper/basemutex.hxx>
#include <comphelper/anytostring.hxx>
using namespace com::sun::star;
......@@ -150,12 +149,6 @@ bool getPassword( const uno::Reference< task::XInteractionHandler >& xHandler,
}
catch( uno::Exception& )
{
#if 0
OSL_ENSURE( false,
rtl::OUStringToOString(
comphelper::anyToString( cppu::getCaughtException() ),
RTL_TEXTENCODING_UTF8 ).getStr() );
#endif
}
OSL_TRACE( "request %s selected\n", pRequest->isSelected() ? "was" : "was not" );
......
......@@ -35,7 +35,6 @@
#include "odfemitter.hxx"
#include <rtl/ustrbuf.hxx>
#include <comphelper/anytostring.hxx>
#include <cppuhelper/exc_hlp.hxx>
#include <com/sun/star/io/XInputStream.hpp>
#include <com/sun/star/io/XOutputStream.hpp>
......
......@@ -37,7 +37,6 @@
#include "saxattrlist.hxx"
#include <rtl/strbuf.hxx>
#include <comphelper/anytostring.hxx>
#include <cppuhelper/exc_hlp.hxx>
#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
......@@ -62,12 +61,6 @@ SaxEmitter::SaxEmitter( const uno::Reference< xml::sax::XDocumentHandler >& xDoc
}
catch( xml::sax::SAXException& )
{
#if 0
OSL_ENSURE( false,
rtl::OUStringToOString(
comphelper::anyToString( cppu::getCaughtException() ),
RTL_TEXTENCODING_UTF8 ).getStr() );
#endif
}
#if OSL_DEBUG_LEVEL > 1
static const char* pDir = getenv( "DBG_PDFIMPORT_DIR" );
......@@ -99,12 +92,6 @@ SaxEmitter::~SaxEmitter()
}
catch( xml::sax::SAXException& )
{
#if 0
OSL_ENSURE( false,
rtl::OUStringToOString(
comphelper::anyToString( cppu::getCaughtException() ),
RTL_TEXTENCODING_UTF8 ).getStr() );
#endif
}
#if OSL_DEBUG_LEVEL > 1
if( pStream )
......@@ -127,12 +114,6 @@ void SaxEmitter::beginTag( const char* pTag, const PropertyMap& rProperties )
}
catch( xml::sax::SAXException& )
{
#if 0
OSL_ENSURE( false,
rtl::OUStringToOString(
comphelper::anyToString( cppu::getCaughtException() ),
RTL_TEXTENCODING_UTF8 ).getStr() );
#endif
}
#if OSL_DEBUG_LEVEL > 1
if( pStream )
......@@ -167,12 +148,6 @@ void SaxEmitter::write( const rtl::OUString& rText )
}
catch( xml::sax::SAXException& )
{
#if 0
OSL_ENSURE( false,
rtl::OUStringToOString(
comphelper::anyToString( cppu::getCaughtException() ),
RTL_TEXTENCODING_UTF8 ).getStr() );
#endif
}
#if OSL_DEBUG_LEVEL > 1
if( pStream )
......@@ -193,12 +168,6 @@ void SaxEmitter::endTag( const char* pTag )
}
catch( xml::sax::SAXException& )
{
#if 0
OSL_ENSURE( false,
rtl::OUStringToOString(
comphelper::anyToString( cppu::getCaughtException() ),
RTL_TEXTENCODING_UTF8 ).getStr() );
#endif
}
#if OSL_DEBUG_LEVEL > 1
if( pStream )
......
......@@ -38,7 +38,6 @@
#include <cppuhelper/factory.hxx>
#include <cppuhelper/implementationentry.hxx>
#include <comphelper/servicedecl.hxx>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
......
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
#
# Copyright 2008 by Sun Microsystems, Inc.
#
# OpenOffice.org - a multi-platform office productivity suite
......@@ -70,6 +70,7 @@ SHL1STDLIBS=\
$(COMPHELPERLIB) \
$(CPPUHELPERLIB) \
$(CPPUNITLIB) \
$(TESTSHL2LIB) \
$(ZLIB3RDLIB) \
$(CPPULIB) \
$(SALLIB)
......@@ -103,6 +104,7 @@ APP1STDLIBS=\
$(COMPHELPERLIB) \
$(CPPUHELPERLIB) \
$(CPPUNITLIB) \
$(TESTSHL2LIB) \
$(ZLIB3RDLIB) \
$(CPPULIB) \
$(SALLIB)
......@@ -131,6 +133,7 @@ APP2STDLIBS=\
$(COMPHELPERLIB) \
$(CPPUHELPERLIB) \
$(CPPUNITLIB) \
$(TESTSHL2LIB) \
$(ZLIB3RDLIB) \
$(CPPULIB) \
$(SALLIB)
......@@ -161,5 +164,5 @@ APP2STDLIBS=\
@echo ----------------------------------------------------------
testshl2 -forward $(BIN)$/ $(SHL1TARGETN)
$(TOUCH) $@
#ALLTAR : $(MISC)$/pdfi_unittest_succeeded
......@@ -48,7 +48,7 @@
#include <rtl/math.hxx>
#include <osl/file.hxx>
#include <osl/process.h>
#include <cppunit/simpleheader.hxx>
#include <testshl/simpleheader.hxx>
#include <cppuhelper/compbase1.hxx>
#include <cppuhelper/bootstrap.hxx>
#include <cppuhelper/basemutex.hxx>
......
......@@ -147,8 +147,8 @@
<file file="${commons-httpclient-jar}"/>
<file file="${commons-lang-jar}"/>
<file file="${commons-logging-jar}"/>
<zipfileset file="${solar.bin}/xslt/export/wiki/odt2mediawiki.xsl" casesensitive="yes" fullpath="filter/odt2mediawiki.xsl"/>
<zipfileset file="${solar.bin}/xslt/export/wiki/mediawiki.ott" casesensitive="yes" fullpath="templates/MediaWiki/mediawiki.ott"/>
<zipfileset file="src/filter/odt2mediawiki.xsl" casesensitive="yes" fullpath="filter/odt2mediawiki.xsl"/>
<zipfileset file="src/filter/mediawiki.ott" casesensitive="yes" fullpath="templates/MediaWiki/mediawiki.ott"/>
<zipfileset dir="${solar.bin}/xslt/export/xsltml" casesensitive="yes" prefix="filter/math"/>
<zipfileset dir="src" includes="uno-extension-manifest.xml" casesensitive="yes" fullpath="META-INF/manifest.xml"/>
<zipfileset dir="dialogs" includes="**/*.xdl,**/*.xba,**/*.xlb" casesensitive="yes" prefix="WikiEditor"/>
......@@ -170,6 +170,8 @@
<fileset dir="${out}/misc/${target}/merge/org/openoffice/TypeDetection" includes="*.xcu" casesensitive="yes"/>
-->
<fileset dir="src/registry/data/org/openoffice/TypeDetection" includes="*.xcu" casesensitive="yes"/>
<zipfileset file="src/filter/odt2mediawiki.xsl" casesensitive="yes" fullpath="filter/odt2mediawiki.xsl"/>
<zipfileset file="src/filter/mediawiki.ott" casesensitive="yes" fullpath="templates/MediaWiki/mediawiki.ott"/>
<zipfileset dir="${out}/misc/${target}/help" includes="**/*.xhp,component.txt" casesensitive="yes" prefix="help"/>
<zipfileset dir="dialogs" includes="**/*.xdl,**/*.xba,**/*.xlb" casesensitive="yes" prefix="WikiEditor"/>
<zipfileset dir="src" includes="uno-extension-manifest.xml" casesensitive="yes" fullpath="META-INF/manifest.xml"/>
......
This diff is collapsed.
swext swext : l10n javaunohelper ridljar unoil jurt APACHE_COMMONS:apache-commons officecfg readlicense_oo xsltml filter NULL
swext swext : officecfg l10n javaunohelper ridljar unoil jurt APACHE_COMMONS:apache-commons readlicense_oo xsltml NULL
swext swext usr1 - all swext_mkout NULL
swext swext\mediawiki\help nmake - all swext_mwhelp NULL
swext swext\mediawiki\src\registry\schema\org\openoffice\Office\Custom nmake - all swext_mwschema NULL
......
xp xpdf : solenv sal soltools NULL
xp xpdf : solenv soltools NULL
xp xpdf nmake - all xp_xpdf NULL
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment