2010-10-14 08:27:31 +02:00
|
|
|
|
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
2000-09-18 16:07:07 +00:00
|
|
|
|
/*************************************************************************
|
|
|
|
|
*
|
2008-04-10 08:39:13 +00:00
|
|
|
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
2000-09-18 16:07:07 +00:00
|
|
|
|
*
|
2010-02-12 15:01:35 +01:00
|
|
|
|
* Copyright 2000, 2010 Oracle and/or its affiliates.
|
2000-09-18 16:07:07 +00:00
|
|
|
|
*
|
2008-04-10 08:39:13 +00:00
|
|
|
|
* OpenOffice.org - a multi-platform office productivity suite
|
2000-09-18 16:07:07 +00:00
|
|
|
|
*
|
2008-04-10 08:39:13 +00:00
|
|
|
|
* This file is part of OpenOffice.org.
|
2000-09-18 16:07:07 +00:00
|
|
|
|
*
|
2008-04-10 08:39:13 +00:00
|
|
|
|
* 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.
|
2000-09-18 16:07:07 +00:00
|
|
|
|
*
|
2008-04-10 08:39:13 +00:00
|
|
|
|
* 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).
|
2000-09-18 16:07:07 +00:00
|
|
|
|
*
|
2008-04-10 08:39:13 +00:00
|
|
|
|
* 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.
|
2000-09-18 16:07:07 +00:00
|
|
|
|
*
|
|
|
|
|
************************************************************************/
|
2006-09-17 07:16:49 +00:00
|
|
|
|
|
2012-02-08 14:34:22 +01:00
|
|
|
|
#include "sal/config.h"
|
|
|
|
|
|
2012-02-08 22:07:23 +01:00
|
|
|
|
#include <cstddef>
|
2012-02-08 14:34:22 +01:00
|
|
|
|
#include <cstring>
|
|
|
|
|
|
2012-02-08 22:07:23 +01:00
|
|
|
|
#include "boost/scoped_ptr.hpp"
|
2000-09-18 16:07:07 +00:00
|
|
|
|
#include <stdio.h>
|
|
|
|
|
#include <stdlib.h>
|
2012-02-08 22:07:23 +01:00
|
|
|
|
#include "common.hxx"
|
2000-09-18 16:07:07 +00:00
|
|
|
|
#include "export.hxx"
|
2012-02-02 09:11:38 +01:00
|
|
|
|
#include "helper.hxx"
|
2000-09-18 16:07:07 +00:00
|
|
|
|
#include "tokens.h"
|
2004-11-18 07:16:38 +00:00
|
|
|
|
#include <iostream>
|
2011-07-01 22:27:20 +01:00
|
|
|
|
#include <rtl/strbuf.hxx>
|
2011-08-29 23:03:08 +01:00
|
|
|
|
|
2011-07-01 22:27:20 +01:00
|
|
|
|
extern "C" { int yyerror( const char * ); }
|
|
|
|
|
extern "C" { int YYWarning( const char * ); }
|
2000-09-18 16:07:07 +00:00
|
|
|
|
|
2012-02-08 22:07:23 +01:00
|
|
|
|
namespace {
|
2000-09-18 16:07:07 +00:00
|
|
|
|
|
2012-02-08 22:07:23 +01:00
|
|
|
|
rtl::OString sActFileName; //TODO
|
|
|
|
|
MergeDataFile * pMergeDataFile = 0; //TODO
|
2000-09-18 16:07:07 +00:00
|
|
|
|
|
2012-02-08 22:07:23 +01:00
|
|
|
|
namespace global {
|
2004-06-25 11:40:49 +00:00
|
|
|
|
|
2012-02-08 22:07:23 +01:00
|
|
|
|
bool mergeMode = false;
|
|
|
|
|
bool errorLog = true;
|
|
|
|
|
char const * prj = 0;
|
|
|
|
|
char const * prjRoot = 0;
|
|
|
|
|
char const * inputPathname = 0;
|
|
|
|
|
char const * outputPathname = 0;
|
|
|
|
|
char const * mergeSrc;
|
|
|
|
|
boost::scoped_ptr< Export > exporter;
|
2004-07-13 12:51:32 +00:00
|
|
|
|
|
2012-02-08 22:07:23 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void handleArguments(int argc, char ** argv) {
|
|
|
|
|
for (int i = 1; i != argc; ++i) {
|
|
|
|
|
if (std::strcmp(argv[i], "-e") == 0) {
|
|
|
|
|
global::errorLog = false;
|
|
|
|
|
} else if (std::strcmp(argv[i], "-i") == 0) {
|
|
|
|
|
if (++i == argc) {
|
|
|
|
|
global::inputPathname = 0; // no valid command line
|
2000-09-18 16:07:07 +00:00
|
|
|
|
break;
|
2012-02-08 22:07:23 +01:00
|
|
|
|
}
|
|
|
|
|
global::inputPathname = argv[i];
|
|
|
|
|
} else if (std::strcmp(argv[i], "-l") == 0) {
|
|
|
|
|
if (++i == argc) {
|
|
|
|
|
global::inputPathname = 0; // no valid command line
|
2000-09-18 16:07:07 +00:00
|
|
|
|
break;
|
2012-02-08 22:07:23 +01:00
|
|
|
|
}
|
|
|
|
|
Export::sLanguages = argv[i];
|
|
|
|
|
} else if (std::strcmp(argv[i], "-m") == 0) {
|
|
|
|
|
if (++i == argc) {
|
|
|
|
|
global::inputPathname = 0; // no valid command line
|
2000-09-18 16:07:07 +00:00
|
|
|
|
break;
|
2012-02-08 22:07:23 +01:00
|
|
|
|
}
|
|
|
|
|
global::mergeSrc = argv[i];
|
|
|
|
|
global::mergeMode = true;
|
|
|
|
|
} else if (std::strcmp(argv[i], "-o") == 0) {
|
|
|
|
|
if (++i == argc) {
|
|
|
|
|
global::inputPathname = 0; // no valid command line
|
2000-09-18 16:07:07 +00:00
|
|
|
|
break;
|
2012-02-08 22:07:23 +01:00
|
|
|
|
}
|
|
|
|
|
global::outputPathname = argv[i];
|
|
|
|
|
} else if (std::strcmp(argv[i], "-p") == 0) {
|
|
|
|
|
if (++i == argc) {
|
|
|
|
|
global::inputPathname = 0; // no valid command line
|
2000-09-18 16:07:07 +00:00
|
|
|
|
break;
|
2012-02-08 22:07:23 +01:00
|
|
|
|
}
|
|
|
|
|
global::prj = argv[i];
|
|
|
|
|
} else if (std::strcmp(argv[i], "-r") == 0) {
|
|
|
|
|
if (++i == argc) {
|
|
|
|
|
global::inputPathname = 0; // no valid command line
|
2001-05-23 07:05:40 +00:00
|
|
|
|
break;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
2012-02-08 22:07:23 +01:00
|
|
|
|
global::prjRoot = argv[i];
|
|
|
|
|
} else {
|
|
|
|
|
global::inputPathname = 0; // no valid command line
|
|
|
|
|
break;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
2012-02-08 22:07:23 +01:00
|
|
|
|
if (global::inputPathname == 0 || global::outputPathname == 0) {
|
|
|
|
|
std::fprintf(
|
|
|
|
|
stderr,
|
|
|
|
|
("Syntax: transex3 [-p Prj] [-r PrjRoot] -i FileIn -o FileOut"
|
|
|
|
|
" [-m DataBase] [-e] [-l l1,l2,...]\n"
|
|
|
|
|
" Prj: Project\n"
|
|
|
|
|
" PrjRoot: Path to project root (../.. etc.)\n"
|
|
|
|
|
" FileIn: Source files (*.src)\n"
|
|
|
|
|
" FileOut: Destination file (*.*)\n"
|
|
|
|
|
" DataBase: Mergedata (*.sdf)\n"
|
|
|
|
|
" -e: Disable writing errorlog\n"
|
|
|
|
|
" -l: Restrict the handled languages; l1, l2, ... are elements of"
|
|
|
|
|
" (de, en-US, ...)\n"));
|
|
|
|
|
std::exit(EXIT_FAILURE);
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
2012-02-08 22:07:23 +01:00
|
|
|
|
Export::InitLanguages();
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
2004-06-25 11:40:49 +00:00
|
|
|
|
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
|
|
|
|
|
2012-02-08 22:07:23 +01:00
|
|
|
|
extern "C" {
|
2000-09-18 16:07:07 +00:00
|
|
|
|
|
2012-02-08 22:07:23 +01:00
|
|
|
|
FILE * init(int argc, char ** argv) {
|
|
|
|
|
handleArguments(argc, argv);
|
2001-06-07 12:33:31 +00:00
|
|
|
|
|
2012-02-08 22:07:23 +01:00
|
|
|
|
FILE * pFile = std::fopen(global::inputPathname, "r");
|
|
|
|
|
if (pFile == 0) {
|
|
|
|
|
std::fprintf(
|
|
|
|
|
stderr, "Error: Cannot open file \"%s\"\n",
|
|
|
|
|
global::inputPathname);
|
|
|
|
|
std::exit(EXIT_FAILURE);
|
|
|
|
|
}
|
2001-06-07 12:33:31 +00:00
|
|
|
|
|
2012-02-08 22:07:23 +01:00
|
|
|
|
if (global::mergeMode) {
|
|
|
|
|
global::exporter.reset(
|
|
|
|
|
new Export(global::mergeSrc, global::outputPathname));
|
|
|
|
|
} else {
|
|
|
|
|
sActFileName =
|
|
|
|
|
common::pathnameToken(global::inputPathname, global::prjRoot);
|
|
|
|
|
global::exporter.reset(new Export(global::outputPathname));
|
|
|
|
|
}
|
2000-09-18 16:07:07 +00:00
|
|
|
|
|
2012-02-08 22:07:23 +01:00
|
|
|
|
global::exporter->Init();
|
2001-06-07 12:33:31 +00:00
|
|
|
|
|
2012-02-08 22:07:23 +01:00
|
|
|
|
return pFile;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
|
|
|
|
|
2006-06-19 16:21:29 +00:00
|
|
|
|
int Parse( int nTyp, const char *pTokenText ){
|
2012-02-08 22:07:23 +01:00
|
|
|
|
global::exporter->Execute( nTyp , pTokenText );
|
2004-06-25 11:40:49 +00:00
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
void Close(){
|
2012-02-08 22:07:23 +01:00
|
|
|
|
global::exporter->pParseQueue->Close();
|
2012-02-13 21:46:50 +01:00
|
|
|
|
global::exporter.reset();
|
|
|
|
|
// avoid nontrivial Export dtor being executed during exit
|
2004-06-25 11:40:49 +00:00
|
|
|
|
}
|
2012-01-30 20:44:22 +00:00
|
|
|
|
|
2000-09-18 16:07:07 +00:00
|
|
|
|
int WorkOnTokenSet( int nTyp, char *pTokenText )
|
|
|
|
|
{
|
2004-06-25 11:40:49 +00:00
|
|
|
|
|
2012-02-08 22:07:23 +01:00
|
|
|
|
global::exporter->pParseQueue->Push( QueueEntry( nTyp , rtl::OString(pTokenText) ) );
|
2000-09-18 16:07:07 +00:00
|
|
|
|
return 1;
|
|
|
|
|
}
|
2004-06-25 11:40:49 +00:00
|
|
|
|
|
|
|
|
|
} // extern
|
2000-09-18 16:07:07 +00:00
|
|
|
|
|
|
|
|
|
extern "C" {
|
|
|
|
|
/*****************************************************************************/
|
|
|
|
|
int SetError()
|
|
|
|
|
/*****************************************************************************/
|
|
|
|
|
{
|
|
|
|
|
// set error at global instance of class Export
|
2012-02-08 22:07:23 +01:00
|
|
|
|
global::exporter->SetError();
|
2000-09-18 16:07:07 +00:00
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
extern "C" {
|
|
|
|
|
/*****************************************************************************/
|
|
|
|
|
int GetError()
|
|
|
|
|
/*****************************************************************************/
|
|
|
|
|
{
|
|
|
|
|
// get error at global instance of class Export
|
2012-02-08 22:07:23 +01:00
|
|
|
|
if (global::exporter->GetError())
|
2000-09-18 16:07:07 +00:00
|
|
|
|
return 1;
|
2010-07-29 10:56:19 +08:00
|
|
|
|
return sal_False;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//
|
|
|
|
|
// class ResData
|
|
|
|
|
//
|
|
|
|
|
|
|
|
|
|
/*****************************************************************************/
|
2011-12-07 10:49:55 +00:00
|
|
|
|
sal_Bool ResData::SetId( const rtl::OString& rId, sal_uInt16 nLevel )
|
2000-09-18 16:07:07 +00:00
|
|
|
|
/*****************************************************************************/
|
|
|
|
|
{
|
|
|
|
|
if ( nLevel > nIdLevel )
|
|
|
|
|
{
|
|
|
|
|
nIdLevel = nLevel;
|
|
|
|
|
sId = rId;
|
|
|
|
|
|
2011-07-01 22:27:20 +01:00
|
|
|
|
if ( bChild && bChildWithText )
|
|
|
|
|
{
|
|
|
|
|
rtl::OString sError(RTL_CONSTASCII_STRINGPARAM("ResId after child definition"));
|
|
|
|
|
yyerror(sError.getStr());
|
2000-09-18 16:07:07 +00:00
|
|
|
|
SetError();
|
|
|
|
|
}
|
|
|
|
|
|
2012-01-27 11:16:15 +00:00
|
|
|
|
if ( sId.getLength() > 255 )
|
2011-09-18 13:32:07 +01:00
|
|
|
|
{
|
|
|
|
|
YYWarning( "LocalId > 255 chars, truncating..." );
|
2012-02-15 15:26:43 +01:00
|
|
|
|
sId = sId.copy(0, 255).trim();
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
|
|
|
|
|
2010-07-29 10:56:19 +08:00
|
|
|
|
return sal_True;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
|
|
|
|
|
2010-07-29 10:56:19 +08:00
|
|
|
|
return sal_False;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//
|
|
|
|
|
// class Export
|
|
|
|
|
//
|
|
|
|
|
|
2012-02-08 22:07:23 +01:00
|
|
|
|
Export::Export(const rtl::OString &rOutput)
|
2006-06-19 16:21:29 +00:00
|
|
|
|
:
|
|
|
|
|
pWordTransformer( NULL ),
|
2010-07-29 10:56:19 +08:00
|
|
|
|
bDefine( sal_False ),
|
|
|
|
|
bNextMustBeDefineEOL( sal_False ),
|
2006-06-19 16:21:29 +00:00
|
|
|
|
nLevel( 0 ),
|
2000-09-18 16:07:07 +00:00
|
|
|
|
nList( LIST_NON ),
|
2006-06-19 16:21:29 +00:00
|
|
|
|
nListIndex( 0 ),
|
|
|
|
|
nListLevel( 0 ),
|
|
|
|
|
bSkipFile( false ),
|
2012-02-08 22:07:23 +01:00
|
|
|
|
sProject( global::prj ),
|
|
|
|
|
sRoot( global::prjRoot ),
|
|
|
|
|
bMergeMode( false ),
|
2010-07-29 10:56:19 +08:00
|
|
|
|
bError( sal_False ),
|
|
|
|
|
bReadOver( sal_False ),
|
|
|
|
|
bDontWriteOutput( sal_False ),
|
2012-02-08 22:07:23 +01:00
|
|
|
|
sFilename( global::inputPathname )
|
2000-09-18 16:07:07 +00:00
|
|
|
|
{
|
2004-06-25 11:40:49 +00:00
|
|
|
|
pParseQueue = new ParserQueue( *this );
|
|
|
|
|
|
|
|
|
|
if( !isInitialized ) InitLanguages();
|
2000-09-18 16:07:07 +00:00
|
|
|
|
// used when export is enabled
|
|
|
|
|
|
|
|
|
|
// open output stream
|
2012-02-08 22:07:23 +01:00
|
|
|
|
aOutput.open(rOutput.getStr(), std::ios_base::out | std::ios_base::trunc);
|
|
|
|
|
if (!aOutput.is_open()) {
|
|
|
|
|
fprintf(stderr, "ERROR : Can't open file %s\n", rOutput.getStr());
|
|
|
|
|
exit ( -1 );
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2012-02-08 22:07:23 +01:00
|
|
|
|
Export::Export(const rtl::OString &rMergeSource, const rtl::OString &rOutput)
|
2006-06-19 16:21:29 +00:00
|
|
|
|
:
|
|
|
|
|
pWordTransformer( NULL ),
|
2010-07-29 10:56:19 +08:00
|
|
|
|
bDefine( sal_False ),
|
|
|
|
|
bNextMustBeDefineEOL( sal_False ),
|
2006-06-19 16:21:29 +00:00
|
|
|
|
nLevel( 0 ),
|
2000-09-18 16:07:07 +00:00
|
|
|
|
nList( LIST_NON ),
|
2006-06-19 16:21:29 +00:00
|
|
|
|
nListIndex( 0 ),
|
|
|
|
|
nListLevel( 0 ),
|
|
|
|
|
bSkipFile( false ),
|
2012-02-08 22:07:23 +01:00
|
|
|
|
sProject( global::prj ),
|
|
|
|
|
sRoot( global::prjRoot ),
|
2010-07-29 10:56:19 +08:00
|
|
|
|
bMergeMode( sal_True ),
|
2000-09-18 16:07:07 +00:00
|
|
|
|
sMergeSrc( rMergeSource ),
|
2010-07-29 10:56:19 +08:00
|
|
|
|
bError( sal_False ),
|
|
|
|
|
bReadOver( sal_False ),
|
|
|
|
|
bDontWriteOutput( sal_False ),
|
2012-02-08 22:07:23 +01:00
|
|
|
|
sFilename( global::inputPathname )
|
2000-09-18 16:07:07 +00:00
|
|
|
|
{
|
2004-06-25 11:40:49 +00:00
|
|
|
|
pParseQueue = new ParserQueue( *this );
|
|
|
|
|
if( !isInitialized ) InitLanguages( bMergeMode );
|
2000-09-18 16:07:07 +00:00
|
|
|
|
// used when merge is enabled
|
|
|
|
|
|
|
|
|
|
// open output stream
|
2012-02-08 22:07:23 +01:00
|
|
|
|
aOutput.open(rOutput.getStr(), std::ios_base::out | std::ios_base::trunc);
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*****************************************************************************/
|
|
|
|
|
void Export::Init()
|
|
|
|
|
/*****************************************************************************/
|
|
|
|
|
{
|
|
|
|
|
// resets the internal status, used before parseing another file
|
|
|
|
|
sActPForm = "";
|
2010-07-29 10:56:19 +08:00
|
|
|
|
bDefine = sal_False;
|
|
|
|
|
bNextMustBeDefineEOL = sal_False;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
nLevel = 0;
|
|
|
|
|
nList = LIST_NON;
|
2011-11-27 08:44:15 +00:00
|
|
|
|
m_sListLang = rtl::OString();
|
2000-09-18 16:07:07 +00:00
|
|
|
|
nListIndex = 0;
|
2011-01-22 21:51:18 -08:00
|
|
|
|
for ( size_t i = 0, n = aResStack.size(); i < n; ++i )
|
|
|
|
|
delete aResStack[ i ];
|
|
|
|
|
aResStack.clear();
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*****************************************************************************/
|
|
|
|
|
Export::~Export()
|
|
|
|
|
/*****************************************************************************/
|
|
|
|
|
{
|
2004-06-25 11:40:49 +00:00
|
|
|
|
if( pParseQueue )
|
|
|
|
|
delete pParseQueue;
|
2012-02-08 22:07:23 +01:00
|
|
|
|
aOutput.close();
|
2011-01-22 21:51:18 -08:00
|
|
|
|
for ( size_t i = 0, n = aResStack.size(); i < n; ++i )
|
|
|
|
|
delete aResStack[ i ];
|
|
|
|
|
aResStack.clear();
|
2000-09-18 16:07:07 +00:00
|
|
|
|
|
2012-02-08 22:07:23 +01:00
|
|
|
|
if ( bMergeMode ) {
|
2000-09-18 16:07:07 +00:00
|
|
|
|
if ( !pMergeDataFile )
|
2012-02-08 22:07:23 +01:00
|
|
|
|
pMergeDataFile = new MergeDataFile(sMergeSrc, global::inputPathname, global::errorLog);
|
2000-09-18 16:07:07 +00:00
|
|
|
|
|
|
|
|
|
delete pMergeDataFile;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*****************************************************************************/
|
2006-06-19 16:21:29 +00:00
|
|
|
|
int Export::Execute( int nToken, const char * pToken )
|
2000-09-18 16:07:07 +00:00
|
|
|
|
/*****************************************************************************/
|
|
|
|
|
{
|
2006-06-19 16:21:29 +00:00
|
|
|
|
|
2012-02-02 09:11:38 +01:00
|
|
|
|
rtl::OString sToken( pToken );
|
|
|
|
|
rtl::OString sOrig( sToken );
|
2010-07-29 10:56:19 +08:00
|
|
|
|
sal_Bool bWriteToMerged = bMergeMode;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
|
2011-11-18 21:03:31 +00:00
|
|
|
|
if ( nToken == CONDITION )
|
|
|
|
|
{
|
|
|
|
|
rtl::OString sTestToken(pToken);
|
2012-02-15 15:26:43 +01:00
|
|
|
|
sTestToken = sTestToken.replaceAll("\t", rtl::OString()).
|
|
|
|
|
replaceAll(" ", rtl::OString());
|
2012-02-10 21:53:20 +01:00
|
|
|
|
if (( !bReadOver ) && ( sTestToken.indexOf("#ifndef__RSC_PARSER") == 0 ))
|
2010-07-29 10:56:19 +08:00
|
|
|
|
bReadOver = sal_True;
|
2012-02-10 21:53:20 +01:00
|
|
|
|
else if (( bReadOver ) && ( sTestToken.indexOf("#endif") == 0 ))
|
2010-07-29 10:56:19 +08:00
|
|
|
|
bReadOver = sal_False;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
|
|
|
|
if ((( nToken < FILTER_LEVEL ) || ( bReadOver )) &&
|
|
|
|
|
(!(( bNextMustBeDefineEOL ) && ( sOrig == "\n" )))) {
|
|
|
|
|
// this tokens are not mandatory for parsing, so ignore them ...
|
|
|
|
|
if ( bMergeMode )
|
2004-06-25 11:40:49 +00:00
|
|
|
|
WriteToMerged( sOrig , false ); // ... ore whrite them directly to dest.
|
2000-09-18 16:07:07 +00:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ResData *pResData = NULL;
|
|
|
|
|
if ( nLevel ) {
|
|
|
|
|
// res. exists at cur. level
|
2011-01-22 21:51:18 -08:00
|
|
|
|
pResData = ( (nLevel-1) < aResStack.size() ) ? aResStack[ nLevel-1 ] : NULL;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
|
|
|
|
else if (( nToken != RESSOURCE ) &&
|
|
|
|
|
( nToken != RESSOURCEEXPR ) &&
|
|
|
|
|
( nToken != SMALRESSOURCE ) &&
|
|
|
|
|
( nToken != LEVELUP ) &&
|
2004-06-25 11:40:49 +00:00
|
|
|
|
( nToken != NORMDEFINE ) &&
|
2000-09-18 16:07:07 +00:00
|
|
|
|
( nToken != RSCDEFINE ) &&
|
|
|
|
|
( nToken != CONDITION ) &&
|
|
|
|
|
( nToken != PRAGMA ))
|
|
|
|
|
{
|
|
|
|
|
// no res. exists at cur. level so return
|
|
|
|
|
if ( bMergeMode )
|
2004-06-25 11:40:49 +00:00
|
|
|
|
WriteToMerged( sOrig , false );
|
2000-09-18 16:07:07 +00:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
2004-06-25 11:40:49 +00:00
|
|
|
|
// #define NO_LOCALIZE_EXPORT
|
|
|
|
|
if( bSkipFile ){
|
|
|
|
|
if ( bMergeMode ) {
|
|
|
|
|
WriteToMerged( sOrig , false );
|
|
|
|
|
}
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
2000-09-18 16:07:07 +00:00
|
|
|
|
|
|
|
|
|
if ( bDefine ) {
|
|
|
|
|
if (( nToken != EMPTYLINE ) && ( nToken != LEVELDOWN ) && ( nToken != LEVELUP )) {
|
|
|
|
|
// cur. res. defined in macro
|
|
|
|
|
if ( bNextMustBeDefineEOL ) {
|
|
|
|
|
if ( nToken != RSCDEFINELEND ) {
|
|
|
|
|
// end of macro found, so destroy res.
|
2010-07-29 10:56:19 +08:00
|
|
|
|
bDefine = sal_False;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
if ( bMergeMode ) {
|
|
|
|
|
MergeRest( pResData );
|
|
|
|
|
}
|
2010-07-29 10:56:19 +08:00
|
|
|
|
bNextMustBeDefineEOL = sal_False;
|
2006-06-19 16:21:29 +00:00
|
|
|
|
Execute( LEVELDOWN, "" );
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
// next line also in macro definition
|
2010-07-29 10:56:19 +08:00
|
|
|
|
bNextMustBeDefineEOL = sal_False;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
if ( bMergeMode )
|
2004-06-25 11:40:49 +00:00
|
|
|
|
WriteToMerged( sOrig , false );
|
2000-09-18 16:07:07 +00:00
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2010-07-29 10:56:19 +08:00
|
|
|
|
sal_Bool bExecuteDown = sal_False;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
if ( nToken != LEVELDOWN ) {
|
2010-07-29 10:56:19 +08:00
|
|
|
|
sal_uInt16 nOpen = 0;
|
|
|
|
|
sal_uInt16 nClose = 0;
|
|
|
|
|
sal_Bool bReadOver1 = sal_False;
|
|
|
|
|
sal_uInt16 i = 0;
|
2012-02-02 09:11:38 +01:00
|
|
|
|
for ( i = 0; i < sToken.getLength(); i++ ) {
|
|
|
|
|
if ( sToken[i] == '"' )
|
2006-06-19 16:21:29 +00:00
|
|
|
|
bReadOver1 = !bReadOver1;
|
2012-02-02 09:11:38 +01:00
|
|
|
|
if ( !bReadOver1 && ( sToken[i] == '{' ))
|
2000-09-18 16:07:07 +00:00
|
|
|
|
nOpen++;
|
|
|
|
|
}
|
|
|
|
|
|
2010-07-29 10:56:19 +08:00
|
|
|
|
bReadOver1 = sal_False;
|
2012-02-02 09:11:38 +01:00
|
|
|
|
for ( i = 0; i < sToken.getLength(); i++ ) {
|
|
|
|
|
if ( sToken[i] == '"' )
|
2006-06-19 16:21:29 +00:00
|
|
|
|
bReadOver1 = !bReadOver1;
|
2012-02-02 09:11:38 +01:00
|
|
|
|
if ( !bReadOver1 && ( sToken[i] == '}' ))
|
2000-09-18 16:07:07 +00:00
|
|
|
|
nClose++;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if ( nOpen < nClose )
|
2010-07-29 10:56:19 +08:00
|
|
|
|
bExecuteDown = sal_True;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
|
|
|
|
switch ( nToken ) {
|
2004-06-25 11:40:49 +00:00
|
|
|
|
|
|
|
|
|
case NORMDEFINE:
|
2012-02-15 15:26:43 +01:00
|
|
|
|
sToken = sToken.replace('\r', ' ').replace('\t', ' ');
|
|
|
|
|
for (;;) {
|
|
|
|
|
sal_Int32 n = 0;
|
|
|
|
|
sToken = sToken.replaceFirst(" ", " ", &n);
|
|
|
|
|
if (n == -1) {
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
2012-02-02 09:11:38 +01:00
|
|
|
|
if( sToken.equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("#define NO_LOCALIZE_EXPORT")) ){
|
2004-06-25 11:40:49 +00:00
|
|
|
|
bSkipFile = true;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
if ( bMergeMode )
|
|
|
|
|
WriteToMerged( sOrig , false );
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
|
2000-09-18 16:07:07 +00:00
|
|
|
|
case RSCDEFINE:
|
2010-07-29 10:56:19 +08:00
|
|
|
|
bDefine = sal_True; // res. defined in macro
|
2004-06-25 11:40:49 +00:00
|
|
|
|
|
2000-09-18 16:07:07 +00:00
|
|
|
|
case RESSOURCE:
|
|
|
|
|
case RESSOURCEEXPR: {
|
2010-07-29 10:56:19 +08:00
|
|
|
|
bDontWriteOutput = sal_False;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
if ( nToken != RSCDEFINE )
|
2010-07-29 10:56:19 +08:00
|
|
|
|
bNextMustBeDefineEOL = sal_False;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
// this is the beginning of a new res.
|
|
|
|
|
nLevel++;
|
|
|
|
|
if ( nLevel > 1 ) {
|
Merge commit 'ooo/DEV300_m101' into intm101
The following builds for me:
basebmp, basegfx, comphelper, dtrans, i18npool, i18nutil, l10ntools, o3tl,
psprint_config, regexp, rsc, sax, sot, tools, ucbhelper, unotools, vcl
The rest still needs fixing ;-)
Conflicts:
canvas/prj/build.lst
canvas/source/cairo/cairo_textlayout.cxx
canvas/source/directx/dx_winstuff.hxx
canvas/source/tools/image.cxx
canvas/source/vcl/canvashelper.cxx
comphelper/inc/comphelper/documentconstants.hxx
comphelper/inc/comphelper/optionalvalue.hxx
comphelper/inc/comphelper/querydeep.hxx
comphelper/prj/build.lst
comphelper/qa/complex/makefile.mk
comphelper/qa/string/test_string_noadditional.cxx
comphelper/source/misc/componentmodule.cxx
comphelper/source/misc/mimeconfighelper.cxx
comphelper/source/misc/querydeep.cxx
comphelper/source/misc/uieventslogger.cxx
comphelper/source/property/TypeGeneration.cxx
comphelper/test/uno_iterators/uno_iterators.cxx
comphelper/util/makefile.mk
cppcanvas/source/mtfrenderer/implrenderer.cxx
dtrans/prj/build.lst
dtrans/source/generic/dtrans.cxx
dtrans/source/win32/dtobj/FmtFilter.cxx
i18npool/prj/build.lst
i18npool/source/localedata/data/localedata_others.map
i18npool/source/localedata/data/makefile.mk
i18npool/source/localedata/localedata.cxx
i18npool/source/localedata/saxparser.cxx
i18npool/source/registerservices/registerservices.cxx
i18npool/source/search/textsearch.cxx
l10ntools/inc/cfgmerge.hxx
l10ntools/inc/export.hxx
l10ntools/inc/gsicheck.hxx
l10ntools/inc/l10ntools/vosapp.hxx
l10ntools/inc/tagtest.hxx
l10ntools/inc/xmlparse.hxx
l10ntools/layout/layoutparse.cxx
l10ntools/layout/tralay.cxx
l10ntools/source/cfgmerge.cxx
l10ntools/source/export.cxx
l10ntools/source/export2.cxx
l10ntools/source/gsicheck.cxx
l10ntools/source/help/HelpLinker.cxx
l10ntools/source/lngex.cxx
l10ntools/source/lngmerge.cxx
l10ntools/source/merge.cxx
l10ntools/source/tagtest.cxx
l10ntools/source/xmlparse.cxx
padmin/source/fontentry.cxx
padmin/source/padialog.cxx
padmin/source/padialog.src
padmin/source/pamain.cxx
rsc/inc/rscarray.hxx
rsc/inc/rscclass.hxx
rsc/inc/rscclobj.hxx
rsc/inc/rsccont.hxx
rsc/inc/rscdb.hxx
rsc/inc/rscdef.hxx
rsc/inc/rscmgr.hxx
rsc/inc/rscrange.hxx
rsc/inc/rsctop.hxx
rsc/inc/vclrsc.hxx
rsc/source/parser/rscdb.cxx
rsc/source/parser/rscicpx.cxx
rsc/source/parser/rscinit.cxx
rsc/source/prj/start.cxx
rsc/source/res/rscarray.cxx
rsc/source/res/rscclass.cxx
rsc/source/res/rscclobj.cxx
rsc/source/res/rsccont.cxx
rsc/source/res/rscmgr.cxx
rsc/source/res/rscrange.cxx
rsc/source/res/rsctop.cxx
rsc/source/rsc/rsc.cxx
rsc/source/tools/rscdef.cxx
rsc/source/tools/rsctools.cxx
sax/source/expatwrap/sax_expat.cxx
sax/source/fastparser/facreg.cxx
sax/source/tools/fastserializer.cxx
sot/inc/sot/filelist.hxx
sot/inc/sot/object.hxx
sot/source/base/factory.cxx
sot/source/base/filelist.cxx
sot/source/sdstor/stg.cxx
sot/source/sdstor/stgcache.cxx
sot/source/sdstor/stgole.cxx
sot/source/sdstor/stgstrms.cxx
sot/source/sdstor/storage.cxx
sot/source/sdstor/ucbstorage.cxx
svl/inc/svl/cenumitm.hxx
svl/inc/svl/cintitem.hxx
svl/inc/svl/cntwall.hxx
svl/inc/svl/ctypeitm.hxx
svl/inc/svl/custritm.hxx
svl/inc/svl/dateitem.hxx
svl/inc/svl/filerec.hxx
svl/inc/svl/globalnameitem.hxx
svl/inc/svl/ilstitem.hxx
svl/inc/svl/imageitm.hxx
svl/inc/svl/intitem.hxx
svl/inc/svl/itempool.hxx
svl/inc/svl/itemset.hxx
svl/inc/svl/lckbitem.hxx
svl/inc/svl/poolitem.hxx
svl/inc/svl/ptitem.hxx
svl/inc/svl/rectitem.hxx
svl/inc/svl/sfontitm.hxx
svl/inc/svl/slstitm.hxx
svl/inc/svl/srchitem.hxx
svl/inc/svl/svarray.hxx
svl/inc/svl/svdde.hxx
svl/inc/svl/svstdarr.hxx
svl/inc/svl/szitem.hxx
svl/inc/svl/visitem.hxx
svl/inc/svl/zforlist.hxx
svl/inc/svl/zformat.hxx
svl/prj/build.lst
svl/qa/complex/ConfigItems/helper/ConfigItemTest.cxx
svl/qa/complex/ConfigItems/helper/makefile.mk
svl/qa/makefile.mk
svl/source/filepicker/pickerhelper.cxx
svl/source/filerec/filerec.cxx
svl/source/items/cenumitm.cxx
svl/source/items/cintitem.cxx
svl/source/items/cntwall.cxx
svl/source/items/ctypeitm.cxx
svl/source/items/custritm.cxx
svl/source/items/dateitem.cxx
svl/source/items/globalnameitem.cxx
svl/source/items/ilstitem.cxx
svl/source/items/imageitm.cxx
svl/source/items/intitem.cxx
svl/source/items/itempool.cxx
svl/source/items/itemprop.cxx
svl/source/items/itemset.cxx
svl/source/items/lckbitem.cxx
svl/source/items/poolio.cxx
svl/source/items/poolitem.cxx
svl/source/items/ptitem.cxx
svl/source/items/rectitem.cxx
svl/source/items/slstitm.cxx
svl/source/items/srchitem.cxx
svl/source/items/style.cxx
svl/source/items/szitem.cxx
svl/source/items/visitem.cxx
svl/source/items/whiter.cxx
svl/source/memtools/svarray.cxx
svl/source/misc/PasswordHelper.cxx
svl/source/misc/adrparse.cxx
svl/source/misc/lngmisc.cxx
svl/source/notify/brdcst.cxx
svl/source/notify/listener.cxx
svl/source/notify/listenerbase.cxx
svl/source/numbers/makefile.mk
svl/source/numbers/nbdll.cxx
svl/source/numbers/zforfind.cxx
svl/source/numbers/zforlist.cxx
svl/source/numbers/zformat.cxx
svl/source/numbers/zforscan.cxx
svl/source/passwordcontainer/passwordcontainer.cxx
svl/source/svdde/ddecli.cxx
svl/source/svdde/ddeimp.hxx
svl/source/svdde/ddemlos2.h
svl/source/svdde/ddesvr.cxx
svl/source/undo/undo.cxx
svl/source/uno/registerservices.cxx
svl/util/makefile.mk
svtools/bmpmaker/bmpsum.cxx
svtools/bmpmaker/g2g.cxx
svtools/bmpmaker/makefile.mk
svtools/inc/borderhelper.hxx
svtools/inc/svtools/accessiblefactory.hxx
svtools/inc/svtools/apearcfg.hxx
svtools/inc/svtools/brwbox.hxx
svtools/inc/svtools/ctrlbox.hxx
svtools/inc/svtools/ctrltool.hxx
svtools/inc/svtools/editbrowsebox.hxx
svtools/inc/svtools/ehdl.hxx
svtools/inc/svtools/embedhlp.hxx
svtools/inc/svtools/filter.hxx
svtools/inc/svtools/ivctrl.hxx
svtools/inc/svtools/parhtml.hxx
svtools/inc/svtools/printdlg.hxx
svtools/inc/svtools/rtftoken.h
svtools/inc/svtools/ruler.hxx
svtools/inc/svtools/svicnvw.hxx
svtools/inc/svtools/svlbitm.hxx
svtools/inc/svtools/svlbox.hxx
svtools/inc/svtools/svtreebx.hxx
svtools/inc/svtools/tabbar.hxx
svtools/inc/svtools/table/abstracttablecontrol.hxx
svtools/inc/svtools/taskbar.hxx
svtools/inc/svtools/textview.hxx
svtools/inc/svtools/valueset.hxx
svtools/source/brwbox/brwbox1.cxx
svtools/source/brwbox/brwbox2.cxx
svtools/source/brwbox/datwin.cxx
svtools/source/brwbox/datwin.hxx
svtools/source/brwbox/makefile.mk
svtools/source/config/apearcfg.cxx
svtools/source/config/htmlcfg.cxx
svtools/source/config/menuoptions.cxx
svtools/source/config/miscopt.cxx
svtools/source/contnr/cont_pch.cxx
svtools/source/contnr/ctrdll.cxx
svtools/source/contnr/fileview.cxx
svtools/source/contnr/imivctl1.cxx
svtools/source/contnr/ivctrl.cxx
svtools/source/contnr/makefile.mk
svtools/source/contnr/svcontnr.src
svtools/source/contnr/svicnvw.cxx
svtools/source/contnr/svimpbox.cxx
svtools/source/contnr/svimpicn.cxx
svtools/source/contnr/svlbitm.cxx
svtools/source/contnr/svtreebx.cxx
svtools/source/contnr/templwin.cxx
svtools/source/contnr/templwin.hxx
svtools/source/control/asynclink.cxx
svtools/source/control/ctrlbox.cxx
svtools/source/control/ctrldll.cxx
svtools/source/control/ctrltool.cxx
svtools/source/control/filectrl.cxx
svtools/source/control/filectrl.src
svtools/source/control/headbar.cxx
svtools/source/control/inettbc.cxx
svtools/source/control/makefile.mk
svtools/source/control/prgsbar.cxx
svtools/source/control/roadmap.cxx
svtools/source/control/ruler.cxx
svtools/source/control/scriptedtext.cxx
svtools/source/control/stdmenu.cxx
svtools/source/control/tabbar.cxx
svtools/source/control/taskbar.cxx
svtools/source/control/taskbox.cxx
svtools/source/control/taskmisc.cxx
svtools/source/control/taskstat.cxx
svtools/source/control/valueacc.cxx
svtools/source/control/valueset.cxx
svtools/source/dialogs/addresstemplate.cxx
svtools/source/dialogs/addresstemplate.src
svtools/source/dialogs/colrdlg.src
svtools/source/dialogs/filedlg2.cxx
svtools/source/dialogs/filedlg2.hxx
svtools/source/dialogs/makefile.mk
svtools/source/dialogs/printdlg.cxx
svtools/source/dialogs/printdlg.src
svtools/source/dialogs/propctrl.cxx
svtools/source/dialogs/propctrl.hxx
svtools/source/dialogs/property.cxx
svtools/source/edit/makefile.mk
svtools/source/edit/sychconv.cxx
svtools/source/edit/syntaxhighlight.cxx
svtools/source/edit/textdoc.cxx
svtools/source/edit/texteng.cxx
svtools/source/edit/textundo.cxx
svtools/source/edit/textview.cxx
svtools/source/filter.vcl/filter/SvFilterOptionsDialog.cxx
svtools/source/filter.vcl/filter/dlgejpg.cxx
svtools/source/filter.vcl/filter/dlgejpg.hxx
svtools/source/filter.vcl/filter/dlgejpg.src
svtools/source/filter.vcl/filter/dlgepng.cxx
svtools/source/filter.vcl/filter/dlgepng.hxx
svtools/source/filter.vcl/filter/dlgepng.src
svtools/source/filter.vcl/filter/dlgexpor.cxx
svtools/source/filter.vcl/filter/dlgexpor.hxx
svtools/source/filter.vcl/filter/dlgexpor.src
svtools/source/filter.vcl/filter/filter2.cxx
svtools/source/filter.vcl/filter/makefile.mk
svtools/source/filter.vcl/filter/sgfbram.cxx
svtools/source/filter.vcl/filter/sgvmain.cxx
svtools/source/filter.vcl/filter/sgvspln.cxx
svtools/source/filter.vcl/filter/strings.src
svtools/source/filter.vcl/jpeg/makefile.mk
svtools/source/filter.vcl/wmf/emfwr.cxx
svtools/source/filter.vcl/wmf/emfwr.hxx
svtools/source/filter.vcl/wmf/enhwmf.cxx
svtools/source/filter.vcl/wmf/winmtf.hxx
svtools/source/filter.vcl/wmf/wmfwr.cxx
svtools/source/filter.vcl/wmf/wmfwr.hxx
svtools/source/graphic/grfcache.cxx
svtools/source/graphic/grfcache.hxx
svtools/source/graphic/grfmgr.cxx
svtools/source/graphic/makefile.mk
svtools/source/inc/accessibletableimp.hxx
svtools/source/inc/svimpbox.hxx
svtools/source/java/patchjavaerror.src
svtools/source/misc/ehdl.cxx
svtools/source/misc/errtxt.src
svtools/source/misc/helpagentwindow.cxx
svtools/source/misc/imagemgr.cxx
svtools/source/misc/imagemgr.src
svtools/source/misc/imageresourceaccess.cxx
svtools/source/misc/imap.cxx
svtools/source/misc/langtab.src
svtools/source/misc/makefile.mk
svtools/source/misc/svtdata.cxx
svtools/source/misc/templatefoldercache.cxx
svtools/source/misc/transfer2.cxx
svtools/source/misc/undo.src
svtools/source/plugapp/commtest.cxx
svtools/source/plugapp/commtest.src
svtools/source/plugapp/makefile.mk
svtools/source/plugapp/testtool.src
svtools/source/productregistration/productregistration.cxx
svtools/source/svhtml/htmlkywd.cxx
svtools/source/svhtml/parhtml.cxx
svtools/source/svrtf/rtfkey2.cxx
svtools/source/svrtf/rtfkeywd.cxx
svtools/source/table/defaultinputhandler.cxx
svtools/source/table/makefile.mk
svtools/source/table/tablecontrol.cxx
svtools/source/table/tablecontrol_impl.cxx
svtools/source/table/tablecontrol_impl.hxx
svtools/source/table/tabledatawindow.cxx
svtools/source/table/tablegeometry.cxx
svtools/source/table/tablegeometry.hxx
svtools/source/toolpanel/makefile.mk
svtools/source/toolpanel/toolpaneldrawer.cxx
svtools/source/uno/addrtempuno.cxx
svtools/source/uno/miscservices.cxx
svtools/source/uno/svtxgridcontrol.cxx
svtools/source/uno/svtxgridcontrol.hxx
svtools/source/uno/toolboxcontroller.cxx
svtools/source/uno/treecontrolpeer.cxx
svtools/source/uno/unocontroltablemodel.cxx
svtools/source/uno/unocontroltablemodel.hxx
svtools/source/uno/unoimap.cxx
svtools/source/urlobj/inetimg.cxx
svtools/util/makefile.mk
svtools/workben/browser.cxx
svtools/workben/cui/makefile.mk
svtools/workben/makefile.mk
svtools/workben/stest.cxx
svtools/workben/toolpanel/makefile.mk
svtools/workben/urange.cxx
toolkit/inc/toolkit/awt/vclxdevice.hxx
toolkit/inc/toolkit/awt/vclxgraphics.hxx
toolkit/inc/toolkit/awt/vclxwindows.hxx
toolkit/inc/toolkit/controls/dialogcontrol.hxx
toolkit/inc/toolkit/helper/property.hxx
toolkit/inc/toolkit/helper/servicenames.hxx
toolkit/inc/toolkit/helper/throbberimpl.hxx
toolkit/qa/complex/toolkit/accessibility/_XAccessibleComponent.java
toolkit/source/awt/asynccallback.cxx
toolkit/source/awt/vclxgraphics.cxx
toolkit/source/awt/vclxtoolkit.cxx
toolkit/source/awt/vclxwindow.cxx
toolkit/source/awt/xsimpleanimation.cxx
toolkit/source/awt/xthrobber.cxx
toolkit/source/controls/dialogcontrol.cxx
toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
toolkit/source/controls/grid/defaultgriddatamodel.cxx
toolkit/source/controls/grid/gridcontrol.cxx
toolkit/source/controls/grid/initguard.hxx
toolkit/source/controls/unocontrol.cxx
toolkit/source/controls/unocontrolcontainer.cxx
toolkit/source/controls/unocontrols.cxx
toolkit/source/helper/listenermultiplexer.cxx
toolkit/source/helper/property.cxx
toolkit/source/helper/registerservices.cxx
toolkit/source/helper/servicenames.cxx
toolkit/source/helper/throbberimpl.cxx
toolkit/source/helper/tkresmgr.cxx
tools/StaticLibrary_ooopathutils.mk
tools/bootstrp/addexes/makefile.mk
tools/bootstrp/addexes2/makefile.mk
tools/bootstrp/addexes2/mkfilt.cxx
tools/bootstrp/command.cxx
tools/bootstrp/cppdep.cxx
tools/bootstrp/iserver.cxx
tools/bootstrp/makefile.mk
tools/bootstrp/mkcreate.cxx
tools/bootstrp/prj.cxx
tools/bootstrp/rscdep.cxx
tools/bootstrp/sstring.cxx
tools/inc/bootstrp/command.hxx
tools/inc/bootstrp/mkcreate.hxx
tools/inc/bootstrp/prj.hxx
tools/inc/bootstrp/sstring.hxx
tools/inc/tools/agapi.hxx
tools/inc/tools/agitem.hxx
tools/inc/tools/chapi.hxx
tools/inc/tools/download.hxx
tools/inc/tools/eacopier.hxx
tools/inc/tools/fract.hxx
tools/inc/tools/fsys.hxx
tools/inc/tools/geninfo.hxx
tools/inc/tools/globname.hxx
tools/inc/tools/inetmime.hxx
tools/inc/tools/multisel.hxx
tools/inc/tools/poly.hxx
tools/inc/tools/postsys.h
tools/inc/tools/postwin.h
tools/inc/tools/presys.h
tools/inc/tools/prewin.h
tools/inc/tools/pstm.hxx
tools/inc/tools/ref.hxx
tools/inc/tools/simplerm.hxx
tools/inc/tools/solar.h
tools/inc/tools/table.hxx
tools/inc/tools/urlkeys.hxx
tools/inc/tools/urlobj.hxx
tools/prj/build.lst
tools/prj/d.lst
tools/qa/makefile.mk
tools/source/communi/geninfo.cxx
tools/source/debug/debug.cxx
tools/source/fsys/dirent.cxx
tools/source/fsys/tdir.cxx
tools/source/fsys/unx.cxx
tools/source/fsys/urlobj.cxx
tools/source/generic/color.cxx
tools/source/generic/config.cxx
tools/source/generic/fract.cxx
tools/source/inet/inetmime.cxx
tools/source/memtools/multisel.cxx
tools/source/memtools/table.cxx
tools/source/rc/resmgr.cxx
tools/source/ref/globname.cxx
tools/source/ref/pstm.cxx
tools/source/solar/solar.c
tools/source/stream/strmos2.cxx
tools/source/stream/strmunx.cxx
tools/source/stream/strmwnt.cxx
tools/source/string/makefile.mk
tools/source/testtoolloader/testtoolloader.cxx
tools/test/makefile.mk
tools/util/makefile.mk
tools/win/inc/dll.hxx
tools/win/inc/parser.hxx
tools/win/inc/shellex.h
tools/win/inc/shutil.h
tools/win/inc/toolsdll.hxx
tools/win/inc/winshell.hxx
tools/workben/makefile.mk
ucbhelper/source/client/proxydecider.cxx
ucbhelper/workben/ucbexplorer/ucbexplorer.hrc
unotools/inc/unotools/unotunnelhelper.hxx
unotools/source/config/fltrcfg.cxx
unotools/source/config/lingucfg.cxx
unotools/source/config/misccfg.cxx
unotools/source/config/pathoptions.cxx
unotools/source/config/searchopt.cxx
unotools/source/i18n/localedatawrapper.cxx
unotools/source/ucbhelper/localfilehelper.cxx
unotools/source/ucbhelper/ucbhelper.cxx
unotools/source/ucbhelper/xtempfile.cxx
vcl/aqua/inc/salbmp.h
vcl/aqua/inc/salgdi.h
vcl/aqua/inc/salinst.h
vcl/aqua/source/app/salinst.cxx
vcl/aqua/source/gdi/aquaprintaccessoryview.mm
vcl/aqua/source/gdi/salgdi.cxx
vcl/aqua/source/gdi/salprn.cxx
vcl/aqua/source/window/salframeview.mm
vcl/aqua/source/window/salobj.cxx
vcl/inc/vcl/bitmap.hxx
vcl/inc/vcl/brdwin.hxx
vcl/inc/vcl/button.hxx
vcl/inc/vcl/cmdevt.hxx
vcl/inc/vcl/cvtgrf.hxx
vcl/inc/vcl/dialog.hxx
vcl/inc/vcl/dockwin.hxx
vcl/inc/vcl/event.hxx
vcl/inc/vcl/fixed.hxx
vcl/inc/vcl/fldunit.hxx
vcl/inc/vcl/floatwin.hxx
vcl/inc/vcl/gdimtf.hxx
vcl/inc/vcl/glyphcache.hxx
vcl/inc/vcl/graphite_adaptors.hxx
vcl/inc/vcl/graphite_features.hxx
vcl/inc/vcl/graphite_layout.hxx
vcl/inc/vcl/ilstbox.hxx
vcl/inc/vcl/image.h
vcl/inc/vcl/imgctrl.hxx
vcl/inc/vcl/impbmpconv.hxx
vcl/inc/vcl/impprn.hxx
vcl/inc/vcl/jobset.h
vcl/inc/vcl/keycodes.hxx
vcl/inc/vcl/lstbox.hxx
vcl/inc/vcl/mapunit.hxx
vcl/inc/vcl/menu.hxx
vcl/inc/vcl/msgbox.hxx
vcl/inc/vcl/outdev.hxx
vcl/inc/vcl/prndlg.hxx
vcl/inc/vcl/salatype.hxx
vcl/inc/vcl/salbmp.hxx
vcl/inc/vcl/salgdi.hxx
vcl/inc/vcl/salinst.hxx
vcl/inc/vcl/seleng.hxx
vcl/inc/vcl/settings.hxx
vcl/inc/vcl/smartid.hxx
vcl/inc/vcl/status.hxx
vcl/inc/vcl/strhelper.hxx
vcl/inc/vcl/svapp.hxx
vcl/inc/vcl/svdata.hxx
vcl/inc/vcl/syschild.hxx
vcl/inc/vcl/sysdata.hxx
vcl/inc/vcl/taskpanelist.hxx
vcl/inc/vcl/toolbox.hxx
vcl/inc/vcl/vclevent.hxx
vcl/inc/vcl/windata.hxx
vcl/inc/vcl/window.hxx
vcl/inc/vcl/wintypes.hxx
vcl/os2/source/app/salinst.cxx
vcl/os2/source/gdi/salgdi.cxx
vcl/os2/source/window/salmenu.cxx
vcl/os2/source/window/salobj.cxx
vcl/prj/build.lst
vcl/source/app/dbggui.cxx
vcl/source/app/help.cxx
vcl/source/app/idlemgr.cxx
vcl/source/app/settings.cxx
vcl/source/app/svapp.cxx
vcl/source/app/svdata.cxx
vcl/source/app/svmain.cxx
vcl/source/app/svmainhook.cxx
vcl/source/app/unohelp.cxx
vcl/source/app/vclevent.cxx
vcl/source/control/button.cxx
vcl/source/control/combobox.cxx
vcl/source/control/edit.cxx
vcl/source/control/field.cxx
vcl/source/control/fixed.cxx
vcl/source/control/ilstbox.cxx
vcl/source/control/imgctrl.cxx
vcl/source/control/makefile.mk
vcl/source/control/tabctrl.cxx
vcl/source/gdi/bitmap.cxx
vcl/source/gdi/bitmap2.cxx
vcl/source/gdi/bitmap4.cxx
vcl/source/gdi/bmpconv.cxx
vcl/source/gdi/cvtsvm.cxx
vcl/source/gdi/font.cxx
vcl/source/gdi/gdimtf.cxx
vcl/source/gdi/image.cxx
vcl/source/gdi/impimage.cxx
vcl/source/gdi/jobset.cxx
vcl/source/gdi/makefile.mk
vcl/source/gdi/metaact.cxx
vcl/source/gdi/outdev.cxx
vcl/source/gdi/outdev3.cxx
vcl/source/gdi/outdev4.cxx
vcl/source/gdi/outdevnative.cxx
vcl/source/gdi/pdfwriter.cxx
vcl/source/gdi/pdfwriter_impl.cxx
vcl/source/gdi/print3.cxx
vcl/source/gdi/salmisc.cxx
vcl/source/glyphs/gcach_ftyp.cxx
vcl/source/glyphs/gcach_ftyp.hxx
vcl/source/glyphs/glyphcache.cxx
vcl/source/glyphs/graphite_cache.cxx
vcl/source/glyphs/graphite_layout.cxx
vcl/source/glyphs/graphite_textsrc.hxx
vcl/source/helper/canvasbitmap.cxx
vcl/source/helper/smartid.cxx
vcl/source/helper/xconnection.cxx
vcl/source/src/btntext.src
vcl/source/src/images.src
vcl/source/src/print.src
vcl/source/window/accel.cxx
vcl/source/window/accmgr.cxx
vcl/source/window/brdwin.cxx
vcl/source/window/btndlg.cxx
vcl/source/window/dlgctrl.cxx
vcl/source/window/javachild.cxx
vcl/source/window/menu.cxx
vcl/source/window/msgbox.cxx
vcl/source/window/printdlg.cxx
vcl/source/window/status.cxx
vcl/source/window/syschild.cxx
vcl/source/window/toolbox.cxx
vcl/source/window/toolbox2.cxx
vcl/source/window/window.cxx
vcl/source/window/window2.cxx
vcl/source/window/wrkwin.cxx
vcl/unx/gtk/app/gtkdata.cxx
vcl/unx/gtk/app/gtkinst.cxx
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
vcl/unx/gtk/window/gtkframe.cxx
vcl/unx/gtk/window/gtkobject.cxx
vcl/unx/headless/svpbmp.hxx
vcl/unx/headless/svpgdi.cxx
vcl/unx/headless/svpgdi.hxx
vcl/unx/headless/svpinst.cxx
vcl/unx/headless/svpinst.hxx
vcl/unx/headless/svpprn.cxx
vcl/unx/headless/svpprn.hxx
vcl/unx/headless/svppspgraphics.cxx
vcl/unx/headless/svppspgraphics.hxx
vcl/unx/headless/svptext.cxx
vcl/unx/inc/dtint.hxx
vcl/unx/inc/plugins/gtk/gtkdata.hxx
vcl/unx/inc/pspgraphics.h
vcl/unx/inc/salbmp.h
vcl/unx/inc/saldata.hxx
vcl/unx/inc/saldisp.hxx
vcl/unx/inc/salgdi.h
vcl/unx/inc/salinst.h
vcl/unx/inc/xfont.hxx
vcl/unx/kde/kdedata.cxx
vcl/unx/kde4/KDESalGraphics.cxx
vcl/unx/source/app/keysymnames.cxx
vcl/unx/source/app/saldata.cxx
vcl/unx/source/app/saldisp.cxx
vcl/unx/source/app/salinst.cxx
vcl/unx/source/app/wmadaptor.cxx
vcl/unx/source/dtrans/X11_selection.cxx
vcl/unx/source/dtrans/X11_service.cxx
vcl/unx/source/gdi/makefile.mk
vcl/unx/source/gdi/pspgraphics.cxx
vcl/unx/source/gdi/salgdi.cxx
vcl/unx/source/gdi/salgdi3.cxx
vcl/unx/source/gdi/salprnpsp.cxx
vcl/unx/source/gdi/xfont.cxx
vcl/unx/source/gdi/xlfd_attr.cxx
vcl/unx/source/gdi/xlfd_attr.hxx
vcl/unx/source/gdi/xlfd_extd.cxx
vcl/unx/source/gdi/xlfd_extd.hxx
vcl/unx/source/gdi/xlfd_smpl.cxx
vcl/unx/source/gdi/xlfd_smpl.hxx
vcl/unx/source/printer/ppdparser.cxx
vcl/unx/source/printer/printerinfomanager.cxx
vcl/unx/source/window/salframe.cxx
vcl/unx/source/window/salmenu.cxx
vcl/unx/source/window/salobj.cxx
vcl/util/makefile2.pmk
vcl/win/inc/salbmp.h
vcl/win/inc/saldata.hxx
vcl/win/inc/salgdi.h
vcl/win/inc/salinst.h
vcl/win/source/app/saldata.cxx
vcl/win/source/app/salinst.cxx
vcl/win/source/gdi/salgdi.cxx
vcl/win/source/gdi/salgdi3.cxx
vcl/win/source/gdi/salprn.cxx
vcl/win/source/gdi/winlayout.cxx
vcl/win/source/window/salframe.cxx
vcl/win/source/window/salobj.cxx
vcl/workben/outdevgrind.cxx
vos/inc/vos/execabl.hxx
vos/inc/vos/macros.hxx
vos/inc/vos/pipe.hxx
vos/inc/vos/process.hxx
vos/inc/vos/refernce.hxx
vos/inc/vos/signal.hxx
vos/inc/vos/socket.hxx
vos/inc/vos/stream.hxx
vos/inc/vos/thread.hxx
vos/source/pipe.cxx
vos/source/process.cxx
vos/source/signal.cxx
vos/source/thread.cxx
vos/source/timer.cxx
2011-03-11 14:24:23 +01:00
|
|
|
|
aResStack[ nLevel - 2 ]->bChild = sal_True;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// create new instance for this res. and fill mandatory fields
|
|
|
|
|
|
2006-03-29 12:26:24 +00:00
|
|
|
|
pResData = new ResData( sActPForm, FullId() , sFilename );
|
2011-01-22 21:51:18 -08:00
|
|
|
|
aResStack.push_back( pResData );
|
2012-02-15 15:26:43 +01:00
|
|
|
|
sToken = sToken.replaceAll("\n", rtl::OString()).
|
|
|
|
|
replaceAll("\r", rtl::OString()).
|
|
|
|
|
replaceAll("{", rtl::OString()).replace('\t', ' ');
|
|
|
|
|
sToken = sToken.trim();
|
|
|
|
|
rtl::OString sTLower = sToken.getToken(0, ' ').toAsciiLowerCase();
|
2011-12-07 10:49:55 +00:00
|
|
|
|
pResData->sResTyp = sTLower;
|
2012-02-02 09:11:38 +01:00
|
|
|
|
rtl::OString sId( sToken.copy( pResData->sResTyp.getLength() + 1 ));
|
2012-02-02 21:36:11 +01:00
|
|
|
|
rtl::OString sCondition;
|
2012-02-02 09:11:38 +01:00
|
|
|
|
if ( sId.indexOf( '#' ) != -1 )
|
2011-11-18 21:03:31 +00:00
|
|
|
|
{
|
2000-09-18 16:07:07 +00:00
|
|
|
|
// between ResTyp, Id and paranthes is a precomp. condition
|
|
|
|
|
sCondition = "#";
|
2012-02-15 15:26:43 +01:00
|
|
|
|
sal_Int32 n = 0;
|
2012-02-10 21:53:20 +01:00
|
|
|
|
sId = sId.getToken(0, '#', n);
|
|
|
|
|
sCondition += sId.getToken(0, '#', n);
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
2012-02-15 15:26:43 +01:00
|
|
|
|
sId = sId.getToken(0, '/');
|
2000-09-18 16:07:07 +00:00
|
|
|
|
CleanValue( sId );
|
2012-02-15 15:26:43 +01:00
|
|
|
|
sId = sId.replaceAll("\t", rtl::OString());
|
2000-09-18 16:07:07 +00:00
|
|
|
|
pResData->SetId( sId, ID_LEVEL_IDENTIFIER );
|
2012-02-02 21:36:11 +01:00
|
|
|
|
if (!sCondition.isEmpty())
|
2011-09-18 13:32:07 +01:00
|
|
|
|
{
|
|
|
|
|
Execute( CONDITION, ""); // execute the precomp. condition
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case SMALRESSOURCE: {
|
2010-07-29 10:56:19 +08:00
|
|
|
|
bDontWriteOutput = sal_False;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
// this is the beginning of a new res.
|
2010-07-29 10:56:19 +08:00
|
|
|
|
bNextMustBeDefineEOL = sal_False;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
nLevel++;
|
|
|
|
|
if ( nLevel > 1 ) {
|
Merge commit 'ooo/DEV300_m101' into intm101
The following builds for me:
basebmp, basegfx, comphelper, dtrans, i18npool, i18nutil, l10ntools, o3tl,
psprint_config, regexp, rsc, sax, sot, tools, ucbhelper, unotools, vcl
The rest still needs fixing ;-)
Conflicts:
canvas/prj/build.lst
canvas/source/cairo/cairo_textlayout.cxx
canvas/source/directx/dx_winstuff.hxx
canvas/source/tools/image.cxx
canvas/source/vcl/canvashelper.cxx
comphelper/inc/comphelper/documentconstants.hxx
comphelper/inc/comphelper/optionalvalue.hxx
comphelper/inc/comphelper/querydeep.hxx
comphelper/prj/build.lst
comphelper/qa/complex/makefile.mk
comphelper/qa/string/test_string_noadditional.cxx
comphelper/source/misc/componentmodule.cxx
comphelper/source/misc/mimeconfighelper.cxx
comphelper/source/misc/querydeep.cxx
comphelper/source/misc/uieventslogger.cxx
comphelper/source/property/TypeGeneration.cxx
comphelper/test/uno_iterators/uno_iterators.cxx
comphelper/util/makefile.mk
cppcanvas/source/mtfrenderer/implrenderer.cxx
dtrans/prj/build.lst
dtrans/source/generic/dtrans.cxx
dtrans/source/win32/dtobj/FmtFilter.cxx
i18npool/prj/build.lst
i18npool/source/localedata/data/localedata_others.map
i18npool/source/localedata/data/makefile.mk
i18npool/source/localedata/localedata.cxx
i18npool/source/localedata/saxparser.cxx
i18npool/source/registerservices/registerservices.cxx
i18npool/source/search/textsearch.cxx
l10ntools/inc/cfgmerge.hxx
l10ntools/inc/export.hxx
l10ntools/inc/gsicheck.hxx
l10ntools/inc/l10ntools/vosapp.hxx
l10ntools/inc/tagtest.hxx
l10ntools/inc/xmlparse.hxx
l10ntools/layout/layoutparse.cxx
l10ntools/layout/tralay.cxx
l10ntools/source/cfgmerge.cxx
l10ntools/source/export.cxx
l10ntools/source/export2.cxx
l10ntools/source/gsicheck.cxx
l10ntools/source/help/HelpLinker.cxx
l10ntools/source/lngex.cxx
l10ntools/source/lngmerge.cxx
l10ntools/source/merge.cxx
l10ntools/source/tagtest.cxx
l10ntools/source/xmlparse.cxx
padmin/source/fontentry.cxx
padmin/source/padialog.cxx
padmin/source/padialog.src
padmin/source/pamain.cxx
rsc/inc/rscarray.hxx
rsc/inc/rscclass.hxx
rsc/inc/rscclobj.hxx
rsc/inc/rsccont.hxx
rsc/inc/rscdb.hxx
rsc/inc/rscdef.hxx
rsc/inc/rscmgr.hxx
rsc/inc/rscrange.hxx
rsc/inc/rsctop.hxx
rsc/inc/vclrsc.hxx
rsc/source/parser/rscdb.cxx
rsc/source/parser/rscicpx.cxx
rsc/source/parser/rscinit.cxx
rsc/source/prj/start.cxx
rsc/source/res/rscarray.cxx
rsc/source/res/rscclass.cxx
rsc/source/res/rscclobj.cxx
rsc/source/res/rsccont.cxx
rsc/source/res/rscmgr.cxx
rsc/source/res/rscrange.cxx
rsc/source/res/rsctop.cxx
rsc/source/rsc/rsc.cxx
rsc/source/tools/rscdef.cxx
rsc/source/tools/rsctools.cxx
sax/source/expatwrap/sax_expat.cxx
sax/source/fastparser/facreg.cxx
sax/source/tools/fastserializer.cxx
sot/inc/sot/filelist.hxx
sot/inc/sot/object.hxx
sot/source/base/factory.cxx
sot/source/base/filelist.cxx
sot/source/sdstor/stg.cxx
sot/source/sdstor/stgcache.cxx
sot/source/sdstor/stgole.cxx
sot/source/sdstor/stgstrms.cxx
sot/source/sdstor/storage.cxx
sot/source/sdstor/ucbstorage.cxx
svl/inc/svl/cenumitm.hxx
svl/inc/svl/cintitem.hxx
svl/inc/svl/cntwall.hxx
svl/inc/svl/ctypeitm.hxx
svl/inc/svl/custritm.hxx
svl/inc/svl/dateitem.hxx
svl/inc/svl/filerec.hxx
svl/inc/svl/globalnameitem.hxx
svl/inc/svl/ilstitem.hxx
svl/inc/svl/imageitm.hxx
svl/inc/svl/intitem.hxx
svl/inc/svl/itempool.hxx
svl/inc/svl/itemset.hxx
svl/inc/svl/lckbitem.hxx
svl/inc/svl/poolitem.hxx
svl/inc/svl/ptitem.hxx
svl/inc/svl/rectitem.hxx
svl/inc/svl/sfontitm.hxx
svl/inc/svl/slstitm.hxx
svl/inc/svl/srchitem.hxx
svl/inc/svl/svarray.hxx
svl/inc/svl/svdde.hxx
svl/inc/svl/svstdarr.hxx
svl/inc/svl/szitem.hxx
svl/inc/svl/visitem.hxx
svl/inc/svl/zforlist.hxx
svl/inc/svl/zformat.hxx
svl/prj/build.lst
svl/qa/complex/ConfigItems/helper/ConfigItemTest.cxx
svl/qa/complex/ConfigItems/helper/makefile.mk
svl/qa/makefile.mk
svl/source/filepicker/pickerhelper.cxx
svl/source/filerec/filerec.cxx
svl/source/items/cenumitm.cxx
svl/source/items/cintitem.cxx
svl/source/items/cntwall.cxx
svl/source/items/ctypeitm.cxx
svl/source/items/custritm.cxx
svl/source/items/dateitem.cxx
svl/source/items/globalnameitem.cxx
svl/source/items/ilstitem.cxx
svl/source/items/imageitm.cxx
svl/source/items/intitem.cxx
svl/source/items/itempool.cxx
svl/source/items/itemprop.cxx
svl/source/items/itemset.cxx
svl/source/items/lckbitem.cxx
svl/source/items/poolio.cxx
svl/source/items/poolitem.cxx
svl/source/items/ptitem.cxx
svl/source/items/rectitem.cxx
svl/source/items/slstitm.cxx
svl/source/items/srchitem.cxx
svl/source/items/style.cxx
svl/source/items/szitem.cxx
svl/source/items/visitem.cxx
svl/source/items/whiter.cxx
svl/source/memtools/svarray.cxx
svl/source/misc/PasswordHelper.cxx
svl/source/misc/adrparse.cxx
svl/source/misc/lngmisc.cxx
svl/source/notify/brdcst.cxx
svl/source/notify/listener.cxx
svl/source/notify/listenerbase.cxx
svl/source/numbers/makefile.mk
svl/source/numbers/nbdll.cxx
svl/source/numbers/zforfind.cxx
svl/source/numbers/zforlist.cxx
svl/source/numbers/zformat.cxx
svl/source/numbers/zforscan.cxx
svl/source/passwordcontainer/passwordcontainer.cxx
svl/source/svdde/ddecli.cxx
svl/source/svdde/ddeimp.hxx
svl/source/svdde/ddemlos2.h
svl/source/svdde/ddesvr.cxx
svl/source/undo/undo.cxx
svl/source/uno/registerservices.cxx
svl/util/makefile.mk
svtools/bmpmaker/bmpsum.cxx
svtools/bmpmaker/g2g.cxx
svtools/bmpmaker/makefile.mk
svtools/inc/borderhelper.hxx
svtools/inc/svtools/accessiblefactory.hxx
svtools/inc/svtools/apearcfg.hxx
svtools/inc/svtools/brwbox.hxx
svtools/inc/svtools/ctrlbox.hxx
svtools/inc/svtools/ctrltool.hxx
svtools/inc/svtools/editbrowsebox.hxx
svtools/inc/svtools/ehdl.hxx
svtools/inc/svtools/embedhlp.hxx
svtools/inc/svtools/filter.hxx
svtools/inc/svtools/ivctrl.hxx
svtools/inc/svtools/parhtml.hxx
svtools/inc/svtools/printdlg.hxx
svtools/inc/svtools/rtftoken.h
svtools/inc/svtools/ruler.hxx
svtools/inc/svtools/svicnvw.hxx
svtools/inc/svtools/svlbitm.hxx
svtools/inc/svtools/svlbox.hxx
svtools/inc/svtools/svtreebx.hxx
svtools/inc/svtools/tabbar.hxx
svtools/inc/svtools/table/abstracttablecontrol.hxx
svtools/inc/svtools/taskbar.hxx
svtools/inc/svtools/textview.hxx
svtools/inc/svtools/valueset.hxx
svtools/source/brwbox/brwbox1.cxx
svtools/source/brwbox/brwbox2.cxx
svtools/source/brwbox/datwin.cxx
svtools/source/brwbox/datwin.hxx
svtools/source/brwbox/makefile.mk
svtools/source/config/apearcfg.cxx
svtools/source/config/htmlcfg.cxx
svtools/source/config/menuoptions.cxx
svtools/source/config/miscopt.cxx
svtools/source/contnr/cont_pch.cxx
svtools/source/contnr/ctrdll.cxx
svtools/source/contnr/fileview.cxx
svtools/source/contnr/imivctl1.cxx
svtools/source/contnr/ivctrl.cxx
svtools/source/contnr/makefile.mk
svtools/source/contnr/svcontnr.src
svtools/source/contnr/svicnvw.cxx
svtools/source/contnr/svimpbox.cxx
svtools/source/contnr/svimpicn.cxx
svtools/source/contnr/svlbitm.cxx
svtools/source/contnr/svtreebx.cxx
svtools/source/contnr/templwin.cxx
svtools/source/contnr/templwin.hxx
svtools/source/control/asynclink.cxx
svtools/source/control/ctrlbox.cxx
svtools/source/control/ctrldll.cxx
svtools/source/control/ctrltool.cxx
svtools/source/control/filectrl.cxx
svtools/source/control/filectrl.src
svtools/source/control/headbar.cxx
svtools/source/control/inettbc.cxx
svtools/source/control/makefile.mk
svtools/source/control/prgsbar.cxx
svtools/source/control/roadmap.cxx
svtools/source/control/ruler.cxx
svtools/source/control/scriptedtext.cxx
svtools/source/control/stdmenu.cxx
svtools/source/control/tabbar.cxx
svtools/source/control/taskbar.cxx
svtools/source/control/taskbox.cxx
svtools/source/control/taskmisc.cxx
svtools/source/control/taskstat.cxx
svtools/source/control/valueacc.cxx
svtools/source/control/valueset.cxx
svtools/source/dialogs/addresstemplate.cxx
svtools/source/dialogs/addresstemplate.src
svtools/source/dialogs/colrdlg.src
svtools/source/dialogs/filedlg2.cxx
svtools/source/dialogs/filedlg2.hxx
svtools/source/dialogs/makefile.mk
svtools/source/dialogs/printdlg.cxx
svtools/source/dialogs/printdlg.src
svtools/source/dialogs/propctrl.cxx
svtools/source/dialogs/propctrl.hxx
svtools/source/dialogs/property.cxx
svtools/source/edit/makefile.mk
svtools/source/edit/sychconv.cxx
svtools/source/edit/syntaxhighlight.cxx
svtools/source/edit/textdoc.cxx
svtools/source/edit/texteng.cxx
svtools/source/edit/textundo.cxx
svtools/source/edit/textview.cxx
svtools/source/filter.vcl/filter/SvFilterOptionsDialog.cxx
svtools/source/filter.vcl/filter/dlgejpg.cxx
svtools/source/filter.vcl/filter/dlgejpg.hxx
svtools/source/filter.vcl/filter/dlgejpg.src
svtools/source/filter.vcl/filter/dlgepng.cxx
svtools/source/filter.vcl/filter/dlgepng.hxx
svtools/source/filter.vcl/filter/dlgepng.src
svtools/source/filter.vcl/filter/dlgexpor.cxx
svtools/source/filter.vcl/filter/dlgexpor.hxx
svtools/source/filter.vcl/filter/dlgexpor.src
svtools/source/filter.vcl/filter/filter2.cxx
svtools/source/filter.vcl/filter/makefile.mk
svtools/source/filter.vcl/filter/sgfbram.cxx
svtools/source/filter.vcl/filter/sgvmain.cxx
svtools/source/filter.vcl/filter/sgvspln.cxx
svtools/source/filter.vcl/filter/strings.src
svtools/source/filter.vcl/jpeg/makefile.mk
svtools/source/filter.vcl/wmf/emfwr.cxx
svtools/source/filter.vcl/wmf/emfwr.hxx
svtools/source/filter.vcl/wmf/enhwmf.cxx
svtools/source/filter.vcl/wmf/winmtf.hxx
svtools/source/filter.vcl/wmf/wmfwr.cxx
svtools/source/filter.vcl/wmf/wmfwr.hxx
svtools/source/graphic/grfcache.cxx
svtools/source/graphic/grfcache.hxx
svtools/source/graphic/grfmgr.cxx
svtools/source/graphic/makefile.mk
svtools/source/inc/accessibletableimp.hxx
svtools/source/inc/svimpbox.hxx
svtools/source/java/patchjavaerror.src
svtools/source/misc/ehdl.cxx
svtools/source/misc/errtxt.src
svtools/source/misc/helpagentwindow.cxx
svtools/source/misc/imagemgr.cxx
svtools/source/misc/imagemgr.src
svtools/source/misc/imageresourceaccess.cxx
svtools/source/misc/imap.cxx
svtools/source/misc/langtab.src
svtools/source/misc/makefile.mk
svtools/source/misc/svtdata.cxx
svtools/source/misc/templatefoldercache.cxx
svtools/source/misc/transfer2.cxx
svtools/source/misc/undo.src
svtools/source/plugapp/commtest.cxx
svtools/source/plugapp/commtest.src
svtools/source/plugapp/makefile.mk
svtools/source/plugapp/testtool.src
svtools/source/productregistration/productregistration.cxx
svtools/source/svhtml/htmlkywd.cxx
svtools/source/svhtml/parhtml.cxx
svtools/source/svrtf/rtfkey2.cxx
svtools/source/svrtf/rtfkeywd.cxx
svtools/source/table/defaultinputhandler.cxx
svtools/source/table/makefile.mk
svtools/source/table/tablecontrol.cxx
svtools/source/table/tablecontrol_impl.cxx
svtools/source/table/tablecontrol_impl.hxx
svtools/source/table/tabledatawindow.cxx
svtools/source/table/tablegeometry.cxx
svtools/source/table/tablegeometry.hxx
svtools/source/toolpanel/makefile.mk
svtools/source/toolpanel/toolpaneldrawer.cxx
svtools/source/uno/addrtempuno.cxx
svtools/source/uno/miscservices.cxx
svtools/source/uno/svtxgridcontrol.cxx
svtools/source/uno/svtxgridcontrol.hxx
svtools/source/uno/toolboxcontroller.cxx
svtools/source/uno/treecontrolpeer.cxx
svtools/source/uno/unocontroltablemodel.cxx
svtools/source/uno/unocontroltablemodel.hxx
svtools/source/uno/unoimap.cxx
svtools/source/urlobj/inetimg.cxx
svtools/util/makefile.mk
svtools/workben/browser.cxx
svtools/workben/cui/makefile.mk
svtools/workben/makefile.mk
svtools/workben/stest.cxx
svtools/workben/toolpanel/makefile.mk
svtools/workben/urange.cxx
toolkit/inc/toolkit/awt/vclxdevice.hxx
toolkit/inc/toolkit/awt/vclxgraphics.hxx
toolkit/inc/toolkit/awt/vclxwindows.hxx
toolkit/inc/toolkit/controls/dialogcontrol.hxx
toolkit/inc/toolkit/helper/property.hxx
toolkit/inc/toolkit/helper/servicenames.hxx
toolkit/inc/toolkit/helper/throbberimpl.hxx
toolkit/qa/complex/toolkit/accessibility/_XAccessibleComponent.java
toolkit/source/awt/asynccallback.cxx
toolkit/source/awt/vclxgraphics.cxx
toolkit/source/awt/vclxtoolkit.cxx
toolkit/source/awt/vclxwindow.cxx
toolkit/source/awt/xsimpleanimation.cxx
toolkit/source/awt/xthrobber.cxx
toolkit/source/controls/dialogcontrol.cxx
toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
toolkit/source/controls/grid/defaultgriddatamodel.cxx
toolkit/source/controls/grid/gridcontrol.cxx
toolkit/source/controls/grid/initguard.hxx
toolkit/source/controls/unocontrol.cxx
toolkit/source/controls/unocontrolcontainer.cxx
toolkit/source/controls/unocontrols.cxx
toolkit/source/helper/listenermultiplexer.cxx
toolkit/source/helper/property.cxx
toolkit/source/helper/registerservices.cxx
toolkit/source/helper/servicenames.cxx
toolkit/source/helper/throbberimpl.cxx
toolkit/source/helper/tkresmgr.cxx
tools/StaticLibrary_ooopathutils.mk
tools/bootstrp/addexes/makefile.mk
tools/bootstrp/addexes2/makefile.mk
tools/bootstrp/addexes2/mkfilt.cxx
tools/bootstrp/command.cxx
tools/bootstrp/cppdep.cxx
tools/bootstrp/iserver.cxx
tools/bootstrp/makefile.mk
tools/bootstrp/mkcreate.cxx
tools/bootstrp/prj.cxx
tools/bootstrp/rscdep.cxx
tools/bootstrp/sstring.cxx
tools/inc/bootstrp/command.hxx
tools/inc/bootstrp/mkcreate.hxx
tools/inc/bootstrp/prj.hxx
tools/inc/bootstrp/sstring.hxx
tools/inc/tools/agapi.hxx
tools/inc/tools/agitem.hxx
tools/inc/tools/chapi.hxx
tools/inc/tools/download.hxx
tools/inc/tools/eacopier.hxx
tools/inc/tools/fract.hxx
tools/inc/tools/fsys.hxx
tools/inc/tools/geninfo.hxx
tools/inc/tools/globname.hxx
tools/inc/tools/inetmime.hxx
tools/inc/tools/multisel.hxx
tools/inc/tools/poly.hxx
tools/inc/tools/postsys.h
tools/inc/tools/postwin.h
tools/inc/tools/presys.h
tools/inc/tools/prewin.h
tools/inc/tools/pstm.hxx
tools/inc/tools/ref.hxx
tools/inc/tools/simplerm.hxx
tools/inc/tools/solar.h
tools/inc/tools/table.hxx
tools/inc/tools/urlkeys.hxx
tools/inc/tools/urlobj.hxx
tools/prj/build.lst
tools/prj/d.lst
tools/qa/makefile.mk
tools/source/communi/geninfo.cxx
tools/source/debug/debug.cxx
tools/source/fsys/dirent.cxx
tools/source/fsys/tdir.cxx
tools/source/fsys/unx.cxx
tools/source/fsys/urlobj.cxx
tools/source/generic/color.cxx
tools/source/generic/config.cxx
tools/source/generic/fract.cxx
tools/source/inet/inetmime.cxx
tools/source/memtools/multisel.cxx
tools/source/memtools/table.cxx
tools/source/rc/resmgr.cxx
tools/source/ref/globname.cxx
tools/source/ref/pstm.cxx
tools/source/solar/solar.c
tools/source/stream/strmos2.cxx
tools/source/stream/strmunx.cxx
tools/source/stream/strmwnt.cxx
tools/source/string/makefile.mk
tools/source/testtoolloader/testtoolloader.cxx
tools/test/makefile.mk
tools/util/makefile.mk
tools/win/inc/dll.hxx
tools/win/inc/parser.hxx
tools/win/inc/shellex.h
tools/win/inc/shutil.h
tools/win/inc/toolsdll.hxx
tools/win/inc/winshell.hxx
tools/workben/makefile.mk
ucbhelper/source/client/proxydecider.cxx
ucbhelper/workben/ucbexplorer/ucbexplorer.hrc
unotools/inc/unotools/unotunnelhelper.hxx
unotools/source/config/fltrcfg.cxx
unotools/source/config/lingucfg.cxx
unotools/source/config/misccfg.cxx
unotools/source/config/pathoptions.cxx
unotools/source/config/searchopt.cxx
unotools/source/i18n/localedatawrapper.cxx
unotools/source/ucbhelper/localfilehelper.cxx
unotools/source/ucbhelper/ucbhelper.cxx
unotools/source/ucbhelper/xtempfile.cxx
vcl/aqua/inc/salbmp.h
vcl/aqua/inc/salgdi.h
vcl/aqua/inc/salinst.h
vcl/aqua/source/app/salinst.cxx
vcl/aqua/source/gdi/aquaprintaccessoryview.mm
vcl/aqua/source/gdi/salgdi.cxx
vcl/aqua/source/gdi/salprn.cxx
vcl/aqua/source/window/salframeview.mm
vcl/aqua/source/window/salobj.cxx
vcl/inc/vcl/bitmap.hxx
vcl/inc/vcl/brdwin.hxx
vcl/inc/vcl/button.hxx
vcl/inc/vcl/cmdevt.hxx
vcl/inc/vcl/cvtgrf.hxx
vcl/inc/vcl/dialog.hxx
vcl/inc/vcl/dockwin.hxx
vcl/inc/vcl/event.hxx
vcl/inc/vcl/fixed.hxx
vcl/inc/vcl/fldunit.hxx
vcl/inc/vcl/floatwin.hxx
vcl/inc/vcl/gdimtf.hxx
vcl/inc/vcl/glyphcache.hxx
vcl/inc/vcl/graphite_adaptors.hxx
vcl/inc/vcl/graphite_features.hxx
vcl/inc/vcl/graphite_layout.hxx
vcl/inc/vcl/ilstbox.hxx
vcl/inc/vcl/image.h
vcl/inc/vcl/imgctrl.hxx
vcl/inc/vcl/impbmpconv.hxx
vcl/inc/vcl/impprn.hxx
vcl/inc/vcl/jobset.h
vcl/inc/vcl/keycodes.hxx
vcl/inc/vcl/lstbox.hxx
vcl/inc/vcl/mapunit.hxx
vcl/inc/vcl/menu.hxx
vcl/inc/vcl/msgbox.hxx
vcl/inc/vcl/outdev.hxx
vcl/inc/vcl/prndlg.hxx
vcl/inc/vcl/salatype.hxx
vcl/inc/vcl/salbmp.hxx
vcl/inc/vcl/salgdi.hxx
vcl/inc/vcl/salinst.hxx
vcl/inc/vcl/seleng.hxx
vcl/inc/vcl/settings.hxx
vcl/inc/vcl/smartid.hxx
vcl/inc/vcl/status.hxx
vcl/inc/vcl/strhelper.hxx
vcl/inc/vcl/svapp.hxx
vcl/inc/vcl/svdata.hxx
vcl/inc/vcl/syschild.hxx
vcl/inc/vcl/sysdata.hxx
vcl/inc/vcl/taskpanelist.hxx
vcl/inc/vcl/toolbox.hxx
vcl/inc/vcl/vclevent.hxx
vcl/inc/vcl/windata.hxx
vcl/inc/vcl/window.hxx
vcl/inc/vcl/wintypes.hxx
vcl/os2/source/app/salinst.cxx
vcl/os2/source/gdi/salgdi.cxx
vcl/os2/source/window/salmenu.cxx
vcl/os2/source/window/salobj.cxx
vcl/prj/build.lst
vcl/source/app/dbggui.cxx
vcl/source/app/help.cxx
vcl/source/app/idlemgr.cxx
vcl/source/app/settings.cxx
vcl/source/app/svapp.cxx
vcl/source/app/svdata.cxx
vcl/source/app/svmain.cxx
vcl/source/app/svmainhook.cxx
vcl/source/app/unohelp.cxx
vcl/source/app/vclevent.cxx
vcl/source/control/button.cxx
vcl/source/control/combobox.cxx
vcl/source/control/edit.cxx
vcl/source/control/field.cxx
vcl/source/control/fixed.cxx
vcl/source/control/ilstbox.cxx
vcl/source/control/imgctrl.cxx
vcl/source/control/makefile.mk
vcl/source/control/tabctrl.cxx
vcl/source/gdi/bitmap.cxx
vcl/source/gdi/bitmap2.cxx
vcl/source/gdi/bitmap4.cxx
vcl/source/gdi/bmpconv.cxx
vcl/source/gdi/cvtsvm.cxx
vcl/source/gdi/font.cxx
vcl/source/gdi/gdimtf.cxx
vcl/source/gdi/image.cxx
vcl/source/gdi/impimage.cxx
vcl/source/gdi/jobset.cxx
vcl/source/gdi/makefile.mk
vcl/source/gdi/metaact.cxx
vcl/source/gdi/outdev.cxx
vcl/source/gdi/outdev3.cxx
vcl/source/gdi/outdev4.cxx
vcl/source/gdi/outdevnative.cxx
vcl/source/gdi/pdfwriter.cxx
vcl/source/gdi/pdfwriter_impl.cxx
vcl/source/gdi/print3.cxx
vcl/source/gdi/salmisc.cxx
vcl/source/glyphs/gcach_ftyp.cxx
vcl/source/glyphs/gcach_ftyp.hxx
vcl/source/glyphs/glyphcache.cxx
vcl/source/glyphs/graphite_cache.cxx
vcl/source/glyphs/graphite_layout.cxx
vcl/source/glyphs/graphite_textsrc.hxx
vcl/source/helper/canvasbitmap.cxx
vcl/source/helper/smartid.cxx
vcl/source/helper/xconnection.cxx
vcl/source/src/btntext.src
vcl/source/src/images.src
vcl/source/src/print.src
vcl/source/window/accel.cxx
vcl/source/window/accmgr.cxx
vcl/source/window/brdwin.cxx
vcl/source/window/btndlg.cxx
vcl/source/window/dlgctrl.cxx
vcl/source/window/javachild.cxx
vcl/source/window/menu.cxx
vcl/source/window/msgbox.cxx
vcl/source/window/printdlg.cxx
vcl/source/window/status.cxx
vcl/source/window/syschild.cxx
vcl/source/window/toolbox.cxx
vcl/source/window/toolbox2.cxx
vcl/source/window/window.cxx
vcl/source/window/window2.cxx
vcl/source/window/wrkwin.cxx
vcl/unx/gtk/app/gtkdata.cxx
vcl/unx/gtk/app/gtkinst.cxx
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
vcl/unx/gtk/window/gtkframe.cxx
vcl/unx/gtk/window/gtkobject.cxx
vcl/unx/headless/svpbmp.hxx
vcl/unx/headless/svpgdi.cxx
vcl/unx/headless/svpgdi.hxx
vcl/unx/headless/svpinst.cxx
vcl/unx/headless/svpinst.hxx
vcl/unx/headless/svpprn.cxx
vcl/unx/headless/svpprn.hxx
vcl/unx/headless/svppspgraphics.cxx
vcl/unx/headless/svppspgraphics.hxx
vcl/unx/headless/svptext.cxx
vcl/unx/inc/dtint.hxx
vcl/unx/inc/plugins/gtk/gtkdata.hxx
vcl/unx/inc/pspgraphics.h
vcl/unx/inc/salbmp.h
vcl/unx/inc/saldata.hxx
vcl/unx/inc/saldisp.hxx
vcl/unx/inc/salgdi.h
vcl/unx/inc/salinst.h
vcl/unx/inc/xfont.hxx
vcl/unx/kde/kdedata.cxx
vcl/unx/kde4/KDESalGraphics.cxx
vcl/unx/source/app/keysymnames.cxx
vcl/unx/source/app/saldata.cxx
vcl/unx/source/app/saldisp.cxx
vcl/unx/source/app/salinst.cxx
vcl/unx/source/app/wmadaptor.cxx
vcl/unx/source/dtrans/X11_selection.cxx
vcl/unx/source/dtrans/X11_service.cxx
vcl/unx/source/gdi/makefile.mk
vcl/unx/source/gdi/pspgraphics.cxx
vcl/unx/source/gdi/salgdi.cxx
vcl/unx/source/gdi/salgdi3.cxx
vcl/unx/source/gdi/salprnpsp.cxx
vcl/unx/source/gdi/xfont.cxx
vcl/unx/source/gdi/xlfd_attr.cxx
vcl/unx/source/gdi/xlfd_attr.hxx
vcl/unx/source/gdi/xlfd_extd.cxx
vcl/unx/source/gdi/xlfd_extd.hxx
vcl/unx/source/gdi/xlfd_smpl.cxx
vcl/unx/source/gdi/xlfd_smpl.hxx
vcl/unx/source/printer/ppdparser.cxx
vcl/unx/source/printer/printerinfomanager.cxx
vcl/unx/source/window/salframe.cxx
vcl/unx/source/window/salmenu.cxx
vcl/unx/source/window/salobj.cxx
vcl/util/makefile2.pmk
vcl/win/inc/salbmp.h
vcl/win/inc/saldata.hxx
vcl/win/inc/salgdi.h
vcl/win/inc/salinst.h
vcl/win/source/app/saldata.cxx
vcl/win/source/app/salinst.cxx
vcl/win/source/gdi/salgdi.cxx
vcl/win/source/gdi/salgdi3.cxx
vcl/win/source/gdi/salprn.cxx
vcl/win/source/gdi/winlayout.cxx
vcl/win/source/window/salframe.cxx
vcl/win/source/window/salobj.cxx
vcl/workben/outdevgrind.cxx
vos/inc/vos/execabl.hxx
vos/inc/vos/macros.hxx
vos/inc/vos/pipe.hxx
vos/inc/vos/process.hxx
vos/inc/vos/refernce.hxx
vos/inc/vos/signal.hxx
vos/inc/vos/socket.hxx
vos/inc/vos/stream.hxx
vos/inc/vos/thread.hxx
vos/source/pipe.cxx
vos/source/process.cxx
vos/source/signal.cxx
vos/source/thread.cxx
vos/source/timer.cxx
2011-03-11 14:24:23 +01:00
|
|
|
|
aResStack[ nLevel - 2 ]->bChild = sal_True;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// create new instance for this res. and fill mandatory fields
|
|
|
|
|
|
2006-03-29 12:26:24 +00:00
|
|
|
|
pResData = new ResData( sActPForm, FullId() , sFilename );
|
2011-01-22 21:51:18 -08:00
|
|
|
|
aResStack.push_back( pResData );
|
2012-02-15 15:26:43 +01:00
|
|
|
|
sToken = sToken.replaceAll("\n", rtl::OString()).
|
|
|
|
|
replaceAll("\r", rtl::OString()).
|
|
|
|
|
replaceAll("{", rtl::OString()).
|
|
|
|
|
replaceAll("\t", rtl::OString()).
|
|
|
|
|
replaceAll(" ", rtl::OString()).
|
|
|
|
|
replaceAll("\\", rtl::OString()).toAsciiLowerCase();
|
2012-02-02 09:11:38 +01:00
|
|
|
|
pResData->sResTyp = sToken;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case LEVELUP: {
|
|
|
|
|
// push
|
|
|
|
|
if ( nList )
|
|
|
|
|
nListLevel++;
|
|
|
|
|
if ( nList )
|
|
|
|
|
break;
|
|
|
|
|
|
2010-07-29 10:56:19 +08:00
|
|
|
|
bDontWriteOutput = sal_False;
|
2012-02-02 21:36:11 +01:00
|
|
|
|
rtl::OString sLowerTyp;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
if ( pResData )
|
|
|
|
|
sLowerTyp = "unknown";
|
|
|
|
|
nLevel++;
|
|
|
|
|
if ( nLevel > 1 ) {
|
Merge commit 'ooo/DEV300_m101' into intm101
The following builds for me:
basebmp, basegfx, comphelper, dtrans, i18npool, i18nutil, l10ntools, o3tl,
psprint_config, regexp, rsc, sax, sot, tools, ucbhelper, unotools, vcl
The rest still needs fixing ;-)
Conflicts:
canvas/prj/build.lst
canvas/source/cairo/cairo_textlayout.cxx
canvas/source/directx/dx_winstuff.hxx
canvas/source/tools/image.cxx
canvas/source/vcl/canvashelper.cxx
comphelper/inc/comphelper/documentconstants.hxx
comphelper/inc/comphelper/optionalvalue.hxx
comphelper/inc/comphelper/querydeep.hxx
comphelper/prj/build.lst
comphelper/qa/complex/makefile.mk
comphelper/qa/string/test_string_noadditional.cxx
comphelper/source/misc/componentmodule.cxx
comphelper/source/misc/mimeconfighelper.cxx
comphelper/source/misc/querydeep.cxx
comphelper/source/misc/uieventslogger.cxx
comphelper/source/property/TypeGeneration.cxx
comphelper/test/uno_iterators/uno_iterators.cxx
comphelper/util/makefile.mk
cppcanvas/source/mtfrenderer/implrenderer.cxx
dtrans/prj/build.lst
dtrans/source/generic/dtrans.cxx
dtrans/source/win32/dtobj/FmtFilter.cxx
i18npool/prj/build.lst
i18npool/source/localedata/data/localedata_others.map
i18npool/source/localedata/data/makefile.mk
i18npool/source/localedata/localedata.cxx
i18npool/source/localedata/saxparser.cxx
i18npool/source/registerservices/registerservices.cxx
i18npool/source/search/textsearch.cxx
l10ntools/inc/cfgmerge.hxx
l10ntools/inc/export.hxx
l10ntools/inc/gsicheck.hxx
l10ntools/inc/l10ntools/vosapp.hxx
l10ntools/inc/tagtest.hxx
l10ntools/inc/xmlparse.hxx
l10ntools/layout/layoutparse.cxx
l10ntools/layout/tralay.cxx
l10ntools/source/cfgmerge.cxx
l10ntools/source/export.cxx
l10ntools/source/export2.cxx
l10ntools/source/gsicheck.cxx
l10ntools/source/help/HelpLinker.cxx
l10ntools/source/lngex.cxx
l10ntools/source/lngmerge.cxx
l10ntools/source/merge.cxx
l10ntools/source/tagtest.cxx
l10ntools/source/xmlparse.cxx
padmin/source/fontentry.cxx
padmin/source/padialog.cxx
padmin/source/padialog.src
padmin/source/pamain.cxx
rsc/inc/rscarray.hxx
rsc/inc/rscclass.hxx
rsc/inc/rscclobj.hxx
rsc/inc/rsccont.hxx
rsc/inc/rscdb.hxx
rsc/inc/rscdef.hxx
rsc/inc/rscmgr.hxx
rsc/inc/rscrange.hxx
rsc/inc/rsctop.hxx
rsc/inc/vclrsc.hxx
rsc/source/parser/rscdb.cxx
rsc/source/parser/rscicpx.cxx
rsc/source/parser/rscinit.cxx
rsc/source/prj/start.cxx
rsc/source/res/rscarray.cxx
rsc/source/res/rscclass.cxx
rsc/source/res/rscclobj.cxx
rsc/source/res/rsccont.cxx
rsc/source/res/rscmgr.cxx
rsc/source/res/rscrange.cxx
rsc/source/res/rsctop.cxx
rsc/source/rsc/rsc.cxx
rsc/source/tools/rscdef.cxx
rsc/source/tools/rsctools.cxx
sax/source/expatwrap/sax_expat.cxx
sax/source/fastparser/facreg.cxx
sax/source/tools/fastserializer.cxx
sot/inc/sot/filelist.hxx
sot/inc/sot/object.hxx
sot/source/base/factory.cxx
sot/source/base/filelist.cxx
sot/source/sdstor/stg.cxx
sot/source/sdstor/stgcache.cxx
sot/source/sdstor/stgole.cxx
sot/source/sdstor/stgstrms.cxx
sot/source/sdstor/storage.cxx
sot/source/sdstor/ucbstorage.cxx
svl/inc/svl/cenumitm.hxx
svl/inc/svl/cintitem.hxx
svl/inc/svl/cntwall.hxx
svl/inc/svl/ctypeitm.hxx
svl/inc/svl/custritm.hxx
svl/inc/svl/dateitem.hxx
svl/inc/svl/filerec.hxx
svl/inc/svl/globalnameitem.hxx
svl/inc/svl/ilstitem.hxx
svl/inc/svl/imageitm.hxx
svl/inc/svl/intitem.hxx
svl/inc/svl/itempool.hxx
svl/inc/svl/itemset.hxx
svl/inc/svl/lckbitem.hxx
svl/inc/svl/poolitem.hxx
svl/inc/svl/ptitem.hxx
svl/inc/svl/rectitem.hxx
svl/inc/svl/sfontitm.hxx
svl/inc/svl/slstitm.hxx
svl/inc/svl/srchitem.hxx
svl/inc/svl/svarray.hxx
svl/inc/svl/svdde.hxx
svl/inc/svl/svstdarr.hxx
svl/inc/svl/szitem.hxx
svl/inc/svl/visitem.hxx
svl/inc/svl/zforlist.hxx
svl/inc/svl/zformat.hxx
svl/prj/build.lst
svl/qa/complex/ConfigItems/helper/ConfigItemTest.cxx
svl/qa/complex/ConfigItems/helper/makefile.mk
svl/qa/makefile.mk
svl/source/filepicker/pickerhelper.cxx
svl/source/filerec/filerec.cxx
svl/source/items/cenumitm.cxx
svl/source/items/cintitem.cxx
svl/source/items/cntwall.cxx
svl/source/items/ctypeitm.cxx
svl/source/items/custritm.cxx
svl/source/items/dateitem.cxx
svl/source/items/globalnameitem.cxx
svl/source/items/ilstitem.cxx
svl/source/items/imageitm.cxx
svl/source/items/intitem.cxx
svl/source/items/itempool.cxx
svl/source/items/itemprop.cxx
svl/source/items/itemset.cxx
svl/source/items/lckbitem.cxx
svl/source/items/poolio.cxx
svl/source/items/poolitem.cxx
svl/source/items/ptitem.cxx
svl/source/items/rectitem.cxx
svl/source/items/slstitm.cxx
svl/source/items/srchitem.cxx
svl/source/items/style.cxx
svl/source/items/szitem.cxx
svl/source/items/visitem.cxx
svl/source/items/whiter.cxx
svl/source/memtools/svarray.cxx
svl/source/misc/PasswordHelper.cxx
svl/source/misc/adrparse.cxx
svl/source/misc/lngmisc.cxx
svl/source/notify/brdcst.cxx
svl/source/notify/listener.cxx
svl/source/notify/listenerbase.cxx
svl/source/numbers/makefile.mk
svl/source/numbers/nbdll.cxx
svl/source/numbers/zforfind.cxx
svl/source/numbers/zforlist.cxx
svl/source/numbers/zformat.cxx
svl/source/numbers/zforscan.cxx
svl/source/passwordcontainer/passwordcontainer.cxx
svl/source/svdde/ddecli.cxx
svl/source/svdde/ddeimp.hxx
svl/source/svdde/ddemlos2.h
svl/source/svdde/ddesvr.cxx
svl/source/undo/undo.cxx
svl/source/uno/registerservices.cxx
svl/util/makefile.mk
svtools/bmpmaker/bmpsum.cxx
svtools/bmpmaker/g2g.cxx
svtools/bmpmaker/makefile.mk
svtools/inc/borderhelper.hxx
svtools/inc/svtools/accessiblefactory.hxx
svtools/inc/svtools/apearcfg.hxx
svtools/inc/svtools/brwbox.hxx
svtools/inc/svtools/ctrlbox.hxx
svtools/inc/svtools/ctrltool.hxx
svtools/inc/svtools/editbrowsebox.hxx
svtools/inc/svtools/ehdl.hxx
svtools/inc/svtools/embedhlp.hxx
svtools/inc/svtools/filter.hxx
svtools/inc/svtools/ivctrl.hxx
svtools/inc/svtools/parhtml.hxx
svtools/inc/svtools/printdlg.hxx
svtools/inc/svtools/rtftoken.h
svtools/inc/svtools/ruler.hxx
svtools/inc/svtools/svicnvw.hxx
svtools/inc/svtools/svlbitm.hxx
svtools/inc/svtools/svlbox.hxx
svtools/inc/svtools/svtreebx.hxx
svtools/inc/svtools/tabbar.hxx
svtools/inc/svtools/table/abstracttablecontrol.hxx
svtools/inc/svtools/taskbar.hxx
svtools/inc/svtools/textview.hxx
svtools/inc/svtools/valueset.hxx
svtools/source/brwbox/brwbox1.cxx
svtools/source/brwbox/brwbox2.cxx
svtools/source/brwbox/datwin.cxx
svtools/source/brwbox/datwin.hxx
svtools/source/brwbox/makefile.mk
svtools/source/config/apearcfg.cxx
svtools/source/config/htmlcfg.cxx
svtools/source/config/menuoptions.cxx
svtools/source/config/miscopt.cxx
svtools/source/contnr/cont_pch.cxx
svtools/source/contnr/ctrdll.cxx
svtools/source/contnr/fileview.cxx
svtools/source/contnr/imivctl1.cxx
svtools/source/contnr/ivctrl.cxx
svtools/source/contnr/makefile.mk
svtools/source/contnr/svcontnr.src
svtools/source/contnr/svicnvw.cxx
svtools/source/contnr/svimpbox.cxx
svtools/source/contnr/svimpicn.cxx
svtools/source/contnr/svlbitm.cxx
svtools/source/contnr/svtreebx.cxx
svtools/source/contnr/templwin.cxx
svtools/source/contnr/templwin.hxx
svtools/source/control/asynclink.cxx
svtools/source/control/ctrlbox.cxx
svtools/source/control/ctrldll.cxx
svtools/source/control/ctrltool.cxx
svtools/source/control/filectrl.cxx
svtools/source/control/filectrl.src
svtools/source/control/headbar.cxx
svtools/source/control/inettbc.cxx
svtools/source/control/makefile.mk
svtools/source/control/prgsbar.cxx
svtools/source/control/roadmap.cxx
svtools/source/control/ruler.cxx
svtools/source/control/scriptedtext.cxx
svtools/source/control/stdmenu.cxx
svtools/source/control/tabbar.cxx
svtools/source/control/taskbar.cxx
svtools/source/control/taskbox.cxx
svtools/source/control/taskmisc.cxx
svtools/source/control/taskstat.cxx
svtools/source/control/valueacc.cxx
svtools/source/control/valueset.cxx
svtools/source/dialogs/addresstemplate.cxx
svtools/source/dialogs/addresstemplate.src
svtools/source/dialogs/colrdlg.src
svtools/source/dialogs/filedlg2.cxx
svtools/source/dialogs/filedlg2.hxx
svtools/source/dialogs/makefile.mk
svtools/source/dialogs/printdlg.cxx
svtools/source/dialogs/printdlg.src
svtools/source/dialogs/propctrl.cxx
svtools/source/dialogs/propctrl.hxx
svtools/source/dialogs/property.cxx
svtools/source/edit/makefile.mk
svtools/source/edit/sychconv.cxx
svtools/source/edit/syntaxhighlight.cxx
svtools/source/edit/textdoc.cxx
svtools/source/edit/texteng.cxx
svtools/source/edit/textundo.cxx
svtools/source/edit/textview.cxx
svtools/source/filter.vcl/filter/SvFilterOptionsDialog.cxx
svtools/source/filter.vcl/filter/dlgejpg.cxx
svtools/source/filter.vcl/filter/dlgejpg.hxx
svtools/source/filter.vcl/filter/dlgejpg.src
svtools/source/filter.vcl/filter/dlgepng.cxx
svtools/source/filter.vcl/filter/dlgepng.hxx
svtools/source/filter.vcl/filter/dlgepng.src
svtools/source/filter.vcl/filter/dlgexpor.cxx
svtools/source/filter.vcl/filter/dlgexpor.hxx
svtools/source/filter.vcl/filter/dlgexpor.src
svtools/source/filter.vcl/filter/filter2.cxx
svtools/source/filter.vcl/filter/makefile.mk
svtools/source/filter.vcl/filter/sgfbram.cxx
svtools/source/filter.vcl/filter/sgvmain.cxx
svtools/source/filter.vcl/filter/sgvspln.cxx
svtools/source/filter.vcl/filter/strings.src
svtools/source/filter.vcl/jpeg/makefile.mk
svtools/source/filter.vcl/wmf/emfwr.cxx
svtools/source/filter.vcl/wmf/emfwr.hxx
svtools/source/filter.vcl/wmf/enhwmf.cxx
svtools/source/filter.vcl/wmf/winmtf.hxx
svtools/source/filter.vcl/wmf/wmfwr.cxx
svtools/source/filter.vcl/wmf/wmfwr.hxx
svtools/source/graphic/grfcache.cxx
svtools/source/graphic/grfcache.hxx
svtools/source/graphic/grfmgr.cxx
svtools/source/graphic/makefile.mk
svtools/source/inc/accessibletableimp.hxx
svtools/source/inc/svimpbox.hxx
svtools/source/java/patchjavaerror.src
svtools/source/misc/ehdl.cxx
svtools/source/misc/errtxt.src
svtools/source/misc/helpagentwindow.cxx
svtools/source/misc/imagemgr.cxx
svtools/source/misc/imagemgr.src
svtools/source/misc/imageresourceaccess.cxx
svtools/source/misc/imap.cxx
svtools/source/misc/langtab.src
svtools/source/misc/makefile.mk
svtools/source/misc/svtdata.cxx
svtools/source/misc/templatefoldercache.cxx
svtools/source/misc/transfer2.cxx
svtools/source/misc/undo.src
svtools/source/plugapp/commtest.cxx
svtools/source/plugapp/commtest.src
svtools/source/plugapp/makefile.mk
svtools/source/plugapp/testtool.src
svtools/source/productregistration/productregistration.cxx
svtools/source/svhtml/htmlkywd.cxx
svtools/source/svhtml/parhtml.cxx
svtools/source/svrtf/rtfkey2.cxx
svtools/source/svrtf/rtfkeywd.cxx
svtools/source/table/defaultinputhandler.cxx
svtools/source/table/makefile.mk
svtools/source/table/tablecontrol.cxx
svtools/source/table/tablecontrol_impl.cxx
svtools/source/table/tablecontrol_impl.hxx
svtools/source/table/tabledatawindow.cxx
svtools/source/table/tablegeometry.cxx
svtools/source/table/tablegeometry.hxx
svtools/source/toolpanel/makefile.mk
svtools/source/toolpanel/toolpaneldrawer.cxx
svtools/source/uno/addrtempuno.cxx
svtools/source/uno/miscservices.cxx
svtools/source/uno/svtxgridcontrol.cxx
svtools/source/uno/svtxgridcontrol.hxx
svtools/source/uno/toolboxcontroller.cxx
svtools/source/uno/treecontrolpeer.cxx
svtools/source/uno/unocontroltablemodel.cxx
svtools/source/uno/unocontroltablemodel.hxx
svtools/source/uno/unoimap.cxx
svtools/source/urlobj/inetimg.cxx
svtools/util/makefile.mk
svtools/workben/browser.cxx
svtools/workben/cui/makefile.mk
svtools/workben/makefile.mk
svtools/workben/stest.cxx
svtools/workben/toolpanel/makefile.mk
svtools/workben/urange.cxx
toolkit/inc/toolkit/awt/vclxdevice.hxx
toolkit/inc/toolkit/awt/vclxgraphics.hxx
toolkit/inc/toolkit/awt/vclxwindows.hxx
toolkit/inc/toolkit/controls/dialogcontrol.hxx
toolkit/inc/toolkit/helper/property.hxx
toolkit/inc/toolkit/helper/servicenames.hxx
toolkit/inc/toolkit/helper/throbberimpl.hxx
toolkit/qa/complex/toolkit/accessibility/_XAccessibleComponent.java
toolkit/source/awt/asynccallback.cxx
toolkit/source/awt/vclxgraphics.cxx
toolkit/source/awt/vclxtoolkit.cxx
toolkit/source/awt/vclxwindow.cxx
toolkit/source/awt/xsimpleanimation.cxx
toolkit/source/awt/xthrobber.cxx
toolkit/source/controls/dialogcontrol.cxx
toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
toolkit/source/controls/grid/defaultgriddatamodel.cxx
toolkit/source/controls/grid/gridcontrol.cxx
toolkit/source/controls/grid/initguard.hxx
toolkit/source/controls/unocontrol.cxx
toolkit/source/controls/unocontrolcontainer.cxx
toolkit/source/controls/unocontrols.cxx
toolkit/source/helper/listenermultiplexer.cxx
toolkit/source/helper/property.cxx
toolkit/source/helper/registerservices.cxx
toolkit/source/helper/servicenames.cxx
toolkit/source/helper/throbberimpl.cxx
toolkit/source/helper/tkresmgr.cxx
tools/StaticLibrary_ooopathutils.mk
tools/bootstrp/addexes/makefile.mk
tools/bootstrp/addexes2/makefile.mk
tools/bootstrp/addexes2/mkfilt.cxx
tools/bootstrp/command.cxx
tools/bootstrp/cppdep.cxx
tools/bootstrp/iserver.cxx
tools/bootstrp/makefile.mk
tools/bootstrp/mkcreate.cxx
tools/bootstrp/prj.cxx
tools/bootstrp/rscdep.cxx
tools/bootstrp/sstring.cxx
tools/inc/bootstrp/command.hxx
tools/inc/bootstrp/mkcreate.hxx
tools/inc/bootstrp/prj.hxx
tools/inc/bootstrp/sstring.hxx
tools/inc/tools/agapi.hxx
tools/inc/tools/agitem.hxx
tools/inc/tools/chapi.hxx
tools/inc/tools/download.hxx
tools/inc/tools/eacopier.hxx
tools/inc/tools/fract.hxx
tools/inc/tools/fsys.hxx
tools/inc/tools/geninfo.hxx
tools/inc/tools/globname.hxx
tools/inc/tools/inetmime.hxx
tools/inc/tools/multisel.hxx
tools/inc/tools/poly.hxx
tools/inc/tools/postsys.h
tools/inc/tools/postwin.h
tools/inc/tools/presys.h
tools/inc/tools/prewin.h
tools/inc/tools/pstm.hxx
tools/inc/tools/ref.hxx
tools/inc/tools/simplerm.hxx
tools/inc/tools/solar.h
tools/inc/tools/table.hxx
tools/inc/tools/urlkeys.hxx
tools/inc/tools/urlobj.hxx
tools/prj/build.lst
tools/prj/d.lst
tools/qa/makefile.mk
tools/source/communi/geninfo.cxx
tools/source/debug/debug.cxx
tools/source/fsys/dirent.cxx
tools/source/fsys/tdir.cxx
tools/source/fsys/unx.cxx
tools/source/fsys/urlobj.cxx
tools/source/generic/color.cxx
tools/source/generic/config.cxx
tools/source/generic/fract.cxx
tools/source/inet/inetmime.cxx
tools/source/memtools/multisel.cxx
tools/source/memtools/table.cxx
tools/source/rc/resmgr.cxx
tools/source/ref/globname.cxx
tools/source/ref/pstm.cxx
tools/source/solar/solar.c
tools/source/stream/strmos2.cxx
tools/source/stream/strmunx.cxx
tools/source/stream/strmwnt.cxx
tools/source/string/makefile.mk
tools/source/testtoolloader/testtoolloader.cxx
tools/test/makefile.mk
tools/util/makefile.mk
tools/win/inc/dll.hxx
tools/win/inc/parser.hxx
tools/win/inc/shellex.h
tools/win/inc/shutil.h
tools/win/inc/toolsdll.hxx
tools/win/inc/winshell.hxx
tools/workben/makefile.mk
ucbhelper/source/client/proxydecider.cxx
ucbhelper/workben/ucbexplorer/ucbexplorer.hrc
unotools/inc/unotools/unotunnelhelper.hxx
unotools/source/config/fltrcfg.cxx
unotools/source/config/lingucfg.cxx
unotools/source/config/misccfg.cxx
unotools/source/config/pathoptions.cxx
unotools/source/config/searchopt.cxx
unotools/source/i18n/localedatawrapper.cxx
unotools/source/ucbhelper/localfilehelper.cxx
unotools/source/ucbhelper/ucbhelper.cxx
unotools/source/ucbhelper/xtempfile.cxx
vcl/aqua/inc/salbmp.h
vcl/aqua/inc/salgdi.h
vcl/aqua/inc/salinst.h
vcl/aqua/source/app/salinst.cxx
vcl/aqua/source/gdi/aquaprintaccessoryview.mm
vcl/aqua/source/gdi/salgdi.cxx
vcl/aqua/source/gdi/salprn.cxx
vcl/aqua/source/window/salframeview.mm
vcl/aqua/source/window/salobj.cxx
vcl/inc/vcl/bitmap.hxx
vcl/inc/vcl/brdwin.hxx
vcl/inc/vcl/button.hxx
vcl/inc/vcl/cmdevt.hxx
vcl/inc/vcl/cvtgrf.hxx
vcl/inc/vcl/dialog.hxx
vcl/inc/vcl/dockwin.hxx
vcl/inc/vcl/event.hxx
vcl/inc/vcl/fixed.hxx
vcl/inc/vcl/fldunit.hxx
vcl/inc/vcl/floatwin.hxx
vcl/inc/vcl/gdimtf.hxx
vcl/inc/vcl/glyphcache.hxx
vcl/inc/vcl/graphite_adaptors.hxx
vcl/inc/vcl/graphite_features.hxx
vcl/inc/vcl/graphite_layout.hxx
vcl/inc/vcl/ilstbox.hxx
vcl/inc/vcl/image.h
vcl/inc/vcl/imgctrl.hxx
vcl/inc/vcl/impbmpconv.hxx
vcl/inc/vcl/impprn.hxx
vcl/inc/vcl/jobset.h
vcl/inc/vcl/keycodes.hxx
vcl/inc/vcl/lstbox.hxx
vcl/inc/vcl/mapunit.hxx
vcl/inc/vcl/menu.hxx
vcl/inc/vcl/msgbox.hxx
vcl/inc/vcl/outdev.hxx
vcl/inc/vcl/prndlg.hxx
vcl/inc/vcl/salatype.hxx
vcl/inc/vcl/salbmp.hxx
vcl/inc/vcl/salgdi.hxx
vcl/inc/vcl/salinst.hxx
vcl/inc/vcl/seleng.hxx
vcl/inc/vcl/settings.hxx
vcl/inc/vcl/smartid.hxx
vcl/inc/vcl/status.hxx
vcl/inc/vcl/strhelper.hxx
vcl/inc/vcl/svapp.hxx
vcl/inc/vcl/svdata.hxx
vcl/inc/vcl/syschild.hxx
vcl/inc/vcl/sysdata.hxx
vcl/inc/vcl/taskpanelist.hxx
vcl/inc/vcl/toolbox.hxx
vcl/inc/vcl/vclevent.hxx
vcl/inc/vcl/windata.hxx
vcl/inc/vcl/window.hxx
vcl/inc/vcl/wintypes.hxx
vcl/os2/source/app/salinst.cxx
vcl/os2/source/gdi/salgdi.cxx
vcl/os2/source/window/salmenu.cxx
vcl/os2/source/window/salobj.cxx
vcl/prj/build.lst
vcl/source/app/dbggui.cxx
vcl/source/app/help.cxx
vcl/source/app/idlemgr.cxx
vcl/source/app/settings.cxx
vcl/source/app/svapp.cxx
vcl/source/app/svdata.cxx
vcl/source/app/svmain.cxx
vcl/source/app/svmainhook.cxx
vcl/source/app/unohelp.cxx
vcl/source/app/vclevent.cxx
vcl/source/control/button.cxx
vcl/source/control/combobox.cxx
vcl/source/control/edit.cxx
vcl/source/control/field.cxx
vcl/source/control/fixed.cxx
vcl/source/control/ilstbox.cxx
vcl/source/control/imgctrl.cxx
vcl/source/control/makefile.mk
vcl/source/control/tabctrl.cxx
vcl/source/gdi/bitmap.cxx
vcl/source/gdi/bitmap2.cxx
vcl/source/gdi/bitmap4.cxx
vcl/source/gdi/bmpconv.cxx
vcl/source/gdi/cvtsvm.cxx
vcl/source/gdi/font.cxx
vcl/source/gdi/gdimtf.cxx
vcl/source/gdi/image.cxx
vcl/source/gdi/impimage.cxx
vcl/source/gdi/jobset.cxx
vcl/source/gdi/makefile.mk
vcl/source/gdi/metaact.cxx
vcl/source/gdi/outdev.cxx
vcl/source/gdi/outdev3.cxx
vcl/source/gdi/outdev4.cxx
vcl/source/gdi/outdevnative.cxx
vcl/source/gdi/pdfwriter.cxx
vcl/source/gdi/pdfwriter_impl.cxx
vcl/source/gdi/print3.cxx
vcl/source/gdi/salmisc.cxx
vcl/source/glyphs/gcach_ftyp.cxx
vcl/source/glyphs/gcach_ftyp.hxx
vcl/source/glyphs/glyphcache.cxx
vcl/source/glyphs/graphite_cache.cxx
vcl/source/glyphs/graphite_layout.cxx
vcl/source/glyphs/graphite_textsrc.hxx
vcl/source/helper/canvasbitmap.cxx
vcl/source/helper/smartid.cxx
vcl/source/helper/xconnection.cxx
vcl/source/src/btntext.src
vcl/source/src/images.src
vcl/source/src/print.src
vcl/source/window/accel.cxx
vcl/source/window/accmgr.cxx
vcl/source/window/brdwin.cxx
vcl/source/window/btndlg.cxx
vcl/source/window/dlgctrl.cxx
vcl/source/window/javachild.cxx
vcl/source/window/menu.cxx
vcl/source/window/msgbox.cxx
vcl/source/window/printdlg.cxx
vcl/source/window/status.cxx
vcl/source/window/syschild.cxx
vcl/source/window/toolbox.cxx
vcl/source/window/toolbox2.cxx
vcl/source/window/window.cxx
vcl/source/window/window2.cxx
vcl/source/window/wrkwin.cxx
vcl/unx/gtk/app/gtkdata.cxx
vcl/unx/gtk/app/gtkinst.cxx
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
vcl/unx/gtk/window/gtkframe.cxx
vcl/unx/gtk/window/gtkobject.cxx
vcl/unx/headless/svpbmp.hxx
vcl/unx/headless/svpgdi.cxx
vcl/unx/headless/svpgdi.hxx
vcl/unx/headless/svpinst.cxx
vcl/unx/headless/svpinst.hxx
vcl/unx/headless/svpprn.cxx
vcl/unx/headless/svpprn.hxx
vcl/unx/headless/svppspgraphics.cxx
vcl/unx/headless/svppspgraphics.hxx
vcl/unx/headless/svptext.cxx
vcl/unx/inc/dtint.hxx
vcl/unx/inc/plugins/gtk/gtkdata.hxx
vcl/unx/inc/pspgraphics.h
vcl/unx/inc/salbmp.h
vcl/unx/inc/saldata.hxx
vcl/unx/inc/saldisp.hxx
vcl/unx/inc/salgdi.h
vcl/unx/inc/salinst.h
vcl/unx/inc/xfont.hxx
vcl/unx/kde/kdedata.cxx
vcl/unx/kde4/KDESalGraphics.cxx
vcl/unx/source/app/keysymnames.cxx
vcl/unx/source/app/saldata.cxx
vcl/unx/source/app/saldisp.cxx
vcl/unx/source/app/salinst.cxx
vcl/unx/source/app/wmadaptor.cxx
vcl/unx/source/dtrans/X11_selection.cxx
vcl/unx/source/dtrans/X11_service.cxx
vcl/unx/source/gdi/makefile.mk
vcl/unx/source/gdi/pspgraphics.cxx
vcl/unx/source/gdi/salgdi.cxx
vcl/unx/source/gdi/salgdi3.cxx
vcl/unx/source/gdi/salprnpsp.cxx
vcl/unx/source/gdi/xfont.cxx
vcl/unx/source/gdi/xlfd_attr.cxx
vcl/unx/source/gdi/xlfd_attr.hxx
vcl/unx/source/gdi/xlfd_extd.cxx
vcl/unx/source/gdi/xlfd_extd.hxx
vcl/unx/source/gdi/xlfd_smpl.cxx
vcl/unx/source/gdi/xlfd_smpl.hxx
vcl/unx/source/printer/ppdparser.cxx
vcl/unx/source/printer/printerinfomanager.cxx
vcl/unx/source/window/salframe.cxx
vcl/unx/source/window/salmenu.cxx
vcl/unx/source/window/salobj.cxx
vcl/util/makefile2.pmk
vcl/win/inc/salbmp.h
vcl/win/inc/saldata.hxx
vcl/win/inc/salgdi.h
vcl/win/inc/salinst.h
vcl/win/source/app/saldata.cxx
vcl/win/source/app/salinst.cxx
vcl/win/source/gdi/salgdi.cxx
vcl/win/source/gdi/salgdi3.cxx
vcl/win/source/gdi/salprn.cxx
vcl/win/source/gdi/winlayout.cxx
vcl/win/source/window/salframe.cxx
vcl/win/source/window/salobj.cxx
vcl/workben/outdevgrind.cxx
vos/inc/vos/execabl.hxx
vos/inc/vos/macros.hxx
vos/inc/vos/pipe.hxx
vos/inc/vos/process.hxx
vos/inc/vos/refernce.hxx
vos/inc/vos/signal.hxx
vos/inc/vos/socket.hxx
vos/inc/vos/stream.hxx
vos/inc/vos/thread.hxx
vos/source/pipe.cxx
vos/source/process.cxx
vos/source/signal.cxx
vos/source/thread.cxx
vos/source/timer.cxx
2011-03-11 14:24:23 +01:00
|
|
|
|
aResStack[ nLevel - 2 ]->bChild = sal_True;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
|
|
|
|
|
2006-03-29 12:26:24 +00:00
|
|
|
|
ResData *pNewData = new ResData( sActPForm, FullId() , sFilename );
|
2000-09-18 16:07:07 +00:00
|
|
|
|
pNewData->sResTyp = sLowerTyp;
|
2011-01-22 21:51:18 -08:00
|
|
|
|
aResStack.push_back( pNewData );
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case LEVELDOWN: {
|
|
|
|
|
// pop
|
|
|
|
|
if ( !nList ) {
|
2010-07-29 10:56:19 +08:00
|
|
|
|
bDontWriteOutput = sal_False;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
if ( nLevel ) {
|
|
|
|
|
if ( bDefine && (nLevel == 1 )) {
|
2010-07-29 10:56:19 +08:00
|
|
|
|
bDefine = sal_False;
|
|
|
|
|
bNextMustBeDefineEOL = sal_False;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
|
|
|
|
WriteData( pResData );
|
2011-01-22 21:51:18 -08:00
|
|
|
|
ResStack::iterator it = aResStack.begin();
|
|
|
|
|
::std::advance( it, nLevel-1 );
|
|
|
|
|
delete *it;
|
|
|
|
|
aResStack.erase( it );
|
2000-09-18 16:07:07 +00:00
|
|
|
|
nLevel--;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else {
|
2001-08-29 10:50:41 +00:00
|
|
|
|
if ( bDefine )
|
2010-07-29 10:56:19 +08:00
|
|
|
|
bNextMustBeDefineEOL = sal_True;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
if ( !nListLevel ) {
|
|
|
|
|
if ( bMergeMode )
|
|
|
|
|
MergeRest( pResData, MERGE_MODE_LIST );
|
|
|
|
|
nList = LIST_NON;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
nListLevel--;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
break;
|
2011-11-18 21:03:31 +00:00
|
|
|
|
case ASSIGNMENT:
|
|
|
|
|
{
|
2010-07-29 10:56:19 +08:00
|
|
|
|
bDontWriteOutput = sal_False;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
// interpret different types of assignement
|
2012-02-10 21:53:20 +01:00
|
|
|
|
sal_Int32 n = 0;
|
2012-02-15 15:26:43 +01:00
|
|
|
|
rtl::OString sKey = sToken.getToken(0, '=', n).
|
|
|
|
|
replaceAll(" ", rtl::OString()).
|
|
|
|
|
replaceAll("\t", rtl::OString());
|
2012-02-10 21:53:20 +01:00
|
|
|
|
rtl::OString sValue = sToken.getToken(0, '=', n);
|
2000-09-18 16:07:07 +00:00
|
|
|
|
CleanValue( sValue );
|
2011-11-18 21:03:31 +00:00
|
|
|
|
sKey = sKey.toAsciiUpperCase();
|
|
|
|
|
if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("IDENTIFIER")))
|
|
|
|
|
{
|
2012-02-15 15:26:43 +01:00
|
|
|
|
rtl::OString sId(
|
|
|
|
|
sValue.replaceAll("\t", rtl::OString()).
|
|
|
|
|
replaceAll(" ", rtl::OString()));
|
2011-11-18 21:03:31 +00:00
|
|
|
|
pResData->SetId(sId, ID_LEVEL_IDENTIFIER);
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
2011-11-18 21:03:31 +00:00
|
|
|
|
else if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("HELPID")))
|
|
|
|
|
{
|
2000-09-18 16:07:07 +00:00
|
|
|
|
pResData->sHelpId = sValue;
|
|
|
|
|
}
|
2011-11-18 21:03:31 +00:00
|
|
|
|
else if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("STRINGLIST")))
|
|
|
|
|
{
|
2010-07-29 10:56:19 +08:00
|
|
|
|
pResData->bList = sal_True;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
nList = LIST_STRING;
|
2011-07-01 22:27:20 +01:00
|
|
|
|
m_sListLang = SOURCE_LANGUAGE;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
nListIndex = 0;
|
|
|
|
|
nListLevel = 0;
|
|
|
|
|
}
|
2011-11-18 21:03:31 +00:00
|
|
|
|
else if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("FILTERLIST")))
|
|
|
|
|
{
|
2010-07-29 10:56:19 +08:00
|
|
|
|
pResData->bList = sal_True;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
nList = LIST_FILTER;
|
2011-07-01 22:27:20 +01:00
|
|
|
|
m_sListLang = SOURCE_LANGUAGE;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
nListIndex = 0;
|
|
|
|
|
nListLevel = 0;
|
|
|
|
|
}
|
2011-11-18 21:03:31 +00:00
|
|
|
|
else if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("UIENTRIES")))
|
|
|
|
|
{
|
2010-07-29 10:56:19 +08:00
|
|
|
|
pResData->bList = sal_True;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
nList = LIST_UIENTRIES;
|
2011-07-01 22:27:20 +01:00
|
|
|
|
m_sListLang = SOURCE_LANGUAGE;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
nListIndex = 0;
|
|
|
|
|
nListLevel = 0;
|
|
|
|
|
}
|
2012-02-13 21:46:50 +01:00
|
|
|
|
if (sToken.indexOf( '{' ) != -1
|
|
|
|
|
&& (helper::countOccurrences(sToken, '{')
|
|
|
|
|
> helper::countOccurrences(sToken, '}')))
|
2000-09-18 16:07:07 +00:00
|
|
|
|
{
|
2006-06-19 16:21:29 +00:00
|
|
|
|
Parse( LEVELUP, "" );
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case UIENTRIES:
|
2011-11-18 21:03:31 +00:00
|
|
|
|
case LISTASSIGNMENT:
|
|
|
|
|
{
|
2010-07-29 10:56:19 +08:00
|
|
|
|
bDontWriteOutput = sal_False;
|
2012-02-15 15:26:43 +01:00
|
|
|
|
rtl::OString sTmpToken(
|
|
|
|
|
sToken.replaceAll(" ", rtl::OString()).toAsciiLowerCase());
|
2012-02-02 21:36:11 +01:00
|
|
|
|
sal_Int32 nPos = sTmpToken.indexOf("[en-us]=");
|
|
|
|
|
if (nPos != -1) {
|
2012-02-15 15:26:43 +01:00
|
|
|
|
rtl::OString sKey(
|
|
|
|
|
sTmpToken.copy(0 , nPos).replaceAll(" ", rtl::OString()).
|
|
|
|
|
replaceAll("\t", rtl::OString()));
|
|
|
|
|
rtl::OString sValue = sToken.getToken(1, '=');
|
2000-09-18 16:07:07 +00:00
|
|
|
|
CleanValue( sValue );
|
2011-11-18 21:03:31 +00:00
|
|
|
|
sKey = sKey.toAsciiUpperCase();
|
|
|
|
|
if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("STRINGLIST")))
|
|
|
|
|
{
|
2010-07-29 10:56:19 +08:00
|
|
|
|
pResData->bList = sal_True;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
nList = LIST_STRING;
|
2011-07-01 22:27:20 +01:00
|
|
|
|
m_sListLang = SOURCE_LANGUAGE;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
nListIndex = 0;
|
|
|
|
|
nListLevel = 0;
|
|
|
|
|
}
|
2011-11-18 21:03:31 +00:00
|
|
|
|
else if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("FILTERLIST")))
|
|
|
|
|
{
|
2010-07-29 10:56:19 +08:00
|
|
|
|
pResData->bList = sal_True;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
nList = LIST_FILTER;
|
2011-07-01 22:27:20 +01:00
|
|
|
|
m_sListLang = SOURCE_LANGUAGE;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
nListIndex = 0;
|
|
|
|
|
nListLevel = 0;
|
|
|
|
|
}
|
2004-11-18 07:16:38 +00:00
|
|
|
|
// PairedList
|
2011-11-18 21:03:31 +00:00
|
|
|
|
else if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("PAIREDLIST")))
|
|
|
|
|
{
|
2010-07-29 10:56:19 +08:00
|
|
|
|
pResData->bList = sal_True;
|
2004-11-18 07:16:38 +00:00
|
|
|
|
nList = LIST_PAIRED;
|
2011-07-01 22:27:20 +01:00
|
|
|
|
m_sListLang = SOURCE_LANGUAGE;
|
2004-11-18 07:16:38 +00:00
|
|
|
|
nListIndex = 0;
|
|
|
|
|
nListLevel = 0;
|
|
|
|
|
}
|
2011-11-18 21:03:31 +00:00
|
|
|
|
else if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("ITEMLIST")))
|
|
|
|
|
{
|
2010-07-29 10:56:19 +08:00
|
|
|
|
pResData->bList = sal_True;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
nList = LIST_ITEM;
|
2011-07-01 22:27:20 +01:00
|
|
|
|
m_sListLang = SOURCE_LANGUAGE;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
nListIndex = 0;
|
|
|
|
|
nListLevel = 0;
|
|
|
|
|
}
|
2011-11-18 21:03:31 +00:00
|
|
|
|
else if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("UIENTRIES")))
|
|
|
|
|
{
|
2010-07-29 10:56:19 +08:00
|
|
|
|
pResData->bList = sal_True;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
nList = LIST_UIENTRIES;
|
2011-07-01 22:27:20 +01:00
|
|
|
|
m_sListLang = SOURCE_LANGUAGE;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
nListIndex = 0;
|
|
|
|
|
nListLevel = 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
2011-11-18 21:03:31 +00:00
|
|
|
|
else
|
|
|
|
|
{
|
2000-09-18 16:07:07 +00:00
|
|
|
|
// new res. is a String- or FilterList
|
2012-02-13 21:46:50 +01:00
|
|
|
|
sal_Int32 n = 0;
|
2012-02-15 15:26:43 +01:00
|
|
|
|
rtl::OString sKey(
|
|
|
|
|
sToken.getToken(0, '[', n).replaceAll(" ", rtl::OString()).
|
|
|
|
|
replaceAll("\t", rtl::OString()).toAsciiUpperCase());
|
2011-11-18 21:03:31 +00:00
|
|
|
|
if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("STRINGLIST")))
|
2000-09-18 16:07:07 +00:00
|
|
|
|
nList = LIST_STRING;
|
2011-11-18 21:03:31 +00:00
|
|
|
|
else if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("FILTERLIST")))
|
2000-09-18 16:07:07 +00:00
|
|
|
|
nList = LIST_FILTER;
|
2011-11-18 21:03:31 +00:00
|
|
|
|
else if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("PAIREDLIST")))
|
2004-11-18 07:16:38 +00:00
|
|
|
|
nList = LIST_PAIRED; // abcd
|
2011-11-18 21:03:31 +00:00
|
|
|
|
else if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("ITEMLIST")))
|
2000-09-18 16:07:07 +00:00
|
|
|
|
nList = LIST_ITEM;
|
2011-11-18 21:03:31 +00:00
|
|
|
|
else if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("UIENTRIES")))
|
2000-09-18 16:07:07 +00:00
|
|
|
|
nList = LIST_UIENTRIES;
|
|
|
|
|
if ( nList ) {
|
2012-02-13 21:46:50 +01:00
|
|
|
|
rtl::OString sLang = sToken.getToken(0, ']', n);
|
2000-09-18 16:07:07 +00:00
|
|
|
|
CleanValue( sLang );
|
2011-07-01 22:27:20 +01:00
|
|
|
|
m_sListLang = sLang;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
nListIndex = 0;
|
|
|
|
|
nListLevel = 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case TEXT:
|
|
|
|
|
case _LISTTEXT:
|
|
|
|
|
case LISTTEXT: {
|
|
|
|
|
// this is an entry for a String- or FilterList
|
|
|
|
|
if ( nList ) {
|
|
|
|
|
SetChildWithText();
|
2012-02-13 21:46:50 +01:00
|
|
|
|
sal_Int32 n = 0;
|
|
|
|
|
rtl::OString sEntry(sToken.getToken(1, '"', n));
|
|
|
|
|
if ( helper::countOccurrences(sToken, '"') > 2 )
|
2003-04-29 15:48:05 +00:00
|
|
|
|
sEntry += "\"";
|
|
|
|
|
if ( sEntry == "\\\"" )
|
|
|
|
|
sEntry = "\"";
|
2000-09-18 16:07:07 +00:00
|
|
|
|
InsertListEntry( sEntry, sOrig );
|
2011-07-01 22:27:20 +01:00
|
|
|
|
if ( bMergeMode && ( sEntry != "\"" ))
|
|
|
|
|
{
|
|
|
|
|
PrepareTextToMerge( sOrig, nList, m_sListLang, pResData );
|
2001-05-11 07:58:14 +00:00
|
|
|
|
}
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case LONGTEXTLINE:
|
|
|
|
|
case TEXTLINE:
|
2010-07-29 10:56:19 +08:00
|
|
|
|
bDontWriteOutput = sal_False;
|
2011-11-18 21:03:31 +00:00
|
|
|
|
if ( nLevel )
|
|
|
|
|
{
|
2000-09-18 16:07:07 +00:00
|
|
|
|
CutComment( sToken );
|
|
|
|
|
|
|
|
|
|
// this is a text line!!!
|
2012-02-15 15:26:43 +01:00
|
|
|
|
rtl::OString t(sToken.getToken(0, '='));
|
|
|
|
|
rtl::OString sKey(
|
|
|
|
|
t.getToken(0, '[').replaceAll(" ", rtl::OString()).
|
|
|
|
|
replaceAll("\t", rtl::OString()));
|
2012-02-02 21:36:11 +01:00
|
|
|
|
rtl::OString sText( GetText( sToken, nToken ));
|
2012-02-02 09:11:38 +01:00
|
|
|
|
rtl::OString sLang;
|
2012-02-15 15:26:43 +01:00
|
|
|
|
if ( sToken.getToken(0, '=').indexOf('[') != -1 )
|
2011-08-29 23:03:08 +01:00
|
|
|
|
{
|
2012-02-15 15:26:43 +01:00
|
|
|
|
sLang = sToken.getToken(0, '=').getToken(1, '[').
|
|
|
|
|
getToken(0, ']');
|
2000-09-18 16:07:07 +00:00
|
|
|
|
CleanValue( sLang );
|
|
|
|
|
}
|
2011-07-01 22:27:20 +01:00
|
|
|
|
rtl::OString sLangIndex = sLang;
|
2012-02-02 21:36:11 +01:00
|
|
|
|
rtl::OString sOrigKey = sKey;
|
|
|
|
|
if ( !sText.isEmpty() && !sLang.isEmpty() )
|
2011-11-18 21:03:31 +00:00
|
|
|
|
{
|
|
|
|
|
sKey = sKey.toAsciiUpperCase();
|
|
|
|
|
if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("TEXT")) ||
|
|
|
|
|
sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("MESSAGE")) ||
|
|
|
|
|
sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("CUSTOMUNITTEXT")) ||
|
|
|
|
|
sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("SLOTNAME")) ||
|
|
|
|
|
sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("UINAME")))
|
2000-09-18 16:07:07 +00:00
|
|
|
|
{
|
|
|
|
|
SetChildWithText();
|
2011-07-01 22:27:20 +01:00
|
|
|
|
if ( Export::isSourceLanguage( sLangIndex ) )
|
2000-09-18 16:07:07 +00:00
|
|
|
|
pResData->SetId( sText, ID_LEVEL_TEXT );
|
2007-04-19 14:18:22 +00:00
|
|
|
|
|
2010-07-29 10:56:19 +08:00
|
|
|
|
pResData->bText = sal_True;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
pResData->sTextTyp = sOrigKey;
|
|
|
|
|
if ( bMergeMode ) {
|
2011-07-01 22:27:20 +01:00
|
|
|
|
PrepareTextToMerge( sOrig, STRING_TYP_TEXT, sLangIndex, pResData );
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
2011-07-01 22:27:20 +01:00
|
|
|
|
else
|
|
|
|
|
{
|
2012-01-04 11:38:41 -02:00
|
|
|
|
if (!pResData->sText[ sLangIndex ].isEmpty())
|
2011-07-01 22:27:20 +01:00
|
|
|
|
{
|
|
|
|
|
rtl::OStringBuffer sError(RTL_CONSTASCII_STRINGPARAM("Language "));
|
|
|
|
|
sError.append(sLangIndex);
|
|
|
|
|
sError.append(RTL_CONSTASCII_STRINGPARAM("defined twice"));
|
|
|
|
|
yyerror(sError.getStr());
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
2011-07-01 22:27:20 +01:00
|
|
|
|
pResData->sText[ sLangIndex ] = sText;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else if ( sKey == "HELPTEXT" ) {
|
|
|
|
|
SetChildWithText();
|
2010-07-29 10:56:19 +08:00
|
|
|
|
pResData->bHelpText = sal_True;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
if ( bMergeMode )
|
2011-07-01 22:27:20 +01:00
|
|
|
|
PrepareTextToMerge( sOrig, STRING_TYP_HELPTEXT, sLangIndex, pResData );
|
|
|
|
|
else
|
|
|
|
|
{
|
2012-01-04 11:38:41 -02:00
|
|
|
|
if (!pResData->sHelpText[ sLangIndex ].isEmpty())
|
2011-07-01 22:27:20 +01:00
|
|
|
|
{
|
|
|
|
|
rtl::OStringBuffer sError(RTL_CONSTASCII_STRINGPARAM("Language "));
|
|
|
|
|
sError.append(sLangIndex);
|
|
|
|
|
sError.append(" defined twice");
|
|
|
|
|
YYWarning(sError.getStr());
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
2011-07-01 22:27:20 +01:00
|
|
|
|
pResData->sHelpText[ sLangIndex ] = sText;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else if ( sKey == "QUICKHELPTEXT" ) {
|
|
|
|
|
SetChildWithText();
|
2010-07-29 10:56:19 +08:00
|
|
|
|
pResData->bQuickHelpText = sal_True;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
if ( bMergeMode )
|
2011-07-01 22:27:20 +01:00
|
|
|
|
PrepareTextToMerge( sOrig, STRING_TYP_QUICKHELPTEXT, sLangIndex, pResData );
|
|
|
|
|
else
|
|
|
|
|
{
|
2012-01-04 11:38:41 -02:00
|
|
|
|
if (!pResData->sQuickHelpText[ sLangIndex ].isEmpty())
|
2011-07-01 22:27:20 +01:00
|
|
|
|
{
|
|
|
|
|
rtl::OStringBuffer sError(RTL_CONSTASCII_STRINGPARAM("Language "));
|
|
|
|
|
sError.append(sLangIndex);
|
|
|
|
|
sError.append(RTL_CONSTASCII_STRINGPARAM(" defined twice"));
|
|
|
|
|
YYWarning(sError.getStr());
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
2011-07-01 22:27:20 +01:00
|
|
|
|
pResData->sQuickHelpText[ sLangIndex ] = sText;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else if ( sKey == "TITLE" ) {
|
|
|
|
|
SetChildWithText();
|
2010-07-29 10:56:19 +08:00
|
|
|
|
pResData->bTitle = sal_True;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
if ( bMergeMode )
|
2011-07-01 22:27:20 +01:00
|
|
|
|
PrepareTextToMerge( sOrig, STRING_TYP_TITLE, sLangIndex, pResData );
|
|
|
|
|
else
|
|
|
|
|
{
|
2012-01-04 11:38:41 -02:00
|
|
|
|
if ( !pResData->sTitle[ sLangIndex ].isEmpty())
|
2011-07-01 22:27:20 +01:00
|
|
|
|
{
|
|
|
|
|
rtl::OStringBuffer sError(RTL_CONSTASCII_STRINGPARAM("Language "));
|
|
|
|
|
sError.append(sLangIndex);
|
|
|
|
|
sError.append(RTL_CONSTASCII_STRINGPARAM(" defined twice"));
|
|
|
|
|
YYWarning(sError.getStr());
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
2011-07-01 22:27:20 +01:00
|
|
|
|
pResData->sTitle[ sLangIndex ] = sText;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else if ( sKey == "ACCESSPATH" ) {
|
|
|
|
|
pResData->SetId( sText, ID_LEVEL_ACCESSPATH );
|
|
|
|
|
}
|
|
|
|
|
else if ( sKey == "FIELDNAME" ) {
|
|
|
|
|
pResData->SetId( sText, ID_LEVEL_FIELDNAME );
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case NEWTEXTINRES: {
|
2010-07-29 10:56:19 +08:00
|
|
|
|
bDontWriteOutput = sal_True;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
|
|
|
|
break;
|
2011-08-15 00:22:23 +01:00
|
|
|
|
case APPFONTMAPPING:
|
|
|
|
|
{
|
2010-07-29 10:56:19 +08:00
|
|
|
|
bDontWriteOutput = sal_False;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
// this is a AppfontMapping, so look if its a definition
|
|
|
|
|
// of field size
|
2012-02-13 21:46:50 +01:00
|
|
|
|
sal_Int32 n = 0;
|
2012-02-15 15:26:43 +01:00
|
|
|
|
rtl::OString sKey(
|
|
|
|
|
sToken.getToken(0, '=', n).replaceAll(" ", rtl::OString()).
|
|
|
|
|
replaceAll("\t", rtl::OString()));
|
2012-02-13 21:46:50 +01:00
|
|
|
|
rtl::OString sMapping = sToken.getToken(0, '=', n);
|
2012-02-15 15:26:43 +01:00
|
|
|
|
sMapping = sMapping.getToken(1, '(');
|
|
|
|
|
sMapping = sMapping.getToken(0, ')').
|
|
|
|
|
replaceAll(rtl::OString(' '), rtl::OString()).
|
|
|
|
|
replaceAll(rtl::OString('\t'), rtl::OString()).
|
|
|
|
|
toAsciiUpperCase();
|
2012-02-13 21:46:50 +01:00
|
|
|
|
if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("SIZE"))) {
|
2012-02-15 15:26:43 +01:00
|
|
|
|
pResData->nWidth = sMapping.getToken(0, ',').toInt32();
|
2012-02-13 21:46:50 +01:00
|
|
|
|
} else if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("POSSIZE"))) {
|
2012-02-15 15:26:43 +01:00
|
|
|
|
pResData->nWidth = sMapping.getToken(2, ',').toInt32();
|
2012-02-13 21:46:50 +01:00
|
|
|
|
}
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case RSCDEFINELEND:
|
2010-07-29 10:56:19 +08:00
|
|
|
|
bDontWriteOutput = sal_False;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
break;
|
|
|
|
|
case CONDITION: {
|
2010-07-29 10:56:19 +08:00
|
|
|
|
bDontWriteOutput = sal_False;
|
2012-02-15 15:26:43 +01:00
|
|
|
|
sToken = sToken.replace('\r', ' ').replace('\t', ' ');
|
|
|
|
|
for (;;) {
|
|
|
|
|
sal_Int32 n = 0;
|
|
|
|
|
sToken = sToken.replaceFirst(" ", " ", &n);
|
|
|
|
|
if (n == -1) {
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
2012-02-13 21:46:50 +01:00
|
|
|
|
sal_Int32 n = 0;
|
|
|
|
|
rtl::OString sCondition(sToken.getToken(0, ' ', n));
|
2000-09-18 16:07:07 +00:00
|
|
|
|
if ( sCondition == "#ifndef" ) {
|
|
|
|
|
sActPForm = "!defined ";
|
2012-02-13 21:46:50 +01:00
|
|
|
|
sActPForm += sToken.getToken(0, ' ', n);
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
|
|
|
|
else if ( sCondition == "#ifdef" ) {
|
|
|
|
|
sActPForm = "defined ";
|
2012-02-13 21:46:50 +01:00
|
|
|
|
sActPForm += sToken.getToken(0, ' ', n);
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
|
|
|
|
else if ( sCondition == "#if" ) {
|
2012-02-15 15:26:43 +01:00
|
|
|
|
sActPForm = sToken.copy( 4 ).replaceAll("||", "\\or");
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
|
|
|
|
else if ( sCondition == "#elif" ) {
|
2012-02-15 15:26:43 +01:00
|
|
|
|
sActPForm = sToken.copy( 6 ).replaceAll("||", "\\or");
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
|
|
|
|
else if ( sCondition == "#else" ) {
|
|
|
|
|
sActPForm = sCondition;
|
|
|
|
|
}
|
|
|
|
|
else if ( sCondition == "#endif" ) {
|
|
|
|
|
sActPForm = "";
|
|
|
|
|
}
|
|
|
|
|
else break;
|
|
|
|
|
if ( nLevel ) {
|
2010-07-29 10:56:19 +08:00
|
|
|
|
WriteData( pResData, sal_True );
|
2000-09-18 16:07:07 +00:00
|
|
|
|
pResData->sPForm = sActPForm;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case EMPTYLINE : {
|
2010-07-29 10:56:19 +08:00
|
|
|
|
bDontWriteOutput = sal_False;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
if ( bDefine ) {
|
2010-07-29 10:56:19 +08:00
|
|
|
|
bNextMustBeDefineEOL = sal_False;
|
|
|
|
|
bDefine = sal_False;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
while ( nLevel )
|
2006-06-19 16:21:29 +00:00
|
|
|
|
Parse( LEVELDOWN, "" );
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case PRAGMA : {
|
2010-07-29 10:56:19 +08:00
|
|
|
|
bDontWriteOutput = sal_False;
|
2012-02-02 09:11:38 +01:00
|
|
|
|
fprintf(stderr, "ERROR: archaic PRAGMA %s\n", sToken.getStr());
|
2011-09-12 21:53:16 +01:00
|
|
|
|
exit(-1);
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case TEXTREFID : {
|
2010-07-29 10:56:19 +08:00
|
|
|
|
bDontWriteOutput = sal_True;
|
2007-04-19 14:18:22 +00:00
|
|
|
|
}
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
|
|
|
|
if ( bWriteToMerged ) {
|
|
|
|
|
// the current token must be written to dest. without merging
|
2004-06-25 11:40:49 +00:00
|
|
|
|
|
2012-02-02 09:11:38 +01:00
|
|
|
|
if( bDefine && sOrig.getLength() > 2 ){
|
|
|
|
|
for( sal_uInt16 n = 0 ; n < sOrig.getLength() ; n++ ){
|
|
|
|
|
if( sOrig[n] == '\n' && sOrig[n-1] != '\\'){
|
|
|
|
|
sOrig = sOrig.replaceAt(n++, 0, "\\");
|
2004-06-25 11:40:49 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
WriteToMerged( sOrig , false);
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if ( bExecuteDown ) {
|
2006-06-19 16:21:29 +00:00
|
|
|
|
Parse( LEVELDOWN, "" );
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*****************************************************************************/
|
2012-02-02 09:11:38 +01:00
|
|
|
|
void Export::CutComment( rtl::OString &rText )
|
2000-09-18 16:07:07 +00:00
|
|
|
|
/*****************************************************************************/
|
|
|
|
|
{
|
2012-02-02 21:36:11 +01:00
|
|
|
|
if (rText.indexOf("//") != -1) {
|
2012-02-15 15:26:43 +01:00
|
|
|
|
rtl::OString sWork(rText.replaceAll("\\\"", "XX"));
|
2012-02-02 21:36:11 +01:00
|
|
|
|
bool bInner = false;
|
|
|
|
|
for (sal_Int32 i = 0; i < sWork.getLength() - 1; ++i) {
|
|
|
|
|
if (sWork[i] == '"') {
|
2000-09-18 16:07:07 +00:00
|
|
|
|
bInner = !bInner;
|
2012-02-02 21:36:11 +01:00
|
|
|
|
} else if (sWork[i] == '/' && !bInner && sWork[i + 1] == '/' ) {
|
2012-02-02 09:11:38 +01:00
|
|
|
|
rText = rText.copy(0, i);
|
2012-02-02 21:36:11 +01:00
|
|
|
|
break;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*****************************************************************************/
|
2010-07-29 10:56:19 +08:00
|
|
|
|
sal_Bool Export::WriteData( ResData *pResData, sal_Bool bCreateNew )
|
2000-09-18 16:07:07 +00:00
|
|
|
|
/*****************************************************************************/
|
|
|
|
|
{
|
|
|
|
|
if ( bMergeMode ) {
|
|
|
|
|
MergeRest( pResData );
|
2010-07-29 10:56:19 +08:00
|
|
|
|
return sal_True;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
|
|
|
|
|
2007-04-19 14:18:22 +00:00
|
|
|
|
// mandatory to export: en-US
|
2004-06-25 11:40:49 +00:00
|
|
|
|
|
2012-01-04 11:38:41 -02:00
|
|
|
|
if (( !pResData->sText[ SOURCE_LANGUAGE ].isEmpty())
|
2004-06-25 11:40:49 +00:00
|
|
|
|
||
|
2012-01-04 11:38:41 -02:00
|
|
|
|
( !pResData->sHelpText[ SOURCE_LANGUAGE ].isEmpty())
|
2004-06-25 11:40:49 +00:00
|
|
|
|
||
|
2012-01-04 11:38:41 -02:00
|
|
|
|
( !pResData->sQuickHelpText[ SOURCE_LANGUAGE ].isEmpty())
|
2004-06-25 11:40:49 +00:00
|
|
|
|
||
|
2012-01-04 11:38:41 -02:00
|
|
|
|
( !pResData->sTitle[ SOURCE_LANGUAGE ].isEmpty()))
|
2004-06-25 11:40:49 +00:00
|
|
|
|
|
|
|
|
|
{
|
2012-02-02 21:36:11 +01:00
|
|
|
|
rtl::OString sGID = pResData->sGId;
|
|
|
|
|
rtl::OString sLID;
|
|
|
|
|
if (sGID.isEmpty())
|
2000-09-18 16:07:07 +00:00
|
|
|
|
sGID = pResData->sId;
|
|
|
|
|
else
|
|
|
|
|
sLID = pResData->sId;
|
|
|
|
|
|
2012-02-02 21:36:11 +01:00
|
|
|
|
rtl::OString sXText;
|
|
|
|
|
rtl::OString sXHText;
|
|
|
|
|
rtl::OString sXQHText;
|
|
|
|
|
rtl::OString sXTitle;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
|
2012-02-02 21:36:11 +01:00
|
|
|
|
rtl::OString sCur;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
|
2006-06-19 16:21:29 +00:00
|
|
|
|
for( unsigned int n = 0; n < aLanguages.size(); n++ ){
|
2004-06-25 11:40:49 +00:00
|
|
|
|
sCur = aLanguages[ n ];
|
2012-02-02 21:36:11 +01:00
|
|
|
|
if (!sCur.equalsIgnoreAsciiCase("x-comment") ){
|
2012-01-04 11:38:41 -02:00
|
|
|
|
if (!pResData->sText[ sCur ].isEmpty())
|
2004-06-25 11:40:49 +00:00
|
|
|
|
sXText = pResData->sText[ sCur ];
|
2000-09-18 16:07:07 +00:00
|
|
|
|
else {
|
2007-04-19 14:18:22 +00:00
|
|
|
|
sXText = pResData->sText[ SOURCE_LANGUAGE ];
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
|
|
|
|
|
2012-04-14 14:22:13 +02:00
|
|
|
|
if (!pResData->sText[ X_COMMENT ].isEmpty())
|
|
|
|
|
sXHText = pResData->sText[ X_COMMENT ];
|
2000-09-18 16:07:07 +00:00
|
|
|
|
else {
|
2007-04-19 14:18:22 +00:00
|
|
|
|
sXHText = pResData->sHelpText[ SOURCE_LANGUAGE ];
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
|
|
|
|
|
2012-01-04 11:38:41 -02:00
|
|
|
|
if (!pResData->sQuickHelpText[ sCur ].isEmpty())
|
2004-06-25 11:40:49 +00:00
|
|
|
|
sXQHText = pResData->sQuickHelpText[ sCur ];
|
2000-09-18 16:07:07 +00:00
|
|
|
|
else {
|
2007-04-19 14:18:22 +00:00
|
|
|
|
sXQHText = pResData->sQuickHelpText[ SOURCE_LANGUAGE ];
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
|
|
|
|
|
2012-01-04 11:38:41 -02:00
|
|
|
|
if (!pResData->sTitle[ sCur ].isEmpty())
|
2004-06-25 11:40:49 +00:00
|
|
|
|
sXTitle = pResData->sTitle[ sCur ];
|
2011-07-01 22:27:20 +01:00
|
|
|
|
else
|
2007-04-19 14:18:22 +00:00
|
|
|
|
sXTitle = pResData->sTitle[ SOURCE_LANGUAGE ];
|
2000-09-18 16:07:07 +00:00
|
|
|
|
|
2012-02-02 21:36:11 +01:00
|
|
|
|
if (sXText.isEmpty())
|
2000-09-18 16:07:07 +00:00
|
|
|
|
sXText = "-";
|
|
|
|
|
|
2012-02-02 21:36:11 +01:00
|
|
|
|
if (sXHText.isEmpty())
|
2011-07-01 22:27:20 +01:00
|
|
|
|
{
|
2012-01-04 11:38:41 -02:00
|
|
|
|
if (!pResData->sHelpText[ SOURCE_LANGUAGE ].isEmpty())
|
2007-04-19 14:18:22 +00:00
|
|
|
|
sXHText = pResData->sHelpText[ SOURCE_LANGUAGE ];
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
2004-06-25 11:40:49 +00:00
|
|
|
|
sXText = pResData->sText[ sCur ];
|
2000-09-18 16:07:07 +00:00
|
|
|
|
|
2012-02-08 22:07:23 +01:00
|
|
|
|
rtl::OString sOutput( sProject ); sOutput += "\t";
|
|
|
|
|
if ( !sRoot.isEmpty())
|
|
|
|
|
sOutput += sActFileName;
|
|
|
|
|
sOutput += "\t0\t";
|
|
|
|
|
sOutput += pResData->sResTyp; sOutput += "\t";
|
|
|
|
|
sOutput += sGID; sOutput += "\t";
|
|
|
|
|
sOutput += sLID; sOutput += "\t";
|
|
|
|
|
sOutput += pResData->sHelpId; sOutput += "\t";
|
|
|
|
|
sOutput += pResData->sPForm; sOutput += "\t";
|
2012-02-10 10:44:37 +01:00
|
|
|
|
sOutput += rtl::OString::valueOf(pResData->nWidth); sOutput += "\t";
|
2012-02-08 22:07:23 +01:00
|
|
|
|
sOutput += sCur; sOutput += "\t";
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
sOutput += sXText; sOutput += "\t";
|
|
|
|
|
sOutput += sXHText; sOutput += "\t";
|
|
|
|
|
sOutput += sXQHText; sOutput+= "\t";
|
|
|
|
|
sOutput += sXTitle; sOutput += "\t";
|
|
|
|
|
|
|
|
|
|
aOutput << sOutput.getStr() << '\n';
|
2000-09-18 16:07:07 +00:00
|
|
|
|
|
|
|
|
|
if ( bCreateNew ) {
|
2007-04-19 14:18:22 +00:00
|
|
|
|
pResData->sText[ sCur ] = "";
|
|
|
|
|
pResData->sHelpText[ sCur ] = "";
|
|
|
|
|
pResData->sQuickHelpText[ sCur ]= "";
|
|
|
|
|
pResData->sTitle[ sCur ] = "";
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if ( pResData->pStringList ) {
|
2012-02-02 21:36:11 +01:00
|
|
|
|
rtl::OString sList( "stringlist" );
|
2000-09-18 16:07:07 +00:00
|
|
|
|
WriteExportList( pResData, pResData->pStringList, sList, bCreateNew );
|
|
|
|
|
if ( bCreateNew )
|
|
|
|
|
pResData->pStringList = 0;
|
|
|
|
|
}
|
|
|
|
|
if ( pResData->pFilterList ) {
|
2012-02-02 21:36:11 +01:00
|
|
|
|
rtl::OString sList( "filterlist" );
|
2000-09-18 16:07:07 +00:00
|
|
|
|
WriteExportList( pResData, pResData->pFilterList, sList, bCreateNew );
|
|
|
|
|
if ( bCreateNew )
|
|
|
|
|
pResData->pFilterList = 0;
|
|
|
|
|
}
|
|
|
|
|
if ( pResData->pItemList ) {
|
2012-02-02 21:36:11 +01:00
|
|
|
|
rtl::OString sList( "itemlist" );
|
2000-09-18 16:07:07 +00:00
|
|
|
|
WriteExportList( pResData, pResData->pItemList, sList, bCreateNew );
|
|
|
|
|
if ( bCreateNew )
|
|
|
|
|
pResData->pItemList = 0;
|
|
|
|
|
}
|
2004-11-18 07:16:38 +00:00
|
|
|
|
if ( pResData->pPairedList ) {
|
2012-02-02 21:36:11 +01:00
|
|
|
|
rtl::OString sList( "pairedlist" );
|
2004-11-18 07:16:38 +00:00
|
|
|
|
WriteExportList( pResData, pResData->pPairedList, sList, bCreateNew );
|
|
|
|
|
if ( bCreateNew )
|
|
|
|
|
pResData->pItemList = 0;
|
|
|
|
|
}
|
2000-09-18 16:07:07 +00:00
|
|
|
|
if ( pResData->pUIEntries ) {
|
2012-02-02 21:36:11 +01:00
|
|
|
|
rtl::OString sList( "uientries" );
|
2000-09-18 16:07:07 +00:00
|
|
|
|
WriteExportList( pResData, pResData->pUIEntries, sList, bCreateNew );
|
|
|
|
|
if ( bCreateNew )
|
|
|
|
|
pResData->pUIEntries = 0;
|
|
|
|
|
}
|
2010-07-29 10:56:19 +08:00
|
|
|
|
return sal_True;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
2012-01-30 20:44:22 +00:00
|
|
|
|
|
|
|
|
|
rtl::OString Export::GetPairedListID(const rtl::OString& rText)
|
|
|
|
|
{
|
2004-11-18 07:16:38 +00:00
|
|
|
|
// < "STRING" ; IDENTIFIER ; > ;
|
2012-02-15 15:26:43 +01:00
|
|
|
|
return rText.getToken(1, ';').toAsciiUpperCase().replace('\t', ' ').trim();
|
2004-11-18 07:16:38 +00:00
|
|
|
|
}
|
2012-01-30 20:44:22 +00:00
|
|
|
|
|
|
|
|
|
rtl::OString Export::GetPairedListString(const rtl::OString& rText)
|
|
|
|
|
{
|
2004-11-18 07:16:38 +00:00
|
|
|
|
// < "STRING" ; IDENTIFIER ; > ;
|
2012-02-15 15:26:43 +01:00
|
|
|
|
rtl::OString sString(rText.getToken(0, ';').replace('\t', ' '));
|
|
|
|
|
sString = sString.trim();
|
2012-02-02 21:36:11 +01:00
|
|
|
|
rtl::OString s1(sString.copy(sString.indexOf('"') + 1));
|
|
|
|
|
sString = s1.copy(0, s1.lastIndexOf('"'));
|
2012-02-15 15:26:43 +01:00
|
|
|
|
return sString.trim();
|
2004-11-18 07:16:38 +00:00
|
|
|
|
}
|
2012-01-30 20:44:22 +00:00
|
|
|
|
|
|
|
|
|
rtl::OString Export::StripList(const rtl::OString & rText)
|
|
|
|
|
{
|
|
|
|
|
rtl::OString s1 = rText.copy( rText.indexOf('\"') + 1);
|
|
|
|
|
return s1.copy( 0 , s1.lastIndexOf('\"'));
|
2005-02-14 10:43:50 +00:00
|
|
|
|
}
|
2000-09-18 16:07:07 +00:00
|
|
|
|
|
2012-01-30 20:44:22 +00:00
|
|
|
|
sal_Bool Export::WriteExportList(ResData *pResData, ExportList *pExportList,
|
|
|
|
|
const rtl::OString &rTyp, sal_Bool bCreateNew)
|
2000-09-18 16:07:07 +00:00
|
|
|
|
{
|
2012-02-02 21:36:11 +01:00
|
|
|
|
rtl::OString sGID(pResData->sGId);
|
|
|
|
|
if (sGID.isEmpty())
|
2000-09-18 16:07:07 +00:00
|
|
|
|
sGID = pResData->sId;
|
|
|
|
|
else {
|
|
|
|
|
sGID += ".";
|
|
|
|
|
sGID += pResData->sId;
|
2012-02-13 21:46:50 +01:00
|
|
|
|
while (sGID.getLength() != 0 && sGID[sGID.getLength() - 1] == '.') {
|
|
|
|
|
sGID = sGID.copy(0, sGID.getLength() - 1);
|
|
|
|
|
}
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
|
|
|
|
|
2012-02-02 21:36:11 +01:00
|
|
|
|
rtl::OString sCur;
|
2011-12-07 10:49:55 +00:00
|
|
|
|
for ( size_t i = 0; pExportList != NULL && i < pExportList->size(); i++ )
|
|
|
|
|
{
|
2011-01-22 21:21:53 -08:00
|
|
|
|
ExportListEntry *pEntry = (*pExportList)[ i ];
|
2004-11-18 07:16:38 +00:00
|
|
|
|
|
2012-02-02 21:36:11 +01:00
|
|
|
|
rtl::OString sLID(rtl::OString::valueOf(static_cast<sal_Int64>(i + 1)));
|
2011-07-01 22:27:20 +01:00
|
|
|
|
for (unsigned int n = 0; n < aLanguages.size(); ++n)
|
|
|
|
|
{
|
2004-06-25 11:40:49 +00:00
|
|
|
|
sCur = aLanguages[ n ];
|
2012-01-04 11:38:41 -02:00
|
|
|
|
if (!(*pEntry)[ SOURCE_LANGUAGE ].isEmpty())
|
2011-07-01 22:27:20 +01:00
|
|
|
|
{
|
2012-02-08 22:07:23 +01:00
|
|
|
|
rtl::OString sText((*pEntry)[ SOURCE_LANGUAGE ] );
|
2011-07-01 22:27:20 +01:00
|
|
|
|
|
2012-02-08 22:07:23 +01:00
|
|
|
|
// Strip PairList Line String
|
|
|
|
|
if (rTyp.equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("pairedlist")))
|
|
|
|
|
{
|
|
|
|
|
sLID = GetPairedListID( sText );
|
|
|
|
|
if (!(*pEntry)[ sCur ].isEmpty())
|
|
|
|
|
sText = (*pEntry)[ sCur ];
|
|
|
|
|
sText = GetPairedListString( sText );
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
sText = StripList( (*pEntry)[ sCur ] );
|
|
|
|
|
if( sText == "\\\"" )
|
|
|
|
|
sText = "\"";
|
|
|
|
|
}
|
2000-09-18 16:07:07 +00:00
|
|
|
|
|
2012-02-08 22:07:23 +01:00
|
|
|
|
rtl::OStringBuffer sOutput(sProject);
|
|
|
|
|
sOutput.append('\t');
|
|
|
|
|
if ( !sRoot.isEmpty())
|
|
|
|
|
sOutput.append(sActFileName);
|
|
|
|
|
sOutput.append("\t0\t");
|
|
|
|
|
sOutput.append(rTyp).append('\t');
|
|
|
|
|
sOutput.append(sGID).append('\t');
|
|
|
|
|
sOutput.append(sLID).append("\t\t");
|
|
|
|
|
sOutput.append(pResData->sPForm).append("\t0\t");
|
|
|
|
|
sOutput.append(sCur).append('\t');
|
2001-04-25 09:17:04 +00:00
|
|
|
|
|
2012-02-08 22:07:23 +01:00
|
|
|
|
sOutput.append(sText).append("\t\t\t\t");
|
2004-08-02 15:24:59 +00:00
|
|
|
|
|
2012-02-08 22:07:23 +01:00
|
|
|
|
aOutput << sOutput.makeStringAndClear().getStr() << '\n';
|
2011-07-01 22:27:20 +01:00
|
|
|
|
}
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
|
|
|
|
if ( bCreateNew )
|
|
|
|
|
delete [] pEntry;
|
|
|
|
|
}
|
|
|
|
|
if ( bCreateNew )
|
|
|
|
|
delete pExportList;
|
|
|
|
|
|
2010-07-29 10:56:19 +08:00
|
|
|
|
return sal_True;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
|
|
|
|
|
2012-01-30 20:44:22 +00:00
|
|
|
|
rtl::OString Export::FullId()
|
2000-09-18 16:07:07 +00:00
|
|
|
|
{
|
2012-01-30 20:44:22 +00:00
|
|
|
|
rtl::OStringBuffer sFull;
|
|
|
|
|
if ( nLevel > 1 )
|
|
|
|
|
{
|
|
|
|
|
sFull.append(aResStack[ 0 ]->sId);
|
|
|
|
|
for ( size_t i = 1; i < nLevel - 1; ++i )
|
|
|
|
|
{
|
|
|
|
|
rtl::OString sToAdd = aResStack[ i ]->sId;
|
|
|
|
|
if (!sToAdd.isEmpty())
|
|
|
|
|
sFull.append('.').append(sToAdd);
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
2012-01-30 20:44:22 +00:00
|
|
|
|
if (sFull.getLength() > 255)
|
2011-07-01 22:27:20 +01:00
|
|
|
|
{
|
|
|
|
|
rtl::OString sError(RTL_CONSTASCII_STRINGPARAM("GroupId > 255 chars"));
|
2012-01-30 20:44:22 +00:00
|
|
|
|
printf("GroupID = %s\n", sFull.getStr());
|
2011-07-01 22:27:20 +01:00
|
|
|
|
yyerror(sError.getStr());
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
|
|
|
|
|
2012-01-30 20:44:22 +00:00
|
|
|
|
return sFull.makeStringAndClear();
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
|
|
|
|
|
2012-01-30 20:44:22 +00:00
|
|
|
|
void Export::InsertListEntry(const rtl::OString &rText, const rtl::OString &rLine)
|
2000-09-18 16:07:07 +00:00
|
|
|
|
{
|
2011-01-22 21:51:18 -08:00
|
|
|
|
ResData *pResData = ( nLevel-1 < aResStack.size() ) ? aResStack[ nLevel-1 ] : NULL;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
|
|
|
|
|
ExportList *pList = NULL;
|
|
|
|
|
if ( nList == LIST_STRING ) {
|
|
|
|
|
pList = pResData->pStringList;
|
|
|
|
|
if ( !pList ) {
|
|
|
|
|
pResData->pStringList = new ExportList();
|
|
|
|
|
pList = pResData->pStringList;
|
|
|
|
|
nListIndex = 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else if ( nList == LIST_FILTER ) {
|
|
|
|
|
pList = pResData->pFilterList;
|
|
|
|
|
if ( !pList ) {
|
|
|
|
|
pResData->pFilterList = new ExportList();
|
|
|
|
|
pList = pResData->pFilterList;
|
|
|
|
|
nListIndex = 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else if ( nList == LIST_ITEM ) {
|
|
|
|
|
pList = pResData->pItemList;
|
|
|
|
|
if ( !pList ) {
|
|
|
|
|
pResData->pItemList = new ExportList();
|
|
|
|
|
pList = pResData->pItemList;
|
|
|
|
|
nListIndex = 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
2004-11-18 07:16:38 +00:00
|
|
|
|
else if ( nList == LIST_PAIRED ) {
|
|
|
|
|
pList = pResData->pPairedList;
|
|
|
|
|
if ( !pList ) {
|
|
|
|
|
pResData->pPairedList = new ExportList();
|
|
|
|
|
pList = pResData->pPairedList;
|
|
|
|
|
nListIndex = 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
2000-09-18 16:07:07 +00:00
|
|
|
|
else if ( nList == LIST_UIENTRIES ) {
|
|
|
|
|
pList = pResData->pUIEntries;
|
|
|
|
|
if ( !pList ) {
|
|
|
|
|
pResData->pUIEntries = new ExportList();
|
|
|
|
|
pList = pResData->pUIEntries;
|
|
|
|
|
nListIndex = 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
return;
|
|
|
|
|
|
2011-07-01 22:27:20 +01:00
|
|
|
|
if ( nListIndex + 1 > pList->size())
|
|
|
|
|
{
|
2004-06-25 11:40:49 +00:00
|
|
|
|
ExportListEntry *pNew = new ExportListEntry();
|
2011-07-01 22:27:20 +01:00
|
|
|
|
(*pNew)[LIST_REFID] = rtl::OString::valueOf(static_cast<sal_Int32>(REFID_NONE));
|
|
|
|
|
pList->push_back(pNew);
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
2011-01-22 21:21:53 -08:00
|
|
|
|
ExportListEntry *pCurEntry = (*pList)[ nListIndex ];
|
2004-11-18 07:16:38 +00:00
|
|
|
|
|
|
|
|
|
// For paired list use the line to set proper lid
|
|
|
|
|
if( nList == LIST_PAIRED ){
|
2011-07-01 22:27:20 +01:00
|
|
|
|
(*pCurEntry)[ m_sListLang ] = rLine;
|
2004-11-18 07:16:38 +00:00
|
|
|
|
}else
|
2011-07-01 22:27:20 +01:00
|
|
|
|
(*pCurEntry)[ m_sListLang ] = rText;
|
2004-11-18 07:16:38 +00:00
|
|
|
|
|
2011-07-01 22:27:20 +01:00
|
|
|
|
if ( Export::isSourceLanguage( m_sListLang ) ) {
|
2012-02-21 19:40:32 +01:00
|
|
|
|
(*pCurEntry)[ SOURCE_LANGUAGE ] = rLine;
|
2004-11-18 07:16:38 +00:00
|
|
|
|
|
2007-04-19 14:18:22 +00:00
|
|
|
|
pList->NewSourceLanguageListEntry();
|
2001-07-31 12:12:26 +00:00
|
|
|
|
}
|
2004-11-18 07:16:38 +00:00
|
|
|
|
|
2000-09-18 16:07:07 +00:00
|
|
|
|
nListIndex++;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*****************************************************************************/
|
2012-02-02 09:11:38 +01:00
|
|
|
|
void Export::CleanValue( rtl::OString &rValue )
|
2000-09-18 16:07:07 +00:00
|
|
|
|
/*****************************************************************************/
|
|
|
|
|
{
|
2012-02-02 09:11:38 +01:00
|
|
|
|
while ( !rValue.isEmpty()) {
|
|
|
|
|
if (( rValue[0] == ' ' ) || ( rValue[0] == '\t' ))
|
|
|
|
|
rValue = rValue.copy( 1 );
|
2000-09-18 16:07:07 +00:00
|
|
|
|
else
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
2012-02-02 09:11:38 +01:00
|
|
|
|
if ( !rValue.isEmpty()) {
|
|
|
|
|
for ( sal_Int32 i = rValue.getLength() - 1; i > 0; i-- ) {
|
|
|
|
|
if (( rValue[i] == ' ' ) || ( rValue[i] == '\t' ) ||
|
|
|
|
|
( rValue[i] == '\n' ) || ( rValue[i] == ';' ) ||
|
|
|
|
|
( rValue[i] == '{' ) || ( rValue[i] == '\\' ) ||
|
|
|
|
|
( rValue[i] == '\r' ))
|
|
|
|
|
rValue = rValue.copy(0, i);
|
2000-09-18 16:07:07 +00:00
|
|
|
|
else
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#define TXT_STATE_NON 0x000
|
|
|
|
|
#define TXT_STATE_TEXT 0x001
|
|
|
|
|
#define TXT_STATE_MACRO 0x002
|
2012-01-30 20:44:22 +00:00
|
|
|
|
|
|
|
|
|
rtl::OString Export::GetText(const rtl::OString &rSource, int nToken)
|
2000-09-18 16:07:07 +00:00
|
|
|
|
{
|
2012-02-02 21:36:11 +01:00
|
|
|
|
rtl::OString sReturn;
|
2011-11-18 21:03:31 +00:00
|
|
|
|
switch ( nToken )
|
|
|
|
|
{
|
2000-09-18 16:07:07 +00:00
|
|
|
|
case TEXTLINE:
|
2011-11-18 21:03:31 +00:00
|
|
|
|
case LONGTEXTLINE:
|
|
|
|
|
{
|
2012-02-02 09:11:38 +01:00
|
|
|
|
rtl::OString sTmp(rSource.copy(rSource.indexOf("=")));
|
2000-09-18 16:07:07 +00:00
|
|
|
|
CleanValue( sTmp );
|
2012-02-15 15:26:43 +01:00
|
|
|
|
sTmp = sTmp.replaceAll("\n", rtl::OString()).
|
|
|
|
|
replaceAll("\r", rtl::OString()).
|
|
|
|
|
replaceAll("\\\\\"", "-=<[BSlashBSlashHKom]>=-\"").
|
|
|
|
|
replaceAll("\\\"", "-=<[Hochkomma]>=-").
|
|
|
|
|
replaceAll("\\", "-=<[0x7F]>=-").
|
|
|
|
|
replaceAll("\\0x7F", "-=<[0x7F]>=-");
|
2000-09-18 16:07:07 +00:00
|
|
|
|
|
2012-02-02 21:36:11 +01:00
|
|
|
|
sal_uInt16 nState = TXT_STATE_TEXT;
|
2012-02-13 21:46:50 +01:00
|
|
|
|
for (sal_Int32 i = 1; i <= helper::countOccurrences(sTmp, '"'); ++i)
|
2012-01-02 10:55:27 +00:00
|
|
|
|
{
|
2012-02-15 15:26:43 +01:00
|
|
|
|
rtl::OString sToken(sTmp.getToken(i, '"'));
|
2012-02-02 21:36:11 +01:00
|
|
|
|
if (!sToken.isEmpty()) {
|
2000-09-18 16:07:07 +00:00
|
|
|
|
if ( nState == TXT_STATE_TEXT ) {
|
|
|
|
|
sReturn += sToken;
|
|
|
|
|
nState = TXT_STATE_MACRO;
|
|
|
|
|
}
|
|
|
|
|
else {
|
2012-02-02 21:36:11 +01:00
|
|
|
|
sToken = sToken.replace('\t', ' ');
|
2012-02-15 15:26:43 +01:00
|
|
|
|
for (;;) {
|
|
|
|
|
sal_Int32 n = 0;
|
|
|
|
|
sToken = sToken.replaceFirst(" ", " ", &n);
|
|
|
|
|
if (n == -1) {
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
sToken = sToken.trim();
|
2012-02-02 21:36:11 +01:00
|
|
|
|
if (!sToken.isEmpty()) {
|
2000-09-18 16:07:07 +00:00
|
|
|
|
sReturn += "\\\" ";
|
|
|
|
|
sReturn += sToken;
|
|
|
|
|
sReturn += " \\\"";
|
|
|
|
|
}
|
|
|
|
|
nState = TXT_STATE_TEXT;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2012-02-15 15:26:43 +01:00
|
|
|
|
sReturn = sReturn.replaceAll("-=<[0x7F]>=-", "").
|
|
|
|
|
replaceAll("-=<[Hochkomma]>=-", "\"").
|
|
|
|
|
replaceAll("-=<[BSlashBSlashHKom]>=-", "\\\\").
|
|
|
|
|
replaceAll("\\\\", "-=<[BSlashBSlash]>=-").
|
|
|
|
|
replaceAll("-=<[BSlashBSlash]>=-", "\\");
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
return sReturn;
|
|
|
|
|
}
|
|
|
|
|
|
2012-01-30 20:44:22 +00:00
|
|
|
|
void Export::WriteToMerged(const rtl::OString &rText , bool bSDFContent)
|
2000-09-18 16:07:07 +00:00
|
|
|
|
{
|
2012-02-08 22:07:23 +01:00
|
|
|
|
rtl::OString sText(rText);
|
2012-02-15 15:26:43 +01:00
|
|
|
|
for (;;) {
|
|
|
|
|
sal_Int32 n = 0;
|
|
|
|
|
sText = sText.replaceFirst(" \n", "\n", &n);
|
|
|
|
|
if (n == -1) {
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
2012-02-08 22:07:23 +01:00
|
|
|
|
if (pParseQueue->bNextIsM && bSDFContent && sText.getLength() > 2) {
|
|
|
|
|
for (sal_Int32 n = 0; n < sText.getLength(); ++n) {
|
|
|
|
|
if (sText[n] == '\n' && sText[n - 1] != '\\') {
|
|
|
|
|
sText = sText.replaceAt(n++, 0, "\\");
|
2004-06-25 11:40:49 +00:00
|
|
|
|
}
|
2012-02-08 22:07:23 +01:00
|
|
|
|
}
|
|
|
|
|
} else if (pParseQueue->bLastWasM && sText.getLength() > 2) {
|
|
|
|
|
for (sal_Int32 n = 0; n < sText.getLength(); ++n) {
|
|
|
|
|
if (sText[n] == '\n' && sText[n - 1] != '\\') {
|
|
|
|
|
sText = sText.replaceAt(n++, 0, "\\");
|
2004-06-25 11:40:49 +00:00
|
|
|
|
}
|
2012-02-08 22:07:23 +01:00
|
|
|
|
if (sText[n] == '\n') {
|
|
|
|
|
pParseQueue->bMflag = true;
|
2004-06-25 11:40:49 +00:00
|
|
|
|
}
|
2012-02-08 22:07:23 +01:00
|
|
|
|
}
|
|
|
|
|
} else if (pParseQueue->bCurrentIsM && bSDFContent && sText.getLength() > 2)
|
|
|
|
|
{
|
|
|
|
|
for (sal_Int32 n = 0; n < sText.getLength(); ++n) {
|
|
|
|
|
if (sText[n] == '\n' && sText[n - 1] != '\\') {
|
|
|
|
|
sText = sText.replaceAt(n++, 0, "\\");
|
|
|
|
|
pParseQueue->bMflag = true;
|
2004-06-25 11:40:49 +00:00
|
|
|
|
}
|
2012-02-08 22:07:23 +01:00
|
|
|
|
}
|
|
|
|
|
} else if (pParseQueue->bMflag) {
|
|
|
|
|
for (sal_Int32 n = 1; n < sText.getLength(); ++n) {
|
|
|
|
|
if (sText[n] == '\n' && sText[n - 1] != '\\') {
|
|
|
|
|
sText = sText.replaceAt(n++, 0, "\\");
|
2004-06-25 11:40:49 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
2012-02-08 22:07:23 +01:00
|
|
|
|
} for (sal_Int32 i = 0; i < sText.getLength(); ++i) {
|
|
|
|
|
if (sText[i] == '\n') {
|
|
|
|
|
aOutput << '\n';
|
|
|
|
|
} else {
|
|
|
|
|
char cChar = sText[i];
|
|
|
|
|
aOutput << cChar;
|
|
|
|
|
}
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*****************************************************************************/
|
2012-02-02 09:11:38 +01:00
|
|
|
|
void Export::ConvertMergeContent( rtl::OString &rText )
|
2000-09-18 16:07:07 +00:00
|
|
|
|
/*****************************************************************************/
|
|
|
|
|
{
|
2012-02-02 09:11:38 +01:00
|
|
|
|
sal_Bool bNoOpen = ( rText.indexOf( "\\\"" ) != 0 );
|
2012-02-15 15:26:43 +01:00
|
|
|
|
sal_Bool bNoClose = !rText.endsWithL(RTL_CONSTASCII_STRINGPARAM("\\\""));
|
2011-09-18 23:11:53 +01:00
|
|
|
|
rtl::OStringBuffer sNew;
|
2012-02-02 09:11:38 +01:00
|
|
|
|
for ( sal_Int32 i = 0; i < rText.getLength(); i++ )
|
2011-09-18 23:11:53 +01:00
|
|
|
|
{
|
2012-02-02 09:11:38 +01:00
|
|
|
|
rtl::OString sChar( rText[i]);
|
2011-09-18 23:11:53 +01:00
|
|
|
|
if (sChar.equalsL(RTL_CONSTASCII_STRINGPARAM("\\")))
|
|
|
|
|
{
|
2012-02-02 09:11:38 +01:00
|
|
|
|
if (( i + 1 ) < rText.getLength())
|
2011-09-18 23:11:53 +01:00
|
|
|
|
{
|
2012-02-02 09:11:38 +01:00
|
|
|
|
sal_Char cNext = rText[i + 1];
|
2011-09-18 23:11:53 +01:00
|
|
|
|
if ( cNext == '\"' )
|
|
|
|
|
{
|
|
|
|
|
sChar = rtl::OString('\"');
|
2000-09-18 16:07:07 +00:00
|
|
|
|
i++;
|
|
|
|
|
}
|
2011-09-18 23:11:53 +01:00
|
|
|
|
else if ( cNext == 'n' )
|
|
|
|
|
{
|
|
|
|
|
sChar = rtl::OString(RTL_CONSTASCII_STRINGPARAM("\\n"));
|
2000-09-18 16:07:07 +00:00
|
|
|
|
i++;
|
|
|
|
|
}
|
2011-09-18 23:11:53 +01:00
|
|
|
|
else if ( cNext == 't' )
|
|
|
|
|
{
|
|
|
|
|
sChar = rtl::OString(RTL_CONSTASCII_STRINGPARAM("\\t"));
|
2000-09-18 16:07:07 +00:00
|
|
|
|
i++;
|
|
|
|
|
}
|
2011-09-18 23:11:53 +01:00
|
|
|
|
else if ( cNext == '\'' )
|
|
|
|
|
{
|
|
|
|
|
sChar = rtl::OString(RTL_CONSTASCII_STRINGPARAM("\\\'"));
|
2000-09-18 16:07:07 +00:00
|
|
|
|
i++;
|
|
|
|
|
}
|
|
|
|
|
else
|
2011-09-18 23:11:53 +01:00
|
|
|
|
{
|
|
|
|
|
sChar = rtl::OString(RTL_CONSTASCII_STRINGPARAM("\\\\"));
|
|
|
|
|
}
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
2011-09-18 23:11:53 +01:00
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
sChar = rtl::OString(RTL_CONSTASCII_STRINGPARAM("\\\\"));
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
2011-09-18 23:11:53 +01:00
|
|
|
|
else if (sChar.equalsL(RTL_CONSTASCII_STRINGPARAM("\"")))
|
|
|
|
|
{
|
|
|
|
|
sChar = rtl::OString(RTL_CONSTASCII_STRINGPARAM("\\\""));
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
2011-09-18 23:11:53 +01:00
|
|
|
|
else if (sChar.equalsL(RTL_CONSTASCII_STRINGPARAM("")))
|
|
|
|
|
{
|
|
|
|
|
sChar = rtl::OString(RTL_CONSTASCII_STRINGPARAM("\\0x7F"));
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
2011-09-18 23:11:53 +01:00
|
|
|
|
sNew.append(sChar);
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
|
|
|
|
|
2011-09-18 23:11:53 +01:00
|
|
|
|
rText = sNew.makeStringAndClear();
|
2000-09-18 16:07:07 +00:00
|
|
|
|
|
|
|
|
|
if ( bNoOpen ) {
|
2012-02-02 21:36:11 +01:00
|
|
|
|
rtl::OString sTmp( rText );
|
2000-09-18 16:07:07 +00:00
|
|
|
|
rText = "\"";
|
|
|
|
|
rText += sTmp;
|
|
|
|
|
}
|
|
|
|
|
if ( bNoClose )
|
|
|
|
|
rText += "\"";
|
|
|
|
|
}
|
|
|
|
|
|
2012-02-02 09:11:38 +01:00
|
|
|
|
sal_Bool Export::PrepareTextToMerge(rtl::OString &rText, sal_uInt16 nTyp,
|
2011-07-01 22:27:20 +01:00
|
|
|
|
rtl::OString &rLangIndex, ResData *pResData)
|
2000-09-18 16:07:07 +00:00
|
|
|
|
{
|
|
|
|
|
// position to merge in:
|
2012-02-02 09:11:38 +01:00
|
|
|
|
sal_Int32 nStart = 0;
|
|
|
|
|
sal_Int32 nEnd = 0;
|
2012-02-02 21:36:11 +01:00
|
|
|
|
rtl::OString sOldId = pResData->sId;
|
|
|
|
|
rtl::OString sOldGId = pResData->sGId;
|
|
|
|
|
rtl::OString sOldTyp = pResData->sResTyp;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
|
2012-02-02 21:36:11 +01:00
|
|
|
|
rtl::OString sOrigText( rText );
|
2000-09-18 16:07:07 +00:00
|
|
|
|
|
|
|
|
|
switch ( nTyp ) {
|
|
|
|
|
case LIST_STRING :
|
|
|
|
|
case LIST_UIENTRIES :
|
|
|
|
|
case LIST_FILTER :
|
2004-11-18 07:16:38 +00:00
|
|
|
|
case LIST_PAIRED:
|
2000-09-18 16:07:07 +00:00
|
|
|
|
case LIST_ITEM :
|
|
|
|
|
{
|
|
|
|
|
ExportList *pList = NULL;
|
|
|
|
|
switch ( nTyp ) {
|
|
|
|
|
case LIST_STRING : {
|
|
|
|
|
pResData->sResTyp = "stringlist";
|
|
|
|
|
pList = pResData->pStringList;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case LIST_UIENTRIES : {
|
|
|
|
|
pResData->sResTyp = "uientries";
|
|
|
|
|
pList = pResData->pUIEntries;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case LIST_FILTER : {
|
|
|
|
|
pResData->sResTyp = "filterlist";
|
|
|
|
|
pList = pResData->pFilterList;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case LIST_ITEM : {
|
|
|
|
|
pResData->sResTyp = "itemlist";
|
|
|
|
|
pList = pResData->pItemList;
|
|
|
|
|
}
|
|
|
|
|
break;
|
2004-11-18 07:16:38 +00:00
|
|
|
|
case LIST_PAIRED : {
|
|
|
|
|
pResData->sResTyp = "pairedlist";
|
|
|
|
|
pList = pResData->pPairedList;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
2011-07-01 22:27:20 +01:00
|
|
|
|
if (pList)
|
|
|
|
|
{
|
2011-01-22 21:21:53 -08:00
|
|
|
|
ExportListEntry *pCurEntry = (*pList)[ nListIndex - 1 ];
|
2011-07-01 22:27:20 +01:00
|
|
|
|
if ( pCurEntry )
|
2007-04-19 14:18:22 +00:00
|
|
|
|
rText = (*pCurEntry)[ SOURCE_LANGUAGE ];
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
|
|
|
|
|
2012-02-02 09:11:38 +01:00
|
|
|
|
nStart = rText.indexOf( '"' );
|
|
|
|
|
if ( nStart == -1 ) {
|
2000-09-18 16:07:07 +00:00
|
|
|
|
rText = sOrigText;
|
2010-07-29 10:56:19 +08:00
|
|
|
|
return sal_False;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
|
|
|
|
|
2010-07-29 10:56:19 +08:00
|
|
|
|
sal_Bool bFound = sal_False;
|
2012-02-02 09:11:38 +01:00
|
|
|
|
for ( nEnd = nStart + 1; nEnd < rText.getLength() && !bFound; nEnd++ ) {
|
|
|
|
|
if ( rText[nEnd] == '\"' )
|
2010-07-29 10:56:19 +08:00
|
|
|
|
bFound = sal_True;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
|
|
|
|
if ( !bFound ) {
|
|
|
|
|
rText = sOrigText;
|
2010-07-29 10:56:19 +08:00
|
|
|
|
return sal_False;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
nEnd --;
|
|
|
|
|
sLastListLine = rText;
|
2012-02-02 09:11:38 +01:00
|
|
|
|
if (( sLastListLine.indexOf( '>' ) != -1 ) &&
|
|
|
|
|
( sLastListLine.indexOf( '<' ) == -1 ))
|
2001-08-30 08:43:17 +00:00
|
|
|
|
{
|
2012-02-02 21:36:11 +01:00
|
|
|
|
rtl::OString sTmp = sLastListLine;
|
2001-08-30 08:43:17 +00:00
|
|
|
|
sLastListLine = "<";
|
|
|
|
|
sLastListLine += sTmp;
|
|
|
|
|
}
|
2012-01-27 11:16:15 +00:00
|
|
|
|
if ( pResData->sResTyp.equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("pairedlist")) )
|
|
|
|
|
{
|
2004-11-18 07:16:38 +00:00
|
|
|
|
pResData->sId = GetPairedListID( sLastListLine );
|
|
|
|
|
}
|
2011-07-01 22:27:20 +01:00
|
|
|
|
else pResData->sId = rtl::OString::valueOf(static_cast<sal_Int32>(nListIndex));
|
2004-11-18 07:16:38 +00:00
|
|
|
|
|
2012-01-27 11:16:15 +00:00
|
|
|
|
if (!pResData->sGId.isEmpty())
|
|
|
|
|
pResData->sGId = pResData->sGId + rtl::OString('.');
|
|
|
|
|
pResData->sGId = pResData->sGId + sOldId;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
nTyp = STRING_TYP_TEXT;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case STRING_TYP_TEXT :
|
|
|
|
|
case STRING_TYP_HELPTEXT :
|
|
|
|
|
case STRING_TYP_QUICKHELPTEXT :
|
|
|
|
|
case STRING_TYP_TITLE :
|
|
|
|
|
{
|
2012-02-02 09:11:38 +01:00
|
|
|
|
nStart = rText.indexOf( "=" );
|
|
|
|
|
if ( nStart == -1 ) {
|
2000-09-18 16:07:07 +00:00
|
|
|
|
rText = sOrigText;
|
2010-07-29 10:56:19 +08:00
|
|
|
|
return sal_False;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
nStart++;
|
2010-07-29 10:56:19 +08:00
|
|
|
|
sal_Bool bFound = sal_False;
|
2012-02-02 09:11:38 +01:00
|
|
|
|
while(( nStart < rText.getLength()) && !bFound ) {
|
|
|
|
|
if (( rText[nStart] != ' ' ) && ( rText[nStart] != '\t' ))
|
2010-07-29 10:56:19 +08:00
|
|
|
|
bFound = sal_True;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
else
|
|
|
|
|
nStart ++;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// no start position found
|
|
|
|
|
if ( !bFound ) {
|
|
|
|
|
rText = sOrigText;
|
2010-07-29 10:56:19 +08:00
|
|
|
|
return sal_False;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// position to end mergeing in
|
2012-02-02 09:11:38 +01:00
|
|
|
|
nEnd = rText.getLength() - 1;
|
2010-07-29 10:56:19 +08:00
|
|
|
|
bFound = sal_False;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
|
|
|
|
|
while (( nEnd > nStart ) && !bFound ) {
|
2012-02-02 09:11:38 +01:00
|
|
|
|
if (( rText[nEnd] != ' ' ) && ( rText[nEnd] != '\t' ) &&
|
|
|
|
|
( rText[nEnd] != '\n' ) && ( rText[nEnd] != ';' ) &&
|
|
|
|
|
( rText[nEnd] != '{' ) && ( rText[nEnd] != '\\' ))
|
2000-09-18 16:07:07 +00:00
|
|
|
|
{
|
2010-07-29 10:56:19 +08:00
|
|
|
|
bFound = sal_True;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
nEnd --;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// search for merge data
|
2004-06-25 11:40:49 +00:00
|
|
|
|
if ( !pMergeDataFile ){
|
2012-02-08 22:07:23 +01:00
|
|
|
|
pMergeDataFile = new MergeDataFile( sMergeSrc, global::inputPathname, global::errorLog );
|
2004-06-25 11:40:49 +00:00
|
|
|
|
|
|
|
|
|
// Init Languages
|
2012-02-02 21:36:11 +01:00
|
|
|
|
if( Export::sLanguages.equalsIgnoreAsciiCase("ALL") )
|
2004-06-25 11:40:49 +00:00
|
|
|
|
SetLanguages( pMergeDataFile->GetLanguages() );
|
|
|
|
|
else if( !isInitialized )InitLanguages();
|
2000-09-18 16:07:07 +00:00
|
|
|
|
|
2004-06-25 11:40:49 +00:00
|
|
|
|
}
|
2004-11-18 07:16:38 +00:00
|
|
|
|
|
2000-09-18 16:07:07 +00:00
|
|
|
|
PFormEntrys *pEntrys = pMergeDataFile->GetPFormEntrys( pResData );
|
|
|
|
|
pResData->sId = sOldId;
|
|
|
|
|
pResData->sGId = sOldGId;
|
|
|
|
|
pResData->sResTyp = sOldTyp;
|
|
|
|
|
|
|
|
|
|
if ( !pEntrys ) {
|
|
|
|
|
rText = sOrigText;
|
2010-07-29 10:56:19 +08:00
|
|
|
|
return sal_False; // no data found
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
|
|
|
|
|
2012-02-02 09:11:38 +01:00
|
|
|
|
rtl::OString sContent;
|
2011-07-01 22:27:20 +01:00
|
|
|
|
pEntrys->GetTransex3Text(sContent, nTyp, rLangIndex);
|
2012-02-02 09:11:38 +01:00
|
|
|
|
if (sContent.isEmpty() && (!Export::isSourceLanguage(rLangIndex)))
|
2011-07-01 22:27:20 +01:00
|
|
|
|
{
|
2000-09-18 16:07:07 +00:00
|
|
|
|
rText = sOrigText;
|
2010-07-29 10:56:19 +08:00
|
|
|
|
return sal_False; // no data found
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
|
|
|
|
|
2011-07-01 22:27:20 +01:00
|
|
|
|
if (Export::isSourceLanguage(rLangIndex))
|
2010-07-29 10:56:19 +08:00
|
|
|
|
return sal_False;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
|
2012-02-02 21:36:11 +01:00
|
|
|
|
rtl::OString sPostFix( rText.copy( ++nEnd ));
|
2012-02-02 09:11:38 +01:00
|
|
|
|
rText = rText.copy(0, nStart);
|
2000-09-18 16:07:07 +00:00
|
|
|
|
|
2006-06-19 16:21:29 +00:00
|
|
|
|
ConvertMergeContent( sContent );
|
2000-09-18 16:07:07 +00:00
|
|
|
|
|
2004-11-18 07:16:38 +00:00
|
|
|
|
|
|
|
|
|
|
2000-09-18 16:07:07 +00:00
|
|
|
|
// merge new res. in text line
|
|
|
|
|
rText += sContent;
|
|
|
|
|
rText += sPostFix;
|
|
|
|
|
|
2010-07-29 10:56:19 +08:00
|
|
|
|
return sal_True;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
|
|
|
|
|
2012-02-05 15:03:30 +01:00
|
|
|
|
void Export::ResData2Output( PFormEntrys *pEntry, sal_uInt16 nType, const rtl::OString& rTextType )
|
|
|
|
|
{
|
|
|
|
|
sal_Bool bAddSemicolon = sal_False;
|
|
|
|
|
sal_Bool bFirst = sal_True;
|
|
|
|
|
rtl::OString sCur;
|
|
|
|
|
|
|
|
|
|
for( unsigned int n = 0; n < aLanguages.size(); n++ ){
|
|
|
|
|
sCur = aLanguages[ n ];
|
|
|
|
|
|
|
|
|
|
rtl::OString sText;
|
|
|
|
|
sal_Bool bText = pEntry->GetTransex3Text( sText, nType, sCur , sal_True );
|
|
|
|
|
if ( bText && !sText.isEmpty() && sText != "-" ) {
|
|
|
|
|
rtl::OString sOutput;
|
|
|
|
|
if ( bNextMustBeDefineEOL) {
|
|
|
|
|
if ( bFirst )
|
|
|
|
|
sOutput += "\t\\\n";
|
|
|
|
|
else
|
|
|
|
|
sOutput += ";\t\\\n";
|
|
|
|
|
}
|
|
|
|
|
bFirst=sal_False;
|
|
|
|
|
sOutput += "\t";
|
|
|
|
|
|
|
|
|
|
sOutput += rTextType;
|
|
|
|
|
|
|
|
|
|
if ( ! Export::isSourceLanguage( sCur ) ) {
|
|
|
|
|
sOutput += "[ ";
|
|
|
|
|
sOutput += sCur;
|
|
|
|
|
sOutput += " ] ";
|
|
|
|
|
}
|
|
|
|
|
sOutput += "= ";
|
|
|
|
|
ConvertMergeContent( sText );
|
|
|
|
|
sOutput += sText;
|
|
|
|
|
|
|
|
|
|
if ( bDefine )
|
|
|
|
|
sOutput += ";\\\n";
|
|
|
|
|
else if ( !bNextMustBeDefineEOL )
|
|
|
|
|
sOutput += ";\n";
|
|
|
|
|
else
|
|
|
|
|
bAddSemicolon = sal_True;
|
|
|
|
|
for ( sal_uInt16 j = 1; j < nLevel; j++ )
|
|
|
|
|
sOutput += "\t";
|
|
|
|
|
WriteToMerged( sOutput , true );
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if ( bAddSemicolon ) {
|
|
|
|
|
rtl::OString sOutput( ";" );
|
|
|
|
|
WriteToMerged( sOutput , false );
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2000-09-18 16:07:07 +00:00
|
|
|
|
/*****************************************************************************/
|
2010-07-29 10:56:19 +08:00
|
|
|
|
void Export::MergeRest( ResData *pResData, sal_uInt16 nMode )
|
2000-09-18 16:07:07 +00:00
|
|
|
|
/*****************************************************************************/
|
|
|
|
|
{
|
2004-06-25 11:40:49 +00:00
|
|
|
|
if ( !pMergeDataFile ){
|
2012-02-08 22:07:23 +01:00
|
|
|
|
pMergeDataFile = new MergeDataFile( sMergeSrc, global::inputPathname, global::errorLog );
|
2000-09-18 16:07:07 +00:00
|
|
|
|
|
2004-06-25 11:40:49 +00:00
|
|
|
|
// Init Languages
|
2012-02-02 21:36:11 +01:00
|
|
|
|
if (Export::sLanguages.equalsIgnoreAsciiCase("ALL"))
|
2004-06-25 11:40:49 +00:00
|
|
|
|
SetLanguages( pMergeDataFile->GetLanguages() );
|
|
|
|
|
else if( !isInitialized )InitLanguages();
|
2000-09-18 16:07:07 +00:00
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
switch ( nMode ) {
|
|
|
|
|
case MERGE_MODE_NORMAL : {
|
|
|
|
|
PFormEntrys *pEntry = pMergeDataFile->GetPFormEntrys( pResData );
|
2004-06-25 11:40:49 +00:00
|
|
|
|
|
2012-02-05 15:03:30 +01:00
|
|
|
|
if ( pEntry ) {
|
|
|
|
|
if ( pResData->bText )
|
|
|
|
|
ResData2Output( pEntry, STRING_TYP_TEXT, pResData->sTextTyp );
|
2004-06-25 11:40:49 +00:00
|
|
|
|
|
2012-02-05 15:03:30 +01:00
|
|
|
|
if ( pResData->bQuickHelpText )
|
|
|
|
|
ResData2Output( pEntry, STRING_TYP_QUICKHELPTEXT, rtl::OString("QuickHelpText") );
|
2000-09-18 16:07:07 +00:00
|
|
|
|
|
2012-02-05 15:03:30 +01:00
|
|
|
|
if ( pResData->bTitle )
|
|
|
|
|
ResData2Output( pEntry, STRING_TYP_TITLE, rtl::OString("Title") );
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
|
|
|
|
|
2007-04-19 14:18:22 +00:00
|
|
|
|
// Merge Lists
|
2000-09-18 16:07:07 +00:00
|
|
|
|
|
|
|
|
|
if ( pResData->bList ) {
|
2004-11-18 07:16:38 +00:00
|
|
|
|
bool bPairedList = false;
|
2012-02-02 21:36:11 +01:00
|
|
|
|
rtl::OString sOldId = pResData->sId;
|
|
|
|
|
rtl::OString sOldGId = pResData->sGId;
|
|
|
|
|
rtl::OString sOldTyp = pResData->sResTyp;
|
2012-01-27 11:16:15 +00:00
|
|
|
|
if (!pResData->sGId.isEmpty())
|
|
|
|
|
pResData->sGId = pResData->sGId + rtl::OString('.');
|
|
|
|
|
pResData->sGId = pResData->sGId + sOldId;
|
2012-02-02 21:36:11 +01:00
|
|
|
|
rtl::OString sSpace;
|
2010-07-29 10:56:19 +08:00
|
|
|
|
for ( sal_uInt16 i = 1; i < nLevel-1; i++ )
|
2000-09-18 16:07:07 +00:00
|
|
|
|
sSpace += "\t";
|
2010-07-29 10:56:19 +08:00
|
|
|
|
for ( sal_uInt16 nT = LIST_STRING; nT <= LIST_UIENTRIES; nT++ ) {
|
2001-05-11 07:58:14 +00:00
|
|
|
|
ExportList *pList = NULL;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
switch ( nT ) {
|
2004-11-18 07:16:38 +00:00
|
|
|
|
case LIST_STRING : pResData->sResTyp = "stringlist"; pList = pResData->pStringList; bPairedList = false; break;
|
|
|
|
|
case LIST_FILTER : pResData->sResTyp = "filterlist"; pList = pResData->pFilterList; bPairedList = false; break;
|
|
|
|
|
case LIST_UIENTRIES : pResData->sResTyp = "uientries"; pList = pResData->pUIEntries;bPairedList = false; break;
|
|
|
|
|
case LIST_ITEM : pResData->sResTyp = "itemlist"; pList = pResData->pItemList; bPairedList = false; break;
|
|
|
|
|
case LIST_PAIRED : pResData->sResTyp = "pairedlist"; pList = pResData->pPairedList; bPairedList = true; break;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
2011-07-01 22:27:20 +01:00
|
|
|
|
rtl::OString sCur;
|
|
|
|
|
for( unsigned int n = 0; n < aLanguages.size(); n++ )
|
|
|
|
|
{
|
2004-06-25 11:40:49 +00:00
|
|
|
|
sCur = aLanguages[ n ];
|
2010-07-29 10:56:19 +08:00
|
|
|
|
sal_uInt16 nIdx = 1;
|
2004-11-18 07:16:38 +00:00
|
|
|
|
|
|
|
|
|
// Set matching pairedlist identifier
|
|
|
|
|
if( bPairedList && pResData->pPairedList && ( nIdx == 1 ) ){
|
2011-01-22 21:21:53 -08:00
|
|
|
|
ExportListEntry* pListE = ( ExportListEntry* ) (*pResData->pPairedList)[ nIdx-1 ];
|
2007-04-19 14:18:22 +00:00
|
|
|
|
pResData->sId = GetPairedListID ( (*pListE)[ SOURCE_LANGUAGE ] );
|
2004-11-18 07:16:38 +00:00
|
|
|
|
}
|
|
|
|
|
else
|
2012-02-02 21:36:11 +01:00
|
|
|
|
pResData->sId = "1";
|
2004-11-18 07:16:38 +00:00
|
|
|
|
|
2000-09-18 16:07:07 +00:00
|
|
|
|
PFormEntrys *pEntrys;
|
2012-02-08 22:07:23 +01:00
|
|
|
|
std::size_t nLIndex = 0;
|
|
|
|
|
std::size_t nMaxIndex = 0;
|
2001-08-01 08:08:09 +00:00
|
|
|
|
if ( pList )
|
2007-04-19 14:18:22 +00:00
|
|
|
|
nMaxIndex = pList->GetSourceLanguageListEntryCount();
|
2006-06-19 16:21:29 +00:00
|
|
|
|
pEntrys = pMergeDataFile->GetPFormEntrys( pResData );
|
2006-07-06 13:34:29 +00:00
|
|
|
|
while( pEntrys && ( nLIndex < nMaxIndex )) {
|
2012-02-02 09:11:38 +01:00
|
|
|
|
rtl::OString sText;
|
2010-07-29 10:56:19 +08:00
|
|
|
|
sal_Bool bText;
|
|
|
|
|
bText = pEntrys->GetTransex3Text( sText, STRING_TYP_TEXT, sCur, sal_True );
|
2007-04-19 14:18:22 +00:00
|
|
|
|
if( !bText )
|
2010-07-29 10:56:19 +08:00
|
|
|
|
bText = pEntrys->GetTransex3Text( sText , STRING_TYP_TEXT, SOURCE_LANGUAGE , sal_False );
|
2004-11-18 07:16:38 +00:00
|
|
|
|
|
2012-02-02 09:11:38 +01:00
|
|
|
|
if ( bText && !sText.isEmpty())
|
2011-07-01 22:27:20 +01:00
|
|
|
|
{
|
|
|
|
|
if ( nIdx == 1 )
|
|
|
|
|
{
|
|
|
|
|
rtl::OStringBuffer sHead;
|
2001-08-29 10:50:41 +00:00
|
|
|
|
if ( bNextMustBeDefineEOL )
|
2011-07-01 22:27:20 +01:00
|
|
|
|
sHead.append(RTL_CONSTASCII_STRINGPARAM("\\\n\t"));
|
|
|
|
|
sHead.append(sSpace);
|
|
|
|
|
switch ( nT )
|
|
|
|
|
{
|
|
|
|
|
case LIST_STRING:
|
|
|
|
|
sHead.append(RTL_CONSTASCII_STRINGPARAM("StringList "));
|
|
|
|
|
break;
|
|
|
|
|
case LIST_FILTER:
|
|
|
|
|
sHead.append(RTL_CONSTASCII_STRINGPARAM("FilterList "));
|
|
|
|
|
break;
|
|
|
|
|
case LIST_ITEM:
|
|
|
|
|
sHead.append(RTL_CONSTASCII_STRINGPARAM("ItemList "));
|
|
|
|
|
break;
|
|
|
|
|
case LIST_PAIRED:
|
|
|
|
|
sHead.append(RTL_CONSTASCII_STRINGPARAM("PairedList "));
|
|
|
|
|
break;
|
|
|
|
|
case LIST_UIENTRIES:
|
|
|
|
|
sHead.append(RTL_CONSTASCII_STRINGPARAM("UIEntries "));
|
|
|
|
|
break;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
2011-07-01 22:27:20 +01:00
|
|
|
|
sHead.append(RTL_CONSTASCII_STRINGPARAM("[ "));
|
|
|
|
|
sHead.append(sCur);
|
|
|
|
|
sHead.append(RTL_CONSTASCII_STRINGPARAM(" ] "));
|
2004-06-25 11:40:49 +00:00
|
|
|
|
//}
|
2011-07-01 22:27:20 +01:00
|
|
|
|
if ( bDefine || bNextMustBeDefineEOL )
|
|
|
|
|
{
|
|
|
|
|
sHead.append(RTL_CONSTASCII_STRINGPARAM("= \\\n"));
|
|
|
|
|
sHead.append(sSpace);
|
|
|
|
|
sHead.append(RTL_CONSTASCII_STRINGPARAM("\t{\\\n\t"));
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
2011-07-01 22:27:20 +01:00
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
sHead.append(RTL_CONSTASCII_STRINGPARAM("= \n"));
|
|
|
|
|
sHead.append(sSpace);
|
|
|
|
|
sHead.append(RTL_CONSTASCII_STRINGPARAM("\t{\n\t"));
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
2011-07-01 22:27:20 +01:00
|
|
|
|
WriteToMerged(sHead.makeStringAndClear() , true);
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
2012-02-02 09:11:38 +01:00
|
|
|
|
rtl::OString sLine;
|
2011-01-22 21:21:53 -08:00
|
|
|
|
if ( pList && (*pList)[ nLIndex ] )
|
|
|
|
|
sLine = ( *(*pList)[ nLIndex ])[ SOURCE_LANGUAGE ];
|
2012-02-02 09:11:38 +01:00
|
|
|
|
if ( sLine.isEmpty())
|
2001-05-11 07:58:14 +00:00
|
|
|
|
sLine = sLastListLine;
|
2001-05-15 12:02:37 +00:00
|
|
|
|
|
2012-02-02 09:11:38 +01:00
|
|
|
|
if ( sLastListLine.indexOf( '<' ) != -1 ) {
|
2001-08-29 12:16:38 +00:00
|
|
|
|
if (( nT != LIST_UIENTRIES ) &&
|
2012-02-02 09:11:38 +01:00
|
|
|
|
(( sLine.indexOf( '{' ) == -1 ) ||
|
|
|
|
|
( sLine.indexOf( '{' ) >= sLine.indexOf( '"' ))) &&
|
|
|
|
|
(( sLine.indexOf( '<' ) == -1 ) ||
|
|
|
|
|
( sLine.indexOf( '<' ) >= sLine.indexOf( '"' ))))
|
2001-08-29 12:16:38 +00:00
|
|
|
|
{
|
2012-02-15 15:26:43 +01:00
|
|
|
|
sLine = sLine.replaceFirst("\"", "< \"" );
|
2001-08-29 12:16:38 +00:00
|
|
|
|
}
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
|
|
|
|
|
2012-02-02 09:11:38 +01:00
|
|
|
|
sal_Int32 nStart, nEnd;
|
|
|
|
|
nStart = sLine.indexOf( '"' );
|
2004-11-18 07:16:38 +00:00
|
|
|
|
|
2012-02-02 21:36:11 +01:00
|
|
|
|
rtl::OString sPostFix;
|
2004-11-18 07:16:38 +00:00
|
|
|
|
if( !bPairedList ){
|
2012-02-02 09:11:38 +01:00
|
|
|
|
nEnd = sLine.lastIndexOf( '"' );
|
|
|
|
|
sPostFix = sLine.copy( ++nEnd );
|
|
|
|
|
sLine = sLine.copy(0, nStart);
|
2004-11-18 07:16:38 +00:00
|
|
|
|
}
|
|
|
|
|
|
2000-09-18 16:07:07 +00:00
|
|
|
|
|
2006-06-19 16:21:29 +00:00
|
|
|
|
ConvertMergeContent( sText );
|
2000-09-18 16:07:07 +00:00
|
|
|
|
|
|
|
|
|
// merge new res. in text line
|
2004-11-18 07:16:38 +00:00
|
|
|
|
if( bPairedList ){
|
|
|
|
|
sLine = MergePairedList( sLine , sText );
|
|
|
|
|
}
|
|
|
|
|
else{
|
|
|
|
|
sLine += sText;
|
|
|
|
|
sLine += sPostFix;
|
|
|
|
|
}
|
2000-09-18 16:07:07 +00:00
|
|
|
|
|
2012-02-02 21:36:11 +01:00
|
|
|
|
rtl::OString sText1( "\t" );
|
2006-06-19 16:21:29 +00:00
|
|
|
|
sText1 += sLine;
|
2001-08-29 10:50:41 +00:00
|
|
|
|
if ( bDefine || bNextMustBeDefineEOL )
|
2006-06-19 16:21:29 +00:00
|
|
|
|
sText1 += " ;\\\n";
|
2000-09-18 16:07:07 +00:00
|
|
|
|
else
|
2006-06-19 16:21:29 +00:00
|
|
|
|
sText1 += " ;\n";
|
|
|
|
|
sText1 += sSpace;
|
|
|
|
|
sText1 += "\t";
|
|
|
|
|
WriteToMerged( sText1 ,true );
|
2004-11-18 07:16:38 +00:00
|
|
|
|
|
|
|
|
|
// Set matching pairedlist identifier
|
|
|
|
|
if ( bPairedList ){
|
|
|
|
|
nIdx++;
|
2011-01-22 21:21:53 -08:00
|
|
|
|
ExportListEntry* pListE = ( ExportListEntry* )(*pResData->pPairedList)[ ( nIdx ) -1 ];
|
2004-11-18 07:16:38 +00:00
|
|
|
|
if( pListE ){
|
2007-04-19 14:18:22 +00:00
|
|
|
|
pResData->sId = GetPairedListID ( (*pListE)[ SOURCE_LANGUAGE ] );
|
2004-11-18 07:16:38 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
2011-07-01 22:27:20 +01:00
|
|
|
|
pResData->sId = rtl::OString::valueOf(static_cast<sal_Int32>(++nIdx));
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
break;
|
2001-05-11 07:58:14 +00:00
|
|
|
|
nLIndex ++;
|
2007-07-18 06:13:03 +00:00
|
|
|
|
PFormEntrys *oldEntry = pEntrys;
|
2011-04-16 16:18:45 -03:00
|
|
|
|
pEntrys = pMergeDataFile->GetPFormEntrys( pResData );
|
2007-07-18 06:13:03 +00:00
|
|
|
|
if( !pEntrys )
|
|
|
|
|
pEntrys = oldEntry;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
|
|
|
|
if ( nIdx > 1 ) {
|
2012-02-02 21:36:11 +01:00
|
|
|
|
rtl::OString sFooter;
|
|
|
|
|
if (!sSpace.isEmpty()) {
|
|
|
|
|
sFooter = sSpace.copy(1);
|
|
|
|
|
}
|
2001-08-29 10:50:41 +00:00
|
|
|
|
if ( bNextMustBeDefineEOL )
|
|
|
|
|
sFooter += "};";
|
|
|
|
|
else if ( !bDefine )
|
2000-09-18 16:07:07 +00:00
|
|
|
|
sFooter += "};\n\t";
|
|
|
|
|
else
|
|
|
|
|
sFooter += "\n\n";
|
2004-06-25 11:40:49 +00:00
|
|
|
|
WriteToMerged( sFooter ,true );
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pResData->sId = sOldId;
|
|
|
|
|
pResData->sGId = sOldGId;
|
|
|
|
|
pResData->sResTyp = sOldTyp;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case MERGE_MODE_LIST : {
|
2001-05-11 07:58:14 +00:00
|
|
|
|
ExportList *pList = NULL;
|
|
|
|
|
switch ( nList ) {
|
2004-11-18 07:16:38 +00:00
|
|
|
|
// PairedList
|
2001-05-11 07:58:14 +00:00
|
|
|
|
case LIST_STRING : pList = pResData->pStringList; break;
|
|
|
|
|
case LIST_FILTER : pList = pResData->pFilterList; break;
|
|
|
|
|
case LIST_UIENTRIES : pList = pResData->pUIEntries; break;
|
|
|
|
|
case LIST_ITEM : pList = pResData->pItemList; break;
|
2004-11-18 07:16:38 +00:00
|
|
|
|
case LIST_PAIRED : pList = pResData->pPairedList; break;
|
|
|
|
|
|
2001-05-11 07:58:14 +00:00
|
|
|
|
}
|
|
|
|
|
|
2000-09-18 16:07:07 +00:00
|
|
|
|
nListIndex++;
|
2012-02-08 22:07:23 +01:00
|
|
|
|
std::size_t nMaxIndex = 0;
|
2001-08-01 08:08:09 +00:00
|
|
|
|
if ( pList )
|
2007-04-19 14:18:22 +00:00
|
|
|
|
nMaxIndex = pList->GetSourceLanguageListEntryCount();
|
2012-02-02 09:11:38 +01:00
|
|
|
|
rtl::OString sLine;
|
2011-01-22 21:21:53 -08:00
|
|
|
|
if ( pList && (*pList)[ nListIndex ] )
|
|
|
|
|
sLine = ( *(*pList)[ nListIndex ])[ SOURCE_LANGUAGE ];
|
2012-02-02 09:11:38 +01:00
|
|
|
|
if ( sLine.isEmpty())
|
2001-05-11 07:58:14 +00:00
|
|
|
|
sLine = sLastListLine;
|
2001-05-15 12:02:37 +00:00
|
|
|
|
|
2012-02-02 09:11:38 +01:00
|
|
|
|
if ( sLastListLine.indexOf( '<' ) != -1 ) {
|
2001-08-29 13:13:57 +00:00
|
|
|
|
if (( nList != LIST_UIENTRIES ) &&
|
2012-02-02 09:11:38 +01:00
|
|
|
|
(( sLine.indexOf( '{' ) == -1 ) ||
|
|
|
|
|
( sLine.indexOf( '{' ) >= sLine.indexOf( '"' ))) &&
|
|
|
|
|
(( sLine.indexOf( '<' ) == -1 ) ||
|
|
|
|
|
( sLine.indexOf( '<' ) >= sLine.indexOf( '"' ))))
|
2001-08-29 13:13:57 +00:00
|
|
|
|
{
|
2012-02-15 15:26:43 +01:00
|
|
|
|
sLine = sLine.replaceFirst("\"", "< \"");
|
2001-08-29 13:13:57 +00:00
|
|
|
|
}
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
2006-07-06 13:34:29 +00:00
|
|
|
|
|
2011-07-01 22:27:20 +01:00
|
|
|
|
while( PrepareTextToMerge( sLine, nList, m_sListLang, pResData ) && ( nListIndex <= nMaxIndex )) {
|
2012-02-02 21:36:11 +01:00
|
|
|
|
rtl::OString sText( "\t" );
|
2000-09-18 16:07:07 +00:00
|
|
|
|
sText += sLine;
|
2001-05-15 12:02:37 +00:00
|
|
|
|
sText += " ;";
|
2000-09-18 16:07:07 +00:00
|
|
|
|
sText += "\n";
|
2010-07-29 10:56:19 +08:00
|
|
|
|
for ( sal_uInt16 i = 0; i < nLevel; i++ )
|
2000-09-18 16:07:07 +00:00
|
|
|
|
sText += "\t";
|
2004-06-25 11:40:49 +00:00
|
|
|
|
WriteToMerged( sText ,false );
|
2000-09-18 16:07:07 +00:00
|
|
|
|
nListIndex++;
|
2011-01-22 21:21:53 -08:00
|
|
|
|
if ( pList && (*pList)[ nListIndex ])
|
|
|
|
|
sLine = ( *(*pList)[ nListIndex ])[ SOURCE_LANGUAGE ];
|
2012-02-02 09:11:38 +01:00
|
|
|
|
if ( sLine.isEmpty())
|
2001-05-11 07:58:14 +00:00
|
|
|
|
sLine = sLastListLine;
|
2001-05-15 12:02:37 +00:00
|
|
|
|
sLine += " ;";
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
}
|
2004-06-25 11:40:49 +00:00
|
|
|
|
pParseQueue->bMflag = false;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
|
|
|
|
|
2012-02-02 09:11:38 +01:00
|
|
|
|
rtl::OString Export::MergePairedList( rtl::OString const & sLine , rtl::OString const & sText ){
|
2004-11-18 07:16:38 +00:00
|
|
|
|
// < "xy" ; IDENTIFIER ; >
|
2012-02-02 09:11:38 +01:00
|
|
|
|
rtl::OString sPre = sLine.copy( 0 , sLine.indexOf('"') );
|
|
|
|
|
rtl::OString sPost = sLine.copy( sLine.lastIndexOf('"') + 1 );
|
|
|
|
|
sPre += sText;
|
|
|
|
|
sPre += sPost;
|
2004-11-18 07:16:38 +00:00
|
|
|
|
return sPre;
|
|
|
|
|
}
|
|
|
|
|
|
2000-09-18 16:07:07 +00:00
|
|
|
|
/*****************************************************************************/
|
|
|
|
|
void Export::SetChildWithText()
|
|
|
|
|
/*****************************************************************************/
|
|
|
|
|
{
|
2011-01-22 21:51:18 -08:00
|
|
|
|
if ( aResStack.size() > 1 ) {
|
|
|
|
|
for ( size_t i = 0; i < aResStack.size() - 1; i++ ) {
|
Merge commit 'ooo/DEV300_m101' into intm101
The following builds for me:
basebmp, basegfx, comphelper, dtrans, i18npool, i18nutil, l10ntools, o3tl,
psprint_config, regexp, rsc, sax, sot, tools, ucbhelper, unotools, vcl
The rest still needs fixing ;-)
Conflicts:
canvas/prj/build.lst
canvas/source/cairo/cairo_textlayout.cxx
canvas/source/directx/dx_winstuff.hxx
canvas/source/tools/image.cxx
canvas/source/vcl/canvashelper.cxx
comphelper/inc/comphelper/documentconstants.hxx
comphelper/inc/comphelper/optionalvalue.hxx
comphelper/inc/comphelper/querydeep.hxx
comphelper/prj/build.lst
comphelper/qa/complex/makefile.mk
comphelper/qa/string/test_string_noadditional.cxx
comphelper/source/misc/componentmodule.cxx
comphelper/source/misc/mimeconfighelper.cxx
comphelper/source/misc/querydeep.cxx
comphelper/source/misc/uieventslogger.cxx
comphelper/source/property/TypeGeneration.cxx
comphelper/test/uno_iterators/uno_iterators.cxx
comphelper/util/makefile.mk
cppcanvas/source/mtfrenderer/implrenderer.cxx
dtrans/prj/build.lst
dtrans/source/generic/dtrans.cxx
dtrans/source/win32/dtobj/FmtFilter.cxx
i18npool/prj/build.lst
i18npool/source/localedata/data/localedata_others.map
i18npool/source/localedata/data/makefile.mk
i18npool/source/localedata/localedata.cxx
i18npool/source/localedata/saxparser.cxx
i18npool/source/registerservices/registerservices.cxx
i18npool/source/search/textsearch.cxx
l10ntools/inc/cfgmerge.hxx
l10ntools/inc/export.hxx
l10ntools/inc/gsicheck.hxx
l10ntools/inc/l10ntools/vosapp.hxx
l10ntools/inc/tagtest.hxx
l10ntools/inc/xmlparse.hxx
l10ntools/layout/layoutparse.cxx
l10ntools/layout/tralay.cxx
l10ntools/source/cfgmerge.cxx
l10ntools/source/export.cxx
l10ntools/source/export2.cxx
l10ntools/source/gsicheck.cxx
l10ntools/source/help/HelpLinker.cxx
l10ntools/source/lngex.cxx
l10ntools/source/lngmerge.cxx
l10ntools/source/merge.cxx
l10ntools/source/tagtest.cxx
l10ntools/source/xmlparse.cxx
padmin/source/fontentry.cxx
padmin/source/padialog.cxx
padmin/source/padialog.src
padmin/source/pamain.cxx
rsc/inc/rscarray.hxx
rsc/inc/rscclass.hxx
rsc/inc/rscclobj.hxx
rsc/inc/rsccont.hxx
rsc/inc/rscdb.hxx
rsc/inc/rscdef.hxx
rsc/inc/rscmgr.hxx
rsc/inc/rscrange.hxx
rsc/inc/rsctop.hxx
rsc/inc/vclrsc.hxx
rsc/source/parser/rscdb.cxx
rsc/source/parser/rscicpx.cxx
rsc/source/parser/rscinit.cxx
rsc/source/prj/start.cxx
rsc/source/res/rscarray.cxx
rsc/source/res/rscclass.cxx
rsc/source/res/rscclobj.cxx
rsc/source/res/rsccont.cxx
rsc/source/res/rscmgr.cxx
rsc/source/res/rscrange.cxx
rsc/source/res/rsctop.cxx
rsc/source/rsc/rsc.cxx
rsc/source/tools/rscdef.cxx
rsc/source/tools/rsctools.cxx
sax/source/expatwrap/sax_expat.cxx
sax/source/fastparser/facreg.cxx
sax/source/tools/fastserializer.cxx
sot/inc/sot/filelist.hxx
sot/inc/sot/object.hxx
sot/source/base/factory.cxx
sot/source/base/filelist.cxx
sot/source/sdstor/stg.cxx
sot/source/sdstor/stgcache.cxx
sot/source/sdstor/stgole.cxx
sot/source/sdstor/stgstrms.cxx
sot/source/sdstor/storage.cxx
sot/source/sdstor/ucbstorage.cxx
svl/inc/svl/cenumitm.hxx
svl/inc/svl/cintitem.hxx
svl/inc/svl/cntwall.hxx
svl/inc/svl/ctypeitm.hxx
svl/inc/svl/custritm.hxx
svl/inc/svl/dateitem.hxx
svl/inc/svl/filerec.hxx
svl/inc/svl/globalnameitem.hxx
svl/inc/svl/ilstitem.hxx
svl/inc/svl/imageitm.hxx
svl/inc/svl/intitem.hxx
svl/inc/svl/itempool.hxx
svl/inc/svl/itemset.hxx
svl/inc/svl/lckbitem.hxx
svl/inc/svl/poolitem.hxx
svl/inc/svl/ptitem.hxx
svl/inc/svl/rectitem.hxx
svl/inc/svl/sfontitm.hxx
svl/inc/svl/slstitm.hxx
svl/inc/svl/srchitem.hxx
svl/inc/svl/svarray.hxx
svl/inc/svl/svdde.hxx
svl/inc/svl/svstdarr.hxx
svl/inc/svl/szitem.hxx
svl/inc/svl/visitem.hxx
svl/inc/svl/zforlist.hxx
svl/inc/svl/zformat.hxx
svl/prj/build.lst
svl/qa/complex/ConfigItems/helper/ConfigItemTest.cxx
svl/qa/complex/ConfigItems/helper/makefile.mk
svl/qa/makefile.mk
svl/source/filepicker/pickerhelper.cxx
svl/source/filerec/filerec.cxx
svl/source/items/cenumitm.cxx
svl/source/items/cintitem.cxx
svl/source/items/cntwall.cxx
svl/source/items/ctypeitm.cxx
svl/source/items/custritm.cxx
svl/source/items/dateitem.cxx
svl/source/items/globalnameitem.cxx
svl/source/items/ilstitem.cxx
svl/source/items/imageitm.cxx
svl/source/items/intitem.cxx
svl/source/items/itempool.cxx
svl/source/items/itemprop.cxx
svl/source/items/itemset.cxx
svl/source/items/lckbitem.cxx
svl/source/items/poolio.cxx
svl/source/items/poolitem.cxx
svl/source/items/ptitem.cxx
svl/source/items/rectitem.cxx
svl/source/items/slstitm.cxx
svl/source/items/srchitem.cxx
svl/source/items/style.cxx
svl/source/items/szitem.cxx
svl/source/items/visitem.cxx
svl/source/items/whiter.cxx
svl/source/memtools/svarray.cxx
svl/source/misc/PasswordHelper.cxx
svl/source/misc/adrparse.cxx
svl/source/misc/lngmisc.cxx
svl/source/notify/brdcst.cxx
svl/source/notify/listener.cxx
svl/source/notify/listenerbase.cxx
svl/source/numbers/makefile.mk
svl/source/numbers/nbdll.cxx
svl/source/numbers/zforfind.cxx
svl/source/numbers/zforlist.cxx
svl/source/numbers/zformat.cxx
svl/source/numbers/zforscan.cxx
svl/source/passwordcontainer/passwordcontainer.cxx
svl/source/svdde/ddecli.cxx
svl/source/svdde/ddeimp.hxx
svl/source/svdde/ddemlos2.h
svl/source/svdde/ddesvr.cxx
svl/source/undo/undo.cxx
svl/source/uno/registerservices.cxx
svl/util/makefile.mk
svtools/bmpmaker/bmpsum.cxx
svtools/bmpmaker/g2g.cxx
svtools/bmpmaker/makefile.mk
svtools/inc/borderhelper.hxx
svtools/inc/svtools/accessiblefactory.hxx
svtools/inc/svtools/apearcfg.hxx
svtools/inc/svtools/brwbox.hxx
svtools/inc/svtools/ctrlbox.hxx
svtools/inc/svtools/ctrltool.hxx
svtools/inc/svtools/editbrowsebox.hxx
svtools/inc/svtools/ehdl.hxx
svtools/inc/svtools/embedhlp.hxx
svtools/inc/svtools/filter.hxx
svtools/inc/svtools/ivctrl.hxx
svtools/inc/svtools/parhtml.hxx
svtools/inc/svtools/printdlg.hxx
svtools/inc/svtools/rtftoken.h
svtools/inc/svtools/ruler.hxx
svtools/inc/svtools/svicnvw.hxx
svtools/inc/svtools/svlbitm.hxx
svtools/inc/svtools/svlbox.hxx
svtools/inc/svtools/svtreebx.hxx
svtools/inc/svtools/tabbar.hxx
svtools/inc/svtools/table/abstracttablecontrol.hxx
svtools/inc/svtools/taskbar.hxx
svtools/inc/svtools/textview.hxx
svtools/inc/svtools/valueset.hxx
svtools/source/brwbox/brwbox1.cxx
svtools/source/brwbox/brwbox2.cxx
svtools/source/brwbox/datwin.cxx
svtools/source/brwbox/datwin.hxx
svtools/source/brwbox/makefile.mk
svtools/source/config/apearcfg.cxx
svtools/source/config/htmlcfg.cxx
svtools/source/config/menuoptions.cxx
svtools/source/config/miscopt.cxx
svtools/source/contnr/cont_pch.cxx
svtools/source/contnr/ctrdll.cxx
svtools/source/contnr/fileview.cxx
svtools/source/contnr/imivctl1.cxx
svtools/source/contnr/ivctrl.cxx
svtools/source/contnr/makefile.mk
svtools/source/contnr/svcontnr.src
svtools/source/contnr/svicnvw.cxx
svtools/source/contnr/svimpbox.cxx
svtools/source/contnr/svimpicn.cxx
svtools/source/contnr/svlbitm.cxx
svtools/source/contnr/svtreebx.cxx
svtools/source/contnr/templwin.cxx
svtools/source/contnr/templwin.hxx
svtools/source/control/asynclink.cxx
svtools/source/control/ctrlbox.cxx
svtools/source/control/ctrldll.cxx
svtools/source/control/ctrltool.cxx
svtools/source/control/filectrl.cxx
svtools/source/control/filectrl.src
svtools/source/control/headbar.cxx
svtools/source/control/inettbc.cxx
svtools/source/control/makefile.mk
svtools/source/control/prgsbar.cxx
svtools/source/control/roadmap.cxx
svtools/source/control/ruler.cxx
svtools/source/control/scriptedtext.cxx
svtools/source/control/stdmenu.cxx
svtools/source/control/tabbar.cxx
svtools/source/control/taskbar.cxx
svtools/source/control/taskbox.cxx
svtools/source/control/taskmisc.cxx
svtools/source/control/taskstat.cxx
svtools/source/control/valueacc.cxx
svtools/source/control/valueset.cxx
svtools/source/dialogs/addresstemplate.cxx
svtools/source/dialogs/addresstemplate.src
svtools/source/dialogs/colrdlg.src
svtools/source/dialogs/filedlg2.cxx
svtools/source/dialogs/filedlg2.hxx
svtools/source/dialogs/makefile.mk
svtools/source/dialogs/printdlg.cxx
svtools/source/dialogs/printdlg.src
svtools/source/dialogs/propctrl.cxx
svtools/source/dialogs/propctrl.hxx
svtools/source/dialogs/property.cxx
svtools/source/edit/makefile.mk
svtools/source/edit/sychconv.cxx
svtools/source/edit/syntaxhighlight.cxx
svtools/source/edit/textdoc.cxx
svtools/source/edit/texteng.cxx
svtools/source/edit/textundo.cxx
svtools/source/edit/textview.cxx
svtools/source/filter.vcl/filter/SvFilterOptionsDialog.cxx
svtools/source/filter.vcl/filter/dlgejpg.cxx
svtools/source/filter.vcl/filter/dlgejpg.hxx
svtools/source/filter.vcl/filter/dlgejpg.src
svtools/source/filter.vcl/filter/dlgepng.cxx
svtools/source/filter.vcl/filter/dlgepng.hxx
svtools/source/filter.vcl/filter/dlgepng.src
svtools/source/filter.vcl/filter/dlgexpor.cxx
svtools/source/filter.vcl/filter/dlgexpor.hxx
svtools/source/filter.vcl/filter/dlgexpor.src
svtools/source/filter.vcl/filter/filter2.cxx
svtools/source/filter.vcl/filter/makefile.mk
svtools/source/filter.vcl/filter/sgfbram.cxx
svtools/source/filter.vcl/filter/sgvmain.cxx
svtools/source/filter.vcl/filter/sgvspln.cxx
svtools/source/filter.vcl/filter/strings.src
svtools/source/filter.vcl/jpeg/makefile.mk
svtools/source/filter.vcl/wmf/emfwr.cxx
svtools/source/filter.vcl/wmf/emfwr.hxx
svtools/source/filter.vcl/wmf/enhwmf.cxx
svtools/source/filter.vcl/wmf/winmtf.hxx
svtools/source/filter.vcl/wmf/wmfwr.cxx
svtools/source/filter.vcl/wmf/wmfwr.hxx
svtools/source/graphic/grfcache.cxx
svtools/source/graphic/grfcache.hxx
svtools/source/graphic/grfmgr.cxx
svtools/source/graphic/makefile.mk
svtools/source/inc/accessibletableimp.hxx
svtools/source/inc/svimpbox.hxx
svtools/source/java/patchjavaerror.src
svtools/source/misc/ehdl.cxx
svtools/source/misc/errtxt.src
svtools/source/misc/helpagentwindow.cxx
svtools/source/misc/imagemgr.cxx
svtools/source/misc/imagemgr.src
svtools/source/misc/imageresourceaccess.cxx
svtools/source/misc/imap.cxx
svtools/source/misc/langtab.src
svtools/source/misc/makefile.mk
svtools/source/misc/svtdata.cxx
svtools/source/misc/templatefoldercache.cxx
svtools/source/misc/transfer2.cxx
svtools/source/misc/undo.src
svtools/source/plugapp/commtest.cxx
svtools/source/plugapp/commtest.src
svtools/source/plugapp/makefile.mk
svtools/source/plugapp/testtool.src
svtools/source/productregistration/productregistration.cxx
svtools/source/svhtml/htmlkywd.cxx
svtools/source/svhtml/parhtml.cxx
svtools/source/svrtf/rtfkey2.cxx
svtools/source/svrtf/rtfkeywd.cxx
svtools/source/table/defaultinputhandler.cxx
svtools/source/table/makefile.mk
svtools/source/table/tablecontrol.cxx
svtools/source/table/tablecontrol_impl.cxx
svtools/source/table/tablecontrol_impl.hxx
svtools/source/table/tabledatawindow.cxx
svtools/source/table/tablegeometry.cxx
svtools/source/table/tablegeometry.hxx
svtools/source/toolpanel/makefile.mk
svtools/source/toolpanel/toolpaneldrawer.cxx
svtools/source/uno/addrtempuno.cxx
svtools/source/uno/miscservices.cxx
svtools/source/uno/svtxgridcontrol.cxx
svtools/source/uno/svtxgridcontrol.hxx
svtools/source/uno/toolboxcontroller.cxx
svtools/source/uno/treecontrolpeer.cxx
svtools/source/uno/unocontroltablemodel.cxx
svtools/source/uno/unocontroltablemodel.hxx
svtools/source/uno/unoimap.cxx
svtools/source/urlobj/inetimg.cxx
svtools/util/makefile.mk
svtools/workben/browser.cxx
svtools/workben/cui/makefile.mk
svtools/workben/makefile.mk
svtools/workben/stest.cxx
svtools/workben/toolpanel/makefile.mk
svtools/workben/urange.cxx
toolkit/inc/toolkit/awt/vclxdevice.hxx
toolkit/inc/toolkit/awt/vclxgraphics.hxx
toolkit/inc/toolkit/awt/vclxwindows.hxx
toolkit/inc/toolkit/controls/dialogcontrol.hxx
toolkit/inc/toolkit/helper/property.hxx
toolkit/inc/toolkit/helper/servicenames.hxx
toolkit/inc/toolkit/helper/throbberimpl.hxx
toolkit/qa/complex/toolkit/accessibility/_XAccessibleComponent.java
toolkit/source/awt/asynccallback.cxx
toolkit/source/awt/vclxgraphics.cxx
toolkit/source/awt/vclxtoolkit.cxx
toolkit/source/awt/vclxwindow.cxx
toolkit/source/awt/xsimpleanimation.cxx
toolkit/source/awt/xthrobber.cxx
toolkit/source/controls/dialogcontrol.cxx
toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
toolkit/source/controls/grid/defaultgriddatamodel.cxx
toolkit/source/controls/grid/gridcontrol.cxx
toolkit/source/controls/grid/initguard.hxx
toolkit/source/controls/unocontrol.cxx
toolkit/source/controls/unocontrolcontainer.cxx
toolkit/source/controls/unocontrols.cxx
toolkit/source/helper/listenermultiplexer.cxx
toolkit/source/helper/property.cxx
toolkit/source/helper/registerservices.cxx
toolkit/source/helper/servicenames.cxx
toolkit/source/helper/throbberimpl.cxx
toolkit/source/helper/tkresmgr.cxx
tools/StaticLibrary_ooopathutils.mk
tools/bootstrp/addexes/makefile.mk
tools/bootstrp/addexes2/makefile.mk
tools/bootstrp/addexes2/mkfilt.cxx
tools/bootstrp/command.cxx
tools/bootstrp/cppdep.cxx
tools/bootstrp/iserver.cxx
tools/bootstrp/makefile.mk
tools/bootstrp/mkcreate.cxx
tools/bootstrp/prj.cxx
tools/bootstrp/rscdep.cxx
tools/bootstrp/sstring.cxx
tools/inc/bootstrp/command.hxx
tools/inc/bootstrp/mkcreate.hxx
tools/inc/bootstrp/prj.hxx
tools/inc/bootstrp/sstring.hxx
tools/inc/tools/agapi.hxx
tools/inc/tools/agitem.hxx
tools/inc/tools/chapi.hxx
tools/inc/tools/download.hxx
tools/inc/tools/eacopier.hxx
tools/inc/tools/fract.hxx
tools/inc/tools/fsys.hxx
tools/inc/tools/geninfo.hxx
tools/inc/tools/globname.hxx
tools/inc/tools/inetmime.hxx
tools/inc/tools/multisel.hxx
tools/inc/tools/poly.hxx
tools/inc/tools/postsys.h
tools/inc/tools/postwin.h
tools/inc/tools/presys.h
tools/inc/tools/prewin.h
tools/inc/tools/pstm.hxx
tools/inc/tools/ref.hxx
tools/inc/tools/simplerm.hxx
tools/inc/tools/solar.h
tools/inc/tools/table.hxx
tools/inc/tools/urlkeys.hxx
tools/inc/tools/urlobj.hxx
tools/prj/build.lst
tools/prj/d.lst
tools/qa/makefile.mk
tools/source/communi/geninfo.cxx
tools/source/debug/debug.cxx
tools/source/fsys/dirent.cxx
tools/source/fsys/tdir.cxx
tools/source/fsys/unx.cxx
tools/source/fsys/urlobj.cxx
tools/source/generic/color.cxx
tools/source/generic/config.cxx
tools/source/generic/fract.cxx
tools/source/inet/inetmime.cxx
tools/source/memtools/multisel.cxx
tools/source/memtools/table.cxx
tools/source/rc/resmgr.cxx
tools/source/ref/globname.cxx
tools/source/ref/pstm.cxx
tools/source/solar/solar.c
tools/source/stream/strmos2.cxx
tools/source/stream/strmunx.cxx
tools/source/stream/strmwnt.cxx
tools/source/string/makefile.mk
tools/source/testtoolloader/testtoolloader.cxx
tools/test/makefile.mk
tools/util/makefile.mk
tools/win/inc/dll.hxx
tools/win/inc/parser.hxx
tools/win/inc/shellex.h
tools/win/inc/shutil.h
tools/win/inc/toolsdll.hxx
tools/win/inc/winshell.hxx
tools/workben/makefile.mk
ucbhelper/source/client/proxydecider.cxx
ucbhelper/workben/ucbexplorer/ucbexplorer.hrc
unotools/inc/unotools/unotunnelhelper.hxx
unotools/source/config/fltrcfg.cxx
unotools/source/config/lingucfg.cxx
unotools/source/config/misccfg.cxx
unotools/source/config/pathoptions.cxx
unotools/source/config/searchopt.cxx
unotools/source/i18n/localedatawrapper.cxx
unotools/source/ucbhelper/localfilehelper.cxx
unotools/source/ucbhelper/ucbhelper.cxx
unotools/source/ucbhelper/xtempfile.cxx
vcl/aqua/inc/salbmp.h
vcl/aqua/inc/salgdi.h
vcl/aqua/inc/salinst.h
vcl/aqua/source/app/salinst.cxx
vcl/aqua/source/gdi/aquaprintaccessoryview.mm
vcl/aqua/source/gdi/salgdi.cxx
vcl/aqua/source/gdi/salprn.cxx
vcl/aqua/source/window/salframeview.mm
vcl/aqua/source/window/salobj.cxx
vcl/inc/vcl/bitmap.hxx
vcl/inc/vcl/brdwin.hxx
vcl/inc/vcl/button.hxx
vcl/inc/vcl/cmdevt.hxx
vcl/inc/vcl/cvtgrf.hxx
vcl/inc/vcl/dialog.hxx
vcl/inc/vcl/dockwin.hxx
vcl/inc/vcl/event.hxx
vcl/inc/vcl/fixed.hxx
vcl/inc/vcl/fldunit.hxx
vcl/inc/vcl/floatwin.hxx
vcl/inc/vcl/gdimtf.hxx
vcl/inc/vcl/glyphcache.hxx
vcl/inc/vcl/graphite_adaptors.hxx
vcl/inc/vcl/graphite_features.hxx
vcl/inc/vcl/graphite_layout.hxx
vcl/inc/vcl/ilstbox.hxx
vcl/inc/vcl/image.h
vcl/inc/vcl/imgctrl.hxx
vcl/inc/vcl/impbmpconv.hxx
vcl/inc/vcl/impprn.hxx
vcl/inc/vcl/jobset.h
vcl/inc/vcl/keycodes.hxx
vcl/inc/vcl/lstbox.hxx
vcl/inc/vcl/mapunit.hxx
vcl/inc/vcl/menu.hxx
vcl/inc/vcl/msgbox.hxx
vcl/inc/vcl/outdev.hxx
vcl/inc/vcl/prndlg.hxx
vcl/inc/vcl/salatype.hxx
vcl/inc/vcl/salbmp.hxx
vcl/inc/vcl/salgdi.hxx
vcl/inc/vcl/salinst.hxx
vcl/inc/vcl/seleng.hxx
vcl/inc/vcl/settings.hxx
vcl/inc/vcl/smartid.hxx
vcl/inc/vcl/status.hxx
vcl/inc/vcl/strhelper.hxx
vcl/inc/vcl/svapp.hxx
vcl/inc/vcl/svdata.hxx
vcl/inc/vcl/syschild.hxx
vcl/inc/vcl/sysdata.hxx
vcl/inc/vcl/taskpanelist.hxx
vcl/inc/vcl/toolbox.hxx
vcl/inc/vcl/vclevent.hxx
vcl/inc/vcl/windata.hxx
vcl/inc/vcl/window.hxx
vcl/inc/vcl/wintypes.hxx
vcl/os2/source/app/salinst.cxx
vcl/os2/source/gdi/salgdi.cxx
vcl/os2/source/window/salmenu.cxx
vcl/os2/source/window/salobj.cxx
vcl/prj/build.lst
vcl/source/app/dbggui.cxx
vcl/source/app/help.cxx
vcl/source/app/idlemgr.cxx
vcl/source/app/settings.cxx
vcl/source/app/svapp.cxx
vcl/source/app/svdata.cxx
vcl/source/app/svmain.cxx
vcl/source/app/svmainhook.cxx
vcl/source/app/unohelp.cxx
vcl/source/app/vclevent.cxx
vcl/source/control/button.cxx
vcl/source/control/combobox.cxx
vcl/source/control/edit.cxx
vcl/source/control/field.cxx
vcl/source/control/fixed.cxx
vcl/source/control/ilstbox.cxx
vcl/source/control/imgctrl.cxx
vcl/source/control/makefile.mk
vcl/source/control/tabctrl.cxx
vcl/source/gdi/bitmap.cxx
vcl/source/gdi/bitmap2.cxx
vcl/source/gdi/bitmap4.cxx
vcl/source/gdi/bmpconv.cxx
vcl/source/gdi/cvtsvm.cxx
vcl/source/gdi/font.cxx
vcl/source/gdi/gdimtf.cxx
vcl/source/gdi/image.cxx
vcl/source/gdi/impimage.cxx
vcl/source/gdi/jobset.cxx
vcl/source/gdi/makefile.mk
vcl/source/gdi/metaact.cxx
vcl/source/gdi/outdev.cxx
vcl/source/gdi/outdev3.cxx
vcl/source/gdi/outdev4.cxx
vcl/source/gdi/outdevnative.cxx
vcl/source/gdi/pdfwriter.cxx
vcl/source/gdi/pdfwriter_impl.cxx
vcl/source/gdi/print3.cxx
vcl/source/gdi/salmisc.cxx
vcl/source/glyphs/gcach_ftyp.cxx
vcl/source/glyphs/gcach_ftyp.hxx
vcl/source/glyphs/glyphcache.cxx
vcl/source/glyphs/graphite_cache.cxx
vcl/source/glyphs/graphite_layout.cxx
vcl/source/glyphs/graphite_textsrc.hxx
vcl/source/helper/canvasbitmap.cxx
vcl/source/helper/smartid.cxx
vcl/source/helper/xconnection.cxx
vcl/source/src/btntext.src
vcl/source/src/images.src
vcl/source/src/print.src
vcl/source/window/accel.cxx
vcl/source/window/accmgr.cxx
vcl/source/window/brdwin.cxx
vcl/source/window/btndlg.cxx
vcl/source/window/dlgctrl.cxx
vcl/source/window/javachild.cxx
vcl/source/window/menu.cxx
vcl/source/window/msgbox.cxx
vcl/source/window/printdlg.cxx
vcl/source/window/status.cxx
vcl/source/window/syschild.cxx
vcl/source/window/toolbox.cxx
vcl/source/window/toolbox2.cxx
vcl/source/window/window.cxx
vcl/source/window/window2.cxx
vcl/source/window/wrkwin.cxx
vcl/unx/gtk/app/gtkdata.cxx
vcl/unx/gtk/app/gtkinst.cxx
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
vcl/unx/gtk/window/gtkframe.cxx
vcl/unx/gtk/window/gtkobject.cxx
vcl/unx/headless/svpbmp.hxx
vcl/unx/headless/svpgdi.cxx
vcl/unx/headless/svpgdi.hxx
vcl/unx/headless/svpinst.cxx
vcl/unx/headless/svpinst.hxx
vcl/unx/headless/svpprn.cxx
vcl/unx/headless/svpprn.hxx
vcl/unx/headless/svppspgraphics.cxx
vcl/unx/headless/svppspgraphics.hxx
vcl/unx/headless/svptext.cxx
vcl/unx/inc/dtint.hxx
vcl/unx/inc/plugins/gtk/gtkdata.hxx
vcl/unx/inc/pspgraphics.h
vcl/unx/inc/salbmp.h
vcl/unx/inc/saldata.hxx
vcl/unx/inc/saldisp.hxx
vcl/unx/inc/salgdi.h
vcl/unx/inc/salinst.h
vcl/unx/inc/xfont.hxx
vcl/unx/kde/kdedata.cxx
vcl/unx/kde4/KDESalGraphics.cxx
vcl/unx/source/app/keysymnames.cxx
vcl/unx/source/app/saldata.cxx
vcl/unx/source/app/saldisp.cxx
vcl/unx/source/app/salinst.cxx
vcl/unx/source/app/wmadaptor.cxx
vcl/unx/source/dtrans/X11_selection.cxx
vcl/unx/source/dtrans/X11_service.cxx
vcl/unx/source/gdi/makefile.mk
vcl/unx/source/gdi/pspgraphics.cxx
vcl/unx/source/gdi/salgdi.cxx
vcl/unx/source/gdi/salgdi3.cxx
vcl/unx/source/gdi/salprnpsp.cxx
vcl/unx/source/gdi/xfont.cxx
vcl/unx/source/gdi/xlfd_attr.cxx
vcl/unx/source/gdi/xlfd_attr.hxx
vcl/unx/source/gdi/xlfd_extd.cxx
vcl/unx/source/gdi/xlfd_extd.hxx
vcl/unx/source/gdi/xlfd_smpl.cxx
vcl/unx/source/gdi/xlfd_smpl.hxx
vcl/unx/source/printer/ppdparser.cxx
vcl/unx/source/printer/printerinfomanager.cxx
vcl/unx/source/window/salframe.cxx
vcl/unx/source/window/salmenu.cxx
vcl/unx/source/window/salobj.cxx
vcl/util/makefile2.pmk
vcl/win/inc/salbmp.h
vcl/win/inc/saldata.hxx
vcl/win/inc/salgdi.h
vcl/win/inc/salinst.h
vcl/win/source/app/saldata.cxx
vcl/win/source/app/salinst.cxx
vcl/win/source/gdi/salgdi.cxx
vcl/win/source/gdi/salgdi3.cxx
vcl/win/source/gdi/salprn.cxx
vcl/win/source/gdi/winlayout.cxx
vcl/win/source/window/salframe.cxx
vcl/win/source/window/salobj.cxx
vcl/workben/outdevgrind.cxx
vos/inc/vos/execabl.hxx
vos/inc/vos/macros.hxx
vos/inc/vos/pipe.hxx
vos/inc/vos/process.hxx
vos/inc/vos/refernce.hxx
vos/inc/vos/signal.hxx
vos/inc/vos/socket.hxx
vos/inc/vos/stream.hxx
vos/inc/vos/thread.hxx
vos/source/pipe.cxx
vos/source/process.cxx
vos/source/signal.cxx
vos/source/thread.cxx
vos/source/timer.cxx
2011-03-11 14:24:23 +01:00
|
|
|
|
aResStack[ i ]->bChildWithText = sal_True;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2012-01-30 20:44:22 +00:00
|
|
|
|
void ParserQueue::Push( const QueueEntry& aEntry )
|
|
|
|
|
{
|
|
|
|
|
sal_Int32 nLen = aEntry.sLine.getLength();
|
2006-06-19 16:21:29 +00:00
|
|
|
|
|
2004-06-25 11:40:49 +00:00
|
|
|
|
if( !bStart ){
|
|
|
|
|
aQueueCur->push( aEntry );
|
2012-01-30 20:44:22 +00:00
|
|
|
|
if( nLen > 1 && aEntry.sLine[nLen-1] == '\n' )
|
2004-06-25 11:40:49 +00:00
|
|
|
|
bStart = true;
|
|
|
|
|
else if ( aEntry.nTyp != IGNOREDTOKENS ){
|
2012-01-30 20:44:22 +00:00
|
|
|
|
if( nLen > 1 && ( aEntry.sLine[nLen-1] == '\\') ){
|
2004-06-25 11:40:49 +00:00
|
|
|
|
// Next is Macro
|
|
|
|
|
bCurrentIsM = true;
|
|
|
|
|
}else{
|
|
|
|
|
// Next is no Macro
|
|
|
|
|
bCurrentIsM = false;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else{
|
|
|
|
|
aQueueNext->push( aEntry );
|
2012-01-30 20:44:22 +00:00
|
|
|
|
if( nLen > 1 && aEntry.sLine[nLen-1] != '\n' ){
|
|
|
|
|
if( nLen > 1 && ( aEntry.sLine[nLen-1] == '\\') ){
|
2004-06-25 11:40:49 +00:00
|
|
|
|
// Next is Macro
|
|
|
|
|
bNextIsM = true;
|
|
|
|
|
}
|
|
|
|
|
else{
|
|
|
|
|
// Next is no Macro
|
|
|
|
|
bNextIsM = false;
|
|
|
|
|
}
|
2012-01-30 20:44:22 +00:00
|
|
|
|
}else if( nLen > 2 && aEntry.sLine[nLen-1] == '\n' ){
|
2004-06-25 11:40:49 +00:00
|
|
|
|
if( aEntry.nTyp != IGNOREDTOKENS ){
|
2012-01-30 20:44:22 +00:00
|
|
|
|
if( nLen > 2 && ( aEntry.sLine[nLen-2] == '\\') ){
|
2004-06-25 11:40:49 +00:00
|
|
|
|
// Next is Macro
|
|
|
|
|
bNextIsM = true;
|
|
|
|
|
}
|
|
|
|
|
else{
|
|
|
|
|
// Next is no Macro
|
|
|
|
|
bNextIsM = false;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
// Pop current
|
|
|
|
|
Pop( *aQueueCur );
|
|
|
|
|
bLastWasM = bCurrentIsM;
|
|
|
|
|
// next -> current
|
|
|
|
|
bCurrentIsM = bNextIsM;
|
|
|
|
|
aQref = aQueueCur;
|
|
|
|
|
aQueueCur = aQueueNext;
|
|
|
|
|
aQueueNext = aQref;
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
else{
|
|
|
|
|
// Pop current
|
|
|
|
|
Pop( *aQueueCur );
|
|
|
|
|
bLastWasM = bCurrentIsM;
|
|
|
|
|
// next -> current
|
|
|
|
|
bCurrentIsM = bNextIsM;
|
|
|
|
|
aQref = aQueueCur;
|
|
|
|
|
aQueueCur = aQueueNext;
|
|
|
|
|
aQueueNext = aQref;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void ParserQueue::Close(){
|
|
|
|
|
// Pop current
|
|
|
|
|
Pop( *aQueueCur );
|
|
|
|
|
// next -> current
|
|
|
|
|
bLastWasM = bCurrentIsM;
|
|
|
|
|
bCurrentIsM = bNextIsM;
|
|
|
|
|
aQref = aQueueCur;
|
|
|
|
|
aQueueCur = aQueueNext;
|
|
|
|
|
aQueueNext = aQref;
|
|
|
|
|
bNextIsM = false;
|
|
|
|
|
Pop( *aQueueNext );
|
|
|
|
|
};
|
2012-01-30 20:44:22 +00:00
|
|
|
|
|
|
|
|
|
void ParserQueue::Pop( std::queue<QueueEntry>& aQueue )
|
|
|
|
|
{
|
|
|
|
|
while (!aQueue.empty())
|
|
|
|
|
{
|
2004-06-25 11:40:49 +00:00
|
|
|
|
QueueEntry aEntry = aQueue.front();
|
|
|
|
|
aQueue.pop();
|
2012-01-30 20:44:22 +00:00
|
|
|
|
aExport.Execute(aEntry.nTyp, aEntry.sLine.getStr());
|
2004-06-25 11:40:49 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
2012-01-30 20:44:22 +00:00
|
|
|
|
|
2004-06-25 11:40:49 +00:00
|
|
|
|
ParserQueue::ParserQueue( Export& aExportObj )
|
2006-06-19 16:21:29 +00:00
|
|
|
|
:
|
2004-06-25 11:40:49 +00:00
|
|
|
|
bCurrentIsM( false ),
|
|
|
|
|
bNextIsM( false ) ,
|
2006-06-19 16:21:29 +00:00
|
|
|
|
bLastWasM( false ),
|
2004-06-25 11:40:49 +00:00
|
|
|
|
bMflag( false ) ,
|
2006-06-19 16:21:29 +00:00
|
|
|
|
aExport( aExportObj ) ,
|
|
|
|
|
bStart( false ) ,
|
|
|
|
|
bStartNext( false )
|
|
|
|
|
{
|
2004-08-02 15:24:59 +00:00
|
|
|
|
aQueueNext = new std::queue<QueueEntry>;
|
|
|
|
|
aQueueCur = new std::queue<QueueEntry>;
|
2004-06-25 11:40:49 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
ParserQueue::~ParserQueue(){
|
|
|
|
|
if( aQueueNext ) delete aQueueNext;
|
|
|
|
|
if( aQueueCur ) delete aQueueCur;
|
|
|
|
|
}
|
2010-10-14 08:27:31 +02:00
|
|
|
|
|
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|