summaryrefslogtreecommitdiff
path: root/ucb/source/ucp/odma/odma_main.cxx
blob: a8eb6f83a6bc55fb3d67ff52d74444b7e8233b79 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * Copyright 2000, 2010 Oracle and/or its affiliates.
 *
 * OpenOffice.org - a multi-platform office productivity suite
 *
 * This file is part of OpenOffice.org.
 *
 * OpenOffice.org is free software: you can redistribute it and/or modify
 * it under the terms of the GNU Lesser General Public License version 3
 * only, as published by the Free Software Foundation.
 *
 * OpenOffice.org is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU Lesser General Public License version 3 for more details
 * (a copy is included in the LICENSE file that accompanied this code).
 *
 * You should have received a copy of the GNU Lesser General Public License
 * version 3 along with OpenOffice.org.  If not, see
 * <http://www.openoffice.org/license.html>
 * for a copy of the LGPLv3 License.
 *
 ************************************************************************/


// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_ucb.hxx"
#ifdef WNT
#include <windows.h>
#endif
#include <osl/process.h>
#include "odma_provider.hxx"

#ifdef WNT
#define SOFFICE "soffice.exe"
#else
#define SOFFICE "soffice"
#endif

/** our main program to convert ODMAIDs to ODMA URLs
*/

#if (defined UNX) || (defined OS2)
void main( int argc, char * argv[] )
#else
void _cdecl main( int argc, char * argv[] )
#endif
{
    static ::rtl::OUString sProcess(RTL_CONSTASCII_USTRINGPARAM(SOFFICE));
    if(argc > 1)
    {
        ::rtl::OUString* pArguments = new ::rtl::OUString[argc-1];
        for(int i = 0; i < argc-1; ++i)
        {
            pArguments[i] = ::rtl::OUString::createFromAscii(argv[i+1]);
            if( pArguments[i].matchIgnoreAsciiCaseAsciiL(
                    RTL_CONSTASCII_STRINGPARAM(ODMA_URL_ODMAID)))
            {
                ::rtl::OUString sArgument
                      = ::rtl::OUString(
                          RTL_CONSTASCII_USTRINGPARAM(
                              ODMA_URL_SCHEME ODMA_URL_SHORT "/"));
                sArgument += pArguments[i];
                pArguments[i] = sArgument;
            }
        }

        rtl_uString ** ustrArgumentList = new rtl_uString * [argc-1];
        for (int i = 0; i < argc-1; i++)
            ustrArgumentList[i] = pArguments[i].pData;

        oslProcess  aProcess;

        if ( osl_Process_E_None == osl_executeProcess(
                 sProcess.pData,
                 ustrArgumentList,
                 argc-1,
                 osl_Process_DETACHED,
                 NULL,
                 NULL,
                 NULL,
                 0,
                 &aProcess )
        )
            osl_freeProcessHandle( aProcess );

        delete [] ustrArgumentList;
        delete [] pArguments;
    }
}

/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
='mode'>-rw-r--r--accessibility/workben/org/openoffice/accessibility/awb/view/text/makefile.common2
-rw-r--r--accessibility/workben/org/openoffice/accessibility/misc/makefile.common2
-rwxr-xr-xagg/prj/build.lst2
-rw-r--r--apache-commons/prj/build.lst2
-rw-r--r--automation/inc/automation/communi.hxx2
-rw-r--r--automation/source/miniapp/testapp.hxx2
-rw-r--r--automation/source/server/scmdstrm.cxx6
-rw-r--r--automation/source/server/server.cxx2
-rw-r--r--automation/source/server/statemnt.cxx6
-rw-r--r--automation/source/testtool/makefile.mk4
-rw-r--r--automation/source/testtool/objtest.cxx2
-rw-r--r--automation/source/testtool/tcommuni.hxx2
-rw-r--r--avmedia/inc/avmedia/mediaitem.hxx2
-rw-r--r--avmedia/inc/avmedia/mediatoolbox.hxx2
-rw-r--r--avmedia/inc/helpids.hrc2
-rw-r--r--avmedia/source/framework/mediacontrol.cxx2
-rw-r--r--avmedia/source/framework/mediamisc.cxx2
-rw-r--r--avmedia/source/framework/mediaplayer.cxx2
-rw-r--r--avmedia/source/java/makefile.mk2
-rw-r--r--avmedia/source/viewer/mediawindow.cxx2
-rw-r--r--basctl/inc/helpid.hrc2
-rw-r--r--basctl/inc/pch/precompiled_basctl.hxx14
-rw-r--r--basctl/sdi/basslots.sdi8
-rw-r--r--basctl/sdi/makefile.mk8
-rw-r--r--basctl/source/basicide/basicbox.hxx2
-rw-r--r--basctl/source/basicide/baside2.cxx13
-rw-r--r--basctl/source/basicide/baside2.hxx16
-rw-r--r--basctl/source/basicide/baside2b.cxx24
-rw-r--r--basctl/source/basicide/basides1.cxx2
-rw-r--r--basctl/source/basicide/basidesh.cxx2
-rw-r--r--basctl/source/basicide/basobj2.cxx2
-rw-r--r--basctl/source/basicide/basobj3.cxx2
-rw-r--r--basctl/source/basicide/bastype2.hxx2
-rw-r--r--basctl/source/basicide/brkdlg.hrc2
-rw-r--r--basctl/source/basicide/ide_pch.hxx10
-rw-r--r--basctl/source/basicide/iderdll.cxx2
-rw-r--r--basctl/source/basicide/macrodlg.hrc2
-rw-r--r--basctl/source/basicide/moduldl2.cxx2
-rw-r--r--basctl/source/basicide/moduldlg.hrc2
-rw-r--r--basctl/source/basicide/moptions.hrc2
-rw-r--r--basctl/source/basicide/objdlg.hrc2
-rw-r--r--basctl/source/basicide/scriptdocument.cxx2
-rw-r--r--basctl/source/basicide/tbxctl.cxx2
-rw-r--r--basctl/source/basicide/tbxctl.hrc2
-rw-r--r--basctl/source/dlged/dlged.cxx2
-rw-r--r--basctl/source/inc/accessibledialogwindow.hxx2
-rw-r--r--basctl/source/inc/baside3.hxx2
-rw-r--r--basctl/source/inc/basobj.hxx2
-rw-r--r--basctl/source/inc/dlged.hxx4
-rw-r--r--basctl/source/inc/dlgresid.hrc2
-rw-r--r--basctl/source/inc/propbrw.hxx4
-rw-r--r--basctl/source/inc/sbxitem.hxx2
-rw-r--r--basebmp/test/basictest.cxx2
-rw-r--r--basebmp/test/bmpmasktest.cxx2
-rw-r--r--basebmp/test/bmptest.cxx2
-rw-r--r--basebmp/test/cliptest.cxx2
-rw-r--r--basebmp/test/filltest.cxx2
-rw-r--r--basebmp/test/linetest.cxx2
-rw-r--r--basebmp/test/makefile.mk17
-rw-r--r--basebmp/test/masktest.cxx2
-rw-r--r--basebmp/test/polytest.cxx2
-rw-r--r--basegfx/test/basegfx1d.cxx2
-rw-r--r--basegfx/test/basegfx2d.cxx2
-rw-r--r--basegfx/test/basegfx3d.cxx2
-rw-r--r--basegfx/test/makefile.mk11
-rw-r--r--basic/inc/basic/basmgr.hxx2
-rw-r--r--basic/inc/basic/sbdef.hxx2
-rw-r--r--basic/inc/basic/sbx.hxx6
-rw-r--r--basic/inc/basic/sbxbase.hxx2
-rw-r--r--basic/inc/basic/sbxobj.hxx2
-rw-r--r--basic/inc/basic/testtool.hxx2
-rw-r--r--basic/inc/pch/precompiled_basic.hxx28
-rw-r--r--basic/inc/sb.hrc2
-rw-r--r--basic/source/app/app.cxx2
-rw-r--r--basic/source/app/app.hxx4
-rw-r--r--basic/source/app/appedit.cxx2
-rw-r--r--basic/source/app/dialogs.cxx4
-rw-r--r--basic/source/app/msgedit.cxx2
-rw-r--r--basic/source/app/textedit.hxx2
-rw-r--r--basic/source/basmgr/basicmanagerrepository.cxx4
-rw-r--r--basic/source/basmgr/basmgr.cxx4
-rw-r--r--basic/source/classes/propacc.cxx2
-rw-r--r--basic/source/classes/sbunoobj.cxx15
-rw-r--r--basic/source/classes/sbxmod.cxx2
-rw-r--r--basic/source/comp/codegen.cxx6
-rw-r--r--basic/source/comp/exprgen.cxx2
-rw-r--r--basic/source/comp/symtbl.cxx2
-rw-r--r--basic/source/inc/propacc.hxx2
-rw-r--r--basic/source/inc/symtbl.hxx2
-rw-r--r--basic/source/runtime/basrdll.cxx2
-rw-r--r--basic/source/runtime/ddectrl.cxx2
-rw-r--r--basic/source/runtime/dllmgr.hxx4
-rw-r--r--basic/source/runtime/methods.cxx2
-rw-r--r--basic/source/runtime/methods1.cxx2
-rw-r--r--basic/source/runtime/runtime.cxx8
-rw-r--r--basic/source/runtime/step1.cxx2
-rw-r--r--basic/source/sbx/format.src2
-rw-r--r--basic/source/sbx/sbxdate.cxx2
-rw-r--r--basic/source/sbx/sbxobj.cxx2
-rw-r--r--basic/source/sbx/sbxscan.cxx6
-rw-r--r--basic/source/sbx/sbxvar.cxx2
-rw-r--r--basic/source/uno/dlgcont.cxx2
-rw-r--r--basic/source/uno/namecont.cxx14
-rw-r--r--basic/source/uno/scriptcont.cxx2
-rw-r--r--bean/com/sun/star/beans/makefile.mk2
-rw-r--r--bean/com/sun/star/comp/beans/makefile.mk2
-rw-r--r--bean/prj/build.lst2
-rw-r--r--bean/qa/complex/makefile.mk2
-rw-r--r--bean/test/applet/oooapplet/makefile.mk2
-rw-r--r--bean/test/makefile.mk2
-rw-r--r--berkeleydb/db-4.7.25.patch31
-rw-r--r--berkeleydb/makefile.mk6
-rw-r--r--berkeleydb/prj/build.lst2
-rw-r--r--bridges/source/remote/static/proxy.cxx8
-rw-r--r--bridges/source/remote/static/remote.cxx8
-rw-r--r--bridges/source/remote/urp/urp_log.hxx2
-rw-r--r--bridges/test/testclient.cxx15
-rw-r--r--bridges/test/testcomp.cxx11
-rw-r--r--bridges/test/testoffice.cxx10
-rw-r--r--bridges/test/testsameprocess.cxx7
-rwxr-xr-xcanvas/source/directx/dx_config.cxx3
-rw-r--r--canvas/source/directx/dx_config.hxx2
-rw-r--r--chart2/inc/pch/precompiled_chart2.hxx22
-rw-r--r--chart2/source/controller/accessibility/AccessibleBase.cxx2
-rw-r--r--chart2/source/controller/dialogs/Bitmaps.hrc2
-rw-r--r--chart2/source/controller/dialogs/Bitmaps_HC.hrc4
-rw-r--r--chart2/source/controller/dialogs/DataBrowser.cxx4
-rw-r--r--chart2/source/controller/dialogs/ObjectNameProvider.cxx2
-rw-r--r--chart2/source/controller/dialogs/TextDirectionListBox.cxx2
-rw-r--r--chart2/source/controller/dialogs/dlg_DataEditor.cxx8
-rw-r--r--chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx2
-rw-r--r--chart2/source/controller/dialogs/dlg_InsertLegend.cxx2
-rw-r--r--chart2/source/controller/dialogs/dlg_NumberFormat.cxx4
-rw-r--r--chart2/source/controller/dialogs/dlg_ObjectProperties.cxx8
-rw-r--r--chart2/source/controller/dialogs/res_DataLabel.cxx10
-rw-r--r--chart2/source/controller/dialogs/res_DataLabel.hxx2
-rw-r--r--chart2/source/controller/dialogs/res_ErrorBar.cxx2
-rw-r--r--chart2/source/controller/dialogs/res_LegendPosition.cxx2
-rw-r--r--chart2/source/controller/dialogs/res_LegendPosition.hxx2
-rw-r--r--chart2/source/controller/dialogs/res_Trendline.hxx2
-rw-r--r--chart2/source/controller/dialogs/tp_AxisLabel.cxx2
-rw-r--r--chart2/source/controller/dialogs/tp_AxisPositions.cxx6
-rw-r--r--chart2/source/controller/dialogs/tp_PointGeometry.cxx2
-rw-r--r--chart2/source/controller/dialogs/tp_PolarOptions.cxx4
-rw-r--r--chart2/source/controller/dialogs/tp_Scale.cxx6
-rw-r--r--chart2/source/controller/dialogs/tp_SeriesToAxis.cxx6
-rw-r--r--chart2/source/controller/dialogs/tp_TitleRotation.cxx2
-rw-r--r--chart2/source/controller/drawinglayer/ViewElementListProvider.cxx2
-rw-r--r--chart2/source/controller/inc/HelpIds.hrc2
-rw-r--r--chart2/source/controller/inc/ItemConverter.hxx4
-rw-r--r--chart2/source/controller/inc/dlg_DataEditor.hxx2
-rw-r--r--chart2/source/controller/inc/dlg_InsertDataLabel.hxx2
-rw-r--r--chart2/source/controller/inc/dlg_InsertErrorBars.hxx2
-rw-r--r--chart2/source/controller/inc/dlg_InsertTrendline.hxx2
-rw-r--r--chart2/source/controller/inc/res_ErrorBar.hxx2
-rw-r--r--chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx4
-rw-r--r--chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx2
-rw-r--r--chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx8
-rwxr-xr-xchart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx4
-rw-r--r--chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx4
-rw-r--r--chart2/source/controller/itemsetwrapper/ItemConverter.cxx6
-rw-r--r--chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx2
-rw-r--r--chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx2
-rw-r--r--chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx8
-rw-r--r--chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx4
-rw-r--r--chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx2
-rw-r--r--chart2/source/controller/main/ChartController_Position.cxx2
-rw-r--r--chart2/source/controller/main/ChartController_TextEdit.cxx2
-rw-r--r--chart2/source/controller/main/ConfigurationAccess.cxx7
-rw-r--r--chart2/source/inc/Strings.hrc2
-rw-r--r--chart2/source/inc/chartview/NumberFormatterWrapper.hxx2
-rw-r--r--chart2/source/model/filter/XMLFilter.cxx2
-rw-r--r--chart2/source/model/main/ChartModel.cxx2
-rw-r--r--chart2/source/model/main/ImplChartModel.cxx4
-rw-r--r--chart2/source/tools/AxisHelper.cxx2
-rw-r--r--chart2/source/tools/CharacterProperties.cxx2
-rw-r--r--chart2/source/tools/ConfigColorScheme.cxx4
-rw-r--r--chart2/source/tools/ImplUndoManager.cxx4
-rw-r--r--chart2/source/tools/ImplUndoManager.hxx1
-rw-r--r--chart2/source/tools/OPropertySet.cxx2
-rw-r--r--chart2/source/view/main/ChartItemPool.cxx8
-rw-r--r--chart2/source/view/main/ChartItemPool.hxx4
-rw-r--r--chart2/source/view/main/ChartView.cxx2
-rw-r--r--chart2/source/view/main/ChartView.hxx2
-rw-r--r--chart2/source/view/main/DrawModelWrapper.cxx6
-rw-r--r--chart2/source/view/main/NumberFormatterWrapper.cxx4
-rw-r--r--chart2/source/view/main/VLegend.cxx2
-rw-r--r--cli_ure/prj/build.lst2
-rw-r--r--cli_ure/qa/climaker/makefile.mk2
-rw-r--r--cli_ure/source/native/path.cxx2
-rw-r--r--codemaker/test/cppumaker/makefile.mk4
-rw-r--r--codemaker/test/cppumaker/test_codemaker_cppumaker.cxx2
-rw-r--r--comphelper/qa/makefile.mk6
-rw-r--r--comphelper/qa/test_string.cxx2
-rw-r--r--comphelper/qa/test_weakbag.cxx2
-rw-r--r--comphelper/source/misc/comphelper_services.cxx2
-rw-r--r--comphelper/source/misc/documentiologring.cxx25
-rw-r--r--comphelper/source/misc/documentiologring.hxx11
-rw-r--r--comphelper/source/property/ChainablePropertySetInfo.cxx2
-rw-r--r--comphelper/source/property/MasterPropertySetInfo.cxx4
-rw-r--r--comphelper/source/property/propertysetinfo.cxx2
-rw-r--r--configmgr/qa/unit/common.hxx2
-rw-r--r--configmgr/qa/unit/makefile.mk4
-rw-r--r--configmgr/qa/unit/threading.cxx2
-rw-r--r--configure.in136
-rw-r--r--connectivity/prj/build.lst2
-rw-r--r--connectivity/source/commontools/formattedcolumnvalue.cxx2
-rw-r--r--connectivity/source/drivers/calc/CConnection.cxx2
-rw-r--r--connectivity/source/drivers/calc/CTable.cxx4
-rw-r--r--connectivity/source/drivers/calc/makefile.mk1
-rw-r--r--connectivity/source/drivers/dbase/DTable.cxx6
-rw-r--r--connectivity/source/drivers/evoab/LFolderList.cxx6
-rw-r--r--connectivity/source/drivers/evoab/LTable.cxx6
-rw-r--r--connectivity/source/drivers/evoab2/NResultSet.cxx2
-rw-r--r--connectivity/source/drivers/evoab2/makefile.mk2
-rw-r--r--connectivity/source/drivers/file/FConnection.cxx2
-rw-r--r--connectivity/source/drivers/file/fcode.cxx2
-rw-r--r--connectivity/source/drivers/flat/ETable.cxx6
-rw-r--r--connectivity/source/drivers/flat/makefile.mk2
-rw-r--r--connectivity/source/drivers/kab/KConnection.cxx2
-rw-r--r--connectivity/source/drivers/kab/KDEInit.cxx2
-rw-r--r--connectivity/source/drivers/kab/KDatabaseMetaData.cxx2
-rw-r--r--connectivity/source/drivers/kab/KResultSet.hxx2
-rw-r--r--connectivity/source/drivers/kab/kcondition.hxx2
-rw-r--r--connectivity/source/drivers/kab/kfields.hxx2
-rw-r--r--connectivity/source/drivers/kab/korder.hxx2
-rw-r--r--cppu/qa/makefile.mk18
-rw-r--r--cppu/qa/test_any.cxx2
-rw-r--r--cppu/qa/test_recursion.cxx2
-rw-r--r--cppu/qa/test_reference.cxx2
-rw-r--r--cppu/qa/test_unotype.cxx2
-rw-r--r--cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx2
-rw-r--r--cppuhelper/qa/ifcontainer/makefile.mk5
-rw-r--r--cppuhelper/qa/propertysetmixin/makefile.mk4
-rw-r--r--cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx2
-rw-r--r--cppuhelper/qa/unourl/cppu_unourl.cxx2
-rw-r--r--cppuhelper/qa/unourl/makefile.mk5
-rw-r--r--cppuhelper/qa/weak/makefile.mk6
-rw-r--r--cppuhelper/qa/weak/test_weak.cxx2
-rw-r--r--cppuhelper/source/interfacecontainer.cxx7
-rw-r--r--cppuhelper/test/testidlclass.cxx19
-rw-r--r--cppuhelper/test/testproptyphlp.cxx22
-rw-r--r--cppunit/cppunit-1.8.0-r1.patch8106
-rw-r--r--cppunit/makefile.mk76
-rw-r--r--cppunit/prj/build.lst2
-rw-r--r--cppunit/prj/d.lst77
-rwxr-xr-xcrashrep/source/unx/res.cxx9
-rw-r--r--cui/inc/makefile.mk (renamed from svtools/source/syslocale/makefile.mk)20
-rw-r--r--cui/inc/pch/precompiled_cui.cxx (renamed from sandbox/com/sun/star/lib/sandbox/Disposable.java)8
-rw-r--r--cui/inc/pch/precompiled_cui.hxx968
-rw-r--r--cui/prj/build.lst9
-rwxr-xr-xcui/prj/d.lst8
-rw-r--r--cui/source/customize/acccfg.cxx (renamed from svx/source/cui/acccfg.cxx)52
-rw-r--r--cui/source/customize/acccfg.hrc (renamed from svx/source/cui/acccfg.hrc)0
-rw-r--r--cui/source/customize/acccfg.src (renamed from svx/source/cui/acccfg.src)2
-rw-r--r--cui/source/customize/cfg.cxx (renamed from svx/source/cui/cfg.cxx)178
-rw-r--r--cui/source/customize/cfg.hrc (renamed from svx/source/cui/cfg.hrc)0
-rw-r--r--cui/source/customize/cfg.src (renamed from svx/source/cui/cfg.src)2
-rw-r--r--cui/source/customize/cfgutil.cxx (renamed from svx/source/cui/cfgutil.cxx)50
-rw-r--r--cui/source/customize/eventdlg.cxx (renamed from svx/source/cui/eventdlg.cxx)34
-rw-r--r--cui/source/customize/eventdlg.hrc (renamed from svx/source/cui/eventdlg.hrc)2
-rw-r--r--cui/source/customize/eventdlg.hxx (renamed from svx/source/inc/eventdlg.hxx)0
-rw-r--r--cui/source/customize/eventdlg.src (renamed from svx/source/cui/eventdlg.src)0
-rw-r--r--cui/source/customize/macropg.cxx (renamed from svx/source/cui/macropg.cxx)60
-rw-r--r--cui/source/customize/macropg.hrc (renamed from svx/source/cui/macropg.hrc)0
-rw-r--r--cui/source/customize/macropg.src (renamed from svx/source/cui/macropg.src)3
-rw-r--r--cui/source/customize/macropg_impl.hxx (renamed from svx/source/inc/macropg_impl.hxx)0
-rwxr-xr-x[-rw-r--r--]cui/source/customize/makefile.mk (renamed from svtools/source/items/makefile.mk)50
-rw-r--r--cui/source/customize/selector.cxx (renamed from svx/source/cui/selector.cxx)46
-rw-r--r--cui/source/customize/selector.hrc (renamed from svx/source/cui/selector.hrc)0
-rw-r--r--cui/source/customize/selector.src (renamed from svx/source/cui/selector.src)2
-rw-r--r--cui/source/dialogs/SpellAttrib.cxx (renamed from svx/source/cui/SpellAttrib.cxx)5
-rw-r--r--cui/source/dialogs/SpellAttrib.hxx (renamed from svx/source/cui/SpellAttrib.hxx)0
-rw-r--r--cui/source/dialogs/SpellDialog.cxx (renamed from svx/source/cui/SpellDialog.cxx)106
-rw-r--r--cui/source/dialogs/SpellDialog.hrc (renamed from svx/source/cui/SpellDialog.hrc)0
-rw-r--r--cui/source/dialogs/SpellDialog.src (renamed from svx/source/cui/SpellDialog.src)2
-rw-r--r--cui/source/dialogs/charmap.hrc (renamed from svx/source/cui/charmap.hrc)0
-rw-r--r--cui/source/dialogs/charmap.src (renamed from svx/source/cui/charmap.src)5
-rw-r--r--cui/source/dialogs/commonlingui.cxx (renamed from svx/source/cui/commonlingui.cxx)38
-rw-r--r--cui/source/dialogs/commonlingui.hxx (renamed from svx/source/cui/commonlingui.hxx)0
-rw-r--r--cui/source/dialogs/commonlingui.src (renamed from svx/source/cui/commonlingui.src)2
-rw-r--r--cui/source/dialogs/cuicharmap.cxx (renamed from svx/source/cui/cuicharmap.cxx)27
-rw-r--r--cui/source/dialogs/cuifmsearch.cxx (renamed from svx/source/cui/cuifmsearch.cxx)114
-rw-r--r--cui/source/dialogs/cuigaldlg.cxx (renamed from svx/source/cui/cuigaldlg.cxx)174
-rw-r--r--cui/source/dialogs/cuigrfflt.cxx (renamed from svx/source/cui/cuigrfflt.cxx)59
-rw-r--r--cui/source/dialogs/cuihyperdlg.cxx (renamed from svx/source/cui/cuihyperdlg.cxx)50
-rwxr-xr-xcui/source/dialogs/cuiimapdlg.hrc (renamed from svx/source/cui/cuiimapdlg.hrc)5
-rwxr-xr-xcui/source/dialogs/cuiimapdlg.src (renamed from svx/source/cui/cuiimapdlg.src)0
-rw-r--r--cui/source/dialogs/cuiimapwnd.cxx (renamed from svx/source/cui/cuiimapwnd.cxx)49
-rw-r--r--cui/source/dialogs/cuitbxform.cxx (renamed from svx/source/cui/cuitbxform.cxx)42
-rw-r--r--cui/source/dialogs/dlgname.cxx (renamed from svx/source/cui/dlgname.cxx)64
-rw-r--r--cui/source/dialogs/dlgname.hrc (renamed from svx/source/cui/dlgname.hrc)0
-rw-r--r--cui/source/dialogs/dlgname.src (renamed from svx/source/cui/dlgname.src)2
-rw-r--r--cui/source/dialogs/fmsearch.hrc (renamed from svx/source/inc/fmsearch.hrc)17
-rw-r--r--cui/source/dialogs/fmsearch.src (renamed from svx/source/form/fmsearch.src)3
-rw-r--r--cui/source/dialogs/gallery.src482
-rw-r--r--cui/source/dialogs/grfflt.hrc (renamed from svx/source/cui/grfflt.hrc)0
-rw-r--r--cui/source/dialogs/grfflt.src (renamed from svx/source/cui/grfflt.src)3
-rw-r--r--cui/source/dialogs/hangulhanjadlg.cxx (renamed from svx/source/cui/hangulhanjadlg.cxx)134
-rw-r--r--cui/source/dialogs/hangulhanjadlg.hrc (renamed from svx/source/cui/hangulhanjadlg.hrc)0
-rw-r--r--cui/source/dialogs/hangulhanjadlg.src (renamed from svx/source/cui/hangulhanjadlg.src)2
-rw-r--r--cui/source/dialogs/hldocntp.cxx (renamed from svx/source/cui/hldocntp.cxx)32
-rw-r--r--cui/source/dialogs/hldoctp.cxx (renamed from svx/source/cui/hldoctp.cxx)30
-rw-r--r--cui/source/dialogs/hlinettp.cxx (renamed from svx/source/cui/hlinettp.cxx)41
-rw-r--r--cui/source/dialogs/hlmailtp.cxx (renamed from svx/source/cui/hlmailtp.cxx)27
-rw-r--r--cui/source/dialogs/hlmarkwn.cxx (renamed from svx/source/cui/hlmarkwn.cxx)21
-rw-r--r--cui/source/dialogs/hlmarkwn.hrc (renamed from svx/source/inc/hlmarkwn.hrc)0
-rw-r--r--cui/source/dialogs/hlmarkwn.src (renamed from svx/source/cui/hlmarkwn.src)2
-rw-r--r--cui/source/dialogs/hltpbase.cxx (renamed from svx/source/cui/hltpbase.cxx)23
-rw-r--r--cui/source/dialogs/hyperdlg.hrc (renamed from svx/source/inc/hyperdlg.hrc)0
-rw-r--r--cui/source/dialogs/hyperdlg.src (renamed from svx/source/dialog/hyperdlg.src)2
-rw-r--r--cui/source/dialogs/iconcdlg.cxx (renamed from svx/source/cui/iconcdlg.cxx)19
-rw-r--r--cui/source/dialogs/iconcdlg.src (renamed from svx/source/cui/iconcdlg.src)2
-rw-r--r--cui/source/dialogs/insdlg.cxx (renamed from svx/source/cui/insdlg.cxx)208
-rw-r--r--cui/source/dialogs/insrc.cxx (renamed from svx/source/cui/insrc.cxx)33
-rw-r--r--cui/source/dialogs/insrc.hrc (renamed from svx/source/cui/insrc.hrc)0
-rw-r--r--cui/source/dialogs/insrc.src (renamed from svx/source/cui/insrc.src)2
-rw-r--r--cui/source/dialogs/linkdlg.cxx (renamed from svx/source/cui/linkdlg.cxx)81
-rwxr-xr-xcui/source/dialogs/makefile.mk118
-rw-r--r--cui/source/dialogs/multifil.cxx (renamed from svx/source/cui/multifil.cxx)20
-rw-r--r--cui/source/dialogs/multipat.cxx (renamed from svx/source/cui/multipat.cxx)44
-rw-r--r--cui/source/dialogs/multipat.hrc (renamed from svx/inc/multipat.hrc)0
-rw-r--r--cui/source/dialogs/multipat.src (renamed from svx/source/options/multipat.src)2
-rw-r--r--cui/source/dialogs/newtabledlg.cxx (renamed from svx/source/cui/newtabledlg.cxx)28
-rw-r--r--cui/source/dialogs/newtabledlg.hrc (renamed from svx/source/cui/newtabledlg.hrc)0
-rw-r--r--cui/source/dialogs/newtabledlg.src (renamed from svx/source/cui/newtabledlg.src)2
-rw-r--r--cui/source/dialogs/pastedlg.cxx (renamed from svx/source/cui/pastedlg.cxx)34
-rw-r--r--cui/source/dialogs/plfilter.cxx (renamed from svx/source/cui/plfilter.cxx)6
-rw-r--r--cui/source/dialogs/postdlg.cxx (renamed from svx/source/cui/postdlg.cxx)61
-rw-r--r--cui/source/dialogs/postdlg.hrc (renamed from svx/source/cui/postdlg.hrc)0
-rw-r--r--cui/source/dialogs/postdlg.src (renamed from svx/source/cui/postdlg.src)5
-rw-r--r--cui/source/dialogs/scriptdlg.cxx (renamed from svx/source/cui/scriptdlg.cxx)89
-rw-r--r--cui/source/dialogs/scriptdlg.hrc (renamed from svx/source/cui/scriptdlg.hrc)2
-rw-r--r--cui/source/dialogs/scriptdlg.src (renamed from svx/source/cui/scriptdlg.src)2
-rw-r--r--cui/source/dialogs/sdrcelldlg.cxx (renamed from svx/source/cui/sdrcelldlg.cxx)16
-rw-r--r--cui/source/dialogs/sdrcelldlg.src (renamed from svx/source/cui/sdrcelldlg.src)2
-rw-r--r--cui/source/dialogs/showcols.cxx (renamed from svx/source/cui/showcols.cxx)19
-rw-r--r--cui/source/dialogs/showcols.src (renamed from svx/source/fmcomp/showcols.src)5
-rw-r--r--cui/source/dialogs/splitcelldlg.cxx (renamed from svx/source/cui/splitcelldlg.cxx)42
-rw-r--r--cui/source/dialogs/splitcelldlg.hrc (renamed from svx/source/cui/splitcelldlg.hrc)0
-rw-r--r--cui/source/dialogs/splitcelldlg.src (renamed from svx/source/cui/splitcelldlg.src)2
-rw-r--r--cui/source/dialogs/srchxtra.cxx (renamed from svx/source/cui/srchxtra.cxx)76
-rw-r--r--cui/source/dialogs/srchxtra.hrc (renamed from svx/source/cui/srchxtra.hrc)0
-rw-r--r--cui/source/dialogs/srchxtra.src (renamed from svx/source/cui/srchxtra.src)3
-rw-r--r--cui/source/dialogs/svuidlg.hrc (renamed from svx/source/cui/svuidlg.hrc)6
-rw-r--r--cui/source/dialogs/svuidlg.src (renamed from svx/source/cui/svuidlg.src)0
-rw-r--r--cui/source/dialogs/tbxform.src (renamed from svx/source/form/tbxform.src)4
-rw-r--r--cui/source/dialogs/winpluginlib.cpp (renamed from svx/source/cui/winpluginlib.cpp)0
-rw-r--r--cui/source/dialogs/zoom.cxx (renamed from svx/source/cui/zoom.cxx)64
-rw-r--r--cui/source/dialogs/zoom.hrc (renamed from svx/source/cui/zoom.hrc)0
-rw-r--r--cui/source/dialogs/zoom.src (renamed from svx/source/cui/zoom.src)5
-rw-r--r--cui/source/factory/cuiexp.cxx (renamed from svx/source/cui/cuiexp.cxx)6
-rw-r--r--cui/source/factory/cuiresmgr.cxx (renamed from svtools/source/misc/iniprop.cxx)30
-rw-r--r--cui/source/factory/dlgfact.cxx (renamed from svx/source/cui/dlgfact.cxx)672
-rw-r--r--cui/source/factory/dlgfact.hxx (renamed from svx/source/cui/dlgfact.hxx)90
-rw-r--r--cui/source/factory/init.cxx (renamed from svx/source/cui/init.cxx)6
-rwxr-xr-xcui/source/factory/makefile.mk56
-rw-r--r--cui/source/inc/ControlFocusHelper.hxx (renamed from svx/source/cui/ControlFocusHelper.hxx)0
-rw-r--r--cui/source/inc/SpellDialog.hxx (renamed from svx/source/inc/SpellDialog.hxx)2
-rw-r--r--cui/source/inc/acccfg.hxx (renamed from svx/source/cui/acccfg.hxx)2
-rw-r--r--cui/source/inc/align.hxx (renamed from svx/source/cui/align.hxx)15
-rw-r--r--cui/source/inc/autocdlg.hxx (renamed from svx/source/cui/autocdlg.hxx)0
-rw-r--r--cui/source/inc/backgrnd.hxx (renamed from svx/source/cui/backgrnd.hxx)0
-rw-r--r--cui/source/inc/bbdlg.hxx (renamed from svx/source/cui/bbdlg.hxx)0
-rw-r--r--cui/source/inc/border.hxx (renamed from svx/source/cui/border.hxx)24
-rw-r--r--cui/source/inc/cfg.hxx (renamed from svx/source/cui/cfg.hxx)2
-rw-r--r--cui/source/inc/cfgutil.hxx (renamed from svx/source/cui/cfgutil.hxx)2
-rw-r--r--cui/source/inc/chardlg.hxx (renamed from svx/source/cui/chardlg.hxx)0
-rw-r--r--cui/source/inc/connect.hxx (renamed from svx/source/cui/connect.hxx)14
-rw-r--r--cui/source/inc/cuicharmap.hxx (renamed from svx/source/cui/cuicharmap.hxx)0
-rw-r--r--cui/source/inc/cuifmsearch.hxx (renamed from svx/source/cui/cuifmsearch.hxx)2
-rw-r--r--cui/source/inc/cuigaldlg.hxx (renamed from svx/source/cui/cuigaldlg.hxx)10
-rw-r--r--cui/source/inc/cuigrfflt.hxx (renamed from svx/source/cui/cuigrfflt.hxx)0
-rw-r--r--cui/source/inc/cuihyperdlg.hxx (renamed from svx/source/cui/cuihyperdlg.hxx)2
-rw-r--r--cui/source/inc/cuiimapwnd.hxx (renamed from svx/source/cui/cuiimapwnd.hxx)2
-rw-r--r--cui/source/inc/cuioptgenrl.hxx (renamed from svx/source/cui/cuioptgenrl.hxx)8
-rw-r--r--cui/source/inc/cuires.hrc430
-rw-r--r--cui/source/inc/cuisrchdlg.hxx (renamed from svx/source/cui/cuisrchdlg.hxx)6
-rw-r--r--cui/source/inc/cuitabarea.hxx (renamed from svx/source/cui/cuitabarea.hxx)0
-rw-r--r--cui/source/inc/cuitabline.hxx (renamed from svx/source/cui/cuitabline.hxx)0
-rw-r--r--cui/source/inc/cuitbxform.hxx (renamed from svx/source/cui/cuitbxform.hxx)0
-rw-r--r--cui/source/inc/dbregister.hxx (renamed from svx/source/cui/dbregister.hxx)2
-rw-r--r--cui/source/inc/defdlgname.hxx (renamed from svx/inc/defdlgname.hxx)0
-rw-r--r--cui/source/inc/dialmgr.hxx48
-rw-r--r--cui/source/inc/dlgname.hxx (renamed from svx/source/cui/dlgname.hxx)0
-rw-r--r--cui/source/inc/dstribut.hxx (renamed from svx/source/cui/dstribut.hxx)0
-rw-r--r--cui/source/inc/gallery.hrc104
-rw-r--r--cui/source/inc/grfpage.hxx (renamed from svx/source/cui/grfpage.hxx)0
-rw-r--r--cui/source/inc/hangulhanjadlg.hxx (renamed from svx/source/cui/hangulhanjadlg.hxx)4
-rwxr-xr-xcui/source/inc/headertablistbox.hxx (renamed from svx/source/cui/headertablistbox.hxx)0
-rw-r--r--cui/source/inc/helpid.hrc390
-rw-r--r--cui/source/inc/hldocntp.hxx (renamed from svx/source/cui/hldocntp.hxx)0
-rw-r--r--cui/source/inc/hldoctp.hxx (renamed from svx/source/cui/hldoctp.hxx)0
-rw-r--r--cui/source/inc/hlinettp.hxx (renamed from svx/source/cui/hlinettp.hxx)2
-rw-r--r--cui/source/inc/hlmailtp.hxx (renamed from svx/source/cui/hlmailtp.hxx)0
-rw-r--r--cui/source/inc/hlmarkwn.hxx (renamed from svx/source/inc/hlmarkwn.hxx)0
-rw-r--r--cui/source/inc/hlmarkwn_def.hxx (renamed from svx/inc/hlmarkwn_def.hxx)0
-rw-r--r--cui/source/inc/hltpbase.hxx (renamed from svx/source/cui/hltpbase.hxx)17
-rw-r--r--cui/source/inc/iconcdlg.hxx (renamed from svx/source/cui/iconcdlg.hxx)4
-rw-r--r--cui/source/inc/insdlg.hxx (renamed from svx/source/cui/insdlg.hxx)0
-rw-r--r--cui/source/inc/insrc.hxx (renamed from svx/source/cui/insrc.hxx)0
-rw-r--r--cui/source/inc/internationaloptions.hxx (renamed from svx/source/cui/internationaloptions.hxx)0
-rw-r--r--cui/source/inc/labdlg.hxx (renamed from svx/source/cui/labdlg.hxx)0
-rw-r--r--cui/source/inc/linkdlg.hxx (renamed from svx/source/cui/linkdlg.hxx)0
-rwxr-xr-xcui/source/inc/macroass.hxx (renamed from svx/source/cui/macroass.hxx)2
-rw-r--r--cui/source/inc/macropg.hxx (renamed from svx/source/cui/macropg.hxx)2
-rw-r--r--cui/source/inc/measure.hxx (renamed from svx/source/cui/measure.hxx)4
-rw-r--r--cui/source/inc/multifil.hxx (renamed from svx/source/cui/multifil.hxx)0
-rw-r--r--cui/source/inc/multipat.hxx (renamed from svx/source/cui/multipat.hxx)0
-rw-r--r--cui/source/inc/newtabledlg.hxx (renamed from svx/source/cui/newtabledlg.hxx)0
-rw-r--r--cui/source/inc/numfmt.hxx (renamed from svx/source/cui/numfmt.hxx)17
-rw-r--r--cui/source/inc/numpages.hxx (renamed from svx/source/cui/numpages.hxx)2
-rw-r--r--cui/source/inc/optasian.hxx (renamed from svx/source/cui/optasian.hxx)0
-rw-r--r--cui/source/inc/optdict.hxx (renamed from svx/source/cui/optdict.hxx)0
-rw-r--r--cui/source/inc/optimprove.hxx (renamed from svx/inc/svx/optimprove.hxx)0
-rw-r--r--cui/source/inc/optlingu.hxx (renamed from svx/inc/svx/optlingu.hxx)0
-rw-r--r--cui/source/inc/optpath.hxx (renamed from svx/source/cui/optpath.hxx)0
-rw-r--r--cui/source/inc/page.hxx (renamed from svx/source/cui/page.hxx)17
-rw-r--r--cui/source/inc/paragrph.hxx (renamed from svx/source/cui/paragrph.hxx)12
-rw-r--r--cui/source/inc/pastedlg.hxx (renamed from svx/source/cui/pastedlg.hxx)0
-rw-r--r--cui/source/inc/postdlg.hxx (renamed from svx/source/cui/postdlg.hxx)0
-rw-r--r--cui/source/inc/radiobtnbox.hxx (renamed from svx/inc/radiobtnbox.hxx)0
-rw-r--r--cui/source/inc/scriptdlg.hxx (renamed from svx/source/cui/scriptdlg.hxx)0
-rw-r--r--cui/source/inc/sdrcelldlg.hxx (renamed from svx/source/cui/sdrcelldlg.hxx)0
-rw-r--r--cui/source/inc/selector.hxx (renamed from svx/source/cui/selector.hxx)2
-rw-r--r--cui/source/inc/showcols.hxx (renamed from svx/source/cui/showcols.hxx)0
-rw-r--r--cui/source/inc/splitcelldlg.hxx (renamed from svx/source/cui/splitcelldlg.hxx)0
-rw-r--r--cui/source/inc/srchxtra.hxx (renamed from svx/source/cui/srchxtra.hxx)2
-rw-r--r--cui/source/inc/tabstpge.hxx (renamed from svx/source/cui/tabstpge.hxx)3
-rw-r--r--cui/source/inc/textanim.hxx (renamed from svx/source/cui/textanim.hxx)0
-rw-r--r--cui/source/inc/textattr.hxx (renamed from svx/source/cui/textattr.hxx)0
-rw-r--r--cui/source/inc/transfrm.hxx (renamed from svx/source/cui/transfrm.hxx)0
-rw-r--r--cui/source/inc/treeopt.hxx (renamed from svx/source/cui/treeopt.hxx)0
-rw-r--r--cui/source/inc/zoom.hxx (renamed from svx/source/cui/zoom.hxx)0
-rw-r--r--cui/source/options/cfgchart.cxx (renamed from svx/source/cui/cfgchart.cxx)18
-rw-r--r--cui/source/options/cfgchart.hxx (renamed from svx/source/cui/cfgchart.hxx)3
-rw-r--r--cui/source/options/connpoolconfig.cxx (renamed from svx/source/cui/connpoolconfig.cxx)11
-rw-r--r--cui/source/options/connpoolconfig.hxx (renamed from svx/source/cui/connpoolconfig.hxx)0
-rw-r--r--cui/source/options/connpooloptions.cxx (renamed from svx/source/cui/connpooloptions.cxx)34
-rw-r--r--cui/source/options/connpooloptions.hrc (renamed from svx/source/cui/connpooloptions.hrc)0
-rw-r--r--cui/source/options/connpooloptions.hxx (renamed from svx/source/cui/connpooloptions.hxx)4
-rw-r--r--cui/source/options/connpooloptions.src (renamed from svx/source/cui/connpooloptions.src)2
-rw-r--r--cui/source/options/connpoolsettings.cxx (renamed from svx/source/cui/connpoolsettings.cxx)2
-rw-r--r--cui/source/options/connpoolsettings.hxx (renamed from svx/source/cui/connpoolsettings.hxx)2
-rw-r--r--cui/source/options/cuisrchdlg.cxx (renamed from svx/source/cui/cuisrchdlg.cxx)29
-rw-r--r--cui/source/options/dbregister.cxx (renamed from svx/source/cui/dbregister.cxx)41
-rw-r--r--cui/source/options/dbregister.hrc (renamed from svx/source/cui/dbregister.hrc)0
-rw-r--r--cui/source/options/dbregister.src (renamed from svx/source/cui/dbregister.src)8
-rw-r--r--cui/source/options/dbregisterednamesconfig.cxx (renamed from svx/source/cui/dbregisterednamesconfig.cxx)17
-rw-r--r--cui/source/options/dbregisterednamesconfig.hxx (renamed from svx/source/cui/dbregisterednamesconfig.hxx)0
-rw-r--r--cui/source/options/dbregistersettings.cxx (renamed from svx/source/cui/dbregistersettings.cxx)6
-rw-r--r--cui/source/options/dbregistersettings.hxx (renamed from svx/source/cui/dbregistersettings.hxx)2
-rw-r--r--cui/source/options/doclinkdialog.cxx (renamed from svx/source/cui/doclinkdialog.cxx)44
-rw-r--r--cui/source/options/doclinkdialog.hrc (renamed from svx/source/cui/doclinkdialog.hrc)0
-rw-r--r--cui/source/options/doclinkdialog.hxx (renamed from svx/source/cui/doclinkdialog.hxx)0
-rw-r--r--cui/source/options/doclinkdialog.src (renamed from svx/source/cui/doclinkdialog.src)2
-rw-r--r--cui/source/options/fontsubs.cxx (renamed from svx/source/cui/fontsubs.cxx)67
-rw-r--r--cui/source/options/fontsubs.hrc (renamed from svx/source/cui/fontsubs.hrc)2
-rw-r--r--cui/source/options/fontsubs.hxx (renamed from svx/source/cui/fontsubs.hxx)7
-rw-r--r--cui/source/options/fontsubs.src (renamed from svx/source/cui/fontsubs.src)1
-rw-r--r--cui/source/options/internationaloptions.cxx (renamed from svx/source/cui/internationaloptions.cxx)29
-rw-r--r--cui/source/options/internationaloptions.hrc (renamed from svx/source/cui/internationaloptions.hrc)0
-rw-r--r--cui/source/options/internationaloptions.src (renamed from svx/source/cui/internationaloptions.src)1
-rwxr-xr-xcui/source/options/makefile.mk122
-rw-r--r--cui/source/options/optHeaderTabListbox.cxx (renamed from svx/source/cui/optHeaderTabListbox.cxx)5
-rw-r--r--cui/source/options/optHeaderTabListbox.hxx (renamed from svx/source/cui/optHeaderTabListbox.hxx)0
-rw-r--r--cui/source/options/optaccessibility.cxx (renamed from svx/source/cui/optaccessibility.cxx)35
-rw-r--r--cui/source/options/optaccessibility.hrc (renamed from svx/inc/optaccessibility.hrc)0
-rw-r--r--cui/source/options/optaccessibility.hxx (renamed from svx/source/cui/optaccessibility.hxx)0
-rw-r--r--cui/source/options/optaccessibility.src (renamed from svx/source/options/optaccessibility.src)2
-rw-r--r--cui/source/options/optasian.cxx (renamed from svx/source/cui/optasian.cxx)49
-rw-r--r--cui/source/options/optasian.hrc (renamed from svx/inc/optasian.hrc)0
-rw-r--r--cui/source/options/optasian.src (renamed from svx/source/options/optasian.src)2
-rw-r--r--cui/source/options/optchart.cxx (renamed from svx/source/cui/optchart.cxx)27
-rw-r--r--cui/source/options/optchart.hrc (renamed from svx/source/inc/optchart.hrc)0
-rw-r--r--cui/source/options/optchart.hxx (renamed from svx/source/cui/optchart.hxx)0
-rw-r--r--cui/source/options/optchart.src (renamed from svx/source/options/optchart.src)2
-rw-r--r--cui/source/options/optcolor.cxx (renamed from svx/source/cui/optcolor.cxx)51
-rw-r--r--cui/source/options/optcolor.hrc (renamed from svx/inc/optcolor.hrc)0
-rw-r--r--cui/source/options/optcolor.hxx (renamed from svx/source/cui/optcolor.hxx)0
-rw-r--r--cui/source/options/optcolor.src (renamed from svx/source/options/optcolor.src)2
-rw-r--r--cui/source/options/optctl.cxx (renamed from svx/source/cui/optctl.cxx)43
-rw-r--r--cui/source/options/optctl.hrc (renamed from svx/inc/optctl.hrc)0
-rw-r--r--cui/source/options/optctl.hxx (renamed from svx/source/cui/optctl.hxx)0
-rw-r--r--cui/source/options/optctl.src (renamed from svx/source/options/optctl.src)2
-rw-r--r--cui/source/options/optdict.cxx (renamed from svx/source/cui/optdict.cxx)90
-rw-r--r--cui/source/options/optdict.hrc (renamed from svx/source/inc/optdict.hrc)0
-rw-r--r--cui/source/options/optdict.src (renamed from svx/source/options/optdict.src)2
-rw-r--r--cui/source/options/optfltr.cxx (renamed from svx/source/cui/optfltr.cxx)57
-rw-r--r--cui/source/options/optfltr.hrc (renamed from svx/source/cui/optfltr.hrc)0
-rw-r--r--cui/source/options/optfltr.hxx (renamed from svx/source/cui/optfltr.hxx)0
-rw-r--r--cui/source/options/optfltr.src (renamed from svx/source/cui/optfltr.src)2
-rw-r--r--cui/source/options/optgdlg.cxx (renamed from svx/source/cui/optgdlg.cxx)331
-rw-r--r--cui/source/options/optgdlg.hrc (renamed from svx/source/cui/optgdlg.hrc)0
-rw-r--r--cui/source/options/optgdlg.hxx (renamed from svx/source/cui/optgdlg.hxx)3
-rw-r--r--cui/source/options/optgdlg.src (renamed from svx/source/cui/optgdlg.src)3
-rw-r--r--cui/source/options/optgenrl.cxx (renamed from svx/source/cui/optgenrl.cxx)89
-rw-r--r--cui/source/options/optgenrl.hrc (renamed from svx/inc/optgenrl.hrc)0
-rw-r--r--cui/source/options/optgenrl.src (renamed from svx/source/options/optgenrl.src)20
-rw-r--r--cui/source/options/opthtml.cxx (renamed from svx/source/cui/opthtml.cxx)68
-rw-r--r--cui/source/options/opthtml.hrc (renamed from svx/source/cui/opthtml.hrc)0
-rw-r--r--cui/source/options/opthtml.hxx (renamed from svx/source/cui/opthtml.hxx)14
-rw-r--r--cui/source/options/opthtml.src (renamed from svx/source/cui/opthtml.src)2
-rw-r--r--cui/source/options/optimprove.cxx (renamed from svx/source/cui/optimprove.cxx)43
-rw-r--r--cui/source/options/optimprove.hrc (renamed from svx/inc/optimprove.hrc)0
-rw-r--r--cui/source/options/optimprove.src (renamed from svx/source/options/optimprove.src)3
-rw-r--r--cui/source/options/optimprove2.cxx (renamed from svx/source/cui/optimprove2.cxx)46
-rw-r--r--cui/source/options/optinet2.cxx (renamed from svx/source/cui/optinet2.cxx)235
-rw-r--r--cui/source/options/optinet2.hrc (renamed from svx/inc/optinet2.hrc)5
-rw-r--r--cui/source/options/optinet2.hxx (renamed from svx/source/cui/optinet2.hxx)6
-rw-r--r--cui/source/options/optinet2.src (renamed from svx/source/options/optinet2.src)2
-rw-r--r--cui/source/options/optjava.cxx (renamed from svx/source/cui/optjava.cxx)104
-rw-r--r--cui/source/options/optjava.hrc (renamed from svx/source/cui/optjava.hrc)0
-rw-r--r--cui/source/options/optjava.hxx (renamed from svx/source/cui/optjava.hxx)4
-rw-r--r--cui/source/options/optjava.src (renamed from svx/source/cui/optjava.src)2
-rw-r--r--cui/source/options/optjsearch.cxx (renamed from svx/source/cui/optjsearch.cxx)62
-rw-r--r--cui/source/options/optjsearch.hrc (renamed from svx/inc/optjsearch.hrc)0
-rw-r--r--cui/source/options/optjsearch.hxx (renamed from svx/source/cui/optjsearch.hxx)0
-rw-r--r--cui/source/options/optjsearch.src (renamed from svx/source/options/optjsearch.src)2
-rw-r--r--cui/source/options/optlingu.cxx (renamed from svx/source/options/optlingu.cxx)128
-rw-r--r--cui/source/options/optlingu.hrc (renamed from svx/source/options/optlingu.hrc)0
-rw-r--r--cui/source/options/optlingu.src (renamed from svx/source/options/optlingu.src)2
-rw-r--r--cui/source/options/optmemory.cxx (renamed from svx/source/cui/optmemory.cxx)95
-rw-r--r--cui/source/options/optmemory.hrc (renamed from svx/source/cui/optmemory.hrc)0
-rw-r--r--cui/source/options/optmemory.hxx (renamed from svx/source/cui/optmemory.hxx)0
-rw-r--r--cui/source/options/optmemory.src (renamed from svx/source/cui/optmemory.src)2
-rw-r--r--cui/source/options/optpath.cxx (renamed from svx/source/cui/optpath.cxx)47
-rw-r--r--cui/source/options/optpath.hrc (renamed from svx/inc/optpath.hrc)0
-rw-r--r--cui/source/options/optpath.src (renamed from svx/source/options/optpath.src)2
-rw-r--r--cui/source/options/optsave.cxx (renamed from svx/source/cui/optsave.cxx)88
-rw-r--r--cui/source/options/optsave.hrc (renamed from svx/inc/optsave.hrc)0
-rw-r--r--cui/source/options/optsave.hxx (renamed from svx/source/cui/optsave.hxx)0
-rw-r--r--cui/source/options/optsave.src (renamed from svx/source/options/optsave.src)2
-rw-r--r--cui/source/options/optspell.hrc (renamed from svx/inc/optspell.hrc)0
-rw-r--r--cui/source/options/optspell.src (renamed from svx/source/options/optspell.src)0
-rw-r--r--cui/source/options/optupdt.cxx (renamed from svx/source/cui/optupdt.cxx)43
-rw-r--r--cui/source/options/optupdt.hrc (renamed from svx/source/cui/optupdt.hrc)0
-rw-r--r--cui/source/options/optupdt.hxx (renamed from svx/source/cui/optupdt.hxx)0
-rw-r--r--cui/source/options/optupdt.src (renamed from svx/source/cui/optupdt.src)2
-rw-r--r--cui/source/options/radiobtnbox.cxx (renamed from svx/source/dialog/radiobtnbox.cxx)10
-rw-r--r--cui/source/options/readonlyimage.cxx (renamed from svx/source/cui/readonlyimage.cxx)16
-rw-r--r--cui/source/options/readonlyimage.hxx (renamed from svx/source/cui/readonlyimage.hxx)0
-rw-r--r--cui/source/options/readonlyimage.src (renamed from svx/source/cui/readonlyimage.src)2
-rw-r--r--cui/source/options/sdbcdriverenum.cxx (renamed from svx/source/cui/sdbcdriverenum.cxx)6
-rw-r--r--cui/source/options/sdbcdriverenum.hxx (renamed from svx/source/cui/sdbcdriverenum.hxx)0
-rw-r--r--cui/source/options/securityoptions.cxx (renamed from svx/source/cui/securityoptions.cxx)61
-rw-r--r--cui/source/options/securityoptions.hrc (renamed from svx/source/cui/securityoptions.hrc)0
-rw-r--r--cui/source/options/securityoptions.hxx (renamed from svx/source/cui/securityoptions.hxx)0
-rw-r--r--cui/source/options/securityoptions.src (renamed from svx/source/cui/securityoptions.src)2
-rw-r--r--cui/source/options/treeopt.cxx (renamed from svx/source/cui/treeopt.cxx)137
-rw-r--r--cui/source/options/treeopt.hrc (renamed from svx/source/cui/treeopt.hrc)0
-rw-r--r--cui/source/options/treeopt.src (renamed from svx/source/cui/treeopt.src)3
-rw-r--r--cui/source/options/webconninfo.cxx (renamed from svx/source/cui/webconninfo.cxx)37
-rw-r--r--cui/source/options/webconninfo.hrc (renamed from svx/source/cui/webconninfo.hrc)0
-rw-r--r--cui/source/options/webconninfo.hxx (renamed from svx/source/cui/webconninfo.hxx)0
-rw-r--r--cui/source/options/webconninfo.src (renamed from svx/source/cui/webconninfo.src)2
-rw-r--r--cui/source/tabpages/align.cxx (renamed from svx/source/cui/align.cxx)90
-rw-r--r--cui/source/tabpages/align.hrc (renamed from svx/source/cui/align.hrc)0
-rw-r--r--cui/source/tabpages/align.src (renamed from svx/source/cui/align.src)4
-rw-r--r--cui/source/tabpages/autocdlg.cxx (renamed from svx/source/cui/autocdlg.cxx)250
-rw-r--r--cui/source/tabpages/autocdlg.hrc (renamed from svx/source/cui/autocdlg.hrc)2
-rw-r--r--cui/source/tabpages/autocdlg.src (renamed from svx/source/cui/autocdlg.src)4
-rw-r--r--cui/source/tabpages/backgrnd.cxx (renamed from svx/source/cui/backgrnd.cxx)100
-rw-r--r--cui/source/tabpages/backgrnd.hrc (renamed from svx/source/cui/backgrnd.hrc)0
-rw-r--r--cui/source/tabpages/backgrnd.src (renamed from svx/source/cui/backgrnd.src)4
-rw-r--r--cui/source/tabpages/bbdlg.cxx (renamed from svx/source/cui/bbdlg.cxx)12
-rw-r--r--cui/source/tabpages/bbdlg.src (renamed from svx/source/cui/bbdlg.src)2
-rw-r--r--cui/source/tabpages/border.cxx (renamed from svx/source/cui/border.cxx)112
-rw-r--r--cui/source/tabpages/border.hrc (renamed from svx/source/cui/border.hrc)0
-rw-r--r--cui/source/tabpages/border.src (renamed from svx/source/cui/border.src)4
-rw-r--r--cui/source/tabpages/borderconn.cxx (renamed from svx/source/cui/borderconn.cxx)8
-rw-r--r--cui/source/tabpages/borderconn.hxx (renamed from svx/source/cui/borderconn.hxx)0
-rw-r--r--cui/source/tabpages/chardlg.cxx (renamed from svx/source/cui/chardlg.cxx)247
-rw-r--r--cui/source/tabpages/chardlg.h (renamed from svx/source/cui/chardlg.h)0
-rw-r--r--cui/source/tabpages/chardlg.hrc (renamed from svx/source/cui/chardlg.hrc)0
-rw-r--r--cui/source/tabpages/chardlg.src (renamed from svx/source/cui/chardlg.src)9
-rw-r--r--cui/source/tabpages/connect.cxx (renamed from svx/source/cui/connect.cxx)64
-rw-r--r--cui/source/tabpages/connect.hrc (renamed from svx/inc/connect.hrc)0
-rw-r--r--cui/source/tabpages/connect.src (renamed from svx/source/cui/connect.src)4
-rw-r--r--cui/source/tabpages/dstribut.cxx (renamed from svx/source/cui/dstribut.cxx)70
-rw-r--r--cui/source/tabpages/dstribut.hrc (renamed from svx/source/cui/dstribut.hrc)0
-rw-r--r--cui/source/tabpages/dstribut.src (renamed from svx/source/cui/dstribut.src)3
-rw-r--r--cui/source/tabpages/frmdirlbox.src (renamed from svx/source/dialog/frmdirlbox.src)2
-rw-r--r--cui/source/tabpages/grfpage.cxx (renamed from svx/source/cui/grfpage.cxx)82
-rw-r--r--cui/source/tabpages/grfpage.hrc (renamed from svx/source/cui/grfpage.hrc)0
-rw-r--r--cui/source/tabpages/grfpage.src (renamed from svx/source/cui/grfpage.src)3
-rw-r--r--cui/source/tabpages/labdlg.cxx (renamed from svx/source/cui/labdlg.cxx)64
-rw-r--r--cui/source/tabpages/labdlg.hrc (renamed from svx/source/cui/labdlg.hrc)2
-rw-r--r--cui/source/tabpages/labdlg.src (renamed from svx/source/cui/labdlg.src)2
-rw-r--r--cui/source/tabpages/macroass.cxx (renamed from svx/source/cui/macroass.cxx)36
-rw-r--r--cui/source/tabpages/macroass.hrc (renamed from svx/source/cui/macroass.hrc)0
-rw-r--r--cui/source/tabpages/macroass.src (renamed from svx/source/cui/macroass.src)4
-rwxr-xr-xcui/source/tabpages/makefile.mk114
-rw-r--r--cui/source/tabpages/measure.cxx (renamed from svx/source/cui/measure.cxx)78
-rw-r--r--cui/source/tabpages/measure.hrc (renamed from svx/source/cui/measure.hrc)0
-rw-r--r--cui/source/tabpages/measure.src (renamed from svx/source/cui/measure.src)4
-rw-r--r--cui/source/tabpages/numfmt.cxx (renamed from svx/source/cui/numfmt.cxx)92
-rw-r--r--cui/source/tabpages/numfmt.hrc (renamed from svx/source/cui/numfmt.hrc)0
-rw-r--r--cui/source/tabpages/numfmt.src (renamed from svx/source/cui/numfmt.src)4
-rw-r--r--cui/source/tabpages/numpages.cxx (renamed from svx/source/cui/numpages.cxx)212
-rw-r--r--cui/source/tabpages/numpages.hrc (renamed from svx/source/cui/numpages.hrc)0
-rw-r--r--cui/source/tabpages/numpages.src (renamed from svx/source/cui/numpages.src)104
-rw-r--r--cui/source/tabpages/page.cxx (renamed from svx/source/cui/page.cxx)160
-rw-r--r--cui/source/tabpages/page.h (renamed from svx/source/cui/page.h)0
-rw-r--r--cui/source/tabpages/page.hrc (renamed from svx/source/cui/page.hrc)0
-rw-r--r--cui/source/tabpages/page.src (renamed from svx/source/cui/page.src)165
-rw-r--r--cui/source/tabpages/paragrph.cxx (renamed from svx/source/cui/paragrph.cxx)217
-rw-r--r--cui/source/tabpages/paragrph.hrc (renamed from svx/source/cui/paragrph.hrc)0
-rw-r--r--cui/source/tabpages/paragrph.src (renamed from svx/source/cui/paragrph.src)3
-rw-r--r--cui/source/tabpages/strings.src178
-rw-r--r--cui/source/tabpages/swpossizetabpage.cxx (renamed from svx/source/cui/swpossizetabpage.cxx)99
-rw-r--r--cui/source/tabpages/swpossizetabpage.hrc (renamed from svx/source/cui/swpossizetabpage.hrc)0
-rw-r--r--cui/source/tabpages/swpossizetabpage.hxx (renamed from svx/source/cui/swpossizetabpage.hxx)6
-rw-r--r--cui/source/tabpages/swpossizetabpage.src (renamed from svx/source/cui/swpossizetabpage.src)5
-rw-r--r--cui/source/tabpages/tabarea.cxx (renamed from svx/source/cui/tabarea.cxx)31
-rw-r--r--cui/source/tabpages/tabarea.hrc (renamed from svx/source/cui/tabarea.hrc)0
-rw-r--r--cui/source/tabpages/tabarea.src (renamed from svx/source/cui/tabarea.src)3
-rw-r--r--cui/source/tabpages/tabline.cxx (renamed from svx/source/cui/tabline.cxx)23
-rw-r--r--cui/source/tabpages/tabline.hrc (renamed from svx/source/cui/tabline.hrc)0
-rw-r--r--cui/source/tabpages/tabline.src (renamed from svx/source/cui/tabline.src)3
-rw-r--r--cui/source/tabpages/tabstpge.cxx (renamed from svx/source/cui/tabstpge.cxx)80
-rw-r--r--cui/source/tabpages/tabstpge.hrc (renamed from svx/source/cui/tabstpge.hrc)0
-rw-r--r--cui/source/tabpages/tabstpge.src (renamed from svx/source/cui/tabstpge.src)4
-rw-r--r--cui/source/tabpages/textanim.cxx (renamed from svx/source/cui/textanim.cxx)65
-rw-r--r--cui/source/tabpages/textanim.hrc (renamed from svx/source/cui/textanim.hrc)0
-rw-r--r--cui/source/tabpages/textanim.src (renamed from svx/source/cui/textanim.src)3
-rw-r--r--cui/source/tabpages/textattr.cxx (renamed from svx/source/cui/textattr.cxx)64
-rw-r--r--cui/source/tabpages/textattr.hrc (renamed from svx/source/cui/textattr.hrc)0
-rw-r--r--cui/source/tabpages/textattr.src (renamed from svx/source/cui/textattr.src)4
-rw-r--r--cui/source/tabpages/tparea.cxx (renamed from svx/source/cui/tparea.cxx)157
-rw-r--r--cui/source/tabpages/tpbitmap.cxx (renamed from svx/source/cui/tpbitmap.cxx)109
-rw-r--r--cui/source/tabpages/tpcolor.cxx (renamed from svx/source/cui/tpcolor.cxx)112
-rw-r--r--cui/source/tabpages/tpgradnt.cxx (renamed from svx/source/cui/tpgradnt.cxx)114
-rw-r--r--cui/source/tabpages/tphatch.cxx (renamed from svx/source/cui/tphatch.cxx)106
-rw-r--r--cui/source/tabpages/tpline.cxx (renamed from svx/source/cui/tpline.cxx)138
-rw-r--r--cui/source/tabpages/tplnedef.cxx (renamed from svx/source/cui/tplnedef.cxx)106
-rw-r--r--cui/source/tabpages/tplneend.cxx (renamed from svx/source/cui/tplneend.cxx)81
-rw-r--r--cui/source/tabpages/tpshadow.cxx (renamed from svx/source/cui/tpshadow.cxx)47
-rw-r--r--cui/source/tabpages/transfrm.cxx (renamed from svx/source/cui/transfrm.cxx)122
-rw-r--r--cui/source/tabpages/transfrm.hrc (renamed from svx/source/cui/transfrm.hrc)0
-rw-r--r--cui/source/tabpages/transfrm.src (renamed from svx/source/cui/transfrm.src)4
-rw-r--r--cui/util/cui.map (renamed from svx/util/cui.map)0
-rw-r--r--cui/util/hidother.src203
-rw-r--r--cui/util/makefile.mk110
-rw-r--r--cui/util/makefile.pmk47
-rw-r--r--dbaccess/inc/dbaccess_helpid.hrc2
-rw-r--r--dbaccess/inc/pch/precompiled_dbaccess.hxx12
-rw-r--r--dbaccess/inc/singledoccontroller.hxx2
-rw-r--r--dbaccess/prj/build.lst2
-rw-r--r--dbaccess/source/core/api/KeySet.cxx5
-rw-r--r--dbaccess/source/core/api/RowSet.cxx2
-rw-r--r--dbaccess/source/core/api/SingleSelectQueryComposer.cxx2
-rw-r--r--dbaccess/source/core/api/querycomposer.cxx2
-rw-r--r--dbaccess/source/core/dataaccess/databasecontext.cxx4
-rw-r--r--dbaccess/source/core/dataaccess/databasedocument.cxx2
-rw-r--r--dbaccess/source/core/inc/core_resource.hrc2
-rw-r--r--dbaccess/source/core/resource/core_resource.cxx2
-rw-r--r--dbaccess/source/ext/adabas/Acomponentmodule.cxx2
-rw-r--r--dbaccess/source/ext/adabas/AdabasNewDb.cxx2
-rw-r--r--dbaccess/source/ext/adabas/adabasui_resource.hrc2
-rw-r--r--dbaccess/source/ext/macromigration/dbmm_global.hrc2
-rw-r--r--dbaccess/source/ext/macromigration/macromigrationdialog.cxx2
-rw-r--r--dbaccess/source/filter/migration/cfgimport.cxx2
-rw-r--r--dbaccess/source/filter/xml/dbloader2.cxx2
-rw-r--r--dbaccess/source/filter/xml/xmlExport.cxx4
-rw-r--r--dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx4
-rw-r--r--dbaccess/source/filter/xml/xmlfilter.cxx2
-rw-r--r--dbaccess/source/sdbtools/inc/sdbt_resource.hrc2
-rw-r--r--dbaccess/source/ui/app/AppController.cxx12
-rw-r--r--dbaccess/source/ui/app/AppControllerDnD.cxx2
-rw-r--r--dbaccess/source/ui/app/AppControllerGen.cxx2
-rw-r--r--dbaccess/source/ui/app/AppView.cxx4
-rw-r--r--dbaccess/source/ui/browser/genericcontroller.cxx4
-rw-r--r--dbaccess/source/ui/browser/sbagrid.cxx12
-rw-r--r--dbaccess/source/ui/browser/unodatbr.cxx6
-rw-r--r--dbaccess/source/ui/control/ColumnControlWindow.cxx2
-rw-r--r--dbaccess/source/ui/control/FieldDescControl.cxx12
-rw-r--r--dbaccess/source/ui/control/charsetlistbox.cxx4
-rw-r--r--dbaccess/source/ui/control/opendoccontrols.cxx4
-rw-r--r--dbaccess/source/ui/control/sqledit.cxx16
-rw-r--r--dbaccess/source/ui/control/toolboxcontroller.cxx2
-rw-r--r--dbaccess/source/ui/dlg/CollectionView.cxx2
-rw-r--r--dbaccess/source/ui/dlg/ConnectionHelper.cxx14
-rw-r--r--dbaccess/source/ui/dlg/ConnectionPage.cxx14
-rw-r--r--dbaccess/source/ui/dlg/ConnectionPageSetup.cxx12
-rw-r--r--dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx14
-rw-r--r--dbaccess/source/ui/dlg/DbAdminImpl.cxx10
-rw-r--r--dbaccess/source/ui/dlg/DbAdminImpl.hxx4
-rw-r--r--dbaccess/source/ui/dlg/DriverSettings.hxx2
-rw-r--r--dbaccess/source/ui/dlg/ExtensionNotPresent.cxx2
-rw-r--r--dbaccess/source/ui/dlg/TextConnectionHelper.cxx14
-rw-r--r--dbaccess/source/ui/dlg/UserAdminDlg.cxx6
-rw-r--r--[-rwxr-xr-x]dbaccess/source/ui/dlg/admincontrols.cxx6
-rw-r--r--dbaccess/source/ui/dlg/adminpages.cxx6
-rw-r--r--dbaccess/source/ui/dlg/advancedsettings.cxx6
-rw-r--r--dbaccess/source/ui/dlg/dbadmin.cxx6
-rw-r--r--dbaccess/source/ui/dlg/dbfindex.cxx4
-rw-r--r--dbaccess/source/ui/dlg/dbwiz.cxx6
-rw-r--r--dbaccess/source/ui/dlg/dbwizsetup.cxx10
-rw-r--r--dbaccess/source/ui/dlg/detailpages.cxx10
-rw-r--r--dbaccess/source/ui/dlg/dlgattr.cxx6
-rw-r--r--dbaccess/source/ui/dlg/dsnItem.hxx2
-rw-r--r--dbaccess/source/ui/dlg/dsselect.cxx8
-rw-r--r--dbaccess/source/ui/dlg/generalpage.cxx2
-rw-r--r--dbaccess/source/ui/dlg/paramdialog.cxx2
-rw-r--r--dbaccess/source/ui/dlg/tablespage.cxx4
-rw-r--r--dbaccess/source/ui/inc/GeneralUndo.hxx2
-rw-r--r--dbaccess/source/ui/inc/brwctrlr.hxx2
-rw-r--r--dbaccess/source/ui/inc/dbu_resource.hrc2
-rw-r--r--dbaccess/source/ui/inc/indexdialog.hxx2
-rw-r--r--dbaccess/source/ui/inc/propertysetitem.hxx2
-rw-r--r--dbaccess/source/ui/inc/querycontroller.hxx2
-rw-r--r--dbaccess/source/ui/inc/sqledit.hxx10
-rw-r--r--dbaccess/source/ui/inc/stringlistitem.hxx2
-rw-r--r--dbaccess/source/ui/misc/DExport.cxx6
-rw-r--r--dbaccess/source/ui/misc/HtmlReader.cxx2
-rw-r--r--dbaccess/source/ui/misc/TokenWriter.cxx4
-rw-r--r--dbaccess/source/ui/misc/ToolBoxHelper.cxx4
-rw-r--r--dbaccess/source/ui/misc/UITools.cxx16
-rw-r--r--dbaccess/source/ui/misc/datasourceconnector.cxx2
-rw-r--r--dbaccess/source/ui/misc/linkeddocuments.cxx2
-rw-r--r--dbaccess/source/ui/misc/moduledbu.cxx2
-rw-r--r--dbaccess/source/ui/misc/propertystorage.cxx6
-rw-r--r--dbaccess/source/ui/querydesign/JoinDesignView.cxx2
-rw-r--r--dbaccess/source/ui/querydesign/JoinTableView.cxx2
-rw-r--r--dbaccess/source/ui/querydesign/QueryDesignView.cxx4
-rw-r--r--dbaccess/source/ui/relationdesign/RelationDesignView.cxx2
-rw-r--r--dbaccess/source/ui/relationdesign/RelationTableView.cxx2
-rw-r--r--dbaccess/source/ui/tabledesign/TableDesignView.cxx2
-rw-r--r--desktop/inc/app.hxx1
-rw-r--r--desktop/prj/build.lst2
-rw-r--r--desktop/qa/deployment_misc/makefile.mk6
-rw-r--r--desktop/qa/deployment_misc/test_dp_version.cxx2
-rw-r--r--desktop/source/app/app.cxx66
-rw-r--r--desktop/source/app/appinit.cxx6
-rw-r--r--desktop/source/app/cmdlineargs.cxx2
-rw-r--r--desktop/source/app/copyright_ascii_ooo.c4
-rw-r--r--desktop/source/app/copyright_ascii_sun.c4
-rw-r--r--desktop/source/app/desktop.hrc2
-rw-r--r--desktop/source/app/langselect.cxx14
-rw-r--r--desktop/source/app/langselect.hxx6
-rw-r--r--desktop/source/app/makefile.mk9
-rw-r--r--desktop/source/app/officeipcthread.cxx2
-rw-r--r--desktop/source/app/userinstall.cxx4
-rw-r--r--desktop/source/deployment/dp_persmap.cxx2
-rw-r--r--desktop/source/deployment/gui/dp_gui_autoscrolledit.cxx2
-rw-r--r--desktop/source/deployment/gui/dp_gui_autoscrolledit.hxx2
-rw-r--r--desktop/source/deployment/gui/dp_gui_dialog2.cxx2
-rw-r--r--desktop/source/deployment/gui/license_dialog.cxx2
-rw-r--r--desktop/source/deployment/makefile.mk1
-rw-r--r--desktop/source/deployment/manager/dp_manager.cxx2
-rw-r--r--desktop/source/deployment/registry/component/dp_component.cxx2
-rw-r--r--desktop/source/deployment/registry/configuration/dp_configuration.cxx2
-rw-r--r--desktop/source/deployment/registry/executable/dp_executable.cxx2
-rw-r--r--desktop/source/deployment/registry/help/dp_help.cxx9
-rw-r--r--desktop/source/deployment/registry/package/dp_package.cxx2
-rw-r--r--desktop/source/deployment/registry/script/dp_script.cxx2
-rw-r--r--desktop/source/deployment/registry/sfwk/dp_sfwk.cxx2
-rw-r--r--desktop/source/inc/helpid.hrc2
-rw-r--r--desktop/source/migration/makefile.mk1
-rw-r--r--desktop/source/migration/pages.cxx10
-rw-r--r--desktop/source/migration/pages.hxx2
-rw-r--r--desktop/source/registration/com/sun/star/servicetag/BrowserSupport.java5
-rw-r--r--desktop/source/registration/com/sun/star/servicetag/Installer.java7
-rw-r--r--desktop/source/registration/com/sun/star/servicetag/LinuxSystemEnvironment.java142
-rw-r--r--desktop/source/registration/com/sun/star/servicetag/RegistrationData.java1004
-rw-r--r--desktop/source/registration/com/sun/star/servicetag/RegistrationDocument.java814
-rw-r--r--desktop/source/registration/com/sun/star/servicetag/Registry.java5
-rw-r--r--desktop/source/registration/com/sun/star/servicetag/ServiceTag.java5
-rw-r--r--desktop/source/registration/com/sun/star/servicetag/SolarisServiceTag.java5
-rw-r--r--desktop/source/registration/com/sun/star/servicetag/SolarisSystemEnvironment.java279
-rw-r--r--desktop/source/registration/com/sun/star/servicetag/SunConnection.java5
-rw-r--r--desktop/source/registration/com/sun/star/servicetag/SysnetRegistryHelper.java5
-rw-r--r--desktop/source/registration/com/sun/star/servicetag/SystemEnvironment.java91
-rw-r--r--desktop/source/registration/com/sun/star/servicetag/UnauthorizedAccessException.java5
-rw-r--r--desktop/source/registration/com/sun/star/servicetag/Util.java7
-rw-r--r--desktop/source/registration/com/sun/star/servicetag/WindowsSystemEnvironment.java98
-rw-r--r--desktop/source/registration/com/sun/star/servicetag/resources/product_registration.xsd667
-rw-r--r--drawinglayer/source/processor2d/canvasprocessor.cxx2
-rw-r--r--drawinglayer/source/processor2d/vclprocessor2d.cxx2
-rw-r--r--expat/expat-2.0.1.patch97
-rw-r--r--expat/expat-winapi.patch13
-rw-r--r--expat/expat.patch183
-rw-r--r--expat/makefile.mk15
-rw-r--r--expat/prj/d.lst3
-rw-r--r--extensions/inc/extensio.hrc2
-rw-r--r--extensions/inc/pch/precompiled_extensions.hxx6
-rw-r--r--extensions/prj/build.lst3
-rw-r--r--extensions/source/abpilot/abpfinalpage.cxx4
-rw-r--r--extensions/source/abpilot/makefile.mk2
-rw-r--r--extensions/source/activex/main/so_activex.cpp5
-rw-r--r--extensions/source/bibliography/bibconfig.cxx6
-rw-r--r--extensions/source/bibliography/bibconfig.hxx1
-rw-r--r--extensions/source/bibliography/bibload.cxx4
-rw-r--r--extensions/source/bibliography/bibmod.cxx2
-rw-r--r--extensions/source/bibliography/datman.cxx2
-rw-r--r--extensions/source/bibliography/framectr.hxx2
-rw-r--r--extensions/source/bibliography/menu.src2
-rw-r--r--extensions/source/bibliography/toolbar.cxx4
-rw-r--r--extensions/source/bibliography/toolbar.hxx2
-rw-r--r--extensions/source/dbpilots/commonpagesdbp.cxx4
-rw-r--r--extensions/source/dbpilots/makefile.mk3
-rw-r--r--extensions/source/inc/componentmodule.cxx2
-rw-r--r--extensions/source/nsplugin/source/so_env.cxx3
-rw-r--r--extensions/source/oooimprovecore/core.cxx4
-rw-r--r--extensions/source/plugin/base/manager.cxx2
-rw-r--r--extensions/source/plugin/base/nfuncs.cxx5
-rw-r--r--extensions/source/plugin/unx/unxmgr.cxx20
-rw-r--r--extensions/source/plugin/util/makefile.mk3
-rw-r--r--extensions/source/preload/makefile.mk3
-rw-r--r--extensions/source/preload/oemwiz.cxx6
-rw-r--r--extensions/source/preload/oemwiz.hxx2
-rw-r--r--extensions/source/propctrlr/eventhandler.cxx4
-rw-r--r--extensions/source/propctrlr/formcomponenthandler.cxx14
-rw-r--r--extensions/source/propctrlr/propertyhandler.cxx2
-rw-r--r--extensions/source/propctrlr/propresid.hrc2
-rw-r--r--extensions/source/propctrlr/standardcontrol.cxx2
-rw-r--r--extensions/source/propctrlr/usercontrol.cxx4
-rw-r--r--extensions/source/propctrlr/xsdvalidationhelper.cxx2
-rw-r--r--extensions/test/sax/testsax.cxx13
-rw-r--r--extensions/test/sax/testwriter.cxx7
-rw-r--r--extensions/test/stm/datatest.cxx28
-rw-r--r--extensions/test/stm/marktest.cxx12
-rw-r--r--extensions/test/stm/pipetest.cxx6
-rw-r--r--extensions/util/hidother.src1
-rw-r--r--extensions/workben/pythonautotest.cxx76
-rw-r--r--extensions/workben/pythontest.cxx6
-rw-r--r--extensions/workben/testcomponent.cxx11
-rw-r--r--filter/inc/filter.hrc2
-rw-r--r--filter/inc/filter/msfilter/countryid.hxx (renamed from svx/inc/countryid.hxx)8
-rw-r--r--filter/inc/filter/msfilter/escherex.hxx (renamed from svx/inc/svx/escherex.hxx)24
-rw-r--r--filter/inc/filter/msfilter/mscodec.hxx (renamed from svx/inc/mscodec.hxx)22
-rw-r--r--filter/inc/filter/msfilter/msdffimp.hxx (renamed from svx/inc/svx/msdffimp.hxx)119
-rw-r--r--filter/inc/filter/msfilter/msfilterdllapi.h (renamed from svtools/inc/svtool.h)18
-rw-r--r--filter/inc/filter/msfilter/msfiltertracer.hxx (renamed from svx/inc/svx/msfiltertracer.hxx)4
-rw-r--r--filter/inc/filter/msfilter/msocximex.hxx (renamed from svx/inc/svx/msocximex.hxx)6
-rw-r--r--filter/inc/filter/msfilter/msoleexp.hxx (renamed from svx/inc/msoleexp.hxx)4
-rw-r--r--filter/inc/filter/msfilter/msvbahelper.hxx (renamed from svx/inc/svx/msvbahelper.hxx)10
-rw-r--r--filter/inc/filter/msfilter/svdfppt.hxx (renamed from svx/inc/svx/svdfppt.hxx)38
-rw-r--r--filter/inc/filter/msfilter/svxmsbas.hxx (renamed from svx/inc/svxmsbas.hxx)10
-rw-r--r--filter/prj/build.lst1
-rw-r--r--filter/prj/d.lst7
-rw-r--r--filter/source/config/fragments/makefile.mk4
-rwxr-xr-xfilter/source/config/tools/merge/pyAltFCFGMerge2
-rw-r--r--filter/source/flash/swfdialog.cxx2
-rw-r--r--filter/source/msfilter/countryid.cxx (renamed from svx/source/msfilter/countryid.cxx)6
-rw-r--r--filter/source/msfilter/escherex.cxx (renamed from svx/source/msfilter/escherex.cxx)16
-rw-r--r--filter/source/msfilter/eschesdo.cxx (renamed from svx/source/msfilter/eschesdo.cxx)7
-rw-r--r--filter/source/msfilter/eschesdo.hxx (renamed from svx/source/msfilter/eschesdo.hxx)2
-rw-r--r--filter/source/msfilter/makefile.mk (renamed from svx/source/msfilter/makefile.mk)52
-rw-r--r--filter/source/msfilter/makefile.pmk (renamed from svtools/win/res/makefile.mk)6
-rw-r--r--filter/source/msfilter/mscodec.cxx (renamed from svx/source/msfilter/mscodec.cxx)6
-rw-r--r--filter/source/msfilter/msdffimp.cxx (renamed from svx/source/msfilter/msdffimp.cxx)80
-rw-r--r--filter/source/msfilter/msfiltertracer.cxx (renamed from svx/source/msfilter/msfiltertracer.cxx)4
-rw-r--r--filter/source/msfilter/msocximex.cxx (renamed from svx/source/msfilter/msocximex.cxx)19
-rw-r--r--filter/source/msfilter/msoleexp.cxx (renamed from svx/source/msfilter/msoleexp.cxx)15
-rw-r--r--filter/source/msfilter/msvbahelper.cxx (renamed from svx/source/msfilter/msvbahelper.cxx)4
-rw-r--r--filter/source/msfilter/msvbasic.cxx (renamed from svx/source/msfilter/msvbasic.cxx)2
-rw-r--r--filter/source/msfilter/msvbasic.hxx (renamed from svx/source/msfilter/msvbasic.hxx)2
-rw-r--r--filter/source/msfilter/svdfppt.cxx (renamed from svx/source/svdraw/svdfppt.cxx)20
-rw-r--r--filter/source/msfilter/svxmsbas.cxx (renamed from svx/source/msfilter/svxmsbas.cxx)8
-rw-r--r--filter/source/msfilter/svxmsbas2.cxx (renamed from svx/source/msfilter/svxmsbas2.cxx)6
-rw-r--r--filter/source/msfilter/viscache.hxx (renamed from svx/source/msfilter/viscache.hxx)0
-rw-r--r--filter/source/pdf/pdfdialog.cxx2
-rw-r--r--filter/source/pdf/pdfexport.cxx4
-rw-r--r--filter/source/pdf/pdffilter.cxx2
-rw-r--r--filter/source/xsltdialog/xmlfileview.hxx2
-rw-r--r--filter/source/xsltdialog/xmlfilterdialogcomponent.cxx2
-rw-r--r--filter/source/xsltdialog/xmlfilterjar.cxx2
-rw-r--r--filter/source/xsltdialog/xmlfiltersettingsdialog.hxx4
-rw-r--r--filter/source/xsltdialog/xmlfiltertabpagexslt.cxx2
-rw-r--r--filter/source/xsltdialog/xmlfiltertestdialog.hxx2
-rw-r--r--forms/inc/pch/precompiled_forms.hxx18
-rw-r--r--forms/prj/build.lst2
-rwxr-xr-xforms/qa/complex/forms/makefile.mk2
-rw-r--r--forms/source/component/Currency.cxx2
-rw-r--r--forms/source/component/DatabaseForm.cxx4
-rw-r--r--forms/source/component/FormattedField.cxx4
-rw-r--r--forms/source/component/ImageControl.cxx2
-rw-r--r--forms/source/inc/frm_resource.hrc2
-rw-r--r--forms/source/resource/frm_resource.cxx2
-rw-r--r--forms/source/richtext/parametrizedattributedispatcher.cxx4
-rw-r--r--forms/source/richtext/richtextcontrol.cxx4
-rw-r--r--forms/source/richtext/richtextengine.cxx6
-rw-r--r--forms/source/richtext/richtextimplcontrol.cxx4
-rw-r--r--forms/source/richtext/richtextvclcontrol.cxx6
-rw-r--r--forms/source/richtext/rtattributehandler.cxx4
-rw-r--r--forms/source/richtext/rtattributes.hxx2
-rw-r--r--formula/inc/formula/opcode.hxx2
-rw-r--r--formula/inc/formula/token.hxx2
-rw-r--r--formula/inc/helpids.hrc2
-rw-r--r--formula/source/core/api/FormulaCompiler.cxx2
-rw-r--r--formula/source/core/inc/core_resource.hrc2
-rw-r--r--formula/source/core/resource/core_resource.cxx2
-rw-r--r--formula/source/ui/dlg/FormulaHelper.cxx2
-rw-r--r--formula/source/ui/dlg/formula.cxx6
-rw-r--r--formula/source/ui/dlg/funcpage.cxx4
-rw-r--r--formula/source/ui/dlg/parawin.cxx4
-rw-r--r--formula/source/ui/dlg/structpg.cxx4
-rw-r--r--formula/source/ui/inc/ForResId.hrc2
-rw-r--r--formula/source/ui/resource/ModuleHelper.cxx2
-rw-r--r--formula/util/makefile.mk2
-rw-r--r--fpicker/source/aqua/resourceprovider.cxx2
-rw-r--r--fpicker/source/generic/fpicker.cxx2
-rw-r--r--fpicker/source/office/OfficeFilePicker.cxx4
-rw-r--r--fpicker/source/office/OfficeFilePicker.src2
-rw-r--r--fpicker/source/office/OfficeFolderPicker.cxx4
-rw-r--r--fpicker/source/office/iodlg.cxx16
-rw-r--r--fpicker/source/office/iodlg.hrc2
-rw-r--r--fpicker/source/office/iodlg.hxx6
-rw-r--r--fpicker/source/office/iodlg.src2
-rw-r--r--fpicker/source/office/iodlgimp.cxx10
-rw-r--r--fpicker/source/office/iodlgimp.hxx2
-rw-r--r--fpicker/source/unx/gnome/resourceprovider.cxx2
-rw-r--r--fpicker/source/unx/kde4/KDE4FilePicker.cxx2
-rw-r--r--fpicker/source/win32/misc/resourceprovider.cxx2
-rw-r--r--framework/inc/classes/fwktabwindow.hxx1
-rw-r--r--framework/inc/classes/protocolhandlercache.hxx1
-rw-r--r--framework/inc/dispatch/basedispatcher.hxx2
-rw-r--r--framework/inc/framework.hrc2
-rw-r--r--framework/inc/helper/mischelper.hxx2
-rw-r--r--framework/inc/helper/persistentwindowstate.hxx2
-rw-r--r--framework/inc/helper/titlebarupdate.hxx2
-rw-r--r--framework/inc/helpid.hrc2
-rw-r--r--framework/inc/pch/precompiled_framework.hxx26
-rw-r--r--framework/inc/services/autorecovery.hxx7
-rw-r--r--framework/inc/services/desktop.hxx2
-rw-r--r--framework/inc/services/frame.hxx2
-rw-r--r--framework/inc/services/licensedlg.hxx2
-rw-r--r--framework/inc/services/pluginframe.hxx2
-rw-r--r--framework/inc/services/sessionlistener.hxx20
-rw-r--r--framework/inc/services/substitutepathvars.hxx1
-rw-r--r--framework/inc/services/tabwindowservice.hxx91
-rw-r--r--framework/inc/xml/eventsconfiguration.hxx2
-rw-r--r--framework/inc/xml/imagesconfiguration.hxx2
-rw-r--r--framework/inc/xml/statusbarconfiguration.hxx2
-rw-r--r--framework/inc/xml/toolboxconfiguration.hxx2
-rwxr-xr-xframework/qa/complex/api_internal/makefile.mk2
-rwxr-xr-xframework/qa/complex/broken_document/makefile.mk2
-rw-r--r--framework/qa/complex/contextMenuInterceptor/makefile.mk2
-rwxr-xr-xframework/qa/complex/disposing/makefile.mk2
-rwxr-xr-xframework/qa/complex/framework/recovery/makefile.mk2
-rwxr-xr-xframework/qa/complex/imageManager/interfaces/makefile.mk2
-rwxr-xr-xframework/qa/complex/imageManager/makefile.mk2
-rwxr-xr-xframework/qa/complex/path_settings/makefile.mk2
-rwxr-xr-xframework/qa/complex/path_substitution/makefile.mk2
-rwxr-xr-xframework/qa/complex/sequence/makefile.mk2
-rw-r--r--framework/source/classes/bmkmenu.cxx2
-rw-r--r--framework/source/classes/fwktabwindow.cxx6
-rw-r--r--framework/source/classes/menumanager.cxx4
-rw-r--r--framework/source/classes/protocolhandlercache.cxx4
-rw-r--r--framework/source/dispatch/closedispatcher.cxx2
-rw-r--r--framework/source/dispatch/startmoduledispatcher.cxx2
-rw-r--r--framework/source/helper/titlebarupdate.cxx6
-rw-r--r--framework/source/helper/titlehelper.cxx2
-rw-r--r--framework/source/layoutmanager/layoutmanager.cxx8
-rw-r--r--framework/source/loadenv/loadenv.cxx2
-rw-r--r--framework/source/services/autorecovery.cxx147
-rw-r--r--framework/source/services/backingcomp.cxx4
-rw-r--r--framework/source/services/backingwindow.cxx4
-rw-r--r--framework/source/services/backingwindow.hxx2
-rw-r--r--framework/source/services/frame.cxx2
-rw-r--r--framework/source/services/mediatypedetectionhelper.cxx2
-rw-r--r--framework/source/services/sessionlistener.cxx161
-rw-r--r--framework/source/services/substitutepathvars.cxx5
-rw-r--r--framework/source/services/tabwindowservice.cxx32
-rw-r--r--framework/source/uielement/controlmenucontroller.cxx2
-rw-r--r--framework/source/uielement/langselectionmenucontroller.cxx2
-rw-r--r--framework/source/uielement/langselectionstatusbarcontroller.cxx4
-rw-r--r--framework/source/uielement/menubarmanager.cxx6
-rw-r--r--framework/source/uielement/newmenucontroller.cxx2
-rw-r--r--framework/source/uielement/recentfilesmenucontroller.cxx2
-rw-r--r--framework/source/uielement/toolbarmanager.cxx10
-rw-r--r--framework/source/uielement/toolbarsmenucontroller.cxx2
-rw-r--r--goodies/inc/chtuner.hxx2
-rw-r--r--goodies/inc/goodies.hrc2
-rw-r--r--goodies/inc/pch/precompiled_goodies.hxx10
-rw-r--r--goodies/source/filter.vcl/egif/egif.cxx2
-rw-r--r--goodies/source/filter.vcl/eos2met/eos2met.cxx2
-rw-r--r--goodies/source/filter.vcl/epbm/epbm.cxx2
-rw-r--r--goodies/source/filter.vcl/epgm/epgm.cxx2
-rw-r--r--goodies/source/filter.vcl/epict/epict.cxx2
-rw-r--r--goodies/source/filter.vcl/eppm/eppm.cxx2
-rw-r--r--goodies/source/filter.vcl/eps/eps.cxx2
-rw-r--r--goodies/source/filter.vcl/etiff/etiff.cxx2
-rw-r--r--goodies/source/filter.vcl/ipcd/ipcd.cxx2
-rw-r--r--goodies/source/graphic/grfcache.cxx18
-rw-r--r--goodies/source/graphic/grfmgr.cxx2
-rw-r--r--goodies/source/inv/invader.cxx2
-rw-r--r--goodies/source/unographic/descriptor.cxx2
-rw-r--r--goodies/source/unographic/provider.cxx2
-rw-r--r--goodies/source/unographic/renderer.cxx2
-rw-r--r--goodies/source/unographic/transformer.cxx2
-rw-r--r--hunspell/hunspell-1.2.8.patch3
-rw-r--r--hunspell/prj/build.lst2
-rw-r--r--hyphen/hyphen-2.4.patch3
-rw-r--r--hyphen/prj/build.lst2
-rw-r--r--i18npool/source/characterclassification/cclass_unicode_parser.cxx2
-rw-r--r--i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx15
-rw-r--r--i18npool/source/isolang/inwnt.cxx4
-rw-r--r--i18npool/source/isolang/mslangid.cxx2
-rw-r--r--i18npool/source/localedata/localedata.cxx11
-rw-r--r--icc/README8
-rw-r--r--icc/SampleICC-1.3.2-bendian.patch5133
-rw-r--r--icc/SampleICC-1.3.2.patch96
-rw-r--r--icc/makefile.mk5
-rw-r--r--icc/prj/build.lst2
-rw-r--r--io/source/stm/omark.cxx10
-rw-r--r--io/test/stm/datatest.cxx28
-rw-r--r--io/test/stm/marktest.cxx14
-rw-r--r--libegg/prj/build.lst2
-rw-r--r--libegg/source/eggtrayicon.c48
-rw-r--r--libtextcat/libtextcat-2.2.patch3
-rw-r--r--libtextcat/prj/build.lst2
-rw-r--r--libwpd/prj/build.lst2
-rw-r--r--libxmlsec/prj/build.lst2
-rw-r--r--lingucomponent/prj/build.lst2
-rw-r--r--lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx10
-rw-r--r--lingucomponent/source/languageguessing/guesslang.cxx2
-rw-r--r--lingucomponent/source/lingutil/lingutil.cxx4
-rw-r--r--lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx4
-rw-r--r--lingucomponent/source/spellcheck/macosxspell/makefile.mk2
-rw-r--r--lingucomponent/source/spellcheck/spell/makefile.mk3
-rw-r--r--lingucomponent/source/spellcheck/spell/sspellimp.cxx6
-rw-r--r--lingucomponent/source/thesaurus/libnth/nthesimp.cxx4
-rw-r--r--linguistic/inc/lngprops.hxx2
-rw-r--r--linguistic/inc/misc.hxx3
-rw-r--r--linguistic/prj/build.lst2
-rw-r--r--linguistic/source/convdic.cxx97
-rw-r--r--linguistic/source/convdiclist.cxx8
-rw-r--r--linguistic/source/convdiclist.hxx2
-rw-r--r--linguistic/source/convdicxml.cxx3
-rw-r--r--linguistic/source/convdicxml.hxx2
-rw-r--r--linguistic/source/defs.hxx7
-rw-r--r--linguistic/source/dicimp.cxx103
-rw-r--r--linguistic/source/dicimp.hxx3
-rw-r--r--linguistic/source/dlistimp.cxx41
-rw-r--r--linguistic/source/gciterator.cxx6
-rw-r--r--linguistic/source/grammarchecker.cxx1
-rw-r--r--linguistic/source/hhconvdic.cxx1
-rw-r--r--linguistic/source/hyphdsp.cxx2
-rw-r--r--linguistic/source/hyphdta.cxx2
-rw-r--r--linguistic/source/lngopt.cxx3
-rw-r--r--linguistic/source/lngopt.hxx8
-rw-r--r--linguistic/source/lngsvcmgr.cxx19
-rw-r--r--linguistic/source/lngsvcmgr.hxx2
-rw-r--r--linguistic/source/makefile.mk8
-rw-r--r--linguistic/source/misc.cxx9
-rw-r--r--linguistic/source/misc2.cxx2
-rw-r--r--linguistic/source/spelldsp.cxx2
-rw-r--r--linguistic/source/thesdsp.cxx2
-rw-r--r--lpsolve/prj/build.lst2
-rw-r--r--neon/neon.patch3
-rw-r--r--neon/neon_exports_unix.patch3
-rw-r--r--nss/dtoa.patch110
-rw-r--r--nss/makefile.mk11
-rw-r--r--nss/nss.patch41
-rw-r--r--o3tl/qa/makefile.mk3
-rw-r--r--o3tl/qa/test-cow_wrapper.cxx2
-rw-r--r--o3tl/qa/test-heap_ptr.cxx2
-rw-r--r--o3tl/qa/test-range.cxx2
-rwxr-xr-xodk/examples/DevelopersGuide/ScriptingFramework/SayHello/build.xml1
-rwxr-xr-xodk/examples/DevelopersGuide/ScriptingFramework/ScriptSelector/build.xml1
-rw-r--r--odk/pack/copying/apiref-autodoc.since2
-rw-r--r--odk/prj/build.lst2
-rw-r--r--offapi/com/sun/star/frame/XSessionManagerListener2.idl (renamed from svtools/inc/iniadrtk.hxx)53
-rw-r--r--offapi/com/sun/star/frame/makefile.mk1
-rw-r--r--offapi/com/sun/star/util/Duration.idl104
-rw-r--r--offapi/com/sun/star/util/makefile.mk1
-rw-r--r--officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu2
-rw-r--r--officecfg/registry/schema/org/openoffice/Office/Recovery.xcs13
-rw-r--r--oox/source/export/drawingml.cxx4
-rw-r--r--oox/source/export/shapes.cxx4
-rw-r--r--oox/source/xls/formulabase.cxx9
-rw-r--r--openssl/makefile.mk6
-rw-r--r--package/source/xstor/makefile.mk1
-rw-r--r--package/source/xstor/owriteablestream.cxx22
-rw-r--r--package/source/xstor/selfterminatefilestream.cxx156
-rw-r--r--package/source/xstor/selfterminatefilestream.hxx79
-rw-r--r--package/source/zippackage/ZipPackage.cxx23
-rw-r--r--packimages/pack/makefile.mk13
-rw-r--r--postprocess/prj/build.lst2
-rw-r--r--redland/prj/build.lst2
-rw-r--r--redland/raptor/raptor-1.4.18.patch.dmake4
-rw-r--r--redland/rasqal/rasqal-0.9.16.patch.dmake3
-rw-r--r--redland/redland/redland-1.0.8.patch.dmake3
-rw-r--r--registry/source/keyimpl.cxx8
-rw-r--r--registry/source/regimpl.cxx22
-rw-r--r--registry/source/regimpl.hxx2
-rw-r--r--registry/source/registry.cxx2
-rw-r--r--reportbuilder/template/makefile.mk2
-rw-r--r--reportdesign/inc/RptResId.hrc2
-rw-r--r--reportdesign/inc/UndoActions.hxx2
-rw-r--r--reportdesign/inc/UndoEnv.hxx2
-rw-r--r--reportdesign/inc/helpids.hrc2
-rw-r--r--reportdesign/source/core/api/ReportComponent.cxx4
-rw-r--r--reportdesign/source/core/api/ReportDefinition.cxx23
-rw-r--r--reportdesign/source/core/api/ReportEngineJFree.cxx2
-rw-r--r--reportdesign/source/core/inc/core_resource.hrc2
-rw-r--r--reportdesign/source/core/resource/core_resource.cxx2
-rw-r--r--reportdesign/source/core/sdr/ModuleHelper.cxx2
-rw-r--r--reportdesign/source/core/sdr/RptModel.cxx2
-rw-r--r--reportdesign/source/core/sdr/UndoActions.cxx2
-rw-r--r--reportdesign/source/core/sdr/UndoEnv.cxx2
-rw-r--r--reportdesign/source/core/sdr/formatnormalizer.cxx2
-rw-r--r--reportdesign/source/filter/xml/dbloader2.hxx2
-rw-r--r--reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx2
-rw-r--r--reportdesign/source/filter/xml/xmlImage.cxx2
-rw-r--r--reportdesign/source/ui/dlg/Condition.cxx2
-rw-r--r--reportdesign/source/ui/dlg/DateTime.cxx2
-rw-r--r--reportdesign/source/ui/dlg/Formula.cxx2
-rw-r--r--reportdesign/source/ui/dlg/Navigator.cxx4
-rw-r--r--reportdesign/source/ui/dlg/Navigator.src2
-rw-r--r--reportdesign/source/ui/dlg/dlgpage.cxx6
-rw-r--r--reportdesign/source/ui/inc/DataProvider.hxx4
-rw-r--r--reportdesign/source/ui/inc/DesignView.hxx4
-rw-r--r--reportdesign/source/ui/inc/ReportController.hxx2
-rw-r--r--reportdesign/source/ui/inc/ReportControllerObserver.hxx2
-rw-r--r--reportdesign/source/ui/inc/ViewsWindow.hxx9
-rw-r--r--reportdesign/source/ui/inc/propbrw.hxx4
-rw-r--r--reportdesign/source/ui/inspection/DataProviderHandler.cxx2
-rw-r--r--reportdesign/source/ui/inspection/GeometryHandler.cxx6
-rw-r--r--reportdesign/source/ui/inspection/ReportComponentHandler.cxx2
-rw-r--r--reportdesign/source/ui/misc/ColorListener.cxx2
-rw-r--r--reportdesign/source/ui/misc/UITools.cxx8
-rw-r--r--reportdesign/source/ui/misc/toolboxcontroller.cxx2
-rw-r--r--reportdesign/source/ui/report/DesignView.cxx4
-rw-r--r--reportdesign/source/ui/report/ReportController.cxx12
-rw-r--r--reportdesign/source/ui/report/ReportControllerObserver.cxx2
-rw-r--r--reportdesign/source/ui/report/ReportSection.cxx2
-rw-r--r--reportdesign/source/ui/report/ReportWindow.cxx4
-rw-r--r--reportdesign/source/ui/report/StartMarker.cxx4
-rw-r--r--reportdesign/source/ui/report/ViewsWindow.cxx11
-rw-r--r--rsc/inc/rsctools.hxx44
-rw-r--r--sal/osl/unx/file.cxx4
-rw-r--r--sal/osl/unx/file_misc.cxx98
-rw-r--r--sal/osl/unx/makefile.mk8
-rw-r--r--sal/osl/w32/dllentry.c4
-rw-r--r--sal/osl/w32/file.cxx2
-rw-r--r--sal/qa/ByteSequence/ByteSequence.cxx2
-rw-r--r--sal/qa/ByteSequence/makefile.mk17
-rw-r--r--sal/qa/ByteSequence/rtl_old_testbyteseq.cxx2
-rw-r--r--sal/qa/OStringBuffer/makefile.mk13
-rw-r--r--sal/qa/OStringBuffer/rtl_OStringBuffer.cxx2
-rw-r--r--sal/qa/osl/condition/makefile.mk13
-rw-r--r--sal/qa/osl/condition/osl_Condition_Const.h2
-rw-r--r--sal/qa/osl/file/makefile.mk24
-rw-r--r--sal/qa/osl/file/osl_File.cxx2
-rw-r--r--sal/qa/osl/file/osl_old_test_file.cxx2
-rwxr-xr-xsal/qa/osl/file/test_cpy_wrt_file.cxx2
-rw-r--r--sal/qa/osl/module/makefile.mk13
-rw-r--r--sal/qa/osl/module/osl_Module_Const.h2
-rw-r--r--sal/qa/osl/module/osl_Module_DLL.cxx2
-rwxr-xr-xsal/qa/osl/mutex/makefile.mk12
-rwxr-xr-xsal/qa/osl/mutex/osl_Mutex_Const.h2
-rw-r--r--sal/qa/osl/pipe/makefile.mk15
-rw-r--r--sal/qa/osl/pipe/osl_Pipe.cxx2
-rw-r--r--sal/qa/osl/process/makefile.mk27
-rw-r--r--sal/qa/osl/process/osl_Thread.cxx2
-rw-r--r--sal/qa/osl/process/osl_process.cxx2
-rw-r--r--sal/qa/osl/profile/makefile.mk8
-rw-r--r--sal/qa/osl/profile/osl_old_testprofile.cxx2
-rwxr-xr-xsal/qa/osl/security/makefile.mk14
-rwxr-xr-xsal/qa/osl/security/osl_Security_Const.h2
-rw-r--r--sal/qa/osl/semaphore/makefile.mk13
-rw-r--r--sal/qa/osl/semaphore/osl_Semaphore_Const.h2
-rwxr-xr-xsal/qa/osl/socket/makefile.mk50
-rw-r--r--sal/qa/osl/socket/osl_AcceptorSocket.cxx2
-rw-r--r--sal/qa/osl/socket/osl_ConnectorSocket.cxx2
-rw-r--r--sal/qa/osl/socket/osl_DatagramSocket.cxx2
-rwxr-xr-xsal/qa/osl/socket/osl_Socket.cxx2
-rw-r--r--sal/qa/osl/socket/osl_Socket2.cxx2
-rw-r--r--sal/qa/osl/socket/osl_SocketAddr.cxx2
-rw-r--r--sal/qa/osl/socket/osl_Socket_tests.cxx2
-rw-r--r--sal/qa/osl/socket/osl_StreamSocket.cxx2
-rw-r--r--sal/qa/osl/socket/sockethelper.cxx2
-rw-r--r--sal/qa/osl/thread/makefile.mk4
-rw-r--r--sal/qa/osl/thread/test_thread.cxx2
-rwxr-xr-xsal/qa/rtl/alloc/makefile.mk14
-rwxr-xr-xsal/qa/rtl/alloc/rtl_alloc.cxx2
-rw-r--r--sal/qa/rtl/bootstrap/makefile.mk10
-rw-r--r--sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx4
-rw-r--r--sal/qa/rtl/cipher/makefile.mk8
-rw-r--r--sal/qa/rtl/cipher/rtl_cipher.cxx2
-rwxr-xr-xsal/qa/rtl/crc32/makefile.mk13
-rwxr-xr-xsal/qa/rtl/crc32/rtl_crc32.cxx2
-rw-r--r--sal/qa/rtl/digest/makefile.mk8
-rw-r--r--sal/qa/rtl/digest/rtl_digest.cxx2
-rw-r--r--sal/qa/rtl/doublelock/makefile.mk8
-rw-r--r--sal/qa/rtl/doublelock/rtl_doublelocking.cxx2
-rw-r--r--sal/qa/rtl/locale/makefile.mk8
-rw-r--r--sal/qa/rtl/locale/rtl_locale.cxx2
-rw-r--r--sal/qa/rtl/logfile/makefile.mk6
-rw-r--r--sal/qa/rtl/logfile/rtl_logfile.cxx2
-rw-r--r--sal/qa/rtl/math/makefile.mk25
-rw-r--r--sal/qa/rtl/math/rtl_math.cxx2
-rw-r--r--sal/qa/rtl/math/rtl_old_testint64.cxx2
-rw-r--r--sal/qa/rtl/ostring/makefile.mk16
-rw-r--r--sal/qa/rtl/ostring/rtl_OString2.cxx2
-rw-r--r--sal/qa/rtl/ostring/rtl_str.cxx2
-rw-r--r--sal/qa/rtl/ostring/rtl_string.cxx2
-rw-r--r--sal/qa/rtl/oustring/makefile.mk12
-rw-r--r--sal/qa/rtl/oustring/rtl_OUString2.cxx2
-rw-r--r--sal/qa/rtl/oustring/rtl_ustr.cxx2
-rw-r--r--sal/qa/rtl/oustringbuffer/makefile.mk8
-rw-r--r--sal/qa/rtl/oustringbuffer/rtl_OUStringBuffer2.cxx2
-rw-r--r--sal/qa/rtl/process/makefile.mk12
-rw-r--r--sal/qa/rtl/process/rtl_Process.cxx2
-rw-r--r--sal/qa/rtl/random/makefile.mk8
-rw-r--r--sal/qa/rtl/random/rtl_random.cxx2
-rw-r--r--sal/qa/rtl/strings/makefile.mk4
-rw-r--r--sal/qa/rtl/strings/test_oustring_compare.cxx2
-rw-r--r--sal/qa/rtl/strings/test_oustring_convert.cxx2
-rw-r--r--sal/qa/rtl/strings/test_oustring_endswith.cxx2
-rw-r--r--sal/qa/rtl/strings/test_oustring_noadditional.cxx2
-rw-r--r--sal/qa/rtl/strings/test_oustringbuffer_utf32.cxx2
-rw-r--r--sal/qa/rtl/textenc/makefile.mk10
-rw-r--r--sal/qa/rtl/textenc/rtl_tencinfo.cxx2
-rw-r--r--sal/qa/rtl/textenc/rtl_textcvt.cxx2
-rw-r--r--sal/qa/rtl/uri/makefile.mk10
-rw-r--r--sal/qa/rtl/uri/rtl_Uri.cxx2
-rw-r--r--sal/qa/rtl/uri/rtl_testuri.cxx2
-rw-r--r--sal/qa/rtl/uuid/makefile.mk8
-rw-r--r--sal/qa/rtl/uuid/rtl_Uuid.cxx2
-rw-r--r--sal/qa/rtl_strings/makefile.mk45
-rw-r--r--sal/qa/rtl_strings/rtl_old_testostring.cxx2
-rw-r--r--sal/qa/rtl_strings/rtl_old_testowstring.cxx2
-rw-r--r--sal/qa/rtl_strings/rtl_old_teststrbuf.cxx2
-rw-r--r--sal/qa/sal/makefile.mk4
-rw-r--r--sal/qa/sal/test_types.cxx2
-rw-r--r--sal/qa/systools/makefile.mk9
-rw-r--r--sal/qa/systools/test_comtools.cxx2
-rw-r--r--sal/qa/testHelperFunctions/makefile.mk6
-rw-r--r--sal/qa/testHelperFunctions/testHelperFunctions.cxx2
-rw-r--r--sal/qa/testHelperFunctions/testHelperFunctions2.cxx2
-rw-r--r--salhelper/qa/makefile.mk6
-rw-r--r--salhelper/qa/test_api.cxx2
-rw-r--r--sandbox/com/sun/star/lib/sandbox/AudioProxy.java74
-rw-r--r--sandbox/com/sun/star/lib/sandbox/Cachable.java37
-rw-r--r--sandbox/com/sun/star/lib/sandbox/ClassContext.java58
-rw-r--r--sandbox/com/sun/star/lib/sandbox/ClassContextImpl.java356
-rw-r--r--sandbox/com/sun/star/lib/sandbox/ClassContextProxy.java152
-rw-r--r--sandbox/com/sun/star/lib/sandbox/ExecutionContext.java473
-rw-r--r--sandbox/com/sun/star/lib/sandbox/ImageProducerProxy.java77
-rw-r--r--sandbox/com/sun/star/lib/sandbox/JarEntry.java95
-rw-r--r--sandbox/com/sun/star/lib/sandbox/JarInputStream.java107
-rw-r--r--sandbox/com/sun/star/lib/sandbox/PermissionCollection.java86
-rw-r--r--sandbox/com/sun/star/lib/sandbox/ProtectionDomain.java87
-rw-r--r--sandbox/com/sun/star/lib/sandbox/Resource.java52
-rw-r--r--sandbox/com/sun/star/lib/sandbox/ResourceImpl.java317
-rw-r--r--sandbox/com/sun/star/lib/sandbox/ResourceProxy.java217
-rw-r--r--sandbox/com/sun/star/lib/sandbox/ResourceViewer.java101
-rw-r--r--sandbox/com/sun/star/lib/sandbox/SandboxMessageHandler.java119
-rw-r--r--sandbox/com/sun/star/lib/sandbox/SandboxSecurity.java1160
-rw-r--r--sandbox/com/sun/star/lib/sandbox/SandboxSecurityException.java71
-rw-r--r--sandbox/com/sun/star/lib/sandbox/SandboxThreadGroup.java63
-rw-r--r--sandbox/com/sun/star/lib/sandbox/WeakRef.java80
-rw-r--r--sandbox/com/sun/star/lib/sandbox/WeakTable.java147
-rw-r--r--sandbox/com/sun/star/lib/sandbox/XImage.java70
-rw-r--r--sandbox/com/sun/star/lib/sandbox/makefile.mk89
-rw-r--r--sandbox/prj/build.lst5
-rw-r--r--sandbox/prj/d.lst1
-rw-r--r--sandbox/test/com/sun/star/lib/sandbox/ResourceTest.java69
-rw-r--r--sandbox/util/delzip0
-rw-r--r--sandbox/util/makefile.mk48
-rw-r--r--sax/inc/sax/tools/converter.hxx52
-rw-r--r--sax/source/expatwrap/attrlistimpl.cxx7
-rw-r--r--sax/source/expatwrap/sax_expat.cxx4
-rw-r--r--sax/source/fastparser/fastparser.hxx4
-rw-r--r--sax/source/tools/converter.cxx500
-rw-r--r--sax/test/sax/testsax.cxx13
-rw-r--r--sc/inc/addruno.hxx2
-rw-r--r--sc/inc/afmtuno.hxx4
-rw-r--r--sc/inc/appluno.hxx2
-rw-r--r--sc/inc/attrib.hxx6
-rw-r--r--sc/inc/autoform.hxx2
-rw-r--r--sc/inc/brdcst.hxx4
-rw-r--r--sc/inc/cell.hxx4
-rw-r--r--sc/inc/cellsuno.hxx6
-rw-r--r--sc/inc/chart2uno.hxx4
-rw-r--r--sc/inc/chartlis.hxx2
-rw-r--r--sc/inc/chartuno.hxx2
-rw-r--r--sc/inc/chgtrack.hxx8
-rw-r--r--sc/inc/conditio.hxx2
-rw-r--r--sc/inc/confuno.hxx4
-rw-r--r--sc/inc/dapiuno.hxx4
-rw-r--r--sc/inc/datauno.hxx4
-rw-r--r--sc/inc/defltuno.hxx4
-rw-r--r--sc/inc/detdata.hxx2
-rw-r--r--sc/inc/dispuno.hxx4
-rw-r--r--sc/inc/docoptio.hxx4
-rw-r--r--sc/inc/docpool.hxx2
-rw-r--r--sc/inc/document.hxx2
-rw-r--r--sc/inc/docuno.hxx4
-rw-r--r--sc/inc/dptabres.hxx2
-rw-r--r--sc/inc/drawattr.hxx2
-rw-r--r--sc/inc/drdefuno.hxx2
-rw-r--r--sc/inc/editsrc.hxx2
-rw-r--r--sc/inc/externalrefmgr.hxx2
-rw-r--r--sc/inc/fielduno.hxx4
-rw-r--r--sc/inc/fmtuno.hxx2
-rw-r--r--sc/inc/forbiuno.hxx2
-rw-r--r--sc/inc/funcuno.hxx2
-rw-r--r--sc/inc/hints.hxx2
-rw-r--r--sc/inc/linkuno.hxx4
-rw-r--r--sc/inc/lookupcache.hxx2
-rw-r--r--sc/inc/nameuno.hxx2
-rw-r--r--sc/inc/notesuno.hxx2
-rw-r--r--sc/inc/patattr.hxx6
-rw-r--r--sc/inc/pch/precompiled_sc.hxx20
-rw-r--r--sc/inc/printopt.hxx3
-rw-r--r--sc/inc/scmod.hxx7
-rw-r--r--sc/inc/srchuno.hxx2
-rw-r--r--sc/inc/stlpool.hxx2
-rw-r--r--sc/inc/stlsheet.hxx2
-rw-r--r--sc/inc/styleuno.hxx4
-rw-r--r--sc/inc/targuno.hxx2
-rw-r--r--sc/inc/textuno.hxx4
-rw-r--r--sc/inc/tokenuno.hxx2
-rw-r--r--sc/inc/unoreflist.hxx2
-rw-r--r--sc/inc/viewuno.hxx4
-rwxr-xr-x[-rw-r--r--]sc/prj/build.lst2
-rwxr-xr-xsc/qa/complex/calcPreview/makefile.mk2
-rwxr-xr-xsc/qa/complex/cellRanges/makefile.mk2
-rw-r--r--sc/sdi/docsh.sdi4
-rw-r--r--sc/sdi/makefile.mk12
-rw-r--r--sc/sdi/prevwsh.sdi4
-rw-r--r--sc/sdi/scslots.sdi7
-rw-r--r--sc/sdi/tabvwsh.sdi4
-rw-r--r--sc/source/core/data/attarray.cxx4
-rw-r--r--sc/source/core/data/bcaslot.cxx4
-rw-r--r--sc/source/core/data/cell.cxx6
-rw-r--r--sc/source/core/data/cell2.cxx4
-rw-r--r--sc/source/core/data/column.cxx4
-rw-r--r--sc/source/core/data/column2.cxx6
-rw-r--r--sc/source/core/data/column3.cxx4
-rw-r--r--sc/source/core/data/conditio.cxx4
-rw-r--r--sc/source/core/data/dbdocutl.cxx2
-rw-r--r--sc/source/core/data/dociter.cxx2
-rw-r--r--sc/source/core/data/docpool.cxx4
-rw-r--r--sc/source/core/data/documen2.cxx6
-rw-r--r--sc/source/core/data/documen3.cxx4
-rw-r--r--sc/source/core/data/documen4.cxx4
-rw-r--r--sc/source/core/data/documen8.cxx60
-rw-r--r--sc/source/core/data/documen9.cxx4
-rw-r--r--sc/source/core/data/document.cxx6
-rw-r--r--sc/source/core/data/dpdimsave.cxx2
-rw-r--r--sc/source/core/data/dpgroup.cxx2
-rw-r--r--sc/source/core/data/dpobject.cxx2
-rw-r--r--sc/source/core/data/dpsdbtab.cxx2
-rw-r--r--sc/source/core/data/dpshttab.cxx2
-rw-r--r--sc/source/core/data/dptabsrc.cxx4
-rw-r--r--sc/source/core/data/drwlayer.cxx4
-rw-r--r--sc/source/core/data/global.cxx8
-rw-r--r--sc/source/core/data/global2.cxx6
-rw-r--r--sc/source/core/data/globalx.cxx2
-rw-r--r--sc/source/core/data/patattr.cxx4
-rw-r--r--sc/source/core/data/poolhelp.cxx2
-rw-r--r--sc/source/core/data/postit.cxx2
-rw-r--r--sc/source/core/data/stlpool.cxx6
-rw-r--r--sc/source/core/data/stlsheet.cxx6
-rw-r--r--sc/source/core/data/table2.cxx4
-rw-r--r--sc/source/core/data/table3.cxx2
-rw-r--r--sc/source/core/data/table4.cxx2
-rw-r--r--sc/source/core/data/tabprotection.cxx2
-rw-r--r--sc/source/core/data/validat.cxx2
-rw-r--r--sc/source/core/inc/adiasync.hxx4
-rw-r--r--sc/source/core/inc/bcaslot.hxx4
-rw-r--r--sc/source/core/inc/core_pch.hxx44
-rw-r--r--sc/source/core/inc/ddelink.hxx2
-rw-r--r--sc/source/core/tool/address.cxx6
-rw-r--r--sc/source/core/tool/autoform.cxx4
-rw-r--r--sc/source/core/tool/cellform.cxx4
-rw-r--r--sc/source/core/tool/chartarr.cxx4
-rw-r--r--sc/source/core/tool/chgtrack.cxx21
-rw-r--r--sc/source/core/tool/compiler.cxx2
-rw-r--r--sc/source/core/tool/ddelink.cxx2
-rw-r--r--sc/source/core/tool/detfunc.cxx2
-rw-r--r--sc/source/core/tool/docoptio.cxx2
-rw-r--r--sc/source/core/tool/editutil.cxx6
-rw-r--r--sc/source/core/tool/interpr1.cxx6
-rw-r--r--sc/source/core/tool/interpr2.cxx4
-rw-r--r--sc/source/core/tool/interpr4.cxx2
-rw-r--r--sc/source/core/tool/interpr5.cxx2
-rw-r--r--sc/source/core/tool/optutil.cxx2
-rw-r--r--sc/source/core/tool/printopt.cxx1
-rw-r--r--sc/source/core/tool/progress.cxx4
-rw-r--r--sc/source/core/tool/rangeseq.cxx2
-rw-r--r--sc/source/core/tool/reftokenhelper.cxx7
-rw-r--r--sc/source/core/tool/scmatrix.cxx2
-rw-r--r--sc/source/core/tool/token.cxx2
-rw-r--r--sc/source/core/tool/zforauto.cxx4
-rw-r--r--sc/source/filter/dif/difimp.cxx2
-rw-r--r--sc/source/filter/excel/excdoc.cxx4
-rw-r--r--sc/source/filter/excel/excel.cxx2
-rw-r--r--sc/source/filter/excel/excimp8.cxx4
-rw-r--r--sc/source/filter/excel/excrecds.cxx12
-rw-r--r--sc/source/filter/excel/expop2.cxx4
-rw-r--r--sc/source/filter/excel/impop.cxx8
-rw-r--r--sc/source/filter/excel/xechart.cxx2
-rw-r--r--sc/source/filter/excel/xecontent.cxx2
-rw-r--r--sc/source/filter/excel/xehelper.cxx8
-rw-r--r--sc/source/filter/excel/xelink.cxx2
-rw-r--r--sc/source/filter/excel/xepage.cxx6
-rw-r--r--sc/source/filter/excel/xepivot.cxx2
-rw-r--r--sc/source/filter/excel/xeroot.cxx8
-rw-r--r--sc/source/filter/excel/xestream.cxx2
-rw-r--r--sc/source/filter/excel/xestyle.cxx210
-rw-r--r--sc/source/filter/excel/xetable.cxx2
-rw-r--r--sc/source/filter/excel/xicontent.cxx6
-rw-r--r--sc/source/filter/excel/xiescher.cxx4
-rw-r--r--sc/source/filter/excel/xihelper.cxx2
-rw-r--r--sc/source/filter/excel/xipage.cxx6
-rw-r--r--sc/source/filter/excel/xipivot.cxx4
-rw-r--r--sc/source/filter/excel/xlchart.cxx4
-rw-r--r--sc/source/filter/excel/xlroot.cxx11
-rw-r--r--sc/source/filter/excel/xltools.cxx2
-rw-r--r--sc/source/filter/excel/xltracer.cxx2
-rw-r--r--sc/source/filter/ftools/fapihelper.cxx4
-rw-r--r--sc/source/filter/ftools/ftools.cxx6
-rw-r--r--sc/source/filter/html/htmlexp.cxx10
-rw-r--r--sc/source/filter/html/htmlexp2.cxx2
-rw-r--r--sc/source/filter/html/htmlpars.cxx2
-rw-r--r--sc/source/filter/inc/eeparser.hxx2
-rw-r--r--sc/source/filter/inc/excrecds.hxx2
-rw-r--r--sc/source/filter/inc/filt_pch.hxx32
-rw-r--r--sc/source/filter/inc/xcl97esc.hxx2
-rw-r--r--sc/source/filter/inc/xestream.hxx4
-rw-r--r--sc/source/filter/inc/xestyle.hxx43
-rw-r--r--sc/source/filter/inc/xichart.hxx2
-rw-r--r--sc/source/filter/inc/xiescher.hxx4
-rw-r--r--sc/source/filter/inc/xistream.hxx6
-rw-r--r--sc/source/filter/inc/xlstyle.hxx2
-rw-r--r--sc/source/filter/lotus/tool.cxx2
-rw-r--r--sc/source/filter/rtf/eeimpars.cxx4
-rw-r--r--sc/source/filter/rtf/rtfexp.cxx2
-rw-r--r--sc/source/filter/starcalc/scflt.cxx4
-rw-r--r--sc/source/filter/starcalc/scfobj.cxx2
-rw-r--r--sc/source/filter/xcl97/XclImpChangeTrack.cxx2
-rw-r--r--sc/source/filter/xcl97/xcl97esc.cxx2
-rw-r--r--sc/source/filter/xcl97/xcl97rec.cxx8
-rw-r--r--sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx2
-rw-r--r--sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx2
-rw-r--r--sc/source/filter/xml/XMLExportDatabaseRanges.cxx4
-rw-r--r--sc/source/filter/xml/XMLTrackedChangesContext.cxx2
-rw-r--r--sc/source/filter/xml/xmlcelli.cxx4
-rw-r--r--sc/source/filter/xml/xmlexprt.cxx10
-rw-r--r--sc/source/filter/xml/xmlimprt.cxx8
-rw-r--r--sc/source/filter/xml/xmlwrap.cxx14
-rw-r--r--sc/source/ui/Accessibility/AccessibleContextBase.cxx2
-rw-r--r--sc/source/ui/Accessibility/AccessibleDocument.cxx4
-rw-r--r--sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx2
-rw-r--r--sc/source/ui/Accessibility/AccessiblePageHeader.cxx6
-rw-r--r--sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx2
-rw-r--r--sc/source/ui/Accessibility/AccessiblePreviewTable.cxx2
-rw-r--r--sc/source/ui/app/drwtrans.cxx4
-rw-r--r--sc/source/ui/app/inputhdl.cxx2
-rw-r--r--sc/source/ui/app/inputwin.cxx2
-rw-r--r--sc/source/ui/app/lnktrans.cxx2
-rw-r--r--sc/source/ui/app/scmod.cxx211
-rw-r--r--sc/source/ui/app/scmod2.cxx2
-rw-r--r--sc/source/ui/app/transobj.cxx4
-rw-r--r--sc/source/ui/app/typemap.cxx12
-rw-r--r--sc/source/ui/attrdlg/attrdlg.cxx2
-rw-r--r--sc/source/ui/attrdlg/condfrmt.cxx2
-rw-r--r--sc/source/ui/cctrl/tbinsert.cxx2
-rw-r--r--sc/source/ui/cctrl/tbzoomsliderctrl.cxx2
-rw-r--r--sc/source/ui/dbgui/csvgrid.cxx18
-rw-r--r--sc/source/ui/dbgui/pfiltdlg.cxx2
-rw-r--r--sc/source/ui/dbgui/scendlg.cxx2
-rw-r--r--sc/source/ui/dbgui/validate.cxx8
-rw-r--r--sc/source/ui/docshell/arealink.cxx2
-rw-r--r--sc/source/ui/docshell/docfunc.cxx4
-rw-r--r--sc/source/ui/docshell/docsh.cxx11
-rw-r--r--sc/source/ui/docshell/docsh2.cxx2
-rw-r--r--sc/source/ui/docshell/docsh3.cxx10
-rw-r--r--sc/source/ui/docshell/docsh4.cxx8
-rw-r--r--sc/source/ui/docshell/docsh5.cxx2
-rw-r--r--sc/source/ui/docshell/docsh8.cxx4
-rw-r--r--sc/source/ui/docshell/externalrefmgr.cxx12
-rw-r--r--sc/source/ui/docshell/impex.cxx4
-rw-r--r--sc/source/ui/docshell/tablink.cxx4
-rw-r--r--sc/source/ui/drawfunc/chartsh.cxx2
-rw-r--r--sc/source/ui/drawfunc/drawsh.cxx12
-rw-r--r--sc/source/ui/drawfunc/drawsh2.cxx4
-rw-r--r--sc/source/ui/drawfunc/drawsh5.cxx4
-rw-r--r--sc/source/ui/drawfunc/drformsh.cxx2
-rw-r--r--sc/source/ui/drawfunc/drtxtob.cxx6
-rw-r--r--sc/source/ui/drawfunc/drtxtob2.cxx2
-rw-r--r--sc/source/ui/drawfunc/fuconcustomshape.cxx2
-rw-r--r--sc/source/ui/drawfunc/fuins1.cxx2
-rw-r--r--sc/source/ui/drawfunc/fuins2.cxx8
-rw-r--r--sc/source/ui/drawfunc/futext.cxx2
-rw-r--r--sc/source/ui/drawfunc/graphsh.cxx2
-rw-r--r--sc/source/ui/drawfunc/mediash.cxx2
-rw-r--r--sc/source/ui/drawfunc/oleobjsh.cxx2
-rw-r--r--sc/source/ui/formdlg/formula.cxx4
-rw-r--r--sc/source/ui/inc/AccessibilityHints.hxx4
-rw-r--r--sc/source/ui/inc/AccessibleContextBase.hxx2
-rw-r--r--sc/source/ui/inc/DrawModelBroadcaster.hxx2
-rw-r--r--sc/source/ui/inc/acredlin.hxx2
-rw-r--r--sc/source/ui/inc/csvgrid.hxx9
-rw-r--r--sc/source/ui/inc/dwfunctr.hxx2
-rw-r--r--sc/source/ui/inc/formula.hxx2
-rw-r--r--sc/source/ui/inc/funcpage.hxx2
-rw-r--r--sc/source/ui/inc/inputwin.hxx2
-rw-r--r--sc/source/ui/inc/msgpool.hxx6
-rw-r--r--sc/source/ui/inc/navipi.hxx4
-rw-r--r--sc/source/ui/inc/parawin.hxx2
-rw-r--r--sc/source/ui/inc/servobj.hxx4
-rw-r--r--sc/source/ui/inc/target.hxx2
-rw-r--r--sc/source/ui/inc/tbzoomsliderctrl.hxx2
-rw-r--r--sc/source/ui/inc/ui_pch.hxx48
-rw-r--r--sc/source/ui/inc/uiitems.hxx2
-rw-r--r--sc/source/ui/inc/undobase.hxx2
-rw-r--r--sc/source/ui/inc/undodraw.hxx2
-rw-r--r--sc/source/ui/inc/undotab.hxx4
-rw-r--r--sc/source/ui/inc/viewfunc.hxx4
-rw-r--r--sc/source/ui/miscdlgs/acredlin.cxx2
-rw-r--r--sc/source/ui/miscdlgs/autofmt.cxx2
-rw-r--r--sc/source/ui/miscdlgs/filldlg.cxx2
-rw-r--r--sc/source/ui/miscdlgs/optsolver.cxx2
-rw-r--r--sc/source/ui/miscdlgs/redcom.cxx2
-rw-r--r--sc/source/ui/miscdlgs/scuiautofmt.cxx2
-rw-r--r--sc/source/ui/miscdlgs/sharedocdlg.cxx4
-rw-r--r--sc/source/ui/miscdlgs/solvrdlg.cxx2
-rw-r--r--sc/source/ui/miscdlgs/textdlgs.cxx4
-rw-r--r--sc/source/ui/navipi/content.cxx2
-rw-r--r--sc/source/ui/navipi/navcitem.cxx4
-rw-r--r--sc/source/ui/navipi/navipi.cxx4
-rw-r--r--sc/source/ui/navipi/scenwnd.cxx4
-rw-r--r--sc/source/ui/optdlg/tpprint.cxx2
-rw-r--r--sc/source/ui/pagedlg/areasdlg.cxx2
-rw-r--r--sc/source/ui/pagedlg/hfedtdlg.cxx2
-rw-r--r--sc/source/ui/pagedlg/scuitphfedit.cxx4
-rw-r--r--sc/source/ui/pagedlg/tphf.cxx2
-rw-r--r--sc/source/ui/src/globstr.src2
-rw-r--r--sc/source/ui/styleui/scstyles.src2
-rw-r--r--sc/source/ui/styleui/styledlg.cxx8
-rw-r--r--sc/source/ui/undo/undocell.cxx2
-rw-r--r--sc/source/ui/undo/undostyl.cxx2
-rw-r--r--sc/source/ui/undo/undotab.cxx2
-rw-r--r--sc/source/ui/unoobj/addruno.cxx2
-rw-r--r--sc/source/ui/unoobj/afmtuno.cxx2
-rw-r--r--sc/source/ui/unoobj/cellsuno.cxx4
-rw-r--r--sc/source/ui/unoobj/chartuno.cxx2
-rw-r--r--sc/source/ui/unoobj/cursuno.cxx4
-rw-r--r--sc/source/ui/unoobj/dapiuno.cxx2
-rw-r--r--sc/source/ui/unoobj/datauno.cxx4
-rw-r--r--sc/source/ui/unoobj/defltuno.cxx4
-rw-r--r--sc/source/ui/unoobj/dispuno.cxx2
-rw-r--r--sc/source/ui/unoobj/docuno.cxx6
-rw-r--r--sc/source/ui/unoobj/fielduno.cxx2
-rw-r--r--sc/source/ui/unoobj/funcuno.cxx2
-rw-r--r--sc/source/ui/unoobj/linkuno.cxx2
-rw-r--r--sc/source/ui/unoobj/nameuno.cxx2
-rw-r--r--sc/source/ui/unoobj/notesuno.cxx2
-rw-r--r--sc/source/ui/unoobj/optuno.cxx2
-rw-r--r--sc/source/ui/unoobj/scdetect.cxx6
-rw-r--r--sc/source/ui/unoobj/styleuno.cxx8
-rw-r--r--sc/source/ui/unoobj/targuno.cxx4
-rw-r--r--sc/source/ui/unoobj/tokenuno.cxx2
-rw-r--r--sc/source/ui/unoobj/warnpassword.cxx2
-rw-r--r--sc/source/ui/vba/vbafont.cxx2
-rw-r--r--sc/source/ui/vba/vbahelper.cxx830
-rw-r--r--sc/source/ui/vba/vbaworksheets.cxx4
-rw-r--r--sc/source/ui/view/cellsh.cxx8
-rw-r--r--sc/source/ui/view/cellsh1.cxx10
-rw-r--r--sc/source/ui/view/cellsh2.cxx12
-rw-r--r--sc/source/ui/view/cellsh3.cxx2
-rw-r--r--sc/source/ui/view/dbfunc3.cxx2
-rw-r--r--sc/source/ui/view/editsh.cxx4
-rw-r--r--sc/source/ui/view/formatsh.cxx8
-rw-r--r--sc/source/ui/view/gridwin.cxx4
-rw-r--r--sc/source/ui/view/gridwin3.cxx2
-rw-r--r--sc/source/ui/view/notemark.cxx4
-rw-r--r--sc/source/ui/view/output2.cxx4
-rw-r--r--sc/source/ui/view/pgbrksh.cxx2
-rw-r--r--sc/source/ui/view/pivotsh.cxx2
-rw-r--r--sc/source/ui/view/preview.cxx2
-rw-r--r--sc/source/ui/view/prevwsh.cxx6
-rw-r--r--sc/source/ui/view/prevwsh2.cxx2
-rw-r--r--sc/source/ui/view/tabvwsh2.cxx10
-rw-r--r--sc/source/ui/view/tabvwsh3.cxx10
-rw-r--r--sc/source/ui/view/tabvwsh4.cxx4
-rw-r--r--sc/source/ui/view/tabvwsh5.cxx4
-rw-r--r--sc/source/ui/view/tabvwsh9.cxx2
-rw-r--r--sc/source/ui/view/tabvwsha.cxx8
-rw-r--r--sc/source/ui/view/tabvwshb.cxx6
-rw-r--r--sc/source/ui/view/tabvwshe.cxx2
-rw-r--r--sc/source/ui/view/tabvwshf.cxx6
-rw-r--r--sc/source/ui/view/tabvwshh.cxx2
-rw-r--r--sc/source/ui/view/viewfun2.cxx6
-rw-r--r--sc/source/ui/view/viewfun3.cxx6
-rw-r--r--sc/source/ui/view/viewfun4.cxx4
-rw-r--r--sc/source/ui/view/viewfun5.cxx6
-rw-r--r--sc/source/ui/view/viewfunc.cxx4
-rw-r--r--sc/source/ui/view/viewutil.cxx12
-rw-r--r--sc/util/makefile.mk2
-rw-r--r--sc/workben/addin.cxx2
-rw-r--r--sc/workben/result.hxx2
-rw-r--r--scp2/prj/build.lst2
-rw-r--r--scp2/source/ooo/file_library_ooo.scp6
-rw-r--r--scp2/source/ooo/file_ooo.scp18
-rw-r--r--scp2/source/ooo/file_resource_ooo.scp2
-rw-r--r--scp2/source/ooo/module_hidden_ooo.scp1
-rwxr-xr-xscp2/source/ooo/module_lang_template.scp1
-rw-r--r--sd/inc/helpids.h2
-rw-r--r--sd/inc/pch/precompiled_sd.hxx97
-rw-r--r--sd/inc/sdattr.hxx6
-rw-r--r--sd/inc/sdmod.hxx2
-rw-r--r--sd/inc/sdundo.hxx2
-rw-r--r--sd/inc/stlfamily.hxx2
-rw-r--r--sd/inc/stlsheet.hxx2
-rw-r--r--sd/inc/undo/undomanager.hxx2
-rwxr-xr-x[-rw-r--r--]sd/prj/build.lst2
-rw-r--r--sd/sdi/ViewShellBase.sdi4
-rw-r--r--sd/sdi/_docsh.sdi2
-rw-r--r--sd/sdi/docshell.sdi2
-rw-r--r--sd/sdi/grdocsh.sdi2
-rw-r--r--sd/sdi/makefile.mk14
-rw-r--r--sd/sdi/sdgslots.sdi9
-rw-r--r--sd/sdi/sdslots.sdi9
-rw-r--r--sd/sdi/svxitems.sdi93
-rw-r--r--sd/source/core/CustomAnimationPreset.cxx2
-rw-r--r--sd/source/core/TransitionPreset.cxx2
-rw-r--r--sd/source/core/anminfo.cxx4
-rw-r--r--sd/source/core/drawdoc.cxx18
-rw-r--r--sd/source/core/drawdoc2.cxx2
-rw-r--r--sd/source/core/drawdoc3.cxx4
-rw-r--r--sd/source/core/drawdoc4.cxx4
-rw-r--r--sd/source/core/sdpage.cxx2
-rw-r--r--sd/source/core/sdpage2.cxx4
-rw-r--r--sd/source/core/stlfamily.cxx2
-rw-r--r--sd/source/core/stlpool.cxx8
-rw-r--r--sd/source/core/stlsheet.cxx4
-rw-r--r--sd/source/core/typemap.cxx12
-rw-r--r--sd/source/filter/cgm/sdcgmfilter.cxx2
-rw-r--r--sd/source/filter/eppt/eppt.cxx40
-rw-r--r--sd/source/filter/eppt/eppt.hxx4
-rw-r--r--sd/source/filter/eppt/epptso.cxx2
-rw-r--r--sd/source/filter/eppt/escherex.hxx2
-rw-r--r--sd/source/filter/eppt/pptexanimations.hxx2
-rw-r--r--sd/source/filter/grf/sdgrffilter.cxx2
-rw-r--r--sd/source/filter/html/buttonset.cxx2
-rw-r--r--sd/source/filter/html/htmlex.cxx8
-rw-r--r--sd/source/filter/html/htmlex.hxx2
-rw-r--r--sd/source/filter/html/pubdlg.cxx14
-rw-r--r--sd/source/filter/ppt/pptatom.hxx1
-rw-r--r--sd/source/filter/ppt/pptin.cxx14
-rw-r--r--sd/source/filter/ppt/pptin.hxx4
-rw-r--r--sd/source/filter/ppt/pptinanimations.hxx4
-rw-r--r--sd/source/filter/sdfilter.cxx2
-rw-r--r--sd/source/filter/sdpptwrp.cxx40
-rw-r--r--sd/source/filter/xml/sdtransform.cxx8
-rw-r--r--sd/source/filter/xml/sdxmlwrp.cxx6
-rw-r--r--sd/source/ui/animations/AnimationSchemesPane.cxx2
-rw-r--r--sd/source/ui/animations/CustomAnimationCreateDialog.cxx2
-rw-r--r--sd/source/ui/animations/CustomAnimationDialog.cxx2
-rw-r--r--sd/source/ui/animations/SlideTransitionPane.cxx2
-rw-r--r--sd/source/ui/annotations/annotationmanager.cxx12
-rw-r--r--sd/source/ui/annotations/annotationwindow.cxx10
-rw-r--r--sd/source/ui/app/optsitem.cxx6
-rw-r--r--sd/source/ui/app/res_bmp.src2
-rw-r--r--sd/source/ui/app/sddll.cxx2
-rw-r--r--sd/source/ui/app/sddll1.cxx2
-rw-r--r--sd/source/ui/app/sdmod.cxx8
-rw-r--r--sd/source/ui/app/sdmod1.cxx6
-rw-r--r--sd/source/ui/app/sdmod2.cxx10
-rw-r--r--sd/source/ui/app/sdpopup.cxx4
-rw-r--r--sd/source/ui/app/sdxfer.cxx4
-rw-r--r--sd/source/ui/app/tbxww.cxx2
-rw-r--r--sd/source/ui/app/tmplctrl.cxx4
-rw-r--r--sd/source/ui/dlg/LayerDialogContent.cxx2
-rw-r--r--sd/source/ui/dlg/animobjs.cxx2
-rw-r--r--sd/source/ui/dlg/celltempl.cxx4
-rw-r--r--sd/source/ui/dlg/dlgass.cxx6
-rw-r--r--sd/source/ui/dlg/dlgassim.cxx2
-rw-r--r--sd/source/ui/dlg/dlgassim.hxx2
-rw-r--r--sd/source/ui/dlg/dlgchar.cxx2
-rw-r--r--sd/source/ui/dlg/dlgfield.cxx6
-rw-r--r--sd/source/ui/dlg/dlgolbul.cxx6
-rw-r--r--sd/source/ui/dlg/dlgpage.cxx4
-rw-r--r--sd/source/ui/dlg/dlgsnap.cxx4
-rw-r--r--sd/source/ui/dlg/gluectrl.cxx2
-rw-r--r--sd/source/ui/dlg/layeroptionsdlg.cxx2
-rw-r--r--sd/source/ui/dlg/morphdlg.cxx4
-rw-r--r--sd/source/ui/dlg/navigatr.cxx6
-rw-r--r--sd/source/ui/dlg/paragr.cxx6
-rw-r--r--sd/source/ui/dlg/present.cxx2
-rw-r--r--sd/source/ui/dlg/prltempl.cxx6
-rw-r--r--sd/source/ui/dlg/prntopts.cxx2
-rw-r--r--sd/source/ui/dlg/sdpreslt.cxx2
-rw-r--r--sd/source/ui/dlg/sdtreelb.cxx2
-rw-r--r--sd/source/ui/dlg/tabtempl.cxx6
-rw-r--r--sd/source/ui/dlg/tpaction.cxx6
-rw-r--r--sd/source/ui/dlg/tpoption.cxx2
-rw-r--r--sd/source/ui/dlg/unchss.cxx6
-rw-r--r--sd/source/ui/docshell/docshel2.cxx2
-rw-r--r--sd/source/ui/docshell/docshel3.cxx2
-rw-r--r--sd/source/ui/docshell/docshel4.cxx12
-rw-r--r--sd/source/ui/docshell/docshell.cxx12
-rw-r--r--sd/source/ui/framework/tools/FrameworkHelper.cxx2
-rw-r--r--sd/source/ui/func/bulmaper.cxx4
-rw-r--r--sd/source/ui/func/fuarea.cxx5
-rw-r--r--sd/source/ui/func/fubullet.cxx6
-rw-r--r--sd/source/ui/func/fucon3d.cxx2
-rw-r--r--sd/source/ui/func/fuconarc.cxx4
-rw-r--r--sd/source/ui/func/fuconbez.cxx4
-rw-r--r--sd/source/ui/func/fuconcs.cxx6
-rw-r--r--sd/source/ui/func/fuconrec.cxx4
-rw-r--r--sd/source/ui/func/fuconstr.cxx2
-rw-r--r--sd/source/ui/func/fuconuno.cxx4
-rw-r--r--sd/source/ui/func/fudraw.cxx2
-rw-r--r--sd/source/ui/func/fuediglu.cxx2
-rw-r--r--sd/source/ui/func/fuformatpaintbrush.cxx2
-rw-r--r--sd/source/ui/func/fuhhconv.cxx2
-rw-r--r--sd/source/ui/func/fuinsert.cxx8
-rw-r--r--sd/source/ui/func/fuinsfil.cxx4
-rw-r--r--sd/source/ui/func/fuline.cxx6
-rw-r--r--sd/source/ui/func/fulinend.cxx2
-rw-r--r--sd/source/ui/func/fuoaprms.cxx2
-rw-r--r--sd/source/ui/func/fuolbull.cxx4
-rw-r--r--sd/source/ui/func/fupage.cxx8
-rw-r--r--sd/source/ui/func/fupoor.cxx2
-rw-r--r--sd/source/ui/func/fuprlout.cxx4
-rw-r--r--sd/source/ui/func/fuprobjs.cxx4
-rw-r--r--sd/source/ui/func/fuscale.cxx7
-rw-r--r--sd/source/ui/func/fusel.cxx8
-rw-r--r--sd/source/ui/func/fusldlg.cxx2
-rw-r--r--sd/source/ui/func/fusnapln.cxx2
-rw-r--r--sd/source/ui/func/futempl.cxx2
-rw-r--r--sd/source/ui/func/futext.cxx6
-rw-r--r--sd/source/ui/func/futransf.cxx4
-rw-r--r--sd/source/ui/func/futxtatt.cxx2
-rw-r--r--sd/source/ui/inc/AccessibleOutlineEditSource.hxx4
-rw-r--r--sd/source/ui/inc/EventMultiplexer.hxx2
-rw-r--r--sd/source/ui/inc/FormShellManager.hxx2
-rw-r--r--sd/source/ui/inc/PreviewRenderer.hxx2
-rw-r--r--sd/source/ui/inc/ViewShellHint.hxx2
-rw-r--r--sd/source/ui/inc/WindowUpdater.hxx8
-rw-r--r--sd/source/ui/inc/diactrl.hxx2
-rw-r--r--sd/source/ui/inc/docprev.hxx2
-rw-r--r--sd/source/ui/inc/fuconuno.hxx2
-rw-r--r--sd/source/ui/inc/fuformatpaintbrush.hxx4
-rw-r--r--sd/source/ui/inc/optsitem.hxx1
-rw-r--r--sd/source/ui/inc/sdtreelb.hxx2
-rw-r--r--sd/source/ui/inc/sdxfer.hxx2
-rw-r--r--sd/source/ui/inc/unomodel.hxx2
-rwxr-xr-xsd/source/ui/notes/EditWindow.cxx6
-rw-r--r--sd/source/ui/presenter/PresenterTextView.cxx8
-rw-r--r--sd/source/ui/slideshow/showwin.cxx2
-rw-r--r--sd/source/ui/slideshow/slideshow.cxx2
-rw-r--r--sd/source/ui/slideshow/slideshowimpl.cxx4
-rw-r--r--sd/source/ui/slideshow/slideshowimpl.hxx4
-rw-r--r--sd/source/ui/slideshow/slideshowviewimpl.hxx4
-rw-r--r--sd/source/ui/slidesorter/controller/SlsListener.hxx2
-rw-r--r--sd/source/ui/slidesorter/controller/SlsSlotManager.cxx10
-rw-r--r--sd/source/ui/slidesorter/view/SlideSorterView.cxx6
-rw-r--r--sd/source/ui/table/TableDesignPane.cxx2
-rw-r--r--sd/source/ui/table/tablefunction.cxx4
-rw-r--r--sd/source/ui/table/tableobjectbar.cxx4
-rw-r--r--sd/source/ui/toolpanel/LayoutMenu.cxx2
-rw-r--r--sd/source/ui/toolpanel/TitleBar.cxx2
-rw-r--r--sd/source/ui/toolpanel/controls/MasterPageContainer.cxx4
-rw-r--r--sd/source/ui/toolpanel/controls/MasterPageObserver.cxx2
-rw-r--r--sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx8
-rw-r--r--sd/source/ui/unoidl/sddetect.cxx8
-rw-r--r--sd/source/ui/unoidl/unoobj.cxx4
-rw-r--r--sd/source/ui/unoidl/unopage.cxx4
-rw-r--r--sd/source/ui/unoidl/unopage.hxx2
-rw-r--r--sd/source/ui/unoidl/unopback.cxx2
-rw-r--r--sd/source/ui/view/GraphicObjectBar.cxx6
-rw-r--r--sd/source/ui/view/MediaObjectBar.cxx4
-rw-r--r--sd/source/ui/view/Outliner.cxx4
-rw-r--r--sd/source/ui/view/PrintManager.cxx12
-rw-r--r--sd/source/ui/view/ToolBarManager.cxx2
-rw-r--r--sd/source/ui/view/ViewShellBase.cxx2
-rw-r--r--sd/source/ui/view/ViewShellImplementation.cxx2
-rw-r--r--sd/source/ui/view/WindowUpdater.cxx54
-rw-r--r--sd/source/ui/view/drawview.cxx8
-rw-r--r--sd/source/ui/view/drbezob.cxx4
-rw-r--r--sd/source/ui/view/drtxtob.cxx10
-rw-r--r--sd/source/ui/view/drtxtob1.cxx10
-rw-r--r--sd/source/ui/view/drviews2.cxx4
-rw-r--r--sd/source/ui/view/drviews3.cxx12
-rw-r--r--sd/source/ui/view/drviews4.cxx2
-rw-r--r--sd/source/ui/view/drviews7.cxx16
-rw-r--r--sd/source/ui/view/drviews9.cxx6
-rw-r--r--sd/source/ui/view/drviewsa.cxx6
-rw-r--r--sd/source/ui/view/drviewsb.cxx2
-rw-r--r--sd/source/ui/view/drviewsc.cxx6
-rw-r--r--sd/source/ui/view/drviewsd.cxx6
-rw-r--r--sd/source/ui/view/drviewse.cxx10
-rw-r--r--sd/source/ui/view/drviewsf.cxx8
-rw-r--r--sd/source/ui/view/drviewsh.cxx4
-rw-r--r--sd/source/ui/view/drviewsi.cxx2
-rw-r--r--sd/source/ui/view/drviewsj.cxx2
-rw-r--r--sd/source/ui/view/outlnvs2.cxx4
-rw-r--r--sd/source/ui/view/outlnvsh.cxx6
-rw-r--r--sd/source/ui/view/outlview.cxx6
-rw-r--r--sd/source/ui/view/sdruler.cxx2
-rw-r--r--sd/source/ui/view/sdview2.cxx6
-rw-r--r--sd/source/ui/view/sdview3.cxx6
-rw-r--r--sd/source/ui/view/sdview4.cxx2
-rw-r--r--sd/source/ui/view/viewshe2.cxx2
-rw-r--r--sd/source/ui/view/viewshe3.cxx7
-rw-r--r--sd/source/ui/view/viewshel.cxx4
-rw-r--r--sd/util/makefile.mk3
-rw-r--r--sd/util/sdfilt.map2
-rw-r--r--sdext/source/minimizer/configurationaccess.cxx1
-rw-r--r--sdext/source/minimizer/fileopendialog.cxx1
-rw-r--r--sdext/source/minimizer/fileopendialog.hxx2
-rw-r--r--sdext/source/minimizer/pppoptimizer.cxx2
-rw-r--r--sdext/source/minimizer/pppoptimizer.hxx1
-rw-r--r--sdext/source/pdfimport/misc/pwdinteract.cxx7
-rw-r--r--sdext/source/pdfimport/odf/odfemitter.cxx1
-rw-r--r--sdext/source/pdfimport/sax/emitcontext.cxx31
-rw-r--r--sdext/source/pdfimport/services.cxx1
-rwxr-xr-xsdext/source/pdfimport/test/makefile.mk7
-rwxr-xr-xsdext/source/pdfimport/test/tests.cxx2
-rw-r--r--set_soenv.in22
-rwxr-xr-xsetup_native/source/win32/customactions/reg64/reg64.cxx310
-rw-r--r--sfx2/inc/arrdecl.hxx2
-rw-r--r--sfx2/inc/minfitem.hxx2
-rw-r--r--sfx2/inc/msgnodei.hxx4
-rw-r--r--sfx2/inc/orgmgr.hxx2
-rw-r--r--sfx2/inc/pch/precompiled_sfx2.hxx142
-rw-r--r--sfx2/inc/sfx2/app.hxx6
-rw-r--r--sfx2/inc/sfx2/appuno.hxx4
-rw-r--r--sfx2/inc/sfx2/cntids.hrc4
-rw-r--r--sfx2/inc/sfx2/ctrlitem.hxx2
-rw-r--r--sfx2/inc/sfx2/dinfdlg.hxx72
-rw-r--r--sfx2/inc/sfx2/dispatch.hxx2
-rw-r--r--sfx2/inc/sfx2/docfile.hxx7
-rw-r--r--sfx2/inc/sfx2/event.hxx4
-rw-r--r--sfx2/inc/sfx2/evntconf.hxx4
-rw-r--r--sfx2/inc/sfx2/fcontnr.hxx2
-rw-r--r--sfx2/inc/sfx2/frame.hxx4
-rw-r--r--sfx2/inc/sfx2/frmdescr.hxx4
-rw-r--r--sfx2/inc/sfx2/itemwrapper.hxx8
-rw-r--r--sfx2/inc/sfx2/linkmgr.hxx2
-rw-r--r--sfx2/inc/sfx2/macrconf.hxx2
-rw-r--r--sfx2/inc/sfx2/macropg.hxx2
-rw-r--r--sfx2/inc/sfx2/msgpool.hxx2
-rw-r--r--sfx2/inc/sfx2/objitem.hxx2
-rw-r--r--sfx2/inc/sfx2/objsh.hxx2
-rw-r--r--sfx2/inc/sfx2/objuno.hxx2
-rw-r--r--sfx2/inc/sfx2/querystatus.hxx2
-rw-r--r--sfx2/inc/sfx2/request.hxx4
-rw-r--r--sfx2/inc/sfx2/sfx.hrc4
-rw-r--r--sfx2/inc/sfx2/sfxbasemodel.hxx2
-rw-r--r--sfx2/inc/sfx2/sfxhtml.hxx2
-rw-r--r--sfx2/inc/sfx2/sfxsids.hrc2
-rw-r--r--sfx2/inc/sfx2/sfxstatuslistener.hxx2
-rw-r--r--sfx2/inc/sfx2/shell.hxx2
-rw-r--r--sfx2/inc/sfx2/srchitem.hxx3
-rw-r--r--sfx2/inc/sfx2/tabdlg.hxx4
-rw-r--r--sfx2/inc/sfx2/viewfrm.hxx4
-rw-r--r--sfx2/inc/sfx2/viewsh.hxx2
-rw-r--r--sfx2/inc/sorgitm.hxx2
-rw-r--r--sfx2/inc/stbitem.hxx2
-rw-r--r--sfx2/inc/tplpitem.hxx2
-rw-r--r--sfx2/prj/d.lst4
-rw-r--r--sfx2/qa/complex/DocumentMetaData.java50
-rw-r--r--sfx2/sdi/sfxitems.sdi89
-rw-r--r--sfx2/sdi/sfxslots.sdi94
-rw-r--r--sfx2/source/appl/app.cxx47
-rw-r--r--sfx2/source/appl/appbas.cxx16
-rw-r--r--sfx2/source/appl/appcfg.cxx38
-rw-r--r--sfx2/source/appl/appchild.cxx4
-rw-r--r--sfx2/source/appl/appdata.cxx9
-rw-r--r--sfx2/source/appl/appdde.cxx12
-rw-r--r--sfx2/source/appl/appinit.cxx18
-rw-r--r--sfx2/source/appl/appmain.cxx9
-rw-r--r--sfx2/source/appl/appmisc.cxx16
-rw-r--r--sfx2/source/appl/appopen.cxx18
-rw-r--r--sfx2/source/appl/appquit.cxx15
-rw-r--r--sfx2/source/appl/appserv.cxx18
-rw-r--r--sfx2/source/appl/appuno.cxx16
-rw-r--r--sfx2/source/appl/childwin.cxx2
-rw-r--r--sfx2/source/appl/impldde.cxx2
-rw-r--r--sfx2/source/appl/linkmgr2.cxx2
-rw-r--r--sfx2/source/appl/linksrc.cxx2
-rw-r--r--sfx2/source/appl/lnkbase2.cxx2
-rw-r--r--sfx2/source/appl/newhelp.cxx10
-rw-r--r--sfx2/source/appl/newhelp.hxx2
-rw-r--r--sfx2/source/appl/sfxhelp.cxx17
-rw-r--r--sfx2/source/appl/sfxpicklist.cxx10
-rw-r--r--sfx2/source/appl/shutdownicon.cxx31
-rw-r--r--sfx2/source/appl/shutdowniconOs2.cxx4
-rw-r--r--sfx2/source/appl/shutdowniconaqua.mm6
-rw-r--r--sfx2/source/appl/shutdowniconunx.cxx4
-rw-r--r--sfx2/source/appl/shutdowniconw32.cxx4
-rw-r--r--sfx2/source/appl/workwin.cxx10
-rw-r--r--sfx2/source/bastyp/fltfnc.cxx20
-rw-r--r--sfx2/source/bastyp/frmhtml.cxx2
-rw-r--r--sfx2/source/bastyp/frmhtmlw.cxx4
-rw-r--r--sfx2/source/bastyp/progress.cxx2
-rw-r--r--sfx2/source/bastyp/sfxhtml.cxx4
-rw-r--r--sfx2/source/config/evntconf.cxx4
-rw-r--r--sfx2/source/control/bindings.cxx14
-rw-r--r--sfx2/source/control/ctrlitem.cxx2
-rw-r--r--sfx2/source/control/dispatch.cxx14
-rw-r--r--sfx2/source/control/macrconf.cxx2
-rw-r--r--sfx2/source/control/makefile.mk6
-rw-r--r--sfx2/source/control/msg.cxx4
-rw-r--r--sfx2/source/control/querystatus.cxx12
-rw-r--r--sfx2/source/control/request.cxx6
-rw-r--r--sfx2/source/control/sfxstatuslistener.cxx12
-rw-r--r--sfx2/source/control/shell.cxx10
-rw-r--r--sfx2/source/control/srchitem.cxx7
-rw-r--r--sfx2/source/control/statcach.cxx8
-rw-r--r--sfx2/source/control/unoctitm.cxx12
-rw-r--r--sfx2/source/dialog/alienwarn.cxx2
-rw-r--r--sfx2/source/dialog/basedlgs.cxx4
-rw-r--r--sfx2/source/dialog/dialog.hrc2
-rw-r--r--sfx2/source/dialog/dinfdlg.cxx361
-rw-r--r--sfx2/source/dialog/dinfdlg.hrc22
-rw-r--r--sfx2/source/dialog/dinfdlg.src222
-rw-r--r--sfx2/source/dialog/dockwin.cxx2
-rw-r--r--sfx2/source/dialog/filedlghelper.cxx18
-rw-r--r--sfx2/source/dialog/filedlgimpl.hxx2
-rw-r--r--sfx2/source/dialog/intro.cxx2
-rw-r--r--sfx2/source/dialog/itemconnect.cxx2
-rw-r--r--sfx2/source/dialog/mailmodel.cxx2
-rw-r--r--sfx2/source/dialog/mailmodelapi.cxx6
-rw-r--r--sfx2/source/dialog/mgetempl.cxx8
-rw-r--r--sfx2/source/dialog/newstyle.cxx2
-rw-r--r--sfx2/source/dialog/printopt.cxx4
-rw-r--r--sfx2/source/dialog/recfloat.cxx2
-rw-r--r--sfx2/source/dialog/splitwin.cxx2
-rw-r--r--sfx2/source/dialog/srchdlg.cxx2
-rw-r--r--sfx2/source/dialog/styledlg.cxx4
-rw-r--r--sfx2/source/dialog/tabdlg.cxx4
-rw-r--r--sfx2/source/dialog/templdlg.cxx8
-rw-r--r--sfx2/source/dialog/tplcitem.cxx2
-rw-r--r--sfx2/source/dialog/versdlg.cxx12
-rw-r--r--sfx2/source/doc/SfxDocumentMetaData.cxx132
-rw-r--r--sfx2/source/doc/applet.cxx2
-rw-r--r--sfx2/source/doc/doc.src2
-rw-r--r--sfx2/source/doc/docfac.cxx4
-rw-r--r--sfx2/source/doc/docfile.cxx186
-rw-r--r--sfx2/source/doc/docinsert.cxx10
-rw-r--r--sfx2/source/doc/docmacromode.cxx2
-rw-r--r--sfx2/source/doc/doctdlg.cxx2
-rw-r--r--sfx2/source/doc/doctempl.cxx2
-rw-r--r--sfx2/source/doc/doctemplates.cxx2
-rw-r--r--sfx2/source/doc/docvor.cxx12
-rw-r--r--sfx2/source/doc/frmdescr.cxx2
-rw-r--r--sfx2/source/doc/guisaveas.cxx11
-rw-r--r--sfx2/source/doc/new.cxx4
-rw-r--r--sfx2/source/doc/objcont.cxx20
-rw-r--r--sfx2/source/doc/objmisc.cxx32
-rw-r--r--sfx2/source/doc/objserv.cxx12
-rw-r--r--sfx2/source/doc/objstor.cxx29
-rw-r--r--sfx2/source/doc/objuno.cxx2
-rw-r--r--sfx2/source/doc/objxtor.cxx16
-rwxr-xr-xsfx2/source/doc/printhelper.cxx8
-rwxr-xr-xsfx2/source/doc/sfxacldetect.cxx216
-rw-r--r--sfx2/source/doc/sfxbasemodel.cxx6
-rw-r--r--sfx2/source/explorer/nochaos.cxx6
-rw-r--r--sfx2/source/inc/appdata.hxx4
-rw-r--r--sfx2/source/inc/applet.hxx4
-rw-r--r--sfx2/source/inc/eventsupplier.hxx4
-rw-r--r--sfx2/source/inc/helpid.hrc5
-rw-r--r--sfx2/source/inc/iframe.hxx4
-rw-r--r--sfx2/source/inc/objshimp.hxx2
-rw-r--r--sfx2/source/inc/plugin.hxx4
-rw-r--r--sfx2/source/inc/sfxlocal.hrc5
-rw-r--r--sfx2/source/inc/sfxpicklist.hxx2
-rw-r--r--sfx2/source/inc/templdgi.hxx6
-rw-r--r--sfx2/source/inc/virtmenu.hxx2
-rw-r--r--sfx2/source/inc/workwin.hxx2
-rw-r--r--sfx2/source/inet/inettbc.cxx16
-rw-r--r--sfx2/source/layout/sfxtabdialog.cxx4
-rw-r--r--sfx2/source/menu/mnuitem.cxx4
-rw-r--r--sfx2/source/menu/mnumgr.cxx4
-rw-r--r--sfx2/source/menu/objmnctl.cxx2
-rw-r--r--sfx2/source/menu/virtmenu.cxx6
-rw-r--r--sfx2/source/notify/eventsupplier.cxx6
-rw-r--r--sfx2/source/statbar/stbitem.cxx8
-rw-r--r--sfx2/source/toolbox/imgmgr.cxx4
-rw-r--r--sfx2/source/toolbox/tbxitem.cxx14
-rw-r--r--sfx2/source/view/frame.cxx6
-rw-r--r--sfx2/source/view/frmload.cxx8
-rw-r--r--sfx2/source/view/impframe.cxx2
-rw-r--r--sfx2/source/view/impframe.hxx2
-rw-r--r--sfx2/source/view/ipclient.cxx2
-rw-r--r--sfx2/source/view/printer.cxx2
-rw-r--r--sfx2/source/view/prnmon.cxx4
-rw-r--r--sfx2/source/view/topfrm.cxx16
-rw-r--r--sfx2/source/view/viewfrm.cxx16
-rw-r--r--sfx2/source/view/viewprn.cxx14
-rw-r--r--sfx2/source/view/viewsh.cxx14
-rw-r--r--shell/inc/internal/utilities.hxx1
-rw-r--r--shell/inc/internal/xml_parser.hxx11
-rw-r--r--shell/inc/kde_headers.h (renamed from vcl/unx/inc/kde_headers.h)0
-rw-r--r--shell/prj/build.lst2
-rwxr-xr-x[-rw-r--r--]shell/prj/d.lst1
-rwxr-xr-xshell/qa/makefile.mk12
-rwxr-xr-xshell/qa/recent_docs.cxx2
-rw-r--r--shell/source/all/xml_parser.cxx14
-rw-r--r--shell/source/backends/gconfbe/gconfbackend.cxx3
-rw-r--r--shell/source/backends/gconfbe/gconfbackend.hxx5
-rw-r--r--shell/source/backends/kdebe/kdebecdef.cxx2
-rw-r--r--shell/source/backends/kdebe/kdecommonlayer.cxx2
-rwxr-xr-x[-rw-r--r--]shell/source/backends/kdebe/kdeinetlayer.hxx2
-rw-r--r--shell/source/backends/kdebe/kdepathslayer.cxx2
-rw-r--r--shell/source/backends/kdebe/kdevcllayer.cxx2
-rw-r--r--shell/source/tools/lngconvex/lngconvex.cxx13
-rw-r--r--shell/source/unix/sysshell/recently_used_file.cxx6
-rw-r--r--shell/source/unix/sysshell/recently_used_file.hxx3
-rw-r--r--shell/source/unix/sysshell/recently_used_file_handler.cxx20
-rw-r--r--slideshow/test/makefile.mk13
-rw-r--r--slideshow/test/slidetest.cxx2
-rw-r--r--slideshow/test/testshape.cxx2
-rw-r--r--slideshow/test/testview.cxx2
-rw-r--r--slideshow/test/views.cxx2
-rw-r--r--soldep/bootstrp/XMLBuildListParser.pm1966
-rw-r--r--soldep/bootstrp/XmlBuildList.cxx436
-rw-r--r--soldep/bootstrp/makefile.mk11
-rw-r--r--soldep/bootstrp/minormk.cxx2
-rw-r--r--soldep/inc/soldep/XmlBuildList.hxx160
-rw-r--r--soldep/inc/soldep/depper.hxx2
-rw-r--r--soldep/inc/soldep/objwin.hxx2
-rw-r--r--soldep/prj/d.lst1
-rw-r--r--soldep/source/connctr.cxx528
-rw-r--r--soldep/source/depapp.cxx290
-rw-r--r--soldep/source/depapp.hxx2
-rw-r--r--soldep/source/objwin.cxx1560
-rw-r--r--soldep/source/soldep.cxx3510
-rwxr-xr-xsolenv/bin/deliver.pl2
-rwxr-xr-x[-rw-r--r--]solenv/config/sdev300.ini1938
-rw-r--r--solenv/inc/libs.mk12
-rw-r--r--solenv/inc/minor.mk6
-rw-r--r--solenv/inc/rules.mk2
-rw-r--r--solenv/inc/settings.mk32
-rw-r--r--solenv/inc/shlinfo.rc2
-rw-r--r--solenv/inc/target.mk10
-rw-r--r--solenv/inc/version.hrc4
-rw-r--r--solenv/inc/version_so.hrc4
-rwxr-xr-x[-rw-r--r--]soltools/adjustvisibility/makefile.mk5
-rwxr-xr-xsoltools/mkdepend/collectdircontent.cxx2
-rwxr-xr-x[-rw-r--r--]soltools/mkdepend/makefile.mk20
-rw-r--r--soltools/prj/build.lst2
-rwxr-xr-x[-rw-r--r--]soltools/util/makefile.pmk18
-rw-r--r--splitbuild/base.lst1
-rw-r--r--splitbuild/binfilter.lst1
-rwxr-xr-xsplitbuild/bm4
-rw-r--r--splitbuild/build.lst1
-rw-r--r--splitbuild/calc.lst1
-rw-r--r--splitbuild/common.lst1
-rw-r--r--splitbuild/content.lst1
-rw-r--r--splitbuild/draw.lst1
-rw-r--r--splitbuild/extensions.lst1
-rw-r--r--splitbuild/extern.lst1
-rwxr-xr-xsplitbuild/filter.lst1
-rw-r--r--splitbuild/framework.lst1
-rw-r--r--splitbuild/gui.lst1
-rw-r--r--splitbuild/prj/build.lst2
-rw-r--r--splitbuild/prj/d.lst1
-rw-r--r--splitbuild/start.lst1
-rw-r--r--splitbuild/uno.lst1
-rw-r--r--splitbuild/writer.lst1
-rw-r--r--starmath/inc/action.hxx2
-rw-r--r--starmath/inc/config.hxx4
-rw-r--r--starmath/inc/document.hxx2
-rw-r--r--starmath/inc/format.hxx4
-rw-r--r--starmath/inc/smmod.hxx9
-rw-r--r--starmath/inc/starmath.hrc2
-rw-r--r--starmath/inc/symbol.hxx4
-rw-r--r--starmath/sdi/makefile.mk10
-rw-r--r--starmath/sdi/smitems.sdi (renamed from starmath/sdi/svxitems.sdi)0
-rw-r--r--starmath/sdi/smslots.sdi16
-rw-r--r--starmath/source/accessibility.cxx2
-rw-r--r--starmath/source/accessibility.hxx2
-rw-r--r--starmath/source/cfgitem.cxx2
-rw-r--r--starmath/source/cfgitem.hxx4
-rw-r--r--starmath/source/config.cxx16
-rw-r--r--starmath/source/dialog.cxx6
-rw-r--r--starmath/source/document.cxx28
-rw-r--r--starmath/source/edit.cxx8
-rw-r--r--starmath/source/math_pch.cxx36
-rw-r--r--starmath/source/mathmlexport.cxx24
-rw-r--r--starmath/source/mathmlimport.cxx140
-rw-r--r--starmath/source/parse.cxx2
-rw-r--r--starmath/source/smdetect.cxx6
-rw-r--r--starmath/source/smmod.cxx17
-rw-r--r--starmath/source/toolbox.cxx4
-rw-r--r--starmath/source/typemap.cxx6
-rw-r--r--starmath/source/unomodel.cxx2
-rw-r--r--starmath/source/view.cxx18
-rw-r--r--stoc/test/javavm/testapplet/TestApplet.java1
-rw-r--r--stoc/test/javavm/testapplet/makefile.mk2
-rw-r--r--stoc/test/javavm/testcomponent/TestComponent.java5
-rw-r--r--stoc/test/javavm/testcomponent/makefile.mk2
-rw-r--r--stoc/test/uriproc/makefile.mk4
-rw-r--r--stoc/test/uriproc/test_uriproc.cxx2
-rw-r--r--svl/inc/PasswordHelper.hxx (renamed from svtools/inc/PasswordHelper.hxx)2
-rw-r--r--svl/inc/adrparse.hxx (renamed from svtools/inc/adrparse.hxx)2
-rw-r--r--svl/inc/broadcast.hxx (renamed from svtools/inc/broadcast.hxx)2
-rw-r--r--svl/inc/cntnrsrt.hxx (renamed from svtools/inc/cntnrsrt.hxx)0
-rw-r--r--svl/inc/cntwids.hrc (renamed from svtools/inc/cntwids.hrc)0
-rw-r--r--svl/inc/converter.hxx (renamed from svtools/source/svsql/converter.hxx)2
-rw-r--r--svl/inc/filenotation.hxx (renamed from svtools/inc/filenotation.hxx)2
-rw-r--r--svl/inc/folderrestriction.hxx (renamed from svtools/inc/folderrestriction.hxx)2
-rw-r--r--svl/inc/fstathelper.hxx (renamed from svtools/inc/fstathelper.hxx)2
-rw-r--r--svl/inc/inetdef.hxx (renamed from svtools/inc/inetdef.hxx)0
-rw-r--r--svl/inc/inetmsg.hxx (renamed from svtools/inc/inetmsg.hxx)0
-rw-r--r--svl/inc/inetstrm.hxx (renamed from svtools/inc/inetstrm.hxx)0
-rw-r--r--svl/inc/instrm.hxx (renamed from svtools/inc/instrm.hxx)2
-rw-r--r--svl/inc/listener.hxx (renamed from svtools/inc/listener.hxx)2
-rw-r--r--svl/inc/listeneriter.hxx (renamed from svtools/inc/listeneriter.hxx)2
-rw-r--r--svl/inc/lngmisc.hxx (renamed from svtools/inc/lngmisc.hxx)2
-rw-r--r--svl/inc/makefile.mk52
-rw-r--r--svl/inc/memberid.hrc (renamed from svtools/inc/memberid.hrc)0
-rw-r--r--svl/inc/nfsymbol.hxx (renamed from svtools/inc/nfsymbol.hxx)0
-rw-r--r--svl/inc/numuno.hxx (renamed from svtools/inc/numuno.hxx)4
-rw-r--r--svl/inc/outstrm.hxx (renamed from svtools/inc/outstrm.hxx)2
-rw-r--r--svl/inc/pch/precompiled_svl.cxx (renamed from sandbox/com/sun/star/lib/sandbox/Permission.java)8
-rw-r--r--svl/inc/pch/precompiled_svl.hxx435
-rw-r--r--svl/inc/pickerhelper.hxx (renamed from svtools/inc/pickerhelper.hxx)2
-rw-r--r--svl/inc/pickerhistory.hxx (renamed from svtools/inc/pickerhistory.hxx)2
-rw-r--r--svl/inc/pickerhistoryaccess.hxx (renamed from svtools/inc/pickerhistoryaccess.hxx)2
-rw-r--r--svl/inc/poolcach.hxx (renamed from svtools/inc/poolcach.hxx)4
-rw-r--r--svl/inc/strmadpt.hxx (renamed from svtools/inc/strmadpt.hxx)2
-rw-r--r--svl/inc/stylepool.hxx (renamed from svtools/inc/stylepool.hxx)2
-rw-r--r--svl/inc/svl/aeitem.hxx (renamed from svtools/inc/svtools/aeitem.hxx)8
-rw-r--r--svl/inc/svl/brdcst.hxx (renamed from svtools/inc/svtools/brdcst.hxx)4
-rw-r--r--svl/inc/svl/cancel.hxx (renamed from svtools/inc/svtools/cancel.hxx)8
-rw-r--r--svl/inc/svl/cenumitm.hxx (renamed from svtools/inc/svtools/cenumitm.hxx)4
-rw-r--r--svl/inc/svl/cintitem.hxx (renamed from svtools/inc/svtools/cintitem.hxx)4
-rw-r--r--svl/inc/svl/cjkoptions.hxx (renamed from svtools/inc/svtools/cjkoptions.hxx)6
-rw-r--r--svl/inc/svl/cnclhint.hxx (renamed from svtools/inc/svtools/cnclhint.hxx)4
-rw-r--r--svl/inc/svl/cntwall.hxx (renamed from svtools/inc/svtools/cntwall.hxx)4
-rw-r--r--svl/inc/svl/ctloptions.hxx (renamed from svtools/inc/svtools/ctloptions.hxx)13
-rw-r--r--svl/inc/svl/ctypeitm.hxx (renamed from svtools/inc/svtools/ctypeitm.hxx)4
-rw-r--r--svl/inc/svl/custritm.hxx (renamed from svtools/inc/svtools/custritm.hxx)4
-rw-r--r--svl/inc/svl/dateitem.hxx (renamed from svtools/inc/svtools/dateitem.hxx)2
-rw-r--r--svl/inc/svl/documentlockfile.hxx (renamed from svtools/inc/svtools/documentlockfile.hxx)6
-rw-r--r--svl/inc/svl/eitem.hxx (renamed from svtools/inc/svtools/eitem.hxx)8
-rw-r--r--svl/inc/svl/filerec.hxx (renamed from svtools/inc/svtools/filerec.hxx)4
-rw-r--r--svl/inc/svl/flagitem.hxx (renamed from svtools/inc/svtools/flagitem.hxx)8
-rw-r--r--svl/inc/svl/globalnameitem.hxx (renamed from svtools/inc/svtools/globalnameitem.hxx)6
-rw-r--r--svl/inc/svl/hint.hxx (renamed from svtools/inc/svtools/hint.hxx)2
-rw-r--r--svl/inc/svl/httpcook.hxx (renamed from svtools/inc/svtools/httpcook.hxx)2
-rw-r--r--svl/inc/svl/ilstitem.hxx (renamed from svtools/inc/svtools/ilstitem.hxx)4
-rw-r--r--svl/inc/svl/imageitm.hxx (renamed from svtools/inc/svtools/imageitm.hxx)6
-rw-r--r--svl/inc/svl/inethist.hxx (renamed from svtools/inc/svtools/inethist.hxx)6
-rw-r--r--svl/inc/svl/inettype.hxx (renamed from svtools/inc/svtools/inettype.hxx)2
-rw-r--r--svl/inc/svl/intitem.hxx (renamed from svtools/inc/svtools/intitem.hxx)16
-rw-r--r--svl/inc/svl/isethint.hxx (renamed from svtools/inc/svtools/isethint.hxx)4
-rw-r--r--svl/inc/svl/itemiter.hxx (renamed from svtools/inc/svtools/itemiter.hxx)4
-rw-r--r--svl/inc/svl/itempool.hxx (renamed from svtools/inc/svtools/itempool.hxx)6
-rw-r--r--svl/inc/svl/itemprop.hxx (renamed from svtools/inc/svtools/itemprop.hxx)4
-rw-r--r--svl/inc/svl/itemset.hxx (renamed from svtools/inc/svtools/itemset.hxx)4
-rw-r--r--svl/inc/svl/languageoptions.hxx (renamed from svtools/inc/svtools/languageoptions.hxx)14
-rw-r--r--svl/inc/svl/lckbitem.hxx (renamed from svtools/inc/svtools/lckbitem.hxx)4
-rw-r--r--svl/inc/svl/lockfilecommon.hxx (renamed from svtools/inc/svtools/lockfilecommon.hxx)4
-rw-r--r--svl/inc/svl/lstner.hxx (renamed from svtools/inc/svtools/lstner.hxx)4
-rw-r--r--svl/inc/svl/macitem.hxx (renamed from svtools/inc/svtools/macitem.hxx)10
-rw-r--r--svl/inc/svl/metitem.hxx (renamed from svtools/inc/svtools/metitem.hxx)8
-rw-r--r--svl/inc/svl/nfkeytab.hxx (renamed from svtools/inc/svtools/nfkeytab.hxx)0
-rw-r--r--svl/inc/svl/nfversi.hxx (renamed from svtools/inc/svtools/nfversi.hxx)0
-rw-r--r--svl/inc/svl/nranges.hxx (renamed from svtools/inc/svtools/nranges.hxx)4
-rw-r--r--svl/inc/svl/ondemand.hxx (renamed from svtools/inc/svtools/ondemand.hxx)2
-rw-r--r--svl/inc/svl/ownlist.hxx (renamed from svtools/inc/svtools/ownlist.hxx)8
-rw-r--r--svl/inc/svl/poolitem.hxx (renamed from svtools/inc/svtools/poolitem.hxx)6
-rw-r--r--svl/inc/svl/ptitem.hxx (renamed from svtools/inc/svtools/ptitem.hxx)8
-rw-r--r--svl/inc/svl/rectitem.hxx (renamed from svtools/inc/svtools/rectitem.hxx)8
-rw-r--r--svl/inc/svl/restrictedpaths.hxx (renamed from svtools/inc/svtools/restrictedpaths.hxx)6
-rw-r--r--svl/inc/svl/rngitem.hxx (renamed from svtools/inc/svtools/rngitem.hxx)12
-rw-r--r--svl/inc/svl/sfontitm.hxx (renamed from svtools/inc/svtools/sfontitm.hxx)2
-rw-r--r--svl/inc/svl/sharecontrolfile.hxx (renamed from svtools/inc/svtools/sharecontrolfile.hxx)6
-rw-r--r--svl/inc/svl/slstitm.hxx (renamed from svtools/inc/svtools/slstitm.hxx)4
-rw-r--r--svl/inc/svl/smplhint.hxx (renamed from svtools/inc/svtools/smplhint.hxx)4
-rw-r--r--svl/inc/svl/solar.hrc (renamed from svtools/inc/svtools/solar.hrc)18
-rw-r--r--svl/inc/svl/stritem.hxx (renamed from svtools/inc/svtools/stritem.hxx)6
-rw-r--r--svl/inc/svl/style.hrc (renamed from svtools/inc/svtools/style.hrc)0
-rw-r--r--svl/inc/svl/style.hxx (renamed from svtools/inc/svtools/style.hxx)38
-rw-r--r--svl/inc/svl/svarray.hxx (renamed from svtools/inc/svtools/svarray.hxx)2
-rw-r--r--svl/inc/svl/svdde.hxx (renamed from svtools/inc/svtools/svdde.hxx)34
-rw-r--r--svl/inc/svl/svldata.hxx (renamed from svtools/source/misc1/iniadrtk.cxx)79
-rw-r--r--svl/inc/svl/svldllapi.h (renamed from svtools/inc/svtools/svldllapi.h)0
-rw-r--r--svl/inc/svl/svstdarr.hxx (renamed from svtools/inc/svtools/svstdarr.hxx)4
-rw-r--r--svl/inc/svl/svtools.hrc (renamed from svtools/inc/svtools/svtools.hrc)12
-rw-r--r--svl/inc/svl/szitem.hxx (renamed from svtools/inc/svtools/szitem.hxx)2
-rw-r--r--svl/inc/svl/undo.hxx (renamed from svtools/inc/svtools/undo.hxx)16
-rw-r--r--svl/inc/svl/urlfilter.hxx (renamed from svtools/inc/svtools/urlfilter.hxx)0
-rw-r--r--svl/inc/svl/visitem.hxx (renamed from svtools/inc/svtools/visitem.hxx)4
-rw-r--r--svl/inc/svl/zforlist.hxx (renamed from svtools/inc/svtools/zforlist.hxx)60
-rw-r--r--svl/inc/svl/zformat.hxx (renamed from svtools/inc/svtools/zformat.hxx)56
-rw-r--r--svl/inc/urihelper.hxx (renamed from svtools/inc/urihelper.hxx)20
-rw-r--r--svl/inc/urlbmk.hxx (renamed from svtools/inc/urlbmk.hxx)0
-rw-r--r--svl/inc/whiter.hxx (renamed from svtools/inc/whiter.hxx)2
-rw-r--r--svl/inc/xmlement.hxx (renamed from svtools/inc/xmlement.hxx)0
-rw-r--r--svl/prj/build.lst22
-rw-r--r--svl/prj/d.lst22
-rw-r--r--svl/qa/complex/ConfigItems/CheckConfigItems.java (renamed from svtools/qa/complex/ConfigItems/CheckConfigItems.java)2
-rw-r--r--svl/qa/complex/ConfigItems/helper/AccessibilityOptTest.cxx (renamed from svtools/qa/complex/ConfigItems/helper/AccessibilityOptTest.cxx)0
-rw-r--r--svl/qa/complex/ConfigItems/helper/AccessibilityOptTest.hxx (renamed from svtools/qa/complex/ConfigItems/helper/AccessibilityOptTest.hxx)2
-rw-r--r--svl/qa/complex/ConfigItems/helper/ConfigItemTest.cxx (renamed from svtools/qa/complex/ConfigItems/helper/ConfigItemTest.cxx)12
-rw-r--r--svl/qa/complex/ConfigItems/helper/HistoryOptTest.cxx (renamed from svtools/qa/complex/ConfigItems/helper/HistoryOptTest.cxx)2
-rw-r--r--svl/qa/complex/ConfigItems/helper/HistoryOptTest.hxx (renamed from svtools/qa/complex/ConfigItems/helper/HistoryOptTest.hxx)2
-rw-r--r--svl/qa/complex/ConfigItems/helper/PrintOptTest.cxx (renamed from svtools/qa/complex/ConfigItems/helper/PrintOptTest.cxx)0
-rw-r--r--svl/qa/complex/ConfigItems/helper/PrintOptTest.hxx (renamed from svtools/qa/complex/ConfigItems/helper/PrintOptTest.hxx)2
-rw-r--r--svl/qa/complex/ConfigItems/helper/UserOptTest.cxx (renamed from svtools/qa/complex/ConfigItems/helper/UserOptTest.cxx)0
-rw-r--r--svl/qa/complex/ConfigItems/helper/UserOptTest.hxx (renamed from svtools/qa/complex/ConfigItems/helper/UserOptTest.hxx)2
-rw-r--r--svl/qa/complex/ConfigItems/helper/exports.map (renamed from svtools/qa/complex/ConfigItems/helper/exports.map)0
-rw-r--r--svl/qa/complex/ConfigItems/helper/makefile.mk (renamed from svtools/qa/complex/ConfigItems/helper/makefile.mk)4
-rw-r--r--svl/qa/complex/ConfigItems/makefile.mk (renamed from svtools/qa/complex/ConfigItems/makefile.mk)2
-rw-r--r--svl/qa/complex/passwordcontainer/MasterPasswdHandler.java (renamed from svtools/qa/complex/passwordcontainer/MasterPasswdHandler.java)0
-rw-r--r--svl/qa/complex/passwordcontainer/PasswordContainerTest.java (renamed from svtools/qa/complex/passwordcontainer/PasswordContainerTest.java)0
-rw-r--r--svl/qa/complex/passwordcontainer/PasswordContainerUnitTest.java (renamed from svtools/qa/complex/passwordcontainer/PasswordContainerUnitTest.java)0
-rw-r--r--svl/qa/complex/passwordcontainer/Test01.java (renamed from svtools/qa/complex/passwordcontainer/Test01.java)0
-rw-r--r--svl/qa/complex/passwordcontainer/Test02.java (renamed from svtools/qa/complex/passwordcontainer/Test02.java)0
-rw-r--r--svl/qa/complex/passwordcontainer/Test03.java (renamed from svtools/qa/complex/passwordcontainer/Test03.java)0
-rw-r--r--svl/qa/complex/passwordcontainer/TestHelper.java (renamed from svtools/qa/complex/passwordcontainer/TestHelper.java)0
-rw-r--r--svl/qa/complex/passwordcontainer/makefile.mk (renamed from svtools/qa/complex/passwordcontainer/makefile.mk)2
-rwxr-xr-xsvl/qa/export.map (renamed from svtools/qa/export.map)0
-rw-r--r--svl/qa/makefile.mk (renamed from svtools/qa/makefile.mk)23
-rw-r--r--svl/qa/test_URIHelper.cxx (renamed from svtools/qa/test_URIHelper.cxx)4
-rw-r--r--svl/source/config/cjkoptions.cxx (renamed from svtools/source/config/cjkoptions.cxx)13
-rw-r--r--svl/source/config/ctloptions.cxx (renamed from svtools/source/config/ctloptions.cxx)42
-rw-r--r--svl/source/config/itemholder2.cxx182
-rw-r--r--svl/source/config/itemholder2.hxx92
-rw-r--r--svl/source/config/languageoptions.cxx (renamed from svtools/source/config/languageoptions.cxx)40
-rw-r--r--svl/source/config/makefile.mk (renamed from sandbox/test/com/sun/star/lib/sandbox/makefile.mk)27
-rw-r--r--svl/source/filepicker/makefile.mk (renamed from svtools/source/filepicker/makefile.mk)2
-rw-r--r--svl/source/filepicker/pickerhelper.cxx (renamed from svtools/source/filepicker/pickerhelper.cxx)2
-rw-r--r--svl/source/filepicker/pickerhistory.cxx (renamed from svtools/source/filepicker/pickerhistory.cxx)2
-rw-r--r--svl/source/filerec/filerec.cxx (renamed from svtools/source/filerec/filerec.cxx)4
-rw-r--r--svl/source/filerec/makefile.mk (renamed from svtools/source/filerec/makefile.mk)2
-rw-r--r--svl/source/fsstor/exports.map (renamed from svtools/source/fsstor/exports.map)0
-rw-r--r--svl/source/fsstor/fsfactory.cxx (renamed from svtools/source/fsstor/fsfactory.cxx)2
-rw-r--r--svl/source/fsstor/fsstorage.cxx (renamed from svtools/source/fsstor/fsstorage.cxx)2
-rw-r--r--svl/source/fsstor/fsstorage.hxx (renamed from svtools/source/fsstor/fsstorage.hxx)0
-rw-r--r--svl/source/fsstor/makefile.mk (renamed from svtools/source/fsstor/makefile.mk)2
-rw-r--r--svl/source/fsstor/oinputstreamcontainer.cxx (renamed from svtools/source/fsstor/oinputstreamcontainer.cxx)2
-rw-r--r--svl/source/fsstor/oinputstreamcontainer.hxx (renamed from svtools/source/fsstor/oinputstreamcontainer.hxx)0
-rw-r--r--svl/source/fsstor/ostreamcontainer.cxx (renamed from svtools/source/fsstor/ostreamcontainer.cxx)2
-rw-r--r--svl/source/fsstor/ostreamcontainer.hxx (renamed from svtools/source/fsstor/ostreamcontainer.hxx)0
-rw-r--r--svl/source/inc/fsfactory.hxx (renamed from svtools/source/inc/fsfactory.hxx)0
-rw-r--r--svl/source/inc/passwordcontainer.hxx (renamed from svtools/source/inc/passwordcontainer.hxx)0
-rw-r--r--svl/source/inc/poolio.hxx (renamed from svtools/source/inc/poolio.hxx)2
-rw-r--r--svl/source/items/aeitem.cxx (renamed from svtools/source/items/aeitem.cxx)8
-rw-r--r--svl/source/items/cenumitm.cxx (renamed from svtools/source/items1/cenumitm.cxx)4
-rw-r--r--svl/source/items/cintitem.cxx (renamed from svtools/source/items1/cintitem.cxx)4
-rw-r--r--svl/source/items/cntwall.cxx (renamed from svtools/source/items1/cntwall.cxx)4
-rw-r--r--svl/source/items/cstitem.src (renamed from svtools/source/misc/config.src)18
-rw-r--r--svl/source/items/ctypeitm.cxx (renamed from svtools/source/items1/ctypeitm.cxx)4
-rw-r--r--svl/source/items/custritm.cxx (renamed from svtools/source/items1/custritm.cxx)4
-rw-r--r--svl/source/items/dateitem.cxx (renamed from svtools/source/items1/dateitem.cxx)16
-rw-r--r--svl/source/items/eitem.cxx (renamed from svtools/source/items/eitem.cxx)4
-rw-r--r--svl/source/items/flagitem.cxx (renamed from svtools/source/items/flagitem.cxx)6
-rw-r--r--svl/source/items/globalnameitem.cxx (renamed from svtools/source/items/globalnameitem.cxx)4
-rw-r--r--svl/source/items/ilstitem.cxx (renamed from svtools/source/items1/ilstitem.cxx)6
-rw-r--r--svl/source/items/imageitm.cxx (renamed from svtools/source/items/imageitm.cxx)4
-rw-r--r--svl/source/items/intitem.cxx (renamed from svtools/source/items/intitem.cxx)6
-rw-r--r--svl/source/items/itemiter.cxx (renamed from svtools/source/items1/itemiter.cxx)8
-rw-r--r--svl/source/items/itempool.cxx (renamed from svtools/source/items1/itempool.cxx)16
-rw-r--r--svl/source/items/itemprop.cxx (renamed from svtools/source/items1/itemprop.cxx)22
-rw-r--r--svl/source/items/itemset.cxx (renamed from svtools/source/items1/itemset.cxx)12
-rw-r--r--svl/source/items/lckbitem.cxx (renamed from svtools/source/items1/lckbitem.cxx)6
-rw-r--r--svl/source/items/macitem.cxx (renamed from svtools/source/items/macitem.cxx)4
-rw-r--r--svl/source/items/makefile.mk (renamed from svtools/source/items1/makefile.mk)34
-rw-r--r--svl/source/items/nranges.cxx (renamed from svtools/source/items1/nranges.cxx)2
-rw-r--r--svl/source/items/poolcach.cxx (renamed from svtools/source/items/poolcach.cxx)6
-rw-r--r--svl/source/items/poolio.cxx (renamed from svtools/source/items1/poolio.cxx)18
-rw-r--r--svl/source/items/poolitem.cxx (renamed from svtools/source/items1/poolitem.cxx)4
-rw-r--r--svl/source/items/ptitem.cxx (renamed from svtools/source/items/ptitem.cxx)6
-rw-r--r--svl/source/items/rectitem.cxx (renamed from svtools/source/items/rectitem.cxx)6
-rw-r--r--svl/source/items/rngitem.cxx (renamed from svtools/source/items/rngitem.cxx)6
-rwxr-xr-xsvl/source/items/rngitem_inc.cxx (renamed from svtools/source/items/rngitem_inc.cxx)0
-rw-r--r--svl/source/items/sfontitm.cxx (renamed from svtools/source/items1/sfontitm.cxx)4
-rw-r--r--svl/source/items/sitem.cxx (renamed from svtools/source/items1/sitem.cxx)6
-rw-r--r--svl/source/items/slstitm.cxx (renamed from svtools/source/items1/slstitm.cxx)6
-rw-r--r--svl/source/items/stritem.cxx (renamed from svtools/source/items/stritem.cxx)4
-rw-r--r--svl/source/items/style.cxx (renamed from svtools/source/items/style.cxx)33
-rw-r--r--svl/source/items/stylepool.cxx (renamed from svtools/source/items1/stylepool.cxx)6
-rw-r--r--svl/source/items/szitem.cxx (renamed from svtools/source/items/szitem.cxx)6
-rw-r--r--svl/source/items/visitem.cxx (renamed from svtools/source/items1/visitem.cxx)4
-rw-r--r--svl/source/items/whassert.hxx (renamed from svtools/source/items1/whassert.hxx)0
-rw-r--r--svl/source/items/whiter.cxx (renamed from svtools/source/items1/whiter.cxx)4
-rw-r--r--svl/source/memtools/makefile.mk (renamed from svtools/source/memtools/makefile.mk)2
-rw-r--r--svl/source/memtools/svarray.cxx (renamed from svtools/source/memtools/svarray.cxx)4
-rw-r--r--svl/source/misc/PasswordHelper.cxx (renamed from svtools/source/misc1/PasswordHelper.cxx)2
-rw-r--r--svl/source/misc/adrparse.cxx (renamed from svtools/source/misc1/adrparse.cxx)8
-rw-r--r--svl/source/misc/documentlockfile.cxx (renamed from svtools/source/misc/documentlockfile.cxx)6
-rw-r--r--svl/source/misc/filenotation.cxx (renamed from svtools/source/misc1/filenotation.cxx)2
-rw-r--r--svl/source/misc/folderrestriction.cxx (renamed from svtools/source/misc1/folderrestriction.cxx)2
-rw-r--r--svl/source/misc/fstathelper.cxx (renamed from svtools/source/misc1/fstathelper.cxx)2
-rw-r--r--svl/source/misc/inethist.cxx (renamed from svtools/source/misc1/inethist.cxx)4
-rw-r--r--svl/source/misc/inettype.cxx (renamed from svtools/source/misc1/inettype.cxx)18
-rw-r--r--svl/source/misc/lngmisc.cxx (renamed from svtools/source/misc1/lngmisc.cxx)2
-rw-r--r--svl/source/misc/lockfilecommon.cxx (renamed from svtools/source/misc/lockfilecommon.cxx)6
-rw-r--r--svl/source/misc/makefile.mk (renamed from svtools/source/misc1/makefile.mk)15
-rw-r--r--svl/source/misc/mediatyp.src (renamed from svtools/source/misc1/mediatyp.src)2
-rw-r--r--svl/source/misc/ownlist.cxx (renamed from svtools/source/misc/ownlist.cxx)4
-rw-r--r--svl/source/misc/restrictedpaths.cxx (renamed from svtools/source/misc/restrictedpaths.cxx)6
-rw-r--r--svl/source/misc/sharecontrolfile.cxx (renamed from svtools/source/misc/sharecontrolfile.cxx)6
-rw-r--r--svl/source/misc/strmadpt.cxx (renamed from svtools/source/misc1/strmadpt.cxx)2
-rw-r--r--svl/source/misc/svldata.cxx (renamed from svtools/source/misc1/svtdata.cxx)49
-rw-r--r--svl/source/misc/urihelper.cxx (renamed from svtools/source/misc/urihelper.cxx)10
-rw-r--r--svl/source/notify/brdcst.cxx (renamed from svtools/source/notify/brdcst.cxx)10
-rw-r--r--svl/source/notify/broadcast.cxx (renamed from svtools/source/notify/broadcast.cxx)4
-rw-r--r--svl/source/notify/cancel.cxx (renamed from svtools/source/notify/cancel.cxx)8
-rw-r--r--svl/source/notify/hint.cxx (renamed from svtools/source/notify/hint.cxx)4
-rw-r--r--svl/source/notify/isethint.cxx (renamed from svtools/source/notify/isethint.cxx)6
-rw-r--r--svl/source/notify/listener.cxx (renamed from svtools/source/notify/listener.cxx)2
-rw-r--r--svl/source/notify/listenerbase.cxx (renamed from svtools/source/notify/listenerbase.cxx)2
-rw-r--r--svl/source/notify/listenerbase.hxx (renamed from svtools/source/notify/listenerbase.hxx)0
-rw-r--r--svl/source/notify/listeneriter.cxx (renamed from svtools/source/notify/listeneriter.cxx)2
-rw-r--r--svl/source/notify/lstner.cxx (renamed from svtools/source/notify/lstner.cxx)8
-rw-r--r--svl/source/notify/makefile.mk (renamed from svtools/source/notify/makefile.mk)2
-rw-r--r--svl/source/notify/smplhint.cxx (renamed from svtools/source/notify/smplhint.cxx)4
-rw-r--r--svl/source/numbers/makefile.mk (renamed from svtools/source/numbers/makefile.mk)4
-rw-r--r--svl/source/numbers/nbdll.cxx (renamed from svtools/source/numbers/nbdll.cxx)2
-rw-r--r--svl/source/numbers/numfmuno.cxx (renamed from svtools/source/numbers/numfmuno.cxx)9
-rw-r--r--svl/source/numbers/numfmuno.hxx (renamed from svtools/source/numbers/numfmuno.hxx)0
-rw-r--r--svl/source/numbers/numhead.cxx (renamed from svtools/source/numbers/numhead.cxx)2
-rw-r--r--svl/source/numbers/numhead.hxx (renamed from svtools/source/numbers/numhead.hxx)0
-rw-r--r--svl/source/numbers/numuno.cxx (renamed from svtools/source/numbers/numuno.cxx)5
-rw-r--r--svl/source/numbers/supservs.cxx (renamed from svtools/source/numbers/supservs.cxx)3
-rw-r--r--svl/source/numbers/supservs.hxx (renamed from svtools/source/numbers/supservs.hxx)2
-rw-r--r--svl/source/numbers/zforfind.cxx (renamed from svtools/source/numbers/zforfind.cxx)8
-rw-r--r--svl/source/numbers/zforfind.hxx (renamed from svtools/inc/zforfind.hxx)0
-rw-r--r--svl/source/numbers/zforlist.cxx (renamed from svtools/source/numbers/zforlist.cxx)66
-rw-r--r--svl/source/numbers/zformat.cxx (renamed from svtools/source/numbers/zformat.cxx)6
-rw-r--r--svl/source/numbers/zforscan.cxx (renamed from svtools/source/numbers/zforscan.cxx)6
-rw-r--r--svl/source/numbers/zforscan.hxx (renamed from svtools/source/numbers/zforscan.hxx)2
-rw-r--r--svl/source/passwordcontainer/exports.map (renamed from svtools/source/passwordcontainer/exports.map)0
-rw-r--r--svl/source/passwordcontainer/makefile.mk (renamed from svtools/source/passwordcontainer/makefile.mk)2
-rw-r--r--svl/source/passwordcontainer/passwordcontainer.cxx (renamed from svtools/source/passwordcontainer/passwordcontainer.cxx)8
-rw-r--r--svl/source/passwordcontainer/syscreds.cxx (renamed from svtools/source/passwordcontainer/syscreds.cxx)9
-rw-r--r--svl/source/passwordcontainer/syscreds.hxx (renamed from svtools/source/passwordcontainer/syscreds.hxx)2
-rw-r--r--svl/source/svdde/ddecli.cxx (renamed from svtools/source/svdde/ddecli.cxx)14
-rw-r--r--svl/source/svdde/ddedata.cxx (renamed from svtools/source/svdde/ddedata.cxx)4
-rw-r--r--svl/source/svdde/ddedll.cxx (renamed from svtools/source/svdde/ddedll.cxx)2
-rw-r--r--svl/source/svdde/ddeimp.hxx (renamed from svtools/source/svdde/ddeimp.hxx)0
-rw-r--r--svl/source/svdde/ddeinf.cxx (renamed from svtools/source/svdde/ddeinf.cxx)4
-rw-r--r--svl/source/svdde/ddeml1.cxx (renamed from svtools/source/svdde/ddeml1.cxx)2
-rw-r--r--svl/source/svdde/ddeml2.cxx (renamed from svtools/source/svdde/ddeml2.cxx)2
-rw-r--r--svl/source/svdde/ddemldeb.cxx (renamed from svtools/source/svdde/ddemldeb.cxx)2
-rw-r--r--svl/source/svdde/ddemldeb.hxx (renamed from svtools/source/svdde/ddemldeb.hxx)0
-rw-r--r--svl/source/svdde/ddemlimp.hxx (renamed from svtools/source/svdde/ddemlimp.hxx)0
-rw-r--r--svl/source/svdde/ddemlos2.h (renamed from svtools/source/svdde/ddemlos2.h)0
-rw-r--r--svl/source/svdde/ddestrg.cxx (renamed from svtools/source/svdde/ddestrg.cxx)4
-rw-r--r--svl/source/svdde/ddesvr.cxx (renamed from svtools/source/svdde/ddesvr.cxx)6
-rw-r--r--svl/source/svdde/ddewrap.cxx (renamed from svtools/source/svdde/ddewrap.cxx)2
-rw-r--r--svl/source/svdde/ddewrap.hxx (renamed from svtools/source/svdde/ddewrap.hxx)0
-rw-r--r--svl/source/svdde/makefile.mk (renamed from svtools/source/svdde/makefile.mk)4
-rw-r--r--svl/source/svsql/converter.cxx (renamed from svtools/source/svsql/converter.cxx)2
-rw-r--r--svl/source/svsql/makefile.mk (renamed from svtools/source/svsql/makefile.mk)2
-rw-r--r--svl/source/undo/makefile.mk (renamed from svtools/source/undo/makefile.mk)4
-rw-r--r--svl/source/undo/undo.cxx (renamed from svtools/source/undo/undo.cxx)18
-rw-r--r--svl/source/uno/makefile.mk51
-rw-r--r--svl/source/uno/pathservice.cxx (renamed from svtools/uno/pathservice.cxx)6
-rw-r--r--svl/source/uno/registerservices.cxx (renamed from svtools/source/uno/registerservices.cxx)27
-rw-r--r--svl/unx/inc/convert.hxx (renamed from svtools/unx/inc/convert.hxx)0
-rw-r--r--svl/unx/source/svdde/ddedummy.cxx (renamed from svtools/unx/source/svdde/ddedummy.cxx)4
-rw-r--r--svl/unx/source/svdde/makefile.mk (renamed from svtools/unx/source/svdde/makefile.mk)4
-rw-r--r--svl/util/makefile.mk126
-rw-r--r--svl/util/svl.pmk (renamed from svtools/util/svl.pmk)0
-rw-r--r--svtools/bmpmaker/bmp.cxx2
-rw-r--r--svtools/bmpmaker/bmpsum.cxx2
-rw-r--r--svtools/inc/apearcfg.hxx1
-rw-r--r--svtools/inc/extcolorcfg.hxx4
-rw-r--r--svtools/inc/filedlg2.hrc (renamed from svtools/source/dialogs/filedlg2.hrc)0
-rw-r--r--svtools/inc/flbytes.hxx174
-rw-r--r--svtools/inc/fontsubstconfig.hxx1
-rw-r--r--svtools/inc/imgdef.hxx11
-rw-r--r--svtools/inc/inidef.hxx146
-rw-r--r--svtools/inc/iniprop.hxx64
-rw-r--r--svtools/inc/reginfo.hxx65
-rw-r--r--svtools/inc/rtfkeywd.hxx (renamed from svtools/source/svrtf/rtfkeywd.hxx)0
-rw-r--r--svtools/inc/rtfout.hxx (renamed from svtools/source/svrtf/rtfout.hxx)0
-rw-r--r--svtools/inc/rtftoken.h (renamed from svtools/source/svrtf/rtftoken.h)0
-rw-r--r--svtools/inc/svtools/accessibilityoptions.hxx8
-rw-r--r--svtools/inc/svtools/addxmltostorageoptions.hxx162
-rw-r--r--svtools/inc/svtools/bintitem.hxx88
-rw-r--r--svtools/inc/svtools/colorcfg.hxx11
-rw-r--r--svtools/inc/svtools/cstitem.hxx94
-rw-r--r--svtools/inc/svtools/dtritem.hxx93
-rw-r--r--svtools/inc/svtools/fmtfield.hxx2
-rw-r--r--svtools/inc/svtools/frqitem.hxx178
-rw-r--r--svtools/inc/svtools/helpid.hrc2
-rw-r--r--svtools/inc/svtools/helpopt.hxx4
-rw-r--r--svtools/inc/svtools/htmlout.hxx2
-rw-r--r--svtools/inc/svtools/imapobj.hxx2
-rw-r--r--svtools/inc/svtools/insdlg.hxx2
-rw-r--r--svtools/inc/svtools/menuoptions.hxx12
-rw-r--r--svtools/inc/svtools/miscopt.hxx8
-rw-r--r--svtools/inc/svtools/optionsdrawinglayer.hxx6
-rw-r--r--svtools/inc/svtools/parhtml.hxx2
-rw-r--r--svtools/inc/svtools/parrtf.hxx2
-rw-r--r--svtools/inc/svtools/printoptions.hxx4
-rw-r--r--svtools/inc/svtools/svlbox.hxx2
-rw-r--r--svtools/inc/svtools/svtdata.hxx33
-rw-r--r--svtools/inc/svtools/syntaxhighlight.hxx6
-rw-r--r--svtools/inc/svtools/textdata.hxx4
-rw-r--r--svtools/inc/svtools/texteng.hxx2
-rw-r--r--svtools/inc/svtools/tfrmitem.hxx90
-rw-r--r--svtools/inc/svtools/tresitem.hxx65
-rw-r--r--svtools/inc/svtuno.hxx63
-rw-r--r--svtools/inc/twain.hxx99
-rw-r--r--svtools/inc/xmlcnimp.hxx143
-rw-r--r--svtools/prj/build.lst69
-rw-r--r--svtools/prj/d.lst312
-rw-r--r--svtools/source/brwbox/editbrowsebox.cxx2
-rw-r--r--svtools/source/brwbox/editbrowsebox.src2
-rw-r--r--svtools/source/config/accessibilityoptions.cxx11
-rw-r--r--svtools/source/config/addxmltostorageoptions.cxx291
-rw-r--r--svtools/source/config/apearcfg.cxx10
-rw-r--r--svtools/source/config/colorcfg.cxx104
-rw-r--r--svtools/source/config/extcolorcfg.cxx11
-rw-r--r--svtools/source/config/fontsubstconfig.cxx11
-rw-r--r--svtools/source/config/helpopt.cxx5
-rw-r--r--svtools/source/config/itemholder2.cxx42
-rw-r--r--svtools/source/config/itemholder2.hxx2
-rw-r--r--svtools/source/config/makefile.mk80
-rw-r--r--svtools/source/config/menuoptions.cxx20
-rw-r--r--svtools/source/config/miscopt.cxx62
-rw-r--r--svtools/source/config/optionsdrawinglayer.cxx8
-rw-r--r--svtools/source/config/printoptions.cxx7
-rw-r--r--svtools/source/config/test/test.cxx2
-rw-r--r--svtools/source/contnr/contentenumeration.cxx2
-rw-r--r--svtools/source/contnr/fileview.cxx6
-rw-r--r--svtools/source/contnr/fileview.src2
-rw-r--r--svtools/source/contnr/imivctl.hxx2
-rw-r--r--svtools/source/contnr/svcontnr.src2
-rw-r--r--svtools/source/contnr/svimpbox.cxx2
-rw-r--r--svtools/source/contnr/svimpicn.cxx2
-rw-r--r--svtools/source/contnr/svlbox.cxx2
-rw-r--r--svtools/source/contnr/svtabbx.cxx2
-rw-r--r--svtools/source/contnr/templwin.cxx14
-rw-r--r--svtools/source/contnr/templwin.hxx2
-rw-r--r--svtools/source/contnr/templwin.src2
-rw-r--r--svtools/source/contnr/treelist.cxx2
-rw-r--r--svtools/source/control/calendar.cxx2
-rw-r--r--svtools/source/control/calendar.src2
-rw-r--r--svtools/source/control/collatorres.cxx2
-rw-r--r--svtools/source/control/ctrlbox.cxx2
-rw-r--r--svtools/source/control/ctrlbox.src2
-rw-r--r--svtools/source/control/ctrltool.cxx2
-rw-r--r--svtools/source/control/ctrltool.src2
-rw-r--r--svtools/source/control/fileurlbox.cxx2
-rw-r--r--svtools/source/control/fmtfield.cxx4
-rw-r--r--svtools/source/control/indexentryres.cxx2
-rw-r--r--svtools/source/control/inettbc.cxx18
-rw-r--r--svtools/source/control/makefile.mk1
-rw-r--r--svtools/source/control/reginfo.cxx375
-rw-r--r--svtools/source/control/taskstat.cxx2
-rw-r--r--svtools/source/control/urlcontrol.cxx6
-rw-r--r--svtools/source/dialogs/addresstemplate.cxx16
-rw-r--r--svtools/source/dialogs/addresstemplate.src2
-rw-r--r--svtools/source/dialogs/logindlg.cxx2
-rw-r--r--svtools/source/dialogs/logindlg.src2
-rw-r--r--svtools/source/dialogs/printdlg.cxx2
-rw-r--r--svtools/source/dialogs/printdlg.hrc2
-rw-r--r--svtools/source/dialogs/prnsetup.hrc2
-rw-r--r--svtools/source/dialogs/propctrl.hxx (renamed from svtools/inc/propctrl.hxx)2
-rw-r--r--svtools/source/dialogs/roadmapwizard.cxx2
-rw-r--r--svtools/source/dialogs/wizardmachine.cxx2
-rw-r--r--svtools/source/dialogs/wizardmachine.src2
-rw-r--r--svtools/source/edit/svmedit.cxx10
-rw-r--r--svtools/source/edit/syntaxhighlight.cxx2
-rw-r--r--svtools/source/edit/textdat2.hxx2
-rw-r--r--svtools/source/edit/textdoc.hxx2
-rw-r--r--svtools/source/edit/texteng.cxx2
-rw-r--r--svtools/source/edit/textundo.hxx2
-rw-r--r--svtools/source/edit/textview.cxx4
-rw-r--r--svtools/source/filter.vcl/filter/SvFilterOptionsDialog.cxx4
-rw-r--r--svtools/source/filter.vcl/filter/dlgejpg.hrc2
-rw-r--r--svtools/source/filter.vcl/filter/dlgepng.hrc2
-rw-r--r--svtools/source/filter.vcl/filter/dlgexpor.hrc2
-rw-r--r--svtools/source/filter.vcl/filter/filter.cxx2
-rw-r--r--svtools/source/filter.vcl/filter/makefile.mk2
-rw-r--r--svtools/source/filter.vcl/filter/strings.hrc2
-rw-r--r--svtools/source/filter.vcl/igif/makefile.mk1
-rw-r--r--svtools/source/filter.vcl/ixbm/makefile.mk1
-rw-r--r--svtools/source/filter.vcl/ixpm/makefile.mk1
-rw-r--r--svtools/source/filter.vcl/jpeg/makefile.mk2
-rw-r--r--svtools/source/filter.vcl/wmf/wmfwr.cxx2
-rw-r--r--svtools/source/hatchwindow/hatchwindowfactory.hxx (renamed from svtools/source/inc/hatchwindowfactory.hxx)0
-rw-r--r--svtools/source/inc/filectrl.hrc (renamed from svtools/inc/filectrl.hrc)0
-rw-r--r--svtools/source/inc/gifread.hxx (renamed from svtools/inc/gifread.hxx)0
-rw-r--r--svtools/source/inc/gradwrap.hxx (renamed from svtools/inc/gradwrap.hxx)0
-rw-r--r--svtools/source/inc/iodlg.hrc (renamed from svtools/inc/iodlg.hrc)2
-rw-r--r--svtools/source/inc/jpeg.hxx (renamed from svtools/inc/jpeg.hxx)0
-rw-r--r--svtools/source/inc/msgrd.hxx (renamed from svtools/inc/msgrd.hxx)0
-rw-r--r--svtools/source/inc/msgwr.hxx (renamed from svtools/inc/msgwr.hxx)0
-rw-r--r--svtools/source/inc/property.hxx (renamed from svtools/inc/property.hxx)8
-rw-r--r--svtools/source/inc/sgfbram.hxx (renamed from svtools/inc/sgfbram.hxx)0
-rw-r--r--svtools/source/inc/sgffilt.hxx (renamed from svtools/inc/sgffilt.hxx)0
-rw-r--r--svtools/source/inc/sgvmain.hxx (renamed from svtools/inc/sgvmain.hxx)0
-rw-r--r--svtools/source/inc/sgvspln.hxx (renamed from svtools/inc/sgvspln.hxx)0
-rw-r--r--svtools/source/inc/svimpbox.hxx (renamed from svtools/inc/svimpbox.hxx)0
-rw-r--r--svtools/source/inc/svimpicn.hxx (renamed from svtools/inc/svimpicn.hxx)0
-rw-r--r--svtools/source/inc/xbmread.hxx (renamed from svtools/inc/xbmread.hxx)0
-rw-r--r--svtools/source/inc/xpmread.hxx (renamed from svtools/inc/xpmread.hxx)0
-rw-r--r--svtools/source/items1/bintitem.cxx169
-rw-r--r--svtools/source/items1/cstitem.cxx252
-rw-r--r--svtools/source/items1/cstitem.src112
-rw-r--r--svtools/source/items1/dtritem.cxx244
-rw-r--r--svtools/source/items1/frqitem.cxx580
-rw-r--r--svtools/source/items1/tfrmitem.cxx184
-rw-r--r--svtools/source/java/javaerror.src2
-rw-r--r--svtools/source/java/javainteractionhandler.cxx2
-rw-r--r--svtools/source/java/patchjavaerror.src2
-rw-r--r--svtools/source/misc/ehdl.cxx2
-rw-r--r--svtools/source/misc/ehdl.src2
-rw-r--r--svtools/source/misc/embedhlp.cxx3
-rw-r--r--svtools/source/misc/errtxt.src2
-rw-r--r--svtools/source/misc/flbytes.cxx432
-rw-r--r--svtools/source/misc/helpagent.src2
-rw-r--r--svtools/source/misc/helpagentwindow.cxx2
-rw-r--r--svtools/source/misc/imagemgr.cxx3
-rw-r--r--svtools/source/misc/imagemgr.src2
-rw-r--r--svtools/source/misc/imap.cxx2
-rw-r--r--svtools/source/misc/imap2.cxx2
-rw-r--r--svtools/source/misc/inidef.cxx269
-rw-r--r--svtools/source/misc/itemdel.cxx (renamed from svtools/source/items/itemdel.cxx)4
-rw-r--r--svtools/source/misc/langtab.cxx4
-rw-r--r--svtools/source/misc/langtab.src2
-rw-r--r--svtools/source/misc/makefile.mk37
-rw-r--r--svtools/source/misc/svtdata.cxx (renamed from svtools/source/items1/tresitem.cxx)69
-rw-r--r--svtools/source/misc/templatefoldercache.cxx2
-rw-r--r--svtools/source/misc/transfer.cxx2
-rw-r--r--svtools/source/misc/transfer2.cxx2
-rw-r--r--svtools/source/misc/wallitem.cxx (renamed from svtools/source/items/wallitem.cxx)2
-rw-r--r--svtools/source/plugapp/testtool.src2
-rw-r--r--svtools/source/productregistration/makefile.mk3
-rw-r--r--svtools/source/productregistration/productregistration.cxx20
-rw-r--r--svtools/source/productregistration/registrationdlg.cxx2
-rw-r--r--svtools/source/productregistration/registrationdlg.src2
-rw-r--r--svtools/source/svhtml/htmlout.cxx8
-rw-r--r--svtools/source/svhtml/htmlsupp.cxx2
-rw-r--r--svtools/source/svhtml/parhtml.cxx4
-rw-r--r--svtools/source/svrtf/svparser.cxx10
-rw-r--r--svtools/source/uno/addrtempuno.cxx (renamed from svtools/uno/addrtempuno.cxx)0
-rw-r--r--svtools/source/uno/makefile.mk19
-rw-r--r--svtools/source/uno/miscservices.cxx (renamed from svtools/uno/miscservices.cxx)17
-rw-r--r--svtools/source/uno/unoevent.cxx2
-rw-r--r--svtools/source/uno/unoifac2.hrc2
-rw-r--r--svtools/source/uno/unoiface.cxx2
-rw-r--r--svtools/uno/exports.map8
-rw-r--r--svtools/uno/makefile.mk81
-rw-r--r--svtools/util/makefile.mk113
-rw-r--r--svtools/util/svl.flt85
-rw-r--r--svtools/util/svt.flt81
-rw-r--r--svtools/workben/unodialog/udlg_global.hrc2
-rw-r--r--svx/inc/bolnitem.hxx2
-rw-r--r--svx/inc/bulitem.hxx2
-rw-r--r--svx/inc/charhiddenitem.hxx4
-rw-r--r--svx/inc/chrtitem.hxx2
-rw-r--r--svx/inc/clipboardctl.hxx2
-rw-r--r--svx/inc/clipfmtitem.hxx2
-rw-r--r--svx/inc/dlgutil.hxx4
-rw-r--r--svx/inc/drawitem.hxx2
-rw-r--r--svx/inc/editund2.hxx2
-rw-r--r--svx/inc/extrusioncontrols.hxx2
-rw-r--r--svx/inc/flstitem.hxx2
-rw-r--r--svx/inc/fmhelp.hrc12
-rw-r--r--svx/inc/fontitem.hxx2
-rw-r--r--svx/inc/fwdtitem.hxx2
-rw-r--r--svx/inc/galbrws2.hxx2
-rw-r--r--svx/inc/galctrl.hxx5
-rw-r--r--svx/inc/galdlg.hxx72
-rw-r--r--svx/inc/gallery.hrc55
-rw-r--r--svx/inc/galobj.hxx16
-rw-r--r--svx/inc/galtheme.hxx46
-rw-r--r--svx/inc/grafctrl.hxx4
-rw-r--r--svx/inc/helpid.hrc1043
-rw-r--r--svx/inc/hlnkitem.hxx4
-rw-r--r--svx/inc/htmlcfg.hxx3
-rw-r--r--svx/inc/linectrl.hxx2
-rw-r--r--svx/inc/nlbkitem.hxx2
-rw-r--r--svx/inc/ofaitem.hxx2
-rw-r--r--svx/inc/opaqitem.hxx2
-rw-r--r--svx/inc/optgrid.hxx2
-rw-r--r--svx/inc/optitems.hxx2
-rw-r--r--svx/inc/pch/precompiled_svx.hxx134
-rw-r--r--svx/inc/pgrditem.hxx2
-rw-r--r--svx/inc/postattr.hxx2
-rw-r--r--svx/inc/prntitem.hxx2
-rw-r--r--svx/inc/protitem.hxx2
-rw-r--r--svx/inc/rotmodit.hxx2
-rw-r--r--svx/inc/rulritem.hxx2
-rw-r--r--svx/inc/srchdlg.hxx4
-rwxr-xr-xsvx/inc/svx/EnhancedCustomShapeFunctionParser.hxx (renamed from svx/inc/EnhancedCustomShapeFunctionParser.hxx)0
-rw-r--r--svx/inc/svx/SmartTagItem.hxx2
-rw-r--r--svx/inc/svx/adjitem.hxx2
-rw-r--r--svx/inc/svx/akrnitem.hxx2
-rw-r--r--svx/inc/svx/algitem.hxx4
-rw-r--r--svx/inc/svx/blnkitem.hxx4
-rw-r--r--svx/inc/svx/borderline.hxx2
-rw-r--r--svx/inc/svx/boxitem.hxx2
-rw-r--r--svx/inc/svx/brkitem.hxx2
-rw-r--r--svx/inc/svx/brshitem.hxx2
-rw-r--r--svx/inc/svx/charreliefitem.hxx2
-rw-r--r--svx/inc/svx/charrotateitem.hxx2
-rw-r--r--svx/inc/svx/charscaleitem.hxx2
-rw-r--r--svx/inc/svx/cmapitem.hxx2
-rw-r--r--svx/inc/svx/cntritem.hxx2
-rw-r--r--svx/inc/svx/colrctrl.hxx2
-rw-r--r--svx/inc/svx/colritem.hxx2
-rw-r--r--svx/inc/svx/crsditem.hxx2
-rw-r--r--svx/inc/svx/dialogs.hrc767
-rw-r--r--svx/inc/svx/dlgctl3d.hxx2
-rw-r--r--svx/inc/svx/dlgctrl.hxx1
-rw-r--r--svx/inc/svx/e3ditem.hxx2
-rw-r--r--svx/inc/svx/editdata.hxx2
-rw-r--r--svx/inc/svx/editobj.hxx2
-rw-r--r--svx/inc/svx/emphitem.hxx2
-rw-r--r--svx/inc/svx/escpitem.hxx2
-rw-r--r--svx/inc/svx/exthelpid.hrc58
-rw-r--r--svx/inc/svx/fhgtitem.hxx2
-rw-r--r--svx/inc/svx/fillctrl.hxx2
-rw-r--r--svx/inc/svx/flditem.hxx2
-rw-r--r--svx/inc/svx/fmsearch.hxx2
-rw-r--r--svx/inc/svx/fmtools.hxx (renamed from svx/source/inc/fmtools.hxx)4
-rw-r--r--svx/inc/svx/fntctl.hxx2
-rw-r--r--svx/inc/svx/forbiddenruleitem.hxx2
-rw-r--r--svx/inc/svx/frmdiritem.hxx2
-rw-r--r--svx/inc/svx/gallery1.hxx (renamed from svx/inc/gallery1.hxx)6
-rw-r--r--svx/inc/svx/galmisc.hxx (renamed from svx/inc/galmisc.hxx)36
-rw-r--r--svx/inc/svx/grfcrop.hxx2
-rw-r--r--svx/inc/svx/hngpnctitem.hxx2
-rw-r--r--svx/inc/svx/hyznitem.hxx2
-rw-r--r--svx/inc/svx/impgrf.hxx (renamed from svx/inc/impgrf.hxx)0
-rw-r--r--svx/inc/svx/itemtype.hxx2
-rw-r--r--svx/inc/svx/keepitem.hxx2
-rw-r--r--svx/inc/svx/kernitem.hxx2
-rw-r--r--svx/inc/svx/langitem.hxx2
-rw-r--r--svx/inc/svx/lrspitem.hxx2
-rw-r--r--svx/inc/svx/lspcitem.hxx2
-rw-r--r--svx/inc/svx/msdffdef.hxx93
-rw-r--r--svx/inc/svx/nhypitem.hxx2
-rw-r--r--svx/inc/svx/numfmtsh.hxx2
-rw-r--r--svx/inc/svx/numinf.hxx2
-rw-r--r--svx/inc/svx/numitem.hxx4
-rw-r--r--svx/inc/svx/obj3d.hxx2
-rw-r--r--svx/inc/svx/orphitem.hxx2
-rw-r--r--svx/inc/svx/outliner.hxx2
-rw-r--r--svx/inc/svx/pageitem.hxx2
-rw-r--r--svx/inc/svx/paravertalignitem.hxx2
-rw-r--r--svx/inc/svx/pbinitem.hxx2
-rw-r--r--svx/inc/svx/pmdlitem.hxx2
-rw-r--r--svx/inc/svx/postitem.hxx2
-rw-r--r--svx/inc/svx/prszitem.hxx2
-rw-r--r--svx/inc/svx/ruler.hxx2
-rw-r--r--svx/inc/svx/scriptspaceitem.hxx2
-rw-r--r--svx/inc/svx/scripttypeitem.hxx4
-rw-r--r--svx/inc/svx/sdangitm.hxx2
-rw-r--r--svx/inc/svx/sdasaitm.hxx2
-rw-r--r--svx/inc/svx/sdasitm.hxx2
-rw-r--r--svx/inc/svx/sdggaitm.hxx2
-rw-r--r--svx/inc/svx/sdgmoitm.hxx2
-rw-r--r--svx/inc/svx/sdmetitm.hxx2
-rw-r--r--svx/inc/svx/sdooitm.hxx2
-rw-r--r--svx/inc/svx/sdprcitm.hxx2
-rw-r--r--svx/inc/svx/sdr/properties/attributeproperties.hxx2
-rw-r--r--svx/inc/svx/sdrpagewindow.hxx2
-rw-r--r--svx/inc/svx/sdtaaitm.hxx2
-rw-r--r--svx/inc/svx/sdtacitm.hxx2
-rw-r--r--svx/inc/svx/sdtaditm.hxx2
-rw-r--r--svx/inc/svx/sdtaitm.hxx2
-rw-r--r--svx/inc/svx/sdtakitm.hxx2
-rw-r--r--svx/inc/svx/sdtayitm.hxx2
-rw-r--r--svx/inc/svx/sdtfsitm.hxx2
-rw-r--r--svx/inc/svx/sdynitm.hxx2
-rw-r--r--svx/inc/svx/shaditem.hxx2
-rw-r--r--svx/inc/svx/shdditem.hxx2
-rw-r--r--svx/inc/svx/sizeitem.hxx2
-rw-r--r--svx/inc/svx/spltitem.hxx2
-rw-r--r--svx/inc/svx/svdattr.hxx2
-rw-r--r--svx/inc/svx/svdhdl.hxx2
-rw-r--r--svx/inc/svx/svdmodel.hxx6
-rw-r--r--svx/inc/svx/svdobj.hxx2
-rw-r--r--svx/inc/svx/svdpagv.hxx2
-rw-r--r--svx/inc/svx/svdpntv.hxx14
-rw-r--r--svx/inc/svx/svdundo.hxx4
-rw-r--r--svx/inc/svx/svdview.hxx5
-rw-r--r--svx/inc/svx/svx3ditems.hxx4
-rw-r--r--svx/inc/svx/svxacorr.hxx2
-rw-r--r--svx/inc/svx/svxbox.hxx2
-rw-r--r--svx/inc/svx/svxdlg.hxx73
-rw-r--r--svx/inc/svx/svxids.hrc9
-rw-r--r--svx/inc/svx/svxitems.hrc2
-rw-r--r--svx/inc/svx/sxcecitm.hxx2
-rw-r--r--svx/inc/svx/sxcikitm.hxx2
-rw-r--r--svx/inc/svx/sxctitm.hxx2
-rw-r--r--svx/inc/svx/sxekitm.hxx2
-rw-r--r--svx/inc/svx/sxfiitm.hxx2
-rw-r--r--svx/inc/svx/sxlayitm.hxx4
-rw-r--r--svx/inc/svx/sxmfsitm.hxx2
-rw-r--r--svx/inc/svx/sxmkitm.hxx2
-rw-r--r--svx/inc/svx/sxmtpitm.hxx2
-rw-r--r--svx/inc/svx/sxmuitm.hxx2
-rw-r--r--svx/inc/svx/sxonitm.hxx2
-rw-r--r--svx/inc/svx/tbcontrl.hxx2
-rw-r--r--svx/inc/svx/tstpitem.hxx2
-rw-r--r--svx/inc/svx/twolinesitem.hxx2
-rw-r--r--svx/inc/svx/udlnitem.hxx2
-rw-r--r--svx/inc/svx/ulspitem.hxx2
-rw-r--r--svx/inc/svx/unoedsrc.hxx4
-rw-r--r--svx/inc/svx/unoipset.hxx2
-rw-r--r--svx/inc/svx/unopage.hxx2
-rw-r--r--svx/inc/svx/unoprov.hxx2
-rw-r--r--svx/inc/svx/unoshape.hxx2
-rw-r--r--svx/inc/svx/unoshprp.hxx2
-rw-r--r--svx/inc/svx/unotext.hxx6
-rw-r--r--svx/inc/svx/viewlayoutitem.hxx2
-rw-r--r--svx/inc/svx/wghtitem.hxx2
-rw-r--r--svx/inc/svx/widwitem.hxx2
-rw-r--r--svx/inc/svx/writingmodeitem.hxx2
-rw-r--r--svx/inc/svx/wrlmitem.hxx2
-rw-r--r--svx/inc/svx/xfillit.hxx2
-rw-r--r--svx/inc/svx/xfillit0.hxx2
-rw-r--r--svx/inc/svx/xflasit.hxx2
-rw-r--r--svx/inc/svx/xflbckit.hxx2
-rw-r--r--svx/inc/svx/xflbmpit.hxx2
-rw-r--r--svx/inc/svx/xflbmsli.hxx2
-rw-r--r--svx/inc/svx/xflbmsxy.hxx2
-rw-r--r--svx/inc/svx/xflbmtit.hxx2
-rw-r--r--svx/inc/svx/xflboxy.hxx2
-rw-r--r--svx/inc/svx/xflbstit.hxx2
-rw-r--r--svx/inc/svx/xflbtoxy.hxx2
-rw-r--r--svx/inc/svx/xfltrit.hxx2
-rw-r--r--svx/inc/svx/xftadit.hxx2
-rw-r--r--svx/inc/svx/xftdiit.hxx2
-rw-r--r--svx/inc/svx/xftmrit.hxx2
-rw-r--r--svx/inc/svx/xftshit.hxx2
-rw-r--r--svx/inc/svx/xftshtit.hxx2
-rw-r--r--svx/inc/svx/xftshxy.hxx2
-rw-r--r--svx/inc/svx/xftstit.hxx2
-rw-r--r--svx/inc/svx/xgrscit.hxx2
-rw-r--r--svx/inc/svx/xit.hxx2
-rw-r--r--svx/inc/svx/xlineit.hxx4
-rw-r--r--svx/inc/svx/xlineit0.hxx2
-rw-r--r--svx/inc/svx/xlinjoit.hxx (renamed from svx/inc/xlinjoit.hxx)2
-rw-r--r--svx/inc/svx/xlnasit.hxx2
-rw-r--r--svx/inc/svx/xlnedcit.hxx2
-rw-r--r--svx/inc/svx/xlnedwit.hxx2
-rw-r--r--svx/inc/svx/xlnstcit.hxx2
-rw-r--r--svx/inc/svx/xlnstwit.hxx2
-rw-r--r--svx/inc/svx/xlntrit.hxx2
-rw-r--r--svx/inc/svx/xlnwtit.hxx2
-rw-r--r--svx/inc/svx/xpool.hxx2
-rw-r--r--svx/inc/svx/xsetit.hxx4
-rw-r--r--svx/inc/svx/xtextit.hxx4
-rw-r--r--svx/inc/svx/xtextit0.hxx2
-rw-r--r--svx/inc/svx/zoomitem.hxx2
-rw-r--r--svx/inc/svx/zoomslideritem.hxx2
-rw-r--r--svx/inc/svxgrahicitem.hxx2
-rw-r--r--svx/inc/svxrtf.hxx4
-rw-r--r--svx/inc/txtrange.hxx2
-rw-r--r--svx/inc/unoapi.hxx2
-rw-r--r--svx/inc/unoedhlp.hxx2
-rw-r--r--svx/inc/unofdesc.hxx2
-rw-r--r--svx/inc/unolingu.hxx4
-rw-r--r--svx/inc/xattr.hxx2
-rw-r--r--svx/inc/xmlcnitm.hxx2
-rw-r--r--svx/prj/build.lst6
-rw-r--r--svx/prj/d.lst288
-rw-r--r--svx/sdi/makefile.mk5
-rw-r--r--svx/sdi/svxslots.sdi5
-rw-r--r--svx/source/accessibility/AccessibleEmptyEditSource.cxx2
-rw-r--r--svx/source/accessibility/AccessibleEmptyEditSource.hxx4
-rw-r--r--svx/source/accessibility/AccessibleStaticTextBase.cxx4
-rw-r--r--svx/source/accessibility/GraphCtlAccessibleContext.cxx2
-rwxr-xr-xsvx/source/cui/makefile.mk234
-rw-r--r--svx/source/customshapes/EnhancedCustomShape2d.cxx1
-rw-r--r--svx/source/customshapes/EnhancedCustomShape2d.hxx5
-rw-r--r--svx/source/customshapes/EnhancedCustomShape3d.cxx4
-rw-r--r--svx/source/customshapes/EnhancedCustomShapeEngine.cxx2
-rwxr-xr-x[-rw-r--r--]svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx10
-rw-r--r--svx/source/customshapes/tbxcustomshapes.cxx2
-rw-r--r--svx/source/dialog/_bmpmask.cxx2
-rw-r--r--svx/source/dialog/_contdlg.cxx4
-rw-r--r--svx/source/dialog/charmap.cxx2
-rw-r--r--svx/source/dialog/databaseregistrationui.cxx2
-rw-r--r--svx/source/dialog/dialmgr.cxx2
-rw-r--r--svx/source/dialog/dlgctl3d.cxx2
-rw-r--r--svx/source/dialog/dlgctrl.cxx25
-rw-r--r--svx/source/dialog/dlgutil.cxx2
-rw-r--r--svx/source/dialog/docrecovery.cxx2
-rw-r--r--svx/source/dialog/fntctrl.cxx2
-rw-r--r--svx/source/dialog/graphctl.cxx4
-rw-r--r--svx/source/dialog/grfflt.cxx2
-rw-r--r--svx/source/dialog/hangulhanja.cxx6
-rw-r--r--svx/source/dialog/hdft.cxx4
-rw-r--r--svx/source/dialog/hyperdlg.cxx4
-rw-r--r--svx/source/dialog/hyprlink.cxx20
-rw-r--r--svx/source/dialog/imapdlg.cxx8
-rw-r--r--svx/source/dialog/imapwnd.cxx4
-rw-r--r--svx/source/dialog/imapwnd.hxx2
-rw-r--r--svx/source/dialog/impgrf.cxx12
-rw-r--r--svx/source/dialog/makefile.mk13
-rw-r--r--svx/source/dialog/opengrf.cxx4
-rw-r--r--svx/source/dialog/rlrcitem.cxx4
-rw-r--r--svx/source/dialog/rubydialog.cxx2
-rw-r--r--svx/source/dialog/sdstring.src209
-rw-r--r--svx/source/dialog/srchctrl.cxx2
-rw-r--r--svx/source/dialog/srchdlg.cxx60
-rw-r--r--svx/source/dialog/svxbmpnumvalueset.cxx10
-rw-r--r--svx/source/dialog/svxbmpnumvalueset.src130
-rw-r--r--svx/source/dialog/svxdlg.cxx9
-rw-r--r--svx/source/dialog/svxruler.cxx11
-rw-r--r--svx/source/dialog/thesdlg.cxx2
-rw-r--r--svx/source/editeng/SvXMLAutoCorrectExport.cxx2
-rw-r--r--svx/source/editeng/SvXMLAutoCorrectImport.cxx2
-rw-r--r--svx/source/editeng/acorrcfg.cxx4
-rw-r--r--svx/source/editeng/editattr.hxx2
-rw-r--r--svx/source/editeng/editdbg.hxx2
-rw-r--r--svx/source/editeng/editdoc.hxx6
-rw-r--r--svx/source/editeng/editdoc2.cxx2
-rw-r--r--svx/source/editeng/editeng.cxx6
-rw-r--r--svx/source/editeng/editeng.hrc2
-rw-r--r--svx/source/editeng/editobj.cxx4
-rw-r--r--svx/source/editeng/editobj2.hxx2
-rw-r--r--svx/source/editeng/editview.cxx6
-rw-r--r--svx/source/editeng/edtspell.cxx4
-rw-r--r--svx/source/editeng/eehtml.hxx2
-rw-r--r--svx/source/editeng/eeobj.cxx2
-rw-r--r--svx/source/editeng/eerdll.cxx4
-rw-r--r--svx/source/editeng/eertfpar.cxx2
-rw-r--r--svx/source/editeng/impedit.cxx2
-rw-r--r--svx/source/editeng/impedit.hxx2
-rw-r--r--svx/source/editeng/impedit2.cxx4
-rw-r--r--svx/source/editeng/impedit3.cxx4
-rw-r--r--svx/source/editeng/impedit5.cxx2
-rw-r--r--svx/source/editeng/svxacorr.cxx14
-rw-r--r--svx/source/editeng/txtrange.cxx2
-rw-r--r--svx/source/editeng/unolingu.cxx4
-rw-r--r--svx/source/engine3d/float3d.cxx6
-rw-r--r--svx/source/engine3d/obj3d.cxx4
-rw-r--r--svx/source/engine3d/polysc3d.cxx4
-rw-r--r--svx/source/engine3d/scene3d.cxx4
-rw-r--r--svx/source/fmcomp/fmgridcl.cxx8
-rw-r--r--svx/source/fmcomp/fmgridif.cxx2
-rw-r--r--svx/source/fmcomp/gridcell.cxx4
-rw-r--r--svx/source/fmcomp/gridcols.cxx2
-rw-r--r--svx/source/fmcomp/gridctrl.cxx2
-rw-r--r--svx/source/fmcomp/makefile.mk3
-rw-r--r--svx/source/form/ParseContext.cxx2
-rw-r--r--svx/source/form/databaselocationinput.cxx2
-rw-r--r--svx/source/form/datanavi.cxx6
-rw-r--r--svx/source/form/filtnav.cxx2
-rw-r--r--svx/source/form/fmcontrollayout.cxx3
-rw-r--r--svx/source/form/fmctrler.cxx2
-rw-r--r--svx/source/form/fmexch.cxx4
-rw-r--r--svx/source/form/fmobj.cxx2
-rw-r--r--svx/source/form/fmobjfac.cxx2
-rw-r--r--svx/source/form/fmpage.cxx2
-rw-r--r--svx/source/form/fmpgeimp.cxx2
-rw-r--r--svx/source/form/fmshell.cxx16
-rw-r--r--svx/source/form/fmshimp.cxx6
-rw-r--r--svx/source/form/fmsrccfg.cxx2
-rw-r--r--svx/source/form/fmsrcimp.cxx7
-rw-r--r--svx/source/form/fmtextcontroldialogs.cxx4
-rw-r--r--svx/source/form/fmtextcontrolshell.cxx10
-rw-r--r--svx/source/form/fmtools.cxx6
-rw-r--r--svx/source/form/fmundo.cxx4
-rw-r--r--svx/source/form/fmview.cxx4
-rw-r--r--svx/source/form/fmvwimp.cxx4
-rw-r--r--svx/source/form/formcontrolfactory.cxx2
-rw-r--r--svx/source/form/formcontrolling.cxx2
-rw-r--r--svx/source/form/makefile.mk2
-rw-r--r--svx/source/form/navigatortree.cxx1
-rw-r--r--svx/source/form/navigatortreemodel.cxx1
-rw-r--r--svx/source/form/sdbdatacolumn.cxx10
-rw-r--r--svx/source/form/tabwin.cxx2
-rw-r--r--svx/source/form/tbxform.cxx6
-rw-r--r--svx/source/form/typemap.cxx4
-rw-r--r--svx/source/gallery2/galbrws.cxx6
-rw-r--r--svx/source/gallery2/galbrws1.cxx15
-rw-r--r--svx/source/gallery2/galbrws1.hxx2
-rw-r--r--svx/source/gallery2/galbrws2.cxx25
-rw-r--r--svx/source/gallery2/galctrl.cxx28
-rw-r--r--svx/source/gallery2/galexpl.cxx5
-rw-r--r--svx/source/gallery2/gallery.src456
-rw-r--r--svx/source/gallery2/gallery1.cxx11
-rw-r--r--svx/source/gallery2/galmisc.cxx12
-rw-r--r--svx/source/gallery2/galobj.cxx6
-rw-r--r--svx/source/gallery2/galtheme.cxx32
-rw-r--r--svx/source/gengal/gengal.cxx18
-rw-r--r--svx/source/inc/GraphCtlAccessibleContext.hxx2
-rw-r--r--svx/source/inc/filtnav.hxx8
-rw-r--r--svx/source/inc/fmPropBrw.hxx2
-rw-r--r--svx/source/inc/fmctrler.hxx2
-rw-r--r--svx/source/inc/fmexpl.hxx8
-rw-r--r--svx/source/inc/fmitems.hxx2
-rw-r--r--svx/source/inc/fmresids.hrc16
-rw-r--r--svx/source/inc/fmshimp.hxx11
-rw-r--r--svx/source/inc/fmsrcimp.hxx2
-rw-r--r--svx/source/inc/fmundo.hxx2
-rw-r--r--svx/source/inc/gridcell.hxx2
-rw-r--r--svx/source/inc/svdoimp.hxx2
-rw-r--r--svx/source/inc/tabwin.hxx2
-rw-r--r--svx/source/inc/unoedprx.hxx2
-rw-r--r--svx/source/intro/iso.src2
-rw-r--r--svx/source/intro/ooo.src2
-rw-r--r--svx/source/items/SmartTagItem.cxx2
-rw-r--r--svx/source/items/clipfmtitem.cxx2
-rw-r--r--svx/source/items/flditem.cxx2
-rw-r--r--svx/source/items/frmitems.cxx6
-rw-r--r--svx/source/items/makefile.mk1
-rw-r--r--svx/source/items/numfmtsh.cxx4
-rw-r--r--svx/source/items/page.src258
-rw-r--r--svx/source/items/pageitem.cxx2
-rw-r--r--svx/source/items/paraitem.cxx8
-rw-r--r--svx/source/items/textitem.cxx6
-rw-r--r--svx/source/mnuctrls/SmartTagCtl.cxx2
-rw-r--r--svx/source/mnuctrls/clipboardctl.cxx4
-rw-r--r--svx/source/mnuctrls/fntszctl.cxx2
-rw-r--r--svx/source/options/asiancfg.cxx2
-rw-r--r--svx/source/options/htmlcfg.cxx5
-rw-r--r--svx/source/options/makefile.mk20
-rw-r--r--svx/source/options/srchcfg.cxx2
-rw-r--r--svx/source/outliner/outl_pch.hxx2
-rw-r--r--svx/source/outliner/outleeng.cxx2
-rw-r--r--svx/source/outliner/outlin2.cxx2
-rw-r--r--svx/source/outliner/outliner.cxx8
-rw-r--r--svx/source/outliner/outliner.hrc2
-rw-r--r--svx/source/outliner/outlvw.cxx4
-rw-r--r--svx/source/sdr/attribute/sdrformtextattribute.cxx4
-rw-r--r--svx/source/sdr/contact/viewcontactofgraphic.cxx2
-rw-r--r--svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx2
-rw-r--r--svx/source/sdr/contact/viewcontactofsdrcircobj.cxx2
-rw-r--r--svx/source/sdr/contact/viewcontactofsdrmeasureobj.cxx2
-rw-r--r--svx/source/sdr/contact/viewcontactofsdrrectobj.cxx2
-rw-r--r--svx/source/sdr/primitive2d/sdrattributecreator.cxx8
-rw-r--r--svx/source/sdr/primitive3d/sdrattributecreator3d.cxx2
-rw-r--r--svx/source/sdr/properties/attributeproperties.cxx10
-rw-r--r--svx/source/sdr/properties/captionproperties.cxx4
-rw-r--r--svx/source/sdr/properties/circleproperties.cxx4
-rw-r--r--svx/source/sdr/properties/connectorproperties.cxx4
-rw-r--r--svx/source/sdr/properties/customshapeproperties.cxx10
-rw-r--r--svx/source/sdr/properties/defaultproperties.cxx4
-rw-r--r--svx/source/sdr/properties/e3dcompoundproperties.cxx2
-rw-r--r--svx/source/sdr/properties/e3dextrudeproperties.cxx2
-rw-r--r--svx/source/sdr/properties/e3dlatheproperties.cxx2
-rw-r--r--svx/source/sdr/properties/e3dproperties.cxx2
-rw-r--r--svx/source/sdr/properties/e3dsceneproperties.cxx4
-rw-r--r--svx/source/sdr/properties/e3dsphereproperties.cxx2
-rw-r--r--svx/source/sdr/properties/emptyproperties.cxx2
-rw-r--r--svx/source/sdr/properties/graphicproperties.cxx4
-rw-r--r--svx/source/sdr/properties/groupproperties.cxx4
-rw-r--r--svx/source/sdr/properties/itemsettools.cxx4
-rw-r--r--svx/source/sdr/properties/measureproperties.cxx4
-rw-r--r--svx/source/sdr/properties/pageproperties.cxx2
-rw-r--r--svx/source/sdr/properties/properties.cxx2
-rw-r--r--svx/source/sdr/properties/textproperties.cxx8
-rw-r--r--svx/source/src/app.hrc6
-rw-r--r--svx/source/src/app.src32
-rw-r--r--svx/source/stbctrls/insctrl.cxx2
-rw-r--r--svx/source/stbctrls/modctrl.cxx2
-rw-r--r--svx/source/stbctrls/pszctrl.cxx6
-rw-r--r--svx/source/stbctrls/selctrl.cxx2
-rw-r--r--svx/source/stbctrls/xmlsecctrl.cxx6
-rw-r--r--svx/source/svdraw/makefile.mk6
-rw-r--r--svx/source/svdraw/svdattr.cxx2
-rw-r--r--svx/source/svdraw/svdedtv1.cxx6
-rw-r--r--svx/source/svdraw/svdedtv2.cxx2
-rw-r--r--svx/source/svdraw/svdedxv.cxx8
-rw-r--r--svx/source/svdraw/svdetc.cxx10
-rw-r--r--svx/source/svdraw/svdfmtf.cxx2
-rw-r--r--svx/source/svdraw/svdibrow.cxx10
-rw-r--r--svx/source/svdraw/svdmark.cxx2
-rw-r--r--svx/source/svdraw/svdmodel.cxx10
-rw-r--r--svx/source/svdraw/svdoashp.cxx4
-rw-r--r--svx/source/svdraw/svdoattr.cxx12
-rw-r--r--svx/source/svdraw/svdobj.cxx4
-rw-r--r--svx/source/svdraw/svdocapt.cxx2
-rw-r--r--svx/source/svdraw/svdocirc.cxx2
-rw-r--r--svx/source/svdraw/svdoedge.cxx4
-rw-r--r--svx/source/svdraw/svdograf.cxx6
-rw-r--r--svx/source/svdraw/svdogrp.cxx4
-rw-r--r--svx/source/svdraw/svdomeas.cxx6
-rw-r--r--svx/source/svdraw/svdoole2.cxx6
-rw-r--r--svx/source/svdraw/svdopage.cxx2
-rw-r--r--svx/source/svdraw/svdotext.cxx6
-rw-r--r--svx/source/svdraw/svdotextdecomposition.cxx2
-rw-r--r--svx/source/svdraw/svdotextpathdecomposition.cxx4
-rw-r--r--svx/source/svdraw/svdotxat.cxx12
-rw-r--r--svx/source/svdraw/svdotxed.cxx2
-rw-r--r--svx/source/svdraw/svdotxln.cxx2
-rw-r--r--svx/source/svdraw/svdotxtr.cxx2
-rw-r--r--svx/source/svdraw/svdoutl.cxx2
-rw-r--r--svx/source/svdraw/svdpntv.cxx22
-rw-r--r--svx/source/svdraw/svdtext.cxx2
-rw-r--r--svx/source/svdraw/svdtrans.cxx2
-rw-r--r--svx/source/svdraw/svdundo.cxx2
-rw-r--r--svx/source/svdraw/svdview.cxx16
-rw-r--r--svx/source/svdraw/svdviter.cxx2
-rw-r--r--svx/source/svdraw/svdxcgv.cxx6
-rw-r--r--svx/source/svrtf/rtfgrf.cxx4
-rw-r--r--svx/source/svrtf/rtfitem.cxx4
-rw-r--r--svx/source/svrtf/svxrtf.cxx6
-rw-r--r--svx/source/svxlink/fileobj.cxx4
-rw-r--r--svx/source/svxlink/linkmgr.cxx12
-rw-r--r--svx/source/table/cell.cxx4
-rw-r--r--svx/source/table/celleditsource.cxx6
-rw-r--r--svx/source/table/svdotable.cxx2
-rw-r--r--svx/source/table/tablecontroller.cxx2
-rw-r--r--svx/source/tbxctrls/colorwindow.hxx2
-rw-r--r--svx/source/tbxctrls/extrusioncontrols.cxx4
-rw-r--r--svx/source/tbxctrls/fontworkgallery.cxx2
-rw-r--r--svx/source/tbxctrls/formatpaintbrushctrl.cxx2
-rw-r--r--svx/source/tbxctrls/grafctrl.cxx6
-rw-r--r--svx/source/tbxctrls/itemwin.cxx22
-rw-r--r--svx/source/tbxctrls/layctrl.cxx2
-rw-r--r--svx/source/tbxctrls/lboxctrl.cxx8
-rw-r--r--svx/source/tbxctrls/subtoolboxcontrol.cxx2
-rw-r--r--svx/source/tbxctrls/tbcontrl.cxx16
-rw-r--r--svx/source/tbxctrls/tbxalign.cxx2
-rw-r--r--svx/source/tbxctrls/tbxdrctl.cxx2
-rw-r--r--svx/source/tbxctrls/verttexttbxctrl.cxx4
-rw-r--r--svx/source/toolbars/fontworkbar.cxx2
-rw-r--r--svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx4
-rw-r--r--svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx4
-rw-r--r--svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.src4
-rw-r--r--svx/source/unodraw/UnoGraphicExporter.cxx8
-rw-r--r--svx/source/unodraw/UnoNameItemTable.cxx6
-rw-r--r--svx/source/unodraw/UnoNameItemTable.hxx2
-rw-r--r--svx/source/unodraw/UnoNamespaceMap.cxx2
-rw-r--r--svx/source/unodraw/unobtabl.cxx6
-rw-r--r--svx/source/unodraw/unoctabl.cxx2
-rw-r--r--svx/source/unodraw/unodtabl.cxx4
-rw-r--r--svx/source/unodraw/unofdesc.cxx2
-rw-r--r--svx/source/unodraw/unogtabl.cxx4
-rw-r--r--svx/source/unodraw/unohtabl.cxx4
-rw-r--r--svx/source/unodraw/unoipset.cxx4
-rw-r--r--svx/source/unodraw/unomod.cxx2
-rw-r--r--svx/source/unodraw/unomtabl.cxx8
-rw-r--r--svx/source/unodraw/unonrule.cxx2
-rw-r--r--svx/source/unodraw/unoshap2.cxx2
-rw-r--r--svx/source/unodraw/unoshape.cxx2
-rw-r--r--svx/source/unodraw/unoshtxt.cxx9
-rw-r--r--svx/source/unodraw/unottabl.cxx4
-rw-r--r--svx/source/unoedit/unoedsrc.cxx2
-rw-r--r--svx/source/unoedit/unofored.cxx2
-rw-r--r--svx/source/unoedit/unoforou.cxx6
-rw-r--r--svx/source/unoedit/unotext.cxx8
-rw-r--r--svx/source/unoedit/unotext2.cxx2
-rw-r--r--svx/source/unogallery/unogalitem.cxx12
-rw-r--r--svx/source/unogallery/unogaltheme.cxx6
-rw-r--r--svx/source/unogallery/unogaltheme.hxx2
-rw-r--r--svx/source/unogallery/unogalthemeprovider.cxx4
-rw-r--r--svx/source/xml/xmlgrhlp.cxx2
-rw-r--r--svx/source/xml/xmltxtexp.cxx4
-rw-r--r--svx/source/xml/xmltxtimp.cxx2
-rw-r--r--svx/source/xoutdev/_xoutbmp.cxx4
-rw-r--r--svx/source/xoutdev/xattr.cxx6
-rw-r--r--svx/source/xoutdev/xattrbmp.cxx2
-rw-r--r--svx/source/xoutdev/xexch.cxx8
-rw-r--r--svx/source/xoutdev/xpool.cxx2
-rw-r--r--svx/source/xoutdev/xtabbtmp.cxx2
-rw-r--r--svx/source/xoutdev/xtabcolr.cxx2
-rw-r--r--svx/source/xoutdev/xtabdash.cxx2
-rw-r--r--svx/source/xoutdev/xtabgrdt.cxx2
-rw-r--r--svx/source/xoutdev/xtabhtch.cxx2
-rw-r--r--svx/source/xoutdev/xtablend.cxx2
-rw-r--r--svx/util/hidother.src402
-rw-r--r--svx/util/makefile.mk86
-rw-r--r--svx/workben/edittest.cxx8
-rw-r--r--svx/workben/msview/msview.cxx2
-rw-r--r--sw/inc/PostItMgr.hxx7
-rw-r--r--sw/inc/SwAppletImpl.hxx4
-rw-r--r--sw/inc/SwNumberTree.hxx4
-rw-r--r--sw/inc/acmplwrd.hxx2
-rw-r--r--sw/inc/authfld.hxx2
-rw-r--r--sw/inc/calc.hxx2
-rw-r--r--sw/inc/ccoll.hxx2
-rw-r--r--sw/inc/cellatr.hxx4
-rw-r--r--sw/inc/crsrsh.hxx4
-rw-r--r--sw/inc/dbmgr.hxx2
-rw-r--r--sw/inc/doc.hxx8
-rw-r--r--sw/inc/docary.hxx2
-rw-r--r--sw/inc/docsh.hxx2
-rw-r--r--sw/inc/docstyle.hxx6
-rw-r--r--sw/inc/docufld.hxx2
-rw-r--r--sw/inc/edglbldc.hxx2
-rw-r--r--sw/inc/edimp.hxx2
-rw-r--r--sw/inc/editsh.hxx2
-rw-r--r--sw/inc/errhdl.hxx2
-rw-r--r--sw/inc/expfld.hxx2
-rw-r--r--sw/inc/extinput.hxx2
-rw-r--r--sw/inc/fchrfmt.hxx2
-rw-r--r--sw/inc/fldbas.hxx4
-rw-r--r--sw/inc/flypos.hxx2
-rw-r--r--sw/inc/fmtanchr.hxx2
-rw-r--r--sw/inc/fmtautofmt.hxx2
-rw-r--r--sw/inc/fmtclbl.hxx2
-rw-r--r--sw/inc/fmtclds.hxx2
-rw-r--r--sw/inc/fmtcnct.hxx2
-rw-r--r--sw/inc/fmtcntnt.hxx2
-rw-r--r--sw/inc/fmtcol.hxx2
-rw-r--r--sw/inc/fmteiro.hxx2
-rw-r--r--sw/inc/fmtflcnt.hxx2
-rw-r--r--sw/inc/fmtfld.hxx6
-rw-r--r--sw/inc/fmtfollowtextflow.hxx2
-rw-r--r--sw/inc/fmtfordr.hxx2
-rw-r--r--sw/inc/fmtfsize.hxx2
-rw-r--r--sw/inc/fmtftn.hxx2
-rw-r--r--sw/inc/fmtftntx.hxx2
-rw-r--r--sw/inc/fmthdft.hxx2
-rw-r--r--sw/inc/fmtinfmt.hxx2
-rw-r--r--sw/inc/fmtline.hxx2
-rw-r--r--sw/inc/fmtlsplt.hxx2
-rw-r--r--[-rwxr-xr-x]sw/inc/fmtmeta.hxx2
-rw-r--r--sw/inc/fmtornt.hxx2
-rw-r--r--sw/inc/fmtpdsc.hxx2
-rw-r--r--sw/inc/fmtrfmrk.hxx2
-rw-r--r--sw/inc/fmtrowsplt.hxx2
-rw-r--r--sw/inc/fmtruby.hxx2
-rw-r--r--sw/inc/fmtsrnd.hxx2
-rw-r--r--sw/inc/fmturl.hxx2
-rw-r--r--sw/inc/fmtwrapinfluenceonobjpos.hxx2
-rw-r--r--sw/inc/ftnidx.hxx2
-rw-r--r--sw/inc/grfatr.hxx4
-rw-r--r--sw/inc/helpid.h2
-rw-r--r--sw/inc/hfspacingitem.hxx2
-rw-r--r--sw/inc/hints.hxx21
-rw-r--r--sw/inc/index.hxx6
-rw-r--r--sw/inc/istyleaccess.hxx2
-rw-r--r--sw/inc/makefile.mk6
-rw-r--r--sw/inc/modcfg.hxx6
-rw-r--r--sw/inc/ndarr.hxx2
-rw-r--r--sw/inc/ndhints.hxx4
-rw-r--r--sw/inc/ndindex.hxx2
-rw-r--r--sw/inc/node.hxx4
-rw-r--r--sw/inc/numrule.hxx2
-rw-r--r--sw/inc/pam.hxx2
-rw-r--r--sw/inc/paratr.hxx4
-rw-r--r--sw/inc/pch/precompiled_sw.hxx119
-rw-r--r--sw/inc/postithelper.hxx2
-rw-r--r--sw/inc/redline.hxx4
-rw-r--r--sw/inc/rolbck.hxx7
-rw-r--r--sw/inc/rubylist.hxx2
-rw-r--r--sw/inc/section.hxx2
-rw-r--r--sw/inc/shellio.hxx4
-rw-r--r--sw/inc/shellres.hxx4
-rw-r--r--sw/inc/sortopt.hxx2
-rw-r--r--sw/inc/swatrset.hxx4
-rw-r--r--sw/inc/swfltopt.hxx2
-rw-r--r--sw/inc/swhints.hxx2
-rw-r--r--sw/inc/swmodule.hxx9
-rw-r--r--sw/inc/swregion.hxx2
-rw-r--r--sw/inc/swtable.hxx14
-rw-r--r--sw/inc/swundo.hxx2
-rw-r--r--sw/inc/tabcol.hxx2
-rw-r--r--sw/inc/tblafmt.hxx4
-rw-r--r--sw/inc/tblsel.hxx2
-rw-r--r--sw/inc/tgrditem.hxx2
-rw-r--r--sw/inc/tox.hxx4
-rw-r--r--sw/inc/txatbase.hxx2
-rw-r--r--sw/inc/txatritr.hxx2
-rw-r--r--sw/inc/undobj.hxx6
-rw-r--r--sw/inc/unoatxt.hxx4
-rw-r--r--sw/inc/unodraw.hxx2
-rw-r--r--sw/inc/unoevent.hxx2
-rw-r--r--sw/inc/unoevtlstnr.hxx2
-rw-r--r--sw/inc/unomailmerge.hxx2
-rw-r--r--sw/inc/unomap.hxx2
-rw-r--r--sw/inc/unoobj.hxx4
-rw-r--r--sw/inc/unoport.hxx2
-rw-r--r--sw/inc/unosett.hxx2
-rw-r--r--sw/inc/unostyle.hxx4
-rw-r--r--sw/inc/unotxdoc.hxx4
-rw-r--r--sw/inc/viewopt.hxx4
-rw-r--r--sw/inc/viewsh.hxx2
-rw-r--r--sw/inc/viscrs.hxx4
-rwxr-xr-x[-rw-r--r--]sw/prj/build.lst2
-rwxr-xr-xsw/qa/complex/checkColor/makefile.mk2
-rwxr-xr-xsw/qa/complex/indeterminateState/makefile.mk2
-rwxr-xr-xsw/qa/complex/writer/makefile.mk2
-rw-r--r--sw/qa/core/Test-BigPtrArray.cxx2
-rw-r--r--sw/qa/core/makefile.mk16
-rw-r--r--sw/sdi/_docsh.sdi2
-rw-r--r--sw/sdi/_viewsh.sdi2
-rw-r--r--sw/sdi/docsh.sdi2
-rw-r--r--sw/sdi/makefile.mk10
-rw-r--r--sw/sdi/swslots.sdi9
-rw-r--r--sw/sdi/viewsh.sdi6
-rw-r--r--sw/sdi/wdocsh.sdi2
-rw-r--r--sw/sdi/wviewsh.sdi6
-rw-r--r--sw/source/core/SwNumberTree/SwNumberTree.cxx8
-rw-r--r--sw/source/core/access/accmap.cxx18
-rw-r--r--sw/source/core/attr/calbck.cxx6
-rw-r--r--sw/source/core/attr/hints.cxx16
-rw-r--r--sw/source/core/attr/swatrset.cxx4
-rw-r--r--sw/source/core/bastyp/bparr.cxx2
-rw-r--r--sw/source/core/bastyp/calc.cxx4
-rw-r--r--sw/source/core/bastyp/index.cxx10
-rw-r--r--sw/source/core/bastyp/init.cxx6
-rw-r--r--sw/source/core/bastyp/swcache.cxx20
-rw-r--r--sw/source/core/bastyp/swrect.cxx4
-rw-r--r--sw/source/core/crsr/crsrsh.cxx6
-rw-r--r--sw/source/core/crsr/crstrvl.cxx10
-rw-r--r--sw/source/core/crsr/findattr.cxx4
-rw-r--r--sw/source/core/crsr/findtxt.cxx2
-rw-r--r--sw/source/core/crsr/pam.cxx2
-rw-r--r--sw/source/core/crsr/swcrsr.cxx2
-rw-r--r--sw/source/core/crsr/trvltbl.cxx2
-rw-r--r--sw/source/core/crsr/viscrs.cxx6
-rw-r--r--sw/source/core/doc/SwStyleNameMapper.cxx2
-rw-r--r--sw/source/core/doc/dbgoutsw.cxx6
-rw-r--r--sw/source/core/doc/doc.cxx2
-rw-r--r--sw/source/core/doc/docdde.cxx2
-rw-r--r--sw/source/core/doc/docdesc.cxx2
-rw-r--r--sw/source/core/doc/docdraw.cxx2
-rw-r--r--sw/source/core/doc/docfld.cxx12
-rw-r--r--sw/source/core/doc/docfly.cxx4
-rw-r--r--sw/source/core/doc/docfmt.cxx10
-rw-r--r--sw/source/core/doc/docglbl.cxx6
-rw-r--r--sw/source/core/doc/doclay.cxx8
-rw-r--r--sw/source/core/doc/docnew.cxx13
-rw-r--r--sw/source/core/doc/docredln.cxx8
-rw-r--r--sw/source/core/doc/doctxm.cxx2
-rw-r--r--sw/source/core/doc/fmtcol.cxx2
-rw-r--r--sw/source/core/doc/htmltbl.cxx8
-rw-r--r--sw/source/core/doc/notxtfrm.cxx2
-rw-r--r--sw/source/core/doc/number.cxx16
-rw-r--r--sw/source/core/doc/swstylemanager.cxx2
-rw-r--r--sw/source/core/doc/tblafmt.cxx8
-rw-r--r--sw/source/core/doc/tblcpy.cxx2
-rw-r--r--sw/source/core/doc/tblrwcl.cxx6
-rw-r--r--sw/source/core/doc/visiturl.cxx2
-rw-r--r--sw/source/core/docnode/ndcopy.cxx4
-rw-r--r--sw/source/core/docnode/ndindex.cxx8
-rw-r--r--sw/source/core/docnode/ndnotxt.cxx2
-rw-r--r--sw/source/core/docnode/ndnum.cxx2
-rw-r--r--sw/source/core/docnode/ndsect.cxx2
-rw-r--r--sw/source/core/docnode/ndtbl.cxx2
-rw-r--r--sw/source/core/docnode/node.cxx21
-rw-r--r--sw/source/core/docnode/nodes.cxx4
-rw-r--r--sw/source/core/docnode/section.cxx4
-rw-r--r--sw/source/core/draw/dpage.cxx4
-rw-r--r--sw/source/core/draw/drawdoc.cxx4
-rw-r--r--sw/source/core/edit/autofmt.cxx2
-rw-r--r--sw/source/core/edit/edattr.cxx2
-rw-r--r--sw/source/core/edit/edglss.cxx2
-rw-r--r--sw/source/core/edit/editsh.cxx6
-rw-r--r--sw/source/core/edit/ednumber.cxx2
-rw-r--r--sw/source/core/edit/edtab.cxx2
-rw-r--r--sw/source/core/edit/edtox.cxx2
-rw-r--r--sw/source/core/except/dbgloop.cxx2
-rw-r--r--sw/source/core/except/makefile.mk6
-rw-r--r--sw/source/core/fields/authfld.cxx2
-rw-r--r--sw/source/core/fields/dbfld.cxx2
-rw-r--r--sw/source/core/fields/docufld.cxx78
-rw-r--r--sw/source/core/fields/fldbas.cxx8
-rw-r--r--sw/source/core/fields/flddat.cxx2
-rw-r--r--sw/source/core/fields/flddropdown.cxx2
-rw-r--r--sw/source/core/fields/reffld.cxx2
-rw-r--r--sw/source/core/fields/usrfld.cxx4
-rw-r--r--sw/source/core/frmedt/fecopy.cxx2
-rw-r--r--sw/source/core/frmedt/fedesc.cxx2
-rw-r--r--sw/source/core/frmedt/fefly1.cxx6
-rw-r--r--sw/source/core/frmedt/feflyole.cxx2
-rw-r--r--sw/source/core/graphic/ndgrf.cxx4
-rw-r--r--sw/source/core/inc/SwXTextDefaults.hxx2
-rw-r--r--sw/source/core/inc/blink.hxx2
-rw-r--r--sw/source/core/inc/dbg_lay.hxx2
-rw-r--r--sw/source/core/inc/dbgloop.hxx2
-rw-r--r--sw/source/core/inc/docsort.hxx2
-rw-r--r--sw/source/core/inc/doctxm.hxx2
-rw-r--r--sw/source/core/inc/drawfont.hxx34
-rw-r--r--sw/source/core/inc/flyfrm.hxx2
-rw-r--r--sw/source/core/inc/fntcache.hxx2
-rw-r--r--sw/source/core/inc/frame.hxx2
-rw-r--r--sw/source/core/inc/ftnfrm.hxx4
-rw-r--r--sw/source/core/inc/layact.hxx4
-rw-r--r--sw/source/core/inc/laycache.hxx2
-rw-r--r--sw/source/core/inc/mvsave.hxx2
-rw-r--r--sw/source/core/inc/noteurl.hxx2
-rw-r--r--sw/source/core/inc/pagefrm.hxx2
-rw-r--r--sw/source/core/inc/rootfrm.hxx4
-rw-r--r--sw/source/core/inc/scriptinfo.hxx2
-rw-r--r--sw/source/core/inc/scrrect.hxx2
-rw-r--r--sw/source/core/inc/swblocks.hxx2
-rw-r--r--sw/source/core/inc/swcache.hxx14
-rw-r--r--sw/source/core/inc/swfntcch.hxx2
-rw-r--r--sw/source/core/inc/swfont.hxx2
-rw-r--r--sw/source/core/inc/tblrwcl.hxx4
-rw-r--r--sw/source/core/inc/txtfrm.hxx2
-rw-r--r--sw/source/core/inc/visiturl.hxx2
-rw-r--r--sw/source/core/layout/atrfrm.cxx6
-rw-r--r--sw/source/core/layout/calcmove.cxx6
-rw-r--r--sw/source/core/layout/dbg_lay.cxx6
-rw-r--r--sw/source/core/layout/fly.cxx2
-rw-r--r--sw/source/core/layout/flylay.cxx4
-rw-r--r--sw/source/core/layout/frmtool.cxx2
-rw-r--r--sw/source/core/layout/ftnfrm.cxx14
-rw-r--r--sw/source/core/layout/layact.cxx10
-rw-r--r--sw/source/core/layout/laycache.cxx2
-rw-r--r--sw/source/core/layout/layhelp.hxx2
-rw-r--r--sw/source/core/layout/layouter.cxx2
-rw-r--r--sw/source/core/layout/makefile.mk6
-rw-r--r--sw/source/core/layout/newfrm.cxx4
-rw-r--r--sw/source/core/layout/pagechg.cxx8
-rw-r--r--sw/source/core/layout/paintfrm.cxx6
-rw-r--r--sw/source/core/layout/sectfrm.cxx4
-rw-r--r--sw/source/core/layout/ssfrm.cxx2
-rw-r--r--sw/source/core/layout/tabfrm.cxx6
-rw-r--r--sw/source/core/layout/trvlfrm.cxx2
-rw-r--r--sw/source/core/layout/unusedf.cxx2
-rw-r--r--sw/source/core/layout/virtoutp.cxx4
-rw-r--r--sw/source/core/layout/wsfrm.cxx8
-rw-r--r--sw/source/core/makefile.mk4
-rw-r--r--sw/source/core/sw3io/sw3convert.cxx10
-rw-r--r--sw/source/core/swg/SwXMLSectionList.cxx2
-rw-r--r--sw/source/core/swg/SwXMLTextBlocks1.cxx2
-rw-r--r--sw/source/core/swg/swblocks.cxx4
-rw-r--r--sw/source/core/table/swnewtable.cxx8
-rw-r--r--sw/source/core/table/swtable.cxx10
-rw-r--r--sw/source/core/text/EnhancedPDFExportHelper.cxx24
-rw-r--r--sw/source/core/text/atrstck.cxx2
-rw-r--r--sw/source/core/text/frmcrsr.cxx4
-rw-r--r--sw/source/core/text/frmform.cxx14
-rw-r--r--sw/source/core/text/frmpaint.cxx2
-rw-r--r--sw/source/core/text/guess.cxx2
-rw-r--r--sw/source/core/text/inftxt.cxx18
-rw-r--r--sw/source/core/text/inftxt.hxx6
-rw-r--r--sw/source/core/text/itratr.hxx2
-rw-r--r--sw/source/core/text/itrform2.cxx2
-rw-r--r--sw/source/core/text/itrpaint.cxx2
-rw-r--r--sw/source/core/text/makefile.mk11
-rw-r--r--sw/source/core/text/porglue.cxx2
-rw-r--r--sw/source/core/text/porlay.cxx2
-rw-r--r--sw/source/core/text/porlay.hxx2
-rw-r--r--sw/source/core/text/porlin.cxx8
-rw-r--r--sw/source/core/text/porlin.hxx4
-rw-r--r--sw/source/core/text/redlnitr.cxx2
-rw-r--r--sw/source/core/text/redlnitr.hxx2
-rw-r--r--sw/source/core/text/txtfly.cxx8
-rw-r--r--sw/source/core/text/txtfly.hxx6
-rw-r--r--sw/source/core/text/txtfrm.cxx13
-rw-r--r--sw/source/core/text/txtftn.cxx6
-rw-r--r--sw/source/core/text/txthyph.cxx2
-rw-r--r--sw/source/core/text/txtinit.cxx2
-rw-r--r--sw/source/core/text/txtio.cxx2
-rw-r--r--sw/source/core/text/txtpaint.cxx2
-rw-r--r--sw/source/core/text/txtpaint.hxx2
-rw-r--r--sw/source/core/text/txttab.cxx4
-rw-r--r--sw/source/core/tox/toxhlp.cxx24
-rw-r--r--sw/source/core/tox/txmsrt.cxx2
-rw-r--r--sw/source/core/txtnode/atrfld.cxx2
-rw-r--r--sw/source/core/txtnode/atrftn.cxx2
-rw-r--r--sw/source/core/txtnode/fmtatr2.cxx8
-rw-r--r--sw/source/core/txtnode/fntcache.cxx2
-rw-r--r--sw/source/core/txtnode/fntcap.cxx4
-rw-r--r--sw/source/core/txtnode/ndhints.cxx18
-rw-r--r--sw/source/core/txtnode/ndtxt.cxx14
-rw-r--r--sw/source/core/txtnode/swfont.cxx2
-rw-r--r--sw/source/core/txtnode/thints.cxx20
-rw-r--r--sw/source/core/txtnode/txatbase.cxx2
-rw-r--r--sw/source/core/txtnode/txtedt.cxx3
-rw-r--r--sw/source/core/undo/docundo.cxx4
-rw-r--r--sw/source/core/undo/rolbck.cxx2
-rw-r--r--sw/source/core/undo/unattr.cxx2
-rw-r--r--sw/source/core/undo/undobj.cxx4
-rw-r--r--sw/source/core/undo/undobj1.cxx2
-rw-r--r--sw/source/core/undo/untbl.cxx9
-rw-r--r--sw/source/core/unocore/swunohelper.cxx2
-rw-r--r--sw/source/core/unocore/unochart.cxx2
-rw-r--r--sw/source/core/unocore/unocoll.cxx2
-rw-r--r--sw/source/core/unocore/unocrsrhelper.cxx6
-rw-r--r--sw/source/core/unocore/unoevent.cxx2
-rw-r--r--sw/source/core/unocore/unofield.cxx2
-rw-r--r--sw/source/core/unocore/unomap.cxx2
-rw-r--r--sw/source/core/unocore/unoobj.cxx2
-rw-r--r--sw/source/core/unocore/unoobj2.cxx2
-rw-r--r--sw/source/core/unocore/unoparagraph.cxx2
-rw-r--r--sw/source/core/unocore/unoport.cxx2
-rw-r--r--sw/source/core/unocore/unoprnms.cxx2
-rw-r--r--sw/source/core/unocore/unosect.cxx2
-rw-r--r--sw/source/core/unocore/unostyle.cxx6
-rw-r--r--sw/source/core/unocore/unotbl.cxx4
-rw-r--r--sw/source/core/view/vdraw.cxx2
-rw-r--r--sw/source/core/view/viewsh.cxx39
-rw-r--r--sw/source/core/view/vprint.cxx61
-rw-r--r--sw/source/filter/ascii/ascatr.cxx2
-rw-r--r--sw/source/filter/basflt/fltini.cxx26
-rw-r--r--sw/source/filter/basflt/shellio.cxx6
-rw-r--r--sw/source/filter/html/SwAppletImpl.cxx2
-rw-r--r--sw/source/filter/html/css1atr.cxx4
-rw-r--r--sw/source/filter/html/htmlatr.cxx4
-rw-r--r--sw/source/filter/html/htmlbas.cxx2
-rw-r--r--sw/source/filter/html/htmlcss1.cxx6
-rw-r--r--sw/source/filter/html/htmlctxt.cxx2
-rw-r--r--sw/source/filter/html/htmldraw.cxx4
-rw-r--r--sw/source/filter/html/htmlfld.cxx4
-rw-r--r--sw/source/filter/html/htmlfly.cxx2
-rw-r--r--sw/source/filter/html/htmlfly.hxx2
-rw-r--r--sw/source/filter/html/htmlform.cxx2
-rw-r--r--sw/source/filter/html/htmlforw.cxx4
-rw-r--r--sw/source/filter/html/htmlftn.cxx4
-rw-r--r--sw/source/filter/html/htmlgrin.cxx6
-rw-r--r--sw/source/filter/html/htmlnum.cxx2
-rw-r--r--sw/source/filter/html/htmlplug.cxx6
-rw-r--r--sw/source/filter/html/htmlsect.cxx2
-rw-r--r--sw/source/filter/html/htmltab.cxx10
-rw-r--r--sw/source/filter/html/htmltabw.cxx4
-rw-r--r--sw/source/filter/html/svxcss1.cxx4
-rw-r--r--sw/source/filter/html/svxcss1.hxx4
-rw-r--r--sw/source/filter/html/swhtml.cxx28
-rw-r--r--sw/source/filter/html/swhtml.hxx6
-rw-r--r--sw/source/filter/html/wrthtml.cxx4
-rw-r--r--sw/source/filter/html/wrthtml.hxx2
-rw-r--r--sw/source/filter/inc/fltglbls.hxx2
-rw-r--r--sw/source/filter/inc/msfilter.hxx2
-rw-r--r--sw/source/filter/inc/wrtswtbl.hxx4
-rw-r--r--sw/source/filter/rtf/rtfatr.cxx8
-rw-r--r--sw/source/filter/rtf/rtffld.cxx4
-rw-r--r--sw/source/filter/rtf/rtffly.cxx2
-rw-r--r--sw/source/filter/rtf/rtfnum.cxx4
-rw-r--r--sw/source/filter/rtf/swparrtf.cxx8
-rw-r--r--sw/source/filter/rtf/swparrtf.hxx2
-rw-r--r--sw/source/filter/rtf/wrtrtf.cxx2
-rw-r--r--sw/source/filter/writer/writer.cxx6
-rw-r--r--sw/source/filter/writer/wrt_fn.cxx4
-rw-r--r--sw/source/filter/writer/wrtswtbl.cxx22
-rw-r--r--sw/source/filter/ww1/fltshell.cxx6
-rw-r--r--sw/source/filter/ww1/w1filter.cxx2
-rw-r--r--sw/source/filter/ww1/w1sprm.cxx4
-rw-r--r--sw/source/filter/ww8/docxattributeoutput.cxx2
-rw-r--r--sw/source/filter/ww8/dump/ww8scan.hxx2
-rw-r--r--sw/source/filter/ww8/escher.hxx2
-rw-r--r--sw/source/filter/ww8/tracer.cxx2
-rw-r--r--sw/source/filter/ww8/writerhelper.cxx2
-rw-r--r--sw/source/filter/ww8/writerhelper.hxx4
-rw-r--r--sw/source/filter/ww8/writerwordglue.cxx2
-rw-r--r--sw/source/filter/ww8/wrtw8esh.cxx7
-rw-r--r--sw/source/filter/ww8/wrtw8nds.cxx4
-rw-r--r--sw/source/filter/ww8/wrtww8.cxx42
-rw-r--r--sw/source/filter/ww8/wrtww8.hxx4
-rw-r--r--sw/source/filter/ww8/wrtww8gr.cxx6
-rw-r--r--sw/source/filter/ww8/ww8atr.cxx8
-rw-r--r--sw/source/filter/ww8/ww8glsy.cxx2
-rw-r--r--sw/source/filter/ww8/ww8graf.cxx4
-rw-r--r--sw/source/filter/ww8/ww8graf2.cxx4
-rw-r--r--sw/source/filter/ww8/ww8par.cxx18
-rw-r--r--sw/source/filter/ww8/ww8par.hxx4
-rw-r--r--sw/source/filter/ww8/ww8par2.cxx6
-rw-r--r--sw/source/filter/ww8/ww8par3.cxx6
-rw-r--r--sw/source/filter/ww8/ww8par4.cxx4
-rw-r--r--sw/source/filter/ww8/ww8par5.cxx6
-rw-r--r--sw/source/filter/ww8/ww8par6.cxx4
-rw-r--r--sw/source/filter/xml/XMLRedlineImportHelper.cxx2
-rw-r--r--sw/source/filter/xml/swxml.cxx4
-rw-r--r--sw/source/filter/xml/wrtxml.cxx4
-rw-r--r--sw/source/filter/xml/xmlexpit.cxx8
-rw-r--r--sw/source/filter/xml/xmlfmt.cxx2
-rw-r--r--sw/source/filter/xml/xmlfmte.cxx2
-rw-r--r--sw/source/filter/xml/xmlimp.cxx4
-rw-r--r--sw/source/filter/xml/xmlimpit.cxx6
-rw-r--r--sw/source/filter/xml/xmltble.cxx14
-rw-r--r--sw/source/filter/xml/xmltbli.cxx6
-rw-r--r--sw/source/filter/xml/xmltbli.hxx2
-rw-r--r--sw/source/filter/xml/xmltexte.cxx4
-rw-r--r--sw/source/filter/xml/xmltexti.cxx2
-rw-r--r--sw/source/ui/app/app.src2
-rw-r--r--sw/source/ui/app/apphdl.cxx196
-rw-r--r--sw/source/ui/app/appopt.cxx16
-rw-r--r--sw/source/ui/app/docsh.cxx29
-rw-r--r--sw/source/ui/app/docsh2.cxx14
-rw-r--r--sw/source/ui/app/docshdrw.cxx2
-rw-r--r--sw/source/ui/app/docshini.cxx11
-rw-r--r--sw/source/ui/app/docst.cxx8
-rw-r--r--sw/source/ui/app/docstyle.cxx10
-rw-r--r--sw/source/ui/app/mainwn.cxx2
-rw-r--r--sw/source/ui/app/swdll.cxx2
-rw-r--r--sw/source/ui/app/swmodul1.cxx2
-rw-r--r--sw/source/ui/app/swmodule.cxx2
-rw-r--r--sw/source/ui/chrdlg/break.cxx2
-rw-r--r--sw/source/ui/chrdlg/chardlg.cxx6
-rw-r--r--sw/source/ui/chrdlg/drpcps.cxx6
-rw-r--r--sw/source/ui/chrdlg/numpara.cxx6
-rw-r--r--sw/source/ui/chrdlg/pardlg.cxx10
-rw-r--r--sw/source/ui/chrdlg/tblnumfm.cxx2
-rw-r--r--sw/source/ui/config/barcfg.cxx2
-rw-r--r--sw/source/ui/config/cfgitems.cxx2
-rw-r--r--sw/source/ui/config/dbconfig.cxx2
-rw-r--r--sw/source/ui/config/fontcfg.cxx4
-rw-r--r--sw/source/ui/config/modcfg.cxx10
-rw-r--r--sw/source/ui/config/optload.cxx2
-rw-r--r--sw/source/ui/config/optpage.cxx12
-rw-r--r--sw/source/ui/config/prtopt.cxx3
-rw-r--r--sw/source/ui/config/uinums.cxx6
-rw-r--r--sw/source/ui/config/usrpref.cxx13
-rw-r--r--sw/source/ui/config/viewopt.cxx12
-rw-r--r--sw/source/ui/dbui/addresslistdialog.cxx4
-rw-r--r--sw/source/ui/dbui/createaddresslistdialog.cxx2
-rw-r--r--sw/source/ui/dbui/dbinsdlg.cxx12
-rw-r--r--sw/source/ui/dbui/dbmgr.cxx16
-rw-r--r--sw/source/ui/dbui/maildispatcher.cxx11
-rw-r--r--sw/source/ui/dbui/mmaddressblockpage.hxx2
-rw-r--r--sw/source/ui/dbui/mmconfigitem.cxx8
-rw-r--r--sw/source/ui/dbui/mmdocselectpage.cxx2
-rw-r--r--sw/source/ui/dbui/mmlayoutpage.cxx4
-rw-r--r--sw/source/ui/dbui/mmmergepage.cxx2
-rw-r--r--sw/source/ui/dbui/mmoutputpage.cxx6
-rw-r--r--sw/source/ui/dialog/SwSpellDialogChildWindow.cxx4
-rw-r--r--sw/source/ui/dialog/ascfldlg.cxx2
-rw-r--r--sw/source/ui/dialog/macassgn.cxx2
-rw-r--r--sw/source/ui/dialog/regionsw.cxx8
-rw-r--r--sw/source/ui/dialog/swdlgfact.cxx4
-rw-r--r--sw/source/ui/dialog/uiregionsw.cxx14
-rw-r--r--sw/source/ui/dochdl/gloshdl.cxx6
-rw-r--r--sw/source/ui/dochdl/swdtflvr.cxx6
-rw-r--r--sw/source/ui/docvw/PostItMgr.cxx8
-rw-r--r--sw/source/ui/docvw/edtwin.cxx16
-rw-r--r--sw/source/ui/docvw/edtwin2.cxx14
-rw-r--r--sw/source/ui/docvw/postit.cxx10
-rw-r--r--sw/source/ui/docvw/romenu.cxx6
-rw-r--r--sw/source/ui/docvw/srcedtw.cxx16
-rw-r--r--sw/source/ui/envelp/envfmt.cxx2
-rw-r--r--sw/source/ui/envelp/envfmt.hxx2
-rw-r--r--sw/source/ui/envelp/envimg.cxx5
-rw-r--r--sw/source/ui/envelp/labelcfg.cxx3
-rw-r--r--sw/source/ui/envelp/labimg.cxx4
-rw-r--r--sw/source/ui/envelp/labprt.cxx4
-rw-r--r--sw/source/ui/envelp/mailmrge.cxx6
-rw-r--r--sw/source/ui/fldui/flddinf.cxx82
-rw-r--r--sw/source/ui/fldui/flddinf.hxx7
-rw-r--r--sw/source/ui/fldui/flddok.cxx2
-rw-r--r--sw/source/ui/fldui/fldedt.cxx18
-rw-r--r--sw/source/ui/fldui/fldmgr.cxx8
-rw-r--r--sw/source/ui/fldui/fldpage.cxx2
-rw-r--r--sw/source/ui/fldui/fldtdlg.cxx34
-rw-r--r--sw/source/ui/fldui/fldvar.cxx2
-rw-r--r--sw/source/ui/fldui/javaedit.cxx2
-rw-r--r--sw/source/ui/fldui/makefile.mk1
-rw-r--r--sw/source/ui/fmtui/tmpdlg.cxx14
-rw-r--r--sw/source/ui/frmdlg/colex.cxx2
-rw-r--r--sw/source/ui/frmdlg/column.cxx2
-rw-r--r--sw/source/ui/frmdlg/frmmgr.cxx2
-rw-r--r--sw/source/ui/frmdlg/frmpage.cxx4
-rw-r--r--sw/source/ui/frmdlg/uiborder.cxx4
-rw-r--r--sw/source/ui/frmdlg/wrap.cxx2
-rw-r--r--sw/source/ui/globdoc/globdoc.cxx2
-rw-r--r--sw/source/ui/inc/barcfg.hxx3
-rw-r--r--sw/source/ui/inc/basesh.hxx2
-rw-r--r--sw/source/ui/inc/cfgitems.hxx6
-rw-r--r--sw/source/ui/inc/dbconfig.hxx2
-rw-r--r--sw/source/ui/inc/dbinsdlg.hxx6
-rw-r--r--sw/source/ui/inc/edtwin.hxx2
-rw-r--r--sw/source/ui/inc/envimg.hxx3
-rw-r--r--sw/source/ui/inc/fldmgr.hxx2
-rw-r--r--sw/source/ui/inc/fontcfg.hxx1
-rw-r--r--sw/source/ui/inc/formatclipboard.hxx4
-rw-r--r--sw/source/ui/inc/glosdoc.hxx2
-rw-r--r--sw/source/ui/inc/gloslst.hxx2
-rw-r--r--sw/source/ui/inc/label.hxx2
-rw-r--r--sw/source/ui/inc/labelcfg.hxx3
-rw-r--r--sw/source/ui/inc/labimg.hxx5
-rw-r--r--sw/source/ui/inc/maildispatcher.hxx2
-rw-r--r--sw/source/ui/inc/navicfg.hxx3
-rw-r--r--sw/source/ui/inc/navipi.hxx2
-rw-r--r--sw/source/ui/inc/numfmtlb.hxx2
-rw-r--r--sw/source/ui/inc/optcomp.hxx2
-rw-r--r--sw/source/ui/inc/optpage.hxx2
-rw-r--r--sw/source/ui/inc/prtopt.hxx3
-rw-r--r--sw/source/ui/inc/redlndlg.hxx4
-rw-r--r--sw/source/ui/inc/srcedtw.hxx13
-rw-r--r--sw/source/ui/inc/swlbox.hxx2
-rw-r--r--sw/source/ui/inc/swwrtshitem.hxx2
-rw-r--r--sw/source/ui/inc/uiitems.hxx2
-rw-r--r--sw/source/ui/inc/uinums.hxx2
-rw-r--r--sw/source/ui/inc/unotxvw.hxx2
-rw-r--r--sw/source/ui/inc/usrpref.hxx10
-rw-r--r--sw/source/ui/index/cnttab.cxx6
-rw-r--r--sw/source/ui/index/idxmrk.cxx10
-rw-r--r--sw/source/ui/index/swuiidxmrk.cxx10
-rw-r--r--sw/source/ui/lingu/olmenu.cxx14
-rw-r--r--sw/source/ui/misc/bookmark.cxx2
-rw-r--r--sw/source/ui/misc/docfnote.cxx2
-rw-r--r--sw/source/ui/misc/glosbib.cxx4
-rw-r--r--sw/source/ui/misc/glosdoc.cxx8
-rw-r--r--sw/source/ui/misc/glossary.cxx12
-rw-r--r--sw/source/ui/misc/glshell.cxx6
-rw-r--r--sw/source/ui/misc/insfnote.cxx4
-rw-r--r--sw/source/ui/misc/insrule.cxx2
-rw-r--r--sw/source/ui/misc/linenum.cxx2
-rw-r--r--sw/source/ui/misc/num.cxx6
-rw-r--r--sw/source/ui/misc/outline.cxx2
-rw-r--r--sw/source/ui/misc/pgfnote.cxx4
-rw-r--r--sw/source/ui/misc/redlndlg.cxx6
-rw-r--r--sw/source/ui/misc/srtdlg.cxx4
-rw-r--r--sw/source/ui/misc/swmodalredlineacceptdlg.cxx4
-rw-r--r--sw/source/ui/ribbar/concustomshape.cxx2
-rw-r--r--sw/source/ui/ribbar/drawbase.cxx2
-rw-r--r--sw/source/ui/ribbar/inputwin.cxx4
-rw-r--r--sw/source/ui/ribbar/tblctrl.cxx2
-rw-r--r--sw/source/ui/ribbar/tbxanchr.cxx2
-rw-r--r--sw/source/ui/ribbar/workctrl.cxx4
-rwxr-xr-xsw/source/ui/shells/annotsh.cxx20
-rw-r--r--sw/source/ui/shells/basesh.cxx16
-rw-r--r--sw/source/ui/shells/beziersh.cxx4
-rw-r--r--sw/source/ui/shells/drawdlg.cxx4
-rw-r--r--sw/source/ui/shells/drawsh.cxx4
-rw-r--r--sw/source/ui/shells/drformsh.cxx4
-rw-r--r--sw/source/ui/shells/drwbassh.cxx12
-rw-r--r--sw/source/ui/shells/drwtxtex.cxx10
-rw-r--r--sw/source/ui/shells/drwtxtsh.cxx8
-rw-r--r--sw/source/ui/shells/frmsh.cxx11
-rw-r--r--sw/source/ui/shells/grfsh.cxx6
-rw-r--r--sw/source/ui/shells/grfshex.cxx4
-rwxr-xr-xsw/source/ui/shells/langhelper.cxx8
-rw-r--r--sw/source/ui/shells/listsh.cxx8
-rw-r--r--sw/source/ui/shells/mediash.cxx6
-rw-r--r--sw/source/ui/shells/slotadd.cxx12
-rw-r--r--sw/source/ui/shells/tabsh.cxx10
-rw-r--r--sw/source/ui/shells/textdrw.cxx2
-rw-r--r--sw/source/ui/shells/textfld.cxx12
-rw-r--r--sw/source/ui/shells/textglos.cxx4
-rw-r--r--sw/source/ui/shells/textidx.cxx4
-rw-r--r--sw/source/ui/shells/textsh.cxx12
-rw-r--r--sw/source/ui/shells/textsh1.cxx22
-rw-r--r--sw/source/ui/shells/textsh2.cxx8
-rw-r--r--sw/source/ui/shells/txtattr.cxx8
-rw-r--r--sw/source/ui/shells/txtcrsr.cxx2
-rw-r--r--sw/source/ui/shells/txtnum.cxx4
-rw-r--r--sw/source/ui/smartmenu/stmenu.cxx2
-rw-r--r--sw/source/ui/table/convert.cxx2
-rw-r--r--sw/source/ui/table/convert.src2
-rw-r--r--sw/source/ui/table/instable.src2
-rw-r--r--sw/source/ui/table/rowht.cxx4
-rw-r--r--sw/source/ui/table/swtablerep.cxx6
-rw-r--r--sw/source/ui/table/tabledlg.cxx6
-rw-r--r--sw/source/ui/table/tautofmt.cxx2
-rw-r--r--sw/source/ui/uiview/pview.cxx10
-rw-r--r--sw/source/ui/uiview/srcview.cxx14
-rw-r--r--sw/source/ui/uiview/view.cxx8
-rw-r--r--sw/source/ui/uiview/view0.cxx10
-rw-r--r--sw/source/ui/uiview/view2.cxx14
-rw-r--r--sw/source/ui/uiview/viewcoll.cxx2
-rw-r--r--sw/source/ui/uiview/viewdlg.cxx2
-rw-r--r--sw/source/ui/uiview/viewdraw.cxx4
-rw-r--r--sw/source/ui/uiview/viewling.cxx4
-rw-r--r--sw/source/ui/uiview/viewprt.cxx29
-rw-r--r--sw/source/ui/uiview/viewsrch.cxx14
-rw-r--r--sw/source/ui/uiview/viewstat.cxx16
-rw-r--r--sw/source/ui/uiview/viewtab.cxx6
-rw-r--r--sw/source/ui/uno/SwXDocumentSettings.cxx2
-rw-r--r--sw/source/ui/uno/dlelstnr.cxx2
-rw-r--r--sw/source/ui/uno/swdet2.cxx2
-rw-r--r--sw/source/ui/uno/swdetect.cxx8
-rw-r--r--sw/source/ui/uno/unoatxt.cxx8
-rw-r--r--sw/source/ui/uno/unomailmerge.cxx4
-rw-r--r--sw/source/ui/uno/unotxdoc.cxx12
-rw-r--r--sw/source/ui/uno/warnpassword.cxx2
-rw-r--r--sw/source/ui/utlui/attrdesc.cxx2
-rw-r--r--sw/source/ui/utlui/bookctrl.cxx6
-rw-r--r--sw/source/ui/utlui/content.cxx4
-rw-r--r--sw/source/ui/utlui/glbltree.cxx10
-rw-r--r--sw/source/ui/utlui/gloslst.cxx6
-rw-r--r--sw/source/ui/utlui/initui.cxx3
-rw-r--r--sw/source/ui/utlui/initui.hrc1
-rw-r--r--sw/source/ui/utlui/initui.src4
-rw-r--r--sw/source/ui/utlui/navicfg.cxx3
-rw-r--r--sw/source/ui/utlui/navipi.cxx6
-rw-r--r--sw/source/ui/utlui/numfmtlb.cxx6
-rw-r--r--sw/source/ui/utlui/swrenamexnameddlg.cxx2
-rw-r--r--sw/source/ui/utlui/tmplctrl.cxx4
-rw-r--r--sw/source/ui/utlui/uitool.cxx8
-rw-r--r--sw/source/ui/utlui/unotools.cxx2
-rw-r--r--sw/source/ui/utlui/viewlayoutctrl.cxx2
-rw-r--r--sw/source/ui/utlui/zoomctrl.cxx2
-rw-r--r--sw/source/ui/vba/vbaaddins.cxx2
-rw-r--r--sw/source/ui/wrtsh/select.cxx4
-rw-r--r--sw/source/ui/wrtsh/wrtsh1.cxx4
-rw-r--r--sw/source/ui/wrtsh/wrtsh2.cxx8
-rw-r--r--sw/source/ui/wrtsh/wrtundo.cxx2
-rw-r--r--sw/util/makefile.mk5
-rwxr-xr-x[-rw-r--r--]sw/util/msword.map3
-rw-r--r--swext/mediawiki/build.xml6
-rw-r--r--swext/mediawiki/src/filter/mediawiki.ott (renamed from filter/source/xslt/export/wiki/mediawiki.ott)bin6304 -> 6304 bytes-rwxr-xr-xswext/mediawiki/src/filter/odt2mediawiki.xsl (renamed from filter/source/xslt/export/wiki/odt2mediawiki.xsl)0
-rw-r--r--swext/prj/build.lst2
-rwxr-xr-xtestautomation/extensions/optional/includes/extensions.inc17
-rwxr-xr-xtestautomation/extensions/optional/includes/publisher.inc80
-rw-r--r--testautomation/extensions/optional/input/dependencies/version31.oxtbin670 -> 1440 bytes-rwxr-xr-xtestautomation/extensions/optional/input/files.txt4
-rwxr-xr-xtestautomation/framework/optional/f_CJK_GridLayout.bas12
-rwxr-xr-xtestautomation/framework/optional/includes/CJK_FeatureSwitchTest_1.inc8
-rwxr-xr-xtestautomation/framework/optional/includes/basic_package_export.inc32
-rwxr-xr-xtestautomation/framework/optional/includes/w_grid_layout1.inc86
-rwxr-xr-xtestautomation/framework/required/f_first.bas12
-rwxr-xr-xtestautomation/framework/required/includes/wizard_documentconverter.inc7
-rwxr-xr-xtestautomation/global/required/includes/g_option.inc6
-rwxr-xr-xtestautomation/global/system/includes/master.inc7
-rwxr-xr-xtestautomation/global/tools/includes/required/t_doc1.inc1
-rwxr-xr-xtestautomation/global/tools/includes/required/t_files.inc6
-rwxr-xr-xtestautomation/global/win/dial_a_c.win64
-rwxr-xr-xtestautomation/global/win/dial_d_h.win20
-rwxr-xr-xtestautomation/global/win/dial_i_o.win94
-rwxr-xr-xtestautomation/global/win/dial_p_s.win41
-rwxr-xr-xtestautomation/global/win/dial_t_z.win114
-rwxr-xr-xtestautomation/global/win/edia_a_c.win22
-rwxr-xr-xtestautomation/global/win/edia_d_h.win66
-rwxr-xr-xtestautomation/global/win/edia_i_o.win54
-rwxr-xr-xtestautomation/global/win/edia_p_s.win44
-rwxr-xr-xtestautomation/global/win/etab_a_d.win162
-rwxr-xr-xtestautomation/global/win/etab_e_g.win130
-rwxr-xr-xtestautomation/global/win/etab_h_o.win84
-rwxr-xr-xtestautomation/global/win/etab_p_s.win110
-rwxr-xr-xtestautomation/global/win/etab_t_z.win22
-rwxr-xr-xtestautomation/global/win/tab_a_d.win184
-rwxr-xr-xtestautomation/global/win/tab_e_g.win110
-rwxr-xr-xtestautomation/global/win/tab_h_o.win331
-rwxr-xr-xtestautomation/global/win/tab_p_s.win190
-rwxr-xr-xtestautomation/global/win/tab_t_z.win280
-rwxr-xr-xtestautomation/math/required/m_updt.bas2
-rwxr-xr-xtestautomation/writer/optional/includes/dropdownLB/w_dropdownLB1.inc8
-rwxr-xr-xtestautomation/writer/optional/includes/insertgraphic/w_insertgraphic2.inc344
-rwxr-xr-xtestautomation/writer/optional/includes/regression/issuezilla/w_issuezilla_regression.inc3
-rwxr-xr-xtestautomation/writer/required/includes/w_005b_.inc37
-rwxr-xr-xtestautomation/writer/required/includes/w_020_.inc14
-rwxr-xr-xtestautomation/writer/required/w_updt.bas2
-rwxr-xr-xtestautomation/writer/tools/includes/w_tool1.inc11
-rwxr-xr-xtestautomation/writer/tools/includes/w_tool2.inc18
-rw-r--r--testshl2/inc/testshl/additionalfunc.hxx61
-rw-r--r--testshl2/inc/testshl/autoregister/callbackstructure.h89
-rw-r--r--testshl2/inc/testshl/autoregister/htestresult.h6
-rw-r--r--testshl2/inc/testshl/autoregister/registerfunc.h (renamed from sandbox/com/sun/star/lib/sandbox/CodeSource.java)34
-rw-r--r--testshl2/inc/testshl/autoregister/registertestfunction.h54
-rw-r--r--testshl2/inc/testshl/autoregister/testfunc.h47
-rw-r--r--testshl2/inc/testshl/autoregisterhelper.hxx (renamed from svtools/inc/reqitem.hxx)55
-rw-r--r--testshl2/inc/testshl/checkboom.hxx (renamed from sandbox/com/sun/star/lib/sandbox/Holder.java)18
-rw-r--r--testshl2/inc/testshl/cmdlinebits.hxx (renamed from svtools/source/misc/iniman.src)54
-rw-r--r--testshl2/inc/testshl/dynamicregister.hxx67
-rw-r--r--testshl2/inc/testshl/filehelper.hxx50
-rw-r--r--testshl2/inc/testshl/getopt.hxx335
-rw-r--r--testshl2/inc/testshl/joblist.hxx99
-rw-r--r--testshl2/inc/testshl/log.hxx116
-rw-r--r--testshl2/inc/testshl/nocopy.hxx13
-rw-r--r--testshl2/inc/testshl/result/SynchronizedObject.h82
-rw-r--r--testshl2/inc/testshl/result/TestListener.h62
-rw-r--r--testshl2/inc/testshl/result/TestResult.h123
-rw-r--r--testshl2/inc/testshl/result/TestResultCollector.h165
-rw-r--r--testshl2/inc/testshl/result/TestSucessListener.h40
-rw-r--r--testshl2/inc/testshl/result/TextTestResult.h62
-rw-r--r--testshl2/inc/testshl/result/callbackfunc.h25
-rw-r--r--testshl2/inc/testshl/result/emacsTestResult.hxx82
-rw-r--r--testshl2/inc/testshl/result/log.hxx106
-rw-r--r--testshl2/inc/testshl/result/optionhelper.hxx98
-rw-r--r--testshl2/inc/testshl/result/outputter.hxx85
-rw-r--r--testshl2/inc/testshl/result/testshlTestResult.h72
-rw-r--r--testshl2/inc/testshl/signaltest.h (renamed from svtools/inc/svtools/options.hxx)44
-rw-r--r--testshl2/inc/testshl/simpleheader.hxx46
-rw-r--r--testshl2/inc/testshl/stringhelper.hxx42
-rw-r--r--testshl2/inc/testshl/taghelper.hxx91
-rw-r--r--testshl2/inc/testshl/tresstatewrapper.h (renamed from svtools/inc/svipcdef.h)57
-rw-r--r--testshl2/inc/testshl/tresstatewrapper.hxx (renamed from svtools/inc/whmap.hxx)53
-rw-r--r--testshl2/inc/testshl/versionhelper.hxx87
-rw-r--r--testshl2/inc/testshl/winstuff.hxx (renamed from svtools/source/config/options.cxx)24
-rw-r--r--testshl2/prj/build.lst9
-rw-r--r--testshl2/prj/d.lst36
-rw-r--r--testshl2/source/autoregisterhelper.cxx8
-rw-r--r--testshl2/source/codegen/codegen.pl2
-rw-r--r--testshl2/source/cppunit/cmdlinebits.cxx144
-rw-r--r--testshl2/source/cppunit/joblist.cxx224
-rw-r--r--testshl2/source/cppunit/makefile.mk103
-rw-r--r--testshl2/source/cppunit/registertestfunction.cxx60
-rw-r--r--testshl2/source/cppunit/result/SynchronizedObject.cpp38
-rw-r--r--testshl2/source/cppunit/result/TestResult.cpp264
-rw-r--r--testshl2/source/cppunit/result/TestResultCollector.cpp150
-rw-r--r--testshl2/source/cppunit/result/TestSucessListener.cpp50
-rw-r--r--testshl2/source/cppunit/result/TextTestResult.cpp194
-rw-r--r--testshl2/source/cppunit/result/emacsTestResult.cxx193
-rw-r--r--testshl2/source/cppunit/result/log.cxx125
-rw-r--r--testshl2/source/cppunit/result/makefile.mk83
-rw-r--r--testshl2/source/cppunit/result/optionhelper.cxx317
-rw-r--r--testshl2/source/cppunit/result/outputter.cxx106
-rw-r--r--testshl2/source/cppunit/result/signal.cxx999
-rw-r--r--testshl2/source/cppunit/result/signal.hxx42
-rw-r--r--testshl2/source/cppunit/result/testshlTestResult.cxx428
-rw-r--r--testshl2/source/cppunit/result/treswrapper.cxx262
-rw-r--r--testshl2/source/cppunit/signaltest.cxx92
-rw-r--r--testshl2/source/cppunit/t_print.cxx98
-rw-r--r--testshl2/source/cppunit/tresregister.cxx69
-rw-r--r--testshl2/source/cppunit/tresstatewrapper.cxx169
-rw-r--r--testshl2/source/cppunit/win32/makefile.mk64
-rw-r--r--testshl2/source/cppunit/win32/winstuff.cxx143
-rwxr-xr-x[-rw-r--r--]testshl2/source/makefile.mk51
-rw-r--r--testshl2/source/testshl.cxx8
-rw-r--r--testtools/qa/cli/makefile.mk2
-rw-r--r--testtools/qa/cliversioning/makefile.mk2
-rwxr-xr-xtoolkit/qa/complex/toolkit/interface_tests/makefile.mk2
-rwxr-xr-xtoolkit/qa/complex/toolkit/makefile.mk2
-rw-r--r--toolkit/src2xml/include.lst3
-rw-r--r--toolkit/workben/layout/editor.cxx11
-rw-r--r--tools/inc/poly.h13
-rw-r--r--tools/inc/tools/date.hxx3
-rw-r--r--tools/inc/tools/fldunit.hxx (renamed from sandbox/com/sun/star/lib/sandbox/WeakEntry.java)26
-rw-r--r--tools/inc/tools/fontenum.hxx175
-rw-r--r--tools/inc/tools/fsys.hxx2
-rw-r--r--tools/inc/tools/gen.hxx31
-rw-r--r--tools/inc/tools/mapunit.hxx44
-rwxr-xr-xtools/inc/tools/solarmutex.hxx (renamed from soldep/inc/XmlBuildListDef.hxx)33
-rw-r--r--tools/inc/tools/wintypes.hxx337
-rw-r--r--tools/prj/d.lst6
-rw-r--r--tools/qa/makefile.mk4
-rw-r--r--tools/qa/test_pathutils.cxx2
-rw-r--r--tools/source/datetime/tdate.cxx6
-rw-r--r--tools/source/generic/line.cxx5
-rw-r--r--tools/source/misc/makefile.mk3
-rw-r--r--tools/source/misc/solarmutex.cxx (renamed from svtools/source/misc/vcldata.cxx)51
-rw-r--r--tools/test/makefile.mk9
-rw-r--r--tools/test/tests.cxx2
-rw-r--r--transex3/inc/xmlparse.hxx4
-rw-r--r--transex3/source/help/HelpLinker.cxx68
-rw-r--r--transex3/source/help/MANIFEST.MF2
-rw-r--r--transex3/source/help/compilehelp.hxx1
-rw-r--r--transex3/source/help/makefile.mk19
-rwxr-xr-xucb/qa/complex/tdoc/interfaces/makefile.mk2
-rwxr-xr-xucb/qa/complex/tdoc/makefile.mk2
-rwxr-xr-xucb/qa/complex/ucb/makefile.mk2
-rw-r--r--ucb/source/ucp/gio/gio_mount.cxx2
-rw-r--r--unotools/inc/unotools/accelcfg.hxx (renamed from svtools/inc/svtools/accelcfg.hxx)8
-rw-r--r--unotools/inc/unotools/cacheoptions.hxx (renamed from svtools/inc/cacheoptions.hxx)12
-rw-r--r--unotools/inc/unotools/cmdoptions.hxx (renamed from svtools/inc/svtools/cmdoptions.hxx)14
-rw-r--r--unotools/inc/unotools/compatibility.hxx (renamed from svtools/inc/svtools/compatibility.hxx)14
-rw-r--r--unotools/inc/unotools/configitem.hxx7
-rw-r--r--unotools/inc/unotools/defaultoptions.hxx (renamed from svtools/inc/svtools/defaultoptions.hxx)12
-rw-r--r--unotools/inc/unotools/dynamicmenuoptions.hxx (renamed from svtools/inc/svtools/dynamicmenuoptions.hxx)14
-rw-r--r--unotools/inc/unotools/eventcfg.hxx (renamed from svtools/inc/eventcfg.hxx)4
-rw-r--r--unotools/inc/unotools/extendedsecurityoptions.hxx (renamed from svtools/inc/svtools/extendedsecurityoptions.hxx)14
-rw-r--r--unotools/inc/unotools/fltrcfg.hxx (renamed from svtools/inc/fltrcfg.hxx)4
-rw-r--r--unotools/inc/unotools/fontcfg.hxx (renamed from vcl/inc/vcl/fontcfg.hxx)26
-rw-r--r--unotools/inc/unotools/fontcvt.hxx (renamed from vcl/inc/vcl/fontcvt.hxx)41
-rw-r--r--unotools/inc/unotools/fontdefs.hxx110
-rw-r--r--unotools/inc/unotools/fontoptions.hxx (renamed from svtools/inc/svtools/fontoptions.hxx)14
-rw-r--r--unotools/inc/unotools/historyoptions.hxx (renamed from svtools/inc/svtools/historyoptions.hxx)8
-rw-r--r--unotools/inc/unotools/historyoptions_const.hxx (renamed from svtools/source/inc/configitems/historyoptions_const.hxx)2
-rw-r--r--unotools/inc/unotools/inetoptions.hxx (renamed from svtools/inc/svtools/inetoptions.hxx)12
-rw-r--r--unotools/inc/unotools/internaloptions.hxx (renamed from svtools/inc/svtools/internaloptions.hxx)14
-rw-r--r--unotools/inc/unotools/itemholderbase.hxx (renamed from svtools/source/config/itemholderbase.hxx)10
-rw-r--r--unotools/inc/unotools/javaoptions.hxx (renamed from svtools/inc/javaoptions.hxx)8
-rw-r--r--unotools/inc/unotools/lingucfg.hxx (renamed from svtools/inc/svtools/lingucfg.hxx)16
-rw-r--r--unotools/inc/unotools/linguprops.hxx (renamed from svtools/inc/linguprops.hxx)4
-rw-r--r--unotools/inc/unotools/localisationoptions.hxx (renamed from svtools/inc/svtools/localisationoptions.hxx)14
-rw-r--r--unotools/inc/unotools/loghelper.hxx (renamed from svtools/source/config/loghelper.hxx)0
-rw-r--r--unotools/inc/unotools/misccfg.hxx (renamed from svtools/inc/misccfg.hxx)39
-rw-r--r--unotools/inc/unotools/moduleoptions.hxx (renamed from svtools/inc/svtools/moduleoptions.hxx)8
-rwxr-xr-xunotools/inc/unotools/options.hxx100
-rw-r--r--unotools/inc/unotools/optionsdlg.hxx (renamed from svtools/inc/svtools/optionsdlg.hxx)12
-rw-r--r--unotools/inc/unotools/pathoptions.hxx (renamed from svtools/inc/svtools/pathoptions.hxx)12
-rw-r--r--unotools/inc/unotools/printwarningoptions.hxx (renamed from svtools/inc/svtools/printwarningoptions.hxx)14
-rw-r--r--unotools/inc/unotools/regoptions.hxx (renamed from svtools/inc/regoptions.hxx)16
-rw-r--r--unotools/inc/unotools/saveopt.hxx (renamed from svtools/inc/svtools/saveopt.hxx)10
-rw-r--r--unotools/inc/unotools/searchopt.hxx (renamed from svtools/inc/searchopt.hxx)4
-rw-r--r--unotools/inc/unotools/securityoptions.hxx (renamed from svtools/inc/svtools/securityoptions.hxx)14
-rw-r--r--unotools/inc/unotools/sourceviewconfig.hxx (renamed from svtools/inc/svtools/sourceviewconfig.hxx)18
-rw-r--r--unotools/inc/unotools/startoptions.hxx (renamed from svtools/inc/svtools/startoptions.hxx)14
-rw-r--r--unotools/inc/unotools/syslocale.hxx (renamed from svtools/inc/svtools/syslocale.hxx)20
-rwxr-xr-x[-rw-r--r--]unotools/inc/unotools/syslocaleoptions.hxx (renamed from svtools/inc/svtools/syslocaleoptions.hxx)31
-rw-r--r--unotools/inc/unotools/undoopt.hxx (renamed from svtools/inc/svtools/undoopt.hxx)15
-rw-r--r--unotools/inc/unotools/useroptions.hxx (renamed from svtools/inc/svtools/useroptions.hxx)17
-rw-r--r--unotools/inc/unotools/useroptions_const.hxx (renamed from svtools/source/inc/configitems/useroptions_const.hxx)0
-rw-r--r--unotools/inc/unotools/viewoptions.hxx (renamed from svtools/inc/svtools/viewoptions.hxx)14
-rw-r--r--unotools/inc/unotools/workingsetoptions.hxx (renamed from svtools/inc/svtools/workingsetoptions.hxx)10
-rw-r--r--unotools/inc/unotools/xmlaccelcfg.hxx (renamed from svtools/inc/xmlaccelcfg.hxx)8
-rw-r--r--unotools/source/config/accelcfg.cxx (renamed from svtools/source/config/accelcfg.cxx)8
-rw-r--r--unotools/source/config/cacheoptions.cxx (renamed from svtools/source/config/cacheoptions.cxx)9
-rw-r--r--unotools/source/config/cmdoptions.cxx (renamed from svtools/source/config/cmdoptions.cxx)4
-rw-r--r--unotools/source/config/compatibility.cxx (renamed from svtools/source/config/compatibility.cxx)4
-rw-r--r--unotools/source/config/configitem.cxx42
-rw-r--r--unotools/source/config/defaultoptions.cxx (renamed from svtools/source/config/defaultoptions.cxx)18
-rw-r--r--unotools/source/config/dynamicmenuoptions.cxx (renamed from svtools/source/config/dynamicmenuoptions.cxx)6
-rw-r--r--unotools/source/config/eventcfg.cxx (renamed from svtools/source/config/eventcfg.cxx)4
-rw-r--r--unotools/source/config/extendedsecurityoptions.cxx (renamed from svtools/source/config/extendedsecurityoptions.cxx)8
-rw-r--r--unotools/source/config/fltrcfg.cxx (renamed from svtools/source/config/fltrcfg.cxx)14
-rw-r--r--unotools/source/config/fontcfg.cxx (renamed from vcl/source/gdi/fontcfg.cxx)199
-rw-r--r--unotools/source/config/fontoptions.cxx (renamed from svtools/source/config/fontoptions.cxx)6
-rw-r--r--unotools/source/config/historyoptions.cxx (renamed from svtools/source/config/historyoptions.cxx)10
-rw-r--r--unotools/source/config/inetoptions.cxx (renamed from svtools/source/config/inetoptions.cxx)6
-rw-r--r--unotools/source/config/internaloptions.cxx (renamed from svtools/source/config/internaloptions.cxx)6
-rw-r--r--unotools/source/config/itemholder1.cxx (renamed from svtools/source/config/itemholder1.cxx)95
-rw-r--r--unotools/source/config/itemholder1.hxx (renamed from svtools/source/config/itemholder1.hxx)8
-rw-r--r--unotools/source/config/javaoptions.cxx (renamed from svtools/source/config/javaoptions.cxx)15
-rw-r--r--unotools/source/config/lingucfg.cxx (renamed from svtools/source/config/lingucfg.cxx)13
-rw-r--r--unotools/source/config/localisationoptions.cxx (renamed from svtools/source/config/localisationoptions.cxx)8
-rw-r--r--unotools/source/config/makefile.mk40
-rw-r--r--unotools/source/config/menuoptions.cxx564
-rw-r--r--unotools/source/config/misccfg.cxx (renamed from svtools/source/config/misccfg.cxx)142
-rw-r--r--unotools/source/config/moduleoptions.cxx (renamed from svtools/source/config/moduleoptions.cxx)6
-rwxr-xr-xunotools/source/config/options.cxx109
-rw-r--r--unotools/source/config/optionsdlg.cxx (renamed from svtools/source/config/optionsdlg.cxx)4
-rw-r--r--unotools/source/config/optionsdrawinglayer.cxx1708
-rw-r--r--unotools/source/config/pathoptions.cxx (renamed from svtools/source/config/pathoptions.cxx)6
-rw-r--r--unotools/source/config/printwarningoptions.cxx (renamed from svtools/source/config/printwarningoptions.cxx)9
-rw-r--r--unotools/source/config/regoptions.cxx (renamed from svtools/source/config/regoptions.cxx)9
-rw-r--r--unotools/source/config/saveopt.cxx (renamed from svtools/source/config/saveopt.cxx)6
-rw-r--r--unotools/source/config/searchopt.cxx (renamed from svtools/source/config/searchopt.cxx)11
-rw-r--r--unotools/source/config/securityoptions.cxx (renamed from svtools/source/config/securityoptions.cxx)8
-rw-r--r--unotools/source/config/sourceviewconfig.cxx (renamed from svtools/source/config/sourceviewconfig.cxx)28
-rw-r--r--unotools/source/config/startoptions.cxx (renamed from svtools/source/config/startoptions.cxx)6
-rwxr-xr-x[-rw-r--r--]unotools/source/config/syslocaleoptions.cxx (renamed from svtools/source/config/syslocaleoptions.cxx)344
-rw-r--r--unotools/source/config/undoopt.cxx (renamed from svtools/source/config/undoopt.cxx)34
-rw-r--r--unotools/source/config/useroptions.cxx (renamed from svtools/source/config/useroptions.cxx)37
-rw-r--r--unotools/source/config/viewoptions.cxx (renamed from svtools/source/config/viewoptions.cxx)4
-rw-r--r--unotools/source/config/workingsetoptions.cxx (renamed from svtools/source/config/workingsetoptions.cxx)4
-rw-r--r--unotools/source/config/xmlaccelcfg.cxx (renamed from svtools/source/config/xmlaccelcfg.cxx)12
-rw-r--r--unotools/source/i18n/calendarwrapper.cxx52
-rw-r--r--unotools/source/i18n/charclass.cxx4
-rw-r--r--unotools/source/i18n/localedatawrapper.cxx2
-rw-r--r--unotools/source/i18n/transliterationwrapper.cxx10
-rw-r--r--unotools/source/misc/fontcvt.cxx (renamed from vcl/source/gdi/fontcvt.cxx)45
-rw-r--r--unotools/source/misc/fontdefs.cxx596
-rw-r--r--unotools/source/misc/makefile.mk3
-rw-r--r--unotools/source/misc/syslocale.cxx (renamed from svtools/source/syslocale/syslocale.cxx)88
-rw-r--r--unotools/source/property/propertysetinfo.cxx2
-rw-r--r--unoxml/test/domtest.cxx2
-rw-r--r--unoxml/test/makefile.mk13
-rw-r--r--uui/source/cookiedg.cxx2
-rw-r--r--uui/source/iahndl.cxx6
-rw-r--r--uui/source/ids.hrc2
-rw-r--r--uui/source/secmacrowarnings.hxx2
-rw-r--r--vbahelper/prj/build.lst2
-rw-r--r--vbahelper/source/vbahelper/vbaapplicationbase.cxx2
-rw-r--r--vbahelper/source/vbahelper/vbacommandbarcontrol.cxx2
-rw-r--r--vbahelper/source/vbahelper/vbahelper.cxx9
-rw-r--r--vbahelper/util/makefile.mk2
-rw-r--r--vcl/aqua/inc/salframe.h3
-rwxr-xr-xvcl/aqua/inc/salframeview.h6
-rw-r--r--vcl/aqua/source/a11y/documentfocuslistener.cxx4
-rw-r--r--vcl/aqua/source/app/salinst.cxx4
-rw-r--r--vcl/aqua/source/window/salframe.cxx24
-rwxr-xr-xvcl/aqua/source/window/salframeview.mm35
-rw-r--r--vcl/inc/vcl/dialog.hxx1
-rw-r--r--vcl/inc/vcl/fldunit.hxx10
-rw-r--r--vcl/inc/vcl/impimagetree.hxx22
-rw-r--r--vcl/inc/vcl/mapunit.hxx10
-rw-r--r--vcl/inc/vcl/outdev.h29
-rw-r--r--vcl/inc/vcl/outdev.hxx26
-rw-r--r--vcl/inc/vcl/outfont.hxx16
-rw-r--r--vcl/inc/vcl/pdfwriter.hxx2
-rw-r--r--vcl/inc/vcl/salbtype.hxx32
-rw-r--r--vcl/inc/vcl/salframe.hxx1
-rw-r--r--vcl/inc/vcl/salsession.hxx10
-rw-r--r--vcl/inc/vcl/settings.hxx21
-rw-r--r--vcl/inc/vcl/svdata.hxx44
-rw-r--r--vcl/inc/vcl/syswin.hxx4
-rw-r--r--vcl/inc/vcl/toolbox.h1
-rw-r--r--vcl/inc/vcl/wintypes.hxx303
-rw-r--r--vcl/os2/source/app/salinst.cxx3
-rw-r--r--vcl/prj/build.lst2
-rw-r--r--vcl/source/app/salvtables.cxx7
-rw-r--r--vcl/source/app/session.cxx26
-rwxr-xr-x[-rw-r--r--]vcl/source/app/settings.cxx203
-rw-r--r--vcl/source/app/svapp.cxx12
-rw-r--r--vcl/source/app/svdata.cxx8
-rw-r--r--vcl/source/app/svmain.cxx10
-rw-r--r--vcl/source/control/field2.cxx11
-rw-r--r--vcl/source/gdi/base14.cxx2
-rw-r--r--vcl/source/gdi/configsettings.cxx205
-rw-r--r--vcl/source/gdi/font.cxx12
-rw-r--r--vcl/source/gdi/impimagetree.cxx60
-rwxr-xr-x[-rw-r--r--]vcl/source/gdi/makefile.mk5
-rw-r--r--vcl/source/gdi/outdev.cxx13
-rw-r--r--vcl/source/gdi/outdev3.cxx611
-rw-r--r--vcl/source/gdi/pdfwriter_impl.cxx238
-rw-r--r--vcl/source/gdi/pdfwriter_impl.hxx10
-rw-r--r--vcl/source/gdi/region.cxx8
-rw-r--r--vcl/source/window/accmgr.cxx17
-rw-r--r--vcl/source/window/dialog.cxx14
-rw-r--r--vcl/source/window/syswin.cxx24
-rw-r--r--vcl/source/window/toolbox2.cxx3
-rw-r--r--vcl/source/window/window.cxx4
-rw-r--r--vcl/unx/gtk/a11y/atktext.cxx12
-rw-r--r--vcl/unx/gtk/window/gtkframe.cxx5
-rw-r--r--vcl/unx/inc/plugins/kde/kdedata.hxx2
-rw-r--r--vcl/unx/inc/salframe.h4
-rw-r--r--vcl/unx/inc/sm.hxx2
-rw-r--r--vcl/unx/kde/kdedata.cxx2
-rw-r--r--vcl/unx/kde/salnativewidgets-kde.cxx7
-rw-r--r--vcl/unx/kde4/KDESalFrame.cxx5
-rw-r--r--vcl/unx/kde4/KDESalFrame.hxx2
-rw-r--r--vcl/unx/source/app/salinst.cxx4
-rw-r--r--vcl/unx/source/app/sm.cxx13
-rw-r--r--vcl/unx/source/gdi/salgdi.cxx2
-rw-r--r--vcl/unx/source/plugadapt/salplug.cxx58
-rw-r--r--vcl/unx/source/printergfx/glyphset.cxx38
-rw-r--r--vcl/unx/source/window/salframe.cxx10
-rw-r--r--vcl/util/makefile.mk1
-rw-r--r--vcl/win/source/app/salinst.cxx3
-rw-r--r--vcl/win/source/window/salframe.cxx3
-rw-r--r--wizards/com/sun/star/wizards/agenda/makefile.mk3
-rw-r--r--wizards/com/sun/star/wizards/fax/makefile.mk2
-rw-r--r--wizards/com/sun/star/wizards/form/makefile.mk2
-rw-r--r--wizards/com/sun/star/wizards/table/makefile.mk2
-rw-r--r--writerfilter/qa/cppunittests/doctok/makefile.mk5
-rw-r--r--writerfilter/qa/cppunittests/doctok/testdoctok.cxx2
-rw-r--r--writerfilter/qa/cppunittests/odiapi/makefile.mk14
-rw-r--r--writerfilter/qa/cppunittests/odiapi/testCore.cxx2
-rw-r--r--writerfilter/qa/cppunittests/odiapi/testProperty.cxx2
-rw-r--r--writerfilter/qa/cppunittests/qname/makefile.mk12
-rw-r--r--writerfilter/qa/cppunittests/qname/testQName.cxx2
-rw-r--r--writerfilter/qa/cppunittests/sl/makefile.mk14
-rw-r--r--writerfilter/qa/cppunittests/sl/testOD_SL.cxx4
-rw-r--r--writerfilter/qa/cppunittests/xxml/makefile.mk14
-rw-r--r--writerfilter/qa/cppunittests/xxml/testXXML.cxx4
-rw-r--r--xmerge/java/build.xml1
-rw-r--r--xmerge/java/org/openoffice/xmerge/converter/xml/xslt/docbook/docbookfilter/makefile.mk2
-rwxr-xr-xxmerge/java/org/openoffice/xmerge/xmergebridge/FlatXml/java/Makefile1
-rwxr-xr-xxmerge/java/org/openoffice/xmerge/xmergebridge/FlatXml/java/makefile.mk2
-rw-r--r--xmerge/java/org/openoffice/xmerge/xmergebridge/FlatXml/java_prettyprint/Makefile1
-rw-r--r--xmerge/java/org/openoffice/xmerge/xmergebridge/Makefile_sdk1
-rw-r--r--xml2cmp/source/xcd/xmlelem.cxx10
-rw-r--r--xmlhelp/prj/build.lst2
-rw-r--r--xmlhelp/source/com/sun/star/help/MANIFEST.MF1
-rw-r--r--xmlhelp/source/com/sun/star/help/makefile.mk12
-rw-r--r--xmlhelp/source/cxxhelp/provider/databases.cxx114
-rw-r--r--xmlhelp/source/cxxhelp/provider/provider.cxx30
-rw-r--r--xmlhelp/source/cxxhelp/provider/urlparameter.cxx2
-rw-r--r--xmlhelp/source/treeview/makefile.mk3
-rw-r--r--xmlhelp/source/treeview/tvread.cxx50
-rw-r--r--xmlhelp/util/makefile.mk8
-rw-r--r--xmloff/inc/VisAreaContext.hxx2
-rw-r--r--xmloff/inc/VisAreaExport.hxx2
-rw-r--r--xmloff/inc/pch/precompiled_xmloff.hxx24
-rw-r--r--xmloff/inc/txtfldi.hxx5
-rw-r--r--xmloff/inc/xexptran.hxx2
-rw-r--r--xmloff/inc/xmlcnitm.hxx2
-rw-r--r--xmloff/inc/xmlehelp.hxx2
-rw-r--r--xmloff/inc/xmloff/ProgressBarHelper.hxx2
-rw-r--r--xmloff/inc/xmloff/maptype.hxx2
-rw-r--r--xmloff/inc/xmloff/styleexp.hxx2
-rw-r--r--xmloff/inc/xmloff/xmlcnimp.hxx4
-rw-r--r--xmloff/inc/xmloff/xmlexp.hxx8
-rw-r--r--xmloff/inc/xmloff/xmlnume.hxx2
-rw-r--r--xmloff/inc/xmloff/xmluconv.hxx2
-rw-r--r--xmloff/prj/build.lst2
-rw-r--r--xmloff/source/chart/XMLErrorBarStylePropertyHdl.cxx2
-rw-r--r--xmloff/source/core/ProgressBarHelper.cxx4
-rw-r--r--xmloff/source/core/attrlist.cxx13
-rw-r--r--xmloff/source/core/i18nmap.cxx2
-rw-r--r--xmloff/source/core/xmlehelp.cxx77
-rw-r--r--xmloff/source/core/xmlerror.cxx2
-rw-r--r--xmloff/source/core/xmlexp.cxx4
-rw-r--r--xmloff/source/core/xmlimp.cxx8
-rw-r--r--xmloff/source/core/xmltkmap.cxx2
-rw-r--r--xmloff/source/core/xmluconv.cxx2
-rw-r--r--xmloff/source/draw/shapeexport.cxx2
-rw-r--r--xmloff/source/draw/shapeexport2.cxx2
-rw-r--r--xmloff/source/draw/shapeexport3.cxx7
-rw-r--r--xmloff/source/draw/xexptran.cxx2
-rw-r--r--xmloff/source/draw/ximpstyl.cxx2
-rw-r--r--xmloff/source/forms/elementexport.cxx3
-rw-r--r--xmloff/source/forms/formenums.cxx2
-rw-r--r--xmloff/source/forms/layerimport.cxx2
-rw-r--r--xmloff/source/style/EnumPropertyHdl.cxx14
-rw-r--r--xmloff/source/style/XMLFontAutoStylePool.cxx4
-rw-r--r--xmloff/source/style/fonthdl.cxx2
-rw-r--r--xmloff/source/style/impastpl.hxx2
-rw-r--r--xmloff/source/style/numehelp.cxx2
-rw-r--r--xmloff/source/style/postuhdl.cxx2
-rw-r--r--xmloff/source/style/styleexp.cxx2
-rw-r--r--xmloff/source/style/weighhdl.cxx49
-rw-r--r--xmloff/source/style/xmlexppr.cxx2
-rw-r--r--xmloff/source/style/xmlnume.cxx2
-rw-r--r--xmloff/source/style/xmlnumfe.cxx12
-rw-r--r--xmloff/source/style/xmlnumfi.cxx8
-rw-r--r--xmloff/source/style/xmlnumi.cxx4
-rw-r--r--xmloff/source/style/xmlstyle.cxx12
-rw-r--r--xmloff/source/style/xmltabi.cxx2
-rw-r--r--xmloff/source/text/XMLIndexTOCContext.cxx2
-rw-r--r--xmloff/source/text/XMLSectionImportContext.cxx2
-rw-r--r--xmloff/source/text/XMLTextColumnsContext.cxx2
-rw-r--r--xmloff/source/text/XMLTextListAutoStylePool.cxx2
-rw-r--r--xmloff/source/text/txtflde.cxx13
-rw-r--r--xmloff/source/text/txtfldi.cxx33
-rw-r--r--xmloff/source/text/txtimp.cxx12
-rw-r--r--xmloff/source/text/txtimppr.cxx14
-rw-r--r--xmloff/source/text/txtparae.cxx10
-rw-r--r--xmloff/source/text/txtparai.cxx2
-rw-r--r--xmloff/source/text/txtparaimphint.hxx2
-rw-r--r--xmloff/source/text/txtprhdl.cxx2
-rw-r--r--xmloff/source/transform/StyleOOoTContext.cxx2
-rw-r--r--xmloff/source/transform/TransformerBase.cxx4
-rw-r--r--xmloff/util/makefile.mk3
-rw-r--r--xmlsecurity/inc/xmlsecurity/macrosecurity.hxx2
-rw-r--r--xmlsecurity/source/component/documentdigitalsignatures.cxx2
-rw-r--r--xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx5
-rw-r--r--xmlsecurity/source/dialogs/helpids.hrc2
-rw-r--r--xmlsecurity/source/dialogs/macrosecurity.cxx2
-rw-r--r--xmlsecurity/source/dialogs/resourcemanager.cxx4
-rw-r--r--xmlsecurity/source/dialogs/stbcontrl.cxx4
-rw-r--r--xmlsecurity/tools/demo/makefile.mk2
-rw-r--r--xmlsecurity/tools/examples/uno_win.bat2
-rw-r--r--xmlsecurity/tools/standalone/csfit/util/makefile.mk2
-rw-r--r--xmlsecurity/tools/standalone/mscsfit/util/makefile.mk2
-rw-r--r--xmlsecurity/tools/uno/makefile.mk2
-rw-r--r--xpdf/prj/build.lst2
4111 files changed, 42446 insertions, 53884 deletions
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/makefile.mk b/accessibility/bridge/org/openoffice/java/accessibility/makefile.mk
index d48817b51a6c..c1909a807863 100755
--- a/accessibility/bridge/org/openoffice/java/accessibility/makefile.mk
+++ b/accessibility/bridge/org/openoffice/java/accessibility/makefile.mk
@@ -39,7 +39,7 @@ PACKAGE = org$/openoffice$/java$/accessibility
.INCLUDE : settings.mk
JAVADIR = $(OUT)$/misc$/java
-JARFILES = sandbox.jar jurt.jar unoil.jar ridl.jar
+JARFILES = jurt.jar unoil.jar ridl.jar
JAVAFILES = \
logging$/XAccessibleEventLog.java \
logging$/XAccessibleHypertextLog.java \
diff --git a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
index 847c8ad2f0af..5f264b388fda 100644
--- a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
+++ b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
@@ -32,7 +32,7 @@
#define INCLUDED_ACCESSIBILITY_TEXTWINDOWACCESSIBILITY_HXX
#include <toolkit/awt/vclxaccessiblecomponent.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
#include <svtools/textdata.hxx>
#include <svtools/texteng.hxx>
#include <svtools/textview.hxx>
diff --git a/accessibility/prj/build.lst b/accessibility/prj/build.lst
index cd30f3452a30..f410ece56d9b 100755
--- a/accessibility/prj/build.lst
+++ b/accessibility/prj/build.lst
@@ -14,4 +14,5 @@ ac accessibility\workben\org\openoffice\accessibility\misc nmake -
ac accessibility\workben\org\openoffice\accessibility\awb\canvas nmake - all ac_awb_canvas ac_awb_tree NULL
ac accessibility\workben\org\openoffice\accessibility\awb\tree nmake - all ac_awb_tree ac_awb_misc NULL
ac accessibility\workben\org\openoffice\accessibility\awb\view nmake - all ac_awb_view ac_awb_view_text NULL
-ac accessibility\workben\org\openoffice\accessibility\awb\view\text nmake - all ac_awb_view_text NULL
+# dependency on ac_awb_misc to avoid concurrent creation of java_ver.mk
+ac accessibility\workben\org\openoffice\accessibility\awb\view\text nmake - all ac_awb_view_text ac_awb_misc NULL
diff --git a/accessibility/workben/makefile.in b/accessibility/workben/makefile.in
index ad97448e7780..d81df5fb7363 100644
--- a/accessibility/workben/makefile.in
+++ b/accessibility/workben/makefile.in
@@ -11,7 +11,6 @@ CLASS_FILES = $(patsubst %.java, %.class, $(JAVAFILES))
CLASSPATH = $(subst $(EMPTYSTRING) $(PATH_SEPARATOR),$(PATH_SEPARATOR),$(OFFICE_CLASSES_DIR)/jurt.jar\
$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)/unoil.jar\
$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)/ridl.jar\
- $(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)/sandbox.jar\
$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)/juh.jar\
$(PATH_SEPARATOR)$(OUT_COMP_JAVA)\
$(PATH_SEPARATOR).\
diff --git a/accessibility/workben/makefile.mk b/accessibility/workben/makefile.mk
index 33c1e2a0ef5e..7f19d8936757 100644
--- a/accessibility/workben/makefile.mk
+++ b/accessibility/workben/makefile.mk
@@ -15,7 +15,6 @@ JAR_PATH = $(SOLARBINDIR)$/
JAR_FILES = \
unoil.jar \
- sandbox.jar \
ridl.jar \
jurt.jar \
juh.jar \
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/canvas/makefile.common b/accessibility/workben/org/openoffice/accessibility/awb/canvas/makefile.common
index 3b7262a8489d..5bb567414220 100644
--- a/accessibility/workben/org/openoffice/accessibility/awb/canvas/makefile.common
+++ b/accessibility/workben/org/openoffice/accessibility/awb/canvas/makefile.common
@@ -56,7 +56,7 @@
#
#*************************************************************************
-JARFILES = sandbox.jar jurt.jar unoil.jar ridl.jar
+JARFILES = jurt.jar unoil.jar ridl.jar
JAVAFILES = \
CanvasShape.java \
Canvas.java \
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/makefile.mk b/accessibility/workben/org/openoffice/accessibility/awb/makefile.mk
index eb744d465cfb..032a75b16d04 100644
--- a/accessibility/workben/org/openoffice/accessibility/awb/makefile.mk
+++ b/accessibility/workben/org/openoffice/accessibility/awb/makefile.mk
@@ -68,7 +68,7 @@ USE_JAVAVER:=TRUE
.INCLUDE : settings.mk
.IF "$(JAVAVER:s/.//)" >= "140"
-JARFILES = sandbox.jar jurt.jar unoil.jar ridl.jar
+JARFILES = jurt.jar unoil.jar ridl.jar
.INCLUDE : makefile.common
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/manifest b/accessibility/workben/org/openoffice/accessibility/awb/manifest
index 951f9ec3128f..36111c54081d 100644
--- a/accessibility/workben/org/openoffice/accessibility/awb/manifest
+++ b/accessibility/workben/org/openoffice/accessibility/awb/manifest
@@ -1,3 +1,3 @@
Manifest-Version: 1.0
Main-Class: org.openoffice.accessibility.awb.AccessibilityWorkBench
-Class-Path: classes.jar sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar xt.jar jaxp.jar
+Class-Path: classes.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar xt.jar jaxp.jar
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/tree/makefile.common b/accessibility/workben/org/openoffice/accessibility/awb/tree/makefile.common
index 7a0813b099db..6b32a5db09a8 100644
--- a/accessibility/workben/org/openoffice/accessibility/awb/tree/makefile.common
+++ b/accessibility/workben/org/openoffice/accessibility/awb/tree/makefile.common
@@ -56,7 +56,7 @@
#
#*************************************************************************
-JARFILES = sandbox.jar jurt.jar unoil.jar ridl.jar
+JARFILES = jurt.jar unoil.jar ridl.jar
JAVAFILES = \
AccessibilityModel.java \
AccessibilityNode.java \
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/view/makefile.common b/accessibility/workben/org/openoffice/accessibility/awb/view/makefile.common
index d4929e3f1cd8..4f5f99ed0cf1 100644
--- a/accessibility/workben/org/openoffice/accessibility/awb/view/makefile.common
+++ b/accessibility/workben/org/openoffice/accessibility/awb/view/makefile.common
@@ -56,7 +56,7 @@
#
#*************************************************************************
-JARFILES = sandbox.jar jurt.jar unoil.jar ridl.jar
+JARFILES = jurt.jar unoil.jar ridl.jar
JAVAFILES = \
ComponentView.java \
ContextView.java \
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/view/text/makefile.common b/accessibility/workben/org/openoffice/accessibility/awb/view/text/makefile.common
index 32655a0c6a6f..e3303bb6890f 100644
--- a/accessibility/workben/org/openoffice/accessibility/awb/view/text/makefile.common
+++ b/accessibility/workben/org/openoffice/accessibility/awb/view/text/makefile.common
@@ -56,7 +56,7 @@
#
#*************************************************************************
-JARFILES = sandbox.jar jurt.jar unoil.jar ridl.jar
+JARFILES = jurt.jar unoil.jar ridl.jar
JAVAFILES = \
CaretSpinnerModel.java \
TextActionDialog.java \
diff --git a/accessibility/workben/org/openoffice/accessibility/misc/makefile.common b/accessibility/workben/org/openoffice/accessibility/misc/makefile.common
index d06336e12c56..f2462a88f841 100644
--- a/accessibility/workben/org/openoffice/accessibility/misc/makefile.common
+++ b/accessibility/workben/org/openoffice/accessibility/misc/makefile.common
@@ -56,7 +56,7 @@
#
#*************************************************************************
-JARFILES = sandbox.jar jurt.jar unoil.jar ridl.jar juh.jar java_uno.jar
+JARFILES = jurt.jar unoil.jar ridl.jar juh.jar java_uno.jar
JAVAFILES = \
AccessibleEventMulticaster.java \
InformationWriter.java \
diff --git a/agg/prj/build.lst b/agg/prj/build.lst
index d1456c605f32..57a09328f82a 100755
--- a/agg/prj/build.lst
+++ b/agg/prj/build.lst
@@ -1,4 +1,4 @@
-ag agg : sal xml2cmp soltools NULL
+ag agg : soltools stlport NULL
ag agg usr1 - all ag_mkout NULL
ag agg\inc get - all ag_inc NULL
ag agg\prj get - all ag_prj NULL
diff --git a/apache-commons/prj/build.lst b/apache-commons/prj/build.lst
index 0a9f79b5ffd7..c509ce0336dd 100644
--- a/apache-commons/prj/build.lst
+++ b/apache-commons/prj/build.lst
@@ -1,4 +1,4 @@
-ac apache-commons : solenv TOMCAT:tomcat NULL
+ac apache-commons : solenv TOMCAT:tomcat NULL
ac apache-commons usr1 - all ac_mkout NULL
ac apache-commons\java\codec nmake - all ac_codec NULL
ac apache-commons\java\lang nmake - all ac_lang NULL
diff --git a/automation/inc/automation/communi.hxx b/automation/inc/automation/communi.hxx
index 2a7b702e38cb..3804ad3048e5 100644
--- a/automation/inc/automation/communi.hxx
+++ b/automation/inc/automation/communi.hxx
@@ -31,7 +31,7 @@
#ifndef _COMMUNI_HXX
#define _COMMUNI_HXX
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
#include <vos/thread.hxx>
#include <vos/mutex.hxx>
#include <vcl/timer.hxx>
diff --git a/automation/source/miniapp/testapp.hxx b/automation/source/miniapp/testapp.hxx
index 0ab2b48d3579..55048d05cbb0 100644
--- a/automation/source/miniapp/testapp.hxx
+++ b/automation/source/miniapp/testapp.hxx
@@ -58,7 +58,7 @@
#ifndef _WRKWIN_HXX //autogen
#include <vcl/wrkwin.hxx>
#endif
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
#include "editwin.hxx"
diff --git a/automation/source/server/scmdstrm.cxx b/automation/source/server/scmdstrm.cxx
index 8888a007918c..a8abce528746 100644
--- a/automation/source/server/scmdstrm.cxx
+++ b/automation/source/server/scmdstrm.cxx
@@ -30,9 +30,9 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_automation.hxx"
-#include <svtools/intitem.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/stritem.hxx>
+#include <svl/eitem.hxx>
#include "scmdstrm.hxx"
#include "svcommstream.hxx"
#include "rcontrol.hxx"
diff --git a/automation/source/server/server.cxx b/automation/source/server/server.cxx
index 988f4055a2eb..890e6ace540d 100644
--- a/automation/source/server/server.cxx
+++ b/automation/source/server/server.cxx
@@ -55,7 +55,7 @@
#if 1
#include <svtools/ttprops.hxx>
#include <basic/ttstrhlp.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
#include <svtools/stringtransfer.hxx>
#include <vcl/sound.hxx>
#include "testtool.hrc"
diff --git a/automation/source/server/statemnt.cxx b/automation/source/server/statemnt.cxx
index 65be45907b90..1477220d5953 100644
--- a/automation/source/server/statemnt.cxx
+++ b/automation/source/server/statemnt.cxx
@@ -85,7 +85,7 @@
#include <vcl/wintypes.hxx>
#include <svtools/valueset.hxx>
#include <svtools/roadmap.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
#include <svtools/extensionlistbox.hxx>
// Hat keinen Includeschutz
#include <svtools/svtdata.hxx>
@@ -102,14 +102,14 @@
//#include <vcl/drag.hxx>
#endif
#include <tools/fsys.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
#include <svtools/ttprops.hxx>
#ifndef _BASIC_TTRESHLP_HXX
#include <basic/ttstrhlp.hxx>
#endif
#include <basic/dispdefs.hxx>
#include <vos/socket.hxx>
-#include <svtools/pickerhistory.hxx>
+#include <svl/pickerhistory.hxx>
#include <com/sun/star/util/XCancellable.hpp>
#include <sot/storage.hxx>
diff --git a/automation/source/testtool/makefile.mk b/automation/source/testtool/makefile.mk
index 79a811fdaee7..e72c92c3b8e1 100644
--- a/automation/source/testtool/makefile.mk
+++ b/automation/source/testtool/makefile.mk
@@ -84,9 +84,9 @@ $(INCCOM)$/r_cmds.hxx : ..$/inc$/rcontrol.hxx \
$(MISC)$/xfilter.pl
$(PERL) $(MISC)$/xfilter.pl ..$/inc rcontrol.hxx $(INCCOM)$/r_cmds RC_
-$(INCCOM)$/res_type.hxx : $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/vcl$/wintypes.hxx \
+$(INCCOM)$/res_type.hxx : $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/tools$/wintypes.hxx \
$(MISC)$/xfilter.pl
- $(PERL) $(MISC)$/xfilter.pl $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT) vcl$/wintypes.hxx $(INCCOM)$/res_type WINDOW_
+ $(PERL) $(MISC)$/xfilter.pl $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT) tools$/wintypes.hxx $(INCCOM)$/res_type WINDOW_
diff --git a/automation/source/testtool/objtest.cxx b/automation/source/testtool/objtest.cxx
index d3937963c155..76e297c3de8a 100644
--- a/automation/source/testtool/objtest.cxx
+++ b/automation/source/testtool/objtest.cxx
@@ -58,7 +58,7 @@ using namespace com::sun::star::devtools;
#include <vcl/svapp.hxx>
#endif
#include <svtools/stringtransfer.hxx>
-#include <svtools/brdcst.hxx>
+#include <svl/brdcst.hxx>
//#ifndef _SBXCLASS_HXX //autogen
#include <basic/sbx.hxx>
//#endif
diff --git a/automation/source/testtool/tcommuni.hxx b/automation/source/testtool/tcommuni.hxx
index 4863f1fd428c..f31d397a7a00 100644
--- a/automation/source/testtool/tcommuni.hxx
+++ b/automation/source/testtool/tcommuni.hxx
@@ -30,7 +30,7 @@
#include <automation/communi.hxx>
#include <tools/link.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
#include <vos/thread.hxx>
diff --git a/avmedia/inc/avmedia/mediaitem.hxx b/avmedia/inc/avmedia/mediaitem.hxx
index 31aa6e9d597c..b341a8f61998 100644
--- a/avmedia/inc/avmedia/mediaitem.hxx
+++ b/avmedia/inc/avmedia/mediaitem.hxx
@@ -33,7 +33,7 @@
#include <tools/rtti.hxx>
#ifndef _POOLITEM_HXX
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
#endif
#include <com/sun/star/media/ZoomLevel.hpp>
diff --git a/avmedia/inc/avmedia/mediatoolbox.hxx b/avmedia/inc/avmedia/mediatoolbox.hxx
index f9a52d584ea0..e7e1e0df2d1c 100644
--- a/avmedia/inc/avmedia/mediatoolbox.hxx
+++ b/avmedia/inc/avmedia/mediatoolbox.hxx
@@ -31,7 +31,7 @@
#ifndef _AVMEDIA_MEDIATOOLBOX_HXX
#define _AVMEDIA_MEDIATOOLBOX_HXX
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
#include <sfx2/tbxctrl.hxx>
namespace avmedia
diff --git a/avmedia/inc/helpids.hrc b/avmedia/inc/helpids.hrc
index 4d3d229826d5..2e51b0500441 100644
--- a/avmedia/inc/helpids.hrc
+++ b/avmedia/inc/helpids.hrc
@@ -31,7 +31,7 @@
#ifndef _AVMEDIA_HELPIDS_HRC
#define _AVMEDIA_HELPIDS_HRC
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
#define HID_AVMEDIA_TOOLBOXITEM_PLAY (HID_AVMEDIA_START+0)
#define HID_AVMEDIA_TOOLBOXITEM_PAUSE (HID_AVMEDIA_START+1)
diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx
index 9ed28adc7067..e5ecac180b6c 100644
--- a/avmedia/source/framework/mediacontrol.cxx
+++ b/avmedia/source/framework/mediacontrol.cxx
@@ -37,7 +37,7 @@
#include <tools/time.hxx>
#include <vcl/svapp.hxx>
#include <vcl/lstbox.hxx>
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
#include <sfx2/viewfrm.hxx>
#include <math.h>
#include <algorithm>
diff --git a/avmedia/source/framework/mediamisc.cxx b/avmedia/source/framework/mediamisc.cxx
index df1ddeb6237c..367ad725fa9a 100644
--- a/avmedia/source/framework/mediamisc.cxx
+++ b/avmedia/source/framework/mediamisc.cxx
@@ -29,7 +29,7 @@
************************************************************************/
#include <tools/resmgr.hxx>
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
#include <vcl/svapp.hxx>
namespace avmedia {
diff --git a/avmedia/source/framework/mediaplayer.cxx b/avmedia/source/framework/mediaplayer.cxx
index 52c8cf61b103..6c2ea64f1fcc 100644
--- a/avmedia/source/framework/mediaplayer.cxx
+++ b/avmedia/source/framework/mediaplayer.cxx
@@ -35,7 +35,7 @@
#include "mediacontrol.hrc"
#include "helpids.hrc"
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
#include <sfx2/app.hxx>
#include <sfx2/sfxsids.hrc>
#include <sfx2/bindings.hxx>
diff --git a/avmedia/source/java/makefile.mk b/avmedia/source/java/makefile.mk
index b445aa87d62e..f207713ac47a 100644
--- a/avmedia/source/java/makefile.mk
+++ b/avmedia/source/java/makefile.mk
@@ -51,7 +51,7 @@ JAVAFILES = \
FrameGrabber.java \
x11$/SystemWindowAdapter.java
-JARFILES = sandbox.jar jurt.jar unoil.jar ridl.jar juh.jar java_uno.jar jmf.jar
+JARFILES = jurt.jar unoil.jar ridl.jar juh.jar java_uno.jar jmf.jar
JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:s/.java//).class)
JARTARGET = $(TARGET).jar
diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx
index 5a3376c0ce65..4cf91bd3d199 100644
--- a/avmedia/source/viewer/mediawindow.cxx
+++ b/avmedia/source/viewer/mediawindow.cxx
@@ -36,7 +36,7 @@
#include "mediawindow.hrc"
#include <tools/urlobj.hxx>
#include <vcl/msgbox.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
#include <sfx2/filedlghelper.hxx>
#include <comphelper/processfactory.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/basctl/inc/helpid.hrc b/basctl/inc/helpid.hrc
index 0ff13c806a07..00356d2bc5c4 100644
--- a/basctl/inc/helpid.hrc
+++ b/basctl/inc/helpid.hrc
@@ -32,7 +32,7 @@
// include ---------------------------------------------------------------
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
// Help-Ids --------------------------------------------------------------
diff --git a/basctl/inc/pch/precompiled_basctl.hxx b/basctl/inc/pch/precompiled_basctl.hxx
index e975d6464194..be1612ea7429 100644
--- a/basctl/inc/pch/precompiled_basctl.hxx
+++ b/basctl/inc/pch/precompiled_basctl.hxx
@@ -77,19 +77,19 @@
#include "vcl/svapp.hxx"
#include "vcl/scrbar.hxx"
-#include "svtools/svarray.hxx"
-#include "svtools/itempool.hxx"
-#include "svtools/itemset.hxx"
-#include "svtools/aeitem.hxx"
-#include "svtools/stritem.hxx"
-#include "svtools/whiter.hxx"
+#include "svl/svarray.hxx"
+#include "svl/itempool.hxx"
+#include "svl/itemset.hxx"
+#include "svl/aeitem.hxx"
+#include "svl/stritem.hxx"
+#include "svl/whiter.hxx"
#include "svtools/langtab.hxx"
#include "svtools/texteng.hxx"
#include "svtools/textview.hxx"
#include "svtools/xtextedt.hxx"
#include "svtools/txtattr.hxx"
#include "svtools/textwindowpeer.hxx"
-#include "svtools/urihelper.hxx"
+#include "svl/urihelper.hxx"
#define _BASIC_TEXTPORTIONS
#include "basic/sbdef.hxx"
diff --git a/basctl/sdi/basslots.sdi b/basctl/sdi/basslots.sdi
index bb9cd1172af9..d2b3cb602ab8 100644
--- a/basctl/sdi/basslots.sdi
+++ b/basctl/sdi/basslots.sdi
@@ -28,8 +28,6 @@
*
************************************************************************/
-import "svxslots.ilb"
-
module
"6706E0E7-FB05-101B-804c-04021c007002"
"6806E0E7-FB05-101B-804c-04021c007002"
@@ -37,10 +35,14 @@ BasicIDE
[
HelpText( "BasicIDE" )
SlotIdFile( "basslots.hrc" )
-TypeLibFile( "basslots.tlb" )
]
{
//=========================================================================
+ include "sfx2/sfxitems.sdi"
+ include "sfx2/sfx.sdi"
+ include "svx/svxitems.sdi"
+ include "svx/xoitems.sdi"
+ include "svx/svx.sdi"
include "baside.sdi"
diff --git a/basctl/sdi/makefile.mk b/basctl/sdi/makefile.mk
index d94921bf9ae2..2244eafcd654 100644
--- a/basctl/sdi/makefile.mk
+++ b/basctl/sdi/makefile.mk
@@ -1,7 +1,7 @@
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+#
# Copyright 2008 by Sun Microsystems, Inc.
#
# OpenOffice.org - a multi-platform office productivity suite
@@ -45,7 +45,11 @@ SDI1EXPORT=basctl
# --- Files --------------------------------------------------------
SVSDI1DEPEND= \
- $(SOLARINCXDIR)$/svxslots.ilb \
+ $(SOLARINCXDIR)$/sfx2/sfx.sdi \
+ $(SOLARINCXDIR)$/sfx2/sfxitems.sdi \
+ $(SOLARINCXDIR)$/svx/svx.sdi \
+ $(SOLARINCXDIR)$/svx/svxitems.sdi \
+ $(SOLARINCXDIR)$/svx/xoitems.sdi \
baside.sdi
# --- Targets -------------------------------------------------------
diff --git a/basctl/source/basicide/basicbox.hxx b/basctl/source/basicide/basicbox.hxx
index e21a0c9d09c6..25f47c980c5d 100644
--- a/basctl/source/basicide/basicbox.hxx
+++ b/basctl/source/basicide/basicbox.hxx
@@ -32,7 +32,7 @@
#define _BASICBOX_HXX
#include "doceventnotifier.hxx"
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
#include <svheader.hxx>
#include <sfx2/tbxctrl.hxx>
#include <vcl/lstbox.hxx>
diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx
index 030fa5e68e26..e23cd68a75af 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -1430,7 +1430,7 @@ ModulWindowLayout::ModulWindowLayout( Window* pParent ) :
m_aSyntaxColors[TT_UNKNOWN] = aColor;
m_aSyntaxColors[TT_WHITESPACE] = aColor;
m_aSyntaxColors[TT_EOL] = aColor;
- StartListening(m_aColorConfig);
+ m_aColorConfig.AddListener(this);
m_aSyntaxColors[TT_IDENTIFIER]
= Color(m_aColorConfig.GetColorValue(svtools::BASICIDENTIFIER).nColor);
m_aSyntaxColors[TT_NUMBER]
@@ -1458,7 +1458,7 @@ ModulWindowLayout::ModulWindowLayout( Window* pParent ) :
ModulWindowLayout::~ModulWindowLayout()
{
- EndListening(m_aColorConfig);
+ m_aColorConfig.RemoveListener(this);
}
void __EXPORT ModulWindowLayout::Resize()
@@ -1602,7 +1602,7 @@ void ModulWindowLayout::DockaWindow( DockingWindow* pDockingWindow )
// evtl. Sonderbehandlung...
ArrangeWindows();
}
-#ifndef PRODUCT
+#ifdef DBG_UTIL
else
DBG_ERROR( "Wer will sich denn hier andocken ?" );
#endif
@@ -1652,13 +1652,8 @@ void ModulWindowLayout::DataChanged(DataChangedEvent const & rDCEvt)
}
// virtual
-void ModulWindowLayout::Notify(SfxBroadcaster & rBc, SfxHint const & rHint)
+void ModulWindowLayout::ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 )
{
- (void)rBc;
-
- if (rHint.ISA(SfxSimpleHint)
- && (static_cast< SfxSimpleHint const & >(rHint).GetId()
- == SFX_HINT_COLORS_CHANGED))
{
Color aColor(m_aColorConfig.GetColorValue(svtools::BASICIDENTIFIER).
nColor);
diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx
index 7c9fd764cef0..0c575229411e 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -48,7 +48,7 @@ class SvxSearchItem;
#endif
#include <basic/sbmod.hxx>
#include <vcl/split.hxx>
-#include "svtools/lstner.hxx"
+#include "svl/lstner.hxx"
#include <svtools/colorcfg.hxx>
#include <sfx2/progress.hxx>
@@ -58,6 +58,10 @@ DBG_NAMEEX( ModulWindow )
#define MARKER_NOMARKER 0xFFFF
+namespace utl
+{
+ class SourceViewConfig;
+}
// #108672 Helper functions to get/set text in TextEngine
// using the stream interface (get/setText() only supports
@@ -108,13 +112,13 @@ namespace svt {
class SourceViewConfig;
}
-class EditorWindow : public Window, public SfxListener
+class EditorWindow : public Window, public SfxListener, public utl::ConfigurationListener
{
private:
ExtTextView* pEditView;
ExtTextEngine* pEditEngine;
- svt::SourceViewConfig* pSourceViewConfig;
+ utl::SourceViewConfig* pSourceViewConfig;
long nCurTextWidth;
@@ -151,6 +155,7 @@ protected:
virtual void Command( const CommandEvent& rCEvt );
virtual void LoseFocus();
virtual void RequestHelp( const HelpEvent& rHEvt );
+ virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 );
void DoSyntaxHighlight( ULONG nPara );
String GetWordAtCursor();
@@ -442,7 +447,7 @@ public:
void SetModule( const ::rtl::OUString& aModule ) { m_aModule = aModule; }
};
-class ModulWindowLayout: public Window, public SfxListener
+class ModulWindowLayout: public Window, public utl::ConfigurationListener
{
private:
@@ -465,8 +470,7 @@ private:
virtual void DataChanged(DataChangedEvent const & rDCEvt);
- using Window::Notify;
- virtual void Notify(SfxBroadcaster & rBc, SfxHint const & rHint);
+ virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 );
void updateSyntaxHighlighting();
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index 644bd85bcb4d..66065d77f71e 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -32,7 +32,7 @@
#include "precompiled_basctl.hxx"
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
#define _BASIC_TEXTPORTIONS
#include <basic/sbdef.hxx>
#include <ide_pch.hxx>
@@ -40,7 +40,7 @@
#include <tools/urlobj.hxx>
#include <unotools/charclass.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
#include <basic/sbx.hxx>
#include <vcl/sound.hxx>
#include <svtools/xtextedt.hxx>
@@ -62,7 +62,7 @@
//#ifndef _SFX_HELP_HXX //autogen
//#include <sfx2/sfxhelp.hxx>
//#endif
-#include <svtools/sourceviewconfig.hxx>
+#include <unotools/sourceviewconfig.hxx>
#ifndef _COM_SUN_STAR_SCRIPT_XLIBRYARYCONTAINER2_HPP_
#include <com/sun/star/script/XLibraryContainer2.hpp>
@@ -172,7 +172,7 @@ EditorWindow::EditorWindow( Window* pParent ) :
pModulWindow = 0;
pEditView = 0;
pEditEngine = 0;
- pSourceViewConfig = new svt::SourceViewConfig;
+ pSourceViewConfig = new utl::SourceViewConfig;
bHighlightning = FALSE;
pProgress = 0;
nCurTextWidth = 0;
@@ -181,15 +181,14 @@ EditorWindow::EditorWindow( Window* pParent ) :
SetPointer( Pointer( POINTER_TEXT ) );
SetHelpId( HID_BASICIDE_EDITORWINDOW );
-
- StartListening( *pSourceViewConfig );
+ pSourceViewConfig->AddListener(this);
}
__EXPORT EditorWindow::~EditorWindow()
{
- EndListening( *pSourceViewConfig );
+ pSourceViewConfig->RemoveListener(this);
delete pSourceViewConfig;
aSyntaxIdleTimer.Stop();
@@ -662,7 +661,7 @@ void EditorWindow::DataChanged(DataChangedEvent const & rDCEvt)
}
}
-void EditorWindow::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
+void EditorWindow::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
{
if ( rHint.ISA( TextHint ) )
{
@@ -718,10 +717,11 @@ void EditorWindow::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
DoDelayedSyntaxHighlight( rTextHint.GetValue() );
}
}
- else if ( &rBC == pSourceViewConfig )
- {
- ImplSetFont();
- }
+}
+
+void EditorWindow::ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 )
+{
+ ImplSetFont();
}
void EditorWindow::SetScrollBarRanges()
diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx
index b821c7ca51c6..044c61d5cc21 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -36,7 +36,7 @@
#define GLOBALOVERFLOW2
#include <basic/sbx.hxx>
#define _SVSTDARR_STRINGS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
#include <ide_pch.hxx>
#define _SOLAR__PRIVATE 1
diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx
index e6b147cc46c8..2d2e0f6a5693 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -52,7 +52,7 @@
#define _SOLAR__PRIVATE 1
#include <basic/sbx.hxx>
-#include <svtools/hint.hxx>
+#include <svl/hint.hxx>
#include <tools/diagnose_ex.h>
#include <basidesh.hrc>
#include <basidesh.hxx>
diff --git a/basctl/source/basicide/basobj2.cxx b/basctl/source/basicide/basobj2.cxx
index e4abb3fad92e..f7ddd62e144a 100644
--- a/basctl/source/basicide/basobj2.cxx
+++ b/basctl/source/basicide/basobj2.cxx
@@ -36,7 +36,7 @@
#include <vector>
#include <algorithm>
#include <basic/sbx.hxx>
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
#include <com/sun/star/document/XEmbeddedScripts.hpp>
#include <com/sun/star/document/XScriptInvocationContext.hpp>
#include <basobj.hxx>
diff --git a/basctl/source/basicide/basobj3.cxx b/basctl/source/basicide/basobj3.cxx
index 8ef06af7dc25..a1887e0ea7a0 100644
--- a/basctl/source/basicide/basobj3.cxx
+++ b/basctl/source/basicide/basobj3.cxx
@@ -36,7 +36,7 @@
#include <vector>
#include <algorithm>
#include <basic/sbx.hxx>
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
#include <iderdll.hxx>
#include <iderdll2.hxx>
diff --git a/basctl/source/basicide/bastype2.hxx b/basctl/source/basicide/bastype2.hxx
index d10bdbc0e7f2..ce96ca3892a9 100644
--- a/basctl/source/basicide/bastype2.hxx
+++ b/basctl/source/basicide/bastype2.hxx
@@ -37,7 +37,7 @@
#define _SVICNVW_HXX
#include <svtools/svtreebx.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
#include <basic/sbstar.hxx>
#include <sbxitem.hxx>
#include "basobj.hxx"
diff --git a/basctl/source/basicide/brkdlg.hrc b/basctl/source/basicide/brkdlg.hrc
index aaf243b5475a..1fcfc9286cff 100644
--- a/basctl/source/basicide/brkdlg.hrc
+++ b/basctl/source/basicide/brkdlg.hrc
@@ -30,7 +30,7 @@
#ifndef _BRKDLG_HRC
#define _BRKDLG_HRC
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
#define RID_BASICIDE_BREAKPOINTDLG ( RID_BASICIDE_START + 80 )
diff --git a/basctl/source/basicide/ide_pch.hxx b/basctl/source/basicide/ide_pch.hxx
index 4029e45fe082..9f294b87577d 100644
--- a/basctl/source/basicide/ide_pch.hxx
+++ b/basctl/source/basicide/ide_pch.hxx
@@ -33,11 +33,11 @@
#include <vcl/msgbox.hxx>
#include <vcl/menu.hxx>
-#include <svtools/svarray.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/aeitem.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/svarray.hxx>
+#include <svl/itemset.hxx>
+#include <svl/aeitem.hxx>
+#include <svl/stritem.hxx>
+#include <svl/whiter.hxx>
#define _BASIC_TEXTPORTIONS
#include <basic/sbdef.hxx>
diff --git a/basctl/source/basicide/iderdll.cxx b/basctl/source/basicide/iderdll.cxx
index cf8ed498d474..5f2ed2301758 100644
--- a/basctl/source/basicide/iderdll.cxx
+++ b/basctl/source/basicide/iderdll.cxx
@@ -41,7 +41,7 @@
#include <sfx2/genlink.hxx>
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
#include <iderdll.hxx>
#include <iderdll2.hxx>
#include <iderid.hxx>
diff --git a/basctl/source/basicide/macrodlg.hrc b/basctl/source/basicide/macrodlg.hrc
index 6702af8febab..23005cddd294 100644
--- a/basctl/source/basicide/macrodlg.hrc
+++ b/basctl/source/basicide/macrodlg.hrc
@@ -30,7 +30,7 @@
#ifndef _MACRODLG_HRC
#define _MACRODLG_HRC
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
#define RID_MACROCHOOSER ( RID_BASICIDE_START + 50 )
#define RID_STR_BTNDEL ( RID_BASICIDE_START + 51 )
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index f0143cc8517b..ea5f7cec9878 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -72,7 +72,7 @@
#include "com/sun/star/ucb/XCommandEnvironment.hpp"
#include <com/sun/star/ucb/NameClash.hpp>
#include "com/sun/star/packages/manifest/XManifestWriter.hpp"
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
#include <comphelper/processfactory.hxx>
#include <com/sun/star/util/VetoException.hpp>
diff --git a/basctl/source/basicide/moduldlg.hrc b/basctl/source/basicide/moduldlg.hrc
index 88f167167d42..755e382cf618 100644
--- a/basctl/source/basicide/moduldlg.hrc
+++ b/basctl/source/basicide/moduldlg.hrc
@@ -30,7 +30,7 @@
#ifndef _MODULDLG_HRC
#define _MODULDLG_HRC
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
#define RID_STR_LIB 1
#define RID_TRLBOX 2
diff --git a/basctl/source/basicide/moptions.hrc b/basctl/source/basicide/moptions.hrc
index a03a90c2d59a..ca1e43e080fb 100644
--- a/basctl/source/basicide/moptions.hrc
+++ b/basctl/source/basicide/moptions.hrc
@@ -30,7 +30,7 @@
#ifndef _MOPTIONS_HRC
#define _MOPTIONS_HRC
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
#define RID_MACROOPTIONS ( RID_BASICIDE_START + 55 )
diff --git a/basctl/source/basicide/objdlg.hrc b/basctl/source/basicide/objdlg.hrc
index 7004541ea465..490a38a5c8fd 100644
--- a/basctl/source/basicide/objdlg.hrc
+++ b/basctl/source/basicide/objdlg.hrc
@@ -30,7 +30,7 @@
#ifndef _OBJDLG_HRC
#define _OBJDLG_HRC
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
#define RID_BASICIDE_OBJCAT ( RID_BASICIDE_START + 70 )
#define RID_FT_MACRODESCR 8
diff --git a/basctl/source/basicide/scriptdocument.cxx b/basctl/source/basicide/scriptdocument.cxx
index b9ffe708e6fa..a87ad521c2f5 100644
--- a/basctl/source/basicide/scriptdocument.cxx
+++ b/basctl/source/basicide/scriptdocument.cxx
@@ -70,7 +70,7 @@
#include <xmlscript/xmldlg_imexp.hxx>
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
#include <unotools/collatorwrapper.hxx>
diff --git a/basctl/source/basicide/tbxctl.cxx b/basctl/source/basicide/tbxctl.cxx
index 3ebc749c30aa..bac7e8854cf6 100644
--- a/basctl/source/basicide/tbxctl.cxx
+++ b/basctl/source/basicide/tbxctl.cxx
@@ -42,7 +42,7 @@
#include <tbxctl.hrc>
#include <idetemp.hxx>
#include <sfx2/imagemgr.hxx>
-#include <svtools/aeitem.hxx>
+#include <svl/aeitem.hxx>
#include <vcl/toolbox.hxx>
using namespace ::com::sun::star::uno;
diff --git a/basctl/source/basicide/tbxctl.hrc b/basctl/source/basicide/tbxctl.hrc
index 1811614d9d37..b26570b5b8bf 100644
--- a/basctl/source/basicide/tbxctl.hrc
+++ b/basctl/source/basicide/tbxctl.hrc
@@ -27,7 +27,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
#define RID_TBXCONTROLS ( RID_BASICIDE_START + 65 )
#define RID_TOOLBOX ( RID_BASICIDE_START + 66 )
diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx
index 6d1080ed659b..423ef39079a0 100644
--- a/basctl/source/dlged/dlged.cxx
+++ b/basctl/source/dlged/dlged.cxx
@@ -46,7 +46,7 @@
#include <iderdll.hxx>
#include <vcl/scrbar.hxx>
#include <tools/shl.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
#include <sfx2/viewfrm.hxx>
#ifndef _SVX_SVXIDS_HRC
diff --git a/basctl/source/inc/accessibledialogwindow.hxx b/basctl/source/inc/accessibledialogwindow.hxx
index 8552f9f09e10..db446d479ead 100644
--- a/basctl/source/inc/accessibledialogwindow.hxx
+++ b/basctl/source/inc/accessibledialogwindow.hxx
@@ -37,7 +37,7 @@
#include <comphelper/accessiblecomponenthelper.hxx>
#include <cppuhelper/implbase3.hxx>
#include <tools/link.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
#include <vector>
diff --git a/basctl/source/inc/baside3.hxx b/basctl/source/inc/baside3.hxx
index 45eace9f6137..4c361d4545f5 100644
--- a/basctl/source/inc/baside3.hxx
+++ b/basctl/source/inc/baside3.hxx
@@ -36,7 +36,7 @@
#endif
#include <bastypes.hxx>
-#include <svtools/undo.hxx>
+#include <svl/undo.hxx>
#include <vcl/dialog.hxx>
#include <vcl/button.hxx>
#include <vcl/lstbox.hxx>
diff --git a/basctl/source/inc/basobj.hxx b/basctl/source/inc/basobj.hxx
index c917de5a6dee..a2911dcccb8f 100644
--- a/basctl/source/inc/basobj.hxx
+++ b/basctl/source/inc/basobj.hxx
@@ -32,7 +32,7 @@
#include "scriptdocument.hxx"
#include <tools/string.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
#ifndef _COM_SUN_STAR_IO_XINPUTSTREAMPROVIDER_HXX_
#include <com/sun/star/io/XInputStreamProvider.hpp>
diff --git a/basctl/source/inc/dlged.hxx b/basctl/source/inc/dlged.hxx
index 908331b0ad63..9a75e80a53e2 100644
--- a/basctl/source/inc/dlged.hxx
+++ b/basctl/source/inc/dlged.hxx
@@ -38,8 +38,8 @@
#include <tools/link.hxx>
#include <tools/gen.hxx>
#include <vcl/timer.hxx>
-#include <svtools/hint.hxx>
-#include <svtools/brdcst.hxx>
+#include <svl/hint.hxx>
+#include <svl/brdcst.hxx>
#define DLGED_PAGE_WIDTH_MIN 1280
#define DLGED_PAGE_HEIGHT_MIN 1024
diff --git a/basctl/source/inc/dlgresid.hrc b/basctl/source/inc/dlgresid.hrc
index 928434749862..b92be11b286f 100644
--- a/basctl/source/inc/dlgresid.hrc
+++ b/basctl/source/inc/dlgresid.hrc
@@ -33,7 +33,7 @@
// include -----------------------------------------------------------
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
// Dialog Control Id's -----------------------------------------------------------
diff --git a/basctl/source/inc/propbrw.hxx b/basctl/source/inc/propbrw.hxx
index 8e3fa615d960..f9be90b38b4b 100644
--- a/basctl/source/inc/propbrw.hxx
+++ b/basctl/source/inc/propbrw.hxx
@@ -37,8 +37,8 @@
#include <com/sun/star/frame/XFrame.hpp>
#include <comphelper/composedprops.hxx>
#include <sfx2/basedlgs.hxx>
-#include <svtools/brdcst.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/brdcst.hxx>
+#include <svl/lstner.hxx>
#include <sfx2/childwin.hxx>
#include <svx/svdmark.hxx>
diff --git a/basctl/source/inc/sbxitem.hxx b/basctl/source/inc/sbxitem.hxx
index 654e283128fb..b1192b51d9bf 100644
--- a/basctl/source/inc/sbxitem.hxx
+++ b/basctl/source/inc/sbxitem.hxx
@@ -31,7 +31,7 @@
#define _SBXITEM_HXX
#include "scriptdocument.hxx"
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
const USHORT BASICIDE_TYPE_UNKNOWN = 0;
const USHORT BASICIDE_TYPE_SHELL = 1;
diff --git a/basebmp/test/basictest.cxx b/basebmp/test/basictest.cxx
index 15d2da39851a..d4d836a4b553 100644
--- a/basebmp/test/basictest.cxx
+++ b/basebmp/test/basictest.cxx
@@ -30,7 +30,7 @@
// autogenerated file with codegen.pl
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
#include <basegfx/vector/b2isize.hxx>
#include <basegfx/point/b2ipoint.hxx>
diff --git a/basebmp/test/bmpmasktest.cxx b/basebmp/test/bmpmasktest.cxx
index afadcad3b3fb..1b9e4ca0c68f 100644
--- a/basebmp/test/bmpmasktest.cxx
+++ b/basebmp/test/bmpmasktest.cxx
@@ -30,7 +30,7 @@
// autogenerated file with codegen.pl
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
#include <basegfx/vector/b2isize.hxx>
#include <basegfx/range/b2irange.hxx>
diff --git a/basebmp/test/bmptest.cxx b/basebmp/test/bmptest.cxx
index 33ed58c25402..978c4bbe6243 100644
--- a/basebmp/test/bmptest.cxx
+++ b/basebmp/test/bmptest.cxx
@@ -30,7 +30,7 @@
// autogenerated file with codegen.pl
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
#include <basegfx/vector/b2isize.hxx>
#include <basegfx/range/b2irange.hxx>
diff --git a/basebmp/test/cliptest.cxx b/basebmp/test/cliptest.cxx
index 2172b0b667a7..41da8cac617a 100644
--- a/basebmp/test/cliptest.cxx
+++ b/basebmp/test/cliptest.cxx
@@ -30,7 +30,7 @@
// autogenerated file with codegen.pl
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
#include <basegfx/vector/b2isize.hxx>
#include <basegfx/point/b2ipoint.hxx>
diff --git a/basebmp/test/filltest.cxx b/basebmp/test/filltest.cxx
index fcc4e5df5fa3..ba25cfa9044e 100644
--- a/basebmp/test/filltest.cxx
+++ b/basebmp/test/filltest.cxx
@@ -30,7 +30,7 @@
// autogenerated file with codegen.pl
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
#include <basegfx/vector/b2isize.hxx>
#include <basegfx/range/b2drange.hxx>
diff --git a/basebmp/test/linetest.cxx b/basebmp/test/linetest.cxx
index 1a424864f893..b78175128eba 100644
--- a/basebmp/test/linetest.cxx
+++ b/basebmp/test/linetest.cxx
@@ -30,7 +30,7 @@
// autogenerated file with codegen.pl
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
#include <basegfx/vector/b2isize.hxx>
#include <basegfx/point/b2ipoint.hxx>
diff --git a/basebmp/test/makefile.mk b/basebmp/test/makefile.mk
index 3ea13868aeb4..f7a5dded4cf1 100644
--- a/basebmp/test/makefile.mk
+++ b/basebmp/test/makefile.mk
@@ -1,7 +1,7 @@
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+#
# Copyright 2008 by Sun Microsystems, Inc.
#
# OpenOffice.org - a multi-platform office productivity suite
@@ -57,7 +57,7 @@ CFLAGS += -fno-inline
# SunStudio 12 (-m64 and -m32 modes): three test cases of the unit tests fail
# if compiled with default -xalias_level (and optimization level -xO3)
-.IF "$(OS)"=="SOLARIS"
+.IF "$(OS)"=="SOLARIS"
# For Sun Studio 8 this switch does not work: compilation fails on bitmapdevice.cxx
.IF "$(CCNUMVER)"!="00050005"
CDEFS+=-xalias_level=compatible
@@ -68,7 +68,7 @@ CDEFS+=-xalias_level=compatible
.IF "$(L10N_framework)"==""
# BEGIN ----------------------------------------------------------------
-# auto generated Target:tests by codegen.pl
+# auto generated Target:tests by codegen.pl
SHL1OBJS= \
$(SLO)$/basictest.obj \
$(SLO)$/bmpmasktest.obj \
@@ -88,13 +88,14 @@ SHL1OBJS= \
# source/makefile.mk
SHL1TARGET= tests
SHL1STDLIBS= $(SALLIB) \
+ $(TESTSHL2LIB)\
$(CPPUNITLIB) \
- $(BASEGFXLIB)
+ $(BASEGFXLIB)
SHL1IMPLIB= i$(SHL1TARGET)
DEF1NAME =$(SHL1TARGET)
-SHL1VERSIONMAP = export.map
+SHL1VERSIONMAP = export.map
.ENDIF
# END ------------------------------------------------------------------
@@ -111,7 +112,7 @@ SHL1VERSIONMAP = export.map
# $(CPPUHELPERLIB) \
# $(UCBHELPERLIB) \
# $(SALLIB) \
-# $(VCLLIB)
+# $(VCLLIB)
#
#.IF "$(GUI)"!="UNX"
#APP2DEF= $(MISC)$/$(TARGET).def
@@ -119,12 +120,12 @@ SHL1VERSIONMAP = export.map
#------------------------------- All object files -------------------------------
# do this here, so we get right dependencies
-SLOFILES=$(SHL1OBJS)
+SLOFILES=$(SHL1OBJS)
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
-.INCLUDE : _cppunit.mk
+.INCLUDE : _cppunit.mk
# --- Enable test execution in normal build ------------------------
.IF "$(L10N_framework)"==""
diff --git a/basebmp/test/masktest.cxx b/basebmp/test/masktest.cxx
index 61f329f094f2..94e5bc42a5ea 100644
--- a/basebmp/test/masktest.cxx
+++ b/basebmp/test/masktest.cxx
@@ -30,7 +30,7 @@
// autogenerated file with codegen.pl
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
#include <basegfx/vector/b2isize.hxx>
#include <basegfx/range/b2irange.hxx>
diff --git a/basebmp/test/polytest.cxx b/basebmp/test/polytest.cxx
index e35c8c834bd9..da118e4b6d8a 100644
--- a/basebmp/test/polytest.cxx
+++ b/basebmp/test/polytest.cxx
@@ -30,7 +30,7 @@
// autogenerated file with codegen.pl
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
#include <basegfx/vector/b2isize.hxx>
#include <basegfx/range/b2irange.hxx>
diff --git a/basegfx/test/basegfx1d.cxx b/basegfx/test/basegfx1d.cxx
index f058b0034fa7..454ed23289b2 100644
--- a/basegfx/test/basegfx1d.cxx
+++ b/basegfx/test/basegfx1d.cxx
@@ -33,7 +33,7 @@
#include "precompiled_basegfx.hxx"
// autogenerated file with codegen.pl
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
namespace basegfx1d
{
diff --git a/basegfx/test/basegfx2d.cxx b/basegfx/test/basegfx2d.cxx
index 4f0305df953f..ab6715467dba 100644
--- a/basegfx/test/basegfx2d.cxx
+++ b/basegfx/test/basegfx2d.cxx
@@ -33,7 +33,7 @@
#include "precompiled_basegfx.hxx"
// autogenerated file with codegen.pl
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <basegfx/polygon/b2dpolygon.hxx>
diff --git a/basegfx/test/basegfx3d.cxx b/basegfx/test/basegfx3d.cxx
index fc59ffbced4e..f0fe463ce23d 100644
--- a/basegfx/test/basegfx3d.cxx
+++ b/basegfx/test/basegfx3d.cxx
@@ -33,7 +33,7 @@
#include "precompiled_basegfx.hxx"
// autogenerated file with codegen.pl
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
namespace basegfx3d
{
diff --git a/basegfx/test/makefile.mk b/basegfx/test/makefile.mk
index 1bd4d59b98d5..da61c60f9308 100644
--- a/basegfx/test/makefile.mk
+++ b/basegfx/test/makefile.mk
@@ -1,7 +1,7 @@
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+#
# Copyright 2008 by Sun Microsystems, Inc.
#
# OpenOffice.org - a multi-platform office productivity suite
@@ -46,7 +46,7 @@ SHL1OBJS= \
$(SLO)$/basegfx1d.obj \
$(SLO)$/basegfx2d.obj \
$(SLO)$/basegfx3d.obj \
- $(SLO)$/testtools.obj
+ $(SLO)$/testtools.obj
# linking statically against basegfx parts
SHL1LIBS=\
@@ -66,23 +66,24 @@ SHL1STDLIBS= \
$(SALLIB) \
$(CPPUHELPERLIB) \
$(CPPULIB) \
+ $(TESTSHL2LIB) \
$(CPPUNITLIB)
SHL1IMPLIB= i$(SHL1TARGET)
DEF1NAME =$(SHL1TARGET)
-SHL1VERSIONMAP = export.map
+SHL1VERSIONMAP = export.map
# END ------------------------------------------------------------------
#------------------------------- All object files -------------------------------
# do this here, so we get right dependencies
-SLOFILES=$(SHL1OBJS)
+SLOFILES=$(SHL1OBJS)
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
-.INCLUDE : _cppunit.mk
+.INCLUDE : _cppunit.mk
# --- Enable testshl2 execution in normal build ------------------------
diff --git a/basic/inc/basic/basmgr.hxx b/basic/inc/basic/basmgr.hxx
index 159bd6f78de9..29f2d7ebc25c 100644
--- a/basic/inc/basic/basmgr.hxx
+++ b/basic/inc/basic/basmgr.hxx
@@ -32,7 +32,7 @@
#define _BASMGR_HXX
#include <tools/string.hxx>
-#include <svtools/brdcst.hxx>
+#include <svl/brdcst.hxx>
#include <basic/sbstar.hxx>
#include <com/sun/star/script/XStorageBasedLibraryContainer.hpp>
#include <com/sun/star/script/XStarBasicAccess.hpp>
diff --git a/basic/inc/basic/sbdef.hxx b/basic/inc/basic/sbdef.hxx
index dbb6e703b0c6..f15391e227d1 100644
--- a/basic/inc/basic/sbdef.hxx
+++ b/basic/inc/basic/sbdef.hxx
@@ -32,7 +32,7 @@
#define _SB_SBDEF_HXX
#include <basic/sbxdef.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
#define _BASIC_TEXTPORTIONS
diff --git a/basic/inc/basic/sbx.hxx b/basic/inc/basic/sbx.hxx
index ce2e992da854..87aacbcab44f 100644
--- a/basic/inc/basic/sbx.hxx
+++ b/basic/inc/basic/sbx.hxx
@@ -32,9 +32,9 @@
#define _SBXCLASS_HXX
#include "tools/ref.hxx"
-#include "svtools/svarray.hxx"
-#include "svtools/smplhint.hxx"
-#include "svtools/lstner.hxx"
+#include "svl/svarray.hxx"
+#include "svl/smplhint.hxx"
+#include "svl/lstner.hxx"
#include <basic/sbxdef.hxx>
#include <basic/sbxform.hxx>
diff --git a/basic/inc/basic/sbxbase.hxx b/basic/inc/basic/sbxbase.hxx
index dc7707cce57d..c8cd59ba320f 100644
--- a/basic/inc/basic/sbxbase.hxx
+++ b/basic/inc/basic/sbxbase.hxx
@@ -33,7 +33,7 @@
#include <i18npool/lang.h>
#include "tools/list.hxx"
-#include "svtools/svarray.hxx"
+#include "svl/svarray.hxx"
#include <basic/sbxdef.hxx>
class SbxFactory;
diff --git a/basic/inc/basic/sbxobj.hxx b/basic/inc/basic/sbxobj.hxx
index 6a62f4a52978..bd3bb8333b54 100644
--- a/basic/inc/basic/sbxobj.hxx
+++ b/basic/inc/basic/sbxobj.hxx
@@ -31,7 +31,7 @@
#ifndef _SBX_SBXOBJECT_HXX
#define _SBX_SBXOBJECT_HXX
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
#include <basic/sbxvar.hxx>
///////////////////////////////////////////////////////////////////////////
diff --git a/basic/inc/basic/testtool.hxx b/basic/inc/basic/testtool.hxx
index 1cdb42fd042c..64645e05ba55 100644
--- a/basic/inc/basic/testtool.hxx
+++ b/basic/inc/basic/testtool.hxx
@@ -30,7 +30,7 @@
#ifndef _BASIC_TESTTOOL_HXX_
#define _BASIC_TESTTOOL_HXX_
-#include <svtools/smplhint.hxx>
+#include <svl/smplhint.hxx>
#include <tools/string.hxx>
#define TESTTOOL_DEFAULT_PORT 12479
diff --git a/basic/inc/pch/precompiled_basic.hxx b/basic/inc/pch/precompiled_basic.hxx
index 32b4fd480afb..f1c120b2618f 100644
--- a/basic/inc/pch/precompiled_basic.hxx
+++ b/basic/inc/pch/precompiled_basic.hxx
@@ -173,35 +173,35 @@
#include "sot/storage.hxx"
#include "sot/storinfo.hxx"
-#include "svtools/brdcst.hxx"
+#include "svl/brdcst.hxx"
#include "svtools/ctrlbox.hxx"
#include "svtools/ctrltool.hxx"
#include "svtools/ehdl.hxx"
#include "svtools/filedlg.hxx"
-#include "svtools/hint.hxx"
-#include "svtools/lstner.hxx"
-#include "svtools/pathoptions.hxx"
+#include "svl/hint.hxx"
+#include "svl/lstner.hxx"
+#include "unotools/pathoptions.hxx"
#include "svtools/sfxecode.hxx"
-#include "svtools/smplhint.hxx"
-#include "svtools/solar.hrc"
+#include "svl/smplhint.hxx"
+#include "svl/solar.hrc"
#include "svtools/stringtransfer.hxx"
-#include "svtools/svarray.hxx"
-#include "svtools/svdde.hxx"
+#include "svl/svarray.hxx"
+#include "svl/svdde.hxx"
#include "svtools/svmedit.hxx"
-#include "svtools/svstdarr.hxx"
+#include "svl/svstdarr.hxx"
#include "svtools/svtdata.hxx"
-#include "svtools/svtools.hrc"
+#include "svl/svtools.hrc"
#include "svtools/svtreebx.hxx"
-#include "svtools/syslocale.hxx"
+#include "unotools/syslocale.hxx"
#include "svtools/taskbar.hxx"
#include "svtools/textdata.hxx"
#include "svtools/texteng.hxx"
#include "svtools/textview.hxx"
#include "svtools/transfer.hxx"
#include "svtools/txtattr.hxx"
-#include "svtools/undo.hxx"
-#include "svtools/zforlist.hxx"
-#include "svtools/zformat.hxx"
+#include "svl/undo.hxx"
+#include "svl/zforlist.hxx"
+#include "svl/zformat.hxx"
#include "tools/color.hxx"
diff --git a/basic/inc/sb.hrc b/basic/inc/sb.hrc
index 6275ad19c996..89db04cef511 100644
--- a/basic/inc/sb.hrc
+++ b/basic/inc/sb.hrc
@@ -31,7 +31,7 @@
#ifndef _SB_HRC
#define _SB_HRC
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
#ifndef IDS_SBERR_START
#define IDS_SBERR_START RID_BASIC_START
diff --git a/basic/source/app/app.cxx b/basic/source/app/app.cxx
index 4743b8c0ddca..31385f2f6e9e 100644
--- a/basic/source/app/app.cxx
+++ b/basic/source/app/app.cxx
@@ -80,7 +80,7 @@
#include <com/sun/star/ucb/XContentProviderManager.hpp>
#include <ucbhelper/content.hxx>
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
using namespace comphelper;
using namespace cppu;
diff --git a/basic/source/app/app.hxx b/basic/source/app/app.hxx
index 4fc9e9cb9c07..68b3db186785 100644
--- a/basic/source/app/app.hxx
+++ b/basic/source/app/app.hxx
@@ -42,8 +42,8 @@
#include <vcl/wrkwin.hxx>
#endif
#include <vcl/timer.hxx>
-#include <svtools/brdcst.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/brdcst.hxx>
+#include <svl/lstner.hxx>
class BasicFrame;
#include <basic/mybasic.hxx>
diff --git a/basic/source/app/appedit.cxx b/basic/source/app/appedit.cxx
index a9b7b1d03b77..31e4192e5965 100644
--- a/basic/source/app/appedit.cxx
+++ b/basic/source/app/appedit.cxx
@@ -34,7 +34,7 @@
#include <svtools/ctrltool.hxx>
#include <svtools/textview.hxx>
#include <svtools/texteng.hxx>
-#include <svtools/undo.hxx>
+#include <svl/undo.hxx>
#ifndef _BASIC_TTRESHLP_HXX
#include <basic/ttstrhlp.hxx>
diff --git a/basic/source/app/dialogs.cxx b/basic/source/app/dialogs.cxx
index 8c4df4186f41..00eba2fbac6c 100644
--- a/basic/source/app/dialogs.cxx
+++ b/basic/source/app/dialogs.cxx
@@ -60,13 +60,13 @@
#include <svtools/stringtransfer.hxx>
#include <vcl/splitwin.hxx>
#ifndef _ZFORLIST_HXX //autogen
-#include <svtools/zformat.hxx>
+#include <svl/zformat.hxx>
#endif
#include <svtools/ctrltool.hxx>
// Ohne Includeschutz
#include <svtools/svtdata.hxx>
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
#include <basic/dispdefs.hxx>
diff --git a/basic/source/app/msgedit.cxx b/basic/source/app/msgedit.cxx
index 7d0755d39aa6..544d7c9f4d4d 100644
--- a/basic/source/app/msgedit.cxx
+++ b/basic/source/app/msgedit.cxx
@@ -48,7 +48,7 @@ Version 3 Changed Charset from CHARSET_IBMPC to RTL_TEXTENCODING_UTF8
#endif
#include <tools/fsys.hxx>
#include <svtools/stringtransfer.hxx>
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
#ifndef _BASIC_TTRESHLP_HXX
#include <basic/ttstrhlp.hxx>
#endif
diff --git a/basic/source/app/textedit.hxx b/basic/source/app/textedit.hxx
index 1598d4867140..5caf90d738d7 100644
--- a/basic/source/app/textedit.hxx
+++ b/basic/source/app/textedit.hxx
@@ -40,7 +40,7 @@ class BreakpointWindow;
#include <vcl/timer.hxx>
#include <tools/table.hxx>
#include <tools/debug.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
#include <svtools/svmedit.hxx>
#include "dataedit.hxx"
diff --git a/basic/source/basmgr/basicmanagerrepository.cxx b/basic/source/basmgr/basicmanagerrepository.cxx
index 17bd8a712763..3a0be2efa41c 100644
--- a/basic/source/basmgr/basicmanagerrepository.cxx
+++ b/basic/source/basmgr/basicmanagerrepository.cxx
@@ -44,8 +44,8 @@
/** === end UNO includes === **/
#include <svtools/ehdl.hxx>
#include <svtools/sfxecode.hxx>
-#include <svtools/pathoptions.hxx>
-#include <svtools/smplhint.hxx>
+#include <unotools/pathoptions.hxx>
+#include <svl/smplhint.hxx>
#include <vcl/svapp.hxx>
#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index 2620852370b1..0645bfb85c2a 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -33,14 +33,14 @@
#include <tools/stream.hxx>
#include <sot/storage.hxx>
#include <tools/urlobj.hxx>
-#include <svtools/smplhint.hxx>
+#include <svl/smplhint.hxx>
#include <vcl/svapp.hxx>
#include <vcl/window.hxx>
#include <vcl/wrkwin.hxx>
#include <vcl/msgbox.hxx>
#include <basic/sbx.hxx>
#include <sot/storinfo.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
#include <basic/sbmod.hxx>
diff --git a/basic/source/classes/propacc.cxx b/basic/source/classes/propacc.cxx
index aed5b2b3c575..f54cdc800d38 100644
--- a/basic/source/classes/propacc.cxx
+++ b/basic/source/classes/propacc.cxx
@@ -35,7 +35,7 @@
#include <tools/urlobj.hxx>
#include <tools/errcode.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
#include <basic/sbstar.hxx>
#include <sbunoobj.hxx>
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index a6ae8cac29af..26d17d77c84b 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -36,7 +36,7 @@
#ifndef _TOOLERR_HXX //autogen
#include <tools/errcode.hxx>
#endif
-#include <svtools/hint.hxx>
+#include <svl/hint.hxx>
#include <cppuhelper/implbase1.hxx>
#include <cppuhelper/exc_hlp.hxx>
@@ -750,11 +750,11 @@ void unoToSbxValue( SbxVariable* pVar, const Any& aValue )
// SbUnoObject instanzieren
String aName;
SbUnoObject* pSbUnoObject = new SbUnoObject( aName, aValue );
- //If this is called externally e.g. from the scripting
- //framework then there is no 'active' runtime the default property will not be set up
- //only a vba object will have XDefaultProp set anyway so... this
- //test seems a bit of overkill
- //if ( SbiRuntime::isVBAEnabled() )
+ //If this is called externally e.g. from the scripting
+ //framework then there is no 'active' runtime the default property will not be set up
+ //only a vba object will have XDefaultProp set anyway so... this
+ //test seems a bit of overkill
+ //if ( SbiRuntime::isVBAEnabled() )
{
String sDfltPropName;
@@ -3377,9 +3377,10 @@ SbxVariable* SbUnoService::Find( const String& rName, SbxClassType )
// Create and insert SbUnoServiceCtor
SbxVariableRef xSbCtorRef = new SbUnoServiceCtor( aName, xCtor );
QuickInsert( (SbxVariable*)xSbCtorRef );
- pRes = xSbCtorRef;
}
}
+
+ pRes = SbxObject::Find( rName, SbxCLASS_METHOD );
}
}
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index 2d5f4f7cdf89..393719b71c2d 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -36,7 +36,7 @@
#include <vos/macros.hxx>
#include <vcl/svapp.hxx>
#include <tools/stream.hxx>
-#include <svtools/brdcst.hxx>
+#include <svl/brdcst.hxx>
#include <tools/shl.hxx>
#include <basic/sbx.hxx>
#include "sb.hxx"
diff --git a/basic/source/comp/codegen.cxx b/basic/source/comp/codegen.cxx
index c3e8a000cf8c..8b840770a0e6 100644
--- a/basic/source/comp/codegen.cxx
+++ b/basic/source/comp/codegen.cxx
@@ -83,7 +83,7 @@ void SbiCodeGen::GenStmnt()
UINT32 SbiCodeGen::Gen( SbiOpcode eOpcode )
{
-#ifndef PRODUCT
+#ifdef DBG_UTIL
if( eOpcode < SbOP0_START || eOpcode > SbOP0_END )
pParser->Error( SbERR_INTERNAL_ERROR, "OPCODE1" );
#endif
@@ -94,7 +94,7 @@ UINT32 SbiCodeGen::Gen( SbiOpcode eOpcode )
UINT32 SbiCodeGen::Gen( SbiOpcode eOpcode, UINT32 nOpnd )
{
-#ifndef PRODUCT
+#ifdef DBG_UTIL
if( eOpcode < SbOP1_START || eOpcode > SbOP1_END )
pParser->Error( SbERR_INTERNAL_ERROR, "OPCODE2" );
#endif
@@ -107,7 +107,7 @@ UINT32 SbiCodeGen::Gen( SbiOpcode eOpcode, UINT32 nOpnd )
UINT32 SbiCodeGen::Gen( SbiOpcode eOpcode, UINT32 nOpnd1, UINT32 nOpnd2 )
{
-#ifndef PRODUCT
+#ifdef DBG_UTIL
if( eOpcode < SbOP2_START || eOpcode > SbOP2_END )
pParser->Error( SbERR_INTERNAL_ERROR, "OPCODE3" );
#endif
diff --git a/basic/source/comp/exprgen.cxx b/basic/source/comp/exprgen.cxx
index c18501c98e40..32a0007a61ca 100644
--- a/basic/source/comp/exprgen.cxx
+++ b/basic/source/comp/exprgen.cxx
@@ -170,7 +170,7 @@ void SbiExprNode::Gen( RecursiveMode eRecMode )
void SbiExprNode::GenElement( SbiOpcode eOp )
{
-#ifndef PRODUCT
+#ifdef DBG_UTIL
if( (eOp < _RTL || eOp > _CALLC) && eOp != _FIND_G && eOp != _FIND_CM )
pGen->GetParser()->Error( SbERR_INTERNAL_ERROR, "Opcode" );
#endif
diff --git a/basic/source/comp/symtbl.cxx b/basic/source/comp/symtbl.cxx
index 2eb87dcdcc52..089dc068773a 100644
--- a/basic/source/comp/symtbl.cxx
+++ b/basic/source/comp/symtbl.cxx
@@ -175,7 +175,7 @@ void SbiSymPool::Add( SbiSymDef* pDef )
{
if( pDef->pIn )
{
-#ifndef PRODUCT
+#ifdef DBG_UTIL
// schon in einem anderen Pool drin!
pParser->Error( SbERR_INTERNAL_ERROR, "Dbl Pool" );
#endif
diff --git a/basic/source/inc/propacc.hxx b/basic/source/inc/propacc.hxx
index 565c7a358a97..698b3d453d5b 100644
--- a/basic/source/inc/propacc.hxx
+++ b/basic/source/inc/propacc.hxx
@@ -30,7 +30,7 @@
#ifndef _SFX_PROPBAG_HXX
#define _SFX_PROPBAG_HXX
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HXX_
#include <com/sun/star/beans/PropertyValue.hpp>
#endif
diff --git a/basic/source/inc/symtbl.hxx b/basic/source/inc/symtbl.hxx
index f3d691bf059a..7221ee68252f 100644
--- a/basic/source/inc/symtbl.hxx
+++ b/basic/source/inc/symtbl.hxx
@@ -31,7 +31,7 @@
#ifndef _SYMTBL_HXX
#define _SYMTBL_HXX
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
#include <tools/string.hxx>
#include <basic/sbxdef.hxx>
#include <basic/sbdef.hxx>
diff --git a/basic/source/runtime/basrdll.cxx b/basic/source/runtime/basrdll.cxx
index e4c9ad1fe307..aa3fda6a7116 100644
--- a/basic/source/runtime/basrdll.cxx
+++ b/basic/source/runtime/basrdll.cxx
@@ -33,7 +33,7 @@
#include <tools/shl.hxx>
#include <vcl/svapp.hxx>
#ifndef _SOLAR_HRC
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
#endif
#include <tools/debug.hxx>
#include <vcl/msgbox.hxx>
diff --git a/basic/source/runtime/ddectrl.cxx b/basic/source/runtime/ddectrl.cxx
index 751bd57cc808..425eec2eaf85 100644
--- a/basic/source/runtime/ddectrl.cxx
+++ b/basic/source/runtime/ddectrl.cxx
@@ -31,7 +31,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_basic.hxx"
#include <tools/errcode.hxx>
-#include <svtools/svdde.hxx>
+#include <svl/svdde.hxx>
#include "ddectrl.hxx"
#ifndef _SBERRORS_HXX
#include <basic/sberrors.hxx>
diff --git a/basic/source/runtime/dllmgr.hxx b/basic/source/runtime/dllmgr.hxx
index 607abaa843fa..ae25e570f10c 100644
--- a/basic/source/runtime/dllmgr.hxx
+++ b/basic/source/runtime/dllmgr.hxx
@@ -32,9 +32,9 @@
#define _DLLMGR_HXX
#define _SVSTDARR_BYTESTRINGSSORT
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
#ifndef _SVSTDARR_HXX //autogen
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
#endif
// !!! nur zum debuggen fuer infoboxes !!!
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index e92c8c974eb2..6c26409a883c 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -43,7 +43,7 @@
#include <vcl/wintypes.hxx>
#include <vcl/msgbox.hxx>
#include <basic/sbx.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
#include <rtl/math.hxx>
#include <tools/urlobj.hxx>
#include <osl/time.h>
diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx
index dbd66a61575c..bac63edb62f9 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -44,7 +44,7 @@
#ifndef _SBX_HXX
#include <basic/sbx.hxx>
#endif
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
#include <tools/fsys.hxx>
#include <tools/urlobj.hxx>
#include <osl/file.hxx>
diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx
index cc276eea766b..6c83c6e2f3f1 100644
--- a/basic/source/runtime/runtime.cxx
+++ b/basic/source/runtime/runtime.cxx
@@ -33,8 +33,8 @@
#include <tools/fsys.hxx>
#include <vcl/svapp.hxx>
#include <tools/wldcrd.hxx>
-#include <svtools/zforlist.hxx>
-#include <svtools/syslocale.hxx>
+#include <svl/zforlist.hxx>
+#include <unotools/syslocale.hxx>
#include "runtime.hxx"
#include "sbintern.hxx"
#include "opcodes.hxx"
@@ -867,7 +867,7 @@ void SbiRuntime::PushVar( SbxVariable* pVar )
SbxVariableRef SbiRuntime::PopVar()
{
-#ifndef PRODUCT
+#ifdef DBG_UTIL
if( !nExprLvl )
{
StarBASIC::FatalError( SbERR_INTERNAL_ERROR );
@@ -902,7 +902,7 @@ BOOL SbiRuntime::ClearExprStack()
SbxVariable* SbiRuntime::GetTOS( short n )
{
n = nExprLvl - n - 1;
-#ifndef PRODUCT
+#ifdef DBG_UTIL
if( n < 0 )
{
StarBASIC::FatalError( SbERR_INTERNAL_ERROR );
diff --git a/basic/source/runtime/step1.cxx b/basic/source/runtime/step1.cxx
index 938e5f6ad236..3c461c1f5541 100644
--- a/basic/source/runtime/step1.cxx
+++ b/basic/source/runtime/step1.cxx
@@ -160,7 +160,7 @@ void SbiRuntime::StepPAD( UINT32 nOp1 )
void SbiRuntime::StepJUMP( UINT32 nOp1 )
{
-#ifndef PRODUCT
+#ifdef DBG_UTIL
// #QUESTION shouln't this be
// if( (BYTE*)( nOp1+pImagGetCode() ) >= pImg->GetCodeSize() )
if( nOp1 >= pImg->GetCodeSize() )
diff --git a/basic/source/sbx/format.src b/basic/source/sbx/format.src
index 8609bbc875b3..618b6d97a8d1 100644
--- a/basic/source/sbx/format.src
+++ b/basic/source/sbx/format.src
@@ -28,7 +28,7 @@
*
************************************************************************/
-#include "svtools/svtools.hrc"
+#include "svl/svtools.hrc"
String STR_BASICKEY_FORMAT_ON
{
diff --git a/basic/source/sbx/sbxdate.cxx b/basic/source/sbx/sbxdate.cxx
index c6862a88a56c..76bb917699ce 100644
--- a/basic/source/sbx/sbxdate.cxx
+++ b/basic/source/sbx/sbxdate.cxx
@@ -31,7 +31,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_basic.hxx"
#include <vcl/svapp.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
#include <tools/errcode.hxx>
#include <tools/color.hxx>
#include <i18npool/lang.h>
diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx
index 3f747f27c5bd..bb62caba2076 100644
--- a/basic/source/sbx/sbxobj.cxx
+++ b/basic/source/sbx/sbxobj.cxx
@@ -35,7 +35,7 @@
#include <basic/sbx.hxx>
#include <basic/sbxbase.hxx>
#include "sbxres.hxx"
-#include <svtools/brdcst.hxx>
+#include <svl/brdcst.hxx>
TYPEINIT1(SbxMethod,SbxVariable)
TYPEINIT1(SbxProperty,SbxVariable)
diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx
index acc5d91c4e2e..1fc3ad018b15 100644
--- a/basic/source/sbx/sbxscan.cxx
+++ b/basic/source/sbx/sbxscan.cxx
@@ -34,7 +34,7 @@
#include <basic/sbx.hxx>
#include "sbxconv.hxx"
-#include "svtools/syslocale.hxx"
+#include "unotools/syslocale.hxx"
#if defined ( UNX )
#include <stdlib.h>
@@ -50,12 +50,12 @@
#include "sbxres.hxx"
#include <basic/sbxbase.hxx>
#include <basic/sbxform.hxx>
-#include <svtools/svtools.hrc>
+#include <svl/svtools.hrc>
#include "basrid.hxx"
#include "runtime.hxx"
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
#include <comphelper/processfactory.hxx>
diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx
index 66c56adc731a..2f517c3453ca 100644
--- a/basic/source/sbx/sbxvar.cxx
+++ b/basic/source/sbx/sbxvar.cxx
@@ -33,7 +33,7 @@
#include <tools/stream.hxx>
-#include "svtools/brdcst.hxx"
+#include "svl/brdcst.hxx"
#include <basic/sbx.hxx>
#include <basic/sbxbase.hxx>
diff --git a/basic/source/uno/dlgcont.cxx b/basic/source/uno/dlgcont.cxx
index f7e5f9a842e4..f199353c2d7a 100644
--- a/basic/source/uno/dlgcont.cxx
+++ b/basic/source/uno/dlgcont.cxx
@@ -51,7 +51,7 @@
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
#include <xmlscript/xmldlg_imexp.hxx>
#include <cppuhelper/factory.hxx>
#include <svtools/sfxecode.hxx>
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index c397e402fac4..02a7b174da1c 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -54,7 +54,7 @@
#include <tools/diagnose_ex.h>
#include <tools/urlobj.hxx>
#include <unotools/streamwrap.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
#include <svtools/sfxecode.hxx>
#include <svtools/ehdl.hxx>
#include <basic/basmgr.hxx>
@@ -940,7 +940,17 @@ sal_Bool SfxLibraryContainer::init_Impl(
// #110009
if( !bStorage && meInitMode == DEFAULT )
- implScanExtensions();
+ {
+ try
+ {
+ implScanExtensions();
+ }
+ catch( uno::Exception& )
+ {
+ // TODO: error handling?
+ OSL_ASSERT( "Cannot access extensions!" );
+ }
+ }
// #110009 Preload?
{
diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx
index aad4815872c0..e72205744ce0 100644
--- a/basic/source/uno/scriptcont.cxx
+++ b/basic/source/uno/scriptcont.cxx
@@ -58,7 +58,7 @@
#include <tools/urlobj.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
#include <svtools/sfxecode.hxx>
#include <svtools/ehdl.hxx>
#include <basic/basmgr.hxx>
diff --git a/bean/com/sun/star/beans/makefile.mk b/bean/com/sun/star/beans/makefile.mk
index 1c38ff105ec9..cb4be6263a37 100644
--- a/bean/com/sun/star/beans/makefile.mk
+++ b/bean/com/sun/star/beans/makefile.mk
@@ -44,7 +44,7 @@ dummy:
.ELSE # "$(OS)"=="MACOSX"
-JARFILES = sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar
+JARFILES = ridl.jar unoil.jar jurt.jar juh.jar
# --- Sources --------------------------------------------------------
diff --git a/bean/com/sun/star/comp/beans/makefile.mk b/bean/com/sun/star/comp/beans/makefile.mk
index 983991fd0c70..2faff8ac14ae 100644
--- a/bean/com/sun/star/comp/beans/makefile.mk
+++ b/bean/com/sun/star/comp/beans/makefile.mk
@@ -44,7 +44,7 @@ dummy:
.ELSE # "$(OS)"=="MACOSX"
-JARFILES = sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar
+JARFILES = ridl.jar unoil.jar jurt.jar juh.jar
# --- Sources --------------------------------------------------------
diff --git a/bean/prj/build.lst b/bean/prj/build.lst
index 06b806b613a5..3767e8fff387 100644
--- a/bean/prj/build.lst
+++ b/bean/prj/build.lst
@@ -1,4 +1,4 @@
-ob bean : javaunohelper sandbox jurt ridljar unoil offapi udkapi NULL
+ob bean : javaunohelper jurt ridljar unoil offapi udkapi NULL
ob bean\com\sun\star\comp\beans nmake - all ob_beanjava NULL
ob bean\com\sun\star\beans nmake - all ob_legacybeanjava ob_beanjava NULL
ob bean\native\win32 nmake - n ob_beanwin32 NULL
diff --git a/bean/qa/complex/makefile.mk b/bean/qa/complex/makefile.mk
index dbf6e8362e1b..4fb1ce0ea8b2 100644
--- a/bean/qa/complex/makefile.mk
+++ b/bean/qa/complex/makefile.mk
@@ -38,7 +38,7 @@ PACKAGE = complex
#----- compile .java files -----------------------------------------
-JARFILES = officebean.jar sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
+JARFILES = officebean.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
JAVAFILES = OOoBeanTest.java ScreenComparer.java WriterFrame.java
JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
diff --git a/bean/test/applet/oooapplet/makefile.mk b/bean/test/applet/oooapplet/makefile.mk
index 5056e0bbb4c6..8abfe7131aed 100644
--- a/bean/test/applet/oooapplet/makefile.mk
+++ b/bean/test/applet/oooapplet/makefile.mk
@@ -38,7 +38,7 @@ PACKAGE = oooapplet
#----- compile .java files -----------------------------------------
-JARFILES = officebean.jar sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar
+JARFILES = officebean.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar
JAVAFILES = OOoViewer.java
JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
diff --git a/bean/test/makefile.mk b/bean/test/makefile.mk
index f214fe4f24cc..5a29c4b1033c 100644
--- a/bean/test/makefile.mk
+++ b/bean/test/makefile.mk
@@ -38,7 +38,7 @@ PACKAGE = test
#----- compile .java files -----------------------------------------
-JARFILES = officebean.jar sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar
+JARFILES = officebean.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar
JAVAFILES = Test.java
JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
diff --git a/berkeleydb/db-4.7.25.patch b/berkeleydb/db-4.7.25.patch
index 30f252ef589c..c97522f62612 100644
--- a/berkeleydb/db-4.7.25.patch
+++ b/berkeleydb/db-4.7.25.patch
@@ -33,7 +33,7 @@
+ $(SLO)$/bt_stat.obj \
+ $(SLO)$/bt_upgrade.obj \
+ $(SLO)$/bt_verify.obj \
-+ $(SLO)$/btree_auto.obj
++ $(SLO)$/btree_auto.obj
+
+.INCLUDE : target.mk
+
@@ -53,7 +53,7 @@
+INCPRE+=..$/build_windows ..$/dbinc ..$/
+CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
+
-+SLOFILES= $(SLO)$/strsep.obj
++SLOFILES= $(SLO)$/strsep.obj
+
+.INCLUDE : target.mk
+
@@ -88,7 +88,7 @@
+ $(SLO)$/util_cache.obj \
+ $(SLO)$/util_log.obj \
+ $(SLO)$/util_sig.obj \
-+ $(SLO)$/zerofill.obj
++ $(SLO)$/zerofill.obj
+
+.INCLUDE : target.mk
+
@@ -119,7 +119,7 @@
+ $(SLO)$/cxx_mpool.obj \
+ $(SLO)$/cxx_multi.obj \
+ $(SLO)$/cxx_seq.obj \
-+ $(SLO)$/cxx_txn.obj
++ $(SLO)$/cxx_txn.obj
+
+.INCLUDE : target.mk
+
@@ -324,7 +324,7 @@
+
+ local:
+ *;
-+};
++};
--- misc/db-4.7.25.NC/dbm/makefile.mk 2009-07-21 11:42:40.000000000 +0200
+++ misc/build/db-4.7.25.NC/dbm/makefile.mk 2009-07-21 11:39:25.000000000 +0200
@@ -1 +1,16 @@
@@ -375,29 +375,29 @@
@@ -13,7 +13,7 @@
libdir= @libdir@
docdir= $(prefix)/docs
-
+
-dmode= 755
+dmode= 775
emode= 555
fmode= 444
-
+
@@ -56,6 +56,7 @@
CCLINK= @MAKEFILE_CCLINK@ @CFLAGS@
-
+
LDFLAGS= @LDFLAGS@
+LDFLAGSVERSION= @LDFLAGSVERSION@
LIBS= @LIBSO_LIBS@
TEST_LIBS= @TEST_LIBS@
LIBCSO_LIBS= @LIBCSO_LIBS@ @LIBSO_LIBS@
@@ -733,7 +734,7 @@
-
+
# Shared C library.
$(libso_target): $(C_OBJS)
- $(SOLINK) $(SOFLAGS) $(LDFLAGS) -o $@ $(C_OBJS) $(LIBCSO_LIBS)
+ $(SOLINK) $(SOFLAGS) $(LDFLAGS) $(LDFLAGSVERSION) -o $@ $(C_OBJS) $(LIBCSO_LIBS)
$(RM) -f $(libdb)
$(LN) -s .libs/$(libdb_version) $(libdb)
-
+
--- misc/db-4.7.25.NC/dist/configure 2008-05-15 23:12:41.000000000 +0200
+++ misc/build/db-4.7.25.NC/dist/configure 2009-07-21 11:39:25.000000000 +0200
@@ -3757,8 +3757,10 @@
@@ -410,7 +410,7 @@
+#CXXFLAGS=${CXXFLAGS-"$CFLAGS"}
+CFLAGS="$CFLAGS $optimize_def"
+CXXFLAGS="$CXXFLAGS $CFLAGS"
-
+
# The default compiler is cc (NOT gcc), the default CFLAGS is as specified
# above, NOT what is set by AC_PROG_CC, as it won't set optimization flags
@@ -12566,7 +12568,8 @@
@@ -434,7 +434,7 @@
@@ -36655,7 +36659,7 @@
DB_VERSION_PATCH!$DB_VERSION_PATCH$ac_delim
_ACEOF
-
+
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 98; then
break
@@ -482,7 +482,7 @@
+ $(SLO)$/env_region.obj \
+ $(SLO)$/env_register.obj \
+ $(SLO)$/env_sig.obj \
-+ $(SLO)$/env_stat.obj
++ $(SLO)$/env_stat.obj
+
+.INCLUDE : target.mk
+
@@ -646,12 +646,13 @@
+
--- misc/db-4.7.25.NC/makefile.mk 2009-07-21 11:42:40.000000000 +0200
+++ misc/build/db-4.7.25.NC/makefile.mk 2009-07-21 11:39:26.000000000 +0200
-@@ -1 +1,80 @@
+@@ -1 +1,81 @@
-dummy
+PRJ=..$/..$/..$/..
+PRJNAME=libdb47
+TARGET=libdb47
+USE_DEFFILE=true
++UWINAPILIB=
+
+.INCLUDE : settings.mk
+CFLAGS+=-GS -EHsc -Gy
@@ -669,7 +670,7 @@
+ hash hmac hsearch lock \
+ log mp mutex os os_windows \
+ qam rep repmgr sequence \
-+ txn xa
++ txn xa
+
+LIB1TARGET= $(SLB)$/$(TARGET).lib
+LIB1FILES= \
diff --git a/berkeleydb/makefile.mk b/berkeleydb/makefile.mk
index 7ee3beb1b07d..bc5df6964bc5 100644
--- a/berkeleydb/makefile.mk
+++ b/berkeleydb/makefile.mk
@@ -1,7 +1,7 @@
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+#
# Copyright 2008 by Sun Microsystems, Inc.
#
# OpenOffice.org - a multi-platform office productivity suite
@@ -59,8 +59,6 @@ ADDITIONAL_FILES= \
sequence$/makefile.mk txn$/makefile.mk xa$/makefile.mk \
db_4_7_gcc4.map
-
-
# not needed for win32. comment out when causing problems...
.IF "$(GUI)$(COM)"=="WNTGCC"
PATCH_FILES=db-4.7.25-mingw.patch
@@ -115,7 +113,7 @@ BUILD_DIR_OUT=$(CONFIGURE_DIR)
.IF "$(OS)"=="IRIX"
CONFIGURE_ACTION= $(CONFIG_SHELL) ..$/dist$/configure
-BUILD_ACTION=gmake
+BUILD_ACTION=gmake
.ELSE
BUILD_ACTION=make
.ENDIF
diff --git a/berkeleydb/prj/build.lst b/berkeleydb/prj/build.lst
index 4631e5605f51..c74e15efd2fd 100644
--- a/berkeleydb/prj/build.lst
+++ b/berkeleydb/prj/build.lst
@@ -1,3 +1,3 @@
-db berkeleydb : external xml2cmp sal NULL
+db berkeleydb : external stlport NULL
db berkeleydb nmake - u as_mkout NULL
db berkeleydb nmake - w,vc7 as_mkout NULL
diff --git a/bridges/source/remote/static/proxy.cxx b/bridges/source/remote/static/proxy.cxx
index 6f07ba95d6ff..6cfd9c11e9fb 100644
--- a/bridges/source/remote/static/proxy.cxx
+++ b/bridges/source/remote/static/proxy.cxx
@@ -30,12 +30,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_bridges.hxx"
-#if OSL_DEBUG_LEVEL == 0
-# ifndef NDEBUG
-# define NDEBUG
-# endif
-#endif
-#include <assert.h>
#include <sal/alloca.h>
#include <bridges/remote/proxy.hxx>
#include <bridges/remote/context.h>
@@ -84,7 +78,7 @@ void acquireRemote2UnoProxy( uno_Interface *pThis )
freeRemote2UnoProxy,
p->m_sOid.pData,
p->m_pType );
- assert( (uno_Interface *)p == pThis );
+ OSL_ASSERT( (uno_Interface *)p == pThis );
}
}
diff --git a/bridges/source/remote/static/remote.cxx b/bridges/source/remote/static/remote.cxx
index 1cb26b4ccd9c..ed8b1dbc9d59 100644
--- a/bridges/source/remote/static/remote.cxx
+++ b/bridges/source/remote/static/remote.cxx
@@ -30,12 +30,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_bridges.hxx"
-#if OSL_DEBUG_LEVEL == 0
-# ifndef NDEBUG
-# define NDEBUG
-# endif
-#endif
-#include <assert.h>
#include <bridges/remote/remote.hxx>
#include <bridges/remote/counter.hxx>
@@ -90,7 +84,7 @@ void acquireRemote2RemoteStub( remote_Interface *pThis )
freeRemote2RemoteStub,
p->m_sOid.pData,
p->m_pType );
- assert( (remote_Interface *)p == pThis );
+ OSL_ASSERT( (remote_Interface *)p == pThis );
}
}
diff --git a/bridges/source/remote/urp/urp_log.hxx b/bridges/source/remote/urp/urp_log.hxx
index c7811faf51e9..6c96ea0dbffc 100644
--- a/bridges/source/remote/urp/urp_log.hxx
+++ b/bridges/source/remote/urp/urp_log.hxx
@@ -29,7 +29,7 @@
************************************************************************/
namespace bridges_urp
{
-#ifndef PRODUCT
+#ifdef DBG_UTIL
#define BRIDGES_URP_PROT
#endif
diff --git a/bridges/test/testclient.cxx b/bridges/test/testclient.cxx
index df5ac58d1a2d..ce870bc19ea9 100644
--- a/bridges/test/testclient.cxx
+++ b/bridges/test/testclient.cxx
@@ -32,11 +32,6 @@
#include "precompiled_bridges.hxx"
#include <string.h>
-#if OSL_DEBUG_LEVEL == 0
-#undef NDEBUG
-#define NDEBUG
-#endif
-#include <assert.h>
#include <osl/time.h>
#include <osl/mutex.hxx>
@@ -193,10 +188,10 @@ int main( int argc, char *argv[] )
{
// test the factory
Reference < XBridge > rBridge2 = rFactory->getBridge( OUString( RTL_CONSTASCII_USTRINGPARAM("bla blub")) );
- assert( rBridge2.is() );
- assert( rBridge2->getDescription() == rBridge->getDescription( ) );
- assert( rBridge2->getName() == rBridge->getName() );
- assert( rBridge2 == rBridge );
+ OSL_ASSERT( rBridge2.is() );
+ OSL_ASSERT( rBridge2->getDescription() == rBridge->getDescription( ) );
+ OSL_ASSERT( rBridge2->getName() == rBridge->getName() );
+ OSL_ASSERT( rBridge2 == rBridge );
}
@@ -230,7 +225,7 @@ int main( int argc, char *argv[] )
}
Reference < XBridge > rBridge = rFactory->getBridge( OUString( RTL_CONSTASCII_USTRINGPARAM("bla blub")) );
-// assert( ! rBridge.is() );
+// OSL_ASSERT( ! rBridge.is() );
}
}
diff --git a/bridges/test/testcomp.cxx b/bridges/test/testcomp.cxx
index 432a32f2a554..90a07ab31f43 100644
--- a/bridges/test/testcomp.cxx
+++ b/bridges/test/testcomp.cxx
@@ -30,11 +30,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_bridges.hxx"
-#if OSL_DEBUG_LEVEL == 0
-#undef NDEBUG
-#define NDEBUG
-#endif
-#include <assert.h>
#include <string.h>
#include <stdlib.h>
#include <osl/time.h>
@@ -598,7 +593,7 @@ void testException( const Reference < XCallMe > &r )
{
try {
r->call( OUString( RTL_CONSTASCII_USTRINGPARAM("dummy")) , -1 );
- assert( ! "no exception flown !" );
+ OSL_ASSERT( ! "no exception flown !" );
}
catch( TestBridgeException & e )
{
@@ -606,11 +601,11 @@ void testException( const Reference < XCallMe > &r )
}
catch( Exception & e )
{
- assert( ! "only base class of exception could be catched!" );
+ OSL_ASSERT( ! "only base class of exception could be catched!" );
}
catch(...)
{
- assert(! "wrong unknown exception !" );
+ OSL_ASSERT(! "wrong unknown exception !" );
}
}
diff --git a/bridges/test/testoffice.cxx b/bridges/test/testoffice.cxx
index bae00be6caaa..bf5b470d7185 100644
--- a/bridges/test/testoffice.cxx
+++ b/bridges/test/testoffice.cxx
@@ -30,10 +30,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_bridges.hxx"
-#if OSL_DEBUG_LEVEL == 0
-#define NDEBUG
-#endif
-#include <assert.h>
#include <osl/time.h>
#include <osl/mutex.hxx>
@@ -96,7 +92,7 @@ void testPipe( const Reference < XMultiServiceFactory > & rSmgr )
rSmgr->createInstance( OUString::createFromAscii( "com.sun.star.io.Pipe" ) ),
UNO_QUERY );
- assert( rOut.is() );
+ OSL_ASSERT( rOut.is() );
{
Sequence < sal_Int8 > seq( 10 );
@@ -115,7 +111,7 @@ void testPipe( const Reference < XMultiServiceFactory > & rSmgr )
if( ! ( 42 == seq.getArray()[0] ) )
printf( "wrong element in sequence\n" );
-// assert( 0 );
+// OSL_ASSERT( 0 );
}
}
#include<stdio.h>
@@ -155,7 +151,7 @@ void testDocument( const Reference < XMultiServiceFactory > & rSmgr )
rSmgr->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop" ))),
UNO_QUERY );
- assert( rLoader.is() );
+ OSL_ASSERT( rLoader.is() );
sal_Char *urls[] = {
"private:factory/swriter",
diff --git a/bridges/test/testsameprocess.cxx b/bridges/test/testsameprocess.cxx
index cf67d2484cb3..1cfc44078376 100644
--- a/bridges/test/testsameprocess.cxx
+++ b/bridges/test/testsameprocess.cxx
@@ -30,11 +30,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_bridges.hxx"
-#if OSL_DEBUG_LEVEL == 0
-#undef NDEBUG
-#define NDEBUG
-#endif
-#include <assert.h>
#include <osl/time.h>
#include <osl/mutex.hxx>
@@ -201,7 +196,7 @@ int main( int argc, char *argv[] )
Reference < XBridge > rBridge = rFactory->getBridge(
OUString( RTL_CONSTASCII_USTRINGPARAM("bla blub")) );
- assert( ! rBridge.is() );
+ OSL_ASSERT( ! rBridge.is() );
}
catch( Exception & )
diff --git a/canvas/source/directx/dx_config.cxx b/canvas/source/directx/dx_config.cxx
index 48f44e3ba816..e124d4d78e6a 100755
--- a/canvas/source/directx/dx_config.cxx
+++ b/canvas/source/directx/dx_config.cxx
@@ -144,6 +144,9 @@ namespace dxcanvas
}
}
+ void DXCanvasItem::Notify( const com::sun::star::uno::Sequence<rtl::OUString>& ) {}
+ void DXCanvasItem::Commit() {}
+
bool DXCanvasItem::isDeviceUsable( const DeviceInfo& rDeviceInfo ) const
{
return maValues.find(rDeviceInfo) == maValues.end();
diff --git a/canvas/source/directx/dx_config.hxx b/canvas/source/directx/dx_config.hxx
index 34deddb509a7..1fffcb2ed56e 100644
--- a/canvas/source/directx/dx_config.hxx
+++ b/canvas/source/directx/dx_config.hxx
@@ -77,6 +77,8 @@ namespace dxcanvas
bool isBlacklistCurrentDevice() const;
void blacklistDevice( const DeviceInfo& rDeviceInfo );
void adaptMaxTextureSize( basegfx::B2IVector& io_maxTextureSize ) const;
+ virtual void Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames);
+ virtual void Commit();
private:
typedef std::set< DeviceInfo > ValueSet;
diff --git a/chart2/inc/pch/precompiled_chart2.hxx b/chart2/inc/pch/precompiled_chart2.hxx
index e8af809b1af2..53b88ebc28ad 100644
--- a/chart2/inc/pch/precompiled_chart2.hxx
+++ b/chart2/inc/pch/precompiled_chart2.hxx
@@ -213,17 +213,17 @@
#include "sot/clsids.hxx"
-#include "svtools/eitem.hxx"
-#include "svtools/intitem.hxx"
-#include "svtools/itemiter.hxx"
-#include "svtools/itempool.hxx"
-#include "svtools/itemset.hxx"
-#include "svtools/pathoptions.hxx"
-#include "svtools/poolitem.hxx"
-#include "svtools/stritem.hxx"
-#include "svtools/syslocale.hxx"
-#include "svtools/urihelper.hxx"
-#include "svtools/whiter.hxx"
+#include "svl/eitem.hxx"
+#include "svl/intitem.hxx"
+#include "svl/itemiter.hxx"
+#include "svl/itempool.hxx"
+#include "svl/itemset.hxx"
+#include "unotools/pathoptions.hxx"
+#include "svl/poolitem.hxx"
+#include "svl/stritem.hxx"
+#include "unotools/syslocale.hxx"
+#include "svl/urihelper.hxx"
+#include "svl/whiter.hxx"
#include "svx/brshitem.hxx"
#include "svx/crsditem.hxx"
diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx b/chart2/source/controller/accessibility/AccessibleBase.cxx
index df3cab9e39b4..81b85cfacf34 100644
--- a/chart2/source/controller/accessibility/AccessibleBase.cxx
+++ b/chart2/source/controller/accessibility/AccessibleBase.cxx
@@ -50,7 +50,7 @@
#include <vcl/svapp.hxx>
#include <rtl/uuid.h>
#include <cppuhelper/queryinterface.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
#include <svx/unofdesc.hxx>
#include <svx/outliner.hxx>
#include <svx/svdoutl.hxx>
diff --git a/chart2/source/controller/dialogs/Bitmaps.hrc b/chart2/source/controller/dialogs/Bitmaps.hrc
index 8823b582a28e..d3aa3ebbff2f 100644
--- a/chart2/source/controller/dialogs/Bitmaps.hrc
+++ b/chart2/source/controller/dialogs/Bitmaps.hrc
@@ -31,7 +31,7 @@
#define CHART_BITMAPS_HRC
#ifndef _SOLAR_HRC
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
#endif
#ifndef STD_MASKCOLOR
diff --git a/chart2/source/controller/dialogs/Bitmaps_HC.hrc b/chart2/source/controller/dialogs/Bitmaps_HC.hrc
index 8dd4acaffd15..71a181b92559 100644
--- a/chart2/source/controller/dialogs/Bitmaps_HC.hrc
+++ b/chart2/source/controller/dialogs/Bitmaps_HC.hrc
@@ -28,10 +28,10 @@
*
************************************************************************/
#ifndef _SOLAR_HRC
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
#endif
-// RID_SCH_START is 30512 (see svtools/solar.hrc)
+// RID_SCH_START is 30512 (see svl/solar.hrc)
// next free: 100
diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx
index b13333dcb323..bab952cf317b 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -36,10 +36,10 @@
#ifndef _ZFORLIST_DECLARE_TABLE
#define _ZFORLIST_DECLARE_TABLE
#endif
-#include <svtools/zformat.hxx>
+#include <svl/zformat.hxx>
#endif
// header for SvNumberFormatter
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
#include "DataBrowser.hxx"
#include "DataBrowserModel.hxx"
diff --git a/chart2/source/controller/dialogs/ObjectNameProvider.cxx b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
index 24b717adba7f..fbbbca7fd826 100644
--- a/chart2/source/controller/dialogs/ObjectNameProvider.cxx
+++ b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
@@ -49,7 +49,7 @@
#include <tools/debug.hxx>
#include <tools/string.hxx>
-// #include <svtools/syslocale.hxx>
+// #include <unotools/syslocale.hxx>
#include <com/sun/star/chart2/XTitle.hpp>
#include <com/sun/star/chart2/XRegressionCurveContainer.hpp>
diff --git a/chart2/source/controller/dialogs/TextDirectionListBox.cxx b/chart2/source/controller/dialogs/TextDirectionListBox.cxx
index d1365b908eac..f049f77ee312 100644
--- a/chart2/source/controller/dialogs/TextDirectionListBox.cxx
+++ b/chart2/source/controller/dialogs/TextDirectionListBox.cxx
@@ -34,7 +34,7 @@
#include "TextDirectionListBox.hxx"
#include "ResId.hxx"
#include "Strings.hrc"
-#include <svtools/languageoptions.hxx>
+#include <svl/languageoptions.hxx>
#include <vcl/window.hxx>
namespace chart
diff --git a/chart2/source/controller/dialogs/dlg_DataEditor.cxx b/chart2/source/controller/dialogs/dlg_DataEditor.cxx
index f3b601453bee..d433aaff4cb3 100644
--- a/chart2/source/controller/dialogs/dlg_DataEditor.cxx
+++ b/chart2/source/controller/dialogs/dlg_DataEditor.cxx
@@ -43,10 +43,10 @@
#include <vcl/msgbox.hxx>
#include <vcl/taskpanelist.hxx>
#include <svtools/miscopt.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
// for SfxBoolItem
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
#include <vcl/edit.hxx>
@@ -104,7 +104,7 @@ DataEditor::DataEditor(
SvtMiscOptions aMiscOptions;
const sal_Int16 nStyle( aMiscOptions.GetToolboxStyle() );
// react on changes
- aMiscOptions.AddListener( LINK( this, DataEditor, MiscHdl ) );
+ aMiscOptions.AddListenerLink( LINK( this, DataEditor, MiscHdl ) );
m_aTbxData.SetOutStyle( nStyle );
// set good window width
@@ -132,7 +132,7 @@ DataEditor::~DataEditor()
notifySystemWindow( this, & m_aTbxData, ::comphelper::mem_fun( & TaskPaneList::RemoveWindow ));
SvtMiscOptions aMiscOptions;
- aMiscOptions.RemoveListener( LINK( this, DataEditor, MiscHdl ) );
+ aMiscOptions.RemoveListenerLink( LINK( this, DataEditor, MiscHdl ) );
OSL_TRACE( "DataEditor: DTOR" );
}
diff --git a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
index 99b88b956c88..859465e3fd0d 100644
--- a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
@@ -41,7 +41,7 @@
#include "ObjectNameProvider.hxx"
// header for class SfxBoolItem
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
//.............................................................................
namespace chart
diff --git a/chart2/source/controller/dialogs/dlg_InsertLegend.cxx b/chart2/source/controller/dialogs/dlg_InsertLegend.cxx
index 9ffaa2b28490..036ad921679d 100644
--- a/chart2/source/controller/dialogs/dlg_InsertLegend.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertLegend.cxx
@@ -41,7 +41,7 @@
// header for enum SvxChartLegendPos
#include <svx/chrtitem.hxx>
// header for class SfxItemPool
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
//.............................................................................
namespace chart
diff --git a/chart2/source/controller/dialogs/dlg_NumberFormat.cxx b/chart2/source/controller/dialogs/dlg_NumberFormat.cxx
index c8684bdaecbc..184214d3c5b0 100644
--- a/chart2/source/controller/dialogs/dlg_NumberFormat.cxx
+++ b/chart2/source/controller/dialogs/dlg_NumberFormat.cxx
@@ -34,7 +34,7 @@
#include "dlg_NumberFormat.hxx"
// header for class SfxItemSet
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
// header for class SvxNumberInfoItem
#define ITEMID_NUMBERINFO SID_ATTR_NUMBERFORMAT_INFO
@@ -45,7 +45,7 @@
#include <sfx2/tabdlg.hxx>
// header for SvNumberFormatter
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
//.............................................................................
namespace chart
diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
index 097c6c1d0107..ec8a0eaaa784 100644
--- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
+++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
@@ -34,7 +34,7 @@
#ifndef _ZFORLIST_DECLARE_TABLE
#define _ZFORLIST_DECLARE_TABLE
#endif
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
#endif
#include "dlg_ObjectProperties.hxx"
@@ -66,8 +66,8 @@
#include <com/sun/star/chart2/XAxis.hpp>
#include <com/sun/star/chart2/XChartType.hpp>
#include <com/sun/star/chart2/XDataSeries.hpp>
-#include <svtools/intitem.hxx>
-#include <svtools/languageoptions.hxx>
+#include <svl/intitem.hxx>
+#include <svl/languageoptions.hxx>
#include <svx/svxids.hrc>
@@ -82,7 +82,7 @@
#include <svx/flagsdef.hxx>
#include <svx/numinf.hxx>
-#include <svtools/cjkoptions.hxx>
+#include <svl/cjkoptions.hxx>
//.............................................................................
namespace chart
diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx b/chart2/source/controller/dialogs/res_DataLabel.cxx
index c6129629a51a..44fd27f7d09a 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.cxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.cxx
@@ -42,13 +42,13 @@
// header for class SvxNumberInfoItem
#include <svx/numinf.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
// for SfxUInt32Item
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
// header for class SfxStringItem
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
//SfxIntegerListItem
-#include <svtools/ilstitem.hxx>
+#include <svl/ilstitem.hxx>
#include <svx/eeitem.hxx>
#include <svx/frmdiritem.hxx>
@@ -56,7 +56,7 @@
#include <vcl/msgbox.hxx>
#include <svx/svxids.hrc>
// header for SvNumberFormatter
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
#include <svtools/controldims.hrc>
diff --git a/chart2/source/controller/dialogs/res_DataLabel.hxx b/chart2/source/controller/dialogs/res_DataLabel.hxx
index e560eed9f573..9d887f7fbc33 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.hxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.hxx
@@ -34,7 +34,7 @@
// header for class CheckBox
#include <vcl/button.hxx>
// header for class SfxItemSet
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
#include "TextDirectionListBox.hxx"
#include <svx/dialcontrol.hxx>
diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx
index 73af56b5a4d0..1f17fe39a9c0 100644
--- a/chart2/source/controller/dialogs/res_ErrorBar.cxx
+++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx
@@ -43,7 +43,7 @@
#include <rtl/math.hxx>
#include <vcl/dialog.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
using namespace ::com::sun::star;
diff --git a/chart2/source/controller/dialogs/res_LegendPosition.cxx b/chart2/source/controller/dialogs/res_LegendPosition.cxx
index 45623ebad3c5..4bbe7344c78d 100644
--- a/chart2/source/controller/dialogs/res_LegendPosition.cxx
+++ b/chart2/source/controller/dialogs/res_LegendPosition.cxx
@@ -50,7 +50,7 @@
#include "chartview/ChartSfxItemIds.hxx"
#include <svx/chrtitem.hxx>
// header for class SfxItemPool
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
//.............................................................................
namespace chart
diff --git a/chart2/source/controller/dialogs/res_LegendPosition.hxx b/chart2/source/controller/dialogs/res_LegendPosition.hxx
index 571a0dfc33ff..81d30eb7b294 100644
--- a/chart2/source/controller/dialogs/res_LegendPosition.hxx
+++ b/chart2/source/controller/dialogs/res_LegendPosition.hxx
@@ -36,7 +36,7 @@
#endif
#include <vcl/fixed.hxx>
// header for class SfxItemSet
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
diff --git a/chart2/source/controller/dialogs/res_Trendline.hxx b/chart2/source/controller/dialogs/res_Trendline.hxx
index e1becbf8631f..181341f5c55e 100644
--- a/chart2/source/controller/dialogs/res_Trendline.hxx
+++ b/chart2/source/controller/dialogs/res_Trendline.hxx
@@ -34,7 +34,7 @@
#include <vcl/button.hxx>
#include <vcl/fixed.hxx>
#include <svtools/valueset.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
#include <svx/chrtitem.hxx>
namespace chart
diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.cxx b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
index ae20b1db1d2b..a7407b4781ee 100644
--- a/chart2/source/controller/dialogs/tp_AxisLabel.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
@@ -41,7 +41,7 @@
#include <svx/chrtitem.hxx>
// header for SfxInt32Item
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
#include <svx/eeitem.hxx>
#include <svx/frmdiritem.hxx>
diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.cxx b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
index d1e17f677646..0b10204c54bc 100644
--- a/chart2/source/controller/dialogs/tp_AxisPositions.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
@@ -46,9 +46,9 @@
// header for class SvxDoubleItem
#include <svx/chrtitem.hxx>
// header for class SfxBoolItem
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
// header for SfxInt32Item
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
// header for class WarningBox
#include <vcl/msgbox.hxx>
@@ -58,7 +58,7 @@
#ifndef _ZFORLIST_DECLARE_TABLE
#define _ZFORLIST_DECLARE_TABLE
#endif
-#include <svtools/zformat.hxx>
+#include <svl/zformat.hxx>
#endif
#include <svtools/controldims.hrc>
diff --git a/chart2/source/controller/dialogs/tp_PointGeometry.cxx b/chart2/source/controller/dialogs/tp_PointGeometry.cxx
index 7e2fa80dd556..d5dcad1eb02d 100644
--- a/chart2/source/controller/dialogs/tp_PointGeometry.cxx
+++ b/chart2/source/controller/dialogs/tp_PointGeometry.cxx
@@ -38,7 +38,7 @@
#include "chartview/ChartSfxItemIds.hxx"
// header for SfxInt32Item
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
// header for class Svx3DHorizontalSegmentsItem
#include <svx/svx3ditems.hxx>
diff --git a/chart2/source/controller/dialogs/tp_PolarOptions.cxx b/chart2/source/controller/dialogs/tp_PolarOptions.cxx
index 38d36d032921..1681962eb5fe 100644
--- a/chart2/source/controller/dialogs/tp_PolarOptions.cxx
+++ b/chart2/source/controller/dialogs/tp_PolarOptions.cxx
@@ -35,8 +35,8 @@
#include "chartview/ChartSfxItemIds.hxx"
#include "NoWarningThisInCTOR.hxx"
-#include <svtools/eitem.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/intitem.hxx>
#include <svtools/controldims.hrc>
//.............................................................................
diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx
index a2c3694a8469..dc2c1f156bcb 100644
--- a/chart2/source/controller/dialogs/tp_Scale.cxx
+++ b/chart2/source/controller/dialogs/tp_Scale.cxx
@@ -46,9 +46,9 @@
// header for class SvxDoubleItem
#include <svx/chrtitem.hxx>
// header for class SfxBoolItem
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
// header for SfxInt32Item
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
// header for class WarningBox
#include <vcl/msgbox.hxx>
@@ -58,7 +58,7 @@
#ifndef _ZFORLIST_DECLARE_TABLE
#define _ZFORLIST_DECLARE_TABLE
#endif
-#include <svtools/zformat.hxx>
+#include <svl/zformat.hxx>
#endif
#include <svtools/controldims.hrc>
diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
index cc8ac2139639..a5247e47ad1e 100644
--- a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
+++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
@@ -38,11 +38,11 @@
#include "NoWarningThisInCTOR.hxx"
// header for class SfxBoolItem
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
// header for SfxInt32Item
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
//SfxIntegerListItem
-#include <svtools/ilstitem.hxx>
+#include <svl/ilstitem.hxx>
#include <svtools/controldims.hrc>
#include <com/sun/star/chart/MissingValueTreatment.hpp>
diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.cxx b/chart2/source/controller/dialogs/tp_TitleRotation.cxx
index 6733d9e08c3a..d04f43c7031b 100644
--- a/chart2/source/controller/dialogs/tp_TitleRotation.cxx
+++ b/chart2/source/controller/dialogs/tp_TitleRotation.cxx
@@ -40,7 +40,7 @@
#include <svx/frmdiritem.hxx>
// header for class SfxInt32Item
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
//.............................................................................
namespace chart
diff --git a/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx b/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx
index 92b37e8b4195..c1ba3ed3ed6c 100644
--- a/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx
+++ b/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx
@@ -57,7 +57,7 @@
//oldChartModelWrapper
// header for class SfxItemPool
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
// header for class FontList
#include <svtools/ctrltool.hxx>
// header for class Application
diff --git a/chart2/source/controller/inc/HelpIds.hrc b/chart2/source/controller/inc/HelpIds.hrc
index ccff9e913f97..89010d2bc8b5 100644
--- a/chart2/source/controller/inc/HelpIds.hrc
+++ b/chart2/source/controller/inc/HelpIds.hrc
@@ -30,7 +30,7 @@
#ifndef CHART_HELPIDS_HRC
#define CHART_HELPIDS_HRC
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
//next is 120
//see old chart: schhids.h
diff --git a/chart2/source/controller/inc/ItemConverter.hxx b/chart2/source/controller/inc/ItemConverter.hxx
index e55456519cd1..52d98132ea82 100644
--- a/chart2/source/controller/inc/ItemConverter.hxx
+++ b/chart2/source/controller/inc/ItemConverter.hxx
@@ -31,8 +31,8 @@
#define CHART_ITEMCONVERTER_HXX
#include <unotools/eventlisteneradapter.hxx>
-#include <svtools/itempool.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itempool.hxx>
+#include <svl/itemset.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
// for pair
diff --git a/chart2/source/controller/inc/dlg_DataEditor.hxx b/chart2/source/controller/inc/dlg_DataEditor.hxx
index fd565aba081b..cd82c4a7f46d 100644
--- a/chart2/source/controller/inc/dlg_DataEditor.hxx
+++ b/chart2/source/controller/inc/dlg_DataEditor.hxx
@@ -31,7 +31,7 @@
#ifndef _SCH_DGRDATA_HXX
#define _SCH_DGRDATA_HXX
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
#include <svtools/stdctrl.hxx>
#include <vcl/toolbox.hxx>
#include <comphelper/stl_types.hxx>
diff --git a/chart2/source/controller/inc/dlg_InsertDataLabel.hxx b/chart2/source/controller/inc/dlg_InsertDataLabel.hxx
index d5748a3e990f..d5e19b6de40c 100644
--- a/chart2/source/controller/inc/dlg_InsertDataLabel.hxx
+++ b/chart2/source/controller/inc/dlg_InsertDataLabel.hxx
@@ -37,7 +37,7 @@
#include <vcl/button.hxx>
#endif
// header for class SfxItemSet
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
//for auto_ptr
#include <memory>
diff --git a/chart2/source/controller/inc/dlg_InsertErrorBars.hxx b/chart2/source/controller/inc/dlg_InsertErrorBars.hxx
index 13382ff9bffa..f463fc1e854f 100644
--- a/chart2/source/controller/inc/dlg_InsertErrorBars.hxx
+++ b/chart2/source/controller/inc/dlg_InsertErrorBars.hxx
@@ -32,7 +32,7 @@
#include <vcl/dialog.hxx>
#include <vcl/button.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
#include <memory>
#include <com/sun/star/frame/XModel.hpp>
diff --git a/chart2/source/controller/inc/dlg_InsertTrendline.hxx b/chart2/source/controller/inc/dlg_InsertTrendline.hxx
index 517da8fb6930..44f660373b41 100644
--- a/chart2/source/controller/inc/dlg_InsertTrendline.hxx
+++ b/chart2/source/controller/inc/dlg_InsertTrendline.hxx
@@ -32,7 +32,7 @@
#include <vcl/dialog.hxx>
#include <vcl/button.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
#include <memory>
//.............................................................................
diff --git a/chart2/source/controller/inc/res_ErrorBar.hxx b/chart2/source/controller/inc/res_ErrorBar.hxx
index e1490f5b7e50..a37ed80cbd30 100644
--- a/chart2/source/controller/inc/res_ErrorBar.hxx
+++ b/chart2/source/controller/inc/res_ErrorBar.hxx
@@ -35,7 +35,7 @@
#include <vcl/field.hxx>
#include <vcl/lstbox.hxx>
#include <svtools/valueset.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
#include <svx/chrtitem.hxx>
#include "chartview/ChartSfxItemIds.hxx"
#include "RangeSelectionButton.hxx"
diff --git a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
index 0c7ff467a91b..07cc3191b906 100644
--- a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
@@ -49,11 +49,11 @@
#include <com/sun/star/chart2/AxisOrientation.hpp>
// for SfxBoolItem
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
// for SvxDoubleItem
#include <svx/chrtitem.hxx>
// for SfxInt32Item
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
#include <rtl/math.hxx>
#include <algorithm>
diff --git a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx
index ad2aab714757..ee83459d4429 100644
--- a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx
@@ -42,7 +42,7 @@
#include <svx/postitem.hxx>
#include <svx/wghtitem.hxx>
#include <svx/fhgtitem.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
#include <com/sun/star/beans/XPropertyState.hpp>
#include <com/sun/star/chart2/XFormattedString.hpp>
diff --git a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
index af062cf3b93c..c27fa016d00d 100644
--- a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
@@ -49,15 +49,15 @@
// header for class XFillColorItem
#include <svx/xflclit.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
#include <svx/sizeitem.hxx>
// header for class SfxStringItem
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
#include <svx/brshitem.hxx>
//SfxIntegerListItem
-#include <svtools/ilstitem.hxx>
+#include <svl/ilstitem.hxx>
#define _SVSTDARR_ULONGS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
#include <vcl/graph.hxx>
#include <com/sun/star/graphic/XGraphic.hpp>
diff --git a/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx b/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx
index fff6d87be9ab..7b05b72bb53f 100755
--- a/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx
@@ -42,9 +42,9 @@
#include "GraphicPropertyItemConverter.hxx"
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
#include <svx/chrtitem.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
#include <rtl/math.hxx>
#include <com/sun/star/chart2/DataPointLabel.hpp>
diff --git a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
index 593b523316e3..1c7273f44c89 100644
--- a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
@@ -38,7 +38,7 @@
#include "CommonConverters.hxx"
// #ifndef _SFXINTITEM_HXX
-// #include <svtools/intitem.hxx>
+// #include <svl/intitem.hxx>
// #endif
#include <svx/xflclit.hxx>
#include <svx/xlnclit.hxx>
@@ -53,7 +53,7 @@
#include <svx/xlntrit.hxx>
#include <svx/eeitem.hxx>
// for SfxBoolItem
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
// for XFillGradientStepCountItem
#include <svx/xgrscit.hxx>
#include <com/sun/star/beans/XPropertyState.hpp>
diff --git a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
index e0a7b20bfa6f..04b35f275618 100644
--- a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
@@ -33,10 +33,10 @@
#include "ItemConverter.hxx"
#include "macros.hxx"
#include <com/sun/star/lang/XComponent.hpp>
-#include <svtools/itemprop.hxx>
-#include <svtools/itemiter.hxx>
+#include <svl/itemprop.hxx>
+#include <svl/itemiter.hxx>
// header for class SfxWhichIter
-#include <svtools/whiter.hxx>
+#include <svl/whiter.hxx>
#include <svx/svxids.hrc>
using namespace ::com::sun::star;
diff --git a/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx b/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx
index c62fa6735512..69209884fbdb 100644
--- a/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx
@@ -40,7 +40,7 @@
#include <com/sun/star/chart2/XRegressionCurve.hpp>
// for SfxBoolItem
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
#include <svx/chrtitem.hxx>
#include <functional>
diff --git a/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx b/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx
index 6ac0d87b3e5f..439aa84c0073 100644
--- a/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx
@@ -39,7 +39,7 @@
#include "CharacterPropertyItemConverter.hxx"
#include "MultipleItemConverter.hxx"
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
#include <rtl/math.hxx>
#include <functional>
diff --git a/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx b/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx
index f30bb4aeda57..d74eff927bc4 100644
--- a/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx
@@ -48,13 +48,13 @@
#include <com/sun/star/chart2/XDataSeries.hpp>
// for SfxBoolItem
-#include <svtools/eitem.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/intitem.hxx>
//SfxIntegerListItem
-#include <svtools/ilstitem.hxx>
+#include <svl/ilstitem.hxx>
#define _SVSTDARR_ULONGS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
#include <rtl/math.hxx>
#include <functional>
diff --git a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
index eed9235aff9b..acaf493836bc 100644
--- a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
@@ -43,9 +43,9 @@
#include "GraphicPropertyItemConverter.hxx"
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
#include <svx/chrtitem.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
#include <rtl/math.hxx>
#include <com/sun/star/chart2/DataPointLabel.hpp>
diff --git a/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx b/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx
index 96f6e01cadb5..a94c1f07909f 100644
--- a/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx
@@ -37,7 +37,7 @@
#include "GraphicPropertyItemConverter.hxx"
#include "CharacterPropertyItemConverter.hxx"
#include "MultipleItemConverter.hxx"
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
#include <rtl/math.hxx>
#include <com/sun/star/chart2/XTitled.hpp>
diff --git a/chart2/source/controller/main/ChartController_Position.cxx b/chart2/source/controller/main/ChartController_Position.cxx
index 4cf4de81480b..4cbb6db76bd4 100644
--- a/chart2/source/controller/main/ChartController_Position.cxx
+++ b/chart2/source/controller/main/ChartController_Position.cxx
@@ -48,7 +48,7 @@
#include <vcl/msgbox.hxx>
#include <svx/svxids.hrc>
#include <svx/rectenum.hxx>
-#include <svtools/aeitem.hxx>
+#include <svl/aeitem.hxx>
#include <svx/svxdlg.hxx>
#include <svx/dialogs.hrc>
#include <vcl/svapp.hxx>
diff --git a/chart2/source/controller/main/ChartController_TextEdit.cxx b/chart2/source/controller/main/ChartController_TextEdit.cxx
index e1f83550bd5d..855357ce701b 100644
--- a/chart2/source/controller/main/ChartController_TextEdit.cxx
+++ b/chart2/source/controller/main/ChartController_TextEdit.cxx
@@ -54,7 +54,7 @@
#include <vcl/svapp.hxx>
#include <vos/mutex.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
#include <svx/fontitem.hxx>
//.............................................................................
diff --git a/chart2/source/controller/main/ConfigurationAccess.cxx b/chart2/source/controller/main/ConfigurationAccess.cxx
index f71d26b7b3c2..65cebdbc13d3 100644
--- a/chart2/source/controller/main/ConfigurationAccess.cxx
+++ b/chart2/source/controller/main/ConfigurationAccess.cxx
@@ -35,7 +35,7 @@
#include "macros.hxx"
// header for class SvtSysLocale
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
// header for class ConfigItem
#include <unotools/configitem.hxx>
// header for rtl::Static
@@ -69,6 +69,8 @@ public:
virtual ~CalcConfigItem();
FieldUnit getFieldUnit();
+ virtual void Commit();
+ virtual void Notify( const uno::Sequence<rtl::OUString>& aPropertyNames);
};
CalcConfigItem::CalcConfigItem()
@@ -80,6 +82,9 @@ CalcConfigItem::~CalcConfigItem()
{
}
+void CalcConfigItem::Commit() {}
+void CalcConfigItem::Notify( const uno::Sequence<rtl::OUString>& ) {}
+
FieldUnit CalcConfigItem::getFieldUnit()
{
FieldUnit eResult( FUNIT_CM );
diff --git a/chart2/source/inc/Strings.hrc b/chart2/source/inc/Strings.hrc
index fea8bb867057..3353e48e9238 100644
--- a/chart2/source/inc/Strings.hrc
+++ b/chart2/source/inc/Strings.hrc
@@ -31,7 +31,7 @@
#define CHART_STRINGS_HRC
// this includes no link dependency
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
//next free is 290
//single free is: 134
diff --git a/chart2/source/inc/chartview/NumberFormatterWrapper.hxx b/chart2/source/inc/chartview/NumberFormatterWrapper.hxx
index 5077541abe2c..03c182229d45 100644
--- a/chart2/source/inc/chartview/NumberFormatterWrapper.hxx
+++ b/chart2/source/inc/chartview/NumberFormatterWrapper.hxx
@@ -30,7 +30,7 @@
#ifndef _CHART2_VIEW_NUMBERFORMATTERWRAPPER_HXX
#define _CHART2_VIEW_NUMBERFORMATTERWRAPPER_HXX
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
#include "chartviewdllapi.hxx"
diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx
index e25cb92d4012..f3971b28d40f 100644
--- a/chart2/source/model/filter/XMLFilter.cxx
+++ b/chart2/source/model/filter/XMLFilter.cxx
@@ -41,7 +41,7 @@
// header contains only macros
#include <svtools/sfxecode.hxx>
// header for class SvtSaveOptions
-#include <svtools/saveopt.hxx>
+#include <unotools/saveopt.hxx>
#include <comphelper/genericpropertyset.hxx>
// header for struct PropertyMapEntry
#include <comphelper/propertysetinfo.hxx>
diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx
index 4882ecef72de..1286a6e553cc 100644
--- a/chart2/source/model/main/ChartModel.cxx
+++ b/chart2/source/model/main/ChartModel.cxx
@@ -49,7 +49,7 @@
#include <comphelper/processfactory.hxx>
// header for class SvNumberFormatsSupplierObj
-#include <svtools/numuno.hxx>
+#include <svl/numuno.hxx>
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/view/XSelectionSupplier.hpp>
diff --git a/chart2/source/model/main/ImplChartModel.cxx b/chart2/source/model/main/ImplChartModel.cxx
index 87383dcf5817..4c8e3bdfc8c9 100644
--- a/chart2/source/model/main/ImplChartModel.cxx
+++ b/chart2/source/model/main/ImplChartModel.cxx
@@ -45,9 +45,9 @@
#include "AxisHelper.hxx"
// header for class SvNumberFormatter
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
// header for class SvNumberFormatsSupplierObj
-#include <svtools/numuno.hxx>
+#include <svl/numuno.hxx>
#include <vcl/svapp.hxx>
#include <cppuhelper/component_context.hxx>
diff --git a/chart2/source/tools/AxisHelper.cxx b/chart2/source/tools/AxisHelper.cxx
index 5e6c0bce8717..b7dfd60f8712 100644
--- a/chart2/source/tools/AxisHelper.cxx
+++ b/chart2/source/tools/AxisHelper.cxx
@@ -42,7 +42,7 @@
#include "DataSeriesHelper.hxx"
#include "Scaling.hxx"
-#include <svtools/saveopt.hxx>
+#include <unotools/saveopt.hxx>
#include <com/sun/star/chart/ChartAxisPosition.hpp>
diff --git a/chart2/source/tools/CharacterProperties.cxx b/chart2/source/tools/CharacterProperties.cxx
index 4f558b35df0a..6981d7fab9a2 100644
--- a/chart2/source/tools/CharacterProperties.cxx
+++ b/chart2/source/tools/CharacterProperties.cxx
@@ -58,7 +58,7 @@
// header for struct SvtLinguConfig
#ifndef _SVTOOLS_LINGUCFG_HXX_
-#include <svtools/lingucfg.hxx>
+#include <unotools/lingucfg.hxx>
#endif
#ifndef INCLUDED_I18NPOOL_MSLANGID_HXX
#include <i18npool/mslangid.hxx>
diff --git a/chart2/source/tools/ConfigColorScheme.cxx b/chart2/source/tools/ConfigColorScheme.cxx
index 835872aad8e4..648aca20bc77 100644
--- a/chart2/source/tools/ConfigColorScheme.cxx
+++ b/chart2/source/tools/ConfigColorScheme.cxx
@@ -76,6 +76,7 @@ public:
protected:
// ____ ::utl::ConfigItem ____
+ virtual void Commit();
virtual void Notify( const Sequence< OUString > & aPropertyNames );
private:
@@ -100,6 +101,9 @@ void ChartConfigItem::Notify( const Sequence< OUString > & aPropertyNames )
}
}
+void ChartConfigItem::Commit()
+{}
+
void ChartConfigItem::addPropertyNotification( const OUString & rPropertyName )
{
m_aPropertiesToNotify.insert( rPropertyName );
diff --git a/chart2/source/tools/ImplUndoManager.cxx b/chart2/source/tools/ImplUndoManager.cxx
index 91d5f869bc53..e6c87ae16f9e 100644
--- a/chart2/source/tools/ImplUndoManager.cxx
+++ b/chart2/source/tools/ImplUndoManager.cxx
@@ -463,6 +463,10 @@ void UndoStepsConfigItem::Notify( const Sequence< OUString > & aPropertyNames )
}
}
+void UndoStepsConfigItem::Commit()
+{
+}
+
// mtehod is not const, because GetProperties is not const
sal_Int32 UndoStepsConfigItem::getUndoSteps()
{
diff --git a/chart2/source/tools/ImplUndoManager.hxx b/chart2/source/tools/ImplUndoManager.hxx
index 94d04b69a5a4..35a90becbcf2 100644
--- a/chart2/source/tools/ImplUndoManager.hxx
+++ b/chart2/source/tools/ImplUndoManager.hxx
@@ -200,6 +200,7 @@ public:
protected:
// ____ ::utl::ConfigItem ____
virtual void Notify( const ::com::sun::star::uno::Sequence< ::rtl::OUString > & aPropertyNames );
+ virtual void Commit();
private:
ConfigItemListener & m_rListener;
diff --git a/chart2/source/tools/OPropertySet.cxx b/chart2/source/tools/OPropertySet.cxx
index 4ba7f99edcc1..d1cf27758110 100644
--- a/chart2/source/tools/OPropertySet.cxx
+++ b/chart2/source/tools/OPropertySet.cxx
@@ -377,7 +377,7 @@ void SAL_CALL OPropertySet::getFastPropertyValue
uno::Reference< beans::XFastPropertySet > xStylePropSet( m_pImplProperties->GetStyle(), uno::UNO_QUERY );
if( xStylePropSet.is() )
{
-#ifndef NDEBUG
+#ifdef DBG_UTIL
{
// check if the handle of the style points to the same property
// name as the handle in this property set
diff --git a/chart2/source/view/main/ChartItemPool.cxx b/chart2/source/view/main/ChartItemPool.cxx
index f3024a10e958..3da8fe225f8c 100644
--- a/chart2/source/view/main/ChartItemPool.cxx
+++ b/chart2/source/view/main/ChartItemPool.cxx
@@ -36,15 +36,15 @@
#include "chartview/ChartSfxItemIds.hxx"
#include <svx/chrtitem.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
#include <svx/brshitem.hxx>
#include <svx/sizeitem.hxx>
// header for class SfxStringItem
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
//SfxIntegerListItem
-#include <svtools/ilstitem.hxx>
+#include <svl/ilstitem.hxx>
#define _SVSTDARR_ULONGS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
namespace chart
{
diff --git a/chart2/source/view/main/ChartItemPool.hxx b/chart2/source/view/main/ChartItemPool.hxx
index 00c813ed4922..22bc5b900d06 100644
--- a/chart2/source/view/main/ChartItemPool.hxx
+++ b/chart2/source/view/main/ChartItemPool.hxx
@@ -30,8 +30,8 @@
#ifndef _CHART2_ITEMPOOL_HXX
#define _CHART2_ITEMPOOL_HXX
-#include <svtools/poolitem.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/poolitem.hxx>
+#include <svl/itempool.hxx>
namespace chart
{
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index dfd57f9bce92..fed4b52f3b5f 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -103,7 +103,7 @@
#include <com/sun/star/text/XTextDocument.hpp>
#include <com/sun/star/text/WritingMode2.hpp>
#include <com/sun/star/text/XTextEmbeddedObjectsSupplier.hpp>
-#include <svtools/languageoptions.hxx>
+#include <svl/languageoptions.hxx>
#include <sot/clsids.hxx>
//.............................................................................
diff --git a/chart2/source/view/main/ChartView.hxx b/chart2/source/view/main/ChartView.hxx
index b536998fd5bd..b1d7c5eede78 100644
--- a/chart2/source/view/main/ChartView.hxx
+++ b/chart2/source/view/main/ChartView.hxx
@@ -36,7 +36,7 @@
#include <cppuhelper/interfacecontainer.hxx>
// header for class SfxListener
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
#include <com/sun/star/datatransfer/XTransferable.hpp>
#include <com/sun/star/drawing/XDrawPage.hpp>
#include <com/sun/star/frame/XModel.hpp>
diff --git a/chart2/source/view/main/DrawModelWrapper.cxx b/chart2/source/view/main/DrawModelWrapper.cxx
index 95b5144265ae..4212640033ac 100644
--- a/chart2/source/view/main/DrawModelWrapper.cxx
+++ b/chart2/source/view/main/DrawModelWrapper.cxx
@@ -37,15 +37,15 @@
#include "ChartItemPool.hxx"
#include "ObjectIdentifier.hxx"
#include <svx/unomodel.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
// header for class SfxBoolItem
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
// header for define EE_PARA_HYPHENATE
#include <svx/eeitem.hxx>
// header for class Svx3DPercentDiagonalItem
#include <svx/svx3ditems.hxx>
// header for class SvtPathOptions
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
// header E3dObjFactory
#include <svx/objfac3d.hxx>
// header for class SdrObjList
diff --git a/chart2/source/view/main/NumberFormatterWrapper.cxx b/chart2/source/view/main/NumberFormatterWrapper.cxx
index 2a01d2f1cde3..b947894c77bb 100644
--- a/chart2/source/view/main/NumberFormatterWrapper.cxx
+++ b/chart2/source/view/main/NumberFormatterWrapper.cxx
@@ -34,9 +34,9 @@
#include "macros.hxx"
#include <comphelper/processfactory.hxx>
// header for class SvNumberFormatsSupplierObj
-#include <svtools/numuno.hxx>
+#include <svl/numuno.hxx>
// header for class SvNumberformat
-#include <svtools/zformat.hxx>
+#include <svl/zformat.hxx>
#include <tools/color.hxx>
#include <i18npool/mslangid.hxx>
#include <tools/debug.hxx>
diff --git a/chart2/source/view/main/VLegend.cxx b/chart2/source/view/main/VLegend.cxx
index b9fa4b3aba84..8e65dd6c2458 100644
--- a/chart2/source/view/main/VLegend.cxx
+++ b/chart2/source/view/main/VLegend.cxx
@@ -49,7 +49,7 @@
#include <com/sun/star/chart2/LegendPosition.hpp>
#include <com/sun/star/chart2/RelativePosition.hpp>
#include <rtl/ustrbuf.hxx>
-#include <svtools/languageoptions.hxx>
+#include <svl/languageoptions.hxx>
#include <vector>
#include <algorithm>
diff --git a/cli_ure/prj/build.lst b/cli_ure/prj/build.lst
index 007a01aec93f..268240c4597b 100644
--- a/cli_ure/prj/build.lst
+++ b/cli_ure/prj/build.lst
@@ -1,4 +1,4 @@
-ure cli_ure : cppu cppuhelper sal codemaker stoc udkapi tools NULL
+ure cli_ure : cppu cppuhelper sal codemaker stoc udkapi bridges NULL
ure cli_ure usr1 - all ure_mkout NULL
ure cli_ure\inc nmake - all ure_inc NULL
ure cli_ure\version nmake - all ure_source_version ure_inc NULL
diff --git a/cli_ure/qa/climaker/makefile.mk b/cli_ure/qa/climaker/makefile.mk
index cde3f4066142..a5b0af914f29 100644
--- a/cli_ure/qa/climaker/makefile.mk
+++ b/cli_ure/qa/climaker/makefile.mk
@@ -41,7 +41,7 @@ CLIMAKER*=$(WRAPCMD) $(BIN)$/climaker
#----- compile .java files -----------------------------------------
-JARFILES = sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
+JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
JAVAFILES = ClimakerTestCase.java
JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
diff --git a/cli_ure/source/native/path.cxx b/cli_ure/source/native/path.cxx
index 075a3cdb75bd..9ef17010b0d2 100644
--- a/cli_ure/source/native/path.cxx
+++ b/cli_ure/source/native/path.cxx
@@ -38,7 +38,7 @@
#include <windows.h>
#include "sal/types.h"
-#include "tools/pathutils.hxx"
+//#include "tools/pathutils.hxx"
namespace cli_ure {
diff --git a/codemaker/test/cppumaker/makefile.mk b/codemaker/test/cppumaker/makefile.mk
index bab3dcbb30ea..1bc926dc0fe0 100644
--- a/codemaker/test/cppumaker/makefile.mk
+++ b/codemaker/test/cppumaker/makefile.mk
@@ -1,7 +1,7 @@
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+#
# Copyright 2008 by Sun Microsystems, Inc.
#
# OpenOffice.org - a multi-platform office productivity suite
@@ -43,7 +43,7 @@ INCPRE += $(MISC)$/$(TARGET)$/inc
SHL1TARGET = $(TARGET)
SHL1OBJS = $(SLO)$/test_codemaker_cppumaker.obj
-SHL1STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(SALLIB)
+SHL1STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(SALLIB) $(TESTSHL2LIB)
SHL1VERSIONMAP = version.map
SHL1IMPLIB = i$(SHL1TARGET)
DEF1NAME = $(SHL1TARGET)
diff --git a/codemaker/test/cppumaker/test_codemaker_cppumaker.cxx b/codemaker/test/cppumaker/test_codemaker_cppumaker.cxx
index 2f5c75fc1d92..9cd3dc70d3fd 100644
--- a/codemaker/test/cppumaker/test_codemaker_cppumaker.cxx
+++ b/codemaker/test/cppumaker/test_codemaker_cppumaker.cxx
@@ -369,7 +369,7 @@
#include "com/sun/star/uno/Any.hxx"
#include "com/sun/star/uno/Type.hxx"
#include "com/sun/star/uno/TypeClass.hpp"
-#include "cppunit/simpleheader.hxx"
+#include "testshl/simpleheader.hxx"
#include "rtl/ustring.h"
#include "rtl/ustring.hxx"
diff --git a/comphelper/qa/makefile.mk b/comphelper/qa/makefile.mk
index cfc597570bc4..52c57a9d77de 100644
--- a/comphelper/qa/makefile.mk
+++ b/comphelper/qa/makefile.mk
@@ -1,7 +1,7 @@
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+#
# Copyright 2008 by Sun Microsystems, Inc.
#
# OpenOffice.org - a multi-platform office productivity suite
@@ -43,7 +43,7 @@ INCPRE += $(MISC)$/$(TARGET)$/inc
SHL1TARGET = $(TARGET)_weakbag
SHL1OBJS = $(SLO)$/test_weakbag.obj
-SHL1STDLIBS = $(CPPUHELPERLIB) $(CPPULIB) $(CPPUNITLIB) $(SALLIB)
+SHL1STDLIBS = $(CPPUHELPERLIB) $(CPPULIB) $(CPPUNITLIB) $(TESTSHL2LIB) $(SALLIB)
SHL1VERSIONMAP = version.map
SHL1IMPLIB = i$(SHL1TARGET)
DEF1NAME = $(SHL1TARGET)
@@ -55,4 +55,4 @@ SLOFILES = $(SHL1OBJS)
ALLTAR: test
test .PHONY: $(SHL1TARGETN)
- testshl2 $(SHL1TARGETN)
+ $(TESTSHL2) $(SHL1TARGETN)
diff --git a/comphelper/qa/test_string.cxx b/comphelper/qa/test_string.cxx
index 035e56fdb8c4..c237158beccc 100644
--- a/comphelper/qa/test_string.cxx
+++ b/comphelper/qa/test_string.cxx
@@ -32,7 +32,7 @@
#include "sal/config.h"
#include "comphelper/string.hxx"
-#include "cppunit/simpleheader.hxx"
+#include "testshl/simpleheader.hxx"
#include "rtl/string.h"
#include "rtl/ustring.h"
#include "rtl/ustring.hxx"
diff --git a/comphelper/qa/test_weakbag.cxx b/comphelper/qa/test_weakbag.cxx
index dd4a8356eb5a..470ac2eef6c0 100644
--- a/comphelper/qa/test_weakbag.cxx
+++ b/comphelper/qa/test_weakbag.cxx
@@ -35,7 +35,7 @@
#include "com/sun/star/uno/XInterface.hpp"
#include "comphelper/weakbag.hxx"
#include "cppuhelper/weak.hxx"
-#include "cppunit/simpleheader.hxx"
+#include "testshl/simpleheader.hxx"
namespace {
diff --git a/comphelper/source/misc/comphelper_services.cxx b/comphelper/source/misc/comphelper_services.cxx
index 77ab145e2581..8fa318a92eb1 100644
--- a/comphelper/source/misc/comphelper_services.cxx
+++ b/comphelper/source/misc/comphelper_services.cxx
@@ -39,6 +39,7 @@ extern void createRegistryInfo_AnyCompareFactory();
extern void createRegistryInfo_OfficeInstallationDirectories();
extern void createRegistryInfo_OInstanceLocker();
extern void createRegistryInfo_Map();
+extern void createRegistryInfo_OSimpleLogRing();
//........................................................................
namespace comphelper { namespace module
@@ -63,6 +64,7 @@ namespace comphelper { namespace module
createRegistryInfo_OfficeInstallationDirectories();
createRegistryInfo_OInstanceLocker();
createRegistryInfo_Map();
+ createRegistryInfo_OSimpleLogRing();
}
}
}
diff --git a/comphelper/source/misc/documentiologring.cxx b/comphelper/source/misc/documentiologring.cxx
index 7969b938e108..8b999aaf4449 100644
--- a/comphelper/source/misc/documentiologring.cxx
+++ b/comphelper/source/misc/documentiologring.cxx
@@ -34,6 +34,8 @@
#include <com/sun/star/frame/DoubleInitializationException.hpp>
#include <com/sun/star/lang/IllegalArgumentException.hpp>
+#include <comphelper_module.hxx>
+
#include "documentiologring.hxx"
using namespace ::com::sun::star;
@@ -56,33 +58,33 @@ OSimpleLogRing::~OSimpleLogRing()
}
// ----------------------------------------------------------
-uno::Sequence< ::rtl::OUString > SAL_CALL OSimpleLogRing::impl_staticGetSupportedServiceNames()
+uno::Sequence< ::rtl::OUString > SAL_CALL OSimpleLogRing::getSupportedServiceNames_static()
{
uno::Sequence< rtl::OUString > aResult( 1 );
- aResult[0] = impl_staticGetServiceName();
+ aResult[0] = getServiceName_static();
return aResult;
}
// ----------------------------------------------------------
-::rtl::OUString SAL_CALL OSimpleLogRing::impl_staticGetImplementationName()
+::rtl::OUString SAL_CALL OSimpleLogRing::getImplementationName_static()
{
return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.logging.SimpleLogRing" ) );
}
// ----------------------------------------------------------
-::rtl::OUString SAL_CALL OSimpleLogRing::impl_staticGetSingletonName()
+::rtl::OUString SAL_CALL OSimpleLogRing::getSingletonName_static()
{
return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.logging.DocumentIOLogRing" ) );
}
// ----------------------------------------------------------
-::rtl::OUString SAL_CALL OSimpleLogRing::impl_staticGetServiceName()
+::rtl::OUString SAL_CALL OSimpleLogRing::getServiceName_static()
{
return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.logging.SimpleLogRing" ) );
}
// ----------------------------------------------------------
-uno::Reference< uno::XInterface > SAL_CALL OSimpleLogRing::impl_staticCreateSelfInstance( const uno::Reference< uno::XComponentContext >& rxContext )
+uno::Reference< uno::XInterface > SAL_CALL OSimpleLogRing::Create( const uno::Reference< uno::XComponentContext >& rxContext )
{
return static_cast< cppu::OWeakObject* >( new OSimpleLogRing( rxContext ) );
}
@@ -149,13 +151,13 @@ void SAL_CALL OSimpleLogRing::initialize( const uno::Sequence< uno::Any >& aArgu
// ----------------------------------------------------------
::rtl::OUString SAL_CALL OSimpleLogRing::getImplementationName() throw (uno::RuntimeException)
{
- return impl_staticGetImplementationName();
+ return getImplementationName_static();
}
// ----------------------------------------------------------
::sal_Bool SAL_CALL OSimpleLogRing::supportsService( const ::rtl::OUString& aServiceName ) throw (uno::RuntimeException)
{
- const uno::Sequence< rtl::OUString > & aSupportedNames = impl_staticGetSupportedServiceNames();
+ const uno::Sequence< rtl::OUString > & aSupportedNames = getSupportedServiceNames_static();
for ( sal_Int32 nInd = 0; nInd < aSupportedNames.getLength(); nInd++ )
{
if ( aSupportedNames[ nInd ].equals( aServiceName ) )
@@ -168,8 +170,13 @@ void SAL_CALL OSimpleLogRing::initialize( const uno::Sequence< uno::Any >& aArgu
// ----------------------------------------------------------
uno::Sequence< ::rtl::OUString > SAL_CALL OSimpleLogRing::getSupportedServiceNames() throw (uno::RuntimeException)
{
- return impl_staticGetSupportedServiceNames();
+ return getSupportedServiceNames_static();
}
} // namespace comphelper
+void createRegistryInfo_OSimpleLogRing()
+{
+ static ::comphelper::module::OAutoRegistration< ::comphelper::OSimpleLogRing > aAutoRegistration;
+ static ::comphelper::module::OSingletonRegistration< ::comphelper::OSimpleLogRing > aSingletonRegistration;
+}
diff --git a/comphelper/source/misc/documentiologring.hxx b/comphelper/source/misc/documentiologring.hxx
index ae7d2a6eaf19..b2b935c478af 100644
--- a/comphelper/source/misc/documentiologring.hxx
+++ b/comphelper/source/misc/documentiologring.hxx
@@ -60,17 +60,16 @@ public:
virtual ~OSimpleLogRing();
static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
- impl_staticGetSupportedServiceNames();
+ getSupportedServiceNames_static();
- static ::rtl::OUString SAL_CALL impl_staticGetImplementationName();
+ static ::rtl::OUString SAL_CALL getImplementationName_static();
- static ::rtl::OUString SAL_CALL impl_staticGetSingletonName();
+ static ::rtl::OUString SAL_CALL getSingletonName_static();
- static ::rtl::OUString SAL_CALL impl_staticGetServiceName();
+ static ::rtl::OUString SAL_CALL getServiceName_static();
static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL
- impl_staticCreateSelfInstance(
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
+ Create( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
// XSimpleLogRing
virtual void SAL_CALL logString( const ::rtl::OUString& aMessage ) throw (::com::sun::star::uno::RuntimeException);
diff --git a/comphelper/source/property/ChainablePropertySetInfo.cxx b/comphelper/source/property/ChainablePropertySetInfo.cxx
index b27cef88319c..c5d134eb9982 100644
--- a/comphelper/source/property/ChainablePropertySetInfo.cxx
+++ b/comphelper/source/property/ChainablePropertySetInfo.cxx
@@ -76,7 +76,7 @@ void ChainablePropertySetInfo::add( PropertyInfo* pMap, sal_Int32 nCount )
{
OUString aName( pMap->mpName, pMap->mnNameLen, RTL_TEXTENCODING_ASCII_US );
-#ifndef PRODUCT
+#ifdef DBG_UTIL
PropertyInfoHash::iterator aIter = maMap.find( aName );
if( aIter != maMap.end() )
OSL_ENSURE( sal_False, "Warning: PropertyInfo added twice, possible error!");
diff --git a/comphelper/source/property/MasterPropertySetInfo.cxx b/comphelper/source/property/MasterPropertySetInfo.cxx
index e74d21b2d755..91a9a17856d4 100644
--- a/comphelper/source/property/MasterPropertySetInfo.cxx
+++ b/comphelper/source/property/MasterPropertySetInfo.cxx
@@ -84,7 +84,7 @@ void MasterPropertySetInfo::add( PropertyInfo* pMap, sal_Int32 nCount, sal_uInt8
{
OUString aName( pMap->mpName, pMap->mnNameLen, RTL_TEXTENCODING_ASCII_US );
-#ifndef PRODUCT
+#ifdef DBG_UTIL
PropertyDataHash::iterator aIter = maMap.find( aName );
if( aIter != maMap.end() )
OSL_ENSURE( sal_False, "Warning: PropertyInfo added twice, possible error!");
@@ -102,7 +102,7 @@ void MasterPropertySetInfo::add( PropertyInfoHash &rHash, sal_uInt8 nMapId )
while ( aIter != aEnd )
{
-#ifndef PRODUCT
+#ifdef DBG_UTIL
PropertyDataHash::iterator aDebugIter = maMap.find( (*aIter).first );
if( aDebugIter != maMap.end() )
OSL_ENSURE( sal_False, "Warning: PropertyInfo added twice, possible error!");
diff --git a/comphelper/source/property/propertysetinfo.cxx b/comphelper/source/property/propertysetinfo.cxx
index e155d695e2c9..83b769553331 100644
--- a/comphelper/source/property/propertysetinfo.cxx
+++ b/comphelper/source/property/propertysetinfo.cxx
@@ -82,7 +82,7 @@ void PropertyMapImpl::add( PropertyMapEntry* pMap, sal_Int32 nCount ) throw()
{
OUString aName( pMap->mpName, pMap->mnNameLen, RTL_TEXTENCODING_ASCII_US );
-#ifndef PRODUCT
+#ifdef DBG_UTIL
PropertyMap::iterator aIter = maPropertyMap.find( aName );
if( aIter != maPropertyMap.end() )
{
diff --git a/configmgr/qa/unit/common.hxx b/configmgr/qa/unit/common.hxx
index d53d52d55ad7..7d5be659283c 100644
--- a/configmgr/qa/unit/common.hxx
+++ b/configmgr/qa/unit/common.hxx
@@ -44,7 +44,7 @@
#include "com/sun/star/uno/XComponentContext.hpp"
#include "cppuhelper/component_context.hxx"
#include "cppuhelper/servicefactory.hxx"
-#include "cppunit/simpleheader.hxx"
+#include "testshl/simpleheader.hxx"
#include "osl/file.hxx"
#include "osl/thread.h"
#include "osl/process.h"
diff --git a/configmgr/qa/unit/makefile.mk b/configmgr/qa/unit/makefile.mk
index a6a79ebdd0ca..aededf799d4f 100644
--- a/configmgr/qa/unit/makefile.mk
+++ b/configmgr/qa/unit/makefile.mk
@@ -1,7 +1,7 @@
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+#
# Copyright 2008 by Sun Microsystems, Inc.
#
# OpenOffice.org - a multi-platform office productivity suite
@@ -41,7 +41,7 @@ DLLPRE = # no leading "lib" on .so files
SHL1TARGET = $(TARGET)
SHL1OBJS = $(SLO)$/performance.obj $(SLO)$/threading.obj $(SLO)$/ubootstrap.obj
-SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(CPPUNITLIB) $(SALLIB)
+SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(CPPUNITLIB) $(TESTSHL2LIB) $(SALLIB)
SHL1VERSIONMAP = export.map
SHL1IMPLIB = i$(SHL1TARGET)
DEF1NAME = $(SHL1TARGET)
diff --git a/configmgr/qa/unit/threading.cxx b/configmgr/qa/unit/threading.cxx
index 1531e9f49138..68baee1c6829 100644
--- a/configmgr/qa/unit/threading.cxx
+++ b/configmgr/qa/unit/threading.cxx
@@ -53,7 +53,7 @@ class KeyTester : public osl::Thread
virtual ~KeyTester ()
{
}
- virtual void run ()
+ virtual void SAL_CALL run ()
{
testIteration();
while (!m_pCond->check())
diff --git a/configure.in b/configure.in
index 3505be436cf6..17cc81f905f5 100644
--- a/configure.in
+++ b/configure.in
@@ -1451,7 +1451,8 @@ if test "$COMPATH" = "." ; then
dnl double square bracket to get single because of M4 quote...
COMPATH=`echo $COMPATH | $SED "s@/[[^/:]]*\\\$@@"`;
fi
-
+COMPATH=`echo $COMPATH | $SED "s@/[[Bb]][[Ii]][[Nn]]\\\$@@"`;
+echo $COMPATH
dnl ===================================================================
dnl Test the gcc version, 3 is OK
dnl ===================================================================
@@ -1595,7 +1596,7 @@ dnl ===================================================================
if test "$_os" = "SunOS"; then
if test "$CC" = "cc"; then
AC_PATH_PROGS(_cc, cc)
- COMPATH=`echo $_cc | $SED -n "s/\/cc//p"`
+ COMPATH=`echo $_cc | $SED -n "s/\/bin\/cc//p"`
AC_MSG_CHECKING([the SunStudio C/C++ compiler version])
dnl cc -V outputs to standard error!!!!
_sunstudio_string=`$CC -V 2>&1 | grep '^cc' | sed -e 's/.* C //'`
@@ -1639,7 +1640,7 @@ dnl ===================================================================
if test "$_os" = "IRIX" -o "$_os" = "IRIX64"; then
if test "$CC" = "cc"; then
AC_PATH_PROGS(_cc, cc)
- COMPATH=`echo $_cc | $SED -n "s/\/cc//p"`
+ COMPATH=`echo $_cc | $SED -n "s/\/bin\/cc//p"`
AC_MSG_CHECKING([the SGI MIPSpro C compiler version])
dnl cc -version outputs to standard error!!!!
_mipspro_version=`$CC -version 2>&1 | $AWK '{ print $4 }'`
@@ -1664,7 +1665,7 @@ dnl ===================================================================
if test "$_os" = "OSF1"; then
if test "$CC" = "cc"; then
AC_PATH_PROGS(_cc, cc)
- COMPATH=`echo $_cc | $SED -n "s/\/cc//p"`
+ COMPATH=`echo $_cc | $SED -n "s/\/bin\/cc//p"`
AC_MSG_WARN([******* $_cc , $COMPATH])
AC_MSG_CHECKING([the Compaq C compiler version])
dnl cc -V outputs to standard error!!!!
@@ -1790,8 +1791,8 @@ if test "$_os" = "WINNT"; then
CC=`cygpath -u "$CC"`
# Remove /cl.exe from CC case insensitive
AC_MSG_RESULT([found ($CC)])
- COMPATH=`echo $CC | $SED 's@/[[cC]][[lL]]\.[[eE]][[xX]][[eE]]@@'`
- export INCLUDE=`cygpath -d "$COMPATH/../Include"`
+ COMPATH=`echo $CC | $SED 's@\/[[Bb]][[Ii]][[Nn]]\/[[cC]][[lL]]\.[[eE]][[xX]][[eE]]@@'`
+ export INCLUDE=`cygpath -d "$COMPATH/Include"`
dnl Check which Microsoft C/C++ compiler is found
AC_MSG_CHECKING([the Version of Microsoft C/C++ Compiler])
dnl The following find microsoft, matches nn.nn.nnnn then pulls numbers out.
@@ -2220,7 +2221,7 @@ _ACEOF
if test -e "$MINGW_CLIB_DIR/libgcc_s.a"; then
AC_MSG_CHECKING([dynamic libgcc name])
MINGW_GCCDLL_pattern=`nm $MINGW_CLIB_DIR/libgcc_s.a | sed -ne 's@.* _libgcc\(.*\)_dll_iname@libgcc\1.dll@p' | uniq | sed -e 's@_@?@g'`
- MINGW_GCCDLL=`cd $COMPATH && ls $MINGW_GCCDLL_pattern 2>/dev/null`
+ MINGW_GCCDLL=`cd $COMPATH/bin && ls $MINGW_GCCDLL_pattern 2>/dev/null`
if test -n "$MINGW_GCCDLL"; then
MINGW_SHARED_GCCLIB=YES
AC_MSG_RESULT([use $MINGW_GCCDLL])
@@ -2237,7 +2238,7 @@ _ACEOF
if test -e "$MINGW_CLIB_DIR/libstdc++_s.a" ; then
AC_MSG_CHECKING([dynamic libstdc++ name])
MINGW_GXXDLL_pattern=`nm $MINGW_CLIB_DIR/libstdc++_s.a | sed -ne 's@.* _libstdc__\(.*\)_dll_iname@libstdc++\1.dll@p' | uniq | sed -e 's@_@?@g'`
- MINGW_GXXDLL=`cd $COMPATH && ls $MINGW_GXXDLL_pattern 2>/dev/null`
+ MINGW_GXXDLL=`cd $COMPATH/bin && ls $MINGW_GXXDLL_pattern 2>/dev/null`
if test -n "$MINGW_GXXDLL"; then
MINGW_SHARED_GXXLIB=YES
AC_MSG_RESULT([use $MINGW_GXXDLL])
@@ -2977,7 +2978,7 @@ if test "$SOLAR_JAVA" != ""; then
AC_MSG_RESULT([checked (ecj)])
#TODO: what's to do here? some switch to do 1.5 compiling?
JAVAFLAGS="-source 1.5 -target 1.5"
- _gij_longver="50000"
+ _gij_longver="40200"
fi
fi
@@ -3032,7 +3033,7 @@ fi
if test "$SOLAR_JAVA" != ""; then
dnl first check if we have been asked to autodetect JAVA_HOME with a recent gij
if test "$JDK" == "gcj" -a -z "$JAVA_HOME"; then
- if test "x$with_jdk_home" = "x" -a "$_gij_longver" -ge "50000"; then
+ if test "x$with_jdk_home" = "x" -a "$_gij_longver" -ge "40200"; then
cat > findhome.java <<_ACEOF
[import java.io.File;
@@ -3072,7 +3073,7 @@ _ACEOF
fi
dnl second sanity check JAVA_HOME if possible
- if test "$JDK" != "gcj" -o "$_gij_longver" -ge "50000"; then
+ if test "$JDK" != "gcj" -o "$_gij_longver" -ge "40200"; then
# check if JAVA_HOME was (maybe incorrectly?) set automatically to /usr
if test "$JAVA_HOME" = "/usr" -a "x$with_jdk_home" = "x"; then
@@ -3852,25 +3853,14 @@ if test -n "$with_system_db" -o -n "$with_system_libs" && \
], []
)
AC_MSG_CHECKING([whether db is at least 4.1])
- for v in `seq 1 7`; do
- AC_TRY_RUN([
+ AC_TRY_RUN([
#include <db.h>
int main(int argc, char **argv) {
- if(DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == $v) return 0;
+ if(DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)) return 0;
else return 1;
}
- ], [DB_VERSION_MINOR=$v], [])
- done
- if test "$DB_VERSION_MINOR" -gt "1"; then
- AC_MSG_RESULT([OK])
- DB_VERSION=4.$DB_VERSION_MINOR
- else
- AC_MSG_ERROR([no. you need at least db 4.1])
- fi
- # does not work :/
- #AC_CHECK_LIB(db, db_create, [],
- # [AC_MSG_ERROR([db library not installed or functional])], [])
+ ], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR([no. you need at least db 4.1])])
AC_HAVE_LIBRARY(db, [],
[AC_MSG_ERROR([db not installed or functional])], [])
SCPDEFS="$SCPDEFS -DSYSTEM_DB"
@@ -4689,7 +4679,8 @@ if test "$_os" != "WINNT" -a "$_os" != "OS2" -a "$_os" != "Darwin"; then
[#include <X11/Intrinsic.h>])
else
AC_MSG_RESULT([yes])
- AC_CHECK_HEADERS(X11/Xaw/Label.h,[],[AC_MSG_ERROR([Xaw include headers not found])])
+ AC_CHECK_HEADERS(X11/Xaw/Label.h,[],[AC_MSG_ERROR([Xaw include headers not found])],
+ [#include <X11/Intrinsic.h>])
AC_CHECK_LIB(Xaw, main, [],
[AC_MSG_ERROR(Xaw library not found or functional)], [])
fi
@@ -5418,8 +5409,8 @@ if test "$_os" = "WINNT"; then
if test -x ./external/msi/instmsia.exe -a -x ./external/msi/instmsiw.exe; then
AC_MSG_RESULT([found])
else
- MSIAPATH=`/bin/find "$COMPATH/../.." -iname instmsia.exe | head -n 1`
- MSIWPATH=`/bin/find "$COMPATH/../.." -iname instmsiw.exe | head -n 1`
+ MSIAPATH=`/bin/find "$COMPATH/.." -iname instmsia.exe | head -n 1`
+ MSIWPATH=`/bin/find "$COMPATH/.." -iname instmsiw.exe | head -n 1`
if test -n "$MSIAPATH" -a -n "$MSIWPATH"; then
cp "$MSIAPATH" ./external/msi/ && chmod +x ./external/msi/instmsia.exe && MSIACOPY="OK"
cp "$MSIWPATH" ./external/msi/ && chmod +x ./external/msi/instmsiw.exe && MSIWCOPY="OK"
@@ -5936,37 +5927,74 @@ AC_SUBST(LIBSERIALIZER_JAR)
if test "$ENABLE_MEDIAWIKI" = "YES" -o "$ENABLE_REPORTBUILDER" = "YES"; then
AC_MSG_CHECKING([which Apache commons-* libs to use])
if test "$with_system_apache_commons" = "yes"; then
- SYSTEM_APACHE_COMMONS=YES
- AC_MSG_RESULT([external])
+ SYSTEM_APACHE_COMMONS=YES
+ AC_MSG_RESULT([external])
if test "$ENABLE_MEDIAWIKI" = "YES"; then
- if test -z "$COMMONS_CODEC_JAR"; then
- COMMONS_CODEC_JAR=/usr/share/java/commons-codec-1.3.jar
- fi
- AC_CHECK_FILE($COMMONS_CODEC_JAR, [],
- [AC_MSG_ERROR(commons-codec.jar not found.)], [])
- if test -z "$COMMONS_LANG_JAR"; then
- COMMONS_LANG_JAR=/usr/share/java/commons-lang-2.3.jar
- fi
- AC_CHECK_FILE($COMMONS_LANG_JAR, [],
- [AC_MSG_ERROR(commons-lang.jar not found.)], [])
- if test -z "$COMMONS_HTTPCLIENT_JAR"; then
- COMMONS_HTTPCLIENT_JAR=/usr/share/java/commons-httpclient-3.1.jar
- fi
- AC_CHECK_FILE($COMMONS_HTTPCLIENT_JAR, [],
- [AC_MSG_ERROR(commons-httpclient.jar not found.)], [])
+ if test -z $COMMONS_CODEC_JAR; then
+ AC_CHECK_FILE(/usr/share/java/commons-codec-1.3.jar,
+ [ COMMONS_CODEC_JAR=/usr/share/java/commons-codec-1.3.jar ],
+ [
+ AC_CHECK_FILE(/usr/share/java/commons-codec.jar,
+ [ COMMONS_CODEC_JAR=/usr/share/java/commons-codecs.jar ],
+ [AC_MSG_ERROR(commons-codec.jar replacement not found.)]
+ )
+ ]
+ )
+ else
+ AC_CHECK_FILE($COMMONS_CODEC_JAR, [],
+ [AC_MSG_ERROR(commons-codec.jar not found.)], [])
+ fi
+
+ if test -z $COMMONS_LANG_JAR; then
+ AC_CHECK_FILE(/usr/share/java/commons-lang-2.3.jar,
+ [ COMMONS_LANG_JAR=/usr/share/java/commons-lang-2.3.jar ],
+ [
+ AC_CHECK_FILE(/usr/share/java/commons-lang.jar,
+ [ COMMONS_LANG_JAR=/usr/share/java/commons-lang.jar ],
+ [AC_MSG_ERROR(commons-lang.jar replacement not found.)]
+ )
+ ]
+ )
+ else
+ AC_CHECK_FILE($COMMONS_LANG_JAR, [],
+ [AC_MSG_ERROR(commons-lang.jar not found.)], [])
+ fi
+
+ if test -z $COMMONS_HTTPCLIENT_JAR; then
+ AC_CHECK_FILE(/usr/share/java/commons-httpclient-3.1.jar,
+ [ COMMONS_HTTPCLIENT_JAR=/usr/share/java/commons-httpclient-3.1.jar ],
+ [
+ AC_CHECK_FILE(/usr/share/java/commons-httpclient.jar,
+ [ COMMONS_HTTPCLIENT_JAR=/usr/share/java/commons-httpclient.jar ],
+ [AC_MSG_ERROR(commons-httpclient.jar replacement not found.)]
+ )
+ ]
+ )
+ else
+ AC_CHECK_FILE($COMMONS_HTTPCLIENT_JAR, [],
+ [AC_MSG_ERROR(commons-httpclient.jar not found.)], [])
+ fi
fi
if test "$ENABLE_MEDIAWIKI" = "YES" -o "$ENABLE_REPORTBUILDER" = "YES"; then
- if test -z "$COMMONS_LOGGING_JAR"; then
- COMMONS_LOGGING_JAR=/usr/share/java/commons-logging-1.1.1.jar
- fi
- AC_CHECK_FILE($COMMONS_LOGGING_JAR, [],
- [AC_MSG_ERROR(commons-logging.jar not found.)], [])
-
+ if test -z $COMMONS_LOGGING_JAR; then
+ AC_CHECK_FILE(/usr/share/java/commons-logging-1.1.1.jar,
+ [ COMMONS_LOGGING_JAR=/usr/share/java/commons-logging-1.1.1.jar ],
+ [
+ AC_CHECK_FILE(/usr/share/java/commons-logging.jar,
+ [ COMMONS_LOGGING_JAR=/usr/share/java/commons-logging.jar ],
+ [AC_MSG_ERROR(commons-logging.jar replacement not found.)]
+ )
+ ]
+ )
+ else
+ AC_CHECK_FILE($COMMONS_LOGGING_JAR, [],
+ [AC_MSG_ERROR(commons-logging.jar not found.)], [])
+ fi
fi
else
- AC_MSG_RESULT([internal])
- SYSTEM_APACHE_COMMONS=NO
- BUILD_TYPE="$BUILD_TYPE APACHE_COMMONS TOMCAT"
+ AC_MSG_RESULT([internal])
+ SYSTEM_APACHE_COMMONS=NO
+ BUILD_TYPE="$BUILD_TYPE APACHE_COMMONS TOMCAT"
fi
fi
AC_SUBST(SYSTEM_APACHE_COMMONS)
diff --git a/connectivity/prj/build.lst b/connectivity/prj/build.lst
index 20cb27644e29..87e1791ba72e 100644
--- a/connectivity/prj/build.lst
+++ b/connectivity/prj/build.lst
@@ -1,4 +1,4 @@
-cn connectivity : l10n comphelper MOZ:moz SO:moz_prebuilt svtools UNIXODBC:unixODBC unoil javaunohelper HSQLDB:hsqldb QADEVOOO:qadevOOo officecfg NSS:nss NULL
+cn connectivity : shell l10n comphelper MOZ:moz SO:moz_prebuilt svl UNIXODBC:unixODBC unoil javaunohelper HSQLDB:hsqldb QADEVOOO:qadevOOo officecfg NSS:nss NULL
cn connectivity usr1 - all cn_mkout NULL
cn connectivity\inc nmake - all cn_inc NULL
cn connectivity\com\sun\star\sdbcx\comp\hsqldb nmake - all cn_jhsqldbdb cn_hsqldb cn_inc NULL
diff --git a/connectivity/source/commontools/formattedcolumnvalue.cxx b/connectivity/source/commontools/formattedcolumnvalue.cxx
index 76519aa6a551..e1b49c878ba9 100644
--- a/connectivity/source/commontools/formattedcolumnvalue.cxx
+++ b/connectivity/source/commontools/formattedcolumnvalue.cxx
@@ -44,7 +44,7 @@
#include <com/sun/star/sdbc/DataType.hpp>
/** === end UNO includes === **/
-#include <svtools/syslocale.hxx>
+//#include <unotools/syslocale.hxx>
#include <tools/diagnose_ex.h>
diff --git a/connectivity/source/drivers/calc/CConnection.cxx b/connectivity/source/drivers/calc/CConnection.cxx
index 77467dda0bc3..cfcd8b83761b 100644
--- a/connectivity/source/drivers/calc/CConnection.cxx
+++ b/connectivity/source/drivers/calc/CConnection.cxx
@@ -46,7 +46,7 @@
#include <tools/urlobj.hxx>
#include "calc/CPreparedStatement.hxx"
#include "calc/CStatement.hxx"
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
#include <connectivity/dbexception.hxx>
#include <cppuhelper/exc_hlp.hxx>
#include <rtl/logfile.hxx>
diff --git a/connectivity/source/drivers/calc/CTable.cxx b/connectivity/source/drivers/calc/CTable.cxx
index 91f917224496..ba6d20ac70f5 100644
--- a/connectivity/source/drivers/calc/CTable.cxx
+++ b/connectivity/source/drivers/calc/CTable.cxx
@@ -50,7 +50,7 @@
#include <com/sun/star/util/NumberFormat.hpp>
#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
#include <com/sun/star/text/XText.hpp>
-#include <svtools/converter.hxx>
+#include <svl/converter.hxx>
#include "calc/CConnection.hxx"
#include "calc/CColumns.hxx"
#include "connectivity/sdbcx/VColumn.hxx"
@@ -58,7 +58,7 @@
#include <osl/thread.h>
#include <tools/config.hxx>
#include <comphelper/sequence.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
#include <rtl/math.hxx>
#include <comphelper/extract.hxx>
#include <connectivity/dbexception.hxx>
diff --git a/connectivity/source/drivers/calc/makefile.mk b/connectivity/source/drivers/calc/makefile.mk
index 620bcd6a8eee..f4019564ed30 100644
--- a/connectivity/source/drivers/calc/makefile.mk
+++ b/connectivity/source/drivers/calc/makefile.mk
@@ -73,6 +73,7 @@ SHL1STDLIBS=\
$(VOSLIB) \
$(SVLLIB) \
$(TOOLSLIB) \
+ $(UNOTOOLSLIB) \
$(SALLIB) \
$(DBTOOLSLIB) \
$(DBFILELIB) \
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index 1db81262e120..e93671441969 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -35,7 +35,7 @@
#include <com/sun/star/sdbc/DataType.hpp>
#include <com/sun/star/ucb/XContentAccess.hpp>
#include <com/sun/star/sdbc/XRow.hpp>
-#include <svtools/converter.hxx>
+#include <svl/converter.hxx>
#include "dbase/DConnection.hxx"
#include "dbase/DColumns.hxx"
#include <osl/thread.h>
@@ -44,8 +44,8 @@
#include "dbase/DIndexes.hxx"
//#include "file/FDriver.hxx"
#include <comphelper/sequence.hxx>
-#include <svtools/zforlist.hxx>
-#include <svtools/syslocale.hxx>
+#include <svl/zforlist.hxx>
+#include <unotools/syslocale.hxx>
#include <rtl/math.hxx>
#include <stdio.h> //sprintf
#include <ucbhelper/content.hxx>
diff --git a/connectivity/source/drivers/evoab/LFolderList.cxx b/connectivity/source/drivers/evoab/LFolderList.cxx
index a3c031c05c05..5f71303d7e28 100644
--- a/connectivity/source/drivers/evoab/LFolderList.cxx
+++ b/connectivity/source/drivers/evoab/LFolderList.cxx
@@ -36,13 +36,13 @@
#include "LFolderList.hxx"
#include <com/sun/star/sdbc/ColumnValue.hpp>
#include <com/sun/star/sdbc/DataType.hpp>
-#include <svtools/converter.hxx>
+#include <svl/converter.hxx>
#include "LConnection.hxx"
#include "LColumns.hxx"
#include <osl/thread.h>
#include <tools/config.hxx>
#include <comphelper/sequence.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
#include <rtl/math.hxx>
#include <stdio.h> //sprintf
#include <comphelper/extract.hxx>
@@ -59,7 +59,7 @@
#ifndef CONNECTIVITY_EVOAB_DEBUG_HELPER_HXX
#include "LDebug.hxx"
#endif
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
using namespace ::comphelper;
using namespace connectivity;
diff --git a/connectivity/source/drivers/evoab/LTable.cxx b/connectivity/source/drivers/evoab/LTable.cxx
index cbb4bc53e9f4..3d72e1a3946f 100644
--- a/connectivity/source/drivers/evoab/LTable.cxx
+++ b/connectivity/source/drivers/evoab/LTable.cxx
@@ -39,13 +39,13 @@
#ifndef _COM_SUN_STAR_SQLC_XROW_HPP_
//#include <com/sun/star/sdbc/XRow.hpp>
#endif
-#include <svtools/converter.hxx>
+#include <svl/converter.hxx>
#include "LConnection.hxx"
#include "LColumns.hxx"
#include <osl/thread.h>
#include <tools/config.hxx>
#include <comphelper/sequence.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
#include <rtl/math.hxx>
#include <stdio.h> //sprintf
#include <comphelper/extract.hxx>
@@ -56,7 +56,7 @@
#include <i18npool/mslangid.hxx>
#include "connectivity/dbconversion.hxx"
#include <comphelper/types.hxx>
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
#ifndef CONNECTIVITY_EVOAB_DEBUG_HELPER_HXX
#include "LDebug.hxx"
#endif
diff --git a/connectivity/source/drivers/evoab2/NResultSet.cxx b/connectivity/source/drivers/evoab2/NResultSet.cxx
index d71908e0afd8..c8cda89b503c 100644
--- a/connectivity/source/drivers/evoab2/NResultSet.cxx
+++ b/connectivity/source/drivers/evoab2/NResultSet.cxx
@@ -54,7 +54,7 @@
#include <cppuhelper/typeprovider.hxx>
#include <rtl/string.hxx>
#include <tools/diagnose_ex.h>
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
#include <unotools/intlwrapper.hxx>
#include <cstring>
diff --git a/connectivity/source/drivers/evoab2/makefile.mk b/connectivity/source/drivers/evoab2/makefile.mk
index e9bb9fdc4d70..6d7ca92fbdd6 100644
--- a/connectivity/source/drivers/evoab2/makefile.mk
+++ b/connectivity/source/drivers/evoab2/makefile.mk
@@ -77,9 +77,7 @@ SHL1STDLIBS=\
$(CPPUHELPERLIB) \
$(VOSLIB) \
$(SVLLIB) \
- $(VCLLIB) \
$(TOOLSLIB) \
- $(SVTOOLLIB) \
$(UNOTOOLSLIB) \
$(UCBHELPERLIB) \
$(SALLIB) \
diff --git a/connectivity/source/drivers/file/FConnection.cxx b/connectivity/source/drivers/file/FConnection.cxx
index 52d14e6498cb..caa117037bcf 100644
--- a/connectivity/source/drivers/file/FConnection.cxx
+++ b/connectivity/source/drivers/file/FConnection.cxx
@@ -44,7 +44,7 @@
#include <com/sun/star/ucb/XContentIdentifier.hpp>
#include <tools/urlobj.hxx>
#include "file/FCatalog.hxx"
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
#include <ucbhelper/content.hxx>
#include <connectivity/dbcharset.hxx>
#include <connectivity/dbexception.hxx>
diff --git a/connectivity/source/drivers/file/fcode.cxx b/connectivity/source/drivers/file/fcode.cxx
index 4b2865a67aa2..5f967758c125 100644
--- a/connectivity/source/drivers/file/fcode.cxx
+++ b/connectivity/source/drivers/file/fcode.cxx
@@ -34,8 +34,8 @@
#include <osl/diagnose.h>
#include "connectivity/sqlparse.hxx"
#include <i18npool/mslangid.hxx>
-#include <vcl/svapp.hxx>
#include <tools/debug.hxx>
+#include <tools/string.hxx>
#include "TConnection.hxx"
#include <com/sun/star/sdb/SQLFilterOperator.hpp>
#include <comphelper/types.hxx>
diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx
index fa4f281ea794..149925d06451 100644
--- a/connectivity/source/drivers/flat/ETable.cxx
+++ b/connectivity/source/drivers/flat/ETable.cxx
@@ -36,13 +36,13 @@
#include <com/sun/star/sdbc/ColumnValue.hpp>
#include <com/sun/star/sdbc/DataType.hpp>
#include <com/sun/star/ucb/XContentAccess.hpp>
-#include <svtools/converter.hxx>
+#include <svl/converter.hxx>
#include "flat/EConnection.hxx"
#include "flat/EColumns.hxx"
#include <osl/thread.h>
#include <tools/config.hxx>
#include <comphelper/sequence.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
#include <rtl/math.hxx>
#include <stdio.h> //sprintf
#include <comphelper/extract.hxx>
@@ -54,7 +54,7 @@
#include "connectivity/dbconversion.hxx"
#include <comphelper/types.hxx>
#include "file/quotedstring.hxx"
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
#include <rtl/logfile.hxx>
using namespace ::comphelper;
diff --git a/connectivity/source/drivers/flat/makefile.mk b/connectivity/source/drivers/flat/makefile.mk
index d044eab2796a..071c8c0cc976 100644
--- a/connectivity/source/drivers/flat/makefile.mk
+++ b/connectivity/source/drivers/flat/makefile.mk
@@ -84,7 +84,7 @@ SHL1STDLIBS=\
$(CPPUHELPERLIB) \
$(VOSLIB) \
$(TOOLSLIB) \
- $(SVTOOLLIB) \
+ $(SVLLIB) \
$(UNOTOOLSLIB) \
$(SALLIB) \
$(DBTOOLSLIB) \
diff --git a/connectivity/source/drivers/kab/KConnection.cxx b/connectivity/source/drivers/kab/KConnection.cxx
index 1df3315f559d..356d43822be4 100644
--- a/connectivity/source/drivers/kab/KConnection.cxx
+++ b/connectivity/source/drivers/kab/KConnection.cxx
@@ -39,7 +39,7 @@
#include "KCatalog.hxx"
#include <com/sun/star/sdbc/ColumnValue.hpp>
#include <com/sun/star/sdbc/TransactionIsolation.hpp>
-#include <vcl/kde_headers.h>
+#include <shell/kde_headers.h>
using namespace connectivity::kab;
using namespace com::sun::star::uno;
diff --git a/connectivity/source/drivers/kab/KDEInit.cxx b/connectivity/source/drivers/kab/KDEInit.cxx
index 3e7c69166b1b..2736cb5c6fbc 100644
--- a/connectivity/source/drivers/kab/KDEInit.cxx
+++ b/connectivity/source/drivers/kab/KDEInit.cxx
@@ -33,7 +33,7 @@
#include "KDEInit.h"
#include <osl/diagnose.h>
#include <osl/process.h>
-#include <vcl/kde_headers.h>
+#include <shell/kde_headers.h>
namespace connectivity
{
diff --git a/connectivity/source/drivers/kab/KDatabaseMetaData.cxx b/connectivity/source/drivers/kab/KDatabaseMetaData.cxx
index c210b52ec4bc..127c70cb4207 100644
--- a/connectivity/source/drivers/kab/KDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/kab/KDatabaseMetaData.cxx
@@ -34,7 +34,7 @@
#include "KDatabaseMetaData.hxx"
#include "kfields.hxx"
#include "KDEInit.h"
-#include <vcl/kde_headers.h>
+#include <shell/kde_headers.h>
#include "FDatabaseMetaDataResultSet.hxx"
#include "OTypeInfo.hxx"
#include <com/sun/star/sdbc/ColumnValue.hpp>
diff --git a/connectivity/source/drivers/kab/KResultSet.hxx b/connectivity/source/drivers/kab/KResultSet.hxx
index 72b1e618be28..51321b106042 100644
--- a/connectivity/source/drivers/kab/KResultSet.hxx
+++ b/connectivity/source/drivers/kab/KResultSet.hxx
@@ -33,7 +33,7 @@
#include "KStatement.hxx"
#include "KResultSetMetaData.hxx"
-#include <vcl/kde_headers.h>
+#include <shell/kde_headers.h>
#include <com/sun/star/sdbc/XRow.hpp>
#include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp>
#include <com/sun/star/sdbc/XColumnLocate.hpp>
diff --git a/connectivity/source/drivers/kab/kcondition.hxx b/connectivity/source/drivers/kab/kcondition.hxx
index bb219fcf443b..0621eef7fb8b 100644
--- a/connectivity/source/drivers/kab/kcondition.hxx
+++ b/connectivity/source/drivers/kab/kcondition.hxx
@@ -34,7 +34,7 @@
#ifndef _COMPHELPER_TYPES_H_
#include <comphelper/types.hxx>
#endif
-#include <vcl/kde_headers.h>
+#include <shell/kde_headers.h>
#include <connectivity/dbexception.hxx>
namespace connectivity
diff --git a/connectivity/source/drivers/kab/kfields.hxx b/connectivity/source/drivers/kab/kfields.hxx
index d6f8622398b4..e73660ad7858 100644
--- a/connectivity/source/drivers/kab/kfields.hxx
+++ b/connectivity/source/drivers/kab/kfields.hxx
@@ -31,7 +31,7 @@
#ifndef _CONNECTIVITY_KAB_FIELDS_HXX_
#define _CONNECTIVITY_KAB_FIELDS_HXX_
-#include <vcl/kde_headers.h>
+#include <shell/kde_headers.h>
#include <connectivity/dbexception.hxx>
#include <rtl/ustring.hxx>
diff --git a/connectivity/source/drivers/kab/korder.hxx b/connectivity/source/drivers/kab/korder.hxx
index 41a280050c06..dd93066074bf 100644
--- a/connectivity/source/drivers/kab/korder.hxx
+++ b/connectivity/source/drivers/kab/korder.hxx
@@ -32,7 +32,7 @@
#define _CONNECTIVITY_KAB_ORDER_HXX_
#include "rtl/ustring.hxx"
-#include <vcl/kde_headers.h>
+#include <shell/kde_headers.h>
#include <vector>
diff --git a/cppu/qa/makefile.mk b/cppu/qa/makefile.mk
index 4051dd6d82ec..8b720c832cf4 100644
--- a/cppu/qa/makefile.mk
+++ b/cppu/qa/makefile.mk
@@ -1,7 +1,7 @@
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+#
# Copyright 2008 by Sun Microsystems, Inc.
#
# OpenOffice.org - a multi-platform office productivity suite
@@ -43,28 +43,28 @@ INCPRE += $(MISC)$/$(TARGET)$/inc
SHL1TARGET = $(TARGET)_any
SHL1OBJS = $(SLO)$/test_any.obj
-SHL1STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(SALLIB)
+SHL1STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(TESTSHL2LIB) $(SALLIB)
SHL1VERSIONMAP = version.map
SHL1IMPLIB = i$(SHL1TARGET)
DEF1NAME = $(SHL1TARGET)
SHL2TARGET = $(TARGET)_unotype
SHL2OBJS = $(SLO)$/test_unotype.obj
-SHL2STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(SALLIB)
+SHL2STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(TESTSHL2LIB) $(SALLIB)
SHL2VERSIONMAP = version.map
SHL2IMPLIB = i$(SHL2TARGET)
DEF2NAME = $(SHL2TARGET)
SHL3TARGET = $(TARGET)_reference
SHL3OBJS = $(SLO)$/test_reference.obj
-SHL3STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(SALLIB)
+SHL3STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(TESTSHL2LIB) $(SALLIB)
SHL3VERSIONMAP = version.map
SHL3IMPLIB = i$(SHL3TARGET)
DEF3NAME = $(SHL3TARGET)
SHL4TARGET = $(TARGET)_recursion
SHL4OBJS = $(SLO)$/test_recursion.obj
-SHL4STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(SALLIB)
+SHL4STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(TESTSHL2LIB) $(SALLIB)
SHL4VERSIONMAP = version.map
SHL4IMPLIB = i$(SHL4TARGET)
DEF4NAME = $(SHL4TARGET)
@@ -92,7 +92,7 @@ $(MISC)$/$(TARGET)$/types.urd: types.idl
$(IDLC) -O$(MISC)$/$(TARGET) -I$(SOLARIDLDIR) -cid -we $<
test .PHONY: $(SHL1TARGETN) $(SHL2TARGETN) $(SHL3TARGETN) $(SHL4TARGETN)
- testshl2 $(SHL1TARGETN)
- testshl2 $(SHL2TARGETN)
- testshl2 $(SHL3TARGETN)
- testshl2 $(SHL4TARGETN) \ No newline at end of file
+ $(TESTSHL2) $(SHL1TARGETN)
+ $(TESTSHL2) $(SHL2TARGETN)
+ $(TESTSHL2) $(SHL3TARGETN)
+ $(TESTSHL2) $(SHL4TARGETN)
diff --git a/cppu/qa/test_any.cxx b/cppu/qa/test_any.cxx
index cad91661926f..785af529e51a 100644
--- a/cppu/qa/test_any.cxx
+++ b/cppu/qa/test_any.cxx
@@ -58,7 +58,7 @@
#include "com/sun/star/uno/Sequence.hxx"
#include "com/sun/star/uno/Type.hxx"
#include "com/sun/star/uno/XInterface.hpp"
-#include "cppunit/simpleheader.hxx"
+#include "testshl/simpleheader.hxx"
#include "osl/diagnose.h"
#include "osl/interlck.h"
#include "rtl/string.h"
diff --git a/cppu/qa/test_recursion.cxx b/cppu/qa/test_recursion.cxx
index 6ae70c44d003..60853776662b 100644
--- a/cppu/qa/test_recursion.cxx
+++ b/cppu/qa/test_recursion.cxx
@@ -31,7 +31,7 @@
#include "precompiled_cppu.hxx"
#include "sal/config.h"
-#include "cppunit/simpleheader.hxx"
+#include "testshl/simpleheader.hxx"
#include "sal/types.h"
#include "Rec.hpp"
diff --git a/cppu/qa/test_reference.cxx b/cppu/qa/test_reference.cxx
index afb12654a124..8bb793c655e4 100644
--- a/cppu/qa/test_reference.cxx
+++ b/cppu/qa/test_reference.cxx
@@ -35,7 +35,7 @@
#include "Interface1.hpp"
-#include "cppunit/simpleheader.hxx"
+#include "testshl/simpleheader.hxx"
#include "rtl/ustring.hxx"
#include "sal/types.h"
diff --git a/cppu/qa/test_unotype.cxx b/cppu/qa/test_unotype.cxx
index 0068dcedd463..ad457d516fa2 100644
--- a/cppu/qa/test_unotype.cxx
+++ b/cppu/qa/test_unotype.cxx
@@ -47,7 +47,7 @@
#include "com/sun/star/uno/XComponentContext.hpp"
#include "com/sun/star/uno/XInterface.hpp"
#include "cppu/unotype.hxx"
-#include "cppunit/simpleheader.hxx"
+#include "testshl/simpleheader.hxx"
#include "rtl/ustring.h"
#include "rtl/ustring.hxx"
#include "sal/types.h"
diff --git a/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx b/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx
index ddbc3f7c6f82..cfcfebf246e6 100644
--- a/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx
+++ b/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx
@@ -28,7 +28,7 @@
*
************************************************************************/
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
#include "com/sun/star/lang/XEventListener.hpp"
#include "cppuhelper/interfacecontainer.hxx"
diff --git a/cppuhelper/qa/ifcontainer/makefile.mk b/cppuhelper/qa/ifcontainer/makefile.mk
index dd6c13fea52c..624bc797a64b 100644
--- a/cppuhelper/qa/ifcontainer/makefile.mk
+++ b/cppuhelper/qa/ifcontainer/makefile.mk
@@ -1,7 +1,7 @@
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+#
# Copyright 2008 by Sun Microsystems, Inc.
#
# OpenOffice.org - a multi-platform office productivity suite
@@ -41,7 +41,7 @@ ENABLE_EXCEPTIONS=TRUE
# BEGIN ----------------------------------------------------------------
-# auto generated Target:joblist by codegen.pl
+# auto generated Target:joblist by codegen.pl
SHL1OBJS= \
$(SLO)$/cppu_ifcontainer.obj
SHL1TARGET= cppu_ifcontainer
@@ -49,6 +49,7 @@ SHL1STDLIBS=\
$(CPPUHELPERLIB) \
$(SALLIB) \
$(CPPULIB) \
+ $(TESTSHL2LIB)\
$(CPPUNITLIB)
SHL1IMPLIB= i$(SHL1TARGET)
DEF1NAME =$(SHL1TARGET)
diff --git a/cppuhelper/qa/propertysetmixin/makefile.mk b/cppuhelper/qa/propertysetmixin/makefile.mk
index b081274d8e99..2ad56c05ff1c 100644
--- a/cppuhelper/qa/propertysetmixin/makefile.mk
+++ b/cppuhelper/qa/propertysetmixin/makefile.mk
@@ -1,7 +1,7 @@
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+#
# Copyright 2008 by Sun Microsystems, Inc.
#
# OpenOffice.org - a multi-platform office productivity suite
@@ -54,7 +54,7 @@ INCPRE += -I$(MISC)$/$(TARGET)$/inc
SHL1TARGET = $(TARGET)
SHL1OBJS = $(SLO)$/test_propertysetmixin.obj
-SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(CPPUNITLIB) $(SALLIB)
+SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(CPPUNITLIB) $(SALLIB) $(TESTSHL2LIB)
SHL1IMPLIB = i$(SHL1TARGET)
DEF1NAME = $(SHL1TARGET)
diff --git a/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx b/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx
index 5336b60ae68a..ecb7220d110d 100644
--- a/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx
+++ b/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx
@@ -64,7 +64,7 @@
#include "com/sun/star/uno/XComponentContext.hpp"
#include "cppuhelper/implbase1.hxx"
#include "cppuhelper/servicefactory.hxx"
-#include "cppunit/simpleheader.hxx"
+#include "testshl/simpleheader.hxx"
#include "osl/mutex.hxx"
#include "osl/thread.h"
#include "rtl/ref.hxx"
diff --git a/cppuhelper/qa/unourl/cppu_unourl.cxx b/cppuhelper/qa/unourl/cppu_unourl.cxx
index 21af4b8d1364..f80388d5d122 100644
--- a/cppuhelper/qa/unourl/cppu_unourl.cxx
+++ b/cppuhelper/qa/unourl/cppu_unourl.cxx
@@ -28,7 +28,7 @@
*
************************************************************************/
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
#include "cppuhelper/unourl.hxx"
#include "rtl/malformeduriexception.hxx"
diff --git a/cppuhelper/qa/unourl/makefile.mk b/cppuhelper/qa/unourl/makefile.mk
index a611b135c7e9..a999532c5b4a 100644
--- a/cppuhelper/qa/unourl/makefile.mk
+++ b/cppuhelper/qa/unourl/makefile.mk
@@ -1,7 +1,7 @@
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+#
# Copyright 2008 by Sun Microsystems, Inc.
#
# OpenOffice.org - a multi-platform office productivity suite
@@ -41,7 +41,7 @@ ENABLE_EXCEPTIONS=TRUE
# BEGIN ----------------------------------------------------------------
-# auto generated Target:joblist by codegen.pl
+# auto generated Target:joblist by codegen.pl
SHL1OBJS= \
$(SLO)$/cppu_unourl.obj
SHL1TARGET= cppu_unourl
@@ -49,6 +49,7 @@ SHL1STDLIBS=\
$(CPPUHELPERLIB) \
$(SALLIB) \
$(CPPULIB) \
+ $(TESTSHL2LIB)\
$(CPPUNITLIB)
SHL1IMPLIB= i$(SHL1TARGET)
DEF1NAME =$(SHL1TARGET)
diff --git a/cppuhelper/qa/weak/makefile.mk b/cppuhelper/qa/weak/makefile.mk
index 95f1697ef7be..bb0072b4d0f3 100644
--- a/cppuhelper/qa/weak/makefile.mk
+++ b/cppuhelper/qa/weak/makefile.mk
@@ -1,7 +1,7 @@
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+#
# Copyright 2008 by Sun Microsystems, Inc.
#
# OpenOffice.org - a multi-platform office productivity suite
@@ -41,7 +41,7 @@ DLLPRE = # no leading "lib" on .so files
SHL1TARGET = $(TARGET)
SHL1OBJS = $(SLO)$/test_weak.obj
-SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(CPPUNITLIB) $(SALLIB)
+SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(CPPUNITLIB) $(SALLIB) $(TESTSHL2LIB)
SHL1VERSIONMAP = version.map
SHL1IMPLIB = i$(SHL1TARGET)
DEF1NAME = $(SHL1TARGET)
@@ -53,4 +53,4 @@ SLOFILES = $(SHL1OBJS)
ALLTAR: test
test .PHONY: $(SHL1TARGETN)
- testshl2 $(SHL1TARGETN)
+ $(TESTSHL2) $(SHL1TARGETN)
diff --git a/cppuhelper/qa/weak/test_weak.cxx b/cppuhelper/qa/weak/test_weak.cxx
index 98bbb6527276..0cf128d519d6 100644
--- a/cppuhelper/qa/weak/test_weak.cxx
+++ b/cppuhelper/qa/weak/test_weak.cxx
@@ -41,7 +41,7 @@
#include "com/sun/star/uno/XWeak.hpp"
#include "cppuhelper/implbase1.hxx"
#include "cppuhelper/weak.hxx"
-#include "cppunit/simpleheader.hxx"
+#include "testshl/simpleheader.hxx"
#include "rtl/ref.hxx"
#include "sal/types.h"
diff --git a/cppuhelper/source/interfacecontainer.cxx b/cppuhelper/source/interfacecontainer.cxx
index 88f25e192e49..cc5b7708f1d8 100644
--- a/cppuhelper/source/interfacecontainer.cxx
+++ b/cppuhelper/source/interfacecontainer.cxx
@@ -40,13 +40,6 @@
#include <hash_map>
-#if OSL_DEBUG_LEVEL == 0
-# ifndef NDEBUG
-# define NDEBUG
-# endif
-#endif
-#include <assert.h>
-
#include <com/sun/star/lang/XEventListener.hpp>
diff --git a/cppuhelper/test/testidlclass.cxx b/cppuhelper/test/testidlclass.cxx
index 8784f59d79e3..89b2d6411e77 100644
--- a/cppuhelper/test/testidlclass.cxx
+++ b/cppuhelper/test/testidlclass.cxx
@@ -30,11 +30,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_cppuhelper.hxx"
-#if OSL_DEBUG_LEVEL == 0
-#undef NDEBUG
-#define NDEBUG
-#endif
-#include <assert.h>
#include <cppuhelper/stdidlclass.hxx>
@@ -65,18 +60,18 @@ void testidlclass( const Reference < XMultiServiceFactory > &rSMgr)
(XServiceInfo * ) 0
);
- assert( r.is() );
+ OSL_ASSERT( r.is() );
{ // test the xidlclassprovider interface !
Reference< XIdlClassProvider > rProv( r , UNO_QUERY );
- assert( rProv.is() );
+ OSL_ASSERT( rProv.is() );
{
Sequence < Reference < XIdlClass > > seq = rProv->getIdlClasses();
// is always one
- assert( seq.getLength() == 1 );
+ OSL_ASSERT( seq.getLength() == 1 );
// test the weak reference
rProv->getIdlClasses();
@@ -89,7 +84,7 @@ void testidlclass( const Reference < XMultiServiceFactory > &rSMgr)
}
- assert( r->getName() == sImplName );
+ OSL_ASSERT( r->getName() == sImplName );
// test equals
Reference < XIdlClass > r2 =
@@ -101,18 +96,18 @@ void testidlclass( const Reference < XMultiServiceFactory > &rSMgr)
(XServiceInfo * ) 0
);
// test for implementation name
- assert( r2->equals( r ) );
+ OSL_ASSERT( r2->equals( r ) );
Sequence < Reference < XIdlClass > > seqIdlClass = r->getInterfaces();
//TODO !
// one idl class for one interface
// this test fails, if core reflection fails !
-// assert( 1 == seqIdlClass.getLength() );
+// OSL_ASSERT( 1 == seqIdlClass.getLength() );
// Reference < XIdlClass > rIdlInterface = seqIdlClass.getArray()[0];
// check for IdlClass interface returned by Core Reflection
-// assert( rIdlInterface.is() );
+// OSL_ASSERT( rIdlInterface.is() );
diff --git a/cppuhelper/test/testproptyphlp.cxx b/cppuhelper/test/testproptyphlp.cxx
index e798f86cab54..d3b17ed3e83a 100644
--- a/cppuhelper/test/testproptyphlp.cxx
+++ b/cppuhelper/test/testproptyphlp.cxx
@@ -34,12 +34,6 @@
#include <com/sun/star/beans/Property.hpp>
-#if OSL_DEBUG_LEVEL == 0
-#undef NDEBUG
-#define NDEBUG
-#endif
-#include <assert.h>
-
using namespace ::com::sun::star::uno;
using namespace ::cppu;
@@ -51,27 +45,27 @@ void testPropertyTypeHelper()
sal_Int32 i;
convertPropertyValue( i , a );
- assert( 25 == i );
+ OSL_ASSERT( 25 == i );
sal_Int16 i16;
convertPropertyValue( i16 , a );
- assert( 25 == i16 );
+ OSL_ASSERT( 25 == i16 );
sal_Int8 i8;
convertPropertyValue( i8 , a );
- assert( 25 == i8 );
+ OSL_ASSERT( 25 == i8 );
sal_uInt32 i32;
convertPropertyValue( i32 , a );
- assert( 25 == i32 );
+ OSL_ASSERT( 25 == i32 );
double d;
convertPropertyValue( d , a );
- assert( 25. == d );
+ OSL_ASSERT( 25. == d );
float f;
convertPropertyValue( f , a );
- assert( 25. == f );
+ OSL_ASSERT( 25. == f );
::com::sun::star::beans::Property prop;
@@ -83,11 +77,11 @@ void testPropertyTypeHelper()
::com::sun::star::beans::Property prop2;
convertPropertyValue( prop2 , a );
- assert( prop.Handle == prop2.Handle && prop.Name == prop2.Name && prop.Attributes == prop2.Attributes );
+ OSL_ASSERT( prop.Handle == prop2.Handle && prop.Name == prop2.Name && prop.Attributes == prop2.Attributes );
::rtl::OUString ow;
a <<= prop.Name;
convertPropertyValue( ow , a );
- assert( ow == prop.Name );
+ OSL_ASSERT( ow == prop.Name );
}
diff --git a/cppunit/cppunit-1.8.0-r1.patch b/cppunit/cppunit-1.8.0-r1.patch
index 426051d6288d..b632c03596a8 100644
--- a/cppunit/cppunit-1.8.0-r1.patch
+++ b/cppunit/cppunit-1.8.0-r1.patch
@@ -1,12 +1,12 @@
--- misc/cppunit-1.8.0/AUTHORS 2002-03-26 09:29:58.000000000 +0100
-+++ misc/build/cppunit-1.8.0/AUTHORS 2008-12-09 08:01:30.000000000 +0100
++++ misc/build/cppunit-1.8.0/AUTHORS 2009-09-12 14:15:35.015625000 +0200
@@ -5,3 +5,4 @@
Baptiste Lepilleur <gaiacrtn@free.fr> <blep@sourceforge.net>
Bastiaan Bakker <bastiaan.bakker@lifeline.nl>
Steve Robbins <smr99@sourceforge.net>
+Lars Langhans <lla@openoffice.org>
--- misc/cppunit-1.8.0/ChangeLog 2002-04-11 11:53:02.000000000 +0200
-+++ misc/build/cppunit-1.8.0/ChangeLog 2008-12-09 08:08:42.000000000 +0100
++++ misc/build/cppunit-1.8.0/ChangeLog 2009-09-12 14:15:35.031250000 +0200
@@ -1,3 +1,9 @@
+2008-12-09 Lars Langhans <lla@openoffice.org>
+ * create with some source files a new library
@@ -18,7 +18,7 @@
* doc/FAQ: removed question about the Exception::operator =() problem.
--- misc/cppunit-1.8.0/INSTALL 2001-07-06 19:48:28.000000000 +0200
-+++ misc/build/cppunit-1.8.0/INSTALL 2008-12-09 09:39:09.000000000 +0100
++++ misc/build/cppunit-1.8.0/INSTALL 2009-09-12 14:15:35.062500000 +0200
@@ -1,6 +1,12 @@
Basic Installation
==================
@@ -33,15 +33,15 @@
The `configure' shell script attempts to guess correct values for
--- misc/cppunit-1.8.0/include/cppunit/Asserter.h 2002-03-28 16:47:07.000000000 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/Asserter.h 2008-02-27 17:09:30.000000000 +0100
-@@ -4,6 +4,7 @@
- #include <cppunit/Portability.h>
++++ misc/build/cppunit-1.8.0/include/cppunit/Asserter.h 2009-09-12 14:15:35.078125000 +0200
+@@ -5,6 +5,7 @@
#include <cppunit/SourceLine.h>
#include <string>
-+#include <rtl/ustring.hxx>
++
namespace CppUnit
{
+
@@ -44,8 +45,8 @@
/*! Throws a Exception with the specified message and location.
@@ -65,7 +65,7 @@
+
+ // LLA: test, if it's possible to use a DEFINE twice ;-)
+ void CPPUNIT_API failIf( bool shouldFail,
-+ rtl::OUString const& message,
++ const char* message,
+ SourceLine const& sourceLine = SourceLine() );
/*! Throws a NotEqualException with the specified message and location.
@@ -109,7 +109,7 @@
} // namespace Asserter
} // namespace CppUnit
--- misc/cppunit-1.8.0/include/cppunit/Exception.h 2002-03-28 16:47:07.000000000 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/Exception.h 2008-02-27 17:10:36.000000000 +0100
++++ misc/build/cppunit-1.8.0/include/cppunit/Exception.h 2009-09-12 14:15:35.093750000 +0200
@@ -21,7 +21,7 @@
class Type
{
@@ -180,7 +180,7 @@
} // namespace CppUnit
--- misc/cppunit-1.8.0/include/cppunit/NotEqualException.h 2002-03-28 16:47:07.000000000 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/NotEqualException.h 2008-02-27 17:11:12.000000000 +0100
++++ misc/build/cppunit-1.8.0/include/cppunit/NotEqualException.h 2009-09-12 14:15:35.093750000 +0200
@@ -19,16 +19,16 @@
* \param additionalMessage Additionnal information provided to further qualify
* the inequality.
@@ -206,30 +206,47 @@
NotEqualException( const NotEqualException &other );
--- misc/cppunit-1.8.0/include/cppunit/Portability.h 2002-03-25 19:41:39.000000000 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/Portability.h 2008-02-27 17:12:24.000000000 +0100
-@@ -3,11 +3,11 @@
-
- /* include platform specific config */
- #if defined(__BORLANDC__)
--# include <cppunit/config-bcb5.h>
-+# include <cppunit/portability/config-bcb5.h>
- #elif defined (_MSC_VER)
--# include <cppunit/config-msvc6.h>
-+# include <cppunit/portability/config-msvc6.h>
- #else
--# include <cppunit/config-auto.h>
-+# include <cppunit/portability/config-auto.h>
++++ misc/build/cppunit-1.8.0/include/cppunit/Portability.h 2009-09-12 14:15:35.109375000 +0200
+@@ -28,7 +28,7 @@
+ #define CPPUNIT_ENABLE_CU_TEST_MACROS 0
#endif
-
+-/* Define to 1 if the preprocessor expands (#foo) to "foo" (quotes incl.)
++/* Define to 1 if the preprocessor expands (#foo) to "foo" (quotes incl.)
+ I don't think there is any C preprocess that does NOT support this! */
+ #ifndef CPPUNIT_HAVE_CPP_SOURCE_ANNOTATION
+ #define CPPUNIT_HAVE_CPP_SOURCE_ANNOTATION 1
+@@ -51,11 +51,11 @@
+ #if CPPUNIT_HAVE_SSTREAM
+ # include <sstream>
+ namespace CppUnit {
+- class OStringStream : public std::ostringstream
++ class OStringStream : public std::ostringstream
+ {
+ };
+ }
+-#else
++#else
+ #if CPPUNIT_HAVE_CLASS_STRSTREAM
+ # include <string>
+ # if CPPUNIT_HAVE_STRSTREAM
+@@ -65,7 +65,7 @@
+ # endif
+
+ namespace CppUnit {
+- class OStringStream : public std::ostrstream
++ class OStringStream : public std::ostrstream
+ {
+ public:
+ std::string str()
--- misc/cppunit-1.8.0/include/cppunit/Test.h 2002-03-28 16:47:07.000000000 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/Test.h 2008-02-27 17:09:20.000000000 +0100
-@@ -3,14 +3,15 @@
-
++++ misc/build/cppunit-1.8.0/include/cppunit/Test.h 2009-09-12 14:15:35.125000000 +0200
+@@ -4,13 +4,15 @@
#include <cppunit/Portability.h>
#include <string>
-+#include <cppunit/autoregister/htestresult.h>
++typedef void* hTestResult;
++
namespace CppUnit {
-class TestResult;
@@ -242,7 +259,7 @@
* All test objects should be a subclass of Test. Some test objects,
* TestCase for example, represent one individual test. Other test
* objects, such as TestSuite, are comprised of several tests.
-@@ -27,7 +28,7 @@
+@@ -27,7 +29,7 @@
/*! \brief Run the test, collecting results.
*/
@@ -252,13 +269,12 @@
/*! \brief Return the number of test cases invoked by run().
*
--- misc/cppunit-1.8.0/include/cppunit/TestAssert.h 2002-04-04 17:39:37.000000000 +0200
-+++ misc/build/cppunit-1.8.0/include/cppunit/TestAssert.h 2008-02-27 17:12:12.000000000 +0100
-@@ -5,9 +5,12 @@
++++ misc/build/cppunit-1.8.0/include/cppunit/TestAssert.h 2009-09-12 14:15:35.156250000 +0200
+@@ -5,9 +5,10 @@
#include <cppunit/Exception.h>
#include <cppunit/Asserter.h>
-+#include <cppunit/checkboom.hxx>
-
+-
namespace CppUnit {
+
@@ -266,7 +282,7 @@
/*! \brief Traits used by CPPUNIT_ASSERT_EQUAL().
*
* Here is an example of specialization of that traits:
-@@ -31,83 +34,83 @@
+@@ -31,83 +32,83 @@
* };
* \endcode
*/
@@ -419,7 +435,7 @@
/* A set of macros which allow us to get the line number
* and file name at the point of an error.
-@@ -118,15 +121,22 @@
+@@ -118,15 +119,22 @@
/** Assertions that a condition is \c true.
* \ingroup Assertions
*/
@@ -450,7 +466,7 @@
#endif
/** Assertion with a user specified message.
-@@ -136,25 +146,33 @@
+@@ -136,25 +144,33 @@
* \param condition If this condition evaluates to \c false then the
* test failed.
*/
@@ -493,7 +509,7 @@
#else
/** Asserts that two values are equals.
* \ingroup Assertions
-@@ -173,9 +191,9 @@
+@@ -173,9 +189,9 @@
* removed by specializing the CppUnit::assertion_traits.
*/
#define CPPUNIT_ASSERT_EQUAL(expected,actual) \
@@ -506,7 +522,7 @@
/** Asserts that two values are equals, provides additional messafe on failure.
* \ingroup Assertions
-@@ -196,20 +214,20 @@
+@@ -196,20 +212,20 @@
* removed by specializing the CppUnit::assertion_traits.
*/
#define CPPUNIT_ASSERT_EQUAL_MESSAGE(message,expected,actual) \
@@ -535,7 +551,7 @@
// Backwards compatibility
-@@ -223,7 +241,6 @@
+@@ -223,7 +239,6 @@
#endif
@@ -544,7 +560,7 @@
#endif // CPPUNIT_TESTASSERT_H
--- misc/cppunit-1.8.0/include/cppunit/TestCaller.h 2002-03-28 16:47:07.000000000 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/TestCaller.h 2008-02-27 17:09:40.000000000 +0100
++++ misc/build/cppunit-1.8.0/include/cppunit/TestCaller.h 2009-09-12 14:15:35.171875000 +0200
@@ -111,7 +111,7 @@
* \param name name of this TestCaller
* \param test the method this TestCaller calls in runTest()
@@ -573,17 +589,16 @@
m_ownFixture( true ),
m_fixture( fixture ),
--- misc/cppunit-1.8.0/include/cppunit/TestCase.h 2002-03-27 18:56:45.000000000 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/TestCase.h 2008-02-27 17:11:00.000000000 +0100
-@@ -3,15 +3,13 @@
++++ misc/build/cppunit-1.8.0/include/cppunit/TestCase.h 2009-09-12 14:15:35.187500000 +0200
+@@ -3,15 +3,12 @@
#include <cppunit/Portability.h>
#include <cppunit/Test.h>
-#include <cppunit/TestAssert.h>
#include <cppunit/TestFixture.h>
#include <string>
--
-+#include <cppunit/autoregister/htestresult.h>
+-
namespace CppUnit {
-class TestResult;
@@ -592,7 +607,7 @@
/*! \brief A single test object.
*
-@@ -28,25 +26,25 @@
+@@ -28,25 +25,25 @@
{
public:
@@ -623,7 +638,7 @@
private:
TestCase( const TestCase &other );
--- misc/cppunit-1.8.0/include/cppunit/TestFailure.h 2002-03-28 16:47:07.000000000 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/TestFailure.h 2008-02-27 17:09:50.000000000 +0100
++++ misc/build/cppunit-1.8.0/include/cppunit/TestFailure.h 2009-09-12 14:15:35.187500000 +0200
@@ -4,6 +4,16 @@
#include <cppunit/Portability.h>
#include <string>
@@ -674,7 +689,7 @@
private:
TestFailure( const TestFailure &other );
--- misc/cppunit-1.8.0/include/cppunit/TestFixture.h 2002-03-28 16:47:07.000000000 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/TestFixture.h 2008-02-27 17:10:26.000000000 +0100
++++ misc/build/cppunit-1.8.0/include/cppunit/TestFixture.h 2009-09-12 14:15:35.203125000 +0200
@@ -74,11 +74,6 @@
* }
* \endcode
@@ -688,8 +703,8 @@
class CPPUNIT_API TestFixture
{
--- misc/cppunit-1.8.0/include/cppunit/TestSuite.h 2002-03-28 16:47:07.000000000 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/TestSuite.h 2008-02-27 17:11:24.000000000 +0100
-@@ -4,17 +4,20 @@
++++ misc/build/cppunit-1.8.0/include/cppunit/TestSuite.h 2009-09-12 14:15:35.218750000 +0200
+@@ -4,9 +4,11 @@
#include <cppunit/Portability.h>
#if CPPUNIT_NEED_DLL_DECL
@@ -701,8 +716,7 @@
#include <cppunit/Test.h>
#include <vector>
- #include <string>
-+#include <cppunit/autoregister/htestresult.h>
+@@ -14,7 +16,7 @@
namespace CppUnit {
@@ -711,7 +725,7 @@
#if CPPUNIT_NEED_DLL_DECL
template class CPPUNIT_API std::vector<Test *>;
-@@ -35,7 +38,6 @@
+@@ -35,7 +37,6 @@
* Note that TestSuites assume lifetime
* control for any tests added to them.
*
@@ -719,7 +733,7 @@
* \see Test
* \see TestCaller
*/
-@@ -44,10 +46,10 @@
+@@ -44,10 +45,10 @@
class CPPUNIT_API TestSuite : public Test
{
public:
@@ -732,7 +746,7 @@
int countTestCases() const;
std::string getName() const;
std::string toString() const;
-@@ -71,7 +73,9 @@
+@@ -71,7 +72,9 @@
#if CPPUNIT_NEED_DLL_DECL
@@ -742,75 +756,9 @@
+#endif
#endif // CPPUNIT_TESTSUITE_H
---- misc/cppunit-1.8.0/include/cppunit/additionalfunc.hxx 2008-12-10 20:46:05.823290260 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/additionalfunc.hxx 2008-07-14 07:25:14.000000000 +0200
-@@ -1 +1,61 @@
--dummy
-+#ifndef ADDITIONALFUNC_HXX
-+#define ADDITIONALFUNC_HXX
-+
-+#include "cppunit/autoregister/registertestfunction.h"
-+#include "sal/types.h"
-+
-+extern "C" void SAL_CALL RegisterAdditionalFunctions(FktRegFuncPtr _pFunc);
-+
-+#define NOADDITIONAL \
-+void RegisterAdditionalFunctions(FktRegFuncPtr){}
-+
-+namespace {
-+
-+enum T2_OSType {
-+ T2_OS_WNT32 = 1,
-+ T2_OS_UNIX,
-+ T2_OS_OS2
-+};
-+
-+inline T2_OSType getOSType()
-+{
-+#if defined WNT
-+ return T2_OS_WNT32;
-+#elif defined OS2
-+ return T2_OS_OS2;
-+#else
-+ return T2_OS_UNIX;
-+#endif
-+}
-+
-+}
-+
-+#define TESTSHL2_UNO_BOOTSTRAP(file) \
-+void RegisterAdditionalFunctions(FktRegFuncPtr _pFunc) \
-+{ \
-+ com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory> xMS; \
-+ com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > xComponentContext; \
-+ try { \
-+ if (strlen(#file) > 0) { \
-+ ::rtl::OUString iniFile(rtl::OUString::createFromAscii(#file)); \
-+ if (getOSType() == T2_OS_WNT32 || getOSType() == T2_OS_OS2) { \
-+ iniFile += ::rtl::OUString::createFromAscii(".ini"); \
-+ } else { \
-+ iniFile += ::rtl::OUString::createFromAscii("rc"); \
-+ } \
-+ xComponentContext = cppu::defaultBootstrap_InitialComponentContext(iniFile); \
-+ } else { \
-+ xComponentContext = cppu::defaultBootstrap_InitialComponentContext(); \
-+ } \
-+ xMS.set(xComponentContext->getServiceManager(), com::sun::star::uno::UNO_QUERY); \
-+ comphelper::setProcessServiceFactory(xMS); \
-+ } \
-+ catch (::com::sun::star::uno::Exception e ) { \
-+ rtl::OString aError; \
-+ aError = rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_ASCII_US); \
-+ printf("Error at UNO bootstrap time caught: %s\nMust quit.\n", aError.getStr()); \
-+ exit(1); \
-+ } \
-+}
-+
-+#endif
-Nur in misc/build/cppunit-1.8.0/include/cppunit: additionalfunc.hxx.dummy.
---- misc/cppunit-1.8.0/include/cppunit/autoregister/callbackfunc_fktptr.h 2008-12-10 20:46:05.931077489 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/autoregister/callbackfunc_fktptr.h 2008-07-14 07:25:14.000000000 +0200
-@@ -1 +1,63 @@
+--- misc/cppunit-1.8.0/include/cppunit/callbackfunc_fktptr.h 2009-09-14 08:43:30.656250000 +0200
++++ misc/build/cppunit-1.8.0/include/cppunit/callbackfunc_fktptr.h 2009-09-12 15:11:06.859375000 +0200
+@@ -1 +1,50 @@
-dummy
+/*************************************************************************
+ *
@@ -845,8 +793,6 @@ Nur in misc/build/cppunit-1.8.0/include/cppunit: additionalfunc.hxx.dummy.
+#ifndef _callbackfunc_fktptr_h
+#define _callbackfunc_fktptr_h
+
-+#include <sal/types.h>
-+
+#ifdef __cplusplus
+extern "C" {
+#endif
@@ -857,400 +803,99 @@ Nur in misc/build/cppunit-1.8.0/include/cppunit: additionalfunc.hxx.dummy.
+typedef void* hTest;
+typedef void* hException;
+
-+typedef sal_Int32 (* FktPtr_CallbackDispatch)(int x, ...);
-+
-+//# typedef void (* FktPtr_TestResult_startTest)(hTestResult, hTest );
-+//# typedef void (* FktPtr_TestResult_addFailure)( hTestResult, hTest , hException pException );
-+//# typedef void (* FktPtr_TestResult_addError)( hTestResult, hTest , hException pException );
-+//# typedef void (* FktPtr_TestResult_endTest)( hTestResult, hTest );
-+//# typedef bool (* FktPtr_TestResult_shouldStop)(hTestResult);
-+//#
-+//# // Additional functions
-+//# typedef void (* FktPtr_TestResult_addInfo)( hTestResult, hTest, const char* );
-+//# typedef void (* FktPtr_TestResult_enterNode)( hTestResult, const char* );
-+//# typedef void (* FktPtr_TestResult_leaveNode)( hTestResult, const char* );
++typedef long (* FktPtr_CallbackDispatch)(int x, ...);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
-Nur in misc/build/cppunit-1.8.0/include/cppunit/autoregister: callbackfunc_fktptr.h.dummy.
---- misc/cppunit-1.8.0/include/cppunit/autoregister/callbackstructure.h 2008-12-10 20:46:06.013912039 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/autoregister/callbackstructure.h 2008-07-14 07:25:14.000000000 +0200
-@@ -1 +1,89 @@
+--- misc/cppunit-1.8.0/include/cppunit/config-auto.h 2009-09-12 15:20:48.250000000 +0200
++++ misc/build/cppunit-1.8.0/include/cppunit/config-auto.h 2009-09-12 14:15:35.234375000 +0200
+@@ -1 +1,64 @@
-dummy
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org. If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+#ifndef _callbackstructure_h
-+#define _callbackstructure_h
-+
-+#include <sal/types.h>
-+#include <cppunit/autoregister/callbackfunc_fktptr.h>
-+#include <cppunit/autoregister/registerfunc.h>
-+#include <cppunit/autoregister/registertestfunction.h>
-+#include <cppunit/cmdlinebits.hxx>
-+
-+// this structure will filled by the testshl tool and hand to the testdll
-+
-+struct CallbackStructure
-+{
-+ // a version number, if we want to change/expand this struct
-+ sal_Int32 nVersion;
-+ sal_Int64 nMagic;
-+
-+ FktRegFuncPtr aRegisterFunction;
-+
-+ FktPtr_CallbackDispatch aCallbackDispatch;
-+
-+ //# FktPtr_TestResult_startTest aStartTest;
-+ //# FktPtr_TestResult_addFailure aAddFailure;
-+ //# FktPtr_TestResult_addError aAddError;
-+ //# FktPtr_TestResult_endTest aEndTest;
-+ //# FktPtr_TestResult_shouldStop aShouldStop;
-+ //#
-+ //# FktPtr_TestResult_addInfo aAddInfo;
-+ //# FktPtr_TestResult_enterNode aEnterNode;
-+ //# FktPtr_TestResult_leaveNode aLeaveNode;
-+
-+ const char* psForward;
-+ CmdLineBits nBits;
-+
-+ // void* pJobList;
-+
-+ sal_Int64 nMagic2;
-+
-+ CallbackStructure()
-+ :nVersion(1),
-+ nMagic(SAL_CONST_INT64(0x0123456789abcdef)),
-+ aRegisterFunction(NULL),
-+ aCallbackDispatch(NULL),
-+ /* aStartTest(NULL),
-+ aAddFailure(NULL),
-+ aAddError(NULL),
-+ aEndTest(NULL),
-+ aShouldStop(NULL),
-+ aAddInfo(NULL),
-+ aEnterNode(NULL),
-+ aLeaveNode(NULL), */
-+ psForward(NULL),
-+ nBits(0),
-+ /* pJobList(NULL), */
-+ nMagic2(0)
-+ {}
-+};
++#ifndef _INCLUDE_CPPUNIT_CONFIG_AUTO_H
++#define _INCLUDE_CPPUNIT_CONFIG_AUTO_H 1
++
++/* include/cppunit/config-auto.h. Generated automatically at end of configure. */
++/* config/config.h. Generated automatically by configure. */
++/* config/config.h.in. Generated automatically from configure.in by autoheader. */
+
++/* define if library uses std::string::compare(string,pos,n) */
++#ifndef CPPUNIT_FUNC_STRING_COMPARE_STRING_FIRST
++#define CPPUNIT_FUNC_STRING_COMPARE_STRING_FIRST 1
+#endif
-Nur in misc/build/cppunit-1.8.0/include/cppunit/autoregister: callbackstructure.h.dummy.
---- misc/cppunit-1.8.0/include/cppunit/autoregister/htestresult.h 2008-12-10 20:46:06.090738039 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/autoregister/htestresult.h 2008-02-27 17:17:34.000000000 +0100
-@@ -1 +1,6 @@
--dummy
-+#ifndef _htestresult_h
-+#define _htestresult_h
-+
-+typedef void* hTestResult;
+
++/* define if the library defines sstream */
++#ifndef CPPUNIT_HAVE_SSTREAM
++#define CPPUNIT_HAVE_SSTREAM 1
+#endif
-Nur in misc/build/cppunit-1.8.0/include/cppunit/autoregister: htestresult.h.dummy.
---- misc/cppunit-1.8.0/include/cppunit/autoregister/registerfunc.h 2008-12-10 20:46:06.135034318 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/autoregister/registerfunc.h 2008-07-14 07:25:14.000000000 +0200
-@@ -1 +1,50 @@
--dummy
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org. If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+#ifndef _registerfunc_h
-+#define _registerfunc_h
-+
-+#include <sal/types.h>
-+#include <cppunit/autoregister/htestresult.h>
-+#include <cppunit/autoregister/callbackfunc_fktptr.h>
-+#include <cppunit/autoregister/testfunc.h>
-+
-+struct CallbackStructure;
-+
-+// this function is used to register one function into a Container in the testshl tool.
-+extern "C" void SAL_CALL registerFunction(FktPtr aFunc, const char* aFuncName);
-+
-+// this function is the register function for auto registering
-+
-+extern "C" void SAL_CALL registerAllTestFunction(CallbackStructure* );
-+typedef void (* FktRegAllPtr)(CallbackStructure*);
-+
+
++/* Define if you have the <cmath> header file. */
++#ifndef CPPUNIT_HAVE_CMATH
++#define CPPUNIT_HAVE_CMATH 1
+#endif
-Nur in misc/build/cppunit-1.8.0/include/cppunit/autoregister: registerfunc.h.dummy.
---- misc/cppunit-1.8.0/include/cppunit/autoregister/registertestfunction.h 2008-12-10 20:46:06.214882818 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/autoregister/registertestfunction.h 2008-07-14 07:25:14.000000000 +0200
-@@ -1 +1,54 @@
--dummy
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org. If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+#ifndef _registertestfunction_h
-+#define _registertestfunction_h
-+
-+#include <sal/types.h>
-+#include <cppunit/autoregister/testfunc.h>
+
-+#ifdef __cplusplus
-+extern "C" {
++/* Define if you have the <dlfcn.h> header file. */
++#ifndef CPPUNIT_HAVE_DLFCN_H
++#define CPPUNIT_HAVE_DLFCN_H 1
+#endif
-+
-+// function ptr, to register a function
-+typedef void (* FktRegFuncPtr)(FktPtr aFunc, const char* aFuncName);
-+
-+// this function is used in the testdll to register the given function
-+// into the testshl
-+extern "C" void SAL_CALL RegisterTestFunctions(FktRegFuncPtr aFunc);
+
-+#ifdef __cplusplus
-+}
++/* define to 1 if the compiler implements namespaces */
++#ifndef CPPUNIT_HAVE_NAMESPACES
++#define CPPUNIT_HAVE_NAMESPACES 1
+#endif
+
++/* define if the compiler supports Run-Time Type Identification */
++#ifndef CPPUNIT_HAVE_RTTI
++#define CPPUNIT_HAVE_RTTI 0
+#endif
+
-+
-Nur in misc/build/cppunit-1.8.0/include/cppunit/autoregister: registertestfunction.h.dummy.
---- misc/cppunit-1.8.0/include/cppunit/autoregister/testfunc.h 2008-12-10 20:46:06.292344601 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/autoregister/testfunc.h 2008-07-14 07:25:14.000000000 +0200
-@@ -1 +1,47 @@
--dummy
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org. If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+#ifndef _testfunc_h
-+#define _testfunc_h
-+
-+#include <cppunit/autoregister/htestresult.h>
-+
-+#ifdef __cplusplus
-+extern "C" {
++/* define if the compiler has stringstream */
++#ifndef CPPUNIT_HAVE_SSTREAM
++#define CPPUNIT_HAVE_SSTREAM 1
+#endif
-+
-+// typedef for a testfunction
-+typedef void (* FktPtr)(hTestResult);
+
-+#ifdef __cplusplus
-+}
++/* Define if you have the <strstream> header file. */
++#ifndef CPPUNIT_HAVE_STRSTREAM
++#define CPPUNIT_HAVE_STRSTREAM 1
+#endif
+
++/* Name of package */
++#ifndef CPPUNIT_PACKAGE
++#define CPPUNIT_PACKAGE "cppunit"
+#endif
-Nur in misc/build/cppunit-1.8.0/include/cppunit/autoregister: testfunc.h.dummy.
---- misc/cppunit-1.8.0/include/cppunit/checkboom.hxx 2008-12-10 20:46:06.371034174 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/checkboom.hxx 2008-07-14 07:25:14.000000000 +0200
-@@ -1 +1,40 @@
--dummy
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org. If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+#ifndef CHECKBOOM_HXX
-+#define CHECKBOOM_HXX
-+
-+#include <string>
-+#include <rtl/ustring.hxx>
-+
-+void CheckBoom(bool bCondition, std::string const& msg);
-+void CheckBoom(bool bCondition, rtl::OUString const& msg);
+
++/* Define to 1 to use type_info::name() for class names */
++#ifndef CPPUNIT_USE_TYPEINFO_NAME
++#define CPPUNIT_USE_TYPEINFO_NAME CPPUNIT_HAVE_RTTI
+#endif
-Nur in misc/build/cppunit-1.8.0/include/cppunit: checkboom.hxx.dummy.
---- misc/cppunit-1.8.0/include/cppunit/cmdlinebits.hxx 2008-12-10 20:46:06.465888459 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/cmdlinebits.hxx 2008-07-14 07:25:14.000000000 +0200
-@@ -1 +1,52 @@
--dummy
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org. If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+#ifndef CMDLINEBITS_HXX
-+#define CMDLINEBITS_HXX
-+
-+#include <sal/types.h>
-+
-+typedef sal_uInt32 CmdLineBits;
-+const char* getForwardString();
-+
-+#include <stdarg.h>
-+
-+enum T_Print_Params {
-+ T_INFO = 1,
-+ T_VERBOSE,
-+ T_DEBUG,
-+ T_ERROR
-+};
-+
-+// void t_print(const char*);
-+void t_print(const char*, ...);
-+void t_print(T_Print_Params, const char*, ...);
+
++/* Version number of package */
++#ifndef CPPUNIT_VERSION
++#define CPPUNIT_VERSION "1.8.0"
++#endif
++
++/* _INCLUDE_CPPUNIT_CONFIG_AUTO_H */
+#endif
-Nur in misc/build/cppunit-1.8.0/include/cppunit: cmdlinebits.hxx.dummy.
+--- misc/cppunit-1.8.0/include/cppunit/config-msvc6.h 2002-03-25 19:41:39.000000000 +0100
++++ misc/build/cppunit-1.8.0/include/cppunit/config-msvc6.h 2009-09-12 14:15:35.250000000 +0200
+@@ -21,12 +21,10 @@
+ #define CPPUNIT_HAVE_NAMESPACES 1
+ #endif
+
+-/* define if the compiler supports Run-Time Type Identification */
+ #ifndef CPPUNIT_HAVE_RTTI
+-#define CPPUNIT_HAVE_RTTI 1
++#define CPPUNIT_HAVE_RTTI 0
+ #endif
+
+-/* Define to 1 to use type_info::name() for class names */
+ #ifndef CPPUNIT_USE_TYPEINFO_NAME
+ #define CPPUNIT_USE_TYPEINFO_NAME CPPUNIT_HAVE_RTTI
+ #endif
--- misc/cppunit-1.8.0/include/cppunit/extensions/AutoRegisterSuite.h 2002-03-28 16:47:07.000000000 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/extensions/AutoRegisterSuite.h 2008-02-27 17:16:16.000000000 +0100
++++ misc/build/cppunit-1.8.0/include/cppunit/extensions/AutoRegisterSuite.h 2009-09-12 14:15:35.265625000 +0200
@@ -1,6 +1,7 @@
#ifndef CPPUNIT_EXTENSIONS_AUTOREGISTERSUITE_H
#define CPPUNIT_EXTENSIONS_AUTOREGISTERSUITE_H
@@ -1290,7 +935,7 @@ Nur in misc/build/cppunit-1.8.0/include/cppunit: cmdlinebits.hxx.dummy.
} // namespace CppUnit
--- misc/cppunit-1.8.0/include/cppunit/extensions/HelperMacros.h 2002-03-28 16:47:07.000000000 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/extensions/HelperMacros.h 2008-02-27 17:17:12.000000000 +0100
++++ misc/build/cppunit-1.8.0/include/cppunit/extensions/HelperMacros.h 2009-09-12 14:15:35.281250000 +0200
@@ -132,6 +132,14 @@
} \
}; \
@@ -1361,8 +1006,8 @@ Nur in misc/build/cppunit-1.8.0/include/cppunit: cmdlinebits.hxx.dummy.
#endif // CPPUNIT_EXTENSIONS_HELPERMACROS_H
--- misc/cppunit-1.8.0/include/cppunit/extensions/TestFactoryRegistry.h 2002-03-28 16:47:07.000000000 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/extensions/TestFactoryRegistry.h 2008-02-27 17:16:38.000000000 +0100
-@@ -4,14 +4,18 @@
++++ misc/build/cppunit-1.8.0/include/cppunit/extensions/TestFactoryRegistry.h 2009-09-12 14:15:35.296875000 +0200
+@@ -4,13 +4,16 @@
#include <cppunit/Portability.h>
#if CPPUNIT_NEED_DLL_DECL
@@ -1375,13 +1020,11 @@ Nur in misc/build/cppunit-1.8.0/include/cppunit: cmdlinebits.hxx.dummy.
#include <cppunit/extensions/TestFactory.h>
#include <map>
#include <string>
++#include <cppunit/Test.h>
-+#include <cppunit/autoregister/htestresult.h>
-+
namespace CppUnit {
- class TestSuite;
-@@ -79,7 +83,7 @@
+@@ -79,7 +82,7 @@
* \param name Name of the registry. It is the name of TestSuite returned by
* makeTest().
*/
@@ -1390,7 +1033,7 @@ Nur in misc/build/cppunit-1.8.0/include/cppunit: cmdlinebits.hxx.dummy.
/// Destructor.
virtual ~TestFactoryRegistry();
-@@ -105,6 +109,7 @@
+@@ -105,6 +108,7 @@
* specified name.
*/
static TestFactoryRegistry &getRegistry( const std::string &name );
@@ -1398,7 +1041,7 @@ Nur in misc/build/cppunit-1.8.0/include/cppunit: cmdlinebits.hxx.dummy.
/** Adds the registered tests to the specified suite.
* \param suite Suite the tests are added to.
-@@ -116,9 +121,12 @@
+@@ -116,9 +120,12 @@
* \param factory Factory to register.
* \deprecated Use registerFactory( TestFactory *) instead.
*/
@@ -1412,7 +1055,7 @@ Nur in misc/build/cppunit-1.8.0/include/cppunit: cmdlinebits.hxx.dummy.
/** Adds the specified TestFactory to the registry.
*
* \param factory Factory to register.
-@@ -141,8 +149,10 @@
+@@ -141,8 +148,10 @@
#if CPPUNIT_NEED_DLL_DECL
@@ -1424,7 +1067,7 @@ Nur in misc/build/cppunit-1.8.0/include/cppunit: cmdlinebits.hxx.dummy.
#endif // CPPUNIT_EXTENSIONS_TESTFACTORYREGISTRY_H
--- misc/cppunit-1.8.0/include/cppunit/extensions/TestSuiteBuilder.h 2002-03-28 16:47:07.000000000 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/extensions/TestSuiteBuilder.h 2008-02-27 17:17:22.000000000 +0100
++++ misc/build/cppunit-1.8.0/include/cppunit/extensions/TestSuiteBuilder.h 2009-09-12 14:15:35.312500000 +0200
@@ -34,11 +34,11 @@
}
#endif
@@ -1476,9 +1119,9 @@ Nur in misc/build/cppunit-1.8.0/include/cppunit: cmdlinebits.hxx.dummy.
}
private:
---- misc/cppunit-1.8.0/include/cppunit/externcallbackfunc.hxx 2008-12-10 20:46:06.550085206 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/externcallbackfunc.hxx 2008-07-14 07:25:14.000000000 +0200
-@@ -1 +1,58 @@
+--- misc/cppunit-1.8.0/include/cppunit/externcallbackfunc.hxx 2009-09-14 08:43:30.703125000 +0200
++++ misc/build/cppunit-1.8.0/include/cppunit/externcallbackfunc.hxx 2009-09-12 15:12:02.703125000 +0200
+@@ -1 +1,39 @@
-dummy
+/*************************************************************************
+ *
@@ -1513,1478 +1156,15 @@ Nur in misc/build/cppunit-1.8.0/include/cppunit: cmdlinebits.hxx.dummy.
+#ifndef _externcallbackfunc_hxx
+#define _externcallbackfunc_hxx
+
-+#include <cppunit/autoregister/callbackfunc_fktptr.h>
++#include <cppunit/callbackfunc_fktptr.h>
+
+// these pointers have they origin in 'tresregister.cxx'
+extern FktPtr_CallbackDispatch pCallbackFunc;
+
-+//# extern FktPtr_TestResult_startTest pTestResult_StartTest;
-+//# extern FktPtr_TestResult_addFailure pTestResult_AddFailure;
-+//# extern FktPtr_TestResult_addError pTestResult_AddError;
-+//# extern FktPtr_TestResult_endTest pTestResult_EndTest;
-+//# extern FktPtr_TestResult_addInfo pTestResult_AddInfo;
-+
-+// these pointers have they origin in 'tresregister.cxx'
-+// extern FktPtr_TestResult_Starter pTestResult_Starter;
-+
-+//# extern FktPtr_TestResult_startTest pTestResult_StartTest;
-+//# extern FktPtr_TestResult_addFailure pTestResult_AddFailure;
-+//# extern FktPtr_TestResult_addError pTestResult_AddError;
-+//# extern FktPtr_TestResult_endTest pTestResult_EndTest;
-+//# extern FktPtr_TestResult_addInfo pTestResult_AddInfo;
-+//#
-+//# extern FktPtr_TestResult_enterNode pTestResult_EnterNode;
-+//# extern FktPtr_TestResult_leaveNode pTestResult_LeaveNode;
-+//#
-+
-+#endif
-Nur in misc/build/cppunit-1.8.0/include/cppunit: externcallbackfunc.hxx.dummy.
---- misc/cppunit-1.8.0/include/cppunit/joblist.hxx 2008-12-10 20:46:06.643901729 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/joblist.hxx 2008-07-14 07:25:14.000000000 +0200
-@@ -1 +1,99 @@
--dummy
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org. If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+#ifndef CPPUNIT_JOBLIST_HXX
-+#define CPPUNIT_JOBLIST_HXX
-+
-+#include <vector>
-+#include <string>
-+#include <hash_map>
-+#include "sal/types.h"
-+
-+// #include <cppunit/nocopy.hxx>
-+
-+/*
-+ struct eqstr
-+ {
-+ bool operator()( std::string const & s1, std::string const& s2 ) const
-+ {
-+ return ( s1 == s2 );
-+ }
-+ };
-+*/
-+
-+/*
-+ struct hashstr
-+ {
-+ sal_uInt32 operator()( std::string const & str ) const
-+ {
-+ return str.hashCode();
-+ }
-+ };
-+*/
-+typedef std::hash_map< std::string, int > HashMap;
-+
-+// typedef std::vector<std::string> StringList;
-+
-+#define JOB_UNKNOWN 0
-+#define JOB_NOT_FOUND 1
-+#define JOB_PASSED 2
-+#define JOB_FAILED 3
-+#define JOB_ACCESS 4
-+
-+#define JOB_EXCLUDE_LIST 0x1000
-+#define JOB_ONLY_LIST 0x1001
-+
-+typedef sal_Int16 JobType;
-+
-+class JobList /* : NOCOPY */
-+{
-+ HashMap m_aJobList;
-+ char** ppsJobList;
-+
-+ // returns true if the given List contains unxlngi or unxsols or wntmsci...
-+ bool isInCurrentEnvironment(std::string const& _sString);
-+ std::string trim(std::string const& _sStringToTrim);
-+
-+public:
-+ JobList();
-+ ~JobList();
-+
-+ bool readfile(std::string const& _sFilename, JobType _nJobType);
-+ const char** getList() const {return (const char**)ppsJobList;}
-+
-+ int getJobListEntry(std::string const& _sIndexName);
-+ void setJobListEntry(std::string const& _sIndexName, int _nValue);
-+
-+ int size() {return m_aJobList.size();}
-+ HashMap const& getHashMap() {return m_aJobList;}
-+};
-+
-+#endif
-+
-Nur in misc/build/cppunit-1.8.0/include/cppunit: joblist.hxx.dummy.
---- misc/cppunit-1.8.0/include/cppunit/nocopy.hxx 2008-12-10 20:46:06.720535461 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/nocopy.hxx 2008-02-27 17:08:42.000000000 +0100
-@@ -1 +1,13 @@
--dummy
-+#ifndef NOCOPY_HXX
-+#define NOCOPY_HXX
-+
-+// prevent illegal copies
-+class NOCOPY
-+{
-+ NOCOPY(NOCOPY const&);
-+ NOCOPY& operator=(NOCOPY const&);
-+public:
-+ NOCOPY(){}
-+};
-+
-+#endif
-Nur in misc/build/cppunit-1.8.0/include/cppunit: nocopy.hxx.dummy.
---- misc/cppunit-1.8.0/include/cppunit/portability/config-auto.h 2008-12-10 20:46:06.802507987 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/portability/config-auto.h 2008-07-14 07:25:14.000000000 +0200
-@@ -1 +1,64 @@
--dummy
-+#ifndef _INCLUDE_CPPUNIT_CONFIG_AUTO_H
-+#define _INCLUDE_CPPUNIT_CONFIG_AUTO_H 1
-+
-+/* include/cppunit/config-auto.h. Generated automatically at end of configure. */
-+/* config/config.h. Generated automatically by configure. */
-+/* config/config.h.in. Generated automatically from configure.in by autoheader. */
-+
-+/* define if library uses std::string::compare(string,pos,n) */
-+#ifndef CPPUNIT_FUNC_STRING_COMPARE_STRING_FIRST
-+#define CPPUNIT_FUNC_STRING_COMPARE_STRING_FIRST 1
-+#endif
-+
-+/* define if the library defines sstream */
-+#ifndef CPPUNIT_HAVE_SSTREAM
-+#define CPPUNIT_HAVE_SSTREAM 1
-+#endif
-+
-+/* Define if you have the <cmath> header file. */
-+#ifndef CPPUNIT_HAVE_CMATH
-+#define CPPUNIT_HAVE_CMATH 1
-+#endif
-+
-+/* Define if you have the <dlfcn.h> header file. */
-+#ifndef CPPUNIT_HAVE_DLFCN_H
-+#define CPPUNIT_HAVE_DLFCN_H 1
-+#endif
-+
-+/* define to 1 if the compiler implements namespaces */
-+#ifndef CPPUNIT_HAVE_NAMESPACES
-+#define CPPUNIT_HAVE_NAMESPACES 1
-+#endif
-+
-+/* define if the compiler supports Run-Time Type Identification */
-+#ifndef CPPUNIT_HAVE_RTTI
-+#define CPPUNIT_HAVE_RTTI 0
-+#endif
-+
-+/* define if the compiler has stringstream */
-+#ifndef CPPUNIT_HAVE_SSTREAM
-+#define CPPUNIT_HAVE_SSTREAM 1
-+#endif
-+
-+/* Define if you have the <strstream> header file. */
-+#ifndef CPPUNIT_HAVE_STRSTREAM
-+#define CPPUNIT_HAVE_STRSTREAM 1
-+#endif
-+
-+/* Name of package */
-+#ifndef CPPUNIT_PACKAGE
-+#define CPPUNIT_PACKAGE "cppunit"
-+#endif
-+
-+/* Define to 1 to use type_info::name() for class names */
-+#ifndef CPPUNIT_USE_TYPEINFO_NAME
-+#define CPPUNIT_USE_TYPEINFO_NAME CPPUNIT_HAVE_RTTI
-+#endif
-+
-+/* Version number of package */
-+#ifndef CPPUNIT_VERSION
-+#define CPPUNIT_VERSION "1.8.0"
-+#endif
-+
-+/* _INCLUDE_CPPUNIT_CONFIG_AUTO_H */
-+#endif
-Nur in misc/build/cppunit-1.8.0/include/cppunit/portability: config-auto.h.dummy.
---- misc/cppunit-1.8.0/include/cppunit/portability/config-bcb5.h 2008-12-10 20:46:05.287223886 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/portability/config-bcb5.h 2008-02-27 17:15:52.000000000 +0100
-@@ -1 +1,48 @@
--dummy
-+#ifndef _INCLUDE_CPPUNIT_CONFIG_BCB5_H
-+#define _INCLUDE_CPPUNIT_CONFIG_BCB5_H 1
-+
-+#define HAVE_CMATH 1
-+
-+/* include/cppunit/config-bcb5.h. Manually adapted from
-+ include/cppunit/config-auto.h */
-+
-+/* define if library uses std::string::compare(string,pos,n) */
-+#ifndef CPPUNIT_FUNC_STRING_COMPARE_STRING_FIRST
-+#define CPPUNIT_FUNC_STRING_COMPARE_STRING_FIRST 1
-+#endif
-+
-+/* Define if you have the <dlfcn.h> header file. */
-+#ifdef CPPUNIT_HAVE_DLFCN_H
-+#undef CPPUNIT_HAVE_DLFCN_H
-+#endif
-+
-+/* define to 1 if the compiler implements namespaces */
-+#ifndef CPPUNIT_HAVE_NAMESPACES
-+#define CPPUNIT_HAVE_NAMESPACES 1
-+#endif
-+
-+/* define if the compiler supports Run-Time Type Identification */
-+#ifndef CPPUNIT_HAVE_RTTI
-+#define CPPUNIT_HAVE_RTTI 1
-+#endif
-+
-+/* Define to 1 to use type_info::name() for class names */
-+#ifndef CPPUNIT_USE_TYPEINFO_NAME
-+#define CPPUNIT_USE_TYPEINFO_NAME CPPUNIT_HAVE_RTTI
-+#endif
-+
-+#define CPPUNIT_HAVE_SSTREAM 1
-+
-+/* Name of package */
-+#ifndef CPPUNIT_PACKAGE
-+#define CPPUNIT_PACKAGE "cppunit"
-+#endif
-+
-+/* Version number of package */
-+#ifndef CPPUNIT_VERSION
-+#define CPPUNIT_VERSION "1.5.5"
-+#endif
-+
-+
-+/* _INCLUDE_CPPUNIT_CONFIG_BCB5_H */
-+#endif
-Nur in misc/build/cppunit-1.8.0/include/cppunit/portability: config-bcb5.h.dummy.
---- misc/cppunit-1.8.0/include/cppunit/portability/config-msvc6.h 2008-12-10 20:46:05.392326519 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/portability/config-msvc6.h 2008-02-27 17:15:40.000000000 +0100
-@@ -1 +1,62 @@
--dummy
-+#ifndef _INCLUDE_CPPUNIT_CONFIG_MSVC6_H
-+#define _INCLUDE_CPPUNIT_CONFIG_MSVC6_H 1
-+
-+#define HAVE_CMATH 1
-+
-+/* include/cppunit/config-msvc6.h. Manually adapted from
-+ include/cppunit/config-auto.h */
-+
-+/* define if library uses std::string::compare(string,pos,n) */
-+#ifdef CPPUNIT_FUNC_STRING_COMPARE_STRING_FIRST
-+#undef CPPUNIT_FUNC_STRING_COMPARE_STRING_FIRST
-+#endif
-+
-+/* Define if you have the <dlfcn.h> header file. */
-+#ifdef CPPUNIT_HAVE_DLFCN_H
-+#undef CPPUNIT_HAVE_DLFCN_H
-+#endif
-+
-+/* define to 1 if the compiler implements namespaces */
-+#ifndef CPPUNIT_HAVE_NAMESPACES
-+#define CPPUNIT_HAVE_NAMESPACES 1
-+#endif
-+
-+#ifndef CPPUNIT_HAVE_RTTI
-+#define CPPUNIT_HAVE_RTTI 0
-+#endif
-+
-+#ifndef CPPUNIT_USE_TYPEINFO_NAME
-+#define CPPUNIT_USE_TYPEINFO_NAME CPPUNIT_HAVE_RTTI
-+#endif
-+
-+#define CPPUNIT_HAVE_SSTREAM 1
-+
-+/* Name of package */
-+#ifndef CPPUNIT_PACKAGE
-+#define CPPUNIT_PACKAGE "cppunit"
-+#endif
-+
-+#undef CPPUNIT_API
-+
-+// define CPPUNIT_DLL_BUILD when building CppUnit dll.
-+#ifdef CPPUNIT_BUILD_DLL
-+#define CPPUNIT_API __declspec(dllexport)
-+#endif
-+
-+// define CPPUNIT_DLL when linking to CppUnit dll.
-+#ifdef CPPUNIT_DLL
-+#define CPPUNIT_API __declspec(dllimport)
-+#endif
-+
-+#ifdef CPPUNIT_API
-+#undef CPPUNIT_NEED_DLL_DECL
-+#define CPPUNIT_NEED_DLL_DECL 1
-+#endif
-+
-+#if _MSC_VER > 1000 // VC++
-+#pragma warning( disable : 4786 ) // disable warning debug symbol > 255...
-+#endif // _MSC_VER > 1000
-+
-+
-+/* _INCLUDE_CPPUNIT_CONFIG_MSVC6_H */
-+#endif
-Nur in misc/build/cppunit-1.8.0/include/cppunit/portability: config-msvc6.h.dummy.
---- misc/cppunit-1.8.0/include/cppunit/result/SynchronizedObject.h 2008-12-10 20:46:04.893658092 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/result/SynchronizedObject.h 2008-02-27 17:14:06.000000000 +0100
-@@ -1 +1,82 @@
--dummy
-+#ifndef CPPUNIT_SYNCHRONIZEDOBJECT_H
-+#define CPPUNIT_SYNCHRONIZEDOBJECT_H
-+
-+#include <cppunit/Portability.h>
-+#include <cppunit/nocopy.hxx>
-+
-+namespace CppUnit
-+{
-+
-+/*! \brief Base class for synchronized object.
-+ *
-+ * Synchronized object are object which members are used concurrently by mutiple
-+ * threads.
-+ *
-+ * This class define the class SynchronizationObject which must be subclassed
-+ * to implement an actual lock.
-+ *
-+ * Each instance of this class holds a pointer on a lock object.
-+ *
-+ * See src/msvc6/MfcSynchronizedObject.h for an example.
-+ */
-+class CPPUNIT_API SynchronizedObject
-+{
-+public:
-+ /*! \brief Abstract synchronization object (mutex)
-+ */
-+ class SynchronizationObject
-+ {
-+ public:
-+ SynchronizationObject() {}
-+ virtual ~SynchronizationObject() {}
-+
-+ virtual void lock() {}
-+ virtual void unlock() {}
-+ };
-+
-+ /*! Constructs a SynchronizedObject object.
-+ */
-+ SynchronizedObject( SynchronizationObject *syncObject =0 );
-+
-+ /// Destructor.
-+ virtual ~SynchronizedObject();
-+
-+protected:
-+ /*! \brief Locks a synchronization object in the current scope.
-+ */
-+ class ExclusiveZone : NOCOPY
-+ {
-+ SynchronizationObject *m_syncObject;
-+
-+ public:
-+ ExclusiveZone( SynchronizationObject *syncObject )
-+ : m_syncObject( syncObject )
-+ {
-+ m_syncObject->lock();
-+ }
-+
-+ ~ExclusiveZone()
-+ {
-+ m_syncObject->unlock ();
-+ }
-+ };
-+
-+ virtual void setSynchronizationObject( SynchronizationObject *syncObject );
-+
-+protected:
-+ SynchronizationObject *m_syncObject;
-+
-+private:
-+ /// Prevents the use of the copy constructor.
-+ SynchronizedObject( const SynchronizedObject &copy );
-+
-+ /// Prevents the use of the copy operator.
-+ void operator =( const SynchronizedObject &copy );
-+};
-+
-+
-+
-+} // namespace CppUnit
-+
-+
-+#endif // CPPUNIT_SYNCHRONIZEDOBJECT_H
-Nur in misc/build/cppunit-1.8.0/include/cppunit/result: SynchronizedObject.h.dummy.
---- misc/cppunit-1.8.0/include/cppunit/result/TestListener.h 2008-12-10 20:46:04.938237839 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/result/TestListener.h 2008-02-27 17:14:38.000000000 +0100
-@@ -1 +1,62 @@
--dummy
-+#ifndef CPPUNIT_TESTLISTENER_H // -*- C++ -*-
-+#define CPPUNIT_TESTLISTENER_H
-+
-+#include <cppunit/Portability.h>
-+
-+
-+namespace CppUnit {
-+
-+class Exception;
-+class Test;
-+class TestFailure;
-+
-+
-+/*! \brief Listener for test progress and result.
-+ * \ingroup TrackingTestExecution
-+ *
-+ * Implementing the Observer pattern a TestListener may be registered
-+ * to a TestResult to obtain information on the testing progress. Use
-+ * specialized sub classes of TestListener for text output
-+ * (TextTestProgressListener). Do not use the Listener for the test
-+ * result output, use a subclass of Outputter instead.
-+ *
-+ * The test framework distinguishes between failures and errors.
-+ * A failure is anticipated and checked for with assertions. Errors are
-+ * unanticipated problems signified by exceptions that are not generated
-+ * by the framework.
-+ *
-+ * \see TestResult
-+ */
-+class CPPUNIT_API TestListener
-+{
-+public:
-+ virtual ~TestListener() {}
-+
-+ /// Called when just before a TestCase is run.
-+ virtual void startTest( Test *test ) =0 ;
-+
-+ /*! Called when a failure occurs while running a test.
-+ * \see TestFailure.
-+ * \warning \a failure is a temporary object that is destroyed after the
-+ * method call. Use TestFailure::clone() to create a duplicate.
-+ */
-+ virtual void addFailure( const TestFailure &failure ) =0;
-+
-+ /// Called just after a TestCase was run (even if a failure occured).
-+ virtual void endTest( Test *test ) =0;
-+
-+ // additional info
-+ virtual void addInfo(Test *test, const char*) =0;
-+
-+ // info in which node we are
-+ // helper functions to create tree structures
-+ // old: virtual void enterNode( const char* ) =0;
-+ // old: virtual void leaveNode( const char* ) =0;
-+};
-+
-+
-+} // namespace CppUnit
-+
-+#endif // CPPUNIT_TESTLISTENER_H
-+
-+
-Nur in misc/build/cppunit-1.8.0/include/cppunit/result: TestListener.h.dummy.
---- misc/cppunit-1.8.0/include/cppunit/result/TestResult.h 2008-12-10 20:46:05.070889564 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/result/TestResult.h 2008-02-27 17:13:08.000000000 +0100
-@@ -1 +1,123 @@
--dummy
-+#ifndef CPPUNIT_TESTRESULT_H
-+#define CPPUNIT_TESTRESULT_H
-+
-+#include <cppunit/Portability.h>
-+
-+#if CPPUNIT_NEED_DLL_DECL
-+#ifdef _MSC_VER
-+#pragma warning( push )
-+#pragma warning( disable: 4251 ) // X needs to have dll-interface to be used by clients of class Z
-+#endif
-+#endif
-+
-+#include <cppunit/result/SynchronizedObject.h>
-+#include <vector>
-+#include <string>
-+#include <deque>
-+//!io #include <iostream>
-+
-+#include "cppunit/result/optionhelper.hxx"
-+#include "cppunit/TestFailure.h"
-+
-+class Outputter;
-+namespace CppUnit {
-+
-+class Exception;
-+class Test;
-+// class TestFailure;
-+class TestListener;
-+
-+#if CPPUNIT_NEED_DLL_DECL
-+ template class CPPUNIT_API std::deque<TestListener *>;
-+#endif
-+
-+/*! \brief Manages TestListener.
-+ * \ingroup TrackingTestExecution
-+ *
-+ * A single instance of this class is used when running the test. It is usually
-+ * created by the test runner (TestRunner).
-+ *
-+ * This class shouldn't have to be inherited from. Use a TestListener
-+ * or one of its subclasses to be informed of the ongoing tests.
-+ * Use a Outputter to receive a test summary once it has finished
-+ *
-+ * TestResult supplies a template method 'setSynchronizationObject()'
-+ * so that subclasses can provide mutual exclusion in the face of multiple
-+ * threads. This can be useful when tests execute in one thread and
-+ * they fill a subclass of TestResult which effects change in another
-+ * thread. To have mutual exclusion, override setSynchronizationObject()
-+ * and make sure that you create an instance of ExclusiveZone at the
-+ * beginning of each method.
-+ *
-+ * \see Test, TestListener, TestResultCollector, Outputter.
-+ */
-+class CPPUNIT_API TestResult : protected SynchronizedObject
-+{
-+protected:
-+ OptionHelper m_aOptionHelper;
-+
-+public:
-+ TestResult( GetOpt & _aOptions, SynchronizationObject *syncObject = 0 );
-+ virtual ~TestResult();
-+
-+ virtual void addListener( TestListener *listener );
-+ virtual void removeListener( TestListener *listener );
-+
-+ virtual void reset();
-+ virtual void stop();
-+
-+ virtual bool shouldStop() const;
-+
-+ virtual void startTest( Test *test );
-+ virtual void addError( Test *test, Exception *e, ErrorType::num eType=ErrorType::ET_ERROR);
-+ virtual void addFailure( Test *test, Exception *e );
-+ virtual void endTest( Test *test );
-+
-+ // LLA: additionals
-+ virtual void addInfo(Test *test, const char *sInfo);
-+
-+ virtual void enterNode(const char* Node);
-+ virtual void leaveNode(const char* Node);
-+ virtual std::string getNodeName();
-+
-+ // if true, execution is allowed.
-+ virtual bool isAllowedToExecute(std::string const & sName);
-+ bool isOnlyShowJobs() {return m_aOptionHelper.isOnlyShowJobs();}
-+ bool isOptionWhereAmI();
-+
-+ virtual void print(Outputter &);
-+ void setExitValue(int _nValue) {m_nExitValue = _nValue;}
-+ int getExitValue() {return m_nExitValue;}
-+
-+protected:
-+ void addFailure( const TestFailure &failure );
-+
-+protected:
-+ typedef std::deque<TestListener *> TestListeners;
-+ TestListeners m_listeners;
-+ bool m_stop;
-+
-+ // this vector is used to expand the test name with a current node name
-+ std::vector<std::string> m_aCurrentNodeNames;
-+
-+ //# std::vector<std::string> m_aNodes;
-+
-+private:
-+ TestResult( const TestResult &other );
-+ TestResult &operator =( const TestResult &other );
-+ int m_nExitValue;
-+};
-+
-+
-+} // namespace CppUnit
-+
-+
-+#if CPPUNIT_NEED_DLL_DECL
-+#ifdef _MSC_VER
-+#pragma warning( pop )
-+#endif
-+#endif
-+
-+#endif // CPPUNIT_TESTRESULT_H
-+
-+
-Nur in misc/build/cppunit-1.8.0/include/cppunit/result: TestResult.h.dummy.
---- misc/cppunit-1.8.0/include/cppunit/result/TestResultCollector.h 2008-12-10 20:46:05.024473262 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/result/TestResultCollector.h 2008-02-27 17:14:48.000000000 +0100
-@@ -1 +1,165 @@
--dummy
-+#ifndef CPPUNIT_TESTRESULTCOLLECTOR_H
-+#define CPPUNIT_TESTRESULTCOLLECTOR_H
-+
-+#include <cppunit/Portability.h>
-+
-+#if CPPUNIT_NEED_DLL_DECL
-+#ifdef _MSC_VER
-+#pragma warning( push )
-+#pragma warning( disable: 4251 ) // X needs to have dll-interface to be used by clients of class Z
-+#endif
-+#endif
-+
-+#include <cppunit/result/TestResult.h>
-+#include <cppunit/result/TestSucessListener.h>
-+#include <deque>
-+#include <vector>
-+
-+namespace CppUnit
-+{
-+
-+
-+#if CPPUNIT_NEED_DLL_DECL
-+ template class CPPUNIT_API std::deque<TestFailure *>;
-+ template class CPPUNIT_API std::deque<Test *>;
-+#endif
-+
-+
-+/*! \brief Collects test result.
-+ * \ingroup WritingTestResult
-+ * \ingroup BrowsingCollectedTestResult
-+ *
-+ * A TestResultCollector is a TestListener which collects the results of executing
-+ * a test case. It is an instance of the Collecting Parameter pattern.
-+ *
-+ * The test framework distinguishes between failures and errors.
-+ * A failure is anticipated and checked for with assertions. Errors are
-+ * unanticipated problems signified by exceptions that are not generated
-+ * by the framework.
-+ * \see TestListener, TestFailure.
-+ */
-+
-+class OneStringContainer
-+{
-+ std::string m_sName;
-+protected:
-+ OneStringContainer() {}
-+public:
-+ OneStringContainer(std::string const& _sName)
-+ :m_sName(_sName){}
-+ std::string getString() const {return m_sName;}
-+ virtual ~OneStringContainer(){}
-+};
-+
-+// -----------------------------------------------------------------------------
-+class TestEnvelope : public OneStringContainer
-+{
-+ Test* m_pTest;
-+public:
-+ TestEnvelope():m_pTest(NULL){}
-+
-+ TestEnvelope(Test* _pTest, std::string const& _sName)
-+ : OneStringContainer(_sName),
-+ m_pTest(_pTest)
-+ {}
-+
-+ Test* getTest() {return m_pTest;}
-+ virtual ~TestEnvelope(){}
-+
-+};
-+
-+// -----------------------------------------------------------------------------
-+class TestInfo : public TestEnvelope
-+{
-+public:
-+ TestInfo(Test* _pTest, std::string const& _sName)
-+ :TestEnvelope(_pTest, _sName)
-+ {}
-+};
-+
-+// -----------------------------------------------------------------------------
-+class TestFailureEnvelope : public OneStringContainer
-+{
-+ TestFailure* m_pTestFailure;
-+public:
-+ TestFailureEnvelope():m_pTestFailure(NULL){}
-+
-+ TestFailureEnvelope(TestFailure* _pTestFailure, std::string const& _sName)
-+ :OneStringContainer(_sName),
-+ m_pTestFailure(_pTestFailure)
-+ {}
-+
-+ TestFailure* getTestFailure() {return m_pTestFailure;}
-+ virtual ~TestFailureEnvelope(){}
-+
-+};
-+// -----------------------------------------------------------------------------
-+
-+class CPPUNIT_API TestResultCollector : public TestSucessListener
-+{
-+ TestResult* m_pResult;
-+public:
-+ typedef std::deque<TestFailureEnvelope *> TestFailures;
-+ typedef std::deque<TestEnvelope *> Tests;
-+ typedef std::vector<TestInfo *> TestInfos;
-+
-+
-+ /*! Constructs a TestResultCollector object.
-+ */
-+ TestResultCollector( TestResult *_pResult, SynchronizationObject *syncObject = 0 );
-+
-+ /// Destructor.
-+ virtual ~TestResultCollector();
-+
-+ void startTest( Test *test );
-+ void endTest( Test *test );
-+
-+ void addFailure( const TestFailure &failure );
-+
-+ virtual void reset();
-+
-+ virtual int runTests() const;
-+ virtual int testErrors() const;
-+ virtual int testFailures() const;
-+ virtual int testFailuresTotal() const;
-+
-+ virtual const TestFailures& failures() const;
-+ virtual const Tests &tests() const;
-+ virtual std::string getInfo(Test*);
-+
-+ virtual void addInfo(Test *test, const char *sInfo);
-+
-+ // virtual void enterNode(const char* Node);
-+ // virtual void leaveNode(const char* Node);
-+
-+protected:
-+ Tests m_tests;
-+ TestFailures m_failures;
-+ TestInfos m_aInfos;
-+
-+ int m_testErrors;
-+
-+ // this vector is used to expand the test name with a current node name
-+ // std::vector<std::string> m_aCurrentNodeNames;
-+ // std::string getNodeName();
-+private:
-+ /// Prevents the use of the copy constructor.
-+ TestResultCollector( const TestResultCollector &copy );
-+
-+ /// Prevents the use of the copy operator.
-+ void operator =( const TestResultCollector &copy );
-+};
-+
-+
-+
-+} // namespace CppUnit
-+
-+
-+#if CPPUNIT_NEED_DLL_DECL
-+#ifdef _MSC_VER
-+#pragma warning( pop )
-+#endif
-+#endif
-+
-+
-+#endif // CPPUNIT_TESTRESULTCOLLECTOR_H
-Nur in misc/build/cppunit-1.8.0/include/cppunit/result: TestResultCollector.h.dummy.
---- misc/cppunit-1.8.0/include/cppunit/result/TestSucessListener.h 2008-12-10 20:46:05.161106554 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/result/TestSucessListener.h 2008-02-27 17:14:16.000000000 +0100
-@@ -1 +1,40 @@
--dummy
-+#ifndef CPPUNIT_TESTSUCESSLISTENER_H
-+#define CPPUNIT_TESTSUCESSLISTENER_H
-+
-+#include <cppunit/result/SynchronizedObject.h>
-+#include <cppunit/result/TestListener.h>
-+
-+
-+namespace CppUnit
-+{
-+
-+/*! \brief TestListener that checks if any test case failed.
-+ * \ingroup TrackingTestExecution
-+ */
-+class CPPUNIT_API TestSucessListener : public TestListener,
-+ public SynchronizedObject
-+{
-+public:
-+ /*! Constructs a TestSucessListener object.
-+ */
-+ TestSucessListener( SynchronizationObject *syncObject = 0 );
-+
-+ /// Destructor.
-+ virtual ~TestSucessListener();
-+
-+ virtual void reset();
-+
-+ void addFailure( const TestFailure &failure );
-+
-+ /// Returns whether the entire test was successful or not.
-+ virtual bool wasSuccessful() const;
-+
-+private:
-+ bool m_sucess;
-+};
-+
-+
-+} // namespace CppUnit
-+
-+
-+#endif // CPPUNIT_TESTSUCESSLISTENER_H
-Nur in misc/build/cppunit-1.8.0/include/cppunit/result: TestSucessListener.h.dummy.
---- misc/cppunit-1.8.0/include/cppunit/result/TextTestResult.h 2008-12-10 20:46:05.242583534 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/result/TextTestResult.h 2008-02-27 17:14:28.000000000 +0100
-@@ -1 +1,62 @@
--dummy
-+#ifndef CPPUNIT_TEXTTESTRESULT_H
-+#define CPPUNIT_TEXTTESTRESULT_H
-+
-+#include <cppunit/result/TestResult.h>
-+#include <cppunit/result/TestResultCollector.h>
-+#include <ostream>
-+
-+class GetOpt;
-+namespace CppUnit {
-+
-+class SourceLine;
-+class Exception;
-+class Test;
-+
-+/*! \brief Holds printable test result (DEPRECATED).
-+ * \ingroup TrackingTestExecution
-+ *
-+ * deprecated Use class TextTestProgressListener and TextOutputter instead.
-+ */
-+class CPPUNIT_API TextTestResult : public TestResult
-+/* public TestResultCollector*/
-+{
-+ TestResultCollector m_aResulter;
-+public:
-+ TextTestResult(GetOpt& _aOptions);
-+
-+ virtual void addFailure( const TestFailure &failure );
-+ virtual void startTest( Test *test );
-+ virtual void endTest( Test *test );
-+
-+ virtual void print( std::ostream &stream );
-+protected:
-+
-+ virtual void printFailures( std::ostream &stream );
-+ virtual void printHeader( std::ostream &stream );
-+
-+ virtual void printFailure( TestFailure *failure,
-+ int failureNumber,
-+ std::ostream &stream );
-+ virtual void printFailureListMark( int failureNumber,
-+ std::ostream &stream );
-+ virtual void printFailureTestName( TestFailure *failure,
-+ std::ostream &stream );
-+ virtual void printFailureType( TestFailure *failure,
-+ std::ostream &stream );
-+ virtual void printFailureLocation( SourceLine sourceLine,
-+ std::ostream &stream );
-+ virtual void printFailureDetail( Exception *thrownException,
-+ std::ostream &stream );
-+ virtual void printFailureWarning( std::ostream &stream );
-+ virtual void printStatistics( std::ostream &stream );
-+};
-+
-+/** insertion operator for easy output */
-+std::ostream &operator <<( std::ostream &stream,
-+ TextTestResult &result );
-+
-+} // namespace CppUnit
-+
-+#endif // CPPUNIT_TEXTTESTRESULT_H
-+
-+
-Nur in misc/build/cppunit-1.8.0/include/cppunit/result: TextTestResult.h.dummy.
---- misc/cppunit-1.8.0/include/cppunit/result/callbackfunc.h 2008-12-10 20:46:06.881445744 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/result/callbackfunc.h 2008-02-27 17:15:00.000000000 +0100
-@@ -1 +1,25 @@
--dummy
-+#ifndef _callbackfunc_h
-+#define _callbackfunc_h
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+ // this is the entry point from the DLL back to the executable.
-+ sal_Int32 CallbackDispatch(int x, ...);
-+
-+//# void TestResult_startTest(hTestResult _pResult, hTest _pTest);
-+//# void TestResult_addFailure( hTestResult _pResult, hTest _pTest, hException _pException );
-+//# void TestResult_addError( hTestResult _pResult, hTest _pTest, hException _pException );
-+//# void TestResult_endTest( hTestResult _pResult, hTest _pTest );
-+//# bool TestResult_shouldStop(hTestResult _pResult);
-+//# void TestResult_addInfo( hTestResult _pResult, hTest _pTest, const char* _sInfo );
-+//#
-+//# void TestResult_enterNode( hTestResult _pResult, const char* _sInfo );
-+//# void TestResult_leaveNode( hTestResult _pResult, const char* _sInfo );
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif
-Nur in misc/build/cppunit-1.8.0/include/cppunit/result: callbackfunc.h.dummy.
---- misc/cppunit-1.8.0/include/cppunit/result/emacsTestResult.hxx 2008-12-10 20:46:06.924792880 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/result/emacsTestResult.hxx 2008-12-10 20:42:43.000000000 +0100
-@@ -1 +1,82 @@
--dummy
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org. If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+#ifndef cppunit_emacstestresult_h
-+#define cppunit_emacstestresult_h
-+
-+#include <cppunit/result/TestResult.h>
-+#include <cppunit/result/TestResultCollector.h>
-+#include <ostream>
-+#include "testshl/getopt.hxx"
-+
-+class Outputter;
-+namespace CppUnit {
-+
-+class SourceLine;
-+class Exception;
-+class Test;
-+
-+/*! \brief Holds printable test result (DEPRECATED).
-+ * \ingroup TrackingTestExecution
-+ *
-+ * deprecated Use class TextTestProgressListener and TextOutputter instead.
-+ */
-+ class CPPUNIT_API emacsTestResult : public TestResult
-+
-+/* ,public TestResultCollector*/
-+ {
-+ GetOpt & m_aOptions;
-+ // OptionHelper m_aOptionHelper;
-+ TestResultCollector m_aResulter;
-+
-+ public:
-+ emacsTestResult(GetOpt & _aOptions);
-+
-+ // virtual void addFailure( const TestFailure &failure );
-+ // virtual void startTest( Test *test );
-+ // virtual void endTest( Test *test );
-+
-+ virtual void print( Outputter &stream );
-+
-+ protected:
-+ virtual void printHeader( Outputter &stream );
-+ // virtual void printTestLine( Outputter &stream, Test* pTest, std::string const& _sNodeName, std::string const& _sInfo);
-+ virtual void printFailureLine( Outputter &stream, TestFailure* pFailure, std::string const& _sNodeName );
-+ };
-+
-+/** insertion operator for easy output */
-+// std::ostream &operator <<( std::ostream &stream,
-+// emacsTestResult &result );
-+
-+} // namespace CppUnit
-+
-+#endif // CPPUNIT_testshlTESTRESULT_H
-+
-+
-Nur in misc/build/cppunit-1.8.0/include/cppunit/result: emacsTestResult.hxx.dummy.
---- misc/cppunit-1.8.0/include/cppunit/result/log.hxx 2008-12-10 20:46:07.004030154 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/result/log.hxx 2008-07-14 07:25:14.000000000 +0200
-@@ -1 +1,106 @@
--dummy
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org. If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+#ifndef __QADEV_REGSCAN_LOG_HXX__
-+#define __QADEV_REGSCAN_LOG_HXX__
-+
-+#include <time.h>
-+#include <rtl/ustring.hxx>
-+#include <rtl/strbuf.hxx>
-+#include <sal/types.h>
-+#include <osl/thread.h>
-+#include <osl/file.hxx>
-+
-+#include <cppunit/nocopy.hxx>
-+
-+//!io #include <iostream>
-+#include <vector>
-+
-+// using namespace std;
-+
-+
-+/**
-+ * Log derives the interface of the ::osl::File class ( is-a relation ).
-+ * Its members (has-a relation) are the (full qualified)name of the log
-+ * and an OStringBuffer which represents the content of the logfile.
-+ * It provides the functionality of easy-to-use open and write logs
-+ */
-+//: Log
-+class Log : NOCOPY {
-+
-+ ::osl::File* m_logfile; // fileobject
-+ rtl::OUString m_logurl; // url of log
-+ rtl::OStringBuffer m_buf; // content of log
-+
-+ Log();
-+
-+public:
-+
-+ //> c'tor
-+ /**
-+ * constructors argument is a full qualified UNC path
-+ * @param OUString logfile ( full qualified UNC path )
-+ */
-+ Log( const rtl::OUString& logURL )
-+ : m_logfile( new ::osl::File( logURL ))
-+ , m_logurl(logURL)
-+ {} ///< c'tor
-+
-+ //> d'tor
-+ virtual ~Log()
-+ {
-+ m_logfile->close();
-+ delete( m_logfile );
-+ } ///< d'tor
-+
-+ //> inline methods
-+ // returns a reference to name instance
-+ inline rtl::OUString getLogURL() { return m_logurl; }
-+ inline rtl::OString getName() { return rtl::OUStringToOString(
-+ m_logurl, RTL_TEXTENCODING_ASCII_US ); }
-+ ///< inline methods
-+
-+ // open logfile for overwrite (default) or append
-+ ::osl::FileBase::RC open( sal_Bool append = sal_False );
-+ ::osl::FileBase::RC close() { return m_logfile->close(); }
-+
-+
-+ // write methods without (default) or with echo on display
-+ ::osl::FileBase::RC write( const sal_Char* buf, sal_Bool v = sal_False );
-+ ::osl::FileBase::RC write( const rtl::OString& buf,
-+ sal_Bool v = sal_False );
-+ //! ::osl::FileBase::RC write( rtl::OStringBuffer& buf,
-+ //! sal_Bool v = sal_False );
-+ ::osl::FileBase::RC write( const rtl::OUString& buf,
-+ rtl_TextEncoding enc = RTL_TEXTENCODING_ASCII_US,
-+ sal_Bool v = sal_False );
-+
-+}; ///:~ Log
-+
-+#endif
-Nur in misc/build/cppunit-1.8.0/include/cppunit/result: log.hxx.dummy.
---- misc/cppunit-1.8.0/include/cppunit/result/optionhelper.hxx 2008-12-10 20:46:07.084399993 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/result/optionhelper.hxx 2008-12-10 20:42:43.000000000 +0100
-@@ -1 +1,98 @@
--dummy
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org. If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+#ifndef optionhelper_hxx
-+#define optionhelper_hxx
-+
-+#include <string>
-+
-+#include <sal/types.h>
-+
-+#include "cppunit/nocopy.hxx"
-+#include "testshl/getopt.hxx"
-+#include "cppunit/joblist.hxx"
-+
-+// -----------------------------------------------------------------------------
-+
-+typedef std::vector<rtl::OString> OStringList;
-+
-+//!? Better: OptionHelper
-+class OptionHelper : NOCOPY
-+{
-+ GetOpt & m_aOption;
-+ JobList m_aJobOnlyList;
-+ JobList m_aJobExcludeList;
-+ OStringList m_aJobFilter;
-+
-+ std::string m_sProjectId;
-+ std::string m_sBuildId;
-+
-+ std::string getProjectId() const;
-+ std::string getBuildId() const;
-+ std::string createDateTag(std::string const& _sProjectId, std::string const& _sBuildId);
-+
-+ void handleJobs();
-+public:
-+ OptionHelper(GetOpt & _aOption)
-+ :m_aOption(_aOption)
-+ {
-+ if (m_aOption.hasOpt("-projectid"))
-+ m_sProjectId = m_aOption.getOpt("-projectid");
-+
-+ if (m_aOption.hasOpt("-buildid"))
-+ m_sBuildId = m_aOption.getOpt("-buildid");
-+
-+ handleJobs();
-+ }
-+
-+ static std::string integerToAscii(sal_Int32 nValue);
-+ static std::string twoDigits(std::string const& _sValue);
-+
-+ std::string createDateTag();
-+ bool showErrors();
-+ bool showTests();
-+
-+ JobList getJobOnlyList() {return m_aJobOnlyList;}
-+ JobList getJobExcludeList() {return m_aJobExcludeList;}
-+
-+ bool isAllowedToExecute(std::string const& _sNode, std::string const& _sName);
-+
-+ bool isOnlyShowJobs() {return m_aOption.hasOpt("-onlyshowjobs") == sal_True ? true : false;}
-+ GetOpt& getOptions() {return m_aOption;}
-+ bool isVerbose() {return m_aOption.hasOpt("-verbose") == sal_True ? true : false;}
-+ bool isOptionWhereAmI() {return m_aOption.hasOpt("-whereami") == sal_True ? true : false;}
-+};
-+
-+// -----------------------------------------------------------------------------
-+
-+
-+#endif
-+
-+
-Nur in misc/build/cppunit-1.8.0/include/cppunit/result: optionhelper.hxx.dummy.
---- misc/cppunit-1.8.0/include/cppunit/result/outputter.hxx 2008-12-10 20:46:07.186579135 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/result/outputter.hxx 2008-12-10 20:42:43.000000000 +0100
-@@ -1 +1,85 @@
--dummy
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org. If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+//
-+
-+#ifndef outputter_hxx
-+#define outputter_hxx
-+
-+#include <string>
-+#include <ostream>
-+#include <memory>
-+#include "testshl/log.hxx"
-+#include <sal/types.h>
-+#include "cppunit/nocopy.hxx"
-+
-+// #include <fstream>
-+
-+class Outputter : NOCOPY
-+{
-+ std::auto_ptr<Log> m_pLog;
-+ std::ostream* m_pStream;
-+
-+ void writeToAll(const sal_Char* _pStr);
-+public:
-+ class endl
-+ {
-+ char c;
-+ public:
-+ endl():c('\0'){}
-+ };
-+public:
-+ Outputter(Log * _pLog )
-+ :m_pLog(_pLog),
-+ m_pStream(NULL) {}
-+
-+ Outputter(std::ostream& _aStream)
-+ :m_pLog(NULL),
-+ m_pStream(&_aStream) {}
-+
-+ ~Outputter();
-+
-+ void write(const sal_Char*);
-+ void write(std::string const&);
-+ void write(sal_Int32);
-+ // void write(double);
-+};
-+
-+Outputter& operator <<( Outputter &stream, const sal_Char* );
-+Outputter& operator <<( Outputter &stream, std::string const& );
-+Outputter& operator <<( Outputter &stream, sal_Int32 );
-+// Outputter& operator <<( Outputter &stream, double );
-+
-+Outputter& operator <<( Outputter &stream, Outputter::endl const&);
-+
-+// Outputter& operator <<( Outputter &stream, const char* );
-+
-+#endif
-+
-Nur in misc/build/cppunit-1.8.0/include/cppunit/result: outputter.hxx.dummy.
---- misc/cppunit-1.8.0/include/cppunit/result/testshlTestResult.h 2008-12-10 20:46:07.267386761 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/result/testshlTestResult.h 2008-12-10 20:42:43.000000000 +0100
-@@ -1 +1,72 @@
--dummy
-+#ifndef cppunit_testshltestresult_h
-+#define cppunit_testshltestresult_h
-+
-+#include <map>
-+#include <cppunit/result/TestResult.h>
-+#include <cppunit/result/TestResultCollector.h>
-+#include <ostream>
-+#include "testshl/getopt.hxx"
-+
-+class Outputter;
-+
-+namespace CppUnit {
-+
-+class SourceLine;
-+class Exception;
-+class Test;
-+
-+struct ltstr
-+{
-+ bool operator()(const CppUnit::Test* p1, const CppUnit::Test* p2) const
-+ {
-+ return p1 < p2;
-+ }
-+};
-+typedef std::map<CppUnit::Test*, bool, ltstr> TestPtrList;
-+
-+
-+/*! \brief Holds printable test result (DEPRECATED).
-+ * \ingroup TrackingTestExecution
-+ *
-+ * deprecated Use class TextTestProgressListener and TextOutputter instead.
-+ */
-+ class CPPUNIT_API testshlTestResult : public TestResult
-+
-+/* ,public TestResultCollector*/
-+ {
-+ GetOpt & m_aOptions;
-+ // OptionHelper m_aOptionHelper;
-+ TestResultCollector m_aResulter;
-+
-+ public:
-+ testshlTestResult(GetOpt & _aOptions);
-+ virtual ~testshlTestResult();
-+
-+ // virtual void addFailure( const TestFailure &failure );
-+ // virtual void startTest( Test *test );
-+ // virtual void endTest( Test *test );
-+
-+ virtual void print( Outputter &stream );
-+
-+ protected:
-+ virtual void printHeader( Outputter &stream );
-+
-+ void printLines(Outputter &stream, HashMap & _aJobList);
-+ void printFailedTests(Outputter &stream, TestPtrList &aFailedTests);
-+ void printTestLines(Outputter &stream, TestPtrList &aFailedTests);
-+ void printUnknownLines(Outputter &stream, HashMap & _aJobList);
-+
-+ virtual void printTestLine( Outputter &stream, Test* pTest, std::string const& _sNodeName, std::string const& _sInfo);
-+ virtual void printFailureLine( Outputter &stream, TestFailure* pFailure, std::string const& _sNodeName );
-+ virtual void printUnknownLine( Outputter &stream, std::string const& _sTestName);
-+ };
-+
-+/** insertion operator for easy output */
-+ Outputter &operator <<( Outputter &stream,
-+ testshlTestResult &result );
-+
-+} // namespace CppUnit
-+
-+#endif // CPPUNIT_testshlTESTRESULT_H
-+
-+
-Nur in misc/build/cppunit-1.8.0/include/cppunit/result: testshlTestResult.h.dummy.
---- misc/cppunit-1.8.0/include/cppunit/signaltest.h 2008-12-10 20:46:07.349658445 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/signaltest.h 2008-07-14 07:25:14.000000000 +0200
-@@ -1 +1,65 @@
--dummy
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org. If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+#ifndef SIGNALTEST_H
-+#define SIGNALTEST_H
-+
-+#include <string>
-+#include "cppunit/Test.h"
-+#include <cppunit/autoregister/htestresult.h>
-+
-+namespace CppUnit
-+{
-+
-+class CPPUNIT_API SignalTest : public Test
-+{
-+public:
-+
-+ SignalTest( std::string const& Name );
-+
-+ ~SignalTest();
-+
-+ virtual void run(hTestResult pResult);
-+ virtual int countTestCases() const;
-+ std::string getName() const;
-+ std::string toString() const;
-+
-+private:
-+ SignalTest( const SignalTest &other );
-+ SignalTest &operator=( const SignalTest &other );
-+
-+private:
-+ const std::string m_sName;
-+};
-+
-+} // namespace CppUnit
-+
-+
+#endif
-Nur in misc/build/cppunit-1.8.0/include/cppunit: signaltest.h.dummy.
---- misc/cppunit-1.8.0/include/cppunit/simpleheader.hxx 2008-12-10 20:46:07.425092111 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/simpleheader.hxx 2008-07-14 07:25:14.000000000 +0200
-@@ -1 +1,45 @@
+--- misc/cppunit-1.8.0/include/cppunit/tagvalues.hxx 2009-09-14 08:43:30.609375000 +0200
++++ misc/build/cppunit-1.8.0/include/cppunit/tagvalues.hxx 2009-09-12 15:14:27.812500000 +0200
+@@ -1 +1,94 @@
-dummy
+/*************************************************************************
+ *
@@ -3016,124 +1196,10 @@ Nur in misc/build/cppunit-1.8.0/include/cppunit: signaltest.h.dummy.
+ *
+ ************************************************************************/
+
-+#ifndef CPPUNIT_SIMPLEHEADER_HXX
-+#define CPPUNIT_SIMPLEHEADER_HXX
-+
-+// This file contains only the cppunit header files, for simplification.
-+
-+#include <cppunit/TestFixture.h>
-+#include <cppunit/TestCaller.h>
-+#include <cppunit/TestSuite.h>
-+#include <cppunit/TestAssert.h>
-+#include <cppunit/autoregister/registertestfunction.h>
-+#include <cppunit/extensions/HelperMacros.h>
-+#include <cppunit/additionalfunc.hxx>
-+#include <cppunit/cmdlinebits.hxx>
-+
-+#endif
-Nur in misc/build/cppunit-1.8.0/include/cppunit: simpleheader.hxx.dummy.
---- misc/cppunit-1.8.0/include/cppunit/stringhelper.hxx 2008-12-10 20:46:07.500255274 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/stringhelper.hxx 2008-07-14 07:25:14.000000000 +0200
-@@ -1 +1,42 @@
--dummy
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org. If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+#ifndef STRINGHELPER_HXX
-+#define STRINGHELPER_HXX
-+
-+#include <rtl/ustring.hxx>
-+#include <rtl/string.hxx>
-+
-+inline void operator <<= (rtl::OString& _rAsciiString, const rtl::OUString& _rUnicodeString)
-+{
-+ _rAsciiString = rtl::OUStringToOString(_rUnicodeString,RTL_TEXTENCODING_ASCII_US);
-+}
-+
-+#endif
-Nur in misc/build/cppunit-1.8.0/include/cppunit: stringhelper.hxx.dummy.
---- misc/cppunit-1.8.0/include/cppunit/taghelper.hxx 2008-12-10 20:46:07.588895546 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/taghelper.hxx 2008-07-14 07:25:14.000000000 +0200
-@@ -1 +1,91 @@
--dummy
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org. If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+#ifndef TAGHELPER_HXX
-+#define TAGHELPER_HXX
-+
-+#include <map>
-+#include <sal/types.h>
-+#include <cppunit/nocopy.hxx>
-+
-+/* Tags are a general mechanism of extensible data arrays for parameter
-+ * specification and property inquiry. In practice, tags are used in arrays,
-+ * or chain of arrays.
-+ *
-+ */
-+
-+typedef sal_IntPtr Tag;
-+typedef sal_IntPtr TagData;
++#ifndef TAGVALUES_H
++#define TAGVALUES_H
+
-+//# struct TagItem
-+//# {
-+//# Tag ti_Tag; /* identifies the type of data */
-+//# TagData ti_Data; /* type-specific data */
-+//# };
++typedef unsigned long Tag;
+
+/* constants for Tag.ti_Tag, control tag values */
+#define TAG_DONE (Tag(0L)) /* terminates array of TagItems. ti_Data unused */
@@ -3147,95 +1213,29 @@ Nur in misc/build/cppunit-1.8.0/include/cppunit: stringhelper.hxx.dummy.
+/* differentiates user tags from control tags */
+#define TAG_USER (Tag(1L<<31))
+
-+// -----------------------------------------------------------------------------
-+class TagHelper /* : NOCOPY */
-+{
-+ typedef std::map<Tag, TagData> TagItems;
-+ TagItems m_aTagItems;
-+
-+public:
-+ TagHelper(){}
-+ void insert(Tag _nTag, TagData _nData)
-+ {
-+ m_aTagItems[_nTag] = _nData;
-+ }
-+ // const TagItems& get() const { return m_aTagItems; }
-+
-+ TagData GetTagData(Tag _aTagValue, TagData _aDefaultValue = 0 /* NULL */) const
-+ {
-+ TagItems::const_iterator it = m_aTagItems.find(_aTagValue);
-+ if (it != m_aTagItems.end())
-+ return (*it).second;
-+ else
-+ return _aDefaultValue;
-+ }
-+};
-+
-+#endif
-+
-+
-Nur in misc/build/cppunit-1.8.0/include/cppunit: taghelper.hxx.dummy.
---- misc/cppunit-1.8.0/include/cppunit/tagvalues.hxx 2008-12-10 20:46:07.672788513 +0100
-+++ misc/build/cppunit-1.8.0/include/cppunit/tagvalues.hxx 2008-07-14 07:25:14.000000000 +0200
-@@ -1 +1,81 @@
--dummy
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org. If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+#ifndef TAGVALUES_H
-+#define TAGVALUES_H
-+
-+#include <cppunit/taghelper.hxx>
+
+#define TAG_TYPE (Tag(TAG_USER | (0x01L)))
+
+#define TAG_RESULT (TAG_USER | 0x100)
-+
++
+#define RESULT_START (Tag(TAG_RESULT | (0x02L)))
+#define TAG_RESULT_PTR (Tag(TAG_RESULT | (0x03L)))
+#define TAG_TEST_PTR (Tag(TAG_RESULT | (0x04L)))
-+
++
+#define RESULT_END (Tag(TAG_RESULT | (0x05L)))
-+
++
+#define RESULT_ADD_FAILURE (Tag(TAG_RESULT | (0x06L)))
+#define RESULT_ADD_ERROR (Tag(TAG_RESULT | (0x07L)))
-+
++
+#define TAG_EXCEPTION (Tag(TAG_RESULT | (0x08L)))
-+
++
+#define RESULT_ADD_INFO (Tag(TAG_RESULT | (0x09L)))
+#define TAG_INFO (Tag(TAG_RESULT | (0x0aL)))
-+
++
+#define RESULT_ENTER_NODE (Tag(TAG_RESULT | (0x0bL)))
+#define RESULT_LEAVE_NODE (Tag(TAG_RESULT | (0x0cL)))
+#define TAG_NODENAME (Tag(TAG_RESULT | (0x0dL)))
-+
++
+#define RESULT_SHOULD_STOP (Tag(TAG_RESULT | (0x0eL)))
+
+
@@ -3257,13 +1257,12 @@ Nur in misc/build/cppunit-1.8.0/include/cppunit: taghelper.hxx.dummy.
+#define DO_NOT_EXECUTE 666
+#define GO_EXECUTE 1
+
-+typedef sal_Int32 ReturnValue;
++typedef long ReturnValue;
+
+#endif
-Nur in misc/build/cppunit-1.8.0/include/cppunit: tagvalues.hxx.dummy.
---- misc/cppunit-1.8.0/include/makefile.mk 2008-12-10 20:46:08.530624271 +0100
-+++ misc/build/cppunit-1.8.0/include/makefile.mk 2008-07-14 07:25:14.000000000 +0200
-@@ -1 +1,52 @@
+--- misc/cppunit-1.8.0/makefile.mk 2009-09-12 15:20:48.343750000 +0200
++++ misc/build/cppunit-1.8.0/makefile.mk 2009-09-12 14:15:35.328125000 +0200
+@@ -1 +1,33 @@
-dummy
+#*************************************************************************
+#
@@ -3284,998 +1283,6 @@ Nur in misc/build/cppunit-1.8.0/include/cppunit: tagvalues.hxx.dummy.
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+# GNU Lesser General Public License version 3 for more details
-+# (a copy is included in the LICENSE file that accompanied this code).
-+#
-+# You should have received a copy of the GNU Lesser General Public License
-+# version 3 along with OpenOffice.org. If not, see
-+# <http://www.openoffice.org/license.html>
-+# for a copy of the LGPLv3 License.
-+#
-+#*************************************************************************
-+PRJ=..
-+# PRJINC=..
-+
-+PRJNAME=cppunit
-+TARGET=inc
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE : settings.mk
-+
-+# --- Files --------------------------------------------------------
-+# --- Targets -------------------------------------------------------
-+
-+.INCLUDE : target.mk
-+
-+.IF "$(ENABLE_PCH)"!=""
-+ALLTAR : \
-+ $(SLO)$/precompiled.pch \
-+ $(SLO)$/precompiled_ex.pch
-+
-+.ENDIF # "$(ENABLE_PCH)"!=""
-+
-Nur in misc/build/cppunit-1.8.0/include: makefile.mk.dummy.
---- misc/cppunit-1.8.0/include/testshl/autoregisterhelper.hxx 2008-12-10 20:46:07.771638742 +0100
-+++ misc/build/cppunit-1.8.0/include/testshl/autoregisterhelper.hxx 2008-07-07 08:13:42.000000000 +0200
-@@ -1 +1,65 @@
--dummy
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org. If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+#ifndef AUTOREGISTER_HXX
-+#define AUTOREGISTER_HXX
-+
-+#include <vector>
-+#include <rtl/ustring.hxx>
-+
-+#include <cppunit/autoregister/testfunc.h>
-+
-+#include "dynamicregister.hxx"
-+#include "getopt.hxx"
-+
-+typedef std::vector<FktPtr> FunctionList;
-+
-+// -----------------------------------------------------------------------------
-+class JobList;
-+class AutomaticRegisterHelper : public DynamicLibraryHelper
-+{
-+ FunctionList m_aFunctionList;
-+ bool m_bLoadLibraryOK;
-+ // GetOpt & m_aOptions; // use getOptions() instead!
-+
-+public:
-+ AutomaticRegisterHelper(rtl::OUString const& _sDLLName, GetOpt & _aOptions/* , JobList * _pJobList = NULL */ );
-+
-+ // FunctionList getFunctions(){return m_aFunctionList;}
-+ void CallAll(hTestResult _hResult) const;
-+
-+ /// @return true, if the given DLLName library could load and initialised.
-+ bool isOkToStartTests() const {return m_bLoadLibraryOK;}
-+
-+ virtual ~AutomaticRegisterHelper();
-+};
-+
-+#endif
-+
-Nur in misc/build/cppunit-1.8.0/include/testshl: autoregisterhelper.hxx.dummy.
---- misc/cppunit-1.8.0/include/testshl/dynamicregister.hxx 2008-12-10 20:46:07.812458771 +0100
-+++ misc/build/cppunit-1.8.0/include/testshl/dynamicregister.hxx 2008-07-07 08:13:42.000000000 +0200
-@@ -1 +1,67 @@
--dummy
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org. If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+#ifndef DYNAMICREGISTER_HXX
-+#define DYNAMICREGISTER_HXX
-+
-+#include <rtl/ustring.hxx>
-+#include <osl/module.hxx>
-+
-+#include "getopt.hxx"
-+#include "cppunit/nocopy.hxx"
-+
-+// -------------------------------------------------
-+
-+class DynamicLibraryHelper : NOCOPY
-+{
-+protected:
-+ osl::Module* m_pModule;
-+ rtl::OUString m_suDLLName;
-+ GetOpt & m_aOptions;
-+
-+ GetOpt& getOptions() {return m_aOptions;}
-+
-+public:
-+ DynamicLibraryHelper(rtl::OUString const& _sDLLName, GetOpt & _aOptions);
-+ virtual ~DynamicLibraryHelper();
-+
-+private:
-+ void showFilenameIfVerbose();
-+ void realLoadLibrary(rtl::OUString const& _sLibToLoad);
-+ void loadLibraryFromAbsolutePath();
-+ void loadLibraryFromLocalPath();
-+
-+ rtl::OUString m_suAbsolutePathFile; // file:///D:/foo/bar/library.dll
-+ rtl::OUString m_suAbsolutePath; // file:///D:/foo/bar
-+ rtl::OUString m_suFilename; // library.dll
-+};
-+
-+#endif
-+
-Nur in misc/build/cppunit-1.8.0/include/testshl: dynamicregister.hxx.dummy.
---- misc/cppunit-1.8.0/include/testshl/filehelper.hxx 2008-12-10 20:46:07.901872218 +0100
-+++ misc/build/cppunit-1.8.0/include/testshl/filehelper.hxx 2008-07-07 08:13:42.000000000 +0200
-@@ -1 +1,50 @@
--dummy
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org. If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+#ifndef FILEHELPER_HXX
-+#define FILEHELPER_HXX
-+
-+#include <string>
-+#include <rtl/ustring.hxx>
-+#include <rtl/string.hxx>
-+#include <cppunit/cmdlinebits.hxx>
-+#include "getopt.hxx"
-+
-+namespace FileHelper
-+{
-+
-+ std::string getTempPath();
-+ rtl::OUString convertPath( rtl::OUString const& _suSysPath );
-+ rtl::OUString convertPath( rtl::OString const& sysPth );
-+ CmdLineBits createFlags( GetOpt & _aOptions );
-+
-+}
-+#endif
-+
-Nur in misc/build/cppunit-1.8.0/include/testshl: filehelper.hxx.dummy.
---- misc/cppunit-1.8.0/include/testshl/getopt.hxx 2008-12-10 20:46:07.985642414 +0100
-+++ misc/build/cppunit-1.8.0/include/testshl/getopt.hxx 2008-07-07 08:13:42.000000000 +0200
-@@ -1 +1,335 @@
--dummy
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org. If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+/*************************************************************************
-+#* class GetOpt
-+#*
-+#*
-+#* Implementation getopt.cxx
-+#*
-+#* Description: class to reflect the commandline options. In addition
-+#* it provides functinality to get options from an inifile
-+#* ( getIniOptions()), evaluate, test and get options
-+#* ( hasOpt(), getOpt() ) and display an usage screen
-+#* formated in dependance of the given optionset, as well
-+#* as display a status about activ options
-+#*
-+#*
-+#* further descriptions:
-+#*
-+#* the constructor is called with two parameters:
-+#* char* argv[] and char* optionSet[],
-+#* the commandline and the available set of options.
-+#* Valid optionstrings have to start with a minus '-', otherwise it will
-+#* be ignored. Optionstrings consist of one or two arguments divided by a
-+#* comma separator, where the second (optional) argument is a short
-+#* description of the option, called hint. It will be automatically
-+#* formated and displayed in the usage screen if available.
-+#* The first argument of the optionstring can consist of two sections,
-+#* the name and the optional necessity and format.
-+#* The name of the option will be the starting minus followed by a string
-+#* like "-src".
-+#* One section options will be treated as flag (see '-v' option in example).
-+#* The second section consist of '=' or ':' which defines the necessity,
-+#* in combination with a character 's' for string or 'n' for numeric and
-+#* an optional '@' standing for 'vector of'.
-+#* '=' means this option needs an argument, ':' means can take an argument
-+#* followed by 's' is, as mentioned above, a single string paramenter,
-+#* followed by a 's' in combination with '@' means this argument consists
-+#* of one string or a vector of strings separated by commas
-+#*
-+#* an example for an optionset:
-+#*
-+#* static char* optionSet[] = {
-+#* "-src=s, release or version of sources",
-+#* "-ini=s, ini file with additional options",
-+#* "-db=s, path of type description database",
-+#* "-inPth=s, source path of component descriptions",
-+#* "-outPth=s, destination path for testcases",
-+#* "-logPth=s, destination path for logging",
-+#* "-mdl=s@, name(s) of module(s) to generate",
-+#* "-v, enable verbose screen messages",
-+#* "-dbg, enable debug messages",
-+#* "-h:s, display help or help on option",
-+#* "-help:s, see -h",
-+#* NULL
-+#* };
-+#*
-+#* As seen a GetOpt class object will be created via:
-+#* GetOpt myOptions( argv, optionSet );
-+#*
-+*************************************************************************/
-+#ifndef __QADEV_REGSCAN_GETOPT_HXX__
-+#define __QADEV_REGSCAN_GETOPT_HXX__
-+
-+#include <osl/file.hxx>
-+#include <sal/types.h>
-+#include <rtl/strbuf.hxx>
-+
-+
-+#include <rtl/string.hxx>
-+
-+// #ifndef __QADEV_REGSCAN_UTIL_HXX__
-+// #include "inc/util.hxx"
-+// #endif
-+
-+
-+#ifdef SOLARIS
-+#include <sys/time.h>
-+#endif
-+
-+#include <iostream>
-+#include <hash_map>
-+// #include "rsexception.hxx"
-+
-+// using namespace std;
-+
-+struct gstr {
-+ sal_Bool operator()( const rtl::OString& oStr1,
-+ const rtl::OString& oStr2 ) const {
-+ return( oStr1 == oStr2 );
-+ }
-+};
-+
-+struct ghstr
-+{
-+ sal_uInt32 operator()( const rtl::OString& str ) const {
-+ return str.hashCode();
-+ }
-+};
-+
-+struct frmt {
-+ sal_uInt32 fCol;
-+ sal_uInt32 sCol;
-+ sal_uInt32 len;
-+};
-+
-+typedef std::hash_map< rtl::OString, std::vector< rtl::OString >, ghstr, gstr >
-+ optHashMap;
-+
-+typedef frmt sFormat;
-+typedef sal_uInt16 optType;
-+
-+#define OT_INVALID 0x0000
-+#define OT_BOOL 0x0001
-+#define OT_STRING 0x0002
-+#define OT_NUMBER 0x0004
-+#define OT_SINGLE 0x0010
-+#define OT_MULTI 0x0020
-+#define OT_OPTIONAL 0x0100
-+
-+//: Option
-+class OptDsc {
-+
-+ rtl::OString m_name;
-+ rtl::OString m_hint;
-+ rtl::OString m_legend;
-+ optType m_type;
-+
-+ /**
-+ * analysis of optionstring and creation of option description class
-+ * @param const rtl::OString& opt = optionstring to analyse
-+ * @return void
-+ */
-+ void createOptDsc( const rtl::OString& opt );
-+
-+ /**
-+ * splitting of an optionstring and creation of a tokenvector
-+ * in dependance of a charset
-+ *
-+ * @param const rtl::OString& opt = optionstring to split
-+ * @param const rtl::OString& cSet = delimiter charset
-+ * @param vector< rtl::OString >& optLine = tokenvector to fill
-+ *
-+ * @return void
-+ */
-+ void split( const rtl::OString& opt, const rtl::OString& charSet,
-+ std::vector< rtl::OString >& optLine );
-+
-+ /**
-+ * private default c'tor, copy c'tor and assignment operator
-+ * to get compiler errors on dumb effords
-+ */
-+ OptDsc();
-+ OptDsc( OptDsc& );
-+ OptDsc& operator = ( OptDsc& );
-+
-+public:
-+
-+ //> c'tor
-+ OptDsc( const rtl::OString& opt )
-+ : m_name(),
-+ m_hint(),
-+ m_legend(),
-+ m_type( 0 ) {
-+
-+ createOptDsc( opt );
-+ } ///< c'tor
-+
-+ //> d'tor
-+ ~OptDsc(){}
-+
-+ /**
-+ * returns the name of this option
-+ * @return rtl::OString&
-+ */
-+ inline rtl::OString& getName() { return m_name; }
-+ /**
-+ * returns the hint of this option
-+ * @return rtl::OString&
-+ */
-+ inline rtl::OString& getHint() { return m_hint; }
-+ /**
-+ * returns the legend of this option
-+ * @return rtl::OString&
-+ */
-+ inline rtl::OString& getLegend() { return m_legend; }
-+
-+ /**
-+ * returns the type of this option
-+ * @return optType
-+ */
-+ inline optType getType() { return m_type; }
-+
-+
-+ inline sal_Bool isFlag() {
-+ return( ( m_type &~ 0xfffe ) == OT_BOOL ) ? sal_True : sal_False;
-+ }
-+ inline sal_Bool isString() {
-+ return( ( m_type &~ 0xfffd ) == OT_STRING ) ? sal_True : sal_False;
-+ }
-+ inline sal_Bool isNumber() {
-+ return( ( m_type &~ 0xfffb ) == OT_NUMBER ) ? sal_True : sal_False;
-+ }
-+ inline sal_Bool isSingle() {
-+ return( ( m_type &~ 0xffef ) == OT_SINGLE ) ? sal_True : sal_False;
-+ }
-+ inline sal_Bool isMulti() {
-+ return( ( m_type &~ 0xffdf ) == OT_MULTI ) ? sal_True : sal_False;
-+ }
-+ inline sal_Bool isOptional() {
-+ return( ( m_type &~ 0xfeff ) == OT_OPTIONAL ) ? sal_True : sal_False;
-+ }
-+
-+}; ///:~ Option
-+
-+class Exception
-+{
-+ rtl::OString m_sAsciiMessage;
-+public:
-+ Exception();
-+ virtual ~Exception(){}
-+
-+ Exception(char const* sAsciiMessage);
-+ Exception(rtl::OString const& sAsciiMessage);
-+
-+ virtual rtl::OUString message() const;
-+ virtual char const* what() const;
-+};
-+
-+class ValueNotFoundException : public Exception
-+{
-+public:
-+ ValueNotFoundException();
-+ ValueNotFoundException(char const* sExit);
-+};
-+
-+//: GetOpt
-+class GetOpt {
-+
-+ rtl::OString m_prgname;
-+ rtl::OString m_vardelim;
-+ std::vector< rtl::OString > m_cmdline;
-+ std::vector< rtl::OString > m_param;
-+ std::vector< rtl::OString > m_varvec;
-+ std::vector< OptDsc* > m_optionset;
-+ optHashMap m_opthash;
-+
-+ //> private methods
-+ void initialize( char* cmdLine[], char const * optSet[] );
-+ void createCmdLineOptions();
-+ sal_uInt32 getMaxNameLength();
-+ sal_uInt32 getMaxLegendLength();
-+ const rtl::OString optDsc2Str( OptDsc* optDsc , sFormat frm );
-+ void tokenize( const rtl::OString& opt, const rtl::OString& charSet,
-+ std::vector< rtl::OString >& optLine, sal_Bool strip = sal_True );
-+ ///< private methods
-+
-+ GetOpt();
-+ GetOpt( GetOpt& );
-+ GetOpt& operator = ( GetOpt& );
-+
-+public:
-+
-+ //> c'tor
-+ GetOpt( char* cmdLine[], char const * optSet[], rtl::OString varDelim =
-+ rtl::OString( "$" ) )
-+ : m_vardelim( varDelim ) {
-+
-+ initialize( cmdLine, optSet );
-+ createCmdLineOptions();
-+ } ///< c'tor
-+
-+ //> d'tor
-+ ~GetOpt();
-+ ///< d'tor
-+
-+ //> inline methods
-+ inline std::vector< rtl::OString >* getCmdLine() { return &m_cmdline; }
-+ inline optHashMap* getOptions() { return ( &m_opthash ); }
-+ inline rtl::OString& getName() { return m_prgname; }
-+ inline rtl::OString& getFirstParam() { return *(m_param.begin()); }
-+ inline std::vector< rtl::OString >& getParams() { return m_param; }
-+ rtl::OString& getOpt( const rtl::OString& opt );
-+ void rmvOpt( rtl::OString& opt ) {
-+ m_opthash.erase( opt );
-+ }
-+ inline std::vector< rtl::OString >& getOptVec( const rtl::OString& opt ) {
-+ return m_opthash[ opt ];
-+ }
-+ ///< inline methods
-+
-+
-+ sal_Bool exist( rtl::OString& opt );
-+ sal_Bool hasParam( std::vector< rtl::OString >::iterator iter );
-+ sal_Bool hasVars( void );
-+ sal_Bool evaluateOpt( std::vector< rtl::OString >::iterator iter );
-+ OptDsc* getOptDsc( rtl::OString& opt );
-+ sal_Bool hasOpt( const rtl::OString& opt ) const;
-+ ::osl::FileBase::RC getIniOptions( rtl::OString iniPth );
-+ void createOpt( rtl::OString& optdsc );
-+ void str2Opt( rtl::OString iOpts );
-+ void addOpt( rtl::OString& opt, sal_Bool evaluate = sal_True );
-+ void replVars( void );
-+ void showUsage( void );
-+ void printStatus( void );
-+
-+}; ///:~ GetOpt
-+#endif
-Nur in misc/build/cppunit-1.8.0/include/testshl: getopt.hxx.dummy.
---- misc/cppunit-1.8.0/include/testshl/log.hxx 2008-12-10 20:46:08.078572827 +0100
-+++ misc/build/cppunit-1.8.0/include/testshl/log.hxx 2008-07-07 08:13:42.000000000 +0200
-@@ -1 +1,116 @@
--dummy
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org. If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ *************************************************************************
-+
-+ Source Code Control System - Header
-+
-+ $Header$
-+
-+ Source Code Control System - Update
-+
-+*************************************************************************/
-+#ifndef __QADEV_REGSCAN_LOG_HXX__
-+#define __QADEV_REGSCAN_LOG_HXX__
-+
-+#include <time.h>
-+#include <rtl/ustring.hxx>
-+#include <rtl/strbuf.hxx>
-+#include <sal/types.h>
-+#include <osl/thread.h>
-+#include <osl/file.hxx>
-+
-+//!io #include <iostream>
-+#include <vector>
-+
-+// using namespace std;
-+
-+
-+/**
-+ * Log derives the interface of the ::osl::File class ( is-a relation ).
-+ * Its members (has-a relation) are the (full qualified)name of the log
-+ * and an OStringBuffer which represents the content of the logfile.
-+ * It provides the functionality of easy-to-use open and write logs
-+ */
-+//: Log
-+class Log {
-+
-+ ::osl::File* m_logfile; // fileobject
-+ rtl::OUString m_logurl; // url of log
-+ rtl::OStringBuffer m_buf; // content of log
-+
-+ Log();
-+
-+public:
-+
-+ //> c'tor
-+ /**
-+ * constructors argument is a full qualified UNC path
-+ * @param OUString logfile ( full qualified UNC path )
-+ */
-+ Log( const rtl::OUString& logURL )
-+ : m_logfile( new ::osl::File( logURL ))
-+ , m_logurl(logURL)
-+ {} ///< c'tor
-+
-+ //> d'tor
-+ virtual ~Log() {
-+ m_logfile->close();
-+ delete( m_logfile );
-+ } ///< d'tor
-+
-+ //> inline methods
-+ // returns a reference to name instance
-+ inline rtl::OUString getLogURL() { return m_logurl; }
-+ inline rtl::OString getName() { return rtl::OUStringToOString(
-+ m_logurl, RTL_TEXTENCODING_ASCII_US ); }
-+ ///< inline methods
-+
-+ // open logfile for overwrite (default) or append
-+ ::osl::FileBase::RC open( sal_Bool append = sal_False );
-+ ::osl::FileBase::RC close() { return m_logfile->close(); }
-+
-+
-+ // write methods without (default) or with echo on display
-+ ::osl::FileBase::RC write( const sal_Char* buf, sal_Bool v = sal_False );
-+ ::osl::FileBase::RC write( const rtl::OString& buf,
-+ sal_Bool v = sal_False );
-+ // ::osl::FileBase::RC write( rtl::OStringBuffer const& buf,
-+ // sal_Bool v = sal_False );
-+ ::osl::FileBase::RC write( const rtl::OUString& buf,
-+ rtl_TextEncoding enc = RTL_TEXTENCODING_ASCII_US,
-+ sal_Bool v = sal_False );
-+
-+}; ///:~ Log
-+
-+Log &operator <<( Log &_aLog, const sal_Char * _sValue );
-+Log &operator <<( Log &_aLog, rtl::OString const& _sValue );
-+Log &operator <<( Log &_aLog, rtl::OUString const& _sValue );
-+// Log &operator <<( Log &_aLog, rtl::OStringBuffer const& _sValue );
-+
-+#endif
-Nur in misc/build/cppunit-1.8.0/include/testshl: log.hxx.dummy.
---- misc/cppunit-1.8.0/include/testshl/tresstatewrapper.h 2008-12-10 20:46:08.171096366 +0100
-+++ misc/build/cppunit-1.8.0/include/testshl/tresstatewrapper.h 2008-07-07 08:13:42.000000000 +0200
-@@ -1 +1,66 @@
--dummy
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org. If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+#ifndef TESTSTATEWRAPPER_H
-+#define TESTSTATEWRAPPER_H
-+
-+#ifdef _RTL_TRES_H_
-+#error "This is old code, please remove the include of rtl/tres.h"
-+#endif
-+
-+#include <sal/types.h>
-+#include "cppunit/autoregister/registertestfunction.h"
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+// typedef void* hTestResult;
-+typedef hTestResult rtlTestResult;
-+
-+// -----------------------------------------------------------------------------
-+void c_rtl_tres_state_start(hTestResult _aResult, const sal_Char* _pName);
-+void c_rtl_tres_state_end(hTestResult _aResult, const sal_Char* _pName);
-+
-+// -----------------------------------------------------------------------------
-+// the old test state function, which here convert all values for using with the
-+// new testshl tool
-+
-+sal_Bool SAL_CALL c_rtl_tres_state(
-+ hTestResult pResult,
-+ sal_Bool bSuccess,
-+ char const * pTestMsg,
-+ char const * pFuncName);
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif
-Nur in misc/build/cppunit-1.8.0/include/testshl: tresstatewrapper.h.dummy.
---- misc/cppunit-1.8.0/include/testshl/tresstatewrapper.hxx 2008-12-10 20:46:08.253163483 +0100
-+++ misc/build/cppunit-1.8.0/include/testshl/tresstatewrapper.hxx 2008-12-10 20:42:43.000000000 +0100
-@@ -1 +1,60 @@
--dummy
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org. If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+#ifndef teststatewrapper_hxx
-+#define teststatewrapper_hxx
-+
-+#include <cppunit/nocopy.hxx>
-+#include <sal/types.h>
-+
-+#include <cppunit/simpleheader.hxx>
-+#include <cppunit/autoregister/callbackfunc_fktptr.h>
-+
-+// This is a hack, because it's possible that the testshl directory doesn't exist.
-+#ifdef LOAD_TRESSTATEWRAPPER_LOCAL
-+#include "tresstatewrapper.h"
-+#else
-+#include <testshl/tresstatewrapper.h>
-+#endif
-+
-+// -----------------------------------------------------------------------------
-+// helper class to mark the start off old test code
-+// the name is need in the test result generator
-+class rtl_tres_state_start : NOCOPY
-+{
-+ const sal_Char* m_pName;
-+ hTestResult m_aResult;
-+public:
-+ rtl_tres_state_start(hTestResult _aResult, const sal_Char* _pName);
-+ ~rtl_tres_state_start();
-+};
-+
-+#endif
-+
-Nur in misc/build/cppunit-1.8.0/include/testshl: tresstatewrapper.hxx.dummy.
---- misc/cppunit-1.8.0/include/testshl/versionhelper.hxx 2008-12-10 20:46:08.329903269 +0100
-+++ misc/build/cppunit-1.8.0/include/testshl/versionhelper.hxx 2008-07-07 08:13:42.000000000 +0200
-@@ -1 +1,87 @@
--dummy
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org. If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+#ifndef AUTOREGISTER_HXX
-+#define AUTOREGISTER_HXX
-+
-+#include <stdio.h>
-+#include <vector>
-+#include <ostream>
-+#include <iostream>
-+
-+#include <rtl/ustring.hxx>
-+#include <rtl/string.hxx>
-+
-+#include "dynamicregister.hxx"
-+
-+// -----------------------------------------------------------------------------
-+// ---------------------------------- Version ----------------------------------
-+// -----------------------------------------------------------------------------
-+// extern "C" const struct VersionInfo *GetVersionInfo();
-+
-+// this is a Hack, but at the moment, no change to handle this behaviour better.
-+struct VersionInfo
-+{
-+ const char* pTime;
-+ const char* pDate;
-+ const char* pUpd;
-+ const char* pMinor;
-+ const char* pBuild;
-+ const char* pInpath;
-+};
-+typedef const struct VersionInfo* (*FktGetVersionInfoPtr)();
-+
-+// -----------------------------------------------------------------------------
-+class VersionHelper : public DynamicLibraryHelper
-+{
-+ const VersionInfo *m_pInfo;
-+
-+public:
-+ VersionHelper(rtl::OUString const& _sDLLName, GetOpt & _aOptions);
-+// void print(std::ostream& _aStream);
-+ void printall(FILE*);
-+
-+ rtl::OString getTime() const;
-+ rtl::OString getDate() const;
-+ rtl::OString getUpd() const;
-+ rtl::OString getMinor() const;
-+ rtl::OString getBuild() const;
-+ rtl::OString getInpath() const;
-+
-+ bool isOk() const;
-+};
-+
-+/** insertion operator for easy output */
-+// std::ostream &operator <<( std::ostream &stream,
-+// VersionHelper &version );
-+
-+
-+#endif
-+
-Nur in misc/build/cppunit-1.8.0/include/testshl: versionhelper.hxx.dummy.
---- misc/cppunit-1.8.0/include/testshl/winstuff.hxx 2008-12-10 20:46:08.412541288 +0100
-+++ misc/build/cppunit-1.8.0/include/testshl/winstuff.hxx 2008-07-16 14:09:24.000000000 +0200
-@@ -1 +1,44 @@
--dummy
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ *
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org. If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+#ifndef WINSTUFF_HXX
-+#define WINSTUFF_HXX
-+
-+#include <sal/types.h>
-+
-+// Isolated into own compilation unit, to avoid interference with
-+// windows headers
-+void WinDebugBreak();
-+void WinSleep( sal_uInt32 sec );
-+sal_uInt32 WinGetCurrentProcessId();
-+void WinTerminateApp( sal_uInt32 dwPID, sal_uInt32 dwTimeout );
-+
-+#endif
-Nur in misc/build/cppunit-1.8.0/include/testshl: winstuff.hxx.dummy.
---- misc/cppunit-1.8.0/makefile.mk 2008-12-10 20:46:08.628149187 +0100
-+++ misc/build/cppunit-1.8.0/makefile.mk 2008-12-09 14:43:50.000000000 +0100
-@@ -1 +1,35 @@
--dummy
-+#*************************************************************************
-+#
-+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+#
-+# Copyright 2008 by Sun Microsystems, Inc.
-+#
-+# OpenOffice.org - a multi-platform office productivity suite
-+#
-+# $RCSfile$
-+#
-+# $Revision$
-+#
-+# This file is part of OpenOffice.org.
-+#
-+# OpenOffice.org is free software: you can redistribute it and/or modify
-+# it under the terms of the GNU Lesser General Public License version 3
-+# only, as published by the Free Software Foundation.
-+#
-+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
@@ -4289,18 +1296,14 @@ Nur in misc/build/cppunit-1.8.0/include/testshl: winstuff.hxx.dummy.
+#*************************************************************************
+
+target:
-+ cd src$/win32 && $(MAKE) $(MFLAGS) $(CALLMACROS)
-+ cd src$/result && $(MAKE) $(MFLAGS) $(CALLMACROS)
-+ cd src$/cppunit && $(MAKE) $(MFLAGS) $(CALLMACROS)
-Nur in misc/build/cppunit-1.8.0: makefile.mk.dummy.
++ cd src && $(MAKE) $(MFLAGS) $(CALLMACROS)
--- misc/cppunit-1.8.0/src/cppunit/Asserter.cpp 2002-03-27 20:04:02.000000000 +0100
-+++ misc/build/cppunit-1.8.0/src/cppunit/Asserter.cpp 2008-02-27 17:21:16.000000000 +0100
-@@ -1,52 +1,76 @@
++++ misc/build/cppunit-1.8.0/src/cppunit/Asserter.cpp 2009-09-12 14:15:35.343750000 +0200
+@@ -1,52 +1,72 @@
#include <cppunit/Asserter.h>
#include <cppunit/NotEqualException.h>
--
-+#include <cppunit/stringhelper.hxx>
+-
namespace CppUnit
{
-
@@ -4349,7 +1352,7 @@ Nur in misc/build/cppunit-1.8.0: makefile.mk.dummy.
- SourceLine sourceLine,
- std::string additionalMessage )
+failIf( bool shouldFail,
-+ rtl::OUString const& _suMessage,
++ const char* _suMessage,
+ SourceLine const& location )
{
- throw NotEqualException( expected,
@@ -4358,10 +1361,7 @@ Nur in misc/build/cppunit-1.8.0: makefile.mk.dummy.
- additionalMessage );
+ if ( shouldFail )
+ {
-+ rtl::OString sMessage;
-+ sMessage <<= _suMessage;
-+ std::string message;
-+ message = sMessage.getStr();
++ std::string message( _suMessage );
+ fail( message, location );
+ }
+}
@@ -4394,7 +1394,7 @@ Nur in misc/build/cppunit-1.8.0: makefile.mk.dummy.
if ( shouldFail )
failNotEqual( expected, actual, sourceLine, additionalMessage );
--- misc/cppunit-1.8.0/src/cppunit/Exception.cpp 2001-10-19 20:37:24.000000000 +0200
-+++ misc/build/cppunit-1.8.0/src/cppunit/Exception.cpp 2008-02-27 17:21:46.000000000 +0100
++++ misc/build/cppunit-1.8.0/src/cppunit/Exception.cpp 2009-09-12 14:15:35.359375000 +0200
@@ -19,20 +19,19 @@
/// Construct the exception
@@ -4437,7 +1437,7 @@ Nur in misc/build/cppunit-1.8.0: makefile.mk.dummy.
m_sourceLine( fileName, lineNumber )
{
--- misc/cppunit-1.8.0/src/cppunit/NotEqualException.cpp 2001-10-06 00:27:14.000000000 +0200
-+++ misc/build/cppunit-1.8.0/src/cppunit/NotEqualException.cpp 2008-02-27 17:21:34.000000000 +0100
++++ misc/build/cppunit-1.8.0/src/cppunit/NotEqualException.cpp 2009-09-12 14:15:35.359375000 +0200
@@ -3,17 +3,17 @@
namespace CppUnit {
@@ -4482,7 +1482,7 @@ Nur in misc/build/cppunit-1.8.0: makefile.mk.dummy.
lineNumber,
fileName ),
--- misc/cppunit-1.8.0/src/cppunit/SourceLine.cpp 2001-10-06 00:27:14.000000000 +0200
-+++ misc/build/cppunit-1.8.0/src/cppunit/SourceLine.cpp 2008-02-27 17:23:14.000000000 +0100
++++ misc/build/cppunit-1.8.0/src/cppunit/SourceLine.cpp 2009-09-12 14:15:35.375000000 +0200
@@ -10,10 +10,10 @@
}
@@ -4499,7 +1499,7 @@ Nur in misc/build/cppunit-1.8.0: makefile.mk.dummy.
}
--- misc/cppunit-1.8.0/src/cppunit/TestAssert.cpp 2001-10-07 21:36:47.000000000 +0200
-+++ misc/build/cppunit-1.8.0/src/cppunit/TestAssert.cpp 2008-02-27 17:23:24.000000000 +0100
++++ misc/build/cppunit-1.8.0/src/cppunit/TestAssert.cpp 2009-09-12 14:15:35.390625000 +0200
@@ -1,4 +1,4 @@
-#if HAVE_CMATH
+#ifdef HAVE_CMATH
@@ -4588,8 +1588,8 @@ Nur in misc/build/cppunit-1.8.0: makefile.mk.dummy.
--- misc/cppunit-1.8.0/src/cppunit/TestCase.cpp 2002-03-25 23:35:34.000000000 +0100
-+++ misc/build/cppunit-1.8.0/src/cppunit/TestCase.cpp 2008-02-27 17:21:24.000000000 +0100
-@@ -1,70 +1,141 @@
++++ misc/build/cppunit-1.8.0/src/cppunit/TestCase.cpp 2009-09-12 15:14:46.515625000 +0200
+@@ -1,74 +1,142 @@
+#include <stdlib.h>
#include <cppunit/Portability.h>
#include <typeinfo>
@@ -4598,11 +1598,9 @@ Nur in misc/build/cppunit-1.8.0: makefile.mk.dummy.
#include "cppunit/TestCase.h"
#include "cppunit/Exception.h"
-#include "cppunit/TestResult.h"
-+// #include "cppunit/TestResult.h"
-
-+#include <cppunit/autoregister/callbackfunc_fktptr.h>
-+#include <cppunit/tagvalues.hxx>
-+#include <cppunit/externcallbackfunc.hxx>
+-
++#include "cppunit/tagvalues.hxx"
++#include "cppunit/externcallbackfunc.hxx"
namespace CppUnit {
@@ -4612,22 +1610,72 @@ Nur in misc/build/cppunit-1.8.0: makefile.mk.dummy.
-{
- return new TestResult;
-}
-+//# CppUnit::TestResult*
+-
+-
+-/// Run the test and catch any exceptions that are triggered by it
+-void
+-TestCase::run( TestResult *result )
+-{
+- result->startTest(this);
+-
+- try {
+- setUp();
+-
+- try {
+- runTest();
+- }
+- catch ( Exception &e ) {
+- Exception *copy = e.clone();
+- result->addFailure( this, copy );
+- }
+- catch ( std::exception &e ) {
+- result->addError( this, new Exception( e.what() ) );
+- }
+- catch (...) {
+- Exception *e = new Exception( "caught unknown exception" );
+- result->addError( this, e );
+- }
+-
+- try {
+- tearDown();
+- }
+- catch (...) {
+- result->addError( this, new Exception( "tearDown() failed" ) );
+- }
+- }
+- catch (...) {
+- result->addError( this, new Exception( "setUp() failed" ) );
+- }
+-
+- result->endTest( this );
+-}
+-
+-
+-/// A default run method
+-TestResult *
+-TestCase::run()
+-{
+- TestResult *result = defaultResult();
+-
+- run (result);
+- return result;
+-}
++//# CppUnit::TestResult*
+//# TestCase::defaultResult()
-+//# {
-+//# return new TestResult;
-+//# }
-
-
- /// Run the test and catch any exceptions that are triggered by it
-+//# void
++//# {
++//# return new TestResult;
++//# }
++
++
++/// Run the test and catch any exceptions that are triggered by it
++//# void
+//# TestCase::run( TestResult *result )
+//# {
+//# result->startTest(this);
-+//#
++//#
+//# try {
+//# setUp();
-+//#
++//#
+//# try {
+//# runTest();
+//# }
@@ -4642,7 +1690,7 @@ Nur in misc/build/cppunit-1.8.0: makefile.mk.dummy.
+//# Exception *e = new Exception( "caught unknown exception" );
+//# result->addError( this, e );
+//# }
-+//#
++//#
+//# try {
+//# tearDown();
+//# }
@@ -4653,132 +1701,97 @@ Nur in misc/build/cppunit-1.8.0: makefile.mk.dummy.
+//# catch (...) {
+//# result->addError( this, new Exception( "setUp() failed" ) );
+//# }
-+//#
++//#
+//# result->endTest( this );
+//# }
+//#
+
- void
--TestCase::run( TestResult *result )
++void
+TestCase::run( hTestResult result )
- {
-- result->startTest(this);
--
-- try {
-- setUp();
-+ Test* pTest = this;
-
-- try {
-- runTest();
-- }
-- catch ( Exception &e ) {
-- Exception *copy = e.clone();
-- result->addFailure( this, copy );
-- }
-- catch ( std::exception &e ) {
-- result->addError( this, new Exception( e.what() ) );
-- }
-- catch (...) {
-- Exception *e = new Exception( "caught unknown exception" );
-- result->addError( this, e );
-- }
--
-- try {
-- tearDown();
-- }
-- catch (...) {
-- result->addError( this, new Exception( "tearDown() failed" ) );
-- }
-- }
-- catch (...) {
-- result->addError( this, new Exception( "setUp() failed" ) );
-- }
--
-- result->endTest( this );
++{
++ CppUnit::Test* pTest = this;
++
+ // if (signalCheck(pTest->getName()) == HAS_SIGNAL)
-+ sal_Int32 nValue = (pCallbackFunc)(0 /* NULL */, TAG_TYPE, EXECUTION_CHECK, TAG_RESULT_PTR, result, TAG_NODENAME, pTest->getName().c_str(), TAG_DONE);
++ long nValue = (pCallbackFunc)(0 /* NULL */, TAG_TYPE, EXECUTION_CHECK, TAG_RESULT_PTR, result, TAG_NODENAME, pTest->getName().c_str(), TAG_DONE);
+ if (nValue == DO_NOT_EXECUTE)
+ {
+ return;
+ }
-+
++
+ // (pTestResult_StartTest)(result, pTest);
+ (pCallbackFunc)(0 /* NULL */, TAG_TYPE, RESULT_START, TAG_RESULT_PTR, result, TAG_TEST_PTR, pTest, TAG_DONE);
+
-+ try
++ try
+ {
+ setUp();
-+
-+ try
++
++ try
+ {
+ runTest();
+ // (pTestResult_AddInfo)(result, pTest, "PASSED");
+ (pCallbackFunc)(0 /* NULL */, TAG_TYPE, RESULT_ADD_INFO, TAG_RESULT_PTR, result, TAG_TEST_PTR, pTest, TAG_INFO, "PASSED", TAG_DONE);
+ }
-+ catch ( StubException &)
++ catch ( CppUnit::StubException &)
+ {
+ (pCallbackFunc)(0 /* NULL */, TAG_TYPE, RESULT_ADD_INFO, TAG_RESULT_PTR, result, TAG_TEST_PTR, pTest, TAG_INFO, "STUB", TAG_DONE );
+ }
-+ catch ( Exception &e )
++ catch ( CppUnit::Exception &e )
+ {
-+ Exception *copy = e.clone();
++ CppUnit::Exception *copy = e.clone();
+ // (pTestResult_AddFailure)( result, pTest, copy );
+ (pCallbackFunc)(0 /* NULL */, TAG_TYPE, RESULT_ADD_FAILURE, TAG_RESULT_PTR, result, TAG_TEST_PTR, pTest, TAG_EXCEPTION, copy, TAG_DONE );
+ }
-+ catch ( std::exception &e )
++ catch ( std::exception &e )
+ {
+ // (pTestResult_AddError)( result, pTest, new Exception( e.what() ) );
-+ (pCallbackFunc)( 0 /* NULL */, TAG_TYPE, RESULT_ADD_ERROR, TAG_RESULT_PTR, result, TAG_TEST_PTR, pTest, TAG_EXCEPTION, new Exception( e.what() ), TAG_DONE );
++ (pCallbackFunc)( 0 /* NULL */, TAG_TYPE, RESULT_ADD_ERROR, TAG_RESULT_PTR, result, TAG_TEST_PTR, pTest, TAG_EXCEPTION, new CppUnit::Exception( e.what() ), TAG_DONE );
+ }
-+ catch (...)
++ catch (...)
+ {
-+ Exception *e = new Exception( "caught unknown exception" );
++ CppUnit::Exception *e = new CppUnit::Exception( "caught unknown exception" );
+ // (pTestResult_AddError)( result, pTest, e );
+ (pCallbackFunc)( 0 /* NULL */, TAG_TYPE, RESULT_ADD_ERROR, TAG_RESULT_PTR, result, TAG_TEST_PTR, pTest, TAG_EXCEPTION, e, TAG_DONE );
+ }
-+
-+ try
++
++ try
+ {
+ tearDown();
+ }
-+ catch (...)
++ catch (...)
+ {
+ // (pTestResult_AddError)( result, pTest, new Exception( "tearDown() failed" ) );
-+ (pCallbackFunc)( 0 /* NULL */, TAG_TYPE, RESULT_ADD_ERROR, TAG_RESULT_PTR, result, TAG_TEST_PTR, pTest, TAG_EXCEPTION, new Exception( "tearDown() failed" ), TAG_DONE );
++ (pCallbackFunc)( 0 /* NULL */, TAG_TYPE, RESULT_ADD_ERROR, TAG_RESULT_PTR, result, TAG_TEST_PTR, pTest, TAG_EXCEPTION, new CppUnit::Exception( "tearDown() failed" ), TAG_DONE );
+ }
+ }
-+ catch (...)
++ catch (...)
+ {
+ // (pTestResult_AddError)( result, pTest, new Exception( "setUp() failed" ) );
-+ (pCallbackFunc)( 0 /* NULL */, TAG_TYPE, RESULT_ADD_ERROR, TAG_RESULT_PTR, result, TAG_TEST_PTR, pTest, TAG_EXCEPTION, new Exception( "setUp() failed" ), TAG_DONE );
++ (pCallbackFunc)( 0 /* NULL */, TAG_TYPE, RESULT_ADD_ERROR, TAG_RESULT_PTR, result, TAG_TEST_PTR, pTest, TAG_EXCEPTION, new CppUnit::Exception( "setUp() failed" ), TAG_DONE );
+ }
-+
++
+ // (pTestResult_EndTest)( result, pTest );
+ (pCallbackFunc)( 0 /* NULL */, TAG_TYPE, RESULT_END, TAG_RESULT_PTR, result, TAG_TEST_PTR, pTest, TAG_DONE );
- }
-
--
- /// A default run method
--TestResult *
--TestCase::run()
--{
-- TestResult *result = defaultResult();
--
-- run (result);
-- return result;
--}
++}
++
++/// A default run method
+//# TestResult *
+//# TestCase::run()
+//# {
+//# TestResult *result = defaultResult();
-+//#
++//#
+//# run (result);
+//# return result;
+//# }
- /// All the work for runTest is deferred to subclasses
-@@ -77,7 +148,7 @@
+-/// All the work for runTest is deferred to subclasses
+-void
++/// All the work for runTest is deferred to subclasses
++void
+ TestCase::runTest()
+ {
+ }
+@@ -77,7 +145,7 @@
/** Constructs a test case.
* \param name the name of the TestCase.
**/
@@ -4787,8 +1800,49 @@ Nur in misc/build/cppunit-1.8.0: makefile.mk.dummy.
: m_name(name)
{
}
-@@ -133,3 +204,8 @@
-
+@@ -100,25 +168,25 @@
+
+
+ /// Returns a count of all the tests executed
+-int
++int
+ TestCase::countTestCases() const
+-{
+- return 1;
++{
++ return 1;
+ }
+
+
+ /// Returns the name of the test case
+-std::string
++std::string
+ TestCase::getName() const
+-{
+- return m_name;
++{
++ return m_name;
+ }
+
+
+ /// Returns the name of the test case instance
+-std::string
++std::string
+ TestCase::toString() const
+-{
++{
+ std::string className;
+
+ #if CPPUNIT_USE_TYPEINFO_NAME
+@@ -128,8 +196,13 @@
+ className = "TestCase";
+ #endif
+
+- return className + "." + getName();
++ return className + "." + getName();
+ }
+-
++
} // namespace CppUnit
+
@@ -4797,8 +1851,8 @@ Nur in misc/build/cppunit-1.8.0: makefile.mk.dummy.
+// tab-width:4
+// End:
--- misc/cppunit-1.8.0/src/cppunit/TestFactoryRegistry.cpp 2002-03-28 16:47:08.000000000 +0100
-+++ misc/build/cppunit-1.8.0/src/cppunit/TestFactoryRegistry.cpp 2008-02-27 17:22:38.000000000 +0100
-@@ -1,12 +1,20 @@
++++ misc/build/cppunit-1.8.0/src/cppunit/TestFactoryRegistry.cpp 2009-09-12 15:17:54.093750000 +0200
+@@ -1,12 +1,19 @@
+#include <stdio.h>
+#include <stdlib.h>
#include <cppunit/extensions/TestFactoryRegistry.h>
@@ -4806,7 +1860,6 @@ Nur in misc/build/cppunit-1.8.0: makefile.mk.dummy.
-#include <set>
+#include <set>
-+//!io #include <iostream>
+#include <sstream>
#if CPPUNIT_USE_TYPEINFO_NAME
@@ -4820,7 +1873,7 @@ Nur in misc/build/cppunit-1.8.0: makefile.mk.dummy.
namespace CppUnit {
-@@ -26,15 +34,18 @@
+@@ -26,15 +33,18 @@
static NamedRegistries &getInstance();
@@ -4842,7 +1895,7 @@ Nur in misc/build/cppunit-1.8.0: makefile.mk.dummy.
typedef std::set<TestFactory *> Factories;
Factories m_factoriesToDestroy;
-@@ -44,13 +55,27 @@
+@@ -44,13 +54,27 @@
NamedRegistries::~NamedRegistries()
{
@@ -4877,7 +1930,7 @@ Nur in misc/build/cppunit-1.8.0: makefile.mk.dummy.
}
-@@ -63,17 +88,55 @@
+@@ -63,17 +87,55 @@
TestFactoryRegistry &
@@ -4938,7 +1991,7 @@ Nur in misc/build/cppunit-1.8.0: makefile.mk.dummy.
}
-@@ -91,9 +154,32 @@
+@@ -91,9 +153,32 @@
return m_destroyedFactories.count( factory ) == 0;
}
@@ -4972,7 +2025,7 @@ Nur in misc/build/cppunit-1.8.0: makefile.mk.dummy.
m_name( name )
{
}
-@@ -116,26 +202,38 @@
+@@ -116,26 +201,38 @@
}
}
@@ -5014,7 +2067,7 @@ Nur in misc/build/cppunit-1.8.0: makefile.mk.dummy.
}
-@@ -144,10 +242,23 @@
+@@ -144,10 +241,23 @@
{
static int serialNumber = 1;
@@ -5024,8 +2077,8 @@ Nur in misc/build/cppunit-1.8.0: makefile.mk.dummy.
- registerFactory( ost.str(), factory );
+ std::string aStr("@Dummy@_");
+
-+ sal_Char cBuf[20];
-+ sal_Char *pBuf = cBuf;
++ char cBuf[20];
++ char *pBuf = cBuf;
+ sprintf(pBuf, "%d", serialNumber++ );
+
+ aStr += std::string(pBuf);
@@ -5042,7 +2095,7 @@ Nur in misc/build/cppunit-1.8.0: makefile.mk.dummy.
}
-@@ -163,6 +274,9 @@
+@@ -163,6 +273,9 @@
void
TestFactoryRegistry::addTestToSuite( TestSuite *suite )
{
@@ -5053,7 +2106,7 @@ Nur in misc/build/cppunit-1.8.0: makefile.mk.dummy.
it != m_factories.end();
++it )
--- misc/cppunit-1.8.0/src/cppunit/TestFailure.cpp 2002-02-28 11:57:20.000000000 +0100
-+++ misc/build/cppunit-1.8.0/src/cppunit/TestFailure.cpp 2008-02-27 17:23:02.000000000 +0100
++++ misc/build/cppunit-1.8.0/src/cppunit/TestFailure.cpp 2009-09-12 14:15:35.437500000 +0200
@@ -5,12 +5,12 @@
namespace CppUnit {
@@ -5105,15 +2158,13 @@ Nur in misc/build/cppunit-1.8.0: makefile.mk.dummy.
} // namespace CppUnit
--- misc/cppunit-1.8.0/src/cppunit/TestSuite.cpp 2002-03-24 20:39:55.000000000 +0100
-+++ misc/build/cppunit-1.8.0/src/cppunit/TestSuite.cpp 2008-02-27 17:24:10.000000000 +0100
-@@ -1,11 +1,15 @@
++++ misc/build/cppunit-1.8.0/src/cppunit/TestSuite.cpp 2009-09-12 15:16:07.265625000 +0200
+@@ -1,11 +1,13 @@
+#include <stdlib.h>
#include "cppunit/TestSuite.h"
-#include "cppunit/TestResult.h"
-+// #include "cppunit/TestResult.h"
-+#include <cppunit/tagvalues.hxx>
-+#include <cppunit/autoregister/callbackfunc_fktptr.h>
-+#include <cppunit/externcallbackfunc.hxx>
++#include "cppunit/tagvalues.hxx"
++#include "cppunit/externcallbackfunc.hxx"
namespace CppUnit {
@@ -5125,7 +2176,7 @@ Nur in misc/build/cppunit-1.8.0: makefile.mk.dummy.
{
}
-@@ -13,7 +17,7 @@
+@@ -13,7 +15,7 @@
/// Destructor
TestSuite::~TestSuite()
{
@@ -5134,7 +2185,7 @@ Nur in misc/build/cppunit-1.8.0: makefile.mk.dummy.
}
-@@ -21,28 +25,37 @@
+@@ -21,28 +23,37 @@
void
TestSuite::deleteContents()
{
@@ -5169,8 +2220,8 @@ Nur in misc/build/cppunit-1.8.0: makefile.mk.dummy.
- }
+ // (pTestResult_EnterNode)(result, getName().c_str());
+ (pCallbackFunc)(0 /* NULL */, TAG_TYPE, RESULT_ENTER_NODE, TAG_RESULT_PTR, result, TAG_NODENAME, getName().c_str(), TAG_DONE);
-+ for ( std::vector<Test *>::iterator it = m_tests.begin();
-+ it != m_tests.end();
++ for ( std::vector<Test *>::const_iterator it = getTests().begin();
++ it != getTests().end();
+ ++it )
+ {
+ //# if ( result->shouldStop() )
@@ -5188,7 +2239,7 @@ Nur in misc/build/cppunit-1.8.0: makefile.mk.dummy.
}
-@@ -50,14 +63,14 @@
+@@ -50,14 +61,14 @@
int
TestSuite::countTestCases() const
{
@@ -5211,7 +2262,7 @@ Nur in misc/build/cppunit-1.8.0: makefile.mk.dummy.
}
-@@ -65,7 +78,7 @@
+@@ -65,7 +76,7 @@
void
TestSuite::addTest( Test *test )
{
@@ -5220,7 +2271,7 @@ Nur in misc/build/cppunit-1.8.0: makefile.mk.dummy.
}
-@@ -73,7 +86,7 @@
+@@ -73,7 +84,7 @@
std::string
TestSuite::toString() const
{
@@ -5229,7 +2280,7 @@ Nur in misc/build/cppunit-1.8.0: makefile.mk.dummy.
}
-@@ -81,16 +94,20 @@
+@@ -81,16 +92,20 @@
std::string
TestSuite::getName() const
{
@@ -5252,392 +2303,14 @@ Nur in misc/build/cppunit-1.8.0: makefile.mk.dummy.
+// Local Variables:
+// tab-width:4
+// End:
---- misc/cppunit-1.8.0/src/cppunit/cmdlinebits.cxx 2008-12-10 20:46:08.820775372 +0100
-+++ misc/build/cppunit-1.8.0/src/cppunit/cmdlinebits.cxx 2008-12-10 20:42:44.000000000 +0100
-@@ -1 +1,144 @@
--dummy
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org. If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+// MARKER(update_precomp.py): autogen include statement, do not remove
-+// #include "precompiled_cppunit.hxx"
-+
-+#ifdef WNT
-+# define UNDER_WINDOWS_DEBUGGING
-+# include "testshl/winstuff.hxx"
-+#endif /* WNT */
-+
-+#include <stdio.h>
-+#include <cppunit/cmdlinebits.hxx>
-+#include "cppunit/checkboom.hxx"
-+
-+#include <cppunit/autoregister/callbackstructure.h>
-+#include <osl/diagnose.h>
-+#include <rtl/tres.h>
-+#include <cppunit/stringhelper.hxx>
-+
-+extern CallbackStructure aGlobalStructure;
-+
-+sal_Bool isBit( CmdLineBits _nBits, CmdLineBits _nFlag );
-+
-+// sal_Bool isBit( CmdLineBits _nBits, CmdLineBits _nFlag )
-+// {
-+// return( ( _nBits & _nFlag ) == _nFlag );
-+// }
-+
-+void CheckBoom(bool bCondition, std::string const& msg)
-+{
-+ (void) msg; // avoid warning
-+ if ( isBit( aGlobalStructure.nBits, rtl_tres_Flag_BOOM ) )
-+ {
-+ /* force an assertion on false state */
-+ if ( !bCondition ) {
-+#ifdef UNDER_WINDOWS_DEBUGGING
-+ WinDebugBreak();
-+#else
-+ OSL_ENSURE( false, msg.c_str() );
-+#endif
-+ }
-+ }
-+}
-+
-+void CheckBoom(bool bCondition, rtl::OUString const& msg)
-+{
-+ if ( isBit( aGlobalStructure.nBits, rtl_tres_Flag_BOOM ) )
-+ {
-+ /* force an assertion on false state */
-+ rtl::OString sMessage;
-+ sMessage <<= msg;
-+ if ( !bCondition ) {
-+#ifdef UNDER_WINDOWS_DEBUGGING
-+ WinDebugBreak();
-+#else
-+ OSL_ENSURE( false, sMessage.getStr() );
-+#endif
-+ }
-+ }
-+}
-+
-+const char* getForwardString()
-+{
-+ return aGlobalStructure.psForward;
-+}
-+
-+// -----------------------------------------------------------------------------
-+// ----------------------------- own printf method -----------------------------
-+// -----------------------------------------------------------------------------
-+
-+// bool isVerbose()
-+// {
-+// if ( isBit( aGlobalStructure.nBits, rtl_tres_Flag_VERBOSE ) )
-+// {
-+// return true;
-+// }
-+// return false;
-+// }
-+//
-+// bool isQuiet()
-+// {
-+// if ( isBit( aGlobalStructure.nBits, rtl_tres_Flag_QUIET ) )
-+// {
-+// return true;
-+// }
-+// return false;
-+// }
-+//
-+// void impl_t_print(const char* _pFormatStr, va_list &args)
-+// {
-+// if (! isQuiet())
-+// {
-+// printf("# ");
-+// vprintf(_pFormatStr, args);
-+// }
-+// }
-+//
-+// void t_print(const char* _pFormatStr, ...)
-+// {
-+// va_list args;
-+// va_start( args, _pFormatStr );
-+// impl_t_print(_pFormatStr, args);
-+// va_end( args );
-+// }
-+//
-+// void t_print(T_Print_Params _eType, const char* _pFormatStr, ...)
-+// {
-+// if (_eType == T_VERBOSE && isVerbose())
-+// {
-+// // if T_VERBOSE and we should be verbose, print info
-+// va_list args;
-+// va_start( args, _pFormatStr );
-+// impl_t_print(_pFormatStr, args);
-+// va_end( args );
-+// }
-+// }
-Nur in misc/build/cppunit-1.8.0/src/cppunit: cmdlinebits.cxx.dummy.
---- misc/cppunit-1.8.0/src/cppunit/joblist.cxx 2008-12-10 20:46:08.893444692 +0100
-+++ misc/build/cppunit-1.8.0/src/cppunit/joblist.cxx 2008-12-09 09:03:54.000000000 +0100
-@@ -1 +1,224 @@
--dummy
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org. If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+// MARKER(update_precomp.py): autogen include statement, do not remove
-+// #include "precompiled_cppunit.hxx"
-+
-+#include <stdlib.h>
-+#include <stdio.h>
-+#include <fstream>
-+#include <rtl/string.hxx>
-+#include "cppunit/joblist.hxx"
-+
-+#define C_SEPARATOR_LIST " \t,;:#"
-+JobList::JobList()
-+ :ppsJobList(NULL)
-+{}
-+
-+// -----------------------------------------------------------------------------
-+bool JobList::isInCurrentEnvironment(std::string const& _sString)
-+{
-+ int nSpace = 0;
-+ std::string sSearchString = _sString;
-+ bool bEnd = false;
-+ // run through the hole given string,
-+ std::string sEnv;
-+
-+ do {
-+ nSpace = sSearchString.find_first_of(C_SEPARATOR_LIST);
-+ if (nSpace < 0)
-+ {
-+ sEnv = sSearchString;
-+ bEnd = true;
-+ }
-+ else
-+ {
-+ sEnv = sSearchString.substr(0, nSpace);
-+ sSearchString = sSearchString.substr(nSpace + 1);
-+ }
-+ if (sEnv.length() > 0)
-+ {
-+ // cout << sEnv << endl;
-+#ifdef LINUX
-+ int nLinux = sEnv.find("unxlng");
-+ if (nLinux >= 0)
-+ {
-+ // found unxlng
-+ return true;
-+ }
-+#endif
-+#ifdef SOLARIS
-+ int nSolaris = sEnv.find("unxsol");
-+ if (nSolaris >= 0)
-+ {
-+ // found unxsol
-+ return true;
-+ }
-+#endif
-+#ifdef WNT
-+ int nWindows = sEnv.find("wnt");
-+ if (nWindows >= 0)
-+ {
-+ // found wnt
-+ return true;
-+ }
-+#endif
-+ }
-+ } while ( !bEnd );
-+ return false;
-+}
-+
-+std::string JobList::trim(std::string const& _sStringToTrim)
-+{
-+ rtl::OString sStr(_sStringToTrim.c_str());
-+ sStr = sStr.trim();
-+ return std::string(sStr.getStr());
-+}
-+
-+// -----------------------------------------------------------------------------
-+bool JobList::readfile(std::string const& _sFilename, JobType _nJobType)
-+{
-+ // StringList aJobList;
-+ m_aJobList.clear();
-+
-+ std::ifstream in(_sFilename.c_str(), std::ios::in);
-+
-+ if (!in)
-+ {
-+ // fprintf(stderr, "warning: Can't open job file: %s\n", _sFilename.c_str());
-+ return false;
-+ }
-+ else
-+ {
-+ if (_nJobType == JOB_EXCLUDE_LIST)
-+ {
-+ fprintf(stderr, "warning: There exist a job exclusion list file: %s\n", _sFilename.c_str());
-+ }
-+
-+ // std::cout << "Check for signal" << std::endl;
-+ std::string sLine;
-+ while (std::getline(in, sLine))
-+ {
-+ if (sLine.size() > 0)
-+ {
-+ char ch = sLine[0];
-+ if (ch != '#' &&
-+ isspace(ch) == 0)
-+ {
-+ sLine = trim(sLine);
-+
-+ // m_aJobList.push_back( sLine );
-+ int nSpace = sLine.find_first_of(C_SEPARATOR_LIST);
-+ if (nSpace < 0)
-+ {
-+ m_aJobList[sLine] = JOB_UNKNOWN;
-+ }
-+ else
-+ {
-+ // found a separator
-+ std::string sTest = sLine.substr(0, nSpace);
-+ std::string sRest = sLine.substr(nSpace + 1);
-+ if (isInCurrentEnvironment(sRest))
-+ {
-+ m_aJobList[sTest] = JOB_UNKNOWN;
-+ }
-+ }
-+ }
-+ }
-+ }
-+
-+ // inclusion list
-+/*
-+ int nSize = m_aJobList.size();
-+
-+ ppsJobList = (char**) malloc((nSize + 1) * sizeof(char*));
-+
-+ int nIdx = 0;
-+ StringList::const_iterator aItEnd = m_aJobList.end();
-+ for(StringList::const_iterator it = m_aJobList.begin();
-+ it != aItEnd; ++it)
-+ {
-+ std::string sValue = *it;
-+ char* psTestFkt = (char*) malloc(sValue.size() + 1);
-+ strcpy(psTestFkt, sValue.c_str());
-+ ppsJobList[nIdx] = psTestFkt;
-+ ++nIdx;
-+ }
-+
-+ ppsJobList[nIdx] = NULL;
-+*/
-+ }
-+ return true;
-+}
-+
-+// -----------------------------------------------------------------------------
-+int JobList::getJobListEntry(std::string const& _sIndexName)
-+{
-+ if (m_aJobList.find(_sIndexName) != m_aJobList.end())
-+ {
-+ return m_aJobList[_sIndexName];
-+ }
-+ return JOB_NOT_FOUND;
-+}
-+
-+// -----------------------------------------------------------------------------
-+void JobList::setJobListEntry(std::string const& _sIndexName, int _nValue)
-+{
-+ // if (m_aJobList.find(_sIndexName) == m_aJobList.end())
-+ // {
-+ m_aJobList[_sIndexName] = _nValue;
-+ // }
-+ // else
-+ // {
-+ // fprintf(stderr, "error: test function '%s' already exist.\n", _sIndexName);
-+ // }
-+}
-+
-+// -----------------------------------------------------------------------------
-+JobList::~JobList()
-+{
-+ int nIdx = 0;
-+ if (ppsJobList)
-+ {
-+ while(ppsJobList[nIdx] != NULL)
-+ {
-+ free(ppsJobList[nIdx]);
-+ ++nIdx;
-+ }
-+ free(ppsJobList);
-+ }
-+}
-+// -----------------------------------------------------------------------------
-+/*
-+ bool JobList::checkFilter(JobList m_aJobFilter, std::string const& _sNodeName, std::string const& _sName)
-+ {
-+ std::string sFilter = m_aJobFilter.m_aJobList.begin();
-+ }
-+*/
-Nur in misc/build/cppunit-1.8.0/src/cppunit: joblist.cxx.dummy.
---- misc/cppunit-1.8.0/src/cppunit/makefile.mk 2008-12-10 20:46:08.970632544 +0100
-+++ misc/build/cppunit-1.8.0/src/cppunit/makefile.mk 2008-12-10 19:44:52.000000000 +0100
-@@ -1 +1,113 @@
+--- misc/cppunit-1.8.0/src/cppunit/makefile.mk 2009-09-12 15:20:48.515625000 +0200
++++ misc/build/cppunit-1.8.0/src/cppunit/makefile.mk 2009-09-12 14:15:35.468750000 +0200
+@@ -1 +1,90 @@
-dummy
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+#
++#
+# Copyright 2008 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
@@ -5690,21 +2363,14 @@ Nur in misc/build/cppunit-1.8.0/src/cppunit: joblist.cxx.dummy.
+ $(SLO)$/SourceLine.obj \
+ $(SLO)$/Exception.obj \
+ $(SLO)$/NotEqualException.obj \
-+ $(SLO)$/TestFailure.obj \
-+ $(SLO)$/joblist.obj \
-+ $(SLO)$/t_print.obj \
-+ $(SLO)$/signaltest.obj
++ $(SLO)$/TestFailure.obj
+
+CPPUNIT_STATIC_SOLFILES = \
+ $(SLO)$/Asserter.obj \
+ $(SLO)$/TestCase.obj \
+ $(SLO)$/TestSuite.obj \
+ $(SLO)$/TestAssert.obj \
-+ $(SLO)$/TestFactoryRegistry.obj \
-+ $(SLO)$/cmdlinebits.obj \
-+ $(SLO)$/tresregister.obj \
-+ $(SLO)$/tresstatewrapper.obj \
-+ $(SLO)$/registertestfunction.obj
++ $(SLO)$/TestFactoryRegistry.obj
+
+
+SLOFILES = \
@@ -5716,558 +2382,29 @@ Nur in misc/build/cppunit-1.8.0/src/cppunit: joblist.cxx.dummy.
+LIB1OBJFILES= \
+ $(SLOFILES)
+
-+.IF "$(GUI)"=="WNT"
++.IF "$(GUI)"=="WNT"
+.IF "$(COM)"=="GCC"
+LIB1ARCHIV=$(LB)$/lib$(TARGET)$(DLLPOSTFIX).a
+.ENDIF
-+LIB1FILES=$(LB)$/c5t_winstuff.lib
++#LIB1FILES=$(LB)$/c5t_winstuff.lib
+.ENDIF
+
+.IF "$(GUI)" == "UNX"
+LIB1ARCHIV=$(LB)$/lib$(TARGET)$(DLLPOSTFIX).a
+.ENDIF
+
-+#-------------------------------------------------------------------------------
-+TARGET2=c5t_no_regallfkt
-+LIB2TARGET= $(LB)$/$(TARGET2).lib
-+LIB2OBJFILES= \
-+ $(CPPUNIT_TESTSHL_SLOFILES)
-+
-+.IF "$(GUI)"=="WNT"
-+.IF "$(COM)"=="GCC"
-+LIB2ARCHIV=$(LB)$/lib$(TARGET2)$(DLLPOSTFIX).a
-+.ENDIF
-+.ENDIF
-+
-+.IF "$(GUI)" == "UNX"
-+LIB2ARCHIV=$(LB)$/lib$(TARGET2)$(DLLPOSTFIX).a
-+.ENDIF
-+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE : target.mk
+
-Nur in misc/build/cppunit-1.8.0/src/cppunit: makefile.mk.dummy.
---- misc/cppunit-1.8.0/src/cppunit/registertestfunction.cxx 2008-12-10 20:46:09.058854031 +0100
-+++ misc/build/cppunit-1.8.0/src/cppunit/registertestfunction.cxx 2008-12-09 09:04:23.000000000 +0100
-@@ -1 +1,60 @@
--dummy
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org. If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+// MARKER(update_precomp.py): autogen include statement, do not remove
-+// #include "precompiled_cppunit.hxx"
-+
-+#include <stdlib.h>
-+#include <cppunit/simpleheader.hxx>
-+#include <cppunit/additionalfunc.hxx>
-+
-+extern "C" void SAL_CALL testAllRegisteredFunctions(hTestResult _pResult)
-+{
-+ CppUnit::TestFactoryRegistry::testRegistries(_pResult);
-+ // CppUnit::Test* tp = CppUnit::TestFactoryRegistry::getRegistry("rtl_OUString").makeTest();
-+ // tp->run(pResult);
-+}
-+
-+// -----------------------------------------------------------------------------
-+// ---------------------------- RegisterTestFunctions ----------------------------
-+// -----------------------------------------------------------------------------
-+
-+extern "C" void SAL_CALL RegisterTestFunctions(FktRegFuncPtr _pFunc)
-+{
-+ if (_pFunc)
-+ {
-+ (_pFunc)(&testAllRegisteredFunctions, "");
-+ }
-+ else
-+ {
-+ // error, FktRegFuncPtr not given
-+ }
-+ RegisterAdditionalFunctions(_pFunc);
-+}
-Nur in misc/build/cppunit-1.8.0/src/cppunit: registertestfunction.cxx.dummy.
---- misc/cppunit-1.8.0/src/cppunit/signaltest.cxx 2008-12-10 20:46:09.119798751 +0100
-+++ misc/build/cppunit-1.8.0/src/cppunit/signaltest.cxx 2008-12-09 09:04:24.000000000 +0100
-@@ -1 +1,92 @@
--dummy
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org. If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+// MARKER(update_precomp.py): autogen include statement, do not remove
-+// #include "precompiled_cppunit.hxx"
-+
-+#include <typeinfo>
-+
-+#include "cppunit/signaltest.h"
-+
-+namespace CppUnit
-+{
-+
-+/** Constructs a test case for a suite.
-+ * This TestCase is intended for use by the TestCaller and should not
-+ * be used by a test case for which run() is called.
-+ **/
-+SignalTest::SignalTest(std::string const& _sName)
-+ : m_sName( _sName )
-+{
-+}
-+
-+
-+/// Destructs a test case
-+SignalTest::~SignalTest()
-+{
-+}
-+
-+
-+/// Returns a count of all the tests executed
-+int
-+SignalTest::countTestCases() const
-+{
-+ return 1;
-+}
-+
-+/// We never need to start this
-+void SignalTest::run(hTestResult) {}
-+
-+
-+/// Returns the name of the test case
-+std::string
-+SignalTest::getName() const
-+{
-+ return m_sName;
-+}
-+
-+
-+/// Returns the name of the test case instance
-+std::string
-+SignalTest::toString() const
-+{
-+ std::string className;
-+
-+#if CPPUNIT_USE_TYPEINFO_NAME
-+ const std::type_info& thisClass = typeid( *this );
-+ className = thisClass.name();
-+#else
-+ className = "SignalTest";
-+#endif
-+
-+ return className + "." + getName();
-+}
-+
-+} // namespace CppUnit
-Nur in misc/build/cppunit-1.8.0/src/cppunit: signaltest.cxx.dummy.
---- misc/cppunit-1.8.0/src/cppunit/t_print.cxx 2008-12-10 20:46:09.210907830 +0100
-+++ misc/build/cppunit-1.8.0/src/cppunit/t_print.cxx 2008-12-09 09:04:23.000000000 +0100
-@@ -1 +1,98 @@
--dummy
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org. If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+// MARKER(update_precomp.py): autogen include statement, do not remove
-+// #include "precompiled_cppunit.hxx"
-+
-+#include <stdio.h>
-+#include <cppunit/cmdlinebits.hxx>
-+#include <rtl/tres.h>
-+#include <osl/mutex.hxx>
-+
-+extern CmdLineBits st_nBits;
-+
-+sal_Bool isBit( CmdLineBits _nBits, CmdLineBits _nFlag )
-+{
-+ return( ( _nBits & _nFlag ) == _nFlag );
-+}
-+
-+// -----------------------------------------------------------------------------
-+// ----------------------------- own printf method -----------------------------
-+// -----------------------------------------------------------------------------
-+
-+bool isVerbose()
-+{
-+ if ( isBit( st_nBits, rtl_tres_Flag_VERBOSE ) )
-+ {
-+ return true;
-+ }
-+ return false;
-+}
-+
-+bool isQuiet()
-+{
-+ if ( isBit( st_nBits, rtl_tres_Flag_QUIET ) )
-+ {
-+ return true;
-+ }
-+ return false;
-+}
-+
-+// ::osl::Mutex m_aTPrintMutex;
-+
-+void impl_t_print(const char* _pFormatStr, va_list &args)
-+{
-+ if (! isQuiet())
-+ {
-+ // ::osl::MutexGuard g(m_aTPrintMutex);
-+ printf("# ");
-+ vprintf(_pFormatStr, args);
-+ }
-+}
-+
-+void t_print(const char* _pFormatStr, ...)
-+{
-+ va_list args;
-+ va_start( args, _pFormatStr );
-+ impl_t_print(_pFormatStr, args);
-+ va_end( args );
-+}
-+
-+void t_print(T_Print_Params _eType, const char* _pFormatStr, ...)
-+{
-+ if (_eType == T_VERBOSE && isVerbose())
-+ {
-+ // if T_VERBOSE and we should be verbose, print info
-+ va_list args;
-+ va_start( args, _pFormatStr );
-+ impl_t_print(_pFormatStr, args);
-+ va_end( args );
-+ }
-+}
-Nur in misc/build/cppunit-1.8.0/src/cppunit: t_print.cxx.dummy.
---- misc/cppunit-1.8.0/src/cppunit/tresregister.cxx 2008-12-10 20:46:09.288665520 +0100
-+++ misc/build/cppunit-1.8.0/src/cppunit/tresregister.cxx 2008-12-09 09:04:23.000000000 +0100
-@@ -1 +1,69 @@
--dummy
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org. If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+// MARKER(update_precomp.py): autogen include statement, do not remove
-+// #include "precompiled_cppunit.hxx"
-+
-+#include <stdio.h>
-+#include <sal/types.h>
-+#include <cppunit/autoregister/registerfunc.h>
-+#include <cppunit/autoregister/callbackstructure.h>
-+#include <cppunit/cmdlinebits.hxx>
-+
-+//! is this global CallbackStructure need?
-+CallbackStructure aGlobalStructure;
-+CmdLineBits st_nBits;
-+
-+FktPtr_CallbackDispatch pCallbackFunc = NULL;
-+
-+// This function is called from the TestShl tool.
-+extern "C" void SAL_CALL registerAllTestFunction(CallbackStructure* _pCallback)
-+{
-+ aGlobalStructure = *_pCallback;
-+
-+ st_nBits = aGlobalStructure.nBits;
-+
-+ pCallbackFunc = _pCallback->aCallbackDispatch;
-+ FktRegFuncPtr pFunc = _pCallback->aRegisterFunction;
-+ if (pFunc)
-+ {
-+ RegisterTestFunctions(pFunc);
-+ }
-+ else
-+ {
-+ // error, should be echoed
-+ fprintf(stderr, "error: Callback Structure doesn't contain a test function ptr.\n");
-+ }
-+
-+ // all is done, copy the magic value
-+ // this is only a simple internal invariant check,
-+ // if the called registerAllTestFunctions Function do, what we want.
-+ _pCallback->nMagic2 = _pCallback->nMagic;
-+}
-Nur in misc/build/cppunit-1.8.0/src/cppunit: tresregister.cxx.dummy.
---- misc/cppunit-1.8.0/src/cppunit/tresstatewrapper.cxx 2008-12-10 20:46:09.345773546 +0100
-+++ misc/build/cppunit-1.8.0/src/cppunit/tresstatewrapper.cxx 2008-12-10 20:42:43.000000000 +0100
-@@ -1 +1,168 @@
--dummy
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org. If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+// MARKER(update_precomp.py): autogen include statement, do not remove
-+// #include "precompiled_cppunit.hxx"
-+
-+// this functions build the wrapper, to handle old function calls to rtl_tres_state
-+// IMPORTANT: Due to the fact that rtl_tres_state is in the sal.lib
-+// you have to rename rtl_tres_state to c_rtl_tres_state
-+//
-+// return c_rtl_tres_state
-+// (
-+// hRtlTestResult,
-+// pData->length == 0 &&
-+// ! *pData->buffer,
-+// "New OString containing no characters",
-+// "ctor_001"
-+// )
-+
-+#include <stdlib.h>
-+#include <stdio.h>
-+#include <string.h>
-+#include "cppunit/Test.h"
-+#include "cppunit/autoregister/htestresult.h"
-+#include "cppunit/autoregister/callbackfunc_fktptr.h"
-+#include "cppunit/TestAssert.h"
-+
-+#define LOAD_TRESSTATEWRAPPER_LOCAL
-+#include "testshl/tresstatewrapper.hxx"
-+#undef LOAD_TRESSTATEWRAPPER_LOCAL
-+
-+#include "cppunit/tagvalues.hxx"
-+#include "cppunit/externcallbackfunc.hxx"
-+
-+// -----------------------------------------------------------------------------
-+// Wrapper class for the CppUnit::Test, because the new TestResult
-+// expect a CppUnit::Test interface
-+
-+class WrappedTest : public CppUnit::Test
-+{
-+ std::string m_sName;
-+public:
-+ WrappedTest(std::string const& _sName)
-+ :m_sName(_sName){}
-+
-+ virtual ~WrappedTest () {}
-+ virtual void run (hTestResult /*pResult*/){}
-+ virtual int countTestCases () const {return 1;}
-+ virtual std::string getName () const {return m_sName;}
-+ virtual std::string toString () const {return "WrappedTest";}
-+};
-+
-+// -----------------------------------------------------------------------------
-+rtl_tres_state_start::rtl_tres_state_start(hTestResult _aResult, const sal_Char* _pName)
-+ :m_pName(_pName),
-+ m_aResult(_aResult)
-+{
-+ // (pTestResult_EnterNode)(m_aResult, m_pName);
-+ (pCallbackFunc)( 0 /* NULL */, TAG_TYPE, RESULT_ENTER_NODE, TAG_RESULT_PTR, m_aResult, TAG_NODENAME, m_pName, TAG_DONE);
-+}
-+rtl_tres_state_start::~rtl_tres_state_start()
-+{
-+ // (pTestResult_LeaveNode)(m_aResult, m_pName);
-+ (pCallbackFunc)(0 /* NULL */, TAG_TYPE, RESULT_LEAVE_NODE, TAG_RESULT_PTR, m_aResult, TAG_NODENAME, m_pName, TAG_DONE);
-+}
-+
-+// --------------------------------- C-Wrapper ---------------------------------
-+typedef std::vector<rtl_tres_state_start*> rtl_tres_states;
-+rtl_tres_states m_StateStack;
-+
-+extern "C" void c_rtl_tres_state_start(hTestResult _aResult, const sal_Char* _pName)
-+{
-+ rtl_tres_state_start* pState = new rtl_tres_state_start(_aResult, _pName);
-+ m_StateStack.push_back(pState);
-+}
-+
-+extern "C" void c_rtl_tres_state_end(hTestResult, const sal_Char*)
-+{
-+ rtl_tres_state_start* pState = m_StateStack.back();
-+
-+ delete pState;
-+ m_StateStack.pop_back();
-+}
-+// -----------------------------------------------------------------------------
-+// -----------------------------------------------------------------------------
-+// -----------------------------------------------------------------------------
-+
-+// -----------------------------------------------------------------------------
-+// ------------------------- Wrapper for rtl_tres_state -------------------------
-+// -----------------------------------------------------------------------------
-+
-+sal_Bool SAL_CALL c_rtl_tres_state(
-+ hTestResult pResult,
-+ sal_Bool bSuccess,
-+ char const * pTestMsg,
-+ char const * pFuncName)
-+{
-+ CppUnit::Test* pTest = new WrappedTest(pFuncName);
-+
-+ sal_Int32 nValue = (pCallbackFunc)(0 /* NULL */, TAG_TYPE, EXECUTION_CHECK, TAG_RESULT_PTR, pResult, TAG_NODENAME, pTest->getName().c_str(), TAG_DONE);
-+ if (nValue == DO_NOT_EXECUTE)
-+ {
-+ return false;
-+ }
-+
-+ // This code is copied from CppUnit::TestCase and less adapted, to work with the
-+ // old test code.
-+ // (pTestResult_StartTest)(pResult, pTest);
-+ (pCallbackFunc)(0 /* NULL */, TAG_TYPE, RESULT_START, TAG_RESULT_PTR, pResult, TAG_TEST_PTR, pTest, TAG_DONE);
-+
-+ try
-+ {
-+ CPPUNIT_ASSERT_MESSAGE( pTestMsg, bSuccess ? true : false );
-+ // (pTestResult_AddInfo)(pResult, pTest, "#PASSED#");
-+ (pCallbackFunc)(0 /* NULL */, TAG_TYPE, RESULT_ADD_INFO, TAG_RESULT_PTR, pResult, TAG_TEST_PTR, pTest, TAG_INFO, "PASSED", TAG_DONE);
-+ }
-+ catch ( CppUnit::Exception &e )
-+ {
-+ CppUnit::Exception *copy = e.clone();
-+ // (pTestResult_AddFailure)( pResult, pTest, copy );
-+ (pCallbackFunc)( 0 /* NULL */, TAG_TYPE, RESULT_ADD_FAILURE, TAG_RESULT_PTR, pResult, TAG_TEST_PTR, pTest, TAG_EXCEPTION, copy, TAG_DONE );
-+ }
-+ catch ( std::exception &e )
-+ {
-+ //(pTestResult_AddError)( pResult, pTest, new CppUnit::Exception( e.what() ) );
-+ (pCallbackFunc)( 0 /* NULL */, TAG_TYPE, RESULT_ADD_ERROR, TAG_RESULT_PTR, pResult, TAG_TEST_PTR, pTest, TAG_EXCEPTION, new CppUnit::Exception( e.what() ), TAG_DONE );
-+ }
-+ catch (...)
-+ {
-+ CppUnit::Exception *e = new CppUnit::Exception( "caught unknown exception" );
-+ // (pTestResult_AddError)( pResult, pTest, e );
-+ (pCallbackFunc)( 0 /* NULL */, TAG_TYPE, RESULT_ADD_ERROR, TAG_RESULT_PTR, pResult, TAG_TEST_PTR, pTest, TAG_EXCEPTION, e, TAG_DONE );
-+ }
-+
-+
-+ // (pTestResult_EndTest)( pResult, pTest );
-+ (pCallbackFunc)( 0 /* NULL */, TAG_TYPE, RESULT_END, TAG_RESULT_PTR, pResult, TAG_TEST_PTR, pTest, TAG_DONE );
-+
-+ return bSuccess;
-+}
-+
-Nur in misc/build/cppunit-1.8.0/src/cppunit: tresstatewrapper.cxx.dummy.
---- misc/cppunit-1.8.0/src/makefile.mk 2008-12-10 20:46:08.706925653 +0100
-+++ misc/build/cppunit-1.8.0/src/makefile.mk 2008-12-09 08:57:10.000000000 +0100
-@@ -1 +1,35 @@
+--- misc/cppunit-1.8.0/src/makefile.mk 2009-09-12 15:20:48.421875000 +0200
++++ misc/build/cppunit-1.8.0/src/makefile.mk 2009-09-12 14:15:35.484375000 +0200
+@@ -1 +1,33 @@
-dummy
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+#
++#
+# Copyright 2008 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
@@ -6296,3535 +2433,4 @@ Nur in misc/build/cppunit-1.8.0/src/cppunit: tresstatewrapper.cxx.dummy.
+#*************************************************************************
+
+target:
-+ cd cppunit && $(MAKE) $(MFLAGS) $(CALLMACROS)
-+ cd result && $(MAKE) $(MFLAGS) $(CALLMACROS)
-+ cd win32 && $(MAKE) $(MFLAGS) $(CALLMACROS)
-Nur in misc/build/cppunit-1.8.0/src: makefile.mk.dummy.
---- misc/cppunit-1.8.0/src/result/SynchronizedObject.cpp 2008-12-10 20:46:05.438373643 +0100
-+++ misc/build/cppunit-1.8.0/src/result/SynchronizedObject.cpp 2008-02-27 17:26:28.000000000 +0100
-@@ -1 +1,35 @@
--dummy
-+#include <cppunit/result/SynchronizedObject.h>
-+
-+
-+namespace CppUnit
-+{
-+
-+
-+
-+
-+SynchronizedObject::SynchronizedObject( SynchronizationObject *syncObject )
-+ : m_syncObject( syncObject == 0 ? new SynchronizationObject() :
-+ syncObject )
-+{
-+}
-+
-+
-+SynchronizedObject::~SynchronizedObject()
-+{
-+ delete m_syncObject;
-+}
-+
-+
-+/** Accept a new synchronization object for protection of this instance
-+ * TestResult assumes ownership of the object
-+ */
-+void
-+SynchronizedObject::setSynchronizationObject( SynchronizationObject *syncObject )
-+{
-+ delete m_syncObject;
-+ m_syncObject = syncObject;
-+}
-+
-+
-+} // namespace CppUnit
-+
-Nur in misc/build/cppunit-1.8.0/src/result: SynchronizedObject.cpp.dummy.
---- misc/cppunit-1.8.0/src/result/TestResult.cpp 2008-12-10 20:46:05.577200921 +0100
-+++ misc/build/cppunit-1.8.0/src/result/TestResult.cpp 2008-12-10 20:42:45.000000000 +0100
-@@ -1 +1,261 @@
--dummy
-+#include <cppunit/TestFailure.h>
-+#include <cppunit/result/TestListener.h>
-+#include "testshl/getopt.hxx"
-+#include <cppunit/result/TestResult.h>
-+#include <algorithm>
-+#include "cppunit/result/outputter.hxx"
-+#include <cppunit/Test.h>
-+#include <cppunit/cmdlinebits.hxx>
-+
-+namespace CppUnit {
-+
-+/// Construct a TestResult
-+TestResult::TestResult( GetOpt &_pOptions, SynchronizationObject *syncObject )
-+ : SynchronizedObject( syncObject ),
-+ m_aOptionHelper(_pOptions),
-+ m_nExitValue(0)
-+{
-+ reset();
-+}
-+
-+
-+/// Destroys a test result
-+TestResult::~TestResult()
-+{
-+}
-+
-+
-+/** Resets the result for a new run.
-+ *
-+ * Clear the previous run result.
-+ */
-+void
-+TestResult::reset()
-+{
-+ ExclusiveZone zone( m_syncObject );
-+ m_stop = false;
-+}
-+
-+
-+/** Adds an error to the list of errors.
-+ * The passed in exception
-+ * caused the error
-+ */
-+void
-+TestResult::addError( Test *test,
-+ Exception *e, ErrorType::num _eType )
-+{
-+ TestFailure aTestFailure( test, e, _eType );
-+ addFailure( aTestFailure );
-+}
-+
-+
-+/** Adds a failure to the list of failures. The passed in exception
-+ * caused the failure.
-+ */
-+void
-+TestResult::addFailure( Test *test, Exception *e )
-+{
-+ TestFailure aTestFailure( test, e, ErrorType::ET_FAILURE );
-+ addFailure( aTestFailure );
-+}
-+
-+
-+/** Called to add a failure to the list of failures.
-+ */
-+void
-+TestResult::addFailure( const TestFailure &failure )
-+{
-+ ExclusiveZone zone( m_syncObject );
-+
-+ // LLA:
-+ // this set the global returnvalue, due to the fact, there occurs a failure, we have to return a non zero value
-+ // at the moment this seams to be a good place.
-+ setExitValue(1);
-+
-+ for ( TestListeners::iterator it = m_listeners.begin();
-+ it != m_listeners.end();
-+ ++it )
-+ {
-+ TestListener *pListener = *it;
-+ pListener->addFailure( failure );
-+ }
-+}
-+
-+
-+/// Informs the result that a test will be started.
-+void
-+TestResult::startTest( Test *test )
-+{
-+ ExclusiveZone zone( m_syncObject );
-+ if (m_aOptionHelper.isVerbose())
-+ {
-+ std::string aStr;
-+ if (test)
-+ {
-+ aStr = getNodeName();
-+ aStr += ".";
-+ aStr += test->getName();
-+ }
-+ // fprintf(stderr, "Start test: %s\n", aStr.c_str());
-+ t_print( T_VERBOSE, "Start test: %s\n", aStr.c_str());
-+ }
-+
-+ for ( TestListeners::iterator it = m_listeners.begin();
-+ it != m_listeners.end();
-+ ++it )
-+ {
-+ TestListener *pListener = *it;
-+ pListener->startTest( test );
-+ }
-+}
-+
-+
-+/// Informs the result that a test was completed.
-+void
-+TestResult::endTest( Test *test )
-+{
-+ ExclusiveZone zone( m_syncObject );
-+ for ( TestListeners::iterator it = m_listeners.begin();
-+ it != m_listeners.end();
-+ ++it )
-+ {
-+ TestListener *pListener = *it;
-+ pListener->endTest( test );
-+ }
-+}
-+
-+
-+/// Returns whether testing should be stopped
-+bool
-+TestResult::shouldStop() const
-+{
-+ ExclusiveZone zone( m_syncObject );
-+ return m_stop;
-+}
-+
-+
-+/// Stop testing
-+void
-+TestResult::stop()
-+{
-+ ExclusiveZone zone( m_syncObject );
-+ m_stop = true;
-+}
-+
-+
-+void
-+TestResult::addListener( TestListener *listener )
-+{
-+ ExclusiveZone zone( m_syncObject );
-+ m_listeners.push_back( listener );
-+}
-+
-+
-+void
-+TestResult::removeListener ( TestListener *listener )
-+{
-+ ExclusiveZone zone( m_syncObject );
-+#if defined(_MSC_VER) && (_MSC_VER >=1400)
-+ m_listeners.erase( remove( m_listeners.begin(),
-+#else
-+ m_listeners.erase( std::remove( m_listeners.begin(),
-+#endif
-+ m_listeners.end(),
-+ listener ),
-+ m_listeners.end());
-+}
-+
-+void
-+TestResult::addInfo(Test *test, const char* _aStr)
-+{
-+ ExclusiveZone zone( m_syncObject );
-+ for ( TestListeners::iterator it = m_listeners.begin();
-+ it != m_listeners.end();
-+ ++it )
-+ {
-+ TestListener *pListener = *it;
-+ pListener->addInfo( test, _aStr );
-+ }
-+}
-+
-+// old: void
-+// old: TestResult::enterNode(const char* _aStr)
-+// old: {
-+// old: ExclusiveZone zone( m_syncObject );
-+// old: for ( TestListeners::iterator it = m_listeners.begin();
-+// old: it != m_listeners.end();
-+// old: ++it )
-+// old: {
-+// old: TestListener *pListener = *it;
-+// old: pListener->enterNode( _aStr );
-+// old: }
-+// old: }
-+// old:
-+// old: void
-+// old: TestResult::leaveNode(const char* _aStr)
-+// old: {
-+// old: ExclusiveZone zone( m_syncObject );
-+// old:
-+// old: for ( TestListeners::iterator it = m_listeners.begin();
-+// old: it != m_listeners.end();
-+// old: ++it )
-+// old: {
-+// old: TestListener *pListener = *it;
-+// old: pListener->leaveNode( _aStr );
-+// old: }
-+// old: }
-+
-+void TestResult::enterNode(const char* _sNode)
-+{
-+ ExclusiveZone zone( m_syncObject );
-+ m_aCurrentNodeNames.push_back(std::string(_sNode));
-+}
-+
-+void TestResult::leaveNode(const char* /*_sNode*/)
-+{
-+ ExclusiveZone zone( m_syncObject );
-+ std::string sBack = m_aCurrentNodeNames.back();
-+ m_aCurrentNodeNames.pop_back();
-+
-+ // due to a -Wall warning, comment out.
-+ // if (sBack != std::string(_sNode))
-+ // {
-+ // volatile int dummy = 0;
-+ // // problem?!
-+ // }
-+}
-+
-+std::string TestResult::getNodeName()
-+{
-+ std::string sName;
-+ for (std::vector<std::string>::const_iterator it = m_aCurrentNodeNames.begin();
-+ it != m_aCurrentNodeNames.end();
-+ ++it)
-+ {
-+ if (sName.size() != 0)
-+ {
-+ sName += ".";
-+ }
-+ sName += *it;
-+ }
-+ return sName;
-+}
-+
-+// -----------------------------------------------------------------------------
-+bool TestResult::isAllowedToExecute(std::string const& _sName)
-+{
-+ return m_aOptionHelper.isAllowedToExecute(getNodeName(), _sName);
-+}
-+// -----------------------------------------------------------------------------
-+bool TestResult::isOptionWhereAmI()
-+{
-+ return m_aOptionHelper.isOptionWhereAmI();
-+}
-+
-+// -----------------------------------------------------------------------------
-+void TestResult::print(Outputter&)
-+{
-+}
-+
-+} // namespace CppUnit
-Nur in misc/build/cppunit-1.8.0/src/result: TestResult.cpp.dummy.
---- misc/cppunit-1.8.0/src/result/TestResultCollector.cpp 2008-12-10 20:46:05.532229436 +0100
-+++ misc/build/cppunit-1.8.0/src/result/TestResultCollector.cpp 2008-02-27 17:25:50.000000000 +0100
-@@ -1 +1,147 @@
--dummy
-+#include <cppunit/TestFailure.h>
-+#include <cppunit/result/TestResultCollector.h>
-+
-+
-+namespace CppUnit
-+{
-+
-+
-+TestResultCollector::TestResultCollector( TestResult* _pResult, SynchronizationObject *syncObject )
-+ : TestSucessListener( syncObject ),
-+ m_pResult(_pResult),
-+ m_testErrors(0)
-+{
-+ reset();
-+}
-+
-+
-+TestResultCollector::~TestResultCollector()
-+{
-+ TestFailures::iterator itFailure = m_failures.begin();
-+ while ( itFailure != m_failures.end() )
-+ {
-+ TestFailureEnvelope *pEnvelope = *itFailure++;
-+ TestFailure *pFailure = pEnvelope->getTestFailure();
-+ delete pFailure;
-+ }
-+}
-+
-+
-+void
-+TestResultCollector::reset()
-+{
-+ TestSucessListener::reset();
-+
-+ ExclusiveZone zone( m_syncObject );
-+ m_testErrors = 0;
-+ m_tests.clear();
-+ m_failures.clear();
-+}
-+
-+
-+void
-+TestResultCollector::startTest( Test *test )
-+{
-+ ExclusiveZone zone (m_syncObject);
-+
-+ m_tests.push_back( new TestEnvelope(test, m_pResult->getNodeName()) );
-+}
-+
-+void
-+TestResultCollector::endTest( Test * )
-+{
-+ // ExclusiveZone zone (m_syncObject);
-+ // Nothing!
-+}
-+
-+
-+void
-+TestResultCollector::addFailure( const TestFailure &failure )
-+{
-+ TestSucessListener::addFailure( failure );
-+
-+ ExclusiveZone zone( m_syncObject );
-+ if ( failure.isError() )
-+ ++m_testErrors;
-+ m_failures.push_back( new TestFailureEnvelope(failure.clone(), m_pResult->getNodeName()) );
-+}
-+
-+
-+/// Gets the number of run tests.
-+int
-+TestResultCollector::runTests() const
-+{
-+ ExclusiveZone zone( m_syncObject );
-+ return m_tests.size();
-+}
-+
-+
-+/// Gets the number of detected errors (uncaught exception).
-+int
-+TestResultCollector::testErrors() const
-+{
-+ ExclusiveZone zone( m_syncObject );
-+ return m_testErrors;
-+}
-+
-+
-+/// Gets the number of detected failures (failed assertion).
-+int
-+TestResultCollector::testFailures() const
-+{
-+ ExclusiveZone zone( m_syncObject );
-+ return m_failures.size() - m_testErrors;
-+}
-+
-+
-+/// Gets the total number of detected failures.
-+int
-+TestResultCollector::testFailuresTotal() const
-+{
-+ ExclusiveZone zone( m_syncObject );
-+ return m_failures.size();
-+}
-+
-+
-+/// Returns a the list failures (random access collection).
-+const TestResultCollector::TestFailures &
-+TestResultCollector::failures() const
-+{
-+ ExclusiveZone zone( m_syncObject );
-+ return m_failures;
-+}
-+
-+
-+const TestResultCollector::Tests &
-+TestResultCollector::tests() const
-+{
-+ ExclusiveZone zone( m_syncObject );
-+ return m_tests;
-+}
-+
-+void TestResultCollector::addInfo(Test *_pTest, const char* _sInfo)
-+{
-+ ExclusiveZone zone( m_syncObject );
-+ m_aInfos.push_back(new TestInfo(_pTest, _sInfo));
-+}
-+
-+std::string TestResultCollector::getInfo(Test *_pTest)
-+{
-+ for (TestInfos::const_iterator it = m_aInfos.begin();
-+ it != m_aInfos.end();
-+ ++it)
-+ {
-+ TestInfo *pInfo = *it;
-+ Test *pTest = pInfo->getTest();
-+ if (pTest == _pTest)
-+ {
-+ std::string sInfo = pInfo->getString();
-+ return sInfo;
-+ }
-+ }
-+ return std::string();
-+}
-+
-+
-+} // namespace CppUnit
-+
-Nur in misc/build/cppunit-1.8.0/src/result: TestResultCollector.cpp.dummy.
---- misc/cppunit-1.8.0/src/result/TestSucessListener.cpp 2008-12-10 20:46:05.660884351 +0100
-+++ misc/build/cppunit-1.8.0/src/result/TestSucessListener.cpp 2008-02-27 17:26:16.000000000 +0100
-@@ -1 +1,46 @@
--dummy
-+#include <cppunit/result/TestSucessListener.h>
-+
-+
-+
-+namespace CppUnit
-+{
-+
-+
-+TestSucessListener::TestSucessListener( SynchronizationObject *syncObject )
-+ : SynchronizedObject( syncObject )
-+ , m_sucess( true )
-+{
-+}
-+
-+
-+TestSucessListener::~TestSucessListener()
-+{
-+}
-+
-+
-+void
-+TestSucessListener::reset()
-+{
-+ ExclusiveZone zone( m_syncObject );
-+ m_sucess = true;
-+}
-+
-+
-+void
-+TestSucessListener::addFailure( const TestFailure & )
-+{
-+ ExclusiveZone zone( m_syncObject );
-+ m_sucess = false;
-+}
-+
-+
-+bool
-+TestSucessListener::wasSuccessful() const
-+{
-+ ExclusiveZone zone( m_syncObject );
-+ return m_sucess;
-+}
-+
-+
-+} // namespace CppUnit
-+
-Nur in misc/build/cppunit-1.8.0/src/result: TestSucessListener.cpp.dummy.
---- misc/cppunit-1.8.0/src/result/TextTestResult.cpp 2008-12-10 20:46:05.742386241 +0100
-+++ misc/build/cppunit-1.8.0/src/result/TextTestResult.cpp 2008-02-27 17:24:56.000000000 +0100
-@@ -1 +1,191 @@
--dummy
-+#include <cppunit/Exception.h>
-+#include <cppunit/NotEqualException.h>
-+#include <cppunit/Test.h>
-+#include <cppunit/TestFailure.h>
-+#include <cppunit/result/TextTestResult.h>
-+// #include <TextTestResult.h>
-+//!io #include <iostream>
-+
-+namespace CppUnit {
-+
-+
-+TextTestResult::TextTestResult(GetOpt& _aOptions)
-+ :TestResult(_aOptions),
-+ m_aResulter(this)
-+{
-+ addListener( &m_aResulter );
-+}
-+
-+
-+void
-+TextTestResult::addFailure( const TestFailure &failure )
-+{
-+ TestResult::addFailure( failure );
-+ // std::cerr << ( failure.isError() ? "E" : "F" );
-+ if (failure.isError())
-+ fprintf(stderr, "E");
-+ else
-+ fprintf(stderr, "F");
-+}
-+
-+
-+void
-+TextTestResult::startTest( Test *test )
-+{
-+ TestResult::startTest (test);
-+ // std::cerr << ".";
-+ fprintf(stderr, ".");
-+}
-+
-+void TextTestResult::endTest( Test *test )
-+{
-+ TestResult::endTest (test);
-+}
-+
-+
-+void
-+TextTestResult::printFailures( std::ostream &stream )
-+{
-+ TestResultCollector::TestFailures::const_iterator itFailure = m_aResulter.failures().begin();
-+ int failureNumber = 1;
-+ while ( itFailure != m_aResulter.failures().end() )
-+ {
-+ stream << std::endl;
-+ TestFailure *pFailure= (*itFailure++)->getTestFailure();
-+ printFailure( pFailure, failureNumber++, stream );
-+ }
-+}
-+
-+
-+void
-+TextTestResult::printFailure( TestFailure *failure,
-+ int failureNumber,
-+ std::ostream &stream )
-+{
-+ printFailureListMark( failureNumber, stream );
-+ stream << ' ';
-+ printFailureTestName( failure, stream );
-+ stream << ' ';
-+ printFailureType( failure, stream );
-+ stream << ' ';
-+ printFailureLocation( failure->sourceLine(), stream );
-+ stream << std::endl;
-+ printFailureDetail( failure->thrownException(), stream );
-+ stream << std::endl;
-+}
-+
-+
-+void
-+TextTestResult::printFailureListMark( int failureNumber,
-+ std::ostream &stream )
-+{
-+ stream << failureNumber << ")";
-+}
-+
-+
-+void
-+TextTestResult::printFailureTestName( TestFailure *failure,
-+ std::ostream &stream )
-+{
-+ Test* pTest = failure->failedTest();
-+ stream << "test: " << pTest->getName();
-+}
-+
-+
-+void
-+TextTestResult::printFailureType( TestFailure *failure,
-+ std::ostream &stream )
-+{
-+ stream << "("
-+ << (failure->isError() ? "E" : "F")
-+ << ")";
-+}
-+
-+
-+void
-+TextTestResult::printFailureLocation( SourceLine sourceLine,
-+ std::ostream &stream )
-+{
-+ if ( !sourceLine.isValid() )
-+ return;
-+
-+ stream << "line: " << sourceLine.lineNumber()
-+ << ' ' << sourceLine.fileName();
-+}
-+
-+
-+void
-+TextTestResult::printFailureDetail( Exception *thrownException,
-+ std::ostream &stream )
-+{
-+ if ( thrownException->isInstanceOf( NotEqualException::type() ) )
-+ {
-+ NotEqualException *e = (NotEqualException*)thrownException;
-+ stream << "expected: " << e->expectedValue() << std::endl
-+ << "but was: " << e->actualValue();
-+ if ( !e->additionalMessage().empty() )
-+ {
-+ stream << std::endl;
-+ stream << "additional message:" << std::endl
-+ << e->additionalMessage();
-+ }
-+ }
-+ else
-+ {
-+ stream << " \"" << thrownException->what() << "\"";
-+ }
-+}
-+
-+
-+void
-+TextTestResult::print( std::ostream& stream )
-+{
-+ printHeader( stream );
-+ stream << std::endl;
-+ printFailures( stream );
-+}
-+
-+
-+void
-+TextTestResult::printHeader( std::ostream &stream )
-+{
-+ if (m_aResulter.wasSuccessful ())
-+ stream << std::endl << "OK (" << m_aResulter.runTests () << " tests)"
-+ << std::endl;
-+ else
-+ {
-+ stream << std::endl;
-+ printFailureWarning( stream );
-+ printStatistics( stream );
-+ }
-+}
-+
-+
-+void
-+TextTestResult::printFailureWarning( std::ostream &stream )
-+{
-+ stream << "!!!FAILURES!!!" << std::endl;
-+}
-+
-+
-+void
-+TextTestResult::printStatistics( std::ostream &stream )
-+{
-+ stream << "Test Results:" << std::endl;
-+
-+ stream << "Run: " << m_aResulter.runTests()
-+ << " Failures: " << m_aResulter.testFailures()
-+ << " Errors: " << m_aResulter.testErrors()
-+ << std::endl;
-+}
-+
-+
-+std::ostream &
-+operator <<( std::ostream &stream,
-+ TextTestResult &result )
-+{
-+ result.print (stream); return stream;
-+}
-+
-+
-+} // namespace CppUnit
-Nur in misc/build/cppunit-1.8.0/src/result: TextTestResult.cpp.dummy.
---- misc/cppunit-1.8.0/src/result/emacsTestResult.cxx 2008-12-10 20:46:09.419267625 +0100
-+++ misc/build/cppunit-1.8.0/src/result/emacsTestResult.cxx 2008-12-09 09:06:11.000000000 +0100
-@@ -1 +1,193 @@
--dummy
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org. If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+// MARKER(update_precomp.py): autogen include statement, do not remove
-+// #include "precompiled_cppunit.hxx"
-+
-+#include <stdlib.h>
-+
-+#include <map>
-+#include <cppunit/Exception.h>
-+#include <cppunit/NotEqualException.h>
-+#include <cppunit/Test.h>
-+#include <cppunit/TestFailure.h>
-+#include <cppunit/result/emacsTestResult.hxx>
-+// #include <TextTestResult.h>
-+//!io #include <iostream>
-+#include <string>
-+
-+#include <rtl/string.hxx>
-+#include "cppunit/result/outputter.hxx"
-+
-+namespace CppUnit {
-+
-+ emacsTestResult::emacsTestResult(GetOpt & _aOptions)
-+ :TestResult(_aOptions),
-+ m_aOptions(_aOptions),
-+ m_aResulter(this)
-+ {
-+ addListener( &m_aResulter );
-+ }
-+
-+ //# struct ltstr
-+ //# {
-+ //# bool operator()(const CppUnit::Test* p1, const CppUnit::Test* p2) const
-+ //# {
-+ //# return p1 < p2;
-+ //# }
-+ //# };
-+ //# typedef std::map<CppUnit::Test*, bool, ltstr> TestPtrList;
-+
-+ void
-+ emacsTestResult::print( Outputter& stream )
-+ {
-+ printHeader( stream );
-+ // stream << std::endl;
-+ // printFailures( stream );
-+
-+ // TestPtrList aFailedTests;
-+
-+ for (TestResultCollector::TestFailures::const_iterator it2 = m_aResulter.failures().begin();
-+ it2 != m_aResulter.failures().end();
-+ ++it2)
-+ {
-+ TestFailureEnvelope *pEnvelop = *it2;
-+ TestFailure *pFailure = pEnvelop->getTestFailure();
-+ std::string sNodeName = pEnvelop->getString();
-+
-+ // aFailedTests[ pFailure->failedTest() ] = true;
-+
-+ printFailureLine(stream, pFailure, sNodeName);
-+ }
-+
-+ // only errors are from interest here
-+ //# for (TestResultCollector::Tests::const_iterator it = m_aResulter.tests().begin();
-+ //# it != m_aResulter.tests().end();
-+ //# ++it)
-+ //# {
-+ //# TestEnvelope *pEnvelop = *it;
-+ //# Test* pTest = pEnvelop->getTest();
-+ //# std::string sNodeName = pEnvelop->getString();
-+ //#
-+ //# if (aFailedTests.find(pTest) == aFailedTests.end())
-+ //# {
-+ //# std::string sInfo = m_aResulter.getInfo(pTest);
-+ //# printTestLine(stream, pTest, sNodeName, sInfo);
-+ //# }
-+ //# }
-+ stream << "Test #PASSED#" << Outputter::endl();
-+ }
-+
-+
-+ void
-+ emacsTestResult::printHeader( Outputter &stream )
-+ {
-+ std::string sDate(m_aOptionHelper.createDateTag());
-+ stream << sDate << Outputter::endl();
-+ }
-+
-+ void
-+ emacsTestResult::printFailureLine( Outputter &stream, TestFailure *_pFailure, std::string const& _sNodeName)
-+ {
-+ std::string aName;
-+ aName += _sNodeName;
-+ aName += ".";
-+ aName += _pFailure->failedTestName();
-+
-+ SourceLine aLine = _pFailure->sourceLine();
-+ sal_Int32 nLine = -1;
-+ std::string sFilename;
-+ if (aLine.isValid())
-+ {
-+ nLine = aLine.lineNumber();
-+ sFilename = aLine.fileName();
-+ }
-+
-+ Exception *pExp = _pFailure->thrownException();
-+ std::string sWhat;
-+ if (pExp)
-+ {
-+ sWhat = pExp->what();
-+ }
-+
-+ stream << sFilename;
-+ stream << ":";
-+ stream << nLine;
-+ stream << ":";
-+
-+ stream << aName;
-+ stream << ";#FAILED#";
-+ // ErrorType::num eErr = _pFailure->getErrorType();
-+ //# if (isErr)
-+ //# stream << "FAILED#;";
-+ //# else
-+ //# stream << "ERROR#;";
-+
-+ stream << sWhat;
-+ stream << Outputter::endl();
-+ }
-+
-+ //# void
-+ //# emacsTestResult::printTestLine( Outputter &stream, Test* _pTest, std::string const& _sNodeName, std::string const& _sInfo)
-+ //# {
-+ //# std::string aName;
-+ //# aName += _sNodeName;
-+ //# aName += ".";
-+ //# aName += _pTest->getName();
-+ //#
-+ //# stream << aName;
-+ //# stream << ";";
-+ //# stream << _sInfo << "#";
-+ //# stream << "OK#";
-+ //# stream << std::endl;
-+ //# }
-+
-+
-+//# void
-+//# emacsTestResult::printStatistics( Outputter &stream )
-+//# {
-+//# stream << "Test Results:" << std::endl;
-+//#
-+//# stream << "Run: " << runTests()
-+//# << " Failures: " << testFailures()
-+//# << " Errors: " << testErrors()
-+//# << std::endl;
-+//# }
-+
-+
-+ Outputter &
-+ operator <<( Outputter &stream,
-+ emacsTestResult &result )
-+ {
-+ result.print (stream); return stream;
-+ }
-+
-+
-+} // namespace CppUnit
-Nur in misc/build/cppunit-1.8.0/src/result: emacsTestResult.cxx.dummy.
---- misc/cppunit-1.8.0/src/result/log.cxx 2008-12-10 20:46:09.499346711 +0100
-+++ misc/build/cppunit-1.8.0/src/result/log.cxx 2008-12-10 20:42:45.000000000 +0100
-@@ -1 +1,125 @@
--dummy
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org. If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+// MARKER(update_precomp.py): autogen include statement, do not remove
-+// #include "precompiled_cppunit.hxx"
-+
-+#include "testshl/log.hxx"
-+
-+// #include <hash_map>
-+// #include <list>
-+// #include <set>
-+
-+using namespace std;
-+
-+::osl::FileBase::RC Log::open( sal_Bool append ) {
-+
-+ ::osl::FileBase::RC ret;
-+
-+ if ( ! append ) {
-+ ret = ::osl::File::remove( m_logurl );
-+ }
-+
-+ if( m_logfile->open( OpenFlag_Write ) == ::osl::FileBase::E_NOENT ) {
-+ ret = m_logfile->open( OpenFlag_Write | OpenFlag_Create );
-+ }
-+ else {
-+ ret = m_logfile->setPos( Pos_End, 0 );
-+ }
-+ return ret;
-+}
-+
-+::osl::FileBase::RC Log::write( const sal_Char* buf, sal_Bool v ) {
-+ sal_uInt64 uBytes=0;
-+ sal_uInt32 len = 0;
-+ const sal_Char* ptr = buf;
-+
-+ if( ptr ) {
-+ while( *ptr++ ) len++;
-+ }
-+
-+ if ( v ) {
-+ // cout << buf << flush;
-+ printf("%s", buf);
-+ }
-+ return m_logfile->write( buf, len , uBytes );
-+}
-+
-+::osl::FileBase::RC Log::write( const rtl::OString& buf, sal_Bool v ) {
-+ sal_uInt64 uBytes=0;
-+ if ( v ) {
-+ // cout << buf.getStr() << flush;
-+ printf("%s", buf.getStr());
-+ }
-+ return m_logfile->write( buf.getStr(), buf.getLength(), uBytes );
-+}
-+/*
-+// LLA: due to a problem with sal/OUStingBuffer getLength() which isn't const, this
-+// is so not compilable.
-+::osl::FileBase::RC Log::write( rtl::OStringBuffer const& buf, sal_Bool v ) {
-+ sal_uInt64 uBytes=0;
-+ if ( v ) {
-+ cout << buf.getStr() << flush;
-+ }
-+ return m_logfile->write( buf.getStr(), buf.getLength(), uBytes );
-+}
-+*/
-+::osl::FileBase::RC Log::write( const rtl::OUString& buf,
-+ rtl_TextEncoding tenc, sal_Bool v ) {
-+ sal_uInt64 uBytes=0;
-+ if ( ! tenc ) {
-+ tenc = RTL_TEXTENCODING_ASCII_US;
-+ }
-+ rtl::OStringBuffer osbuf(
-+ rtl::OUStringToOString( buf, tenc ).getStr() );
-+
-+ if ( v ) {
-+ // cout << osbuf.getStr() << flush;
-+ printf("%s", osbuf.getStr());
-+ }
-+ return m_logfile->write( osbuf.getStr(), osbuf.getLength(), uBytes );
-+}
-+
-+Log &operator <<( Log &_aLog, const sal_Char * _sValue )
-+{
-+ _aLog.write(_sValue); return _aLog;
-+}
-+Log &operator <<( Log &_aLog, rtl::OString const& _sValue )
-+{
-+ _aLog.write(_sValue); return _aLog;
-+}
-+Log &operator <<( Log &_aLog, rtl::OUString const& _sValue )
-+{
-+ _aLog.write(_sValue); return _aLog;
-+}
-+//! Log &operator <<( Log &_aLog, rtl::OStringBuffer const& _sValue )
-+//! {
-+//! _aLog.write(_sValue); return _aLog;
-+//! }
-Nur in misc/build/cppunit-1.8.0/src/result: log.cxx.dummy.
---- misc/cppunit-1.8.0/src/result/makefile.mk 2008-12-10 20:46:09.542019008 +0100
-+++ misc/build/cppunit-1.8.0/src/result/makefile.mk 2008-12-10 20:23:07.000000000 +0100
-@@ -1 +1,88 @@
--dummy
-+#*************************************************************************
-+#
-+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+#
-+# Copyright 2008 by Sun Microsystems, Inc.
-+#
-+# OpenOffice.org - a multi-platform office productivity suite
-+#
-+# $RCSfile$
-+#
-+# $Revision$
-+#
-+# This file is part of OpenOffice.org.
-+#
-+# OpenOffice.org is free software: you can redistribute it and/or modify
-+# it under the terms of the GNU Lesser General Public License version 3
-+# only, as published by the Free Software Foundation.
-+#
-+# OpenOffice.org is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+# GNU Lesser General Public License version 3 for more details
-+# (a copy is included in the LICENSE file that accompanied this code).
-+#
-+# You should have received a copy of the GNU Lesser General Public License
-+# version 3 along with OpenOffice.org. If not, see
-+# <http://www.openoffice.org/license.html>
-+# for a copy of the LGPLv3 License.
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..$/..$/..$/..$/..
-+INCEXT=..$/..$/include
-+# INCEXT=$(SOLARSRC)$/cppunit/$/$(INPATH)/$/misc$/build$/cppunit-1.8.0$/include
-+# PRJ=..$/..
-+# PRJINC=..$/..
-+
-+
-+PRJNAME=cppunit
-+TARGET=c5t_testresult
-+LIBTARGET=NO
-+ENABLE_EXCEPTIONS=TRUE
-+# ENABLE_RTTI=TRUE
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE : settings.mk
-+
-+# --- Files --------------------------------------------------------
-+
-+# CXXFILES = \
-+# querytemplate.cxx \
-+# stringhelper.cxx
-+
-+# ENVCFLAGSCXX+=-DCPPUNIT_BUILD_DLL
-+SLOFILES = \
-+ $(SLO)$/SynchronizedObject.obj \
-+ $(SLO)$/TestResult.obj \
-+ $(SLO)$/TestResultCollector.obj \
-+ $(SLO)$/TestSucessListener.obj \
-+ $(SLO)$/emacsTestResult.obj \
-+ $(SLO)$/log.obj \
-+ $(SLO)$/optionhelper.obj \
-+ $(SLO)$/outputter.obj \
-+ $(SLO)$/signal.obj \
-+ $(SLO)$/testshlTestResult.obj \
-+ $(SLO)$/treswrapper.obj
-+
-+# currently unused
-+# $(SLO)$/TextTestResult.obj
-+
-+LIB1TARGET= $(LB)$/$(TARGET).lib
-+LIB1OBJFILES= $(SLOFILES)
-+
-+.IF "$(GUI)"=="WNT"
-+.IF "$(COM)"=="GCC"
-+LIB1ARCHIV=$(LB)$/lib$(TARGET)$(DLLPOSTFIX).a
-+.ENDIF
-+.ENDIF
-+
-+.IF "$(GUI)" == "UNX"
-+LIB1ARCHIV=$(LB)$/lib$(TARGET)$(DLLPOSTFIX).a
-+.ENDIF
-+
-+# --- Targets ------------------------------------------------------
-+
-+.INCLUDE : target.mk
-+
-Nur in misc/build/cppunit-1.8.0/src/result: makefile.mk.dummy.
---- misc/cppunit-1.8.0/src/result/optionhelper.cxx 2008-12-10 20:46:09.615952197 +0100
-+++ misc/build/cppunit-1.8.0/src/result/optionhelper.cxx 2008-12-09 09:06:14.000000000 +0100
-@@ -1 +1,317 @@
--dummy
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org. If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+// MARKER(update_precomp.py): autogen include statement, do not remove
-+// #include "precompiled_cppunit.hxx"
-+
-+#include "cppunit/result/optionhelper.hxx"
-+// #include <sstream>
-+// #include <string>
-+#include <osl/time.h>
-+#include "cppunit/cmdlinebits.hxx"
-+
-+// -----------------------------------------------------------------------------
-+
-+namespace
-+{
-+ void split( const rtl::OString& opt,
-+ const rtl::OString& _sSeparator,
-+ OStringList& optLine )
-+ {
-+ optLine.clear();
-+ // const sal_Int32 cSetLen = cSet.getLength();
-+ sal_Int32 index = 0;
-+ sal_Int32 oldIndex = 0;
-+
-+ // sal_Int32 i;
-+ // sal_Int32 j = 0;
-+ while ( opt.getLength() > 0)
-+ {
-+ // for ( i = 0; i < cSetLen; i++ )
-+ // {
-+ index = opt.indexOf( _sSeparator, oldIndex);
-+ if( index != -1 )
-+ {
-+ optLine.push_back( opt.copy( oldIndex, index - oldIndex ) );
-+ oldIndex = index + _sSeparator.getLength();
-+ }
-+ // }
-+ else // if (index == -1)
-+ {
-+ optLine.push_back( opt.copy( oldIndex ) );
-+ break;
-+ }
-+ }
-+ } ///< split
-+
-+ bool match(OStringList const& _aFilter, OStringList const& _aName)
-+ {
-+ OStringList::const_iterator aFilterIter = _aFilter.begin();
-+ OStringList::const_iterator aValueIter = _aName.begin();
-+
-+ bool bMatch = false;
-+
-+ while (aFilterIter != _aFilter.end() && aValueIter != _aName.end())
-+ {
-+ rtl::OString sFilter = *aFilterIter;
-+ rtl::OString sName = *aValueIter;
-+
-+ if (sFilter == sName)
-+ {
-+ bMatch = true;
-+ ++aFilterIter;
-+ ++aValueIter;
-+ }
-+ else if (sFilter == "*")
-+ {
-+ bMatch = true;
-+ break;
-+ }
-+ else
-+ {
-+ // Filter does not match
-+ bMatch = false;
-+ break;
-+ }
-+ }
-+ return bMatch;
-+ }
-+}
-+
-+/* static */
-+std::string OptionHelper::integerToAscii(sal_Int32 nValue)
-+{
-+ sal_Char cBuf[30];
-+ sal_Char *pBuf = cBuf;
-+ sprintf(pBuf, "%d", static_cast<int>(nValue));
-+//# std::ostringstream sBuf;
-+//# sBuf << nValue;
-+// rtl::OString sStr;
-+// sStr = rtl::OString::valueOf(nValue);
-+ return std::string(pBuf);
-+}
-+
-+/* static */
-+// if a given String is less then 2 char, add a "0" in front.
-+std::string OptionHelper::twoDigits(std::string const& _sValue)
-+{
-+ std::string sBack;
-+ if (_sValue.length() == 0)
-+ {
-+ sBack = "00";
-+ }
-+ else if (_sValue.length() == 1)
-+ {
-+ sBack = "0";
-+ sBack += _sValue;
-+ }
-+ else
-+ {
-+ sBack = _sValue;
-+ }
-+ return sBack;
-+}
-+
-+
-+std::string OptionHelper::createDateTag(std::string const& _sProjectId, std::string const& _sBuildId)
-+{
-+ TimeValue tmv_system;
-+ TimeValue tmv_local;
-+ oslDateTime dt;
-+ osl_getSystemTime( &tmv_system );
-+ osl_getLocalTimeFromSystemTime(&tmv_system, &tmv_local);
-+ osl_getDateTimeFromTimeValue( &tmv_local, &dt );
-+
-+ sal_Int32 nYear = dt.Year;
-+ sal_Int32 nMonth = dt.Month;
-+ sal_Int32 nDay = dt.Day;
-+
-+ std::string sDate;
-+ sDate = "# Current Time: ";
-+ sDate += std::string(twoDigits(integerToAscii(dt.Hours)));
-+ sDate += ":";
-+ sDate += std::string(twoDigits(integerToAscii(dt.Minutes)));
-+ sDate += ":";
-+ sDate += std::string(twoDigits(integerToAscii(dt.Seconds)));
-+ sDate += "\n";
-+
-+ sDate += "[";
-+
-+ // sDate += rtl::OString::valueOf(nYear);
-+ sDate.append(integerToAscii(nYear));
-+ sDate += ".";
-+ if (nMonth < 10)
-+ sDate += "0";
-+ // sDate += rtl::OString::valueOf(nMonth);
-+ sDate.append(integerToAscii(nMonth));
-+ sDate += ".";
-+ if (nDay < 10)
-+ sDate += "0";
-+ // sDate += rtl::OString::valueOf(nDay);
-+ sDate += std::string(integerToAscii(nDay));
-+ sDate += "/";
-+ sDate += _sProjectId;
-+ sDate += "/";
-+ sDate += _sBuildId;
-+ sDate += "]";
-+
-+ return sDate;
-+}
-+
-+//# rtl::OString createDateTag()
-+//# {
-+//# TimeValue tmv;
-+//# oslDateTime dt;
-+//# osl_getSystemTime( &tmv );
-+//# osl_getDateTimeFromTimeValue( &tmv, &dt );
-+//#
-+//# sal_Int32 nYear = dt.Year;
-+//# sal_Int32 nMonth = dt.Month;
-+//# sal_Int32 nDay = dt.Day;
-+//#
-+//# rtl::OString sDate("[");
-+//# sDate += rtl::OString::valueOf(nYear);
-+//# sDate += ".";
-+//# if (nMonth < 10)
-+//# sDate += "0";
-+//# sDate += rtl::OString::valueOf(nMonth);
-+//# sDate += ".";
-+//# if (nDay < 10)
-+//# sDate += "0";
-+//# sDate += rtl::OString::valueOf(nDay);
-+//# sDate += "//]";
-+//#
-+//# return sDate;
-+//# }
-+
-+std::string OptionHelper::createDateTag()
-+{
-+ return createDateTag(m_sProjectId, m_sBuildId);
-+}
-+
-+bool OptionHelper::showErrors()
-+{
-+ bool bRetValue = true; // default, show all
-+ if (m_aOption.hasOpt("-noerrors"))
-+ {
-+ bRetValue = false;
-+ }
-+ return bRetValue;
-+}
-+
-+bool OptionHelper::showTests()
-+{
-+ bool bRetValue = true; // default, show all
-+ if (m_aOption.hasOpt("-onlyerrors"))
-+ {
-+ bRetValue = false;
-+ }
-+ return bRetValue;
-+}
-+
-+// Check which parameter is given for handle the jobs.
-+// If no parameter is given, all jobs (tests) will run through
-+void OptionHelper::handleJobs()
-+{
-+ // load job file, the file contains the functions which we only want to test.
-+ if (m_aOption.hasOpt("-jobexclude"))
-+ {
-+ rtl::OString sJobFile = m_aOption.getOpt("-jobexclude");
-+ m_aJobExcludeList.readfile(sJobFile.getStr(), JOB_EXCLUDE_LIST);
-+ }
-+
-+ if (m_aOption.hasOpt("-jobonly"))
-+ {
-+ rtl::OString sJobFile = m_aOption.getOpt("-jobonly");
-+ m_aJobOnlyList.readfile(sJobFile.getStr(), JOB_ONLY_LIST);
-+ }
-+
-+ //
-+ if (m_aOption.hasOpt("-jobfilter"))
-+ {
-+ rtl::OString sJobFilter = m_aOption.getOpt("-jobfilter");
-+ split(sJobFilter, ".", m_aJobFilter);
-+ }
-+}
-+
-+// -----------------------------------------------------------------------------
-+// Here will be decide, if a job/test will execute or not.
-+// therefore exist some lists, in which stay all jobs (positive list) or a list (negative list) which jobs should not execute
-+// or if only specific jobs should execute by a given filter
-+
-+bool OptionHelper::isAllowedToExecute(std::string const& _sNodeName, std::string const& _sName)
-+{
-+ std::string sJobName = _sNodeName + "." + _sName;
-+ // t_print(T_VERBOSE, "Jobname %s\n", sJobName.c_str());
-+ if (isOnlyShowJobs()) // true, if parameter -onlyshowjob
-+ {
-+ m_aJobOnlyList.setJobListEntry(sJobName, JOB_ACCESS);
-+ return false;
-+ }
-+
-+ if (m_aJobOnlyList.size()) // >0 if parameter -jobonly
-+ {
-+ if (m_aJobOnlyList.getJobListEntry(sJobName) != JOB_NOT_FOUND)
-+ {
-+ // job entry found, mark as accessed
-+ m_aJobOnlyList.setJobListEntry(sJobName, JOB_ACCESS);
-+ return true;
-+ }
-+ return false;
-+ }
-+ else if (m_aJobFilter.size() > 0) // >0 if parameter -jobfilter
-+ {
-+ OStringList aSplitName;
-+ split(sJobName.c_str(), ".", aSplitName);
-+ if (! match(m_aJobFilter, aSplitName))
-+ {
-+ t_print(T_VERBOSE, "job: '%s' filtered by [-jobfilter]\n", sJobName.c_str());
-+ return false;
-+ }
-+ }
-+ else if (m_aJobExcludeList.size() > 0) // >0 if parameter -jobexclude
-+ {
-+ if (m_aJobExcludeList.getJobListEntry(sJobName) != JOB_NOT_FOUND)
-+ {
-+ // job entry found, this job should not executed, so return false
-+ t_print(T_VERBOSE, "job: '%s' filtered by [-jobexclude]\n", sJobName.c_str());
-+ return false;
-+ }
-+ // m_aJobOnlyList.setJobListEntry(sJobName, JOB_ACCESS);
-+ return true;
-+ }
-+ else
-+ {
-+ //! not handled yet
-+ }
-+
-+ return true;
-+}
-+
-Nur in misc/build/cppunit-1.8.0/src/result: optionhelper.cxx.dummy.
---- misc/cppunit-1.8.0/src/result/outputter.cxx 2008-12-10 20:46:09.657356434 +0100
-+++ misc/build/cppunit-1.8.0/src/result/outputter.cxx 2008-12-09 09:06:18.000000000 +0100
-@@ -1 +1,106 @@
--dummy
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org. If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+// MARKER(update_precomp.py): autogen include statement, do not remove
-+// #include "precompiled_cppunit.hxx"
-+
-+//
-+#include <string>
-+#include <sal/types.h>
-+#include "cppunit/result/outputter.hxx"
-+
-+// -----------------------------------------------------------------------------
-+
-+Outputter::~Outputter()
-+{
-+ // delete m_pLog;
-+}
-+
-+void Outputter::writeToAll(const sal_Char* _sCharStr)
-+{
-+ // std::cout << _sCharStr;
-+ if (m_pStream)
-+ {
-+ *m_pStream << _sCharStr;
-+ }
-+ if (m_pLog.get())
-+ {
-+ m_pLog->write(_sCharStr);
-+ }
-+}
-+
-+void Outputter::write(const sal_Char* _sCharStr)
-+{
-+ writeToAll(_sCharStr);
-+}
-+
-+void Outputter::write(std::string const& _sStr)
-+{
-+ writeToAll(_sStr.c_str());
-+}
-+
-+void Outputter::write(sal_Int32 _nValue)
-+{
-+ sal_Char cBuf[20];
-+ sal_Char* pBuf = cBuf;
-+ sprintf(pBuf, "%d", SAL_STATIC_CAST(int, _nValue));
-+ writeToAll(pBuf);
-+}
-+
-+// -----------------------------------------------------------------------------
-+
-+Outputter& operator <<( Outputter &_aStreamWrapper, const sal_Char* _sValue)
-+{
-+ _aStreamWrapper.write(_sValue);
-+ return _aStreamWrapper;
-+}
-+
-+Outputter& operator <<( Outputter &_aStreamWrapper, std::string const& _sValue)
-+{
-+ _aStreamWrapper.write(_sValue);
-+ return _aStreamWrapper;
-+}
-+
-+Outputter& operator <<( Outputter &_aStreamWrapper, sal_Int32 _nValue)
-+{
-+ _aStreamWrapper.write(_nValue);
-+ return _aStreamWrapper;
-+}
-+
-+//# Outputter& operator <<( Outputter &_aStreamWrapper, double )
-+//# {
-+//# return _aStreamWrapper;
-+//# }
-+
-+Outputter& operator <<( Outputter &_aStreamWrapper, Outputter::endl const&)
-+{
-+ _aStreamWrapper.write("\n");
-+ return _aStreamWrapper;
-+}
-Nur in misc/build/cppunit-1.8.0/src/result: outputter.cxx.dummy.
---- misc/cppunit-1.8.0/src/result/signal.cxx 2008-12-10 20:46:09.750401577 +0100
-+++ misc/build/cppunit-1.8.0/src/result/signal.cxx 2008-12-10 20:42:46.000000000 +0100
-@@ -1 +1,998 @@
--dummy
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org. If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+// MARKER(update_precomp.py): autogen include statement, do not remove
-+// #include "precompiled_cppunit.hxx"
-+
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#if (defined UNX) || (defined OS2)
-+#include <signal.h>
-+#include <errno.h>
-+#endif
-+
-+#include <fstream>
-+#include <vector>
-+#include <hash_map>
-+
-+#include <rtl/tres.h>
-+#include <rtl/string.hxx>
-+
-+#include "testshl/autoregisterhelper.hxx"
-+#include "testshl/getopt.hxx"
-+#include "signal.hxx"
-+#include <cppunit/tagvalues.hxx>
-+#include <unistd.h>
-+#include "testshl/filehelper.hxx"
-+#include <cppunit/result/TestResult.h>
-+#include "cppunit/signaltest.h"
-+#include "cppunit/Exception.h"
-+
-+#ifdef WNT
-+#include "testshl/winstuff.hxx"
-+#endif
-+
-+// typedef std::vector<std::string> StringList;
-+// StringList sCurrentNodeName;
-+CppUnit::TestResult *pTestResult = NULL;
-+std::string sSignalFile;
-+
-+typedef std::hash_map< std::string, int > HashMap;
-+HashMap m_aSignalHash;
-+bool bSignalsCached = false;
-+bool bDoNotTouchSignalFile = false;
-+
-+// -----------------------------------------------------------------------------
-+
-+// return 'true' if signalfile doesn't exist.
-+// else 'false'
-+bool existsSignalFile(std::string const& _sSignalFilename)
-+{
-+ FILE* pFile = fopen(_sSignalFilename.c_str(), "r");
-+ if (!pFile)
-+ {
-+ return false;
-+ }
-+ fprintf(stderr, "'%s' exists.\n", _sSignalFilename.c_str());
-+ fclose(pFile);
-+ return true;
-+}
-+
-+// -----------------------------------------------------------------------------
-+void createEmptySignalFile(std::string const& _sSignalFilename)
-+{
-+ FILE* pFile = fopen(_sSignalFilename.c_str(), "w");
-+ if (!pFile)
-+ {
-+ fprintf(stderr, "error: Could not create signal helper file %s for signal info.\n", _sSignalFilename.c_str());
-+ }
-+ else
-+ {
-+ fprintf(pFile, "# This is an auto generated helper file for signal handling.\n");
-+ fprintf(pFile, "# An entry start by '#' is a comment.\n");
-+ fprintf(pFile, "# All other are test functions which have abort, before this line is removed.\n");
-+ fprintf(pFile, "# So you have to check this functions by hand.\n");
-+
-+ fclose(pFile);
-+ }
-+}
-+
-+// -----------------------------------------------------------------------------
-+/** get Current PID.
-+*/
-+inline ::rtl::OUString getCurrentPID( )
-+{
-+ //~ Get current PID and turn it into OUString;
-+ sal_uInt32 nPID = 0;
-+#ifdef WNT
-+ nPID = WinGetCurrentProcessId();
-+#else
-+ nPID = getpid();
-+#endif
-+ return ( ::rtl::OUString::valueOf( static_cast<long>(nPID ) ) );
-+}
-+// -----------------------------------------------------------------------------
-+static std::string integerToAscii(sal_uInt32 nValue)
-+{
-+ sal_Char cBuf[30];
-+ sal_Char *pBuf = cBuf;
-+ sprintf(pBuf, "%d", static_cast<unsigned int>(nValue));
-+ return std::string(pBuf);
-+}
-+void my_sleep(int sec);
-+
-+// -----------------------------------------------------------------------------
-+void setSignalFilename(GetOpt & opt)
-+{
-+ if (opt.hasOpt("-dntsf") || opt.hasOpt("-donottouchsignalfile"))
-+ {
-+ // special feature, for debugging, so the signal file will not manipulate.
-+ // but create, if no one exist.
-+ bDoNotTouchSignalFile = true;
-+ }
-+
-+ if (opt.hasOpt("-sf") || opt.hasOpt("-signalfile"))
-+ {
-+ if (opt.hasOpt("-sf"))
-+ {
-+ sSignalFile = opt.getOpt("-sf");
-+ }
-+ else if (opt.hasOpt("-signalfile"))
-+ {
-+ sSignalFile = opt.getOpt("-signalfile");
-+ }
-+ }
-+ else
-+ {
-+ std::string sPath;
-+ // std::string sPath(FileHelper::getTempPath());
-+ std::string sFilename("signalfile");
-+ std::string sFilenameExt(".txt");
-+ bool bCanQuitLoop = true;
-+ do
-+ {
-+
-+// #ifdef WNT
-+// sPath += "\\";
-+// #endif
-+// #ifdef UNX
-+// sPath += "/";
-+// #endif
-+ sPath = sFilename;
-+ // BUG: i72675
-+ // add "_12345" where 12345 is the current process ID
-+
-+ TimeValue aTimeValue;
-+ osl_getSystemTime(&aTimeValue);
-+
-+ sPath += "_";
-+ sPath += integerToAscii(aTimeValue.Seconds);
-+ // rtl::OUString suPID = getCurrentPID();
-+ // rtl::OString sPID = rtl::OUStringToOString(suPID, RTL_TEXTENCODING_ASCII_US);
-+ // sPath += sPID.getStr();
-+ sPath += sFilenameExt;
-+ bCanQuitLoop = true;
-+ if (existsSignalFile(sPath))
-+ {
-+ // there is already a signal file, wait a second, choose an other one.
-+ my_sleep(1);
-+ bCanQuitLoop = false;
-+ }
-+ }
-+ while (!(bCanQuitLoop));
-+
-+ sSignalFile = sPath;
-+ fprintf(stderr, "Use default signal file name '%s'\n", sSignalFile.c_str());
-+ }
-+
-+ if (opt.hasOpt("-dnrmsf"))
-+ {
-+ fprintf(stderr, "'Don't remove signal file' (-dnrmsf) is set.\n");
-+ }
-+ else
-+ {
-+ if (bDoNotTouchSignalFile == true)
-+ {
-+ fprintf(stderr, "warning: 'Don't touch signal file' parameter (-dntsf) is set, will not remove existing signal file.\n");
-+ }
-+ else
-+ {
-+ // remove signalfile
-+ createEmptySignalFile(sSignalFile);
-+ }
-+ }
-+}
-+
-+// -----------------------------------------------------------------------------
-+bool doNotTouchSignalFile() { return bDoNotTouchSignalFile; }
-+
-+// -----------------------------------------------------------------------------
-+std::string buildTestFunctionName(std::string const& _sName)
-+{
-+ std::string sName;
-+ if (pTestResult)
-+ {
-+ sName = pTestResult->getNodeName();
-+ sName += ".";
-+ }
-+
-+/*
-+ for (StringList::const_iterator it = sCurrentNodeName.begin();
-+ it != sCurrentNodeName.end();
-+ ++it)
-+ {
-+ sName += *it;
-+ sName += ".";
-+ }
-+*/
-+ sName += _sName;
-+
-+ return sName;
-+}
-+// -----------------------------------------------------------------------------
-+// old: void executionPushName(std::string const& _sName)
-+// old: {
-+// old: sCurrentNodeName.push_back(_sName);
-+// old: }
-+// old: void executionPopName()
-+// old: {
-+// old: sCurrentNodeName.pop_back();
-+// old: }
-+// old:
-+
-+// -----------------------------------------------------------------------------
-+// ------------------------------ Signal Handling ------------------------------
-+// -----------------------------------------------------------------------------
-+
-+// std::string sLastTestFunctionName;
-+
-+std::string getSignalName(sal_Int32 nSignalNo);
-+// -----------------------------------------------------------------------------
-+
-+std::string getSignalFilename()
-+{
-+ return sSignalFile;
-+}
-+
-+// -----------------------------------------------------------------------------
-+// void storeNoSignal(std::string const& _sTestName)
-+// {
-+ // sLastTestFunctionName = buildTestFunctionName(_sTestName);
-+ // std::ofstream out(getSignalFilename().c_str(), std::ios::out);
-+ // out << NO_SIGNAL << std::endl; // no signal!
-+// }
-+
-+void markSignalAsAlreadyDone(sal_Int32 _nSignalNo)
-+{
-+ // std::ofstream out(getSignalFilename().c_str(), std::ios::out | std::ios::app);
-+ FILE *out = fopen(getSignalFilename().c_str(), "a");
-+ if (out != NULL)
-+ {
-+//# out << "# the previous test function creates signal: "
-+//# << getSignalName(_nSignalNo)
-+//# << " ("
-+//# << _nSignalNo
-+//# << ")" << std::endl;
-+//# // out << sLastTestFunctionName << std::endl; // SIGNAL!
-+
-+ fprintf(out, "# the previous test function creates signal: %s(%d)\n", getSignalName(_nSignalNo).c_str(), SAL_STATIC_CAST(int, _nSignalNo));
-+ // fprintf(out, "%s\n", sLastTestFunctionName );
-+ fclose(out);
-+ }
-+ else
-+ {
-+ fprintf(stderr, "error: Can't write signal info to file %s \n", getSignalFilename().c_str());
-+ }
-+}
-+
-+// -----------------------------------------------------------------------------
-+
-+Signal hasSignaled(std::string const& _sTestName)
-+{
-+ // BACK: true: signal
-+ // false: nothing
-+
-+ if (bSignalsCached == true)
-+ {
-+
-+ if (m_aSignalHash.find(buildTestFunctionName(_sTestName)) != m_aSignalHash.end())
-+ {
-+ return HAS_SIGNAL;
-+ }
-+ return NO_SIGNAL;
-+ }
-+
-+ std::ifstream in(getSignalFilename().c_str(), std::ios::in);
-+
-+ // std::cout << "Check for signal" << std::endl;
-+ std::string sLine, sLastLine;
-+ while (std::getline(in, sLine))
-+ {
-+ // std::cout << sTest << std::endl;
-+ char ch = sLine[0];
-+ if (isspace(ch) == 0 &&
-+ sLine.size() > 0)
-+ {
-+ if (ch == '#')
-+ {
-+ if (sLastLine.size() > 0)
-+ {
-+ rtl::OString aStrLine(sLine.c_str());
-+ sal_Int32 nIdx = aStrLine.indexOf("(") + 1;
-+ sal_Int32 nIdx2 = aStrLine.indexOf(")");
-+ sal_Int32 nSignalNo = 0;
-+ if (nIdx > 0 && nIdx2 > 0)
-+ {
-+ rtl::OString sSignalNo = aStrLine.copy(nIdx, nIdx2 - nIdx);
-+ nSignalNo = sSignalNo.toInt32();
-+ m_aSignalHash[sLastLine] = nSignalNo;
-+ }
-+ sLastLine.clear();
-+ }
-+ }
-+ else
-+ {
-+ // if (sTest == buildTestFunctionName(_sTestName))
-+ m_aSignalHash[sLine] = 1;
-+ sLastLine = sLine;
-+ // return HAS_SIGNAL;
-+ }
-+ }
-+ }
-+
-+ bSignalsCached = true;
-+ return hasSignaled(_sTestName);
-+ // return NO_SIGNAL;
-+}
-+
-+#ifdef UNX
-+
-+// -----------------------------------------------------------------------------
-+
-+void release_signal_Handling();
-+
-+//# void signalFunction(int value)
-+//# {
-+//# std::cout << "Signal caught: (" << value << "), please restart." << std::endl;
-+//# markSignalAsAlreadyDone();
-+//#
-+//# release_signal_Handling();
-+//# std::cout.flush();
-+//# abort();
-+//# }
-+
-+// -----------------------------------------------------------------------------
-+extern "C" void SignalHandlerFunction(int _nSignalNo, siginfo_t *, void*)
-+{
-+ // std::cout << "Signal caught: " << getSignalName(_nSignalNo) << " (" << _nSignalNo << "), please restart." << std::endl;
-+ fprintf(stderr, "Signal caught %s(%d)\n", getSignalName(_nSignalNo).c_str(), _nSignalNo);
-+ markSignalAsAlreadyDone(_nSignalNo);
-+
-+ release_signal_Handling();
-+ // std::cout.flush();
-+ abort();
-+}
-+
-+// -----------------------------------------------------------------------------
-+// This is a copy of the osl/signal.c code
-+#define ACT_IGNORE 1
-+#define ACT_ABORT 2
-+#define ACT_EXIT 3
-+#define ACT_SYSTEM 4
-+#define ACT_HIDE 5
-+
-+extern "C" {
-+static struct SignalAction
-+{
-+ int Signal;
-+ int Action;
-+ void (*Handler)(int);
-+} Signals[] =
-+{
-+ { SIGHUP, ACT_IGNORE, NULL }, /* hangup */
-+ { SIGINT, ACT_EXIT, NULL }, /* interrupt (rubout) */
-+ { SIGQUIT, ACT_ABORT, NULL }, /* quit (ASCII FS) */
-+ { SIGILL, ACT_SYSTEM, NULL }, /* illegal instruction (not reset when caught) */
-+/* changed from ACT_ABOUT to ACT_SYSTEM to try and get collector to run*/
-+ { SIGTRAP, ACT_ABORT, NULL }, /* trace trap (not reset when caught) */
-+#if ( SIGIOT != SIGABRT )
-+ { SIGIOT, ACT_ABORT, NULL }, /* IOT instruction */
-+#endif
-+// { SIGABRT, ACT_ABORT, NULL }, /* used by abort, replace SIGIOT in the future */
-+#ifdef SIGEMT
-+ { SIGEMT, ACT_SYSTEM, NULL }, /* EMT instruction */
-+/* changed from ACT_ABORT to ACT_SYSTEM to remove handler*/
-+/* SIGEMT may also be used by the profiler - so it is probably not a good
-+ plan to have the new handler use this signal*/
-+#endif
-+ { SIGFPE, ACT_ABORT, NULL }, /* floating point exception */
-+ { SIGKILL, ACT_SYSTEM, NULL }, /* kill (cannot be caught or ignored) */
-+ { SIGBUS, ACT_ABORT, NULL }, /* bus error */
-+ { SIGSEGV, ACT_ABORT, NULL }, /* segmentation violation */
-+#ifdef SIGSYS
-+ { SIGSYS, ACT_ABORT, NULL }, /* bad argument to system call */
-+#endif
-+ { SIGPIPE, ACT_HIDE, NULL }, /* write on a pipe with no one to read it */
-+ { SIGALRM, ACT_EXIT, NULL }, /* alarm clock */
-+ { SIGTERM, ACT_EXIT, NULL }, /* software termination signal from kill */
-+ { SIGUSR1, ACT_SYSTEM, NULL }, /* user defined signal 1 */
-+ { SIGUSR2, ACT_SYSTEM, NULL }, /* user defined signal 2 */
-+ { SIGCHLD, ACT_SYSTEM, NULL }, /* child status change */
-+#ifdef SIGPWR
-+ { SIGPWR, ACT_IGNORE, NULL }, /* power-fail restart */
-+#endif
-+ { SIGWINCH, ACT_IGNORE, NULL }, /* window size change */
-+ { SIGURG, ACT_EXIT, NULL }, /* urgent socket condition */
-+#ifdef SIGPOLL
-+ { SIGPOLL, ACT_EXIT, NULL }, /* pollable event occured */
-+#endif
-+ { SIGSTOP, ACT_SYSTEM, NULL }, /* stop (cannot be caught or ignored) */
-+ { SIGTSTP, ACT_SYSTEM, NULL }, /* user stop requested from tty */
-+ { SIGCONT, ACT_SYSTEM, NULL }, /* stopped process has been continued */
-+ { SIGTTIN, ACT_SYSTEM, NULL }, /* background tty read attempted */
-+ { SIGTTOU, ACT_SYSTEM, NULL }, /* background tty write attempted */
-+ { SIGVTALRM, ACT_EXIT, NULL }, /* virtual timer expired */
-+ { SIGPROF, ACT_SYSTEM, NULL }, /* profiling timer expired */
-+/*Change from ACT_EXIT to ACT_SYSTEM for SIGPROF is so that profiling signals do
-+ not get taken by the new handler - the new handler does not pass on context
-+ information which causes 'collect' to crash. This is a way of avoiding
-+ what looks like a bug in the new handler*/
-+ { SIGXCPU, ACT_ABORT, NULL }, /* exceeded cpu limit */
-+ { SIGXFSZ, ACT_ABORT, NULL } /* exceeded file size limit */
-+};
-+}
-+
-+const int NoSignals = sizeof(Signals) / sizeof(struct SignalAction);
-+
-+#endif /* UNX */
-+
-+// -----------------------------------------------------------------------------
-+void init_signal_Handling(CppUnit::TestResult *_pResult)
-+{
-+ pTestResult = _pResult;
-+#ifdef UNX
-+
-+// signal(SIGSEGV, signalFunction);
-+ // signal(SIGSEGV, signalFunction);
-+ // signal(SIGFPE, signalFunction);
-+
-+// signal(1, signalFunction);
-+ // struct sigaction action, oldaction;
-+ // action.sa_sigaction = signalFunction2;
-+ // action.sa_flags = SA_ONESHOT /* | SA_SIGINFO */;
-+
-+ struct sigaction act;
-+ struct sigaction oact;
-+
-+ // act.sa_handler = SignalHandlerFunction;
-+ act.sa_flags = SA_RESTART;
-+ // act.sa_flags = SA_ONESHOT /* | SA_SIGINFO */;
-+ act.sa_sigaction = SignalHandlerFunction;
-+
-+ sigfillset(&(act.sa_mask));
-+
-+ /* Initialize the rest of the signals */
-+ for (int i = 0; i < NoSignals; i++)
-+ {
-+ if (Signals[i].Action != ACT_SYSTEM)
-+ {
-+ if (Signals[i].Action == ACT_HIDE)
-+ {
-+ struct sigaction ign;
-+
-+ ign.sa_handler = SIG_IGN;
-+ ign.sa_flags = 0;
-+ sigemptyset(&ign.sa_mask);
-+
-+ if (sigaction(Signals[i].Signal, &ign, &oact) == 0)
-+ Signals[i].Handler = oact.sa_handler;
-+ else
-+ Signals[i].Handler = SIG_DFL;
-+ }
-+ else
-+ if (sigaction(Signals[i].Signal, &act, &oact) == 0)
-+ Signals[i].Handler = oact.sa_handler;
-+ else
-+ Signals[i].Handler = SIG_DFL;
-+ }
-+ }
-+#endif
-+
-+ // ------------ signal helper file must exist -----------------
-+ FILE* pFile = fopen(getSignalFilename().c_str(), "r");
-+ if (!pFile)
-+ {
-+ createEmptySignalFile( getSignalFilename() );
-+ }
-+ else
-+ {
-+ fclose(pFile);
-+ }
-+}
-+
-+// -----------------------------------------------------------------------------
-+void release_signal_Handling()
-+{
-+ // frees all signals
-+#ifdef UNX
-+ int i;
-+ struct sigaction act;
-+
-+ act.sa_flags = 0;
-+ sigemptyset(&(act.sa_mask));
-+
-+ /* Initialize the rest of the signals */
-+ for (i = NoSignals - 1; i >= 0; i--)
-+ {
-+ if (Signals[i].Action != ACT_SYSTEM)
-+ {
-+ act.sa_handler = Signals[i].Handler;
-+
-+ sigaction(Signals[i].Signal, &act, NULL);
-+ }
-+ }
-+#endif
-+}
-+
-+// -----------------------------------------------------------------------------
-+Signal signalCheck(CppUnit::TestResult* _pResult, std::string const& _sTestName)
-+{
-+ // BACK: HAS_SIGNAL: the test has already done and signaled
-+ if (hasSignaled(_sTestName) == HAS_SIGNAL)
-+ {
-+ // std::cout << "The Test '" << buildTestFunctionName(_sTestName) << "' is marked as signaled." << std::endl;
-+ std::string sTestFunctionName = buildTestFunctionName(_sTestName);
-+ fprintf(stderr, "The Test '%s' is marked as signaled.\n", sTestFunctionName.c_str());
-+ if (_pResult)
-+ {
-+ CppUnit::SignalTest *pTest = new CppUnit::SignalTest(_sTestName);
-+
-+ std::string sErrorText = "Function is marked as signaled: ";
-+ sal_Int32 nSignalNo = m_aSignalHash[sTestFunctionName];
-+ sErrorText += getSignalName(nSignalNo);
-+ sErrorText += " (";
-+ sErrorText += OptionHelper::integerToAscii(nSignalNo);
-+ sErrorText += ")";
-+
-+ _pResult->addError(pTest, new CppUnit::SignalException(sErrorText), ErrorType::ET_SIGNAL);
-+ }
-+ return HAS_SIGNAL;
-+ }
-+
-+ // storeNoSignal(_sTestName);
-+ return NO_SIGNAL;
-+}
-+
-+// -----------------------------------------------------------------------------
-+bool copyFile(std::string const& _sFrom, std::string const& _sTo)
-+{
-+ bool bRetValue = false;
-+ const int MAXBUFSIZE = 1024;
-+ char buff[MAXBUFSIZE];
-+ FILE *in = fopen(_sFrom.c_str(), "r");
-+ if (in == NULL)
-+ {
-+ fprintf(stderr, "error: Can't open file %s for read to copy.\n", _sFrom.c_str());
-+ bRetValue = false;
-+ }
-+ else
-+ {
-+ FILE *out = fopen(_sTo.c_str(), "w");
-+ if (out == NULL)
-+ {
-+ fclose(in);
-+ fprintf(stderr, "error: Can't open file %s for write to copy.\n", _sTo.c_str());
-+ bRetValue = false;
-+ }
-+ else
-+ {
-+ int nRealGot = 0;
-+ while(!feof(in))
-+ {
-+ nRealGot = fread(buff, sizeof(char), MAXBUFSIZE, in);
-+ if (nRealGot > 0)
-+ {
-+ fwrite(buff, sizeof(char), nRealGot, out);
-+ }
-+ }
-+ bRetValue = true;
-+ fclose(out);
-+ fclose(in);
-+ }
-+ }
-+ return bRetValue;
-+}
-+
-+// -----------------------------------------------------------------------------
-+void signalStartTest(std::string const& _sName)
-+{
-+ if (doNotTouchSignalFile()) return;
-+
-+ // fprintf(stderr, "### signalStartTest!\n");
-+ // due to the fact, that functions are vicious, we write the name first.
-+ // if it isn't vivious, than we removed it.
-+ std::string sNewName = getSignalFilename();
-+ sNewName += ".bak";
-+ if (copyFile(getSignalFilename(), sNewName))
-+ {
-+ // std::ofstream out(getSignalFilename().c_str(), std::ios::out | std::ios::app);
-+ FILE *out = fopen(getSignalFilename().c_str(), "a");
-+ if (out != NULL)
-+ {
-+ // out << buildTestFunctionName(_sName) << std::endl;
-+ fprintf(out, "%s\n", buildTestFunctionName(_sName).c_str());
-+ fclose(out);
-+ }
-+ else
-+ {
-+ fprintf(stderr, "error: Can't open file %s for append.\n", getSignalFilename().c_str());
-+ }
-+ }
-+ else
-+ {
-+ fprintf(stderr, "error: Can't copy signal helper from file %s to file %s, %d\n", getSignalFilename().c_str(), sNewName.c_str(), errno);
-+ }
-+}
-+
-+// -----------------------------------------------------------------------------
-+void signalEndTest()
-+{
-+ if (doNotTouchSignalFile()) return;
-+
-+ // fprintf(stderr, "### signalEndTest!\n");
-+ if (0 != remove(getSignalFilename().c_str()))
-+ {
-+ fprintf(stderr, "error: Can't delete file %s\n", getSignalFilename().c_str());
-+ }
-+ else
-+ {
-+ std::string sNewName = getSignalFilename();
-+ sNewName += ".bak";
-+ if (0 != rename(sNewName.c_str(), getSignalFilename().c_str()))
-+ {
-+ fprintf(stderr, "error: Can't rename file %s to file %s errno: %d\n", sNewName.c_str(), getSignalFilename().c_str(), errno);
-+ }
-+ }
-+}
-+
-+// -----------------------------------------------------------------------------
-+void removeSignalFile(GetOpt & opt)
-+{
-+ // fprintf(stderr, "### remove signal file: '%s'\n", sSignalFile.c_str());
-+ if (opt.hasOpt("-dnrmsf"))
-+ {
-+ return;
-+ }
-+ if (bDoNotTouchSignalFile == true)
-+ {
-+ return;
-+ }
-+ remove(getSignalFilename().c_str());
-+}
-+
-+// -----------------------------------------------------------------------------
-+
-+sal_Int32 SignalHandlerA( TagHelper const& _aTagItems )
-+{
-+ sal_Int32 nRetValue = 0;
-+ TagData nTagType = _aTagItems.GetTagData(TAG_TYPE, 0);
-+// LLA: unused
-+// hTestResult hResult = (hTestResult) _aTagItems.GetTagData(TAG_RESULT_PTR, 0 /* NULL */ );
-+// CppUnit::TestResult* pResult = (CppUnit::TestResult*)hResult;
-+
-+ try
-+ {
-+ switch(nTagType)
-+ {
-+ // old: case SIGNAL_PUSH_NAME:
-+ // old: {
-+ // old: const char* sName = (const char*) _aTagItems.GetTagData(TAG_NODENAME);
-+ // old: if (sName != NULL)
-+ // old: signalPushName(sName);
-+ // old: break;
-+ // old: }
-+ // old:
-+ // old: case SIGNAL_POP_NAME:
-+ // old: signalPopName();
-+ // old: break;
-+
-+ // old: case SIGNAL_CHECK:
-+ // old: {
-+ // old: const char* sName = (const char*) _aTagItems.GetTagData(TAG_NODENAME);
-+ // old: if (sName != NULL)
-+ // old: {
-+ // old: nRetValue = signalCheck(sName);
-+ // old: }
-+ // old: break;
-+ // old: }
-+
-+ // old: case INIT_SIGNAL_HANDLING:
-+ // old: init_signal_Handling();
-+ // old: break;
-+ // old:
-+ // old: case RELEASE_SIGNAL_HANDLING:
-+ // old: release_signal_Handling();
-+ // old: break;
-+
-+ case SIGNAL_START_TEST:
-+ {
-+ // fprintf(stderr, "### SIGNAL_START_TEST!\n");
-+ const char* sName = (const char*) _aTagItems.GetTagData(TAG_NODENAME);
-+ if (sName != NULL)
-+ {
-+ signalStartTest(sName);
-+ }
-+ break;
-+ }
-+
-+ case SIGNAL_END_TEST:
-+ {
-+ // fprintf(stderr, "### SIGNAL_END_TEST!\n");
-+ const char* sName = (const char*) _aTagItems.GetTagData(TAG_NODENAME);
-+ if (sName != NULL)
-+ {
-+ signalEndTest();
-+ }
-+ break;
-+ }
-+
-+ default:
-+ fprintf(stderr, "error: SignalHandlerA: Can't handle the tag type %d\n", SAL_STATIC_CAST(int, nTagType));
-+ fflush(stderr);
-+ // throw std::exception(/*std::string("Unknown TYPE_TAG Exception.")*/);
-+ }
-+ }
-+ catch (std::exception &e)
-+ {
-+ fprintf(stderr, "error: SignalHandlerA: Exception caught: %s\n", e.what());
-+ fflush(stderr);
-+ // throw e;
-+ }
-+
-+ return nRetValue;
-+}
-+// -----------------------------------------------------------------------------
-+// This a little bit more abstract code, could be easier to modify or expand.
-+
-+sal_Int32 CheckExecution(CppUnit::TestResult* _pResult, std::string const& _sName)
-+{
-+ // more checks in the corresponding job lists
-+ if (_pResult)
-+ {
-+ if (! _pResult->isAllowedToExecute(_sName))
-+ {
-+ return DO_NOT_EXECUTE;
-+ }
-+ }
-+
-+ // Check if the given test should be executed.
-+ if (signalCheck(_pResult, _sName) == HAS_SIGNAL)
-+ {
-+ return DO_NOT_EXECUTE;
-+ }
-+
-+ return GO_EXECUTE;
-+}
-+
-+// -----------------------------------------------------------------------------
-+sal_Int32 ExecutionA( TagHelper const& _aTagItems )
-+{
-+ sal_Int32 nRetValue = 0;
-+ TagData nTagType = _aTagItems.GetTagData(TAG_TYPE, 0);
-+ hTestResult hResult = (hTestResult) _aTagItems.GetTagData(TAG_RESULT_PTR, 0 /* NULL */ );
-+ CppUnit::TestResult* pResult = (CppUnit::TestResult*)hResult;
-+
-+ try
-+ {
-+ switch(nTagType)
-+ {
-+ case EXECUTION_CHECK:
-+ {
-+ const char* sName = (const char*) _aTagItems.GetTagData(TAG_NODENAME);
-+ if (sName)
-+ {
-+ nRetValue = CheckExecution(pResult, sName);
-+ if (nRetValue == GO_EXECUTE)
-+ {
-+ if (pResult && pResult->isOptionWhereAmI())
-+ {
-+ printf("# This is: %s\n", buildTestFunctionName(sName).c_str());
-+ }
-+ }
-+ }
-+
-+ break;
-+ }
-+
-+ // old: case EXECUTION_PUSH_NAME:
-+ // old: {
-+ // old: const char* sName = (const char*) _aTagItems.GetTagData(TAG_NODENAME);
-+ // old: if (sName != NULL)
-+ // old: executionPushName(sName);
-+ // old: break;
-+ // old: }
-+ // old:
-+ // old: case EXECUTION_POP_NAME:
-+ // old: executionPopName();
-+ // old: break;
-+
-+ case INIT_TEST:
-+ init_signal_Handling(pResult);
-+ break;
-+
-+ case RELEASE_TEST:
-+ release_signal_Handling();
-+ break;
-+
-+ default:
-+ fprintf(stderr, "ExceptionA: Can't handle the tag type %d\n", SAL_STATIC_CAST(int, nTagType));
-+ break;
-+ }
-+ }
-+ catch (std::exception &e)
-+ {
-+ fprintf(stderr, "ExecutionA: exception caught: %s\n", e.what());
-+ fflush(stderr);
-+ // throw e;
-+ }
-+ return nRetValue;
-+}
-+
-+// -----------------------------------------------------------------------------
-+std::string getSignalName(sal_Int32 nSignalNo)
-+{
-+ std::string sValue;
-+#ifdef UNX
-+ switch(nSignalNo)
-+ {
-+ case SIGHUP:
-+ sValue = "SIGHUP";
-+ break;
-+
-+ case SIGINT:
-+ sValue = "SIGINT";
-+ break;
-+
-+ case SIGQUIT:
-+ sValue = "SIGQUIT";
-+ break;
-+
-+ case SIGILL:
-+ sValue = "SIGILL";
-+ break;
-+
-+ case SIGTRAP:
-+ sValue = "SIGTRAP";
-+ break;
-+
-+#if ( SIGIOT != SIGABRT )
-+ case SIGIOT:
-+ sValue = "SIGIOT";
-+ break;
-+#endif
-+// case SIGABRT:
-+#ifdef SIGEMT
-+ case SIGEMT:
-+ sValue = "SIGEMT";
-+ break;
-+#endif
-+ case SIGFPE:
-+ sValue = "SIGFPE";
-+ break;
-+
-+ case SIGKILL:
-+ sValue = "SIGKILL";
-+ break;
-+
-+ case SIGBUS:
-+ sValue = "SIGBUS";
-+ break;
-+
-+ case SIGSEGV:
-+ sValue = "SIGSEGV";
-+ break;
-+
-+#ifdef SIGSYS
-+ case SIGSYS:
-+ sValue = "SIGSYS";
-+ break;
-+#endif
-+ case SIGPIPE:
-+ sValue = "SIGPIPE";
-+ break;
-+
-+ case SIGALRM:
-+ sValue = "SIGALRM";
-+ break;
-+
-+ case SIGTERM:
-+ sValue = "SIGTERM";
-+ break;
-+
-+ case SIGUSR1:
-+ sValue = "SIGUSR1";
-+ break;
-+
-+ case SIGUSR2:
-+ sValue = "SIGUSR2";
-+ break;
-+
-+ case SIGCHLD:
-+ sValue = "SIGCHLD";
-+ break;
-+
-+#ifdef SIGPWR
-+ case SIGPWR:
-+ sValue = "SIGPWR";
-+ break;
-+#endif
-+ case SIGWINCH:
-+ sValue = "SIGWINCH";
-+ break;
-+
-+ case SIGURG:
-+ sValue = "SIGURG";
-+ break;
-+
-+#ifdef SIGPOLL
-+ case SIGPOLL:
-+ sValue = "SIGPOLL";
-+ break;
-+#endif
-+ case SIGSTOP:
-+ sValue = "SIGSTOP";
-+ break;
-+
-+ case SIGTSTP:
-+ sValue = "SIGTSTP";
-+ break;
-+
-+ case SIGCONT:
-+ sValue = "SIGCONT";
-+ break;
-+
-+ case SIGTTIN:
-+ sValue = "SIGTTIN";
-+ break;
-+
-+ case SIGTTOU:
-+ sValue = "SIGTTOU";
-+ break;
-+
-+ case SIGVTALRM:
-+ sValue = "SIGVTALRM";
-+ break;
-+
-+ case SIGPROF:
-+ sValue = "SIGPROF";
-+ break;
-+
-+ case SIGXCPU:
-+ sValue = "SIGXCPU";
-+ break;
-+
-+ case SIGXFSZ:
-+ sValue = "SIGXFSZ";
-+ break;
-+
-+ default:
-+ sValue = "Unhandled Signal.";
-+ }
-+#else
-+ (void) nSignalNo; // unused
-+#endif
-+ return sValue;
-+}
-+
-+// The following sets variables for GNU EMACS
-+// Local Variables:
-+// tab-width:4
-+// End:
-Nur in misc/build/cppunit-1.8.0/src/result: signal.cxx.dummy.
---- misc/cppunit-1.8.0/src/result/signal.hxx 2008-12-10 20:46:09.813916116 +0100
-+++ misc/build/cppunit-1.8.0/src/result/signal.hxx 2008-07-07 08:14:56.000000000 +0200
-@@ -1 +1,42 @@
--dummy
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org. If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+#ifndef SIGNAL_HXX
-+#define SIGNAL_HXX
-+
-+#include <sal/types.h>
-+
-+#define HAS_SIGNAL 1
-+#define NO_SIGNAL 0
-+
-+typedef sal_Int32 Signal;
-+
-+#endif
-+
-Nur in misc/build/cppunit-1.8.0/src/result: signal.hxx.dummy.
---- misc/cppunit-1.8.0/src/result/testshlTestResult.cxx 2008-12-10 20:46:09.880238139 +0100
-+++ misc/build/cppunit-1.8.0/src/result/testshlTestResult.cxx 2008-12-09 09:06:11.000000000 +0100
-@@ -1 +1,428 @@
--dummy
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org. If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+// MARKER(update_precomp.py): autogen include statement, do not remove
-+// #include "precompiled_cppunit.hxx"
-+
-+#include <stdlib.h>
-+
-+#include <map>
-+#include <cppunit/Exception.h>
-+#include <cppunit/NotEqualException.h>
-+#include <cppunit/Test.h>
-+#include <cppunit/TestFailure.h>
-+#include <cppunit/result/testshlTestResult.h>
-+// #include <TextTestResult.h>
-+//!io #include <iostream>
-+#include <string>
-+
-+#include <rtl/string.hxx>
-+#include "cppunit/result/outputter.hxx"
-+
-+namespace CppUnit {
-+
-+ testshlTestResult::testshlTestResult(GetOpt & _aOptions)
-+ :TestResult(_aOptions),
-+ m_aOptions(_aOptions),
-+ // m_aOptionHelper(_aOptions),
-+ m_aResulter(this)
-+ {
-+ addListener( &m_aResulter );
-+ }
-+
-+ testshlTestResult::~testshlTestResult()
-+ {
-+ }
-+
-+//# void
-+//# testshlTestResult::addFailure( const TestFailure &failure )
-+//# {
-+//# // TestResultCollector::addFailure( failure );
-+//# // std::cerr << ( failure.isError() ? "E" : "F" );
-+//# m_aResulter.addFailure(failure);
-+//# }
-+//#
-+//#
-+//# void
-+//# testshlTestResult::startTest( Test *test )
-+//# {
-+//# // TestResultCollector::startTest (test);
-+//# m_aResulter.startTest(test);
-+//# // std::cerr << ".";
-+//# }
-+//#
-+//# void testshlTestResult::endTest( Test *test )
-+//# {
-+//# }
-+
-+// -----------------------------------------------------------------------------
-+
-+//# void
-+//# testshlTestResult::printFailures( Outputter &stream )
-+//# {
-+//# TestFailures::const_iterator itFailure = failures().begin();
-+//# int failureNumber = 1;
-+//# while ( itFailure != failures().end() )
-+//# {
-+//# stream << std::endl;
-+//# printFailure( *itFailure++, failureNumber++, stream );
-+//# }
-+//# }
-+//#
-+//#
-+//# void
-+//# testshlTestResult::printFailure( TestFailure *failure,
-+//# int failureNumber,
-+//# std::ostream &stream )
-+//# {
-+//# printFailureListMark( failureNumber, stream );
-+//# stream << ' ';
-+//# printFailureTestName( failure, stream );
-+//# stream << ' ';
-+//# printFailureType( failure, stream );
-+//# stream << ' ';
-+//# printFailureLocation( failure->sourceLine(), stream );
-+//# stream << std::endl;
-+//# printFailureDetail( failure->thrownException(), stream );
-+//# stream << std::endl;
-+//# }
-+//#
-+//#
-+//# void
-+//# testshlTestResult::printFailureListMark( int failureNumber,
-+//# std::ostream &stream )
-+//# {
-+//# stream << failureNumber << ")";
-+//# }
-+//#
-+//#
-+//# void
-+//# testshlTestResult::printFailureTestName( TestFailure *failure,
-+//# std::ostream &stream )
-+//# {
-+//# Test* pTest = failure->failedTest();
-+//# stream << "test: " << pTest->getName();
-+//# }
-+//#
-+//#
-+//# void
-+//# testshlTestResult::printFailureType( TestFailure *failure,
-+//# std::ostream &stream )
-+//# {
-+//# stream << "("
-+//# << (failure->isError() ? "E" : "F")
-+//# << ")";
-+//# }
-+//#
-+//#
-+//# void
-+//# testshlTestResult::printFailureLocation( SourceLine sourceLine,
-+//# std::ostream &stream )
-+//# {
-+//# if ( !sourceLine.isValid() )
-+//# return;
-+//#
-+//# stream << "line: " << sourceLine.lineNumber()
-+//# << ' ' << sourceLine.fileName();
-+//# }
-+//#
-+//#
-+//# void
-+//# testshlTestResult::printFailureDetail( Exception *thrownException,
-+//# std::ostream &stream )
-+//# {
-+//# if ( thrownException->isInstanceOf( NotEqualException::type() ) )
-+//# {
-+//# NotEqualException *e = (NotEqualException*)thrownException;
-+//# stream << "expected: " << e->expectedValue() << std::endl
-+//# << "but was: " << e->actualValue();
-+//# if ( !e->additionalMessage().empty() )
-+//# {
-+//# stream << std::endl;
-+//# stream << "additional message:" << std::endl
-+//# << e->additionalMessage();
-+//# }
-+//# }
-+//# else
-+//# {
-+//# stream << " \"" << thrownException->what() << "\"";
-+//# }
-+//# }
-+
-+
-+// LLA: output format:
-+// Header
-+// # -- BEGIN
-+// Error lines
-+// No error lines
-+// unknown lines
-+// # -- END
-+// Text 'Test #PASSED#' or 'Errors only'
-+
-+void
-+testshlTestResult::print( Outputter& stream )
-+{
-+ printHeader( stream );
-+ // stream << std::endl;
-+ // printFailures( stream );
-+
-+ bool bPassed = false;
-+ if (isOnlyShowJobs())
-+ {
-+ JobList jl(m_aOptionHelper.getJobOnlyList());
-+ HashMap aJobList = jl.getHashMap();
-+ printLines(stream, aJobList);
-+ }
-+ else
-+ {
-+ stream << "# -- BEGIN:" << Outputter::endl();
-+
-+ TestPtrList aFailedTests;
-+
-+ // List of failures
-+ printFailedTests(stream, aFailedTests);
-+
-+ if (! m_aOptionHelper.getOptions().hasOpt("-onlyerrors"))
-+ {
-+ // List of well done tests
-+ printTestLines(stream, aFailedTests);
-+
-+ // List of unknown Tests
-+ JobList jl(m_aOptionHelper.getJobOnlyList());
-+ HashMap aJobList = jl.getHashMap();
-+ printUnknownLines(stream, aJobList);
-+
-+ bPassed = true;
-+ }
-+ stream << "# -- END:" << Outputter::endl();
-+
-+ if (bPassed)
-+ {
-+ stream << "Test #PASSED#" << Outputter::endl();
-+ }
-+
-+ if (m_aOptionHelper.getOptions().hasOpt("-onlyerrors"))
-+ {
-+ stream << "Errors only." << Outputter::endl();
-+ }
-+ }
-+}
-+
-+// -----------------------------------------------------------------------------
-+void
-+testshlTestResult::printLines(Outputter &stream, HashMap & _aJobList)
-+{
-+ int nCount = _aJobList.size();
-+ if (nCount != 0)
-+ {
-+ for (HashMap::const_iterator it = _aJobList.begin();
-+ it != _aJobList.end();
-+ ++it)
-+ {
-+ std::string aKey = (*it).first;
-+ if (_aJobList[aKey] == JOB_ACCESS)
-+ {
-+ stream << aKey;
-+ stream << Outputter::endl();
-+ }
-+ }
-+ }
-+}
-+
-+void
-+testshlTestResult::printFailedTests(Outputter &stream, TestPtrList &aFailedTests)
-+{
-+ for (TestResultCollector::TestFailures::const_iterator it2 = m_aResulter.failures().begin();
-+ it2 != m_aResulter.failures().end();
-+ ++it2)
-+ {
-+ TestFailureEnvelope *pEnvelop = *it2;
-+ TestFailure *pFailure = pEnvelop->getTestFailure();
-+ std::string sNodeName = pEnvelop->getString();
-+
-+ aFailedTests[ pFailure->failedTest() ] = true;
-+
-+ printFailureLine(stream, pFailure, sNodeName);
-+ }
-+}
-+
-+void
-+testshlTestResult::printTestLines(Outputter &stream, TestPtrList &aFailedTests)
-+{
-+ for (TestResultCollector::Tests::const_iterator it = m_aResulter.tests().begin();
-+ it != m_aResulter.tests().end();
-+ ++it)
-+ {
-+ TestEnvelope *pEnvelop = *it;
-+ Test* pTest = pEnvelop->getTest();
-+ std::string sNodeName = pEnvelop->getString();
-+
-+ if (aFailedTests.find(pTest) == aFailedTests.end())
-+ {
-+ std::string sInfo = m_aResulter.getInfo(pTest);
-+ printTestLine(stream, pTest, sNodeName, sInfo);
-+ }
-+ }
-+}
-+
-+void
-+testshlTestResult::printUnknownLines(Outputter &stream, HashMap & _aJobList)
-+{
-+ int nCount = _aJobList.size();
-+ if (nCount != 0)
-+ {
-+ for (HashMap::const_iterator it = _aJobList.begin();
-+ it != _aJobList.end();
-+ ++it)
-+ {
-+ std::string aKey = (*it).first;
-+ if (_aJobList[aKey] == JOB_UNKNOWN)
-+ {
-+ printUnknownLine(stream, aKey);
-+ }
-+ }
-+ }
-+}
-+
-+void
-+testshlTestResult::printHeader( Outputter &stream )
-+{
-+ std::string sDate(m_aOptionHelper.createDateTag());
-+ if (isOnlyShowJobs())
-+ {
-+ stream << "# This is an automatically generated job file." << Outputter::endl();
-+ stream << "# ";
-+ }
-+ else
-+ {
-+ stream << sDate << Outputter::endl();
-+ }
-+}
-+
-+void
-+testshlTestResult::printFailureLine( Outputter &stream, TestFailure *_pFailure, std::string const& _sNodeName)
-+{
-+ std::string aName;
-+ aName += _sNodeName;
-+ aName += ".";
-+ aName += _pFailure->failedTestName();
-+
-+ SourceLine aLine = _pFailure->sourceLine();
-+ sal_Int32 nLine = -1;
-+ std::string sFilename;
-+ if (aLine.isValid())
-+ {
-+ nLine = aLine.lineNumber();
-+ sFilename = aLine.fileName();
-+ }
-+
-+ Exception *pExp = _pFailure->thrownException();
-+ std::string sWhat;
-+ if (pExp)
-+ {
-+ sWhat = pExp->what();
-+ }
-+
-+ ErrorType::num eErr = _pFailure->getErrorType();
-+
-+ stream << aName;
-+ stream << ";";
-+
-+ if (eErr == ErrorType::ET_FAILURE)
-+ stream << "FAILED";
-+
-+ else if (eErr == ErrorType::ET_ERROR)
-+ stream << "ERROR";
-+
-+ else if (eErr == ErrorType::ET_SIGNAL)
-+ stream << "SIGNAL";
-+
-+ else
-+ stream << "UNKNOWN";
-+
-+ stream << "#FAILED#";
-+
-+ stream << sWhat;
-+ stream << Outputter::endl();
-+}
-+
-+void
-+testshlTestResult::printTestLine( Outputter &stream, Test* _pTest, std::string const& _sNodeName, std::string const& _sInfo)
-+{
-+ std::string aName;
-+ aName += _sNodeName;
-+ aName += ".";
-+ aName += _pTest->getName();
-+
-+ stream << aName;
-+ stream << ";";
-+ stream << _sInfo << "#";
-+ if (_sInfo == "PASSED")
-+ {
-+ stream << "OK#";
-+ }
-+ else
-+ {
-+ stream << "FAILED#";
-+ }
-+ stream << Outputter::endl();
-+}
-+
-+void
-+testshlTestResult::printUnknownLine( Outputter &stream, std::string const& _sTestName)
-+{
-+ stream << _sTestName;
-+ stream << ";";
-+ stream << "UNKNOWN#";
-+ stream << "FAILED#";
-+ stream << Outputter::endl();
-+}
-+
-+//# void
-+//# testshlTestResult::printStatistics( Outputter &stream )
-+//# {
-+//# stream << "Test Results:" << std::endl;
-+//#
-+//# stream << "Run: " << runTests()
-+//# << " Failures: " << testFailures()
-+//# << " Errors: " << testErrors()
-+//# << std::endl;
-+//# }
-+
-+
-+Outputter &
-+operator <<( Outputter &stream,
-+ testshlTestResult &result )
-+{
-+ result.print (stream); return stream;
-+}
-+
-+
-+} // namespace CppUnit
-Nur in misc/build/cppunit-1.8.0/src/result: testshlTestResult.cxx.dummy.
---- misc/cppunit-1.8.0/src/result/treswrapper.cxx 2008-12-10 20:46:09.979665912 +0100
-+++ misc/build/cppunit-1.8.0/src/result/treswrapper.cxx 2008-12-09 09:06:10.000000000 +0100
-@@ -1 +1,261 @@
--dummy
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org. If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+// MARKER(update_precomp.py): autogen include statement, do not remove
-+// #include "precompiled_cppunit.hxx"
-+
-+#include <cstdarg>
-+#include <stdlib.h>
-+#include <stdio.h>
-+
-+#include <sal/types.h>
-+#include <cppunit/Test.h>
-+#include "cppunit/autoregister/htestresult.h"
-+#include "cppunit/autoregister/callbackfunc_fktptr.h"
-+#include "cppunit/result/callbackfunc.h"
-+#include "cppunit/result/TestResult.h"
-+
-+#include <cppunit/tagvalues.hxx>
-+
-+namespace
-+{
-+ void TestResult_startTest(hTestResult _pResult, hTest _pTest)
-+ {
-+ CppUnit::TestResult* pResult = (CppUnit::TestResult*)_pResult;
-+ CppUnit::Test* pTest = (CppUnit::Test*)_pTest;
-+
-+ std::string sName = pTest->getName();
-+ CallbackDispatch(0 /* NULL */, TAG_TYPE, SIGNAL_START_TEST, TAG_RESULT_PTR, _pResult, TAG_NODENAME, sName.c_str(), TAG_DONE);
-+
-+ pResult->startTest(pTest);
-+ }
-+
-+ void TestResult_endTest( hTestResult _pResult, hTest _pTest )
-+ {
-+ CppUnit::TestResult* pResult = (CppUnit::TestResult*)_pResult;
-+ CppUnit::Test* pTest = (CppUnit::Test*)_pTest;
-+ pResult->endTest(pTest);
-+
-+ std::string sName = pTest->getName();
-+ CallbackDispatch(0 /* NULL */, TAG_TYPE, SIGNAL_END_TEST, TAG_RESULT_PTR, _pResult, TAG_NODENAME, sName.c_str(), TAG_DONE);
-+ }
-+
-+// -----------------------------------------------------------------------------
-+
-+ void TestResult_addFailure( hTestResult _pResult, hTest _pTest, hException _pException )
-+ {
-+ CppUnit::TestResult* pResult = (CppUnit::TestResult*)_pResult;
-+ CppUnit::Test* pTest = (CppUnit::Test*)_pTest;
-+ CppUnit::Exception* pException = (CppUnit::Exception*)_pException;
-+ pResult->addFailure(pTest, pException);
-+ }
-+
-+ void TestResult_addError( hTestResult _pResult, hTest _pTest, hException _pException )
-+ {
-+ CppUnit::TestResult* pResult = (CppUnit::TestResult*)_pResult;
-+ CppUnit::Test* pTest = (CppUnit::Test*)_pTest;
-+ CppUnit::Exception* pException = (CppUnit::Exception*)_pException;
-+ pResult->addError(pTest, pException);
-+ }
-+
-+ sal_Int32 TestResult_shouldStop(hTestResult _pResult)
-+ {
-+ CppUnit::TestResult* pResult = (CppUnit::TestResult*)_pResult;
-+ return pResult->shouldStop() == true ? 1 : 0;
-+ }
-+
-+// -----------------------------------------------------------------------------
-+ void TestResult_addInfo( hTestResult _pResult, hTest _pTest, const char* _sInfo )
-+ {
-+ CppUnit::TestResult* pResult = (CppUnit::TestResult*)_pResult;
-+ CppUnit::Test* pTest = (CppUnit::Test*)_pTest;
-+ // CppUnit::Exception* pException = (CppUnit::Exception*)_pException;
-+ pResult->addInfo(pTest, _sInfo);
-+ }
-+// -----------------------------------------------------------------------------
-+ void TestResult_enterNode( hTestResult _pResult, const char* _sNode )
-+ {
-+ // signalPushName(getName());
-+ // CallbackDispatch(NULL, TAG_TYPE, EXECUTION_PUSH_NAME, TAG_RESULT_PTR, _pResult, TAG_NODENAME, _sNode, TAG_DONE);
-+
-+ CppUnit::TestResult* pResult = (CppUnit::TestResult*)_pResult;
-+ // CppUnit::Test* pTest = (CppUnit::Test*)_pTest;
-+ // CppUnit::Exception* pException = (CppUnit::Exception*)_pException;
-+ pResult->enterNode(_sNode);
-+ }
-+ void TestResult_leaveNode( hTestResult _pResult, const char* _sNode )
-+ {
-+ CppUnit::TestResult* pResult = (CppUnit::TestResult*)_pResult;
-+ // CppUnit::Test* pTest = (CppUnit::Test*)_pTest;
-+ // CppUnit::Exception* pException = (CppUnit::Exception*)_pException;
-+ pResult->leaveNode(_sNode);
-+
-+ // CallbackDispatch(NULL, TAG_TYPE, EXECUTION_POP_NAME, TAG_RESULT_PTR, _pResult, TAG_DONE);
-+ }
-+
-+// -----------------------------------------------------------------------------
-+ sal_Int32 TestResult_StarterA(TagHelper const& _aTagItems)
-+ {
-+ sal_Int32 nRetValue = 0;
-+ TagData nTagType = _aTagItems.GetTagData(TAG_TYPE, 0);
-+ hTestResult pResult = (hTestResult) _aTagItems.GetTagData(TAG_RESULT_PTR, 0 /* NULL */);
-+ CppUnit::Test* pTest = (CppUnit::Test*) _aTagItems.GetTagData(TAG_TEST_PTR, 0 /* NULL */);
-+
-+ try
-+ {
-+ switch(nTagType)
-+ {
-+ case RESULT_START:
-+ TestResult_startTest(pResult, pTest);
-+ break;
-+
-+ case RESULT_END:
-+ TestResult_endTest(pResult, pTest);
-+ break;
-+
-+ case RESULT_ADD_FAILURE:
-+ {
-+ hException pException = (hException) _aTagItems.GetTagData(TAG_EXCEPTION, 0);
-+ TestResult_addFailure(pResult, pTest, pException);
-+ break;
-+ }
-+
-+ case RESULT_ADD_ERROR:
-+ {
-+ hException pException = (hException) _aTagItems.GetTagData(TAG_EXCEPTION, 0);
-+ TestResult_addError(pResult, pTest, pException);
-+ break;
-+ }
-+
-+ case RESULT_ADD_INFO:
-+ {
-+ const char* pInfo = (const char* ) _aTagItems.GetTagData(TAG_INFO, 0);
-+ TestResult_addInfo(pResult, pTest, pInfo);
-+ break;
-+ }
-+
-+ case RESULT_ENTER_NODE:
-+ {
-+ const char* pNode = (const char* )_aTagItems.GetTagData(TAG_NODENAME, 0);
-+ TestResult_enterNode(pResult, pNode);
-+ break;
-+ }
-+
-+ case RESULT_LEAVE_NODE:
-+ {
-+ const char* pNode = (const char* ) _aTagItems.GetTagData(TAG_NODENAME, 0);
-+ TestResult_leaveNode(pResult, pNode);
-+ break;
-+ }
-+
-+ case RESULT_SHOULD_STOP:
-+ nRetValue = TestResult_shouldStop(pResult);
-+ break;
-+
-+ default:
-+ fprintf(stderr, "TestResult_StarterA: Can't handle the tag type %8x\n", SAL_STATIC_CAST(int, nTagType));
-+ fflush(stderr);
-+ // throw std::exception(/*std::string("Unknown TYPE_TAG Exception.")*/);
-+ }
-+ }
-+ catch (std::exception &e)
-+ {
-+ fprintf(stderr, "TestResult_StarterA: Exception caught: %s\n", e.what());
-+ // throw e;
-+ }
-+
-+ return nRetValue;
-+ }
-+} // namespace anonymous
-+
-+// --------------------------------- Prototypes ---------------------------------
-+
-+sal_Int32 SignalHandlerA( TagHelper const& _aTagItems );
-+sal_Int32 ExecutionA( TagHelper const& _aTagItems );
-+
-+// -----------------------------------------------------------------------------
-+sal_Int32 CallbackDispatch(int x, ...)
-+{
-+ (void) x; // avoid warning
-+
-+ // The idea behind TagItems are from the Amiga OS.
-+ // Due to the fact that the following code does not find my ok
-+ // I decide to wrote a simple helper
-+ //
-+ // struct TagItem *tags = (struct TagItem *)&x + 1;
-+
-+ TagHelper aTagItems;
-+
-+ // the following code could also be in a #define, so other functions could
-+ // use this, but at the moment this function a the only one.
-+
-+ // FILL_TAGS(aTagItems, x);
-+ std::va_list args;
-+ va_start( args, x );
-+ Tag nTag;
-+ do
-+ {
-+ nTag = va_arg(args, Tag);
-+ if (nTag != TAG_DONE)
-+ {
-+ TagData nValue = va_arg(args, TagData);
-+ // printf("Tag: %8x Value:%8x\n", nTag, nValue);
-+ aTagItems.insert(nTag, nValue);
-+ }
-+ } while (nTag != TAG_DONE);
-+
-+ va_end ( args );
-+
-+ // FILL_TAGS:END
-+
-+ // printf(".\n");
-+
-+ sal_Int32 nRetValue = 0;
-+ Tag nPreTag = aTagItems.GetTagData(TAG_TYPE);
-+ if ( (nPreTag & TAG_RESULT) == TAG_RESULT)
-+ {
-+ nRetValue = TestResult_StarterA( aTagItems );
-+ }
-+ else if ((nPreTag & TAG_SIGNAL) == TAG_SIGNAL)
-+ {
-+ nRetValue = SignalHandlerA(aTagItems);
-+ }
-+ else if (( nPreTag & TAG_EXECUTION) == TAG_EXECUTION)
-+ {
-+ nRetValue = ExecutionA(aTagItems);
-+ }
-+ else
-+ {
-+ fprintf(stderr, "CallbackDispatch: First tag is unknown %8x\n", SAL_STATIC_CAST(int, nPreTag));
-+ // unknown TAG_TYPE
-+ }
-+ return nRetValue;
-+}
-+
-Nur in misc/build/cppunit-1.8.0/src/result: treswrapper.cxx.dummy.
---- misc/cppunit-1.8.0/src/win32/makefile.mk 2008-12-10 20:46:10.024158685 +0100
-+++ misc/build/cppunit-1.8.0/src/win32/makefile.mk 2008-12-10 19:45:23.000000000 +0100
-@@ -1 +1,67 @@
--dummy
-+#*************************************************************************
-+#
-+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+#
-+# Copyright 2008 by Sun Microsystems, Inc.
-+#
-+# OpenOffice.org - a multi-platform office productivity suite
-+#
-+# $RCSfile$
-+#
-+# $Revision$
-+#
-+# This file is part of OpenOffice.org.
-+#
-+# OpenOffice.org is free software: you can redistribute it and/or modify
-+# it under the terms of the GNU Lesser General Public License version 3
-+# only, as published by the Free Software Foundation.
-+#
-+# OpenOffice.org is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+# GNU Lesser General Public License version 3 for more details
-+# (a copy is included in the LICENSE file that accompanied this code).
-+#
-+# You should have received a copy of the GNU Lesser General Public License
-+# version 3 along with OpenOffice.org. If not, see
-+# <http://www.openoffice.org/license.html>
-+# for a copy of the LGPLv3 License.
-+#
-+#*************************************************************************
-+PRJ=..$/..$/..$/..$/..$/..
-+INCEXT=..$/..$/include
-+# PRJ=..$/..
-+# PRJINC=..
-+
-+PRJNAME=cppunit
-+TARGET=c5t_winstuff
-+LIBTARGET=NO
-+ENABLE_EXCEPTIONS=TRUE
-+
-+# --- Settings -----------------------------------------------------
-+.INCLUDE : settings.mk
-+
-+# ------------------------------------------------------------------
-+
-+SLOFILES = \
-+ $(SLO)$/winstuff.obj
-+
-+#-------------------------------------------------------------------------------
-+# This is a static lib
-+LIB1TARGET= $(LB)$/$(TARGET).lib
-+LIB1OBJFILES= \
-+ $(SLOFILES)
-+
-+.IF "$(GUI)"=="WNT"
-+.IF "$(COM)"=="GCC"
-+LIB1ARCHIV=$(LB)$/lib$(TARGET)$(DLLPOSTFIX).a
-+.ENDIF
-+.ENDIF
-+
-+.IF "$(GUI)" == "UNX"
-+LIB1ARCHIV=$(LB)$/lib$(TARGET)$(DLLPOSTFIX).a
-+.ENDIF
-+
-+# --- Targets ------------------------------------------------------
-+
-+.INCLUDE : target.mk
-Nur in misc/build/cppunit-1.8.0/src/win32: makefile.mk.dummy.
---- misc/cppunit-1.8.0/src/win32/winstuff.cxx 2008-12-10 20:46:10.106772548 +0100
-+++ misc/build/cppunit-1.8.0/src/win32/winstuff.cxx 2008-12-10 20:42:44.000000000 +0100
-@@ -1 +1,143 @@
--dummy
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org. If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+// MARKER(update_precomp.py): autogen include statement, do not remove
-+// #include "precompiled_cppunit.hxx"
-+
-+#ifdef WIN32
-+#include "testshl/winstuff.hxx"
-+
-+#if defined _MSC_VER
-+#pragma warning(push, 1)
-+#endif
-+#include <windows.h>
-+#if defined _MSC_VER
-+#pragma warning(pop)
-+#endif
-+#include <MAPIWin.h>
-+
-+void WinDebugBreak()
-+{
-+ // forward to WinAPI. Note that the whole story is simply to
-+ // disentangle OOo headers from Windows headers (which are largely
-+ // incompatible, due to name clashes and macro mess-ups)
-+ DebugBreak();
-+}
-+
-+void WinSleep( sal_uInt32 sec )
-+{
-+ Sleep(sec * 1000);
-+}
-+
-+sal_uInt32 WinGetCurrentProcessId()
-+{
-+ return GetCurrentProcessId();
-+}
-+
-+#define TA_FAILED 0
-+#define TA_SUCCESS_CLEAN 1
-+#define TA_SUCCESS_KILL 2
-+#define TA_SUCCESS_16 3
-+
-+ // Declare Callback Enum Functions.
-+bool CALLBACK TerminateAppEnum( HWND hwnd, LPARAM lParam );
-+
-+/*----------------------------------------------------------------
-+ DWORD WINAPI TerminateApp( DWORD dwPID, DWORD dwTimeout )
-+
-+ Purpose:
-+ Shut down a 32-Bit Process (or 16-bit process under Windows 95)
-+
-+ Parameters:
-+ dwPID
-+ Process ID of the process to shut down.
-+
-+ dwTimeout
-+ Wait time in milliseconds before shutting down the process.
-+
-+ Return Value:
-+ TA_FAILED - If the shutdown failed.
-+ TA_SUCCESS_CLEAN - If the process was shutdown using WM_CLOSE.
-+ TA_SUCCESS_KILL - if the process was shut down with
-+ TerminateProcess().
-+ NOTE: See header for these defines.
-+ ----------------------------------------------------------------*/
-+void WinTerminateApp( sal_uInt32 dwPID, sal_uInt32 dwTimeout )
-+{
-+ HANDLE hProc;
-+ DWORD dwRet;
-+
-+ // If we can't open the process with PROCESS_TERMINATE rights,
-+ // then we give up immediately.
-+ hProc = OpenProcess(SYNCHRONIZE|PROCESS_TERMINATE, false,
-+ dwPID);
-+
-+ if(hProc == NULL)
-+ return;
-+
-+ // TerminateAppEnum() posts WM_CLOSE to all windows whose PID
-+ // matches your process's.
-+ EnumWindows((WNDENUMPROC)TerminateAppEnum, (LPARAM) dwPID);
-+
-+ // Wait on the handle. If it signals, great. If it times out,
-+ // then you kill it.
-+ if (WaitForSingleObject(hProc, dwTimeout) != WAIT_OBJECT_0)
-+ dwRet= (TerminateProcess(hProc,0) ? TA_SUCCESS_KILL : TA_FAILED);
-+ else
-+ dwRet = TA_SUCCESS_CLEAN;
-+
-+ CloseHandle(hProc);
-+}
-+
-+bool CALLBACK TerminateAppEnum( HWND hwnd, LPARAM lParam )
-+{
-+ DWORD dwID;
-+
-+ GetWindowThreadProcessId(hwnd, &dwID);
-+
-+ if(dwID == (DWORD)lParam)
-+ {
-+ PostMessage(hwnd, WM_CLOSE, 0, 0);
-+ }
-+
-+ return true;
-+}
-+#else
-+
-+// this file is only need within Windows.
-+// due to the fact that empty files don't create libraries
-+// we store one function in it.
-+int WinStuffDummy_this_function_will_never_need()
-+{
-+ return 42; // we need some code
-+}
-+
-+#endif /* WIN32 */
-+
-Nur in misc/build/cppunit-1.8.0/src/win32: winstuff.cxx.dummy.
++ cd cppunit && $(MAKE) $(MFLAGS) $(CALLMACROS)
diff --git a/cppunit/makefile.mk b/cppunit/makefile.mk
index 8f636569d8b2..3836e6905e9a 100644
--- a/cppunit/makefile.mk
+++ b/cppunit/makefile.mk
@@ -1,7 +1,7 @@
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+#
# Copyright 2008 by Sun Microsystems, Inc.
#
# OpenOffice.org - a multi-platform office productivity suite
@@ -42,84 +42,20 @@ TARGET=so_cppunit
TARFILE_NAME=cppunit-1.8.0
-MOVED_FILES=\
- include$/cppunit$/result$/SynchronizedObject.h \
- include$/cppunit$/result$/TestListener.h \
- include$/cppunit$/result$/TestResultCollector.h \
- include$/cppunit$/result$/TestResult.h \
- include$/cppunit$/result$/TestSucessListener.h \
- include$/cppunit$/result$/TextTestResult.h \
- include$/cppunit$/portability$/config-bcb5.h \
- include$/cppunit$/portability$/config-msvc6.h \
- src$/result$/SynchronizedObject.cpp \
- src$/result$/TestResultCollector.cpp \
- src$/result$/TestResult.cpp \
- src$/result$/TestSucessListener.cpp \
- src$/result$/TextTestResult.cpp
-
ADDITIONAL_FILES=\
- $(MOVED_FILES) \
- include$/cppunit$/additionalfunc.hxx \
- include$/cppunit$/autoregister$/callbackfunc_fktptr.h \
- include$/cppunit$/autoregister$/callbackstructure.h \
- include$/cppunit$/autoregister$/htestresult.h \
- include$/cppunit$/autoregister$/registerfunc.h \
- include$/cppunit$/autoregister$/registertestfunction.h \
- include$/cppunit$/autoregister$/testfunc.h \
- include$/cppunit$/checkboom.hxx \
- include$/cppunit$/cmdlinebits.hxx \
- include$/cppunit$/externcallbackfunc.hxx \
- include$/cppunit$/joblist.hxx \
- include$/cppunit$/nocopy.hxx \
- include$/cppunit$/portability$/config-auto.h \
- include$/cppunit$/result$/callbackfunc.h \
- include$/cppunit$/result$/emacsTestResult.hxx \
- include$/cppunit$/result$/log.hxx \
- include$/cppunit$/result$/optionhelper.hxx \
- include$/cppunit$/result$/outputter.hxx \
- include$/cppunit$/result$/testshlTestResult.h \
- include$/cppunit$/signaltest.h \
- include$/cppunit$/simpleheader.hxx \
- include$/cppunit$/stringhelper.hxx \
- include$/cppunit$/taghelper.hxx \
+ include$/cppunit$/config-auto.h \
include$/cppunit$/tagvalues.hxx \
- include$/testshl$/autoregisterhelper.hxx \
- include$/testshl$/dynamicregister.hxx \
- include$/testshl$/filehelper.hxx \
- include$/testshl$/getopt.hxx \
- include$/testshl$/log.hxx \
- include$/testshl$/tresstatewrapper.h \
- include$/testshl$/tresstatewrapper.hxx \
- include$/testshl$/versionhelper.hxx \
- include$/testshl$/winstuff.hxx \
- include$/makefile.mk \
+ include$/cppunit$/callbackfunc_fktptr.h \
+ include$/cppunit$/externcallbackfunc.hxx \
makefile.mk \
src$/makefile.mk \
- src$/cppunit$/cmdlinebits.cxx \
- src$/cppunit$/joblist.cxx \
- src$/cppunit$/makefile.mk \
- src$/cppunit$/registertestfunction.cxx \
- src$/cppunit$/signaltest.cxx \
- src$/cppunit$/t_print.cxx \
- src$/cppunit$/tresregister.cxx \
- src$/cppunit$/tresstatewrapper.cxx \
- src$/result$/emacsTestResult.cxx \
- src$/result$/log.cxx \
- src$/result$/makefile.mk \
- src$/result$/optionhelper.cxx \
- src$/result$/outputter.cxx \
- src$/result$/signal.cxx \
- src$/result$/signal.hxx \
- src$/result$/testshlTestResult.cxx \
- src$/result$/treswrapper.cxx \
- src$/win32$/makefile.mk \
- src$/win32$/winstuff.cxx
+ src$/cppunit$/makefile.mk
PATCH_FILES=cppunit-1.8.0-r1.patch
# CONFIGURE_DIR=
# CONFIGURE_ACTION=
-#
+#
# BUILD_DIR=
BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
diff --git a/cppunit/prj/build.lst b/cppunit/prj/build.lst
index a1cce90ce3d4..f2587dd4c624 100644
--- a/cppunit/prj/build.lst
+++ b/cppunit/prj/build.lst
@@ -1,3 +1,3 @@
-c5t cppunit : sal NULL
+c5t cppunit : soltools stlport NULL
c5t cppunit usr1 - all c5t_mkout NULL
c5t cppunit nmake - all c5t_make NULL
diff --git a/cppunit/prj/d.lst b/cppunit/prj/d.lst
index 94fa6ac352b5..ff580704f9a4 100644
--- a/cppunit/prj/d.lst
+++ b/cppunit/prj/d.lst
@@ -1,73 +1,10 @@
-mkdir: %_DEST%\inc%_EXT%\cppunit
-mkdir: %_DEST%\inc%_EXT%\cppunit\portability
-mkdir: %_DEST%\inc%_EXT%\cppunit\autoregister
-mkdir: %_DEST%\inc%_EXT%\cppunit\extensions
-mkdir: %_DEST%\inc%_EXT%\cppunit\result
-mkdir: %_DEST%\inc%_EXT%\testshl
+mkdir: %_DEST%/inc%_EXT%/cppunit
+mkdir: %_DEST%/inc%_EXT%/cppunit/extensions
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/Asserter.h %_DEST%\inc%_EXT%/cppunit/Asserter.h
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/Exception.h %_DEST%\inc%_EXT%/cppunit/Exception.h
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/NotEqualException.h %_DEST%\inc%_EXT%/cppunit/NotEqualException.h
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/Portability.h %_DEST%\inc%_EXT%/cppunit/Portability.h
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/SourceLine.h %_DEST%\inc%_EXT%/cppunit/SourceLine.h
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/Test.h %_DEST%\inc%_EXT%/cppunit/Test.h
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/TestAssert.h %_DEST%\inc%_EXT%/cppunit/TestAssert.h
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/TestCaller.h %_DEST%\inc%_EXT%/cppunit/TestCaller.h
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/TestCase.h %_DEST%\inc%_EXT%/cppunit/TestCase.h
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/TestFailure.h %_DEST%\inc%_EXT%/cppunit/TestFailure.h
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/TestFixture.h %_DEST%\inc%_EXT%/cppunit/TestFixture.h
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/TestSuite.h %_DEST%\inc%_EXT%/cppunit/TestSuite.h
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/additionalfunc.hxx %_DEST%\inc%_EXT%/cppunit/additionalfunc.hxx
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/autoregister/callbackfunc_fktptr.h %_DEST%\inc%_EXT%/cppunit/autoregister/callbackfunc_fktptr.h
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/autoregister/callbackstructure.h %_DEST%\inc%_EXT%/cppunit/autoregister/callbackstructure.h
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/autoregister/htestresult.h %_DEST%\inc%_EXT%/cppunit/autoregister/htestresult.h
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/autoregister/registerfunc.h %_DEST%\inc%_EXT%/cppunit/autoregister/registerfunc.h
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/autoregister/registertestfunction.h %_DEST%\inc%_EXT%/cppunit/autoregister/registertestfunction.h
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/autoregister/testfunc.h %_DEST%\inc%_EXT%/cppunit/autoregister/testfunc.h
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/checkboom.hxx %_DEST%\inc%_EXT%/cppunit/checkboom.hxx
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/cmdlinebits.hxx %_DEST%\inc%_EXT%/cppunit/cmdlinebits.hxx
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/extensions/AutoRegisterSuite.h %_DEST%\inc%_EXT%/cppunit/extensions/AutoRegisterSuite.h
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/extensions/HelperMacros.h %_DEST%\inc%_EXT%/cppunit/extensions/HelperMacros.h
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/extensions/TestFactory.h %_DEST%\inc%_EXT%/cppunit/extensions/TestFactory.h
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/extensions/TestFactoryRegistry.h %_DEST%\inc%_EXT%/cppunit/extensions/TestFactoryRegistry.h
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/extensions/TestSuiteBuilder.h %_DEST%\inc%_EXT%/cppunit/extensions/TestSuiteBuilder.h
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/extensions/TestSuiteFactory.h %_DEST%\inc%_EXT%/cppunit/extensions/TestSuiteFactory.h
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/extensions/TypeInfoHelper.h %_DEST%\inc%_EXT%/cppunit/extensions/TypeInfoHelper.h
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/externcallbackfunc.hxx %_DEST%\inc%_EXT%/cppunit/externcallbackfunc.hxx
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/joblist.hxx %_DEST%\inc%_EXT%/cppunit/joblist.hxx
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/nocopy.hxx %_DEST%\inc%_EXT%/cppunit/nocopy.hxx
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/portability/config-auto.h %_DEST%\inc%_EXT%/cppunit/portability/config-auto.h
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/portability/config-bcb5.h %_DEST%\inc%_EXT%/cppunit/portability/config-bcb5.h
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/portability/config-msvc6.h %_DEST%\inc%_EXT%/cppunit/portability/config-msvc6.h
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/result/SynchronizedObject.h %_DEST%\inc%_EXT%/cppunit/result/SynchronizedObject.h
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/result/TestListener.h %_DEST%\inc%_EXT%/cppunit/result/TestListener.h
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/result/TestResult.h %_DEST%\inc%_EXT%/cppunit/result/TestResult.h
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/result/TestResultCollector.h %_DEST%\inc%_EXT%/cppunit/result/TestResultCollector.h
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/result/TestSucessListener.h %_DEST%\inc%_EXT%/cppunit/result/TestSucessListener.h
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/result/TextTestResult.h %_DEST%\inc%_EXT%/cppunit/result/TextTestResult.h
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/result/callbackfunc.h %_DEST%\inc%_EXT%/cppunit/result/callbackfunc.h
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/result/emacsTestResult.hxx %_DEST%\inc%_EXT%/cppunit/result/emacsTestResult.hxx
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/result/log.hxx %_DEST%\inc%_EXT%/cppunit/result/log.hxx
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/result/optionhelper.hxx %_DEST%\inc%_EXT%/cppunit/result/optionhelper.hxx
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/result/outputter.hxx %_DEST%\inc%_EXT%/cppunit/result/outputter.hxx
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/result/testshlTestResult.h %_DEST%\inc%_EXT%/cppunit/result/testshlTestResult.h
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/signaltest.h %_DEST%\inc%_EXT%/cppunit/signaltest.h
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/simpleheader.hxx %_DEST%\inc%_EXT%/cppunit/simpleheader.hxx
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/stringhelper.hxx %_DEST%\inc%_EXT%/cppunit/stringhelper.hxx
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/taghelper.hxx %_DEST%\inc%_EXT%/cppunit/taghelper.hxx
-..\%__SRC%\misc\build\cppunit-1.8.0\include/cppunit/tagvalues.hxx %_DEST%\inc%_EXT%/cppunit/tagvalues.hxx
-..\%__SRC%\misc\build\cppunit-1.8.0\include/testshl/autoregisterhelper.hxx %_DEST%\inc%_EXT%/testshl/autoregisterhelper.hxx
-..\%__SRC%\misc\build\cppunit-1.8.0\include/testshl/dynamicregister.hxx %_DEST%\inc%_EXT%/testshl/dynamicregister.hxx
-..\%__SRC%\misc\build\cppunit-1.8.0\include/testshl/filehelper.hxx %_DEST%\inc%_EXT%/testshl/filehelper.hxx
-..\%__SRC%\misc\build\cppunit-1.8.0\include/testshl/getopt.hxx %_DEST%\inc%_EXT%/testshl/getopt.hxx
-..\%__SRC%\misc\build\cppunit-1.8.0\include/testshl/log.hxx %_DEST%\inc%_EXT%/testshl/log.hxx
-..\%__SRC%\misc\build\cppunit-1.8.0\include/testshl/tresstatewrapper.h %_DEST%\inc%_EXT%/testshl/tresstatewrapper.h
-..\%__SRC%\misc\build\cppunit-1.8.0\include/testshl/tresstatewrapper.hxx %_DEST%\inc%_EXT%/testshl/tresstatewrapper.hxx
-..\%__SRC%\misc\build\cppunit-1.8.0\include/testshl/versionhelper.hxx %_DEST%\inc%_EXT%/testshl/versionhelper.hxx
-..\%__SRC%\misc\build\cppunit-1.8.0\include/testshl/winstuff.hxx %_DEST%\inc%_EXT%/testshl/winstuff.hxx
+../%__SRC%/misc/build/cppunit-1.8.0/include/cppunit/*.h %_DEST%/inc%_EXT%/cppunit/*.h
+../%__SRC%/misc/build/cppunit-1.8.0/include/cppunit/*.hxx %_DEST%/inc%_EXT%/cppunit/*.hxx
+../%__SRC%/misc/build/cppunit-1.8.0/include/cppunit/extensions/*.h %_DEST%/inc%_EXT%/cppunit/extensions/*.h
-
-..\%__SRC%\lib\cppunit.lib %_DEST%\lib%_EXT%\cppunit.lib
-..\%__SRC%\lib\c5t_*.lib %_DEST%\lib%_EXT%\c5t_*.lib
-..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a
+../%__SRC%/lib/cppunit.lib %_DEST%/lib%_EXT%/cppunit.lib
+../%__SRC%/lib/*.a %_DEST%/lib%_EXT%/*.a
diff --git a/crashrep/source/unx/res.cxx b/crashrep/source/unx/res.cxx
index 63910d606a09..54968bb2259d 100755
--- a/crashrep/source/unx/res.cxx
+++ b/crashrep/source/unx/res.cxx
@@ -28,13 +28,6 @@
*
************************************************************************/
-#if OSL_DEBUG_LEVEL == 0
-# ifndef NDEBUG
-# define NDEBUG
-# endif
-#endif
-#include <assert.h>
-
#include <interface.hxx>
#include <cstdio>
#include <hash_map>
@@ -49,7 +42,7 @@ static string getResFileName( const char* progname )
string aRet = progname;
size_t pos = aRet.rfind( '/' );
// FIXME: search PATH if necessary
- assert( pos != string::npos );
+ OSL_ASSERT( pos != string::npos );
aRet.erase( pos );
aRet.append( "/resource/crash_dump.res" );
diff --git a/svtools/source/syslocale/makefile.mk b/cui/inc/makefile.mk
index a393c174856f..74e38ff96c51 100644
--- a/svtools/source/syslocale/makefile.mk
+++ b/cui/inc/makefile.mk
@@ -28,21 +28,25 @@
# for a copy of the LGPLv3 License.
#
#*************************************************************************
-PRJ=..$/..
-PRJNAME=svtools
-TARGET=syslocale
+PRJ=..
+
+PRJNAME=cui
+TARGET=inc
# --- Settings -----------------------------------------------------
.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/svt.pmk
+.INCLUDE : $(PRJ)$/util$/makefile.pmk
# --- Files --------------------------------------------------------
-SLOFILES = \
- $(SLO)$/syslocale.obj
+.INCLUDE : target.mk
-# --- Targets ------------------------------------------------------
+.IF "$(ENABLE_PCH)"!=""
+ALLTAR : \
+ $(SLO)$/precompiled.pch \
+ $(SLO)$/precompiled_ex.pch
+
+.ENDIF # "$(ENABLE_PCH)"!=""
-.INCLUDE : target.mk
diff --git a/sandbox/com/sun/star/lib/sandbox/Disposable.java b/cui/inc/pch/precompiled_cui.cxx
index fdf44cd2c567..2dcd495e1647 100644
--- a/sandbox/com/sun/star/lib/sandbox/Disposable.java
+++ b/cui/inc/pch/precompiled_cui.cxx
@@ -6,7 +6,7 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: Disposable.java,v $
+ * $RCSfile: precompiled_svx.cxx,v $
* $Revision: 1.3 $
*
* This file is part of OpenOffice.org.
@@ -28,9 +28,5 @@
*
************************************************************************/
-package com.sun.star.lib.sandbox;
-
-public interface Disposable {
- void dispose();
-}
+#include "precompiled_cui.hxx"
diff --git a/cui/inc/pch/precompiled_cui.hxx b/cui/inc/pch/precompiled_cui.hxx
new file mode 100644
index 000000000000..1704b8281d86
--- /dev/null
+++ b/cui/inc/pch/precompiled_cui.hxx
@@ -0,0 +1,968 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: precompiled_svx.hxx,v $
+ * $Revision: 1.5 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): Generated on 2006-09-01 17:50:08.279739
+#if 0
+#ifdef PRECOMPILED_HEADERS
+//---MARKER---
+#include "sal/config.h"
+#include "avmedia/mediaitem.hxx"
+#include "avmedia/mediawindow.hxx"
+#include "basegfx/matrix/b2dhommatrix.hxx"
+#include "basegfx/numeric/ftools.hxx"
+#include "basegfx/point/b2dpoint.hxx"
+#include "basegfx/point/b3dpoint.hxx"
+#include "basegfx/polygon/b2dlinegeometry.hxx"
+#include "basegfx/polygon/b2dpolygon.hxx"
+#include "basegfx/polygon/b2dpolygontools.hxx"
+#include "basegfx/polygon/b2dpolypolygon.hxx"
+#include "basegfx/polygon/b2dpolypolygontools.hxx"
+#include "basegfx/polygon/b3dpolygon.hxx"
+#include "basegfx/polygon/b3dpolypolygon.hxx"
+#include "basegfx/polygon/b3dpolypolygontools.hxx"
+#include "basegfx/range/b2drange.hxx"
+#include "basegfx/vector/b2dvector.hxx"
+#include "basegfx/vector/b3dvector.hxx"
+#include "basic/basmgr.hxx"
+#include "basic/sbmod.hxx"
+#include "basic/sbuno.hxx"
+#include "basic/sbx.hxx"
+#include "basic/sbxvar.hxx"
+#include "boost/scoped_ptr.hpp"
+#include "boost/shared_ptr.hpp"
+#include "boost/spirit/core.hpp"
+#include "bootstrp/sstring.hxx"
+#include "com/sun/star/accessibility/AccessibleEventId.hpp"
+#include "com/sun/star/accessibility/AccessibleEventObject.hpp"
+#include "com/sun/star/accessibility/AccessibleRelationType.hpp"
+#include "com/sun/star/accessibility/AccessibleRole.hpp"
+#include "com/sun/star/accessibility/AccessibleStateType.hpp"
+#include "com/sun/star/accessibility/AccessibleTextType.hpp"
+#include "com/sun/star/accessibility/IllegalAccessibleComponentStateException.hpp"
+#include "com/sun/star/accessibility/TextSegment.hpp"
+#include "com/sun/star/accessibility/XAccessible.hpp"
+#include "com/sun/star/accessibility/XAccessibleAction.hpp"
+#include "com/sun/star/accessibility/XAccessibleContext.hpp"
+#include "com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp"
+#include "com/sun/star/accessibility/XAccessibleEventListener.hpp"
+#include "com/sun/star/accessibility/XAccessibleImage.hpp"
+#include "com/sun/star/accessibility/XAccessibleRelationSet.hpp"
+#include "com/sun/star/accessibility/XAccessibleSelection.hpp"
+#include "com/sun/star/accessibility/XAccessibleStateSet.hpp"
+#include "com/sun/star/accessibility/XAccessibleTable.hpp"
+#include "com/sun/star/accessibility/XAccessibleTextAttributes.hpp"
+#include "com/sun/star/accessibility/XAccessibleValue.hpp"
+#include "com/sun/star/awt/CharSet.hpp"
+#include "com/sun/star/awt/FocusChangeReason.hpp"
+#include "com/sun/star/awt/FontDescriptor.hpp"
+#include "com/sun/star/awt/FontFamily.hpp"
+#include "com/sun/star/awt/FontPitch.hpp"
+#include "com/sun/star/awt/FontSlant.hpp"
+#include "com/sun/star/awt/FontType.hpp"
+#include "com/sun/star/awt/FontWeight.hpp"
+#include "com/sun/star/awt/FontWidth.hpp"
+#include "com/sun/star/awt/Gradient.hpp"
+#include "com/sun/star/awt/GradientStyle.hpp"
+#include "com/sun/star/awt/Key.hpp"
+#include "com/sun/star/awt/KeyEvent.hpp"
+#include "com/sun/star/awt/KeyModifier.hpp"
+#include "com/sun/star/awt/LineEndFormat.hpp"
+#include "com/sun/star/awt/PosSize.hpp"
+#include "com/sun/star/awt/RasterOperation.hpp"
+#include "com/sun/star/awt/Rectangle.hpp"
+#include "com/sun/star/awt/ScrollBarOrientation.hpp"
+#include "com/sun/star/awt/SimpleFontMetric.hpp"
+#include "com/sun/star/awt/Size.hpp"
+#include "com/sun/star/awt/TextAlign.hpp"
+#include "com/sun/star/awt/VisualEffect.hpp"
+#include "com/sun/star/awt/WindowAttribute.hpp"
+#include "com/sun/star/awt/WindowDescriptor.hpp"
+#include "com/sun/star/awt/XBitmap.hpp"
+#include "com/sun/star/awt/XCheckBox.hpp"
+#include "com/sun/star/awt/XComboBox.hpp"
+#include "com/sun/star/awt/XControl.hpp"
+#include "com/sun/star/awt/XControlContainer.hpp"
+#include "com/sun/star/awt/XControlModel.hpp"
+#include "com/sun/star/awt/XDevice.hpp"
+#include "com/sun/star/awt/XFocusListener.hpp"
+#include "com/sun/star/awt/XFont.hpp"
+#include "com/sun/star/awt/XGraphics.hpp"
+#include "com/sun/star/awt/XImageConsumer.hpp"
+#include "com/sun/star/awt/XItemListener.hpp"
+#include "com/sun/star/awt/XLayoutConstrains.hpp"
+#include "com/sun/star/awt/XListBox.hpp"
+#include "com/sun/star/awt/XMouseListener.hpp"
+#include "com/sun/star/awt/XProgressMonitor.hpp"
+#include "com/sun/star/awt/XTabController.hpp"
+#include "com/sun/star/awt/XTabControllerModel.hpp"
+#include "com/sun/star/awt/XTextListener.hpp"
+#include "com/sun/star/awt/XToolkit.hpp"
+#include "com/sun/star/awt/XVclWindowPeer.hpp"
+#include "com/sun/star/awt/XWindow.hpp"
+#include "com/sun/star/awt/XWindowListener.hpp"
+#include "com/sun/star/awt/XWindowPeer.hpp"
+#include "com/sun/star/beans/NamedValue.hpp"
+#include "com/sun/star/beans/PropertyAttribute.hpp"
+#include "com/sun/star/beans/PropertyChangeEvent.hpp"
+#include "com/sun/star/beans/PropertyState.hpp"
+#include "com/sun/star/beans/PropertyValue.hpp"
+#include "com/sun/star/beans/PropertyValues.hdl"
+#include "com/sun/star/beans/PropertyValues.hpp"
+#include "com/sun/star/beans/XFastPropertySet.hpp"
+#include "com/sun/star/beans/XIntrospection.hpp"
+#include "com/sun/star/beans/XMultiPropertySet.hpp"
+#include "com/sun/star/beans/XMultiPropertyStates.hpp"
+#include "com/sun/star/beans/XPropertyChangeListener.hpp"
+#include "com/sun/star/beans/XPropertySet.hpp"
+#include "com/sun/star/beans/XPropertySetInfo.hpp"
+#include "com/sun/star/beans/XPropertyState.hpp"
+#include "com/sun/star/chart/ChartAxisArrangeOrderType.hpp"
+#include "com/sun/star/container/ContainerEvent.hpp"
+#include "com/sun/star/container/NoSuchElementException.hpp"
+#include "com/sun/star/container/XChild.hpp"
+#include "com/sun/star/container/XContainer.hpp"
+#include "com/sun/star/container/XContainerListener.hpp"
+#include "com/sun/star/container/XContainerQuery.hpp"
+#include "com/sun/star/container/XContentEnumerationAccess.hpp"
+#include "com/sun/star/container/XEnumeration.hpp"
+#include "com/sun/star/container/XEnumerationAccess.hpp"
+#include "com/sun/star/container/XHierarchicalNameAccess.hpp"
+#include "com/sun/star/container/XIdentifierContainer.hpp"
+#include "com/sun/star/container/XIndexAccess.hpp"
+#include "com/sun/star/container/XIndexContainer.hpp"
+#include "com/sun/star/container/XIndexReplace.hpp"
+#include "com/sun/star/container/XNameAccess.hpp"
+#include "com/sun/star/container/XNameContainer.hpp"
+#include "com/sun/star/container/XNameReplace.hpp"
+#include "com/sun/star/container/XNamed.hpp"
+#include "com/sun/star/container/XSet.hpp"
+#include "com/sun/star/datatransfer/DataFlavor.hpp"
+#include "com/sun/star/datatransfer/XTransferable.hpp"
+#include "com/sun/star/datatransfer/clipboard/XClipboard.hpp"
+#include "com/sun/star/datatransfer/clipboard/XFlushableClipboard.hpp"
+#include "com/sun/star/datatransfer/dnd/DNDConstants.hpp"
+#include "com/sun/star/datatransfer/dnd/XDragGestureRecognizer.hpp"
+#include "com/sun/star/datatransfer/dnd/XDropTarget.hpp"
+#include "com/sun/star/document/EventObject.hpp"
+#include "com/sun/star/document/UpdateDocMode.hpp"
+#include "com/sun/star/document/XActionLockable.hpp"
+#include "com/sun/star/document/XBinaryStreamResolver.hpp"
+#include "com/sun/star/document/XDocumentInfoSupplier.hpp"
+#include "com/sun/star/document/XEmbeddedObjectResolver.hpp"
+#include "com/sun/star/document/XEventBroadcaster.hpp"
+#include "com/sun/star/document/XEventListener.hpp"
+#include "com/sun/star/document/XEventsSupplier.hpp"
+#include "com/sun/star/document/XExporter.hpp"
+#include "com/sun/star/document/XFilter.hpp"
+#include "com/sun/star/document/XGraphicObjectResolver.hpp"
+#include "com/sun/star/document/XImporter.hpp"
+#include "com/sun/star/document/XLinkTargetSupplier.hpp"
+#include "com/sun/star/document/XMimeTypeInfo.hpp"
+#include "com/sun/star/drawing/BitmapMode.hpp"
+#include "com/sun/star/drawing/CameraGeometry.hpp"
+#include "com/sun/star/drawing/CircleKind.hpp"
+#include "com/sun/star/drawing/ColorMode.hpp"
+#include "com/sun/star/drawing/ConnectionType.hpp"
+#include "com/sun/star/drawing/ConnectorType.hpp"
+#include "com/sun/star/drawing/DashStyle.hpp"
+#include "com/sun/star/drawing/Direction3D.hpp"
+#include "com/sun/star/drawing/DoubleSequence.hpp"
+#include "com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.hpp"
+#include "com/sun/star/drawing/EnhancedCustomShapeGluePointType.hpp"
+#include "com/sun/star/drawing/EnhancedCustomShapeParameter.hpp"
+#include "com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp"
+#include "com/sun/star/drawing/EnhancedCustomShapeParameterType.hpp"
+#include "com/sun/star/drawing/EnhancedCustomShapeSegment.hpp"
+#include "com/sun/star/drawing/EnhancedCustomShapeSegmentCommand.hpp"
+#include "com/sun/star/drawing/EnhancedCustomShapeTextFrame.hpp"
+#include "com/sun/star/drawing/EnhancedCustomShapeTextPathMode.hpp"
+#include "com/sun/star/drawing/FillStyle.hpp"
+#include "com/sun/star/drawing/FlagSequence.hpp"
+#include "com/sun/star/drawing/Hatch.hpp"
+#include "com/sun/star/drawing/HomogenMatrix.hpp"
+#include "com/sun/star/drawing/HomogenMatrix3.hpp"
+#include "com/sun/star/drawing/LineDash.hpp"
+#include "com/sun/star/drawing/LineJoint.hpp"
+#include "com/sun/star/drawing/LineStyle.hpp"
+#include "com/sun/star/drawing/MeasureKind.hpp"
+#include "com/sun/star/drawing/MeasureTextHorzPos.hpp"
+#include "com/sun/star/drawing/MeasureTextVertPos.hpp"
+#include "com/sun/star/drawing/NormalsKind.hpp"
+#include "com/sun/star/drawing/PolyPolygonShape3D.hpp"
+#include "com/sun/star/drawing/PolygonFlags.hpp"
+#include "com/sun/star/drawing/PolygonKind.hpp"
+#include "com/sun/star/drawing/Position3D.hpp"
+#include "com/sun/star/drawing/ProjectionMode.hpp"
+#include "com/sun/star/drawing/RectanglePoint.hpp"
+#include "com/sun/star/drawing/ShadeMode.hpp"
+#include "com/sun/star/drawing/TextAdjust.hpp"
+#include "com/sun/star/drawing/TextAnimationDirection.hpp"
+#include "com/sun/star/drawing/TextAnimationKind.hpp"
+#include "com/sun/star/drawing/TextFitToSizeType.hpp"
+#include "com/sun/star/drawing/TextHorizontalAdjust.hpp"
+#include "com/sun/star/drawing/TextVerticalAdjust.hpp"
+#include "com/sun/star/drawing/TextureKind.hpp"
+#include "com/sun/star/drawing/TextureMode.hpp"
+#include "com/sun/star/drawing/TextureProjectionMode.hpp"
+#include "com/sun/star/drawing/XGluePointsSupplier.hpp"
+#include "com/sun/star/drawing/XShapeDescriptor.hpp"
+#include "com/sun/star/embed/Aspects.hpp"
+#include "com/sun/star/embed/ElementModes.hpp"
+#include "com/sun/star/embed/EmbedMisc.hpp"
+#include "com/sun/star/embed/EmbedStates.hpp"
+#include "com/sun/star/embed/EntryInitModes.hpp"
+#include "com/sun/star/embed/NoVisualAreaSizeException.hpp"
+#include "com/sun/star/embed/XEmbedObjectCreator.hpp"
+#include "com/sun/star/embed/XEmbedObjectFactory.hpp"
+#include "com/sun/star/embed/XEmbedPersist.hpp"
+#include "com/sun/star/embed/XEmbeddedObject.hpp"
+#include "com/sun/star/embed/XInsertObjectDialog.hpp"
+#include "com/sun/star/embed/XLinkageSupport.hpp"
+#include "com/sun/star/embed/XStorage.hpp"
+#include "com/sun/star/embed/XTransactedObject.hpp"
+#include "com/sun/star/form/DatabaseDeleteEvent.hpp"
+#include "com/sun/star/form/DatabaseParameterEvent.hpp"
+#include "com/sun/star/form/ErrorEvent.hpp"
+#include "com/sun/star/form/FormButtonType.hpp"
+#include "com/sun/star/form/FormComponentType.hpp"
+#include "com/sun/star/form/ListSourceType.hpp"
+#include "com/sun/star/form/NavigationBarMode.hpp"
+#include "com/sun/star/form/TabulatorCycle.hpp"
+#include "com/sun/star/form/XBoundComponent.hpp"
+#include "com/sun/star/form/XBoundControl.hpp"
+#include "com/sun/star/form/XConfirmDeleteBroadcaster.hpp"
+#include "com/sun/star/form/XConfirmDeleteListener.hpp"
+#include "com/sun/star/form/XDatabaseParameterBroadcaster2.hpp"
+#include "com/sun/star/form/XDatabaseParameterListener.hpp"
+#include "com/sun/star/form/XForm.hpp"
+#include "com/sun/star/form/XFormComponent.hpp"
+#include "com/sun/star/form/XFormController.hpp"
+#include "com/sun/star/form/XFormControllerListener.hpp"
+#include "com/sun/star/form/XFormsSupplier.hpp"
+#include "com/sun/star/form/XFormsSupplier2.hpp"
+#include "com/sun/star/form/XGrid.hpp"
+#include "com/sun/star/form/XGridColumnFactory.hpp"
+#include "com/sun/star/form/XGridFieldDataSupplier.hpp"
+#include "com/sun/star/form/XGridPeer.hpp"
+#include "com/sun/star/form/XImageProducerSupplier.hpp"
+#include "com/sun/star/form/XLoadListener.hpp"
+#include "com/sun/star/form/XLoadable.hpp"
+#include "com/sun/star/form/XReset.hpp"
+#include "com/sun/star/form/XResetListener.hpp"
+#include "com/sun/star/form/binding/XBindableValue.hpp"
+#include "com/sun/star/form/binding/XListEntrySink.hpp"
+#include "com/sun/star/form/binding/XValueBinding.hpp"
+#include "com/sun/star/form/submission/XSubmissionSupplier.hpp"
+#include "com/sun/star/form/validation/XFormComponentValidityListener.hpp"
+#include "com/sun/star/form/validation/XValidatableFormComponent.hpp"
+#include "com/sun/star/frame/DispatchDescriptor.hpp"
+#include "com/sun/star/frame/DispatchInformation.hpp"
+#include "com/sun/star/frame/FeatureStateEvent.hpp"
+#include "com/sun/star/frame/FrameSearchFlag.hpp"
+#include "com/sun/star/frame/XComponentLoader.hpp"
+#include "com/sun/star/frame/XController.hpp"
+#include "com/sun/star/frame/XDesktop.hpp"
+#include "com/sun/star/frame/XDispatch.hpp"
+#include "com/sun/star/frame/XDispatchInformationProvider.hpp"
+#include "com/sun/star/frame/XDispatchProvider.hpp"
+#include "com/sun/star/frame/XDispatchProviderInterception.hpp"
+#include "com/sun/star/frame/XDispatchProviderInterceptor.hpp"
+#include "com/sun/star/frame/XFrame.hpp"
+#include "com/sun/star/frame/XFrameActionListener.hpp"
+#include "com/sun/star/frame/XFrames.hpp"
+#include "com/sun/star/frame/XFramesSupplier.hpp"
+#include "com/sun/star/frame/XInterceptorInfo.hpp"
+#include "com/sun/star/frame/XModel.hpp"
+#include "com/sun/star/frame/XModuleManager.hpp"
+#include "com/sun/star/frame/XStatusListener.hpp"
+#include "com/sun/star/frame/XStorable.hpp"
+#include "com/sun/star/frame/XSynchronousDispatch.hpp"
+#include "com/sun/star/frame/status/ClipboardFormats.hpp"
+#include "com/sun/star/frame/status/FontHeight.hpp"
+#include "com/sun/star/frame/status/ItemStatus.hpp"
+#include "com/sun/star/frame/status/LeftRightMargin.hpp"
+#include "com/sun/star/frame/status/UpperLowerMargin.hpp"
+#include "com/sun/star/frame/status/UpperLowerMarginScale.hpp"
+#include "com/sun/star/gallery/GalleryItemType.hpp"
+#include "com/sun/star/gallery/XGalleryItem.hpp"
+#include "com/sun/star/gallery/XGalleryTheme.hpp"
+#include "com/sun/star/gallery/XGalleryThemeProvider.hpp"
+#include "com/sun/star/graphic/XGraphic.hpp"
+#include "com/sun/star/graphic/XGraphicProvider.hpp"
+#include "com/sun/star/graphic/XGraphicRenderer.hpp"
+#include "com/sun/star/i18n/CharacterIteratorMode.hdl"
+#include "com/sun/star/i18n/CharacterIteratorMode.hpp"
+#include "com/sun/star/i18n/CollatorOptions.hpp"
+#include "com/sun/star/i18n/ForbiddenCharacters.hpp"
+#include "com/sun/star/i18n/InputSequenceCheckMode.hpp"
+#include "com/sun/star/i18n/KCharacterType.hpp"
+#include "com/sun/star/i18n/ScriptType.hdl"
+#include "com/sun/star/i18n/ScriptType.hpp"
+#include "com/sun/star/i18n/TextConversionOption.hdl"
+#include "com/sun/star/i18n/TextConversionOption.hpp"
+#include "com/sun/star/i18n/TextConversionType.hpp"
+#include "com/sun/star/i18n/TransliterationModules.hpp"
+#include "com/sun/star/i18n/UnicodeScript.hpp"
+#include "com/sun/star/i18n/UnicodeType.hdl"
+#include "com/sun/star/i18n/WordType.hpp"
+#include "com/sun/star/i18n/XBreakIterator.hpp"
+#include "com/sun/star/i18n/XExtendedInputSequenceChecker.hpp"
+#include "com/sun/star/i18n/XExtendedTextConversion.hpp"
+#include "com/sun/star/i18n/XForbiddenCharacters.hpp"
+#include "com/sun/star/i18n/XTextConversion.hpp"
+#include "com/sun/star/inspection/XObjectInspector.hpp"
+#include "com/sun/star/inspection/XObjectInspectorModel.hpp"
+#include "com/sun/star/io/IOException.hpp"
+#include "com/sun/star/io/XActiveDataControl.hpp"
+#include "com/sun/star/io/XActiveDataSink.hpp"
+#include "com/sun/star/io/XActiveDataSource.hpp"
+#include "com/sun/star/io/XInputStream.hpp"
+#include "com/sun/star/io/XInputStreamProvider.hpp"
+#include "com/sun/star/io/XMarkableStream.hpp"
+#include "com/sun/star/io/XObjectInputStream.hpp"
+#include "com/sun/star/io/XObjectOutputStream.hpp"
+#include "com/sun/star/io/XOutputStream.hpp"
+#include "com/sun/star/io/XPersistObject.hpp"
+#include "com/sun/star/io/XSeekable.hdl"
+#include "com/sun/star/io/XStream.hpp"
+#include "com/sun/star/lang/DisposedException.hpp"
+#include "com/sun/star/lang/EventObject.hpp"
+#include "com/sun/star/lang/IllegalArgumentException.hpp"
+#include "com/sun/star/lang/IndexOutOfBoundsException.hpp"
+#include "com/sun/star/lang/Locale.hpp"
+#include "com/sun/star/lang/NoSupportException.hpp"
+#include "com/sun/star/lang/ServiceNotRegisteredException.hpp"
+#include "com/sun/star/lang/XComponent.hpp"
+#include "com/sun/star/lang/XEventListener.hpp"
+#include "com/sun/star/lang/XInitialization.hpp"
+#include "com/sun/star/lang/XMultiComponentFactory.hpp"
+#include "com/sun/star/lang/XMultiServiceFactory.hpp"
+#include "com/sun/star/lang/XServiceDisplayName.hpp"
+#include "com/sun/star/lang/XServiceInfo.hpp"
+#include "com/sun/star/lang/XServiceName.hpp"
+#include "com/sun/star/lang/XSingleComponentFactory.hpp"
+#include "com/sun/star/lang/XTypeProvider.hpp"
+#include "com/sun/star/lang/XUnoTunnel.hpp"
+#include "com/sun/star/linguistic2/ConversionDictionaryType.hpp"
+#include "com/sun/star/linguistic2/ConversionDirection.hdl"
+#include "com/sun/star/linguistic2/ConversionPropertyType.hpp"
+#include "com/sun/star/linguistic2/DictionaryEvent.hpp"
+#include "com/sun/star/linguistic2/DictionaryEventFlags.hpp"
+#include "com/sun/star/linguistic2/DictionaryListEvent.hpp"
+#include "com/sun/star/linguistic2/DictionaryListEventFlags.hpp"
+#include "com/sun/star/linguistic2/DictionaryType.hpp"
+#include "com/sun/star/linguistic2/SpellFailure.hpp"
+#include "com/sun/star/linguistic2/XAvailableLocales.hpp"
+#include "com/sun/star/linguistic2/XConversionDictionary.hpp"
+#include "com/sun/star/linguistic2/XConversionDictionaryList.hpp"
+#include "com/sun/star/linguistic2/XConversionPropertyType.hpp"
+#include "com/sun/star/linguistic2/XDictionary.hpp"
+#include "com/sun/star/linguistic2/XDictionary1.hpp"
+#include "com/sun/star/linguistic2/XDictionaryEntry.hpp"
+#include "com/sun/star/linguistic2/XDictionaryEventListener.hpp"
+#include "com/sun/star/linguistic2/XDictionaryList.hpp"
+#include "com/sun/star/linguistic2/XDictionaryListEventListener.hpp"
+#include "com/sun/star/linguistic2/XHyphenatedWord.hpp"
+#include "com/sun/star/linguistic2/XHyphenator.hpp"
+#include "com/sun/star/linguistic2/XLinguServiceManager.hdl"
+#include "com/sun/star/linguistic2/XLinguServiceManager.hpp"
+#include "com/sun/star/linguistic2/XMeaning.hpp"
+#include "com/sun/star/linguistic2/XPossibleHyphens.hpp"
+#include "com/sun/star/linguistic2/XSpellAlternatives.hpp"
+#include "com/sun/star/linguistic2/XSpellChecker.hpp"
+#include "com/sun/star/linguistic2/XSpellChecker1.hpp"
+#include "com/sun/star/linguistic2/XSupportedLocales.hpp"
+#include "com/sun/star/linguistic2/XThesaurus.hpp"
+#include "com/sun/star/media/XPlayer.hpp"
+#include "com/sun/star/media/ZoomLevel.hpp"
+#include "com/sun/star/plugin/PluginDescription.hpp"
+#include "com/sun/star/plugin/XPluginManager.hpp"
+#include "com/sun/star/reflection/XIdlClass.hpp"
+#include "com/sun/star/reflection/XIdlMethod.hpp"
+#include "com/sun/star/reflection/XInterfaceMethodTypeDescription.hpp"
+#include "com/sun/star/reflection/XProxyFactory.hpp"
+#include "com/sun/star/registry/XRegistryKey.hpp"
+#include "com/sun/star/registry/XSimpleRegistry.hpp"
+#include "com/sun/star/script/ScriptEvent.hpp"
+#include "com/sun/star/script/ScriptEventDescriptor.hpp"
+#include "com/sun/star/script/XEventAttacherManager.hpp"
+#include "com/sun/star/script/XInvocation.hpp"
+#include "com/sun/star/script/XLibraryContainer.hpp"
+#include "com/sun/star/script/XScriptListener.hpp"
+#include "com/sun/star/script/XTypeConverter.hpp"
+#include "com/sun/star/script/browse/BrowseNodeFactoryViewTypes.hpp"
+#include "com/sun/star/script/browse/BrowseNodeTypes.hpp"
+#include "com/sun/star/script/browse/XBrowseNode.hpp"
+#include "com/sun/star/script/browse/XBrowseNodeFactory.hpp"
+#include "com/sun/star/script/provider/ScriptErrorRaisedException.hpp"
+#include "com/sun/star/script/provider/ScriptExceptionRaisedException.hpp"
+#include "com/sun/star/script/provider/ScriptFrameworkErrorType.hpp"
+#include "com/sun/star/script/provider/XScriptProvider.hpp"
+#include "com/sun/star/script/provider/XScriptProviderSupplier.hpp"
+#include "com/sun/star/sdb/CommandType.hpp"
+#include "com/sun/star/sdb/ParametersRequest.hpp"
+#include "com/sun/star/sdb/RowChangeAction.hpp"
+#include "com/sun/star/sdb/RowChangeEvent.hpp"
+#include "com/sun/star/sdb/SQLContext.hpp"
+#include "com/sun/star/sdb/SQLErrorEvent.hpp"
+#include "com/sun/star/sdb/XColumn.hpp"
+#include "com/sun/star/sdb/XColumnUpdate.hpp"
+#include "com/sun/star/sdb/XCompletedConnection.hpp"
+#include "com/sun/star/sdb/XInteractionSupplyParameters.hpp"
+#include "com/sun/star/sdb/XQueriesSupplier.hpp"
+#include "com/sun/star/sdb/XResultSetAccess.hpp"
+#include "com/sun/star/sdb/XRowSetApproveBroadcaster.hpp"
+#include "com/sun/star/sdb/XRowSetApproveListener.hpp"
+#include "com/sun/star/sdb/XRowSetSupplier.hpp"
+#include "com/sun/star/sdb/XSQLErrorBroadcaster.hpp"
+#include "com/sun/star/sdb/XSQLErrorListener.hpp"
+#include "com/sun/star/sdb/XSQLQueryComposer.hpp"
+#include "com/sun/star/sdb/XSQLQueryComposerFactory.hpp"
+#include "com/sun/star/sdb/XSingleSelectQueryComposer.hpp"
+#include "com/sun/star/sdbc/ColumnValue.hpp"
+#include "com/sun/star/sdbc/DataType.hpp"
+#include "com/sun/star/sdbc/ResultSetConcurrency.hpp"
+#include "com/sun/star/sdbc/ResultSetType.hpp"
+#include "com/sun/star/sdbc/XConnection.hpp"
+#include "com/sun/star/sdbc/XDataSource.hpp"
+#include "com/sun/star/sdbc/XDatabaseMetaData.hpp"
+#include "com/sun/star/sdbc/XPreparedStatement.hpp"
+#include "com/sun/star/sdbc/XResultSet.hpp"
+#include "com/sun/star/sdbc/XResultSetUpdate.hpp"
+#include "com/sun/star/sdbc/XRow.hpp"
+#include "com/sun/star/sdbc/XRowSet.hpp"
+#include "com/sun/star/sdbc/XRowSetListener.hpp"
+#include "com/sun/star/sdbc/XStatement.hpp"
+#include "com/sun/star/sdbcx/Privilege.hpp"
+#include "com/sun/star/sdbcx/XColumnsSupplier.hpp"
+#include "com/sun/star/sdbcx/XDataDescriptorFactory.hpp"
+#include "com/sun/star/sdbcx/XDeleteRows.hpp"
+#include "com/sun/star/sdbcx/XRowLocate.hpp"
+#include "com/sun/star/sdbcx/XTablesSupplier.hpp"
+#include "com/sun/star/security/XDocumentDigitalSignatures.hpp"
+#include "com/sun/star/style/BreakType.hpp"
+#include "com/sun/star/style/CaseMap.hpp"
+#include "com/sun/star/style/GraphicLocation.hpp"
+#include "com/sun/star/style/LineSpacing.hpp"
+#include "com/sun/star/style/LineSpacingMode.hpp"
+#include "com/sun/star/style/NumberingType.hpp"
+#include "com/sun/star/style/PageStyleLayout.hpp"
+#include "com/sun/star/style/ParagraphAdjust.hpp"
+#include "com/sun/star/style/TabStop.hpp"
+#include "com/sun/star/style/VerticalAlignment.hpp"
+#include "com/sun/star/style/XStyle.hpp"
+#include "com/sun/star/style/XStyleFamiliesSupplier.hpp"
+#include "com/sun/star/table/BorderLine.hpp"
+#include "com/sun/star/table/CellAddress.hpp"
+#include "com/sun/star/table/CellContentType.hpp"
+#include "com/sun/star/table/CellHoriJustify.hpp"
+#include "com/sun/star/table/CellOrientation.hpp"
+#include "com/sun/star/table/CellRangeAddress.hpp"
+#include "com/sun/star/table/CellVertJustify.hpp"
+#include "com/sun/star/table/ShadowFormat.hpp"
+#include "com/sun/star/table/ShadowLocation.hpp"
+#include "com/sun/star/table/TableBorder.hpp"
+#include "com/sun/star/table/TableOrientation.hpp"
+#include "com/sun/star/task/XInteractionHandler.hpp"
+#include "com/sun/star/task/XStatusIndicator.hpp"
+#include "com/sun/star/task/XStatusIndicatorFactory.hpp"
+#include "com/sun/star/text/CharacterCompressionType.hpp"
+#include "com/sun/star/text/ControlCharacter.hpp"
+#include "com/sun/star/text/FilenameDisplayFormat.hpp"
+#include "com/sun/star/text/FontEmphasis.hpp"
+#include "com/sun/star/text/GraphicCrop.hpp"
+#include "com/sun/star/text/HoriOrientation.hpp"
+#include "com/sun/star/text/RelOrientation.hpp"
+#include "com/sun/star/text/RubyAdjust.hpp"
+#include "com/sun/star/text/TextContentAnchorType.hpp"
+#include "com/sun/star/text/VertOrientation.hpp"
+#include "com/sun/star/text/WrapTextMode.hpp"
+#include "com/sun/star/text/WritingMode.hpp"
+#include "com/sun/star/text/WritingMode2.hpp"
+#include "com/sun/star/text/XDefaultNumberingProvider.hpp"
+#include "com/sun/star/text/XNumberingFormatter.hpp"
+#include "com/sun/star/text/XNumberingTypeInfo.hpp"
+#include "com/sun/star/text/XRubySelection.hpp"
+#include "com/sun/star/text/XSimpleText.hpp"
+#include "com/sun/star/text/XText.hpp"
+#include "com/sun/star/text/XTextContent.hpp"
+#include "com/sun/star/text/XTextCursor.hpp"
+#include "com/sun/star/text/XTextField.hdl"
+#include "com/sun/star/text/XTextField.hpp"
+#include "com/sun/star/text/XTextRange.hpp"
+#include "com/sun/star/text/XTextRangeCompare.hpp"
+#include "com/sun/star/text/XTextRangeMover.hpp"
+#include "com/sun/star/ucb/CommandAbortedException.hpp"
+#include "com/sun/star/ucb/NameClash.hpp"
+#include "com/sun/star/ucb/NumberedSortingInfo.hpp"
+#include "com/sun/star/ucb/TransferInfo.hpp"
+#include "com/sun/star/ucb/XAnyCompare.hpp"
+#include "com/sun/star/ucb/XAnyCompareFactory.hpp"
+#include "com/sun/star/ucb/XCommandEnvironment.hpp"
+#include "com/sun/star/ucb/XContent.hpp"
+#include "com/sun/star/ucb/XContentAccess.hpp"
+#include "com/sun/star/ucb/XContentProvider.hpp"
+#include "com/sun/star/ucb/XSimpleFileAccess.hpp"
+#include "com/sun/star/ucb/XSortedDynamicResultSetFactory.hpp"
+#include "com/sun/star/ui/ImageType.hpp"
+#include "com/sun/star/ui/ItemStyle.hpp"
+#include "com/sun/star/ui/ItemType.hpp"
+#include "com/sun/star/ui/UIElementType.hpp"
+#include "com/sun/star/ui/XImageManager.hpp"
+#include "com/sun/star/ui/XModuleUIConfigurationManager.hpp"
+#include "com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp"
+#include "com/sun/star/ui/XUIConfiguration.hpp"
+#include "com/sun/star/ui/XUIConfigurationListener.hpp"
+#include "com/sun/star/ui/XUIConfigurationManager.hpp"
+#include "com/sun/star/ui/XUIConfigurationManagerSupplier.hpp"
+#include "com/sun/star/ui/XUIConfigurationPersistence.hpp"
+#include "com/sun/star/ui/XUIConfigurationStorage.hpp"
+#include "com/sun/star/ui/XUIElement.hpp"
+#include "com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp"
+#include "com/sun/star/ui/dialogs/ExecutableDialogResults.hpp"
+#include "com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp"
+#include "com/sun/star/ui/dialogs/FilePreviewImageFormats.hpp"
+#include "com/sun/star/ui/dialogs/ListboxControlActions.hpp"
+#include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
+#include "com/sun/star/ui/dialogs/XExecutableDialog.hpp"
+#include "com/sun/star/ui/dialogs/XFilePicker.hpp"
+#include "com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp"
+#include "com/sun/star/ui/dialogs/XFilePickerListener.hpp"
+#include "com/sun/star/ui/dialogs/XFilePickerNotifier.hpp"
+#include "com/sun/star/ui/dialogs/XFilePreview.hpp"
+#include "com/sun/star/ui/dialogs/XFilterManager.hpp"
+#include "com/sun/star/ui/dialogs/XFolderPicker.hpp"
+#include "com/sun/star/uno/Any.h"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Exception.hpp"
+#include "com/sun/star/uno/Reference.h"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/Sequence.h"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "com/sun/star/uno/Type.h"
+#include "com/sun/star/uno/XAggregation.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XInterface.hpp"
+#include "com/sun/star/uno/XNamingService.hpp"
+#include "com/sun/star/util/Date.hpp"
+#include "com/sun/star/util/DateTime.hpp"
+#include "com/sun/star/util/Language.hpp"
+#include "com/sun/star/util/MeasureUnit.hpp"
+#include "com/sun/star/util/NumberFormat.hpp"
+#include "com/sun/star/util/SearchAlgorithms.hpp"
+#include "com/sun/star/util/SearchFlags.hpp"
+#include "com/sun/star/util/SearchOptions.hpp"
+#include "com/sun/star/util/SearchResult.hpp"
+#include "com/sun/star/util/SortField.hpp"
+#include "com/sun/star/util/SortFieldType.hpp"
+#include "com/sun/star/util/URL.hpp"
+#include "com/sun/star/util/XCancellable.hpp"
+#include "com/sun/star/util/XChangesBatch.hpp"
+#include "com/sun/star/util/XCloneable.hpp"
+#include "com/sun/star/util/XCloseable.hpp"
+#include "com/sun/star/util/XFlushable.hpp"
+#include "com/sun/star/util/XLocalizedAliases.hpp"
+#include "com/sun/star/util/XModeChangeBroadcaster.hpp"
+#include "com/sun/star/util/XModeChangeListener.hpp"
+#include "com/sun/star/util/XModeSelector.hpp"
+#include "com/sun/star/util/XModifiable.hpp"
+#include "com/sun/star/util/XModifyBroadcaster.hpp"
+#include "com/sun/star/util/XModifyListener.hpp"
+#include "com/sun/star/util/XNumberFormatTypes.hpp"
+#include "com/sun/star/util/XNumberFormats.hpp"
+#include "com/sun/star/util/XNumberFormatsSupplier.hpp"
+#include "com/sun/star/util/XNumberFormatter.hpp"
+#include "com/sun/star/util/XTextSearch.hpp"
+#include "com/sun/star/util/XURLTransformer.hpp"
+#include "com/sun/star/util/logging/LogLevel.hpp"
+#include "com/sun/star/util/logging/XLogger.hpp"
+#include "com/sun/star/view/XSelectionChangeListener.hpp"
+#include "com/sun/star/view/XSelectionSupplier.hpp"
+#include "com/sun/star/xforms/XFormsSupplier.hpp"
+#include "com/sun/star/xforms/XFormsUIHelper1.hpp"
+#include "com/sun/star/xforms/XModel.hpp"
+#include "com/sun/star/xforms/XSubmission.hpp"
+#include "com/sun/star/xml/AttributeData.hpp"
+#include "com/sun/star/xml/dom/DOMException.hpp"
+#include "com/sun/star/xml/dom/XDocument.hpp"
+#include "com/sun/star/xml/dom/XNode.hpp"
+#include "com/sun/star/xml/dom/events/XEventListener.hpp"
+#include "com/sun/star/xml/dom/events/XEventTarget.hpp"
+#include "com/sun/star/xml/sax/InputSource.hpp"
+#include "com/sun/star/xml/sax/SAXParseException.hpp"
+#include "com/sun/star/xml/sax/XAttributeList.hpp"
+#include "com/sun/star/xml/sax/XDocumentHandler.hpp"
+#include "com/sun/star/xml/sax/XParser.hpp"
+#include "comphelper/accessibleeventnotifier.hxx"
+#include "comphelper/anytostring.hxx"
+#include "comphelper/broadcasthelper.hxx"
+#include "comphelper/componentcontext.hxx"
+#include "comphelper/configurationhelper.hxx"
+#include "comphelper/container.hxx"
+#include "comphelper/embeddedobjectcontainer.hxx"
+#include "comphelper/enumhelper.hxx"
+#include "comphelper/implementationreference.hxx"
+#include "comphelper/interaction.hxx"
+#include "comphelper/numbers.hxx"
+#include "comphelper/processfactory.hxx"
+#include "comphelper/propertycontainer.hxx"
+#include "comphelper/propertysethelper.hxx"
+#include "comphelper/regpathhelper.hxx"
+#include "comphelper/scopeguard.hxx"
+#include "comphelper/seqstream.hxx"
+#include "comphelper/sequence.hxx"
+#include "comphelper/sequenceashashmap.hxx"
+#include "comphelper/sequenceasvector.hxx"
+#include "comphelper/servicehelper.hxx"
+#include "comphelper/storagehelper.hxx"
+#include "comphelper/types.hxx"
+#include "comphelper/uno3.hxx"
+#include "connectivity/IParseContext.hxx"
+#include "connectivity/dbexception.hxx"
+#include "connectivity/sqlnode.hxx"
+#include "connectivity/sqlparse.hxx"
+#include "cppuhelper/bootstrap.hxx"
+#include "cppuhelper/compbase12.hxx"
+#include "cppuhelper/compbase2.hxx"
+#include "cppuhelper/compbase3.hxx"
+#include "cppuhelper/compbase4.hxx"
+#include "cppuhelper/compbase6.hxx"
+#include "cppuhelper/compbase7.hxx"
+#include "cppuhelper/component.hxx"
+#include "cppuhelper/component_context.hxx"
+#include "cppuhelper/exc_hlp.hxx"
+#include "cppuhelper/factory.hxx"
+#include "cppuhelper/implbase1.hxx"
+#include "cppuhelper/implbase11.hxx"
+#include "cppuhelper/implbase12.hxx"
+#include "cppuhelper/implbase2.hxx"
+#include "cppuhelper/implbase3.hxx"
+#include "cppuhelper/implbase4.hxx"
+#include "cppuhelper/implbase5.hxx"
+#include "cppuhelper/implbase6.hxx"
+#include "cppuhelper/implbase8.hxx"
+#include "cppuhelper/implementationentry.hxx"
+#include "cppuhelper/interfacecontainer.h"
+#include "cppuhelper/interfacecontainer.hxx"
+#include "cppuhelper/propshlp.hxx"
+#include "cppuhelper/queryinterface.hxx"
+#include "cppuhelper/servicefactory.hxx"
+#include "cppuhelper/typeprovider.hxx"
+#include "cppuhelper/weak.hxx"
+#include "cppuhelper/weakagg.hxx"
+#include "cppuhelper/weakref.hxx"
+#include "i18npool/lang.h"
+#include "i18npool/mslangid.hxx"
+#include "jvmfwk/framework.h"
+#include "linguistic/lngprops.hxx"
+#include "osl/diagnose.h"
+#include "osl/endian.h"
+#include "osl/file.hxx"
+#include "osl/interlck.h"
+#include "osl/module.h"
+#include "osl/module.hxx"
+#include "osl/mutex.hxx"
+#include "osl/nlsupport.h"
+#include "osl/process.h"
+#include "osl/security.hxx"
+#include "rsc/rscsfx.hxx"
+#include "rtl/bootstrap.hxx"
+#include "rtl/cipher.h"
+#include "rtl/crc.h"
+#include "rtl/digest.h"
+#include "rtl/locale.h"
+#include "rtl/logfile.hxx"
+#include "rtl/math.hxx"
+#include "rtl/memory.h"
+#include "rtl/tencinfo.h"
+#include "rtl/textenc.h"
+#include "rtl/ustrbuf.hxx"
+#include "rtl/ustring.hxx"
+#include "rtl/uuid.h"
+#include "sal/config.h"
+#include "sal/main.h"
+#include "sal/types.h"
+#include "sfx2/bindings.hxx"
+#include "sfx2/ctrlitem.hxx"
+#include "sfx2/dispatch.hxx"
+#include "sfx2/docfilt.hxx"
+#include "sfx2/event.hxx"
+#include "sfx2/frame.hxx"
+#include "sfx2/frmdescr.hxx"
+#include "sfx2/imagemgr.hxx"
+#include "sfx2/imgmgr.hxx"
+#include "sfx2/linkmgr.hxx"
+#include "sfx2/linksrc.hxx"
+#include "sfx2/lnkbase.hxx"
+#include "sfx2/minarray.hxx"
+#include "sfx2/minfitem.hxx"
+#include "sfx2/mnuitem.hxx"
+#include "sfx2/module.hxx"
+#include "sfx2/msg.hxx"
+#include "sfx2/msgpool.hxx"
+#include "sfx2/objface.hxx"
+#include "sfx2/objitem.hxx"
+#include "sfx2/progress.hxx"
+#include "sfx2/querystatus.hxx"
+#include "sfx2/request.hxx"
+#include "sfx2/sfxdefs.hxx"
+#include "sfx2/sfxdlg.hxx"
+#include "sfx2/sfxhelp.hxx"
+#include "sfx2/sfxhtml.hxx"
+#include "sfx2/sfxstatuslistener.hxx"
+#include "sfx2/sfxuno.hxx"
+#include "sfx2/shell.hxx"
+#include "sfx2/srchdefs.hxx"
+#include "sfx2/tplpitem.hxx"
+#include "sfx2/viewfrm.hxx"
+#include "sot/clsids.hxx"
+#include "sot/exchange.hxx"
+#include "sot/factory.hxx"
+#include "sot/formats.hxx"
+#include <map>
+#include <set>
+#include <slist>
+#include <vector>
+#include "svtools/FilterConfigItem.hxx"
+#include "svtools/accessibilityoptions.hxx"
+#include "svl/adrparse.hxx"
+#include "svtools/apearcfg.hxx"
+#include "svl/brdcst.hxx"
+#include "unotools/cacheoptions.hxx"
+#include "svl/cancel.hxx"
+#include "svl/cjkoptions.hxx"
+#include "unotools/cmdoptions.hxx"
+#include "svl/cntwall.hxx"
+#include "svtools/colorcfg.hxx"
+#include "svl/ctloptions.hxx"
+#include "unotools/defaultoptions.hxx"
+#include "unotools/dynamicmenuoptions.hxx"
+#include "svtools/ehdl.hxx"
+#include "svl/eitem.hxx"
+#include "unotools/eventcfg.hxx"
+#include "unotools/extendedsecurityoptions.hxx"
+#include "svl/filenotation.hxx"
+#include "svl/flagitem.hxx"
+#include "unotools/fltrcfg.hxx"
+#include "unotools/fontoptions.hxx"
+#include "svtools/fontsubstconfig.hxx"
+#include "svtools/helpopt.hxx"
+#include "svl/hint.hxx"
+#include "svtools/htmlkywd.hxx"
+#include "svtools/htmltokn.h"
+#include "svtools/imagemgr.hxx"
+#include "svtools/imapcirc.hxx"
+#include "svtools/imapobj.hxx"
+#include "svtools/imappoly.hxx"
+#include "svtools/imaprect.hxx"
+#include "svtools/inetimg.hxx"
+#include "unotools/inetoptions.hxx"
+#include "svl/intitem.hxx"
+#include "svl/isethint.hxx"
+#include "svl/itemiter.hxx"
+#include "svl/itempool.hxx"
+#include "svl/itemprop.hxx"
+#include "svl/itemset.hxx"
+#include "unotools/javaoptions.hxx"
+#include "svl/languageoptions.hxx"
+#include "unotools/lingucfg.hxx"
+#include "unotools/linguprops.hxx"
+#include "svl/lngmisc.hxx"
+#include "svtools/localresaccess.hxx"
+#include "svl/lstner.hxx"
+#include "svl/macitem.hxx"
+#include "svtools/menuoptions.hxx"
+#include "svl/metitem.hxx"
+#include "unotools/misccfg.hxx"
+#include "svtools/miscopt.hxx"
+#include "unotools/moduleoptions.hxx"
+#include "svl/numuno.hxx"
+#include "unotools/optionsdlg.hxx"
+#include "svtools/parhtml.hxx"
+#include "svtools/parrtf.hxx"
+#include "unotools/pathoptions.hxx"
+#include "svl/pickerhelper.hxx"
+#include "svl/poolitem.hxx"
+#include "unotools/printwarningoptions.hxx"
+#include "svl/ptitem.hxx"
+#include "svl/rectitem.hxx"
+#include "svl/rngitem.hxx"
+#include "svtools/rtfkeywd.hxx"
+#include "svtools/rtfout.hxx"
+#include "svtools/rtftoken.h"
+#include "unotools/saveopt.hxx"
+#include "unotools/searchopt.hxx"
+#include "unotools/securityoptions.hxx"
+#include "svl/sfontitm.hxx"
+#include "svl/slstitm.hxx"
+#include "svl/smplhint.hxx"
+#include "svtools/soerr.hxx"
+#include "unotools/sourceviewconfig.hxx"
+#include "unotools/startoptions.hxx"
+#include "svtools/stdmenu.hxx"
+#include "svtools/stringtransfer.hxx"
+#include "svl/stritem.hxx"
+#include "svl/style.hxx"
+#include "svl/svarray.hxx"
+#include "svl/svstdarr.hxx"
+#include "unotools/syslocaleoptions.hxx"
+#include "svl/szitem.hxx"
+#include "svtools/textdata.hxx"
+#include "svtools/transfer.hxx"
+#include "svtools/txtcmp.hxx"
+#include "svl/undo.hxx"
+#include "unotools/undoopt.hxx"
+#include "svtools/unoevent.hxx"
+#include "svtools/unoimap.hxx"
+#include "svl/urihelper.hxx"
+#include "svl/urlbmk.hxx"
+#include "unotools/useroptions.hxx"
+#include "unotools/viewoptions.hxx"
+#include "svl/visitem.hxx"
+#include "svl/whiter.hxx"
+#include "sys/stat.h"
+#include "sys/types.h"
+#include "toolkit/awt/vclxdevice.hxx"
+#include "toolkit/controls/unocontrol.hxx"
+#include "tools/bigint.hxx"
+#include "tools/color.hxx"
+#include "tools/config.hxx"
+#include "tools/contnr.hxx"
+#include "tools/debug.hxx"
+#include "tools/diagnose_ex.h"
+#include "tools/dynary.hxx"
+#include "tools/errcode.hxx"
+#include "tools/errinf.hxx"
+#include "tools/fract.hxx"
+#include "tools/gen.hxx"
+#include "tools/globname.hxx"
+#include "tools/inetdef.hxx"
+#include "tools/line.hxx"
+#include "tools/link.hxx"
+#include "tools/list.hxx"
+#include "tools/multisel.hxx"
+#include "tools/poly.hxx"
+#include "tools/rc.h"
+#include "tools/rc.hxx"
+#include "tools/rcid.h"
+#include "tools/ref.hxx"
+#include "tools/resary.hxx"
+#include "tools/resid.hxx"
+#include "tools/resmgr.hxx"
+#include "tools/rtti.hxx"
+#include "tools/shl.hxx"
+#include "tools/solar.h"
+#include "tools/stack.hxx"
+#include "tools/string.hxx"
+#include "tools/table.hxx"
+#include "tools/tenccvt.hxx"
+#include "tools/urlobj.hxx"
+#include "tools/vcompat.hxx"
+#include "tools/vector2d.hxx"
+#include "tools/weakbase.hxx"
+#include "tools/wldcrd.hxx"
+#include "tools/zcodec.hxx"
+#include "ucbhelper/commandenvironment.hxx"
+#include "ucbhelper/configurationkeys.hxx"
+#include "ucbhelper/content.hxx"
+#include "ucbhelper/contentbroker.hxx"
+#include "unicode/ubidi.h"
+#include "uno/lbnames.h"
+#include "uno/mapping.hxx"
+#include "unotools/accessiblerelationsethelper.hxx"
+#include "unotools/accessiblestatesethelper.hxx"
+#include "unotools/bootstrap.hxx"
+#include "unotools/charclass.hxx"
+#include "unotools/collatorwrapper.hxx"
+#include "unotools/configitem.hxx"
+#include "unotools/configmgr.hxx"
+#include "unotools/confignode.hxx"
+#include "unotools/configpathes.hxx"
+#include "unotools/configvaluecontainer.hxx"
+#include "unotools/localfilehelper.hxx"
+#include "unotools/processfactory.hxx"
+#include "comphelper/servicehelper.hxx"
+#include "unotools/streamwrap.hxx"
+#include "unotools/textsearch.hxx"
+#include "unotools/transliterationwrapper.hxx"
+#include "unotools/ucbhelper.hxx"
+#include "vcl/abstdlg.hxx"
+#include "vcl/animate.hxx"
+#include "vcl/bitmap.hxx"
+#include "vcl/bitmapex.hxx"
+#include "vcl/bmpacc.hxx"
+#include "vcl/cmdevt.h"
+#include "vcl/configsettings.hxx"
+#include "vcl/controllayout.hxx"
+#include "vcl/cursor.hxx"
+#include "vcl/decoview.hxx"
+#include "vcl/dndhelp.hxx"
+#include "vcl/fldunit.hxx"
+#include "vcl/fntstyle.hxx"
+#include "unotools/fontcvt.hxx"
+#include "vcl/gdimtf.hxx"
+#include "vcl/help.hxx"
+#include "vcl/image.hxx"
+#include "vcl/jobset.hxx"
+#include "vcl/keycodes.hxx"
+#include "vcl/mapmod.hxx"
+#include "vcl/menu.hxx"
+#include "vcl/mnemonic.hxx"
+#include "vcl/pointr.hxx"
+#include "vcl/region.hxx"
+#include "vcl/salbtype.hxx"
+#include "vcl/stdtext.hxx"
+#include "vcl/timer.hxx"
+#include "vcl/unohelp.hxx"
+#include "vcl/unohelp2.hxx"
+#include "vcl/wall.hxx"
+#include "vcl/wintypes.hxx"
+#include "vos/mutex.hxx"
+#include "vos/ref.hxx"
+#include "vos/refernce.hxx"
+#include "vos/thread.hxx"
+#include "vos/xception.hxx"
+#include "xmloff/DashStyle.hxx"
+#include "xmloff/GradientStyle.hxx"
+#include "xmloff/HatchStyle.hxx"
+#include "xmloff/ImageStyle.hxx"
+#include "xmloff/MarkerStyle.hxx"
+#include "xmloff/attrlist.hxx"
+#include "xmloff/nmspmap.hxx"
+#include "xmloff/xmlcnimp.hxx"
+#include "xmloff/xmlictxt.hxx"
+#include "xmloff/xmlnmspe.hxx"
+#include "xmloff/xmlstyle.hxx"
+#include "xmloff/xmltoken.hxx"
+#include "xmlscript/xmldlg_imexp.hxx"
+//---MARKER---
+#endif
+#endif
diff --git a/cui/prj/build.lst b/cui/prj/build.lst
new file mode 100644
index 000000000000..776d6a6af82e
--- /dev/null
+++ b/cui/prj/build.lst
@@ -0,0 +1,9 @@
+cu cui : svx NULL
+cu cui usr1 - all cui_mkout NULL
+cu cui\inc nmake - all cui_inc NULL
+cu cui\source\options nmake - all cui_options cui_inc NULL
+cu cui\source\customize nmake - all cui_customize cui_inc NULL
+cu cui\source\dialogs nmake - all cui_dialogs cui_inc NULL
+cu cui\source\tabpages nmake - all cui_tabpages cui_inc NULL
+cu cui\source\factory nmake - all cui_factory cui_inc NULL
+cu cui\util nmake - all cui_util cui_factory cui_tabpages cui_dialogs cui_customize cui_options NULL
diff --git a/cui/prj/d.lst b/cui/prj/d.lst
new file mode 100755
index 000000000000..ce672717bfff
--- /dev/null
+++ b/cui/prj/d.lst
@@ -0,0 +1,8 @@
+mkdir: %COMMON_DEST%\bin%_EXT%\hid
+mkdir: %COMMON_DEST%\res%_EXT%
+
+..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
+..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res
+..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
+..\%__SRC%\lib\lib*.* %_DEST%\lib%_EXT%\lib*.*
+
diff --git a/svx/source/cui/acccfg.cxx b/cui/source/customize/acccfg.cxx
index e99fe145c09b..8ff50323cc76 100644
--- a/svx/source/cui/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -29,25 +29,27 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_cui.hxx"
//-----------------------------------------------
// include own files
#include "acccfg.hxx"
#include "cfgutil.hxx"
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
#include <sfx2/msg.hxx>
#include <sfx2/macrconf.hxx>
#include <sfx2/app.hxx>
#include <sfx2/filedlghelper.hxx>
#include <sfx2/minfitem.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
-#include "svx/dialogs.hrc"
+#include "cuires.hrc"
#include "acccfg.hrc"
+#include <svx/svxids.hrc> // SID_CHARMAP, SID_ATTR_SPECIALCHAR
+
//-----------------------------------------------
// include interface declarations
#include <com/sun/star/frame/XFramesSupplier.hpp>
@@ -699,31 +701,31 @@ void SfxAccCfgTabListBox_Impl::KeyInput(const KeyEvent& aKey)
//-----------------------------------------------
SfxAcceleratorConfigPage::SfxAcceleratorConfigPage( Window* pParent, const SfxItemSet& aSet )
- : SfxTabPage (pParent, SVX_RES(RID_SVXPAGE_KEYBOARD), aSet)
+ : SfxTabPage (pParent, CUI_RES(RID_SVXPAGE_KEYBOARD), aSet)
, m_pMacroInfoItem ()
, m_pStringItem ()
, m_pFontItem ()
, m_pFileDlg (NULL)
- , aEntriesBox (this , this, SVX_RES(BOX_ACC_ENTRIES ))
- , aKeyboardGroup (this , SVX_RES(GRP_ACC_KEYBOARD ))
- , aOfficeButton (this , SVX_RES(RB_OFFICE ))
- , aModuleButton (this , SVX_RES(RB_MODULE ))
- , aChangeButton (this , SVX_RES(BTN_ACC_CHANGE ))
- , aRemoveButton (this , SVX_RES(BTN_ACC_REMOVE ))
- , aGroupText (this , SVX_RES(TXT_ACC_GROUP ))
- , pGroupLBox(new SfxConfigGroupListBox_Impl( this, SVX_RES(BOX_ACC_GROUP), SFX_SLOT_ACCELCONFIG ))
- , aFunctionText (this , SVX_RES(TXT_ACC_FUNCTION ))
- , pFunctionBox(new SfxConfigFunctionListBox_Impl( this, SVX_RES( BOX_ACC_FUNCTION )))
- , aKeyText (this , SVX_RES(TXT_ACC_KEY ))
- , aKeyBox (this , SVX_RES(BOX_ACC_KEY ))
- , aFunctionsGroup (this , SVX_RES(GRP_ACC_FUNCTIONS ))
- , aLoadButton (this , SVX_RES(BTN_LOAD ))
- , aSaveButton (this , SVX_RES(BTN_SAVE ))
- , aResetButton (this , SVX_RES(BTN_RESET ))
- , aLoadAccelConfigStr ( SVX_RES( STR_LOADACCELCONFIG ) )
- , aSaveAccelConfigStr ( SVX_RES( STR_SAVEACCELCONFIG ) )
- , aFilterAllStr ( SVX_RES( STR_SFX_FILTERNAME_ALL ) )
- , aFilterCfgStr ( SVX_RES( STR_FILTERNAME_CFG ) )
+ , aEntriesBox (this , this, CUI_RES(BOX_ACC_ENTRIES ))
+ , aKeyboardGroup (this , CUI_RES(GRP_ACC_KEYBOARD ))
+ , aOfficeButton (this , CUI_RES(RB_OFFICE ))
+ , aModuleButton (this , CUI_RES(RB_MODULE ))
+ , aChangeButton (this , CUI_RES(BTN_ACC_CHANGE ))
+ , aRemoveButton (this , CUI_RES(BTN_ACC_REMOVE ))
+ , aGroupText (this , CUI_RES(TXT_ACC_GROUP ))
+ , pGroupLBox(new SfxConfigGroupListBox_Impl( this, CUI_RES(BOX_ACC_GROUP), SFX_SLOT_ACCELCONFIG ))
+ , aFunctionText (this , CUI_RES(TXT_ACC_FUNCTION ))
+ , pFunctionBox(new SfxConfigFunctionListBox_Impl( this, CUI_RES( BOX_ACC_FUNCTION )))
+ , aKeyText (this , CUI_RES(TXT_ACC_KEY ))
+ , aKeyBox (this , CUI_RES(BOX_ACC_KEY ))
+ , aFunctionsGroup (this , CUI_RES(GRP_ACC_FUNCTIONS ))
+ , aLoadButton (this , CUI_RES(BTN_LOAD ))
+ , aSaveButton (this , CUI_RES(BTN_SAVE ))
+ , aResetButton (this , CUI_RES(BTN_RESET ))
+ , aLoadAccelConfigStr ( CUI_RES( STR_LOADACCELCONFIG ) )
+ , aSaveAccelConfigStr ( CUI_RES( STR_SAVEACCELCONFIG ) )
+ , aFilterAllStr ( CUI_RES( STR_SFX_FILTERNAME_ALL ) )
+ , aFilterCfgStr ( CUI_RES( STR_FILTERNAME_CFG ) )
, m_bStylesInfoInitialized(sal_False)
, m_xGlobal ()
, m_xModule ()
diff --git a/svx/source/cui/acccfg.hrc b/cui/source/customize/acccfg.hrc
index 2144af68df35..2144af68df35 100644
--- a/svx/source/cui/acccfg.hrc
+++ b/cui/source/customize/acccfg.hrc
diff --git a/svx/source/cui/acccfg.src b/cui/source/customize/acccfg.src
index df0e0922da12..4c26725a69d9 100644
--- a/svx/source/cui/acccfg.src
+++ b/cui/source/customize/acccfg.src
@@ -29,7 +29,7 @@
************************************************************************/
// include ---------------------------------------------------------------
#include "helpid.hrc"
-#include "svx/dialogs.hrc"
+#include "cuires.hrc"
#include "acccfg.hrc"
#define MASKCOLOR MaskColor = \
diff --git a/svx/source/cui/cfg.cxx b/cui/source/customize/cfg.cxx
index 5df1e03edb53..4697a957662c 100644
--- a/svx/source/cui/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -29,7 +29,7 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_cui.hxx"
#include <stdlib.h>
#include <time.h>
@@ -62,21 +62,21 @@
#include <sfx2/objsh.hxx>
#include <sfx2/request.hxx>
#include <sfx2/filedlghelper.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
#include <svtools/miscopt.hxx>
#include <tools/diagnose_ex.h>
#include <toolkit/unohlp.hxx>
#include <algorithm>
//add
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "cfg.hrc"
#include "helpid.hrc"
#include "acccfg.hxx"
#include "cfg.hxx"
#include "eventdlg.hxx"
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
#include <comphelper/documentinfo.hxx>
#include <comphelper/processfactory.hxx>
@@ -856,7 +856,7 @@ SvxConfigDialog::SvxConfigDialog(
Window * pParent, const SfxItemSet* pSet_ )
:
SfxTabDialog( pParent,
- SVX_RES( RID_SVXDLG_CUSTOMIZE ), pSet_ )
+ CUI_RES( RID_SVXDLG_CUSTOMIZE ), pSet_ )
{
FreeResource();
@@ -1669,25 +1669,25 @@ void SvxDescriptionEdit::SetNewText( const String& _rText )
SvxConfigPage::SvxConfigPage(
Window *pParent, const SfxItemSet& rSet )
:
- SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_MENUS ), rSet ),
+ SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_MENUS ), rSet ),
bInitialised( FALSE ),
pCurrentSaveInData( 0 ),
- aTopLevelSeparator( this, SVX_RES( GRP_MENUS ) ),
- aTopLevelLabel( this, SVX_RES( FT_MENUS ) ),
- aTopLevelListBox( this, SVX_RES( LB_MENUS ) ),
- aNewTopLevelButton( this, SVX_RES( BTN_NEW ) ),
- aModifyTopLevelButton( this, SVX_RES( BTN_CHANGE ) ),
- aContentsSeparator( this, SVX_RES( GRP_MENU_SEPARATOR ) ),
- aContentsLabel( this, SVX_RES( GRP_MENU_ENTRIES ) ),
+ aTopLevelSeparator( this, CUI_RES( GRP_MENUS ) ),
+ aTopLevelLabel( this, CUI_RES( FT_MENUS ) ),
+ aTopLevelListBox( this, CUI_RES( LB_MENUS ) ),
+ aNewTopLevelButton( this, CUI_RES( BTN_NEW ) ),
+ aModifyTopLevelButton( this, CUI_RES( BTN_CHANGE ) ),
+ aContentsSeparator( this, CUI_RES( GRP_MENU_SEPARATOR ) ),
+ aContentsLabel( this, CUI_RES( GRP_MENU_ENTRIES ) ),
aContentsListBox( 0 ),
- aAddCommandsButton( this, SVX_RES( BTN_ADD_COMMANDS ) ),
- aModifyCommandButton( this, SVX_RES( BTN_CHANGE_ENTRY ) ),
- aMoveUpButton( this, SVX_RES( BTN_UP ) ),
- aMoveDownButton( this, SVX_RES( BTN_DOWN ) ),
- aSaveInText( this, SVX_RES( TXT_SAVEIN ) ),
- aSaveInListBox( this, SVX_RES( LB_SAVEIN ) ),
- aDescriptionLabel( this, SVX_RES( FT_DESCRIPTION ) ),
- aDescriptionField( this, SVX_RES( ED_DESCRIPTION ) ),
+ aAddCommandsButton( this, CUI_RES( BTN_ADD_COMMANDS ) ),
+ aModifyCommandButton( this, CUI_RES( BTN_CHANGE_ENTRY ) ),
+ aMoveUpButton( this, CUI_RES( BTN_UP ) ),
+ aMoveDownButton( this, CUI_RES( BTN_DOWN ) ),
+ aSaveInText( this, CUI_RES( TXT_SAVEIN ) ),
+ aSaveInListBox( this, CUI_RES( LB_SAVEIN ) ),
+ aDescriptionLabel( this, CUI_RES( FT_DESCRIPTION ) ),
+ aDescriptionField( this, CUI_RES( ED_DESCRIPTION ) ),
pSelectorDlg( 0 )
{
aDescriptionField.SetControlBackground( GetSettings().GetStyleSettings().GetDialogColor() );
@@ -2293,7 +2293,7 @@ IMPL_LINK( SvxConfigPage, AsyncInfoMsg, String*, pMsg )
(void)pMsg;
// Asynchronous msg because of D&D
- InfoBox( this, SVX_RES(
+ InfoBox( this, CUI_RES(
IBX_MNUCFG_ALREADY_INCLUDED ) ).Execute();
return 0;
@@ -2397,7 +2397,7 @@ SvxMenuConfigPage::SvxMenuConfigPage(
:
SvxConfigPage( pParent, rSet )
{
- aContentsListBox = new SvxMenuEntriesListBox( this, SVX_RES( BOX_ENTRIES ) );
+ aContentsListBox = new SvxMenuEntriesListBox( this, CUI_RES( BOX_ENTRIES ) );
FreeResource();
PositionContentsListBox();
@@ -2418,7 +2418,7 @@ SvxMenuConfigPage::SvxMenuConfigPage(
aAddCommandsButton.SetClickHdl (
LINK( this, SvxMenuConfigPage, AddCommandsHdl ) );
- PopupMenu* pMenu = new PopupMenu( SVX_RES( MODIFY_MENU ) );
+ PopupMenu* pMenu = new PopupMenu( CUI_RES( MODIFY_MENU ) );
pMenu->SetMenuFlags(
pMenu->GetMenuFlags() | MENU_FLAG_ALWAYSSHOWDISABLEDENTRIES );
@@ -2426,7 +2426,7 @@ SvxMenuConfigPage::SvxMenuConfigPage(
aModifyTopLevelButton.SetSelectHdl(
LINK( this, SvxMenuConfigPage, MenuSelectHdl ) );
- PopupMenu* pEntry = new PopupMenu( SVX_RES( MODIFY_ENTRY ) );
+ PopupMenu* pEntry = new PopupMenu( CUI_RES( MODIFY_ENTRY ) );
pEntry->SetMenuFlags(
pEntry->GetMenuFlags() | MENU_FLAG_ALWAYSSHOWDISABLEDENTRIES );
@@ -2576,7 +2576,7 @@ bool SvxMenuConfigPage::DeleteSelectedContent()
short SvxMenuConfigPage::QueryReset()
{
String msg =
- String( SVX_RES( RID_SVXSTR_CONFIRM_MENU_RESET ) );
+ String( CUI_RES( RID_SVXSTR_CONFIRM_MENU_RESET ) );
String saveInName = aSaveInListBox.GetEntry(
aSaveInListBox.GetSelectEntryPos() );
@@ -2629,11 +2629,11 @@ IMPL_LINK( SvxMenuConfigPage, MenuSelectHdl, MenuButton *, pButton )
SvxConfigEntry* pMenuData = GetTopLevelSelection();
String aNewName( stripHotKey( pMenuData->GetName() ) );
- String aDesc = SVX_RESSSTR( RID_SVXSTR_LABEL_NEW_NAME );
+ String aDesc = CUI_RESSSTR( RID_SVXSTR_LABEL_NEW_NAME );
SvxNameDialog* pNameDialog = new SvxNameDialog( this, aNewName, aDesc );
pNameDialog->SetHelpId( HID_SVX_CONFIG_RENAME_MENU );
- pNameDialog->SetText( SVX_RESSTR( RID_SVXSTR_RENAME_MENU ) );
+ pNameDialog->SetText( CUI_RESSTR( RID_SVXSTR_RENAME_MENU ) );
bool ret = pNameDialog->Execute();
@@ -2687,11 +2687,11 @@ IMPL_LINK( SvxMenuConfigPage, EntrySelectHdl, MenuButton *, pButton )
case ID_ADD_SUBMENU:
{
String aNewName;
- String aDesc = SVX_RESSSTR( RID_SVXSTR_SUBMENU_NAME );
+ String aDesc = CUI_RESSSTR( RID_SVXSTR_SUBMENU_NAME );
SvxNameDialog* pNameDialog = new SvxNameDialog( this, aNewName, aDesc );
pNameDialog->SetHelpId( HID_SVX_CONFIG_NAME_SUBMENU );
- pNameDialog->SetText( SVX_RESSTR( RID_SVXSTR_ADD_SUBMENU ) );
+ pNameDialog->SetText( CUI_RESSTR( RID_SVXSTR_ADD_SUBMENU ) );
bool ret = pNameDialog->Execute();
@@ -2733,11 +2733,11 @@ IMPL_LINK( SvxMenuConfigPage, EntrySelectHdl, MenuButton *, pButton )
(SvxConfigEntry*) pActEntry->GetUserData();
String aNewName( stripHotKey( pEntry->GetName() ) );
- String aDesc = SVX_RESSSTR( RID_SVXSTR_LABEL_NEW_NAME );
+ String aDesc = CUI_RESSSTR( RID_SVXSTR_LABEL_NEW_NAME );
SvxNameDialog* pNameDialog = new SvxNameDialog( this, aNewName, aDesc );
pNameDialog->SetHelpId( HID_SVX_CONFIG_RENAME_MENU_ITEM );
- pNameDialog->SetText( SVX_RESSTR( RID_SVXSTR_RENAME_MENU ) );
+ pNameDialog->SetText( CUI_RESSTR( RID_SVXSTR_RENAME_MENU ) );
bool ret = pNameDialog->Execute();
@@ -2813,7 +2813,7 @@ IMPL_LINK( SvxMenuConfigPage, AddCommandsHdl, Button *, pButton )
LINK( this, SvxMenuConfigPage, AddFunctionHdl ) );
pSelectorDlg->SetDialogDescription( String(
- SVX_RES( RID_SVXSTR_MENU_ADDCOMMANDS_DESCRIPTION ) ) );
+ CUI_RES( RID_SVXSTR_MENU_ADDCOMMANDS_DESCRIPTION ) ) );
}
// Position the Script Selector over the Add button so it is
@@ -2841,16 +2841,16 @@ SvxMainMenuOrganizerDialog::SvxMainMenuOrganizerDialog(
Window* pParent, SvxEntries* entries,
SvxConfigEntry* selection, bool bCreateMenu )
:
- ModalDialog( pParent, SVX_RES( MD_MENU_ORGANISER ) ),
- aMenuNameText( this, SVX_RES( TXT_MENU_NAME ) ),
- aMenuNameEdit( this, SVX_RES( EDIT_MENU_NAME ) ),
- aMenuListText( this, SVX_RES( TXT_MENU ) ),
- aMenuListBox( this, SVX_RES( BOX_MAIN_MENUS ) ),
- aMoveUpButton( this, SVX_RES( BTN_MENU_UP ) ),
- aMoveDownButton( this, SVX_RES( BTN_MENU_DOWN ) ),
- aOKButton( this, SVX_RES( BTN_MENU_ADD ) ),
- aCloseButton( this, SVX_RES( BTN_MENU_CLOSE ) ),
- aHelpButton( this, SVX_RES( BTN_MENU_HELP ) ),
+ ModalDialog( pParent, CUI_RES( MD_MENU_ORGANISER ) ),
+ aMenuNameText( this, CUI_RES( TXT_MENU_NAME ) ),
+ aMenuNameEdit( this, CUI_RES( EDIT_MENU_NAME ) ),
+ aMenuListText( this, CUI_RES( TXT_MENU ) ),
+ aMenuListBox( this, CUI_RES( BOX_MAIN_MENUS ) ),
+ aMoveUpButton( this, CUI_RES( BTN_MENU_UP ) ),
+ aMoveDownButton( this, CUI_RES( BTN_MENU_DOWN ) ),
+ aOKButton( this, CUI_RES( BTN_MENU_ADD ) ),
+ aCloseButton( this, CUI_RES( BTN_MENU_CLOSE ) ),
+ aHelpButton( this, CUI_RES( BTN_MENU_HELP ) ),
bModified( FALSE )
{
FreeResource();
@@ -2884,7 +2884,7 @@ SvxMainMenuOrganizerDialog::SvxMainMenuOrganizerDialog(
{
// Generate custom name for new menu
String prefix =
- String( SVX_RES( RID_SVXSTR_NEW_MENU ) );
+ String( CUI_RES( RID_SVXSTR_NEW_MENU ) );
OUString newname = generateCustomName( prefix, entries );
OUString newurl = generateCustomMenuURL( pEntries );
@@ -2939,7 +2939,7 @@ SvxMainMenuOrganizerDialog::SvxMainMenuOrganizerDialog(
aMenuNameEdit.Hide();
// change the title
- SetText( SVX_RES( RID_SVXSTR_MOVE_MENU ) );
+ SetText( CUI_RES( RID_SVXSTR_MOVE_MENU ) );
}
aMenuListBox.SetSelectHdl(
@@ -3348,7 +3348,7 @@ SvxToolbarConfigPage::SvxToolbarConfigPage(
{
SetHelpId( HID_SVX_CONFIG_TOOLBAR );
- aContentsListBox = new SvxToolbarEntriesListBox(this, SVX_RES(BOX_ENTRIES));
+ aContentsListBox = new SvxToolbarEntriesListBox(this, CUI_RES(BOX_ENTRIES));
FreeResource();
PositionContentsListBox();
aContentsListBox->SetZOrder( &aAddCommandsButton, WINDOW_ZORDER_BEFOR );
@@ -3361,12 +3361,12 @@ SvxToolbarConfigPage::SvxToolbarConfigPage(
aSaveInListBox.SetHelpId( HID_SVX_SAVE_IN );
aTopLevelSeparator.SetText(
- SVX_RES ( RID_SVXSTR_PRODUCTNAME_TOOLBARS ) );
+ CUI_RES ( RID_SVXSTR_PRODUCTNAME_TOOLBARS ) );
- aTopLevelLabel.SetText( SVX_RES( RID_SVXSTR_TOOLBAR ) );
- aModifyTopLevelButton.SetText( SVX_RES( RID_SVXSTR_TOOLBAR ) );
- aContentsSeparator.SetText( SVX_RES( RID_SVXSTR_TOOLBAR_CONTENT ) );
- aContentsLabel.SetText( SVX_RES( RID_SVXSTR_COMMANDS ) );
+ aTopLevelLabel.SetText( CUI_RES( RID_SVXSTR_TOOLBAR ) );
+ aModifyTopLevelButton.SetText( CUI_RES( RID_SVXSTR_TOOLBAR ) );
+ aContentsSeparator.SetText( CUI_RES( RID_SVXSTR_TOOLBAR_CONTENT ) );
+ aContentsLabel.SetText( CUI_RES( RID_SVXSTR_COMMANDS ) );
aTopLevelListBox.SetSelectHdl(
LINK( this, SvxToolbarConfigPage, SelectToolbar ) );
@@ -3386,7 +3386,7 @@ SvxToolbarConfigPage::SvxToolbarConfigPage(
aMoveDownButton.Enable( TRUE );
aMoveUpButton.Enable( TRUE );
- PopupMenu* pMenu = new PopupMenu( SVX_RES( MODIFY_TOOLBAR ) );
+ PopupMenu* pMenu = new PopupMenu( CUI_RES( MODIFY_TOOLBAR ) );
pMenu->SetMenuFlags(
pMenu->GetMenuFlags() | MENU_FLAG_ALWAYSSHOWDISABLEDENTRIES );
@@ -3395,7 +3395,7 @@ SvxToolbarConfigPage::SvxToolbarConfigPage(
LINK( this, SvxToolbarConfigPage, ToolbarSelectHdl ) );
PopupMenu* pEntry = new PopupMenu(
- SVX_RES( MODIFY_TOOLBAR_CONTENT ) );
+ CUI_RES( MODIFY_TOOLBAR_CONTENT ) );
pEntry->SetMenuFlags(
pEntry->GetMenuFlags() | MENU_FLAG_ALWAYSSHOWDISABLEDENTRIES );
@@ -3516,7 +3516,7 @@ bool SvxToolbarConfigPage::DeleteSelectedContent()
GetTopLevelSelection()->IsDeletable() )
{
QueryBox qbox( this,
- SVX_RES( QBX_CONFIRM_DELETE_TOOLBAR ) );
+ CUI_RES( QBX_CONFIRM_DELETE_TOOLBAR ) );
if ( qbox.Execute() == RET_YES )
{
@@ -3571,11 +3571,11 @@ IMPL_LINK( SvxToolbarConfigPage, ToolbarSelectHdl, MenuButton *, pButton )
case ID_RENAME:
{
String aNewName( stripHotKey( pToolbar->GetName() ) );
- String aDesc = SVX_RESSSTR( RID_SVXSTR_LABEL_NEW_NAME );
+ String aDesc = CUI_RESSSTR( RID_SVXSTR_LABEL_NEW_NAME );
SvxNameDialog* pNameDialog = new SvxNameDialog( this, aNewName, aDesc );
pNameDialog->SetHelpId( HID_SVX_CONFIG_RENAME_TOOLBAR );
- pNameDialog->SetText( SVX_RESSTR( RID_SVXSTR_RENAME_TOOLBAR ) );
+ pNameDialog->SetText( CUI_RESSTR( RID_SVXSTR_RENAME_TOOLBAR ) );
bool ret = pNameDialog->Execute();
@@ -3601,7 +3601,7 @@ IMPL_LINK( SvxToolbarConfigPage, ToolbarSelectHdl, MenuButton *, pButton )
case ID_DEFAULT_STYLE:
{
QueryBox qbox( this,
- SVX_RES( QBX_CONFIRM_RESTORE_DEFAULT ) );
+ CUI_RES( QBX_CONFIRM_RESTORE_DEFAULT ) );
if ( qbox.Execute() == RET_YES )
{
@@ -3662,11 +3662,11 @@ IMPL_LINK( SvxToolbarConfigPage, EntrySelectHdl, MenuButton *, pButton )
(SvxConfigEntry*) pActEntry->GetUserData();
String aNewName( stripHotKey( pEntry->GetName() ) );
- String aDesc = SVX_RESSSTR( RID_SVXSTR_LABEL_NEW_NAME );
+ String aDesc = CUI_RESSSTR( RID_SVXSTR_LABEL_NEW_NAME );
SvxNameDialog* pNameDialog = new SvxNameDialog( this, aNewName, aDesc );
pNameDialog->SetHelpId( HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM );
- pNameDialog->SetText( SVX_RESSTR( RID_SVXSTR_RENAME_TOOLBAR ) );
+ pNameDialog->SetText( CUI_RESSTR( RID_SVXSTR_RENAME_TOOLBAR ) );
bool ret = pNameDialog->Execute();
@@ -4887,7 +4887,7 @@ void SvxToolbarConfigPage::UpdateButtonStates()
short SvxToolbarConfigPage::QueryReset()
{
String msg =
- String( SVX_RES( RID_SVXSTR_CONFIRM_TOOLBAR_RESET ) );
+ String( CUI_RES( RID_SVXSTR_CONFIRM_TOOLBAR_RESET ) );
String saveInName = aSaveInListBox.GetEntry(
aSaveInListBox.GetSelectEntryPos() );
@@ -4975,7 +4975,7 @@ IMPL_LINK( SvxToolbarConfigPage, NewToolbarHdl, Button *, pButton )
(void)pButton;
String prefix =
- String( SVX_RES( RID_SVXSTR_NEW_TOOLBAR ) );
+ String( CUI_RES( RID_SVXSTR_NEW_TOOLBAR ) );
OUString aNewName =
generateCustomName( prefix, GetSaveInData()->GetEntries() );
@@ -5300,14 +5300,14 @@ BOOL SvxToolbarEntriesListBox::NotifyCopying(
SvxNewToolbarDialog::SvxNewToolbarDialog(
Window* pWindow, const String& rName )
:
- ModalDialog ( pWindow, SVX_RES( MD_NEW_TOOLBAR ) ),
- aFtDescription ( this, SVX_RES( FT_NAME ) ),
- aEdtName ( this, SVX_RES( EDT_STRING ) ),
- aSaveInText ( this, SVX_RES( TXT_SAVEIN ) ),
- aBtnOK ( this, SVX_RES( BTN_OK ) ),
- aBtnCancel ( this, SVX_RES( BTN_CANCEL ) ),
- aBtnHelp ( this, SVX_RES( BTN_HELP ) ),
- aSaveInListBox ( this, SVX_RES( LB_SAVEIN ) )
+ ModalDialog ( pWindow, CUI_RES( MD_NEW_TOOLBAR ) ),
+ aFtDescription ( this, CUI_RES( FT_NAME ) ),
+ aEdtName ( this, CUI_RES( EDT_STRING ) ),
+ aSaveInText ( this, CUI_RES( TXT_SAVEIN ) ),
+ aBtnOK ( this, CUI_RES( BTN_OK ) ),
+ aBtnCancel ( this, CUI_RES( BTN_CANCEL ) ),
+ aBtnHelp ( this, CUI_RES( BTN_HELP ) ),
+ aSaveInListBox ( this, CUI_RES( LB_SAVEIN ) )
{
FreeResource();
@@ -5336,16 +5336,16 @@ SvxIconSelectorDialog::SvxIconSelectorDialog( Window *pWindow,
const uno::Reference< css::ui::XImageManager >& rXImageManager,
const uno::Reference< css::ui::XImageManager >& rXParentImageManager )
:
- ModalDialog ( pWindow, SVX_RES( MD_ICONSELECTOR ) ),
- aFtDescription ( this, SVX_RES( FT_SYMBOLS ) ),
- aTbSymbol ( this, SVX_RES( TB_SYMBOLS ) ),
- aFtNote ( this, SVX_RES( FT_NOTE ) ),
- aBtnOK ( this, SVX_RES( BTN_OK ) ),
- aBtnCancel ( this, SVX_RES( BTN_CANCEL ) ),
- aBtnHelp ( this, SVX_RES( BTN_HELP ) ),
- aBtnImport ( this, SVX_RES( BTN_IMPORT ) ),
- aBtnDelete ( this, SVX_RES( BTN_DELETE ) ),
- aFlSeparator ( this, SVX_RES( FL_SEPARATOR ) ),
+ ModalDialog ( pWindow, CUI_RES( MD_ICONSELECTOR ) ),
+ aFtDescription ( this, CUI_RES( FT_SYMBOLS ) ),
+ aTbSymbol ( this, CUI_RES( TB_SYMBOLS ) ),
+ aFtNote ( this, CUI_RES( FT_NOTE ) ),
+ aBtnOK ( this, CUI_RES( BTN_OK ) ),
+ aBtnCancel ( this, CUI_RES( BTN_CANCEL ) ),
+ aBtnHelp ( this, CUI_RES( BTN_HELP ) ),
+ aBtnImport ( this, CUI_RES( BTN_IMPORT ) ),
+ aBtnDelete ( this, CUI_RES( BTN_DELETE ) ),
+ aFlSeparator ( this, CUI_RES( FL_SEPARATOR ) ),
m_nNextId ( 0 ),
m_xImageManager ( rXImageManager ),
m_xParentImageManager( rXParentImageManager )
@@ -5638,7 +5638,7 @@ IMPL_LINK( SvxIconSelectorDialog, DeleteHdl, PushButton *, pButton )
{
(void)pButton;
- OUString message = String( SVX_RES( RID_SVXSTR_DELETE_ICON_CONFIRM ) );
+ OUString message = String( CUI_RES( RID_SVXSTR_DELETE_ICON_CONFIRM ) );
bool ret = WarningBox( this, WinBits(WB_OK_CANCEL), message ).Execute();
if ( ret == RET_OK )
@@ -5937,14 +5937,14 @@ bool SvxIconSelectorDialog::ImportGraphic( const OUString& aURL )
SvxIconReplacementDialog :: SvxIconReplacementDialog(
Window *pWindow, const rtl::OUString& aMessage, bool /*bYestoAll*/ )
:
-MessBox( pWindow, WB_DEF_YES, String( SVX_RES( RID_SVXSTR_REPLACE_ICON_CONFIRM ) ), String( SVX_RES( RID_SVXSTR_REPLACE_ICON_WARNING ) ) )
+MessBox( pWindow, WB_DEF_YES, String( CUI_RES( RID_SVXSTR_REPLACE_ICON_CONFIRM ) ), String( CUI_RES( RID_SVXSTR_REPLACE_ICON_WARNING ) ) )
{
SetImage( WarningBox::GetStandardImage() );
SetMessText( ReplaceIconName( aMessage ) );
RemoveButton( 1 );
AddButton( BUTTON_YES, 2, 0 );
- AddButton( String( SVX_RES( RID_SVXSTR_YESTOALL ) ), 5, 0 );
+ AddButton( String( CUI_RES( RID_SVXSTR_YESTOALL ) ), 5, 0 );
AddButton( BUTTON_NO, 3, 0 );
AddButton( BUTTON_CANCEL, 4, 0 );
}
@@ -5952,7 +5952,7 @@ MessBox( pWindow, WB_DEF_YES, String( SVX_RES( RID_SVXSTR_REPLACE_ICON_CONFIRM )
SvxIconReplacementDialog :: SvxIconReplacementDialog(
Window *pWindow, const rtl::OUString& aMessage )
:
-MessBox( pWindow, WB_YES_NO_CANCEL, String( SVX_RES( RID_SVXSTR_REPLACE_ICON_CONFIRM ) ), String( SVX_RES( RID_SVXSTR_REPLACE_ICON_WARNING ) ) )
+MessBox( pWindow, WB_YES_NO_CANCEL, String( CUI_RES( RID_SVXSTR_REPLACE_ICON_CONFIRM ) ), String( CUI_RES( RID_SVXSTR_REPLACE_ICON_WARNING ) ) )
{
SetImage( WarningBox::GetStandardImage() );
SetMessText( ReplaceIconName( aMessage ));
@@ -5961,7 +5961,7 @@ MessBox( pWindow, WB_YES_NO_CANCEL, String( SVX_RES( RID_SVXSTR_REPLACE_ICON_CON
rtl::OUString SvxIconReplacementDialog :: ReplaceIconName( const OUString& rMessage )
{
rtl::OUString name;
- rtl::OUString message = String( SVX_RES( RID_SVXSTR_REPLACE_ICON_WARNING ) );
+ rtl::OUString message = String( CUI_RES( RID_SVXSTR_REPLACE_ICON_WARNING ) );
rtl::OUString placeholder = OUString::createFromAscii( "%ICONNAME" );
sal_Int32 pos = message.indexOf( placeholder );
if ( pos != -1 )
@@ -5985,11 +5985,11 @@ USHORT SvxIconReplacementDialog :: ShowDialog()
SvxIconChangeDialog::SvxIconChangeDialog(
Window *pWindow, const rtl::OUString& aMessage)
:
- ModalDialog ( pWindow, SVX_RES( MD_ICONCHANGE ) ),
- aFImageInfo (this, SVX_RES( FI_INFO ) ),
- aBtnOK (this, SVX_RES(MD_BTN_OK)),
- aDescriptionLabel (this, SVX_RES(FTCHGE_DESCRIPTION)),
- aLineEditDescription (this, SVX_RES(EDT_ADDR))
+ ModalDialog ( pWindow, CUI_RES( MD_ICONCHANGE ) ),
+ aFImageInfo (this, CUI_RES( FI_INFO ) ),
+ aBtnOK (this, CUI_RES(MD_BTN_OK)),
+ aDescriptionLabel (this, CUI_RES(FTCHGE_DESCRIPTION)),
+ aLineEditDescription (this, CUI_RES(EDT_ADDR))
{
FreeResource();
aFImageInfo.SetImage(InfoBox::GetStandardImage());
diff --git a/svx/source/cui/cfg.hrc b/cui/source/customize/cfg.hrc
index 49c155ef96bf..49c155ef96bf 100644
--- a/svx/source/cui/cfg.hrc
+++ b/cui/source/customize/cfg.hrc
diff --git a/svx/source/cui/cfg.src b/cui/source/customize/cfg.src
index 69f1ccc9c61f..15ac23125668 100644
--- a/svx/source/cui/cfg.src
+++ b/cui/source/customize/cfg.src
@@ -27,7 +27,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "cfg.hrc"
#include "helpid.hrc"
diff --git a/svx/source/cui/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index 6e1f115ebc53..37b2b9a54ab0 100644
--- a/svx/source/cui/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -29,7 +29,7 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_cui.hxx"
#include "cfgutil.hxx"
@@ -60,7 +60,7 @@
#include <basic/sbmod.hxx>
#include <basic/basmgr.hxx>
#include <tools/urlobj.hxx>
-#include "svx/dialogs.hrc"
+#include "cuires.hrc"
#include <sfx2/app.hxx>
#include <sfx2/macrconf.hxx>
#include <sfx2/minfitem.hxx>
@@ -70,11 +70,11 @@
#include <rtl/ustrbuf.hxx>
#include <comphelper/sequenceashashmap.hxx>
#include <unotools/configmgr.hxx>
-#include "svx/dialmgr.hxx"
-#include <svtools/stritem.hxx>
+#include "dialmgr.hxx"
+#include <svl/stritem.hxx>
#define _SVSTDARR_STRINGSDTOR
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -550,26 +550,26 @@ struct SvxConfigGroupBoxResource_Impl : public Resource
};
SvxConfigGroupBoxResource_Impl::SvxConfigGroupBoxResource_Impl() :
- Resource(SVX_RES(RID_SVXPAGE_CONFIGGROUPBOX)),
- m_hdImage(SVX_RES(IMG_HARDDISK)),
- m_hdImage_hc(SVX_RES(IMG_HARDDISK_HC)),
- m_libImage(SVX_RES(IMG_LIB)),
- m_libImage_hc(SVX_RES(IMG_LIB_HC)),
- m_macImage(SVX_RES(IMG_MACRO)),
- m_macImage_hc(SVX_RES(IMG_MACRO_HC)),
- m_docImage(SVX_RES(IMG_DOC)),
- m_docImage_hc(SVX_RES(IMG_DOC_HC)),
- m_sMyMacros(String(SVX_RES(STR_MYMACROS))),
- m_sProdMacros(String(SVX_RES(STR_PRODMACROS))),
- m_sMacros(String(SVX_RES(STR_BASICMACROS))),
- m_sDlgMacros(String(SVX_RES(STR_DLG_MACROS))),
- m_aHumanAppName(String(SVX_RES(STR_HUMAN_APPNAME))),
- m_aStrGroupStyles(String(SVX_RES(STR_GROUP_STYLES))),
- m_aScriptType(String(SVX_RES(STR_BASICNAME))),
- m_collapsedImage(SVX_RES(BMP_COLLAPSED)),
- m_collapsedImage_hc(SVX_RES(BMP_COLLAPSED_HC)),
- m_expandedImage(SVX_RES(BMP_EXPANDED)),
- m_expandedImage_hc(SVX_RES(BMP_EXPANDED_HC))
+ Resource(CUI_RES(RID_SVXPAGE_CONFIGGROUPBOX)),
+ m_hdImage(CUI_RES(IMG_HARDDISK)),
+ m_hdImage_hc(CUI_RES(IMG_HARDDISK_HC)),
+ m_libImage(CUI_RES(IMG_LIB)),
+ m_libImage_hc(CUI_RES(IMG_LIB_HC)),
+ m_macImage(CUI_RES(IMG_MACRO)),
+ m_macImage_hc(CUI_RES(IMG_MACRO_HC)),
+ m_docImage(CUI_RES(IMG_DOC)),
+ m_docImage_hc(CUI_RES(IMG_DOC_HC)),
+ m_sMyMacros(String(CUI_RES(STR_MYMACROS))),
+ m_sProdMacros(String(CUI_RES(STR_PRODMACROS))),
+ m_sMacros(String(CUI_RES(STR_BASICMACROS))),
+ m_sDlgMacros(String(CUI_RES(STR_DLG_MACROS))),
+ m_aHumanAppName(String(CUI_RES(STR_HUMAN_APPNAME))),
+ m_aStrGroupStyles(String(CUI_RES(STR_GROUP_STYLES))),
+ m_aScriptType(String(CUI_RES(STR_BASICNAME))),
+ m_collapsedImage(CUI_RES(BMP_COLLAPSED)),
+ m_collapsedImage_hc(CUI_RES(BMP_COLLAPSED_HC)),
+ m_expandedImage(CUI_RES(BMP_EXPANDED)),
+ m_expandedImage_hc(CUI_RES(BMP_EXPANDED_HC))
{
FreeResource();
}
diff --git a/svx/source/cui/eventdlg.cxx b/cui/source/customize/eventdlg.cxx
index dd9e2511b1ea..7f90560d5ab1 100644
--- a/svx/source/cui/eventdlg.cxx
+++ b/cui/source/customize/eventdlg.cxx
@@ -29,7 +29,7 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_cui.hxx"
// include ***************************************************************
#include <svtools/svmedit.hxx>
@@ -52,13 +52,13 @@
#include <sfx2/objsh.hxx>
#include <sfx2/docfac.hxx>
#include <sfx2/fcontnr.hxx>
-#include <svtools/eventcfg.hxx>
+#include <unotools/eventcfg.hxx>
#include "headertablistbox.hxx"
#include "macropg_impl.hxx"
-#include <svx/dialmgr.hxx>
-#include <svx/dialogs.hrc>
+#include <dialmgr.hxx>
+#include <cuires.hrc>
#include "eventdlg.hrc"
#include "helpid.hrc"
#include "selector.hxx"
@@ -71,21 +71,21 @@ using namespace ::com::sun::star;
SvxEventConfigPage::SvxEventConfigPage( Window *pParent, const SfxItemSet& rSet, SvxEventConfigPage::EarlyInit ) :
- _SvxMacroTabPage( pParent, SVX_RES(RID_SVXPAGE_EVENTS), rSet ),
- aSaveInText( this, SVX_RES( TXT_SAVEIN ) ),
- aSaveInListBox( this, SVX_RES( LB_SAVEIN ) ),
+ _SvxMacroTabPage( pParent, CUI_RES(RID_SVXPAGE_EVENTS), rSet ),
+ aSaveInText( this, CUI_RES( TXT_SAVEIN ) ),
+ aSaveInListBox( this, CUI_RES( LB_SAVEIN ) ),
bAppConfig ( TRUE )
{
- mpImpl->pStrEvent = new String( SVX_RES( STR_EVENT ));
- mpImpl->pAssignedMacro = new String( SVX_RES( STR_ASSMACRO ));
- mpImpl->pEventLB = new _HeaderTabListBox( this, SVX_RES( LB_EVENT ));
- mpImpl->pAssignFT = new FixedText( this, SVX_RES( FT_ASSIGN ));
- mpImpl->pAssignPB = new PushButton( this, SVX_RES( PB_ASSIGN ));
- mpImpl->pDeletePB = new PushButton( this, SVX_RES( PB_DELETE ));
- mpImpl->pMacroImg = new Image( SVX_RES( IMG_MACRO) );
- mpImpl->pComponentImg = new Image( SVX_RES( IMG_COMPONENT) );
- mpImpl->pMacroImg_h = new Image( SVX_RES( IMG_MACRO_H) );
- mpImpl->pComponentImg_h = new Image( SVX_RES( IMG_COMPONENT_H) );
+ mpImpl->pStrEvent = new String( CUI_RES( STR_EVENT ));
+ mpImpl->pAssignedMacro = new String( CUI_RES( STR_ASSMACRO ));
+ mpImpl->pEventLB = new _HeaderTabListBox( this, CUI_RES( LB_EVENT ));
+ mpImpl->pAssignFT = new FixedText( this, CUI_RES( FT_ASSIGN ));
+ mpImpl->pAssignPB = new PushButton( this, CUI_RES( PB_ASSIGN ));
+ mpImpl->pDeletePB = new PushButton( this, CUI_RES( PB_DELETE ));
+ mpImpl->pMacroImg = new Image( CUI_RES( IMG_MACRO) );
+ mpImpl->pComponentImg = new Image( CUI_RES( IMG_COMPONENT) );
+ mpImpl->pMacroImg_h = new Image( CUI_RES( IMG_MACRO_H) );
+ mpImpl->pComponentImg_h = new Image( CUI_RES( IMG_COMPONENT_H) );
FreeResource();
diff --git a/svx/source/cui/eventdlg.hrc b/cui/source/customize/eventdlg.hrc
index 245ff183313e..6340186d527c 100644
--- a/svx/source/cui/eventdlg.hrc
+++ b/cui/source/customize/eventdlg.hrc
@@ -32,7 +32,7 @@
////DF temp to figure out what's needed from these
//DF #include "sfx.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "macropg.hrc"
#define TXT_SAVEIN 10
diff --git a/svx/source/inc/eventdlg.hxx b/cui/source/customize/eventdlg.hxx
index 37fc58ea7639..37fc58ea7639 100644
--- a/svx/source/inc/eventdlg.hxx
+++ b/cui/source/customize/eventdlg.hxx
diff --git a/svx/source/cui/eventdlg.src b/cui/source/customize/eventdlg.src
index 8c16b8f45d56..8c16b8f45d56 100644
--- a/svx/source/cui/eventdlg.src
+++ b/cui/source/customize/eventdlg.src
diff --git a/svx/source/cui/macropg.cxx b/cui/source/customize/macropg.cxx
index bda5aca7372b..2bd9194b219b 100644
--- a/svx/source/cui/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -29,39 +29,31 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_cui.hxx"
#include <basic/basmgr.hxx>
-
#include "macropg.hxx"
#include <vcl/msgbox.hxx>
#define _SVSTDARR_STRINGSDTOR
-#include <svtools/svstdarr.hxx>
-#ifndef _SV_MEDIT_HXX
+#include <svl/svstdarr.hxx>
#include <svtools/svmedit.hxx>
-#endif
-#ifndef _EITEM_HXX
-#include <svtools/eitem.hxx>
-#endif
+#include <svl/eitem.hxx>
#include <tools/diagnose_ex.h>
-
#include <sfx2/app.hxx>
#include <sfx2/objsh.hxx>
#include <sfx2/macrconf.hxx>
#include <sfx2/sfxdefs.hxx>
-
#include <com/sun/star/container/NoSuchElementException.hpp>
#include <com/sun/star/lang/IllegalArgumentException.hpp>
-
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
#include "selector.hxx"
#include "cfg.hxx"
#include "macropg.hrc"
#include "helpid.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "headertablistbox.hxx"
#include "macropg_impl.hxx"
-
+#include <svx/dialogs.hrc> // RID_SVXPAGE_MACROASSIGN
#include <comphelper/namedvaluecollection.hxx>
#include <algorithm>
@@ -181,7 +173,7 @@ _HeaderTabListBox::_HeaderTabListBox( Window* pParent, const ResId& rId ) :
maListBox( this, WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP ),
maHeaderBar( this, WB_BUTTONSTYLE | WB_BOTTOMBORDER )
{
-// maListBox.SetWindowBits( WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP );
+ maListBox.SetHelpId( HID_MACRO_HEADERTABLISTBOX );
}
_HeaderTabListBox::~_HeaderTabListBox()
@@ -575,7 +567,7 @@ void _SvxMacroTabPage::DisplayAppEvents( bool appEvents)
}
::rtl::OUString eventURL = h_it->second.second;
- String displayName( SVX_RES( displayableEvent->nEventResourceID ) );
+ String displayName( CUI_RES( displayableEvent->nEventResourceID ) );
displayName += '\t';
SvLBoxEntry* _pE = rListBox.InsertEntry( displayName );
@@ -847,19 +839,19 @@ Any _SvxMacroTabPage::GetPropsByName( const ::rtl::OUString& eventName, EventsHa
}
SvxMacroTabPage::SvxMacroTabPage( Window* pParent, const Reference< frame::XFrame >& _rxDocumentFrame, const SfxItemSet& rSet, Reference< container::XNameReplace > xNameReplace, sal_uInt16 nSelectedIndex )
- : _SvxMacroTabPage( pParent, SVX_RES( RID_SVXPAGE_MACROASSIGN ), rSet )
+ : _SvxMacroTabPage( pParent, CUI_RES( RID_SVXPAGE_MACROASSIGN ), rSet )
{
- mpImpl->pStrEvent = new String( SVX_RES( STR_EVENT ) );
- mpImpl->pAssignedMacro = new String( SVX_RES( STR_ASSMACRO ) );
- mpImpl->pEventLB = new _HeaderTabListBox( this, SVX_RES( LB_EVENT ) );
- mpImpl->pAssignFT = new FixedText( this, SVX_RES( FT_ASSIGN ) );
- mpImpl->pAssignPB = new PushButton( this, SVX_RES( PB_ASSIGN ) );
- mpImpl->pDeletePB = new PushButton( this, SVX_RES( PB_DELETE ) );
- mpImpl->pAssignComponentPB = new PushButton( this, SVX_RES( PB_ASSIGN_COMPONENT ) );
- mpImpl->pMacroImg = new Image( SVX_RES(IMG_MACRO) );
- mpImpl->pComponentImg = new Image( SVX_RES(IMG_COMPONENT) );
- mpImpl->pMacroImg_h = new Image( SVX_RES(IMG_MACRO_H) );
- mpImpl->pComponentImg_h = new Image( SVX_RES(IMG_COMPONENT_H) );
+ mpImpl->pStrEvent = new String( CUI_RES( STR_EVENT ) );
+ mpImpl->pAssignedMacro = new String( CUI_RES( STR_ASSMACRO ) );
+ mpImpl->pEventLB = new _HeaderTabListBox( this, CUI_RES( LB_EVENT ) );
+ mpImpl->pAssignFT = new FixedText( this, CUI_RES( FT_ASSIGN ) );
+ mpImpl->pAssignPB = new PushButton( this, CUI_RES( PB_ASSIGN ) );
+ mpImpl->pDeletePB = new PushButton( this, CUI_RES( PB_DELETE ) );
+ mpImpl->pAssignComponentPB = new PushButton( this, CUI_RES( PB_ASSIGN_COMPONENT ) );
+ mpImpl->pMacroImg = new Image( CUI_RES(IMG_MACRO) );
+ mpImpl->pComponentImg = new Image( CUI_RES(IMG_COMPONENT) );
+ mpImpl->pMacroImg_h = new Image( CUI_RES(IMG_MACRO_H) );
+ mpImpl->pComponentImg_h = new Image( CUI_RES(IMG_COMPONENT_H) );
FreeResource();
@@ -927,12 +919,12 @@ IMPL_LINK(AssignComponentDialog, ButtonHandler, Button *, EMPTYARG)
}
AssignComponentDialog::AssignComponentDialog( Window * pParent, const ::rtl::OUString& rURL )
- : ModalDialog( pParent, SVX_RES( RID_SVXDLG_ASSIGNCOMPONENT ) )
- , maMethodLabel( this, SVX_RES( FT_METHOD ) )
- , maMethodEdit( this, SVX_RES( EDIT_METHOD ) )
- , maOKButton( this, SVX_RES( RID_PB_OK ) )
- , maCancelButton( this, SVX_RES( RID_PB_CANCEL ) )
- , maHelpButton( this, SVX_RES( RID_PB_HELP ) )
+ : ModalDialog( pParent, CUI_RES( RID_SVXDLG_ASSIGNCOMPONENT ) )
+ , maMethodLabel( this, CUI_RES( FT_METHOD ) )
+ , maMethodEdit( this, CUI_RES( EDIT_METHOD ) )
+ , maOKButton( this, CUI_RES( RID_PB_OK ) )
+ , maCancelButton( this, CUI_RES( RID_PB_CANCEL ) )
+ , maHelpButton( this, CUI_RES( RID_PB_HELP ) )
, maURL( rURL )
{
FreeResource();
diff --git a/svx/source/cui/macropg.hrc b/cui/source/customize/macropg.hrc
index ccf348d0cee0..ccf348d0cee0 100644
--- a/svx/source/cui/macropg.hrc
+++ b/cui/source/customize/macropg.hrc
diff --git a/svx/source/cui/macropg.src b/cui/source/customize/macropg.src
index 92e1e718ba61..c5db4bab6af7 100644
--- a/svx/source/cui/macropg.src
+++ b/cui/source/customize/macropg.src
@@ -30,8 +30,9 @@
#include <sfx2/sfx.hrc>
#include "macropg.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "helpid.hrc"
+#include <svx/dialogs.hrc>
#define MASKCOLOR MaskColor = \
Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };
diff --git a/svx/source/inc/macropg_impl.hxx b/cui/source/customize/macropg_impl.hxx
index 0563c2e05151..0563c2e05151 100644
--- a/svx/source/inc/macropg_impl.hxx
+++ b/cui/source/customize/macropg_impl.hxx
diff --git a/svtools/source/items/makefile.mk b/cui/source/customize/makefile.mk
index 651e54bb7e23..f4c9303cc6ba 100644..100755
--- a/svtools/source/items/makefile.mk
+++ b/cui/source/customize/makefile.mk
@@ -1,14 +1,14 @@
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+#
# Copyright 2008 by Sun Microsystems, Inc.
#
# OpenOffice.org - a multi-platform office productivity suite
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.13 $
+# $Revision: 1.65 $
#
# This file is part of OpenOffice.org.
#
@@ -28,38 +28,40 @@
# for a copy of the LGPLv3 License.
#
#*************************************************************************
-
PRJ=..$/..
-PRJNAME=svtools
-TARGET=items
+PRJNAME=cui
+TARGET=customize
ENABLE_EXCEPTIONS=TRUE
# --- Settings -----------------------------------------------------
.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/svt.pmk
+.INCLUDE : $(PRJ)$/util$/makefile.pmk
+
+.IF "$(ENABLE_LAYOUT)" == "TRUE"
+CFLAGS+= -DENABLE_LAYOUT=1 -I../$(PRJ)/layout/inc -I../$(PRJ)/layout/$(INPATH)/inc
+.ENDIF # ENABLE_LAYOUT == TRUE
# --- Files --------------------------------------------------------
-SLOFILES=\
- $(SLO)$/aeitem.obj \
- $(SLO)$/eitem.obj \
- $(SLO)$/flagitem.obj \
- $(SLO)$/globalnameitem.obj \
- $(SLO)$/imageitm.obj \
- $(SLO)$/intitem.obj \
- $(SLO)$/itemdel.obj \
- $(SLO)$/macitem.obj \
- $(SLO)$/poolcach.obj \
- $(SLO)$/ptitem.obj \
- $(SLO)$/rectitem.obj \
- $(SLO)$/rngitem.obj \
- $(SLO)$/stritem.obj \
- $(SLO)$/style.obj \
- $(SLO)$/szitem.obj \
- $(SLO)$/wallitem.obj
+SRS1NAME=customize
+SRC1FILES = \
+ acccfg.src \
+ cfg.src \
+ eventdlg.src \
+ macropg.src \
+ selector.src \
+
+
+SLOFILES+=\
+ $(SLO)$/acccfg.obj \
+ $(SLO)$/cfg.obj \
+ $(SLO)$/cfgutil.obj \
+ $(SLO)$/eventdlg.obj \
+ $(SLO)$/macropg.obj \
+ $(SLO)$/selector.obj \
+
# --- Targets -------------------------------------------------------
.INCLUDE : target.mk
-
diff --git a/svx/source/cui/selector.cxx b/cui/source/customize/selector.cxx
index 83e4aa2b1612..4379c1287d70 100644
--- a/svx/source/cui/selector.cxx
+++ b/cui/source/customize/selector.cxx
@@ -29,20 +29,16 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_cui.hxx"
#include <vcl/help.hxx>
-#ifndef _MSGBOX_HXX //autogen
#include <vcl/msgbox.hxx>
-#endif
#include <vcl/metric.hxx>
-
#include "selector.hxx"
-#include <svx/dialmgr.hxx>
-
+#include <dialmgr.hxx>
#include "selector.hrc"
-#include "fmresids.hrc"
-#include <svx/dialogs.hrc>
-
+#include <svx/fmresids.hrc> // for RID_SVXIMG_...
+#include <svx/dialmgr.hxx> // for RID_SVXIMG_...
+#include <cuires.hrc>
#include <sfx2/app.hxx>
#include <sfx2/msg.hxx>
#include <sfx2/msgpool.hxx>
@@ -55,7 +51,6 @@
#include <comphelper/processfactory.hxx>
#include <comphelper/componentcontext.hxx>
-/** === begin UNO includes === **/
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/script/provider/XScriptProviderSupplier.hpp>
#include <com/sun/star/script/provider/XScriptProvider.hpp>
@@ -72,7 +67,6 @@
#include <com/sun/star/frame/XDispatchInformationProvider.hpp>
#include <com/sun/star/frame/DispatchInformation.hpp>
#include <com/sun/star/container/XChild.hpp>
-/** === end UNO includes === **/
using ::rtl::OUString;
using namespace ::com::sun::star;
@@ -83,7 +77,7 @@ using namespace ::com::sun::star::document;
using namespace ::com::sun::star::container;
#define _SVSTDARR_STRINGSDTOR
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
#include <svtools/imagemgr.hxx>
#include <tools/urlobj.hxx>
#include <tools/diagnose_ex.h>
@@ -621,7 +615,7 @@ void SvxConfigGroupListBox_Impl::Init()
new SvxGroupInfo_Impl( SVX_CFGGROUP_SCRIPTCONTAINER, 0, rootNode );
String aTitle =
- String( SVX_RES( STR_SELECTOR_MACROS ) );
+ String( CUI_RES( STR_SELECTOR_MACROS ) );
SvLBoxEntry *pNewEntry = InsertEntry( aTitle, NULL );
pNewEntry->SetUserData( pInfo );
@@ -1013,21 +1007,21 @@ void SvxConfigGroupListBox_Impl::RequestingChilds( SvLBoxEntry *pEntry )
SvxScriptSelectorDialog::SvxScriptSelectorDialog(
Window* pParent, BOOL bShowSlots, const Reference< frame::XFrame >& xFrame )
:
- ModelessDialog( pParent, SVX_RES( RID_DLG_SCRIPTSELECTOR ) ),
- aDialogDescription( this, SVX_RES( TXT_SELECTOR_DIALOG_DESCRIPTION ) ),
- aGroupText( this, SVX_RES( TXT_SELECTOR_CATEGORIES ) ),
- aCategories( this, SVX_RES( BOX_SELECTOR_CATEGORIES ), bShowSlots, xFrame ),
- aFunctionText( this, SVX_RES( TXT_SELECTOR_COMMANDS ) ),
- aCommands( this, SVX_RES( BOX_SELECTOR_COMMANDS ) ),
- aOKButton( this, SVX_RES( BTN_SELECTOR_OK ) ),
- aCancelButton( this, SVX_RES( BTN_SELECTOR_CANCEL ) ),
- aHelpButton( this, SVX_RES( BTN_SELECTOR_HELP ) ),
- aDescription( this, SVX_RES( GRP_SELECTOR_DESCRIPTION ) ),
- aDescriptionText( this, SVX_RES( TXT_SELECTOR_DESCRIPTION ) ),
+ ModelessDialog( pParent, CUI_RES( RID_DLG_SCRIPTSELECTOR ) ),
+ aDialogDescription( this, CUI_RES( TXT_SELECTOR_DIALOG_DESCRIPTION ) ),
+ aGroupText( this, CUI_RES( TXT_SELECTOR_CATEGORIES ) ),
+ aCategories( this, CUI_RES( BOX_SELECTOR_CATEGORIES ), bShowSlots, xFrame ),
+ aFunctionText( this, CUI_RES( TXT_SELECTOR_COMMANDS ) ),
+ aCommands( this, CUI_RES( BOX_SELECTOR_COMMANDS ) ),
+ aOKButton( this, CUI_RES( BTN_SELECTOR_OK ) ),
+ aCancelButton( this, CUI_RES( BTN_SELECTOR_CANCEL ) ),
+ aHelpButton( this, CUI_RES( BTN_SELECTOR_HELP ) ),
+ aDescription( this, CUI_RES( GRP_SELECTOR_DESCRIPTION ) ),
+ aDescriptionText( this, CUI_RES( TXT_SELECTOR_DESCRIPTION ) ),
m_bShowSlots( bShowSlots )
{
- ResMgr& rMgr = DIALOG_MGR();
+ ResMgr& rMgr = CUI_MGR();
// If we are showing Slot API commands update labels in the UI, and
// enable drag'n'drop
@@ -1214,7 +1208,7 @@ IMPL_LINK( SvxScriptSelectorDialog, ClickHdl, Button *, pButton )
void
SvxScriptSelectorDialog::SetRunLabel()
{
- aOKButton.SetText( String( SVX_RES( STR_SELECTOR_RUN ) ) );
+ aOKButton.SetText( String( CUI_RES( STR_SELECTOR_RUN ) ) );
}
void
diff --git a/svx/source/cui/selector.hrc b/cui/source/customize/selector.hrc
index 68c87b493593..68c87b493593 100644
--- a/svx/source/cui/selector.hrc
+++ b/cui/source/customize/selector.hrc
diff --git a/svx/source/cui/selector.src b/cui/source/customize/selector.src
index de972cdebc01..3985975fb4cf 100644
--- a/svx/source/cui/selector.src
+++ b/cui/source/customize/selector.src
@@ -28,7 +28,7 @@
*
************************************************************************/
#include "helpid.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "selector.hrc"
#define MASKCOLOR MaskColor = \
diff --git a/svx/source/cui/SpellAttrib.cxx b/cui/source/dialogs/SpellAttrib.cxx
index 3614c40c1370..9c26dc321f7b 100644
--- a/svx/source/cui/SpellAttrib.cxx
+++ b/cui/source/dialogs/SpellAttrib.cxx
@@ -29,11 +29,8 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_cui.hxx"
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
#include <SpellAttrib.hxx>
#include <vcl/font.hxx>
#include <com/sun/star/uno/Reference.hxx>
diff --git a/svx/source/cui/SpellAttrib.hxx b/cui/source/dialogs/SpellAttrib.hxx
index ac2bb278c594..ac2bb278c594 100644
--- a/svx/source/cui/SpellAttrib.hxx
+++ b/cui/source/dialogs/SpellAttrib.hxx
diff --git a/svx/source/cui/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index 86dbf966619a..0e69585a4ff4 100644
--- a/svx/source/cui/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -29,11 +29,7 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
// include ---------------------------------------------------------------
@@ -42,22 +38,18 @@
#include <vcl/wrkwin.hxx>
#include <vcl/menu.hxx>
#include <vcl/msgbox.hxx>
-#ifndef _SCRBAR_HXX //autogen
#include <vcl/scrbar.hxx>
-#endif
#include <SpellAttrib.hxx>
#include <sfx2/dispatch.hxx>
#include <sfx2/bindings.hxx>
-#include <svtools/undo.hxx>
-#include <svtools/lingucfg.hxx>
+#include <svl/undo.hxx>
+#include <unotools/lingucfg.hxx>
#include <svtools/textdata.hxx>
#include <svtools/filter.hxx>
-#include <unolingu.hxx>
+#include <svx/unolingu.hxx>
#include <svx/splwrap.hxx>
#include <linguistic/lngprops.hxx>
-#ifndef _LINGUISTIC_MISC_HHX_
#include <linguistic/misc.hxx>
-#endif
#include <comphelper/processfactory.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
@@ -68,22 +60,18 @@
#include <vcl/help.hxx>
#include <vcl/graph.hxx>
#include <osl/file.hxx>
-#include <impgrf.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/impgrf.hxx>
+#include <cuires.hrc>
#include <helpid.hrc>
#include "SpellDialog.hrc"
-
-
-
-#include "optitems.hxx"
+#include <svx/optitems.hxx>
#include <svx/svxenum.hxx>
#include <svx/SpellDialogChildWindow.hxx>
#include "SpellDialog.hxx"
-//#include <svx/splwrap.hxx> // Der Wrapper
-#include "dlgutil.hxx" // language
-#include <svx/optlingu.hxx>
-#include <svx/dialmgr.hxx>
-#include "svxerr.hxx"
+#include <svx/dlgutil.hxx>
+#include "optlingu.hxx"
+#include <dialmgr.hxx>
+#include <svx/svxerr.hxx>
#include "treeopt.hxx"
using namespace ::com::sun::star;
@@ -216,43 +204,43 @@ SpellDialog::SpellDialog(
: SfxModelessDialog (_pBindings,
pChildWindow,
pParent,
- SVX_RES(RID_SVXDLG_SPELLCHECK)),
-
- aVendorImageFI ( this , SVX_RES( IMG_VENDOR ) ),
- aLanguageFT ( this, SVX_RES( FT_LANGUAGE ) ),
- aLanguageLB ( this, SVX_RES( LB_LANGUAGE ) ),
- aNotInDictFT ( this, SVX_RES( FT_NOTINDICT ) ),
- aSentenceED ( this, SVX_RES( ED_NEWWORD ) ),
- aSuggestionFT ( this, SVX_RES( FT_SUGGESTION ) ),
- aSuggestionLB ( this, SVX_RES( LB_SUGGESTION ) ),
-
- aIgnorePB ( this, SVX_RES( PB_IGNORE ) ),
- aIgnoreAllPB ( this, SVX_RES( PB_IGNOREALL ) ),
- aIgnoreRulePB ( this, SVX_RES( PB_IGNORERULE ) ),
- aAddToDictMB ( this, SVX_RES( MB_ADDTODICT ) ),
-
- aChangePB ( this, SVX_RES( PB_CHANGE ) ),
- aChangeAllPB ( this, SVX_RES( PB_CHANGEALL ) ),
- aExplainPB ( this, SVX_RES( PB_EXPLAIN) ),
- aAutoCorrPB ( this, SVX_RES( PB_AUTOCORR ) ),
-
- aCheckGrammarCB ( this, SVX_RES( CB_CHECK_GRAMMAR ) ),
-
- aHelpPB ( this, SVX_RES( PB_HELP ) ),
- aOptionsPB ( this, SVX_RES( PB_OPTIONS ) ),
- aUndoPB ( this, SVX_RES( PB_UNDO ) ),
- aClosePB ( this, SVX_RES( PB_CLOSE ) ),
- aBackgroundGB ( this, SVX_RES( GB_BACKGROUND ) ),
-
- aVendorImage ( SVX_RES( IMG_DEFAULT_VENDOR ) ),
- aVendorImageHC ( SVX_RES( IMG_DEFAULT_VENDOR_HC ) ),
-
- aResumeST ( SVX_RES(ST_RESUME )),
+ CUI_RES(RID_SVXDLG_SPELLCHECK)),
+
+ aVendorImageFI ( this , CUI_RES( IMG_VENDOR ) ),
+ aLanguageFT ( this, CUI_RES( FT_LANGUAGE ) ),
+ aLanguageLB ( this, CUI_RES( LB_LANGUAGE ) ),
+ aNotInDictFT ( this, CUI_RES( FT_NOTINDICT ) ),
+ aSentenceED ( this, CUI_RES( ED_NEWWORD ) ),
+ aSuggestionFT ( this, CUI_RES( FT_SUGGESTION ) ),
+ aSuggestionLB ( this, CUI_RES( LB_SUGGESTION ) ),
+
+ aIgnorePB ( this, CUI_RES( PB_IGNORE ) ),
+ aIgnoreAllPB ( this, CUI_RES( PB_IGNOREALL ) ),
+ aIgnoreRulePB ( this, CUI_RES( PB_IGNORERULE ) ),
+ aAddToDictMB ( this, CUI_RES( MB_ADDTODICT ) ),
+
+ aChangePB ( this, CUI_RES( PB_CHANGE ) ),
+ aChangeAllPB ( this, CUI_RES( PB_CHANGEALL ) ),
+ aExplainPB ( this, CUI_RES( PB_EXPLAIN) ),
+ aAutoCorrPB ( this, CUI_RES( PB_AUTOCORR ) ),
+
+ aCheckGrammarCB ( this, CUI_RES( CB_CHECK_GRAMMAR ) ),
+
+ aHelpPB ( this, CUI_RES( PB_HELP ) ),
+ aOptionsPB ( this, CUI_RES( PB_OPTIONS ) ),
+ aUndoPB ( this, CUI_RES( PB_UNDO ) ),
+ aClosePB ( this, CUI_RES( PB_CLOSE ) ),
+ aBackgroundGB ( this, CUI_RES( GB_BACKGROUND ) ),
+
+ aVendorImage ( CUI_RES( IMG_DEFAULT_VENDOR ) ),
+ aVendorImageHC ( CUI_RES( IMG_DEFAULT_VENDOR_HC ) ),
+
+ aResumeST ( CUI_RES(ST_RESUME )),
aIgnoreOnceST ( aIgnorePB.GetText()),
- aNoSuggestionsST( SVX_RES(ST_NOSUGGESTIONS)),
- m_sTitleSpelling ( SVX_RES( ST_SPELLING ) ),
- m_sTitleSpellingGrammar ( SVX_RES( ST_SPELLING_AND_GRAMMAR ) ),
- m_sTitleSpellingGrammarVendor ( SVX_RES( ST_SPELLING_AND_GRAMMAR_VENDORNAME ) ),
+ aNoSuggestionsST( CUI_RES(ST_NOSUGGESTIONS)),
+ m_sTitleSpelling ( CUI_RES( ST_SPELLING ) ),
+ m_sTitleSpellingGrammar ( CUI_RES( ST_SPELLING_AND_GRAMMAR ) ),
+ m_sTitleSpellingGrammarVendor ( CUI_RES( ST_SPELLING_AND_GRAMMAR_VENDORNAME ) ),
aDialogUndoLink( LINK (this, SpellDialog, DialogUndoHdl)),
bModified( false ),
bFocusLocked( true ),
diff --git a/svx/source/cui/SpellDialog.hrc b/cui/source/dialogs/SpellDialog.hrc
index f571525a25db..f571525a25db 100644
--- a/svx/source/cui/SpellDialog.hrc
+++ b/cui/source/dialogs/SpellDialog.hrc
diff --git a/svx/source/cui/SpellDialog.src b/cui/source/dialogs/SpellDialog.src
index f7cccd5febc2..61ef8b4e6ab2 100644
--- a/svx/source/cui/SpellDialog.src
+++ b/cui/source/dialogs/SpellDialog.src
@@ -28,7 +28,7 @@
*
************************************************************************/
// include ---------------------------------------------------------------
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "helpid.hrc"
#include "SpellDialog.hrc"
// pragma ----------------------------------------------------------------
diff --git a/svx/source/cui/charmap.hrc b/cui/source/dialogs/charmap.hrc
index 49dae5c98f06..49dae5c98f06 100644
--- a/svx/source/cui/charmap.hrc
+++ b/cui/source/dialogs/charmap.hrc
diff --git a/svx/source/cui/charmap.src b/cui/source/dialogs/charmap.src
index 8b93fe850887..c8b1030cb328 100644
--- a/svx/source/cui/charmap.src
+++ b/cui/source/dialogs/charmap.src
@@ -29,10 +29,11 @@
************************************************************************/
// include ---------------------------------------------------------------
-#include <svx/svxids.hrc>
-#include <svx/dialogs.hrc>
+
+#include <cuires.hrc>
#include "charmap.hrc"
#include "helpid.hrc"
+#include <svx/dialogs.hrc> // for RID_SVXDLG_CHARMAP
// RID_SVXDLG_CHARMAP ----------------------------------------------------
ModalDialog RID_SVXDLG_CHARMAP
diff --git a/svx/source/cui/commonlingui.cxx b/cui/source/dialogs/commonlingui.cxx
index 161e1e2bf206..4f2ab5677b63 100644
--- a/svx/source/cui/commonlingui.cxx
+++ b/cui/source/dialogs/commonlingui.cxx
@@ -29,13 +29,11 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_cui.hxx"
#include "commonlingui.hxx"
-#ifndef _SVX_DIALOGS_HRC
-#include <svx/dialogs.hrc>
-#endif
-#include <svx/dialmgr.hxx>
+#include <cuires.hrc>
+#include <dialmgr.hxx>
#include <vcl/decoview.hxx>
#include "hangulhanjadlg.hrc"
@@ -92,21 +90,21 @@ __EXPORT SvxClickInfoCtr::~SvxClickInfoCtr()
//=============================================================================
//-----------------------------------------------------------------------------
SvxCommonLinguisticControl::SvxCommonLinguisticControl( ModalDialog* _pParent )
- :Window( _pParent, SVX_RES( RID_SVX_WND_COMMON_LINGU ) )
- ,aWordText ( this, SVX_RES( FT_WORD ) )
- ,aAktWord ( this, SVX_RES( FT_AKTWORD ) )
- ,aNewWord ( this, SVX_RES( FT_NEWWORD ) )
- ,aNewWordED ( this, SVX_RES( ED_NEWWORD ) )
- ,aSuggestionFT ( this, SVX_RES( FT_SUGGESTION ) )
- ,aIgnoreBtn ( this, SVX_RES( BTN_IGNORE ) )
- ,aIgnoreAllBtn ( this, SVX_RES( BTN_IGNOREALL ) )
- ,aChangeBtn ( this, SVX_RES( BTN_CHANGE ) )
- ,aChangeAllBtn ( this, SVX_RES( BTN_CHANGEALL ) )
- ,aOptionsBtn ( this, SVX_RES( BTN_OPTIONS ) )
- ,aStatusText ( this, SVX_RES( FT_STATUS ) )
- ,aHelpBtn ( this, SVX_RES( BTN_SPL_HELP ) )
- ,aCancelBtn ( this, SVX_RES( BTN_SPL_CANCEL ) )
- ,aAuditBox ( this, SVX_RES( GB_AUDIT ) )
+ :Window( _pParent, CUI_RES( RID_SVX_WND_COMMON_LINGU ) )
+ ,aWordText ( this, CUI_RES( FT_WORD ) )
+ ,aAktWord ( this, CUI_RES( FT_AKTWORD ) )
+ ,aNewWord ( this, CUI_RES( FT_NEWWORD ) )
+ ,aNewWordED ( this, CUI_RES( ED_NEWWORD ) )
+ ,aSuggestionFT ( this, CUI_RES( FT_SUGGESTION ) )
+ ,aIgnoreBtn ( this, CUI_RES( BTN_IGNORE ) )
+ ,aIgnoreAllBtn ( this, CUI_RES( BTN_IGNOREALL ) )
+ ,aChangeBtn ( this, CUI_RES( BTN_CHANGE ) )
+ ,aChangeAllBtn ( this, CUI_RES( BTN_CHANGEALL ) )
+ ,aOptionsBtn ( this, CUI_RES( BTN_OPTIONS ) )
+ ,aStatusText ( this, CUI_RES( FT_STATUS ) )
+ ,aHelpBtn ( this, CUI_RES( BTN_SPL_HELP ) )
+ ,aCancelBtn ( this, CUI_RES( BTN_SPL_CANCEL ) )
+ ,aAuditBox ( this, CUI_RES( GB_AUDIT ) )
{
FreeResource();
diff --git a/svx/source/cui/commonlingui.hxx b/cui/source/dialogs/commonlingui.hxx
index d1781e83348f..d1781e83348f 100644
--- a/svx/source/cui/commonlingui.hxx
+++ b/cui/source/dialogs/commonlingui.hxx
diff --git a/svx/source/cui/commonlingui.src b/cui/source/dialogs/commonlingui.src
index c229953ad3c8..1a58a9ef7fa8 100644
--- a/svx/source/cui/commonlingui.src
+++ b/cui/source/dialogs/commonlingui.src
@@ -28,7 +28,7 @@
*
************************************************************************/
// include ---------------------------------------------------------------
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "helpid.hrc"
#include "hangulhanjadlg.hrc"
diff --git a/svx/source/cui/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx
index 4de8df0e7d7d..83dc06e606a3 100644
--- a/svx/source/cui/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -26,11 +26,7 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
// include ---------------------------------------------------------------
@@ -43,41 +39,40 @@
#include <vcl/svapp.hxx>
#include <vcl/msgbox.hxx>
#include <svtools/colorcfg.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/eitem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/stritem.hxx>
+#include <svl/itempool.hxx>
#include <rtl/textenc.h>
#include <svx/ucsubset.hxx>
-#include <svx/dialogs.hrc>
-#include <svx/dialmgr.hxx>
+#include <cuires.hrc>
+#include <dialmgr.hxx>
#include "cuicharmap.hxx"
#include <sfx2/request.hxx>
#include <sfx2/sfxsids.hrc>
#include <sfx2/app.hxx>
-#include <fontitem.hxx>
+#include <svx/fontitem.hxx>
#include "charmap.hrc"
#include "macroass.hxx"
// class SvxCharacterMap =================================================
SvxCharacterMap::SvxCharacterMap( Window* pParent, BOOL bOne, const SfxItemSet* pSet ) :
- SfxModalDialog( pParent, SVX_RES( RID_SVXDLG_CHARMAP ) ),
+ SfxModalDialog( pParent, CUI_RES( RID_SVXDLG_CHARMAP ) ),
mpCharMapData( 0 )
{
SFX_ITEMSET_ARG( pSet, pItem, SfxBoolItem, FN_PARAM_1, FALSE );
if ( pItem )
bOne = pItem->GetValue();
- mpCharMapData = new SvxCharMapData( this, bOne, &DIALOG_MGR() );
+ mpCharMapData = new SvxCharMapData( this, bOne, &CUI_MGR() );
SFX_ITEMSET_ARG( pSet, pCharItem, SfxInt32Item, SID_ATTR_CHAR, FALSE );
if ( pCharItem )
SetChar( pCharItem->GetValue() );
-
SFX_ITEMSET_ARG( pSet, pDisableItem, SfxBoolItem, FN_PARAM_2, FALSE );
if ( pDisableItem && pDisableItem->GetValue() )
DisableFontSelection();
@@ -571,7 +566,7 @@ IMPL_LINK( SvxCharMapData, DeleteHdl, PushButton *, EMPTYARG )
#include <sfx2/objsh.hxx>
#include <vcl/msgbox.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
IMPL_LINK( SvxCharMapData, AssignHdl, PushButton *, EMPTYARG )
{
diff --git a/svx/source/cui/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx
index b0c80f8297ef..7411224a0f93 100644
--- a/svx/source/cui/cuifmsearch.cxx
+++ b/cui/source/dialogs/cuifmsearch.cxx
@@ -29,43 +29,27 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_cui.hxx"
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
-
-#ifndef _SVX_FMRESIDS_HRC
-#include "fmresids.hrc"
-#endif // _SVX_FMRESIDS_HRC
#include <tools/debug.hxx>
#include <vcl/msgbox.hxx>
-
-
#include <vcl/svapp.hxx>
#include <tools/shl.hxx>
-#include <svx/dialmgr.hxx>
-
-#include <sfx2/tabdlg.hxx> //add by CHINA001 for SfxItemSet
+#include <dialmgr.hxx>
+#include <sfx2/tabdlg.hxx>
#include <osl/mutex.hxx>
#include <sfx2/app.hxx>
-#ifndef _SVX_DIALOGS_HRC
-#include <svx/dialogs.hrc>
-#endif
-#include <svtools/filerec.hxx>
-#include "fmsrcimp.hxx"
-#include "fmsrccfg.hxx"
-
-#ifndef _FMSEARCH_HRC
+#include <cuires.hrc>
+#include <svl/filerec.hxx>
+#include <svx/fmsrccfg.hxx>
+#include <svx/fmsrcimp.hxx>
#include "fmsearch.hrc"
-#endif // _FMSEARCH_HRC
#include "cuifmsearch.hxx"
-#include "srchdlg.hxx"
-#include <svtools/cjkoptions.hxx>
+#include <svx/srchdlg.hxx>
+#include <svl/cjkoptions.hxx>
#include <com/sun/star/i18n/TransliterationModules.hpp>
#include <comphelper/processfactory.hxx>
-
-#include <svx/svxdlg.hxx> //CHINA001
+#include <svx/svxdlg.hxx>
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::i18n;
@@ -114,39 +98,39 @@ void FmSearchDialog::initCommon( const Reference< XResultSet >& _rxCursor )
//------------------------------------------------------------------------
FmSearchDialog::FmSearchDialog(Window* pParent, const UniString& sInitialText, const ::std::vector< String >& _rContexts, sal_Int16 nInitialContext,
const Link& lnkContextSupplier)
- :ModalDialog(pParent, SVX_RES(RID_SVXDLG_SEARCHFORM))
- ,m_flSearchFor (this, SVX_RES(FL_SEARCHFOR))
- ,m_rbSearchForText (this, SVX_RES(RB_SEARCHFORTEXT))
- ,m_rbSearchForNull (this, SVX_RES(RB_SEARCHFORNULL))
- ,m_rbSearchForNotNull (this, SVX_RES(RB_SEARCHFORNOTNULL))
- ,m_cmbSearchText (this, SVX_RES(CMB_SEARCHTEXT))
- ,m_flWhere (this, SVX_RES(FL_WHERE))
- ,m_ftForm (this, SVX_RES(FT_FORM))
- ,m_lbForm (this, SVX_RES(LB_FORM))
- ,m_rbAllFields (this, SVX_RES(RB_ALLFIELDS))
- ,m_rbSingleField (this, SVX_RES(RB_SINGLEFIELD))
- ,m_lbField (this, SVX_RES(LB_FIELD))
- ,m_flOptions (this, SVX_RES(FL_OPTIONS))
- ,m_ftPosition (this, SVX_RES(FT_POSITION))
- ,m_lbPosition (this, SVX_RES(LB_POSITION))
- ,m_cbUseFormat (this, SVX_RES(CB_USEFORMATTER))
- ,m_cbCase (this, SVX_RES(CB_CASE))
- ,m_cbBackwards (this, SVX_RES(CB_BACKWARD))
- ,m_cbStartOver (this, SVX_RES(CB_STARTOVER))
- ,m_cbWildCard (this, SVX_RES(CB_WILDCARD))
- ,m_cbRegular (this, SVX_RES(CB_REGULAR))
- ,m_cbApprox (this, SVX_RES(CB_APPROX))
- ,m_pbApproxSettings (this, SVX_RES(PB_APPROXSETTINGS))
- ,m_aHalfFullFormsCJK (this, SVX_RES(CB_HALFFULLFORMS))
- ,m_aSoundsLikeCJK (this, SVX_RES(CB_SOUNDSLIKECJK))
- ,m_aSoundsLikeCJKSettings (this, SVX_RES(PB_SOUNDSLIKESETTINGS))
- ,m_flState (this, SVX_RES(FL_STATE))
- ,m_ftRecordLabel (this, SVX_RES(FT_RECORDLABEL))
- ,m_ftRecord (this, SVX_RES(FT_RECORD))
- ,m_ftHint (this, SVX_RES(FT_HINT))
- ,m_pbSearchAgain (this, SVX_RES(PB_SEARCH))
- ,m_pbClose (this, SVX_RES(1))
- ,m_pbHelp (this, SVX_RES(1))
+ :ModalDialog(pParent, CUI_RES(RID_SVXDLG_SEARCHFORM))
+ ,m_flSearchFor (this, CUI_RES(FL_SEARCHFOR))
+ ,m_rbSearchForText (this, CUI_RES(RB_SEARCHFORTEXT))
+ ,m_rbSearchForNull (this, CUI_RES(RB_SEARCHFORNULL))
+ ,m_rbSearchForNotNull (this, CUI_RES(RB_SEARCHFORNOTNULL))
+ ,m_cmbSearchText (this, CUI_RES(CMB_SEARCHTEXT))
+ ,m_flWhere (this, CUI_RES(FL_WHERE))
+ ,m_ftForm (this, CUI_RES(FT_FORM))
+ ,m_lbForm (this, CUI_RES(LB_FORM))
+ ,m_rbAllFields (this, CUI_RES(RB_ALLFIELDS))
+ ,m_rbSingleField (this, CUI_RES(RB_SINGLEFIELD))
+ ,m_lbField (this, CUI_RES(LB_FIELD))
+ ,m_flOptions (this, CUI_RES(FL_OPTIONS))
+ ,m_ftPosition (this, CUI_RES(FT_POSITION))
+ ,m_lbPosition (this, CUI_RES(LB_POSITION))
+ ,m_cbUseFormat (this, CUI_RES(CB_USEFORMATTER))
+ ,m_cbCase (this, CUI_RES(CB_CASE))
+ ,m_cbBackwards (this, CUI_RES(CB_BACKWARD))
+ ,m_cbStartOver (this, CUI_RES(CB_STARTOVER))
+ ,m_cbWildCard (this, CUI_RES(CB_WILDCARD))
+ ,m_cbRegular (this, CUI_RES(CB_REGULAR))
+ ,m_cbApprox (this, CUI_RES(CB_APPROX))
+ ,m_pbApproxSettings (this, CUI_RES(PB_APPROXSETTINGS))
+ ,m_aHalfFullFormsCJK (this, CUI_RES(CB_HALFFULLFORMS))
+ ,m_aSoundsLikeCJK (this, CUI_RES(CB_SOUNDSLIKECJK))
+ ,m_aSoundsLikeCJKSettings (this, CUI_RES(PB_SOUNDSLIKESETTINGS))
+ ,m_flState (this, CUI_RES(FL_STATE))
+ ,m_ftRecordLabel (this, CUI_RES(FT_RECORDLABEL))
+ ,m_ftRecord (this, CUI_RES(FT_RECORD))
+ ,m_ftHint (this, CUI_RES(FT_HINT))
+ ,m_pbSearchAgain (this, CUI_RES(PB_SEARCH))
+ ,m_pbClose (this, CUI_RES(1))
+ ,m_pbHelp (this, CUI_RES(1))
,m_sSearch ( m_pbSearchAgain.GetText() )
,m_sCancel ( Button::GetStandardText( BUTTON_CANCEL ) )
,m_pPreSearchFocus( NULL )
@@ -295,7 +279,7 @@ void FmSearchDialog::Init(const UniString& strVisibleFields, const UniString& sI
RID_STR_SEARCH_WHOLE
};
for ( size_t i=0; i<sizeof(nResIds)/sizeof(nResIds[0]); ++i )
- m_lbPosition.InsertEntry( String( SVX_RES( nResIds[i] ) ) );
+ m_lbPosition.InsertEntry( String( CUI_RES( nResIds[i] ) ) );
m_lbPosition.SelectEntryPos(MATCHING_ANYWHERE);
// die Feld-Listbox
@@ -434,7 +418,7 @@ IMPL_LINK(FmSearchDialog, OnClickedSpecialSettings, Button*, pButton )
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact)
{
- AbstractSvxJSearchOptionsDialog* aDlg = pFact->CreateSvxJSearchOptionsDialog( this, aSet, RID_SVXPAGE_JSEARCH_OPTIONS, m_pSearchEngine->GetTransliterationFlags(), RID_SVXPAGE_JSEARCH_OPTIONS );
+ AbstractSvxJSearchOptionsDialog* aDlg = pFact->CreateSvxJSearchOptionsDialog( this, aSet, m_pSearchEngine->GetTransliterationFlags() );
DBG_ASSERT(aDlg, "Dialogdiet fail!");//CHINA001
aDlg->Execute(); //CHINA001 aDlg.Execute();
@@ -503,7 +487,7 @@ IMPL_LINK(FmSearchDialog, OnCheckBoxToggled, CheckBox*, pBox)
// Richtung -> weiterreichen und Checkbox-Text fuer StartOver neu setzen
else if (pBox == &m_cbBackwards)
{
- m_cbStartOver.SetText( String( SVX_RES( bChecked ? RID_STR_FROM_BOTTOM : RID_STR_FROM_TOP ) ) );
+ m_cbStartOver.SetText( String( CUI_RES( bChecked ? RID_STR_FROM_BOTTOM : RID_STR_FROM_TOP ) ) );
m_pSearchEngine->SetDirection(!bChecked);
}
// Aehnlichkeitssuche oder regulaerer Ausdruck
@@ -797,7 +781,7 @@ IMPL_LINK(FmSearchDialog, OnSearchProgress, FmSearchProgress*, pProgress)
case FmSearchProgress::STATE_PROGRESS:
if (pProgress->bOverflow)
{
- String sHint( SVX_RES( m_cbBackwards.IsChecked() ? RID_STR_OVERFLOW_BACKWARD : RID_STR_OVERFLOW_FORWARD ) );
+ String sHint( CUI_RES( m_cbBackwards.IsChecked() ? RID_STR_OVERFLOW_BACKWARD : RID_STR_OVERFLOW_FORWARD ) );
m_ftHint.SetText( sHint );
m_ftHint.Invalidate();
}
@@ -807,7 +791,7 @@ IMPL_LINK(FmSearchDialog, OnSearchProgress, FmSearchProgress*, pProgress)
break;
case FmSearchProgress::STATE_PROGRESS_COUNTING:
- m_ftHint.SetText(SVX_RESSTR(RID_STR_SEARCH_COUNTING));
+ m_ftHint.SetText(CUI_RESSTR(RID_STR_SEARCH_COUNTING));
m_ftHint.Invalidate();
m_ftRecord.SetText(String::CreateFromInt32(pProgress->nCurrentRecord));
@@ -825,7 +809,7 @@ IMPL_LINK(FmSearchDialog, OnSearchProgress, FmSearchProgress*, pProgress)
sal_uInt16 nErrorId = (FmSearchProgress::STATE_ERROR == pProgress->aSearchState)
? RID_SVXERR_SEARCH_GENERAL_ERROR
: RID_SVXERR_SEARCH_NORECORD;
- ErrorBox(this, SVX_RES(nErrorId)).Execute();
+ ErrorBox(this, CUI_RES(nErrorId)).Execute();
}
// KEIN break !
case FmSearchProgress::STATE_CANCELED:
diff --git a/svx/source/cui/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index 3bac445b66e3..426d6fef86ea 100644
--- a/svx/source/cui/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -29,11 +29,7 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
#include <algorithm>
#include <ucbhelper/content.hxx>
@@ -41,20 +37,15 @@
#include <vcl/svapp.hxx>
#include <vcl/msgbox.hxx>
#include <avmedia/mediawindow.hxx>
-#include <svtools/pathoptions.hxx>
-#include <avmedia/mediawindow.hxx>
-#include "opengrf.hxx"
-#include "impgrf.hxx"
-#include "gallery1.hxx"
-#include "galtheme.hxx"
-#include "galbrws2.hxx"
-#include "galdlg.hxx"
-#include "cuigaldlg.hxx" //CHINA001
-#include <svtools/pickerhelper.hxx>
-#ifndef _SVX_HELPID_HRC
+#include <unotools/pathoptions.hxx>
+#include <svx/opengrf.hxx>
+#include <svx/impgrf.hxx>
+#include <svx/gallery1.hxx>
+#include <svx/galtheme.hxx>
+#include "cuigaldlg.hxx"
+#include <svl/pickerhelper.hxx>
#include "helpid.hrc"
-#endif
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
#include <cppuhelper/implbase1.hxx>
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/lang/XInitialization.hpp>
@@ -64,6 +55,9 @@
#include <com/sun/star/sdbc/XRow.hpp>
#include <com/sun/star/ucb/XContentAccess.hpp>
#include <com/sun/star/ui/dialogs/XAsynchronousExecutableDialog.hpp>
+#include <sfx2/sfxuno.hxx>
+#include "dialmgr.hxx"
+#include "gallery.hrc"
// --------------
// - Namespaces -
@@ -230,12 +224,12 @@ void SearchThread::ImplSearch( const INetURLObject& rStartURL,
// ------------------
SearchProgress::SearchProgress( Window* pParent, const INetURLObject& rStartURL ) :
- ModalDialog ( pParent, GAL_RESID(RID_SVXDLG_GALLERY_SEARCH_PROGRESS ) ),
- aFtSearchDir ( this, GAL_RESID( FT_SEARCH_DIR ) ),
- aFLSearchDir ( this, GAL_RESID( FL_SEARCH_DIR ) ),
- aFtSearchType ( this, GAL_RESID( FT_SEARCH_TYPE ) ),
- aFLSearchType ( this, GAL_RESID( FL_SEARCH_TYPE ) ),
- aBtnCancel ( this, GAL_RESID( BTN_CANCEL ) ),
+ ModalDialog ( pParent, CUI_RES(RID_SVXDLG_GALLERY_SEARCH_PROGRESS ) ),
+ aFtSearchDir ( this, CUI_RES( FT_SEARCH_DIR ) ),
+ aFLSearchDir ( this, CUI_RES( FL_SEARCH_DIR ) ),
+ aFtSearchType ( this, CUI_RES( FT_SEARCH_TYPE ) ),
+ aFLSearchType ( this, CUI_RES( FL_SEARCH_TYPE ) ),
+ aBtnCancel ( this, CUI_RES( BTN_CANCEL ) ),
maSearchThread ( this, (TPGalleryThemeProperties*) pParent, rStartURL )
{
FreeResource();
@@ -360,10 +354,10 @@ void SAL_CALL TakeThread::onTerminated()
// ----------------
TakeProgress::TakeProgress( Window* pWindow ) :
- ModalDialog ( pWindow, GAL_RESID( RID_SVXDLG_GALLERY_TAKE_PROGRESS ) ),
- aFtTakeFile ( this, GAL_RESID( FT_TAKE_FILE ) ),
- aFLTakeProgress( this, GAL_RESID( FL_TAKE_PROGRESS ) ),
- aBtnCancel ( this, GAL_RESID( BTN_CANCEL ) ),
+ ModalDialog ( pWindow, CUI_RES( RID_SVXDLG_GALLERY_TAKE_PROGRESS ) ),
+ aFtTakeFile ( this, CUI_RES( FT_TAKE_FILE ) ),
+ aFLTakeProgress( this, CUI_RES( FL_TAKE_PROGRESS ) ),
+ aBtnCancel ( this, CUI_RES( BTN_CANCEL ) ),
maTakeThread ( this, (TPGalleryThemeProperties*) pWindow, maTakenList )
{
@@ -465,10 +459,10 @@ void TakeProgress::StartExecuteModal( const Link& rEndDialogHdl )
// ---------------------
ActualizeProgress::ActualizeProgress( Window* pWindow, GalleryTheme* pThm ) :
- ModalDialog ( pWindow, GAL_RESID( RID_SVXDLG_GALLERY_ACTUALIZE_PROGRESS ) ),
- aFtActualizeFile ( this, GAL_RESID( FT_ACTUALIZE_FILE ) ),
- aFLActualizeProgress ( this, GAL_RESID( FL_ACTUALIZE_PROGRESS ) ),
- aBtnCancel ( this, GAL_RESID( BTN_CANCEL ) ),
+ ModalDialog ( pWindow, CUI_RES( RID_SVXDLG_GALLERY_ACTUALIZE_PROGRESS ) ),
+ aFtActualizeFile ( this, CUI_RES( FT_ACTUALIZE_FILE ) ),
+ aFLActualizeProgress ( this, CUI_RES( FL_ACTUALIZE_PROGRESS ) ),
+ aBtnCancel ( this, CUI_RES( BTN_CANCEL ) ),
pTheme ( pThm )
{
FreeResource();
@@ -546,12 +540,12 @@ IMPL_LINK( ActualizeProgress, ActualizeHdl, INetURLObject*, pURL )
// ---------------
TitleDialog::TitleDialog( Window* pParent, const String& rOldTitle ) :
- ModalDialog ( pParent, GAL_RESID( RID_SVXDLG_GALLERY_TITLE ) ),
- maOk ( this, GAL_RESID( BTN_OK ) ),
- maCancel ( this, GAL_RESID( BTN_CANCEL ) ),
- maHelp ( this, GAL_RESID( BTN_HELP ) ),
- maFL ( this, GAL_RESID( FL_TITLE ) ),
- maEdit ( this, GAL_RESID( EDT_TITLE ) )
+ ModalDialog ( pParent, CUI_RES( RID_SVXDLG_GALLERY_TITLE ) ),
+ maOk ( this, CUI_RES( BTN_OK ) ),
+ maCancel ( this, CUI_RES( BTN_CANCEL ) ),
+ maHelp ( this, CUI_RES( BTN_HELP ) ),
+ maFL ( this, CUI_RES( FL_TITLE ) ),
+ maEdit ( this, CUI_RES( EDT_TITLE ) )
{
FreeResource();
maEdit.SetText( rOldTitle );
@@ -563,19 +557,18 @@ TitleDialog::TitleDialog( Window* pParent, const String& rOldTitle ) :
// -------------------
GalleryIdDialog::GalleryIdDialog( Window* pParent, GalleryTheme* _pThm ) :
- ModalDialog ( pParent, GAL_RESID( RID_SVXDLG_GALLERY_THEMEID ) ),
- aBtnOk ( this, GAL_RESID( BTN_OK ) ),
- aBtnCancel ( this, GAL_RESID( BTN_CANCEL ) ),
- aFLId ( this, GAL_RESID( FL_ID ) ),
- aLbResName ( this, GAL_RESID( LB_RESNAME ) ),
+ ModalDialog ( pParent, CUI_RES( RID_SVXDLG_GALLERY_THEMEID ) ),
+ aBtnOk ( this, CUI_RES( BTN_OK ) ),
+ aBtnCancel ( this, CUI_RES( BTN_CANCEL ) ),
+ aFLId ( this, CUI_RES( FL_ID ) ),
+ aLbResName ( this, CUI_RES( LB_RESNAME ) ),
pThm ( _pThm )
{
FreeResource();
aLbResName.InsertEntry( String( RTL_CONSTASCII_USTRINGPARAM( "!!! No Id !!!" ) ) );
- for( USHORT i = RID_GALLERYSTR_THEME_FIRST; i <= RID_GALLERYSTR_THEME_LAST; i++ )
- aLbResName.InsertEntry( String( GAL_RESID( i ) ) );
+ GalleryTheme::InsertAllThemes( aLbResName );
aLbResName.SelectEntryPos( (USHORT) pThm->GetId() );
aLbResName.GrabFocus();
@@ -597,7 +590,7 @@ IMPL_LINK( GalleryIdDialog, ClickOkHdl, void*, EMPTYARG )
if( ( pInfo->GetId() == nId ) && ( pInfo->GetThemeName() != pThm->GetName() ) )
{
- String aStr( GAL_RESID( RID_SVXSTR_GALLERY_ID_EXISTS ) );
+ String aStr( CUI_RES( RID_SVXSTR_GALLERY_ID_EXISTS ) );
aStr += String( RTL_CONSTASCII_USTRINGPARAM( " (" ) );
aStr += pInfo->GetThemeName();
@@ -622,7 +615,7 @@ IMPL_LINK( GalleryIdDialog, ClickOkHdl, void*, EMPTYARG )
// --------------------------
GalleryThemeProperties::GalleryThemeProperties( Window* pParent, ExchangeData* _pData, SfxItemSet* pItemSet ) :
- SfxTabDialog ( pParent, GAL_RESID( RID_SVXTABDLG_GALLERYTHEME ), pItemSet ),
+ SfxTabDialog ( pParent, CUI_RES( RID_SVXTABDLG_GALLERYTHEME ), pItemSet ),
pData ( _pData )
{
FreeResource();
@@ -638,7 +631,7 @@ GalleryThemeProperties::GalleryThemeProperties( Window* pParent, ExchangeData* _
aText += pData->pTheme->GetName();
if( pData->pTheme->IsReadOnly() )
- aText += String( GAL_RESID( RID_SVXSTR_GALLERY_READONLY ) );
+ aText += String( CUI_RES( RID_SVXSTR_GALLERY_READONLY ) );
SetText( aText );
}
@@ -658,19 +651,19 @@ void GalleryThemeProperties::PageCreated( USHORT nId, SfxTabPage &rPage )
// -------------------------
TPGalleryThemeGeneral::TPGalleryThemeGeneral( Window* pParent, const SfxItemSet& rSet ) :
- SfxTabPage ( pParent, GAL_RESID( RID_SVXTABPAGE_GALLERY_GENERAL ), rSet ),
- aFiMSImage ( this, GAL_RESID( FI_MS_IMAGE ) ),
- aEdtMSName ( this, GAL_RESID( EDT_MS_NAME ) ),
- aFlMSGeneralFirst ( this, GAL_RESID( FL_MS_GENERAL_FIRST ) ),
- aFtMSType ( this, GAL_RESID( FT_MS_TYPE ) ),
- aFtMSShowType ( this, GAL_RESID( FT_MS_SHOW_TYPE ) ),
- aFtMSPath ( this, GAL_RESID( FT_MS_PATH ) ),
- aFtMSShowPath ( this, GAL_RESID( FT_MS_SHOW_PATH ) ),
- aFtMSContent ( this, GAL_RESID( FT_MS_CONTENT ) ),
- aFtMSShowContent ( this, GAL_RESID( FT_MS_SHOW_CONTENT ) ),
- aFlMSGeneralSecond ( this, GAL_RESID( FL_MS_GENERAL_SECOND ) ),
- aFtMSChangeDate ( this, GAL_RESID( FT_MS_CHANGEDATE ) ),
- aFtMSShowChangeDate ( this, GAL_RESID( FT_MS_SHOW_CHANGEDATE ) )
+ SfxTabPage ( pParent, CUI_RES( RID_SVXTABPAGE_GALLERY_GENERAL ), rSet ),
+ aFiMSImage ( this, CUI_RES( FI_MS_IMAGE ) ),
+ aEdtMSName ( this, CUI_RES( EDT_MS_NAME ) ),
+ aFlMSGeneralFirst ( this, CUI_RES( FL_MS_GENERAL_FIRST ) ),
+ aFtMSType ( this, CUI_RES( FT_MS_TYPE ) ),
+ aFtMSShowType ( this, CUI_RES( FT_MS_SHOW_TYPE ) ),
+ aFtMSPath ( this, CUI_RES( FT_MS_PATH ) ),
+ aFtMSShowPath ( this, CUI_RES( FT_MS_SHOW_PATH ) ),
+ aFtMSContent ( this, CUI_RES( FT_MS_CONTENT ) ),
+ aFtMSShowContent ( this, CUI_RES( FT_MS_SHOW_CONTENT ) ),
+ aFlMSGeneralSecond ( this, CUI_RES( FL_MS_GENERAL_SECOND ) ),
+ aFtMSChangeDate ( this, CUI_RES( FT_MS_CHANGEDATE ) ),
+ aFtMSShowChangeDate ( this, CUI_RES( FT_MS_SHOW_CHANGEDATE ) )
{
FreeResource();
}
@@ -683,9 +676,9 @@ void TPGalleryThemeGeneral::SetXChgData( ExchangeData* _pData )
GalleryTheme* pThm = pData->pTheme;
String aOutStr( String::CreateFromInt32( pThm->GetObjectCount() ) );
- String aObjStr( GAL_RESID( RID_SVXSTR_GALLERYPROPS_OBJECT ) );
+ String aObjStr( CUI_RES( RID_SVXSTR_GALLERYPROPS_OBJECT ) );
String aAccess;
- String aType( GAL_RESID( RID_SVXSTR_GALLERYPROPS_GALTHEME ) );
+ String aType( CUI_RES( RID_SVXSTR_GALLERYPROPS_GALTHEME ) );
BOOL bReadOnly = pThm->IsReadOnly() && !pThm->IsImported();
aEdtMSName.SetHelpId( HID_GALLERY_EDIT_MSNAME );
@@ -698,7 +691,7 @@ void TPGalleryThemeGeneral::SetXChgData( ExchangeData* _pData )
aEdtMSName.Enable();
if( pThm->IsReadOnly() )
- aType += String( GAL_RESID( RID_SVXSTR_GALLERY_READONLY ) );
+ aType += String( CUI_RES( RID_SVXSTR_GALLERY_READONLY ) );
aFtMSShowType.SetText( aType );
aFtMSShowPath.SetText( pThm->GetSdgURL().GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS ) );
@@ -735,7 +728,7 @@ void TPGalleryThemeGeneral::SetXChgData( ExchangeData* _pData )
else
nId = RID_SVXBMP_THEME_NORMAL_BIG;
- aFiMSImage.SetImage( Image( Bitmap( GAL_RESID( nId ) ), COL_LIGHTMAGENTA ) );
+ aFiMSImage.SetImage( Image( Bitmap( CUI_RES( nId ) ), COL_LIGHTMAGENTA ) );
}
// ------------------------------------------------------------------------
@@ -758,15 +751,15 @@ SfxTabPage* TPGalleryThemeGeneral::Create( Window* pParent, const SfxItemSet& rS
// ----------------------------
TPGalleryThemeProperties::TPGalleryThemeProperties( Window* pWindow, const SfxItemSet& rSet ) :
- SfxTabPage ( pWindow, GAL_RESID( RID_SVXTABPAGE_GALLERYTHEME_FILES ), rSet ),
- aBtnSearch ( this, GAL_RESID(BTN_SEARCH ) ),
- aBtnTake ( this, GAL_RESID(BTN_TAKE ) ),
- aBtnTakeAll ( this, GAL_RESID(BTN_TAKEALL ) ),
- aCbxPreview ( this, GAL_RESID(CBX_PREVIEW ) ),
- aCbbFileType ( this, GAL_RESID(CBB_FILETYPE ) ),
- aLbxFound ( this, GAL_RESID(LBX_FOUND ) ),
- aFtFileType ( this, GAL_RESID(FT_FILETYPE ) ),
- aWndPreview ( this, GAL_RESID( WND_BRSPRV ) ),
+ SfxTabPage ( pWindow, CUI_RES( RID_SVXTABPAGE_GALLERYTHEME_FILES ), rSet ),
+ aBtnSearch ( this, CUI_RES(BTN_SEARCH ) ),
+ aBtnTake ( this, CUI_RES(BTN_TAKE ) ),
+ aBtnTakeAll ( this, CUI_RES(BTN_TAKEALL ) ),
+ aCbxPreview ( this, CUI_RES(CBX_PREVIEW ) ),
+ aCbbFileType ( this, CUI_RES(CBB_FILETYPE ) ),
+ aLbxFound ( this, CUI_RES(LBX_FOUND ) ),
+ aFtFileType ( this, CUI_RES(FT_FILETYPE ) ),
+ aWndPreview ( this, CUI_RES( WND_BRSPRV ) ),
nCurFilterPos (0),
nFirstExtFilterPos (0),
bEntriesFound (FALSE),
@@ -795,7 +788,7 @@ void TPGalleryThemeProperties::SetXChgData( ExchangeData* _pData )
aCbbFileType.EnableDDAutoWidth( sal_False );
aLbxFound.SetDoubleClickHdl(LINK(this, TPGalleryThemeProperties, DClickFoundHdl));
aLbxFound.SetSelectHdl(LINK(this, TPGalleryThemeProperties, SelectFoundHdl));
- aLbxFound.InsertEntry(String(GAL_RESID(RID_SVXSTR_GALLERY_NOFILES)));
+ aLbxFound.InsertEntry(String(CUI_RES(RID_SVXSTR_GALLERY_NOFILES)));
aLbxFound.Show();
FillFilterList();
@@ -975,7 +968,7 @@ void TPGalleryThemeProperties::FillFilterList()
#endif
pFilterEntry = new FilterEntry;
- pFilterEntry->aFilterName = String( GAL_RESID( RID_SVXSTR_GALLERY_ALLFILES ) );
+ pFilterEntry->aFilterName = String( CUI_RES( RID_SVXSTR_GALLERY_ALLFILES ) );
pFilterEntry->aFilterName = addExtension( pFilterEntry->aFilterName, aExtensions );
aFilterEntryList.Insert(pFilterEntry, aCbbFileType. InsertEntry( pFilterEntry->aFilterName, 0 ) );
@@ -992,7 +985,7 @@ IMPL_LINK( TPGalleryThemeProperties, SelectFileTypeHdl, void *, EMPTYARG )
{
aLastFilterName = aText;
- if( QueryBox( this, WB_YES_NO, String( GAL_RESID( RID_SVXSTR_GALLERY_SEARCH ) ) ).Execute() == RET_YES )
+ if( QueryBox( this, WB_YES_NO, String( CUI_RES( RID_SVXSTR_GALLERY_SEARCH ) ) ).Execute() == RET_YES )
SearchFiles();
}
@@ -1124,33 +1117,22 @@ void TPGalleryThemeProperties::DoPreview()
if( aString != aPreviewString )
{
- Graphic aGraphic;
INetURLObject _aURL( *aFoundList.GetObject( aLbxFound.GetEntryPos( aString ) ) );
-
bInputAllowed = FALSE;
- if( ::avmedia::MediaWindow::isMediaURL( _aURL.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS ) ) )
+ if ( !aWndPreview.SetGraphic( _aURL ) )
+ {
+ GetParent()->LeaveWait();
+ ErrorHandler::HandleError( ERRCODE_IO_NOTEXISTSPATH );
+ GetParent()->EnterWait();
+ }
+ else if( ::avmedia::MediaWindow::isMediaURL( _aURL.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS ) ) )
{
- aGraphic = BitmapEx( GAL_RESID( RID_SVXBMP_GALLERY_MEDIA ) );
xMediaPlayer = ::avmedia::MediaWindow::createPlayer( _aURL.GetMainURL( INetURLObject::NO_DECODE ) );
if( xMediaPlayer.is() )
xMediaPlayer->start();
}
- else
- {
- GraphicFilter* pFilter = GetGrfFilter();
- GalleryProgress aProgress( pFilter );
-
- if( pFilter->ImportGraphic( aGraphic, _aURL, GRFILTER_FORMAT_DONTKNOW ) )
- {
- GetParent()->LeaveWait();
- ErrorHandler::HandleError( ERRCODE_IO_NOTEXISTSPATH );
- GetParent()->EnterWait();
- }
- }
- aWndPreview.SetGraphic( aGraphic );
- aWndPreview.Invalidate();
bInputAllowed = TRUE;
aPreviewString = aString;
}
@@ -1268,7 +1250,7 @@ IMPL_LINK( TPGalleryThemeProperties, EndSearchProgressHdl, SearchProgress *, EMP
}
else
{
- aLbxFound.InsertEntry( String( GAL_RESID( RID_SVXSTR_GALLERY_NOFILES ) ) );
+ aLbxFound.InsertEntry( String( CUI_RES( RID_SVXSTR_GALLERY_NOFILES ) ) );
aBtnTakeAll.Disable();
aCbxPreview.Disable();
bEntriesFound = FALSE;
diff --git a/svx/source/cui/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx
index 830db3ae477a..be2b401320fd 100644
--- a/svx/source/cui/cuigrfflt.cxx
+++ b/cui/source/dialogs/cuigrfflt.cxx
@@ -29,22 +29,19 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_cui.hxx"
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
#include <tools/shl.hxx>
#include <vcl/msgbox.hxx>
#include <sfx2/viewfrm.hxx>
#include <sfx2/viewsh.hxx>
#include <sfx2/objsh.hxx>
#include <sfx2/request.hxx>
-
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
#include "cuigrfflt.hxx"
#include "grfflt.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
+#include <svx/dialogs.hrc> // RID_SVX_GRFFILTER_DLG_...
// --------------------
// - SvxGraphicFilter -
@@ -374,11 +371,11 @@ GraphicFilterDialog::GraphicFilterDialog( Window* pParent, const ResId& rResId,
mfScaleX ( 0.0 ),
mfScaleY ( 0.0 ),
maSizePixel ( LogicToPixel( rGraphic.GetPrefSize(), rGraphic.GetPrefMapMode() ) ),
- maPreview ( this, SVX_RES( CTL_PREVIEW ) ),
- maFlParameter ( this, SVX_RES( FL_PARAMETER ) ),
- maBtnOK ( this, SVX_RES( BTN_OK ) ),
- maBtnCancel ( this, SVX_RES( BTN_CANCEL ) ),
- maBtnHelp ( this, SVX_RES( BTN_HELP ) )
+ maPreview ( this, CUI_RES( CTL_PREVIEW ) ),
+ maFlParameter ( this, CUI_RES( FL_PARAMETER ) ),
+ maBtnOK ( this, CUI_RES( BTN_OK ) ),
+ maBtnCancel ( this, CUI_RES( BTN_CANCEL ) ),
+ maBtnHelp ( this, CUI_RES( BTN_HELP ) )
{
const Size aPreviewSize( maPreview.GetOutputSizePixel() );
Size aGrfSize( maSizePixel );
@@ -453,12 +450,12 @@ IMPL_LINK( GraphicFilterDialog, ImplModifyHdl, void*, EMPTYARG )
GraphicFilterMosaic::GraphicFilterMosaic( Window* pParent, const Graphic& rGraphic,
USHORT nTileWidth, USHORT nTileHeight, BOOL bEnhanceEdges ) :
- GraphicFilterDialog( pParent, SVX_RES( RID_SVX_GRFFILTER_DLG_MOSAIC ), rGraphic ),
- maFtWidth ( this, SVX_RES( DLG_FILTERMOSAIC_FT_WIDTH ) ),
- maMtrWidth ( this, SVX_RES( DLG_FILTERMOSAIC_MTR_WIDTH ) ),
- maFtHeight ( this, SVX_RES( DLG_FILTERMOSAIC_FT_HEIGHT ) ),
- maMtrHeight ( this, SVX_RES( DLG_FILTERMOSAIC_MTR_HEIGHT ) ),
- maCbxEdges ( this, SVX_RES( DLG_FILTERMOSAIC_CBX_EDGES ) )
+ GraphicFilterDialog( pParent, CUI_RES( RID_SVX_GRFFILTER_DLG_MOSAIC ), rGraphic ),
+ maFtWidth ( this, CUI_RES( DLG_FILTERMOSAIC_FT_WIDTH ) ),
+ maMtrWidth ( this, CUI_RES( DLG_FILTERMOSAIC_MTR_WIDTH ) ),
+ maFtHeight ( this, CUI_RES( DLG_FILTERMOSAIC_FT_HEIGHT ) ),
+ maMtrHeight ( this, CUI_RES( DLG_FILTERMOSAIC_MTR_HEIGHT ) ),
+ maCbxEdges ( this, CUI_RES( DLG_FILTERMOSAIC_CBX_EDGES ) )
{
FreeResource();
@@ -526,10 +523,10 @@ Graphic GraphicFilterMosaic::GetFilteredGraphic( const Graphic& rGraphic,
GraphicFilterSolarize::GraphicFilterSolarize( Window* pParent, const Graphic& rGraphic,
BYTE cGreyThreshold, BOOL bInvert ) :
- GraphicFilterDialog ( pParent, SVX_RES( RID_SVX_GRFFILTER_DLG_SOLARIZE ), rGraphic ),
- maFtThreshold ( this, SVX_RES( DLG_FILTERSOLARIZE_FT_THRESHOLD ) ),
- maMtrThreshold ( this, SVX_RES( DLG_FILTERSOLARIZE_MTR_THRESHOLD ) ),
- maCbxInvert ( this, SVX_RES( DLG_FILTERSOLARIZE_CBX_INVERT ) )
+ GraphicFilterDialog ( pParent, CUI_RES( RID_SVX_GRFFILTER_DLG_SOLARIZE ), rGraphic ),
+ maFtThreshold ( this, CUI_RES( DLG_FILTERSOLARIZE_FT_THRESHOLD ) ),
+ maMtrThreshold ( this, CUI_RES( DLG_FILTERSOLARIZE_MTR_THRESHOLD ) ),
+ maCbxInvert ( this, CUI_RES( DLG_FILTERSOLARIZE_CBX_INVERT ) )
{
FreeResource();
@@ -590,9 +587,9 @@ Graphic GraphicFilterSolarize::GetFilteredGraphic( const Graphic& rGraphic,
GraphicFilterSepia::GraphicFilterSepia( Window* pParent, const Graphic& rGraphic,
USHORT nSepiaPercent ) :
- GraphicFilterDialog ( pParent, SVX_RES( RID_SVX_GRFFILTER_DLG_SEPIA ), rGraphic ),
- maFtSepia ( this, SVX_RES( DLG_FILTERSEPIA_FT_SEPIA ) ),
- maMtrSepia ( this, SVX_RES( DLG_FILTERSEPIA_MTR_SEPIA ) )
+ GraphicFilterDialog ( pParent, CUI_RES( RID_SVX_GRFFILTER_DLG_SEPIA ), rGraphic ),
+ maFtSepia ( this, CUI_RES( DLG_FILTERSEPIA_FT_SEPIA ) ),
+ maMtrSepia ( this, CUI_RES( DLG_FILTERSEPIA_MTR_SEPIA ) )
{
FreeResource();
@@ -640,9 +637,9 @@ Graphic GraphicFilterSepia::GetFilteredGraphic( const Graphic& rGraphic,
GraphicFilterPoster::GraphicFilterPoster( Window* pParent, const Graphic& rGraphic,
USHORT nPosterCount ) :
- GraphicFilterDialog ( pParent, SVX_RES( RID_SVX_GRFFILTER_DLG_POSTER ), rGraphic ),
- maFtPoster ( this, SVX_RES( DLG_FILTERPOSTER_FT_POSTER ) ),
- maNumPoster ( this, SVX_RES( DLG_FILTERPOSTER_NUM_POSTER ) )
+ GraphicFilterDialog ( pParent, CUI_RES( RID_SVX_GRFFILTER_DLG_POSTER ), rGraphic ),
+ maFtPoster ( this, CUI_RES( DLG_FILTERPOSTER_FT_POSTER ) ),
+ maNumPoster ( this, CUI_RES( DLG_FILTERPOSTER_NUM_POSTER ) )
{
FreeResource();
@@ -703,9 +700,9 @@ void GraphicFilterEmboss::EmbossControl::MouseButtonDown( const MouseEvent& rEvt
GraphicFilterEmboss::GraphicFilterEmboss( Window* pParent, const Graphic& rGraphic,
RECT_POINT eLightSource ) :
- GraphicFilterDialog ( pParent, SVX_RES( RID_SVX_GRFFILTER_DLG_EMBOSS ), rGraphic ),
- maFtLight ( this, SVX_RES( DLG_FILTEREMBOSS_FT_LIGHT ) ),
- maCtlLight ( this, SVX_RES( DLG_FILTEREMBOSS_CTL_LIGHT ), eLightSource )
+ GraphicFilterDialog ( pParent, CUI_RES( RID_SVX_GRFFILTER_DLG_EMBOSS ), rGraphic ),
+ maFtLight ( this, CUI_RES( DLG_FILTEREMBOSS_FT_LIGHT ) ),
+ maCtlLight ( this, CUI_RES( DLG_FILTEREMBOSS_CTL_LIGHT ), eLightSource )
{
FreeResource();
diff --git a/svx/source/cui/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx
index b29e202030b4..a73cc0007a6f 100644
--- a/svx/source/cui/cuihyperdlg.cxx
+++ b/cui/source/dialogs/cuihyperdlg.cxx
@@ -29,24 +29,18 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
// include ---------------------------------------------------------------
#include <vcl/settings.hxx>
-#include <svtools/viewoptions.hxx>
-
+#include <unotools/viewoptions.hxx>
#include "cuihyperdlg.hxx"
-
#include "hlinettp.hxx"
#include "hlmailtp.hxx"
#include "hldoctp.hxx"
#include "hldocntp.hxx"
-
#include "hyperdlg.hrc"
+#include <svx/svxids.hrc> // SID_READONLY_MODE
using ::com::sun::star::uno::Reference;
using ::com::sun::star::frame::XFrame;
@@ -110,7 +104,7 @@ void SvxHlinkCtrl::StateChanged( USHORT nSID, SfxItemState eState,
|************************************************************************/
SvxHpLinkDlg::SvxHpLinkDlg (Window* pParent, SfxBindings* pBindings)
-: IconChoiceDialog( pParent, SVX_RES ( RID_SVXDLG_NEWHYPERLINK ) ),
+: IconChoiceDialog( pParent, CUI_RES ( RID_SVXDLG_NEWHYPERLINK ) ),
maCtrl ( SID_HYPERLINK_GETLINK, *pBindings, this ),
mpBindings ( pBindings ),
mbReadOnly ( sal_False ),
@@ -123,26 +117,26 @@ SvxHpLinkDlg::SvxHpLinkDlg (Window* pParent, SfxBindings* pBindings)
String aStrTitle;
SvxIconChoiceCtrlEntry* pEntry = NULL;
- aStrTitle = SVX_RESSTR( RID_SVXSTR_HYPERDLG_HLINETTP );
- aImage = Image( SVX_RES ( RID_SVXBMP_HLINETTP ) );
- aImageHC = Image( SVX_RES ( RID_SVXBMP_HLINETTP_H ) );
+ aStrTitle = CUI_RESSTR( RID_SVXSTR_HYPERDLG_HLINETTP );
+ aImage = Image( CUI_RES ( RID_SVXBMP_HLINETTP ) );
+ aImageHC = Image( CUI_RES ( RID_SVXBMP_HLINETTP_H ) );
pEntry = AddTabPage ( RID_SVXPAGE_HYPERLINK_INTERNET, aStrTitle, aImage, aImageHC, SvxHyperlinkInternetTp::Create );
- pEntry->SetQuickHelpText( SVX_RESSTR( RID_SVXSTR_HYPERDLG_HLINETTP_HELP ) );
- aStrTitle = SVX_RESSTR( RID_SVXSTR_HYPERDLG_HLMAILTP );
- aImage = Image( SVX_RES ( RID_SVXBMP_HLMAILTP ) );
- aImageHC = Image( SVX_RES ( RID_SVXBMP_HLMAILTP_H ) );
+ pEntry->SetQuickHelpText( CUI_RESSTR( RID_SVXSTR_HYPERDLG_HLINETTP_HELP ) );
+ aStrTitle = CUI_RESSTR( RID_SVXSTR_HYPERDLG_HLMAILTP );
+ aImage = Image( CUI_RES ( RID_SVXBMP_HLMAILTP ) );
+ aImageHC = Image( CUI_RES ( RID_SVXBMP_HLMAILTP_H ) );
pEntry = AddTabPage ( RID_SVXPAGE_HYPERLINK_MAIL, aStrTitle, aImage, aImageHC, SvxHyperlinkMailTp::Create );
- pEntry->SetQuickHelpText( SVX_RESSTR( RID_SVXSTR_HYPERDLG_HLMAILTP_HELP ) );
- aStrTitle = SVX_RESSTR( RID_SVXSTR_HYPERDLG_HLDOCTP );
- aImage = Image( SVX_RES ( RID_SVXBMP_HLDOCTP ) );
- aImageHC = Image( SVX_RES ( RID_SVXBMP_HLDOCTP_H ) );
+ pEntry->SetQuickHelpText( CUI_RESSTR( RID_SVXSTR_HYPERDLG_HLMAILTP_HELP ) );
+ aStrTitle = CUI_RESSTR( RID_SVXSTR_HYPERDLG_HLDOCTP );
+ aImage = Image( CUI_RES ( RID_SVXBMP_HLDOCTP ) );
+ aImageHC = Image( CUI_RES ( RID_SVXBMP_HLDOCTP_H ) );
pEntry = AddTabPage ( RID_SVXPAGE_HYPERLINK_DOCUMENT, aStrTitle, aImage, aImageHC, SvxHyperlinkDocTp::Create );
- pEntry->SetQuickHelpText( SVX_RESSTR( RID_SVXSTR_HYPERDLG_HLDOCTP_HELP ) );
- aStrTitle = SVX_RESSTR( RID_SVXSTR_HYPERDLG_HLDOCNTP );
- aImage = Image( SVX_RES ( RID_SVXBMP_HLDOCNTP ) );
- aImageHC = Image( SVX_RES ( RID_SVXBMP_HLDOCNTP_H ) );
+ pEntry->SetQuickHelpText( CUI_RESSTR( RID_SVXSTR_HYPERDLG_HLDOCTP_HELP ) );
+ aStrTitle = CUI_RESSTR( RID_SVXSTR_HYPERDLG_HLDOCNTP );
+ aImage = Image( CUI_RES ( RID_SVXBMP_HLDOCNTP ) );
+ aImageHC = Image( CUI_RES ( RID_SVXBMP_HLDOCNTP_H ) );
pEntry = AddTabPage ( RID_SVXPAGE_HYPERLINK_NEWDOCUMENT, aStrTitle, aImage, aImageHC, SvxHyperlinkNewDocTp::Create );
- pEntry->SetQuickHelpText( SVX_RESSTR( RID_SVXSTR_HYPERDLG_HLDOCNTP_HELP ) );
+ pEntry->SetQuickHelpText( CUI_RESSTR( RID_SVXSTR_HYPERDLG_HLDOCNTP_HELP ) );
// all tab pages set -> create mnemonics
// CreateIconTextAutoMnemonics(); #99671# not useful, because this is not what user expects when using mnemonics on the pages
@@ -162,8 +156,8 @@ SvxHpLinkDlg::SvxHpLinkDlg (Window* pParent, SfxBindings* pBindings)
pBindings->Update( SID_READONLY_MODE );
// set OK/Cancel - button
- GetOKButton().SetText ( SVX_RESSTR(RID_SVXSTR_HYPDLG_APPLYBUT) );
- GetCancelButton().SetText ( SVX_RESSTR(RID_SVXSTR_HYPDLG_CLOSEBUT) );
+ GetOKButton().SetText ( CUI_RESSTR(RID_SVXSTR_HYPDLG_APPLYBUT) );
+ GetCancelButton().SetText ( CUI_RESSTR(RID_SVXSTR_HYPDLG_CLOSEBUT) );
GetOKButton().SetClickHdl ( LINK ( this, SvxHpLinkDlg, ClickApplyHdl_Impl ) );
GetCancelButton().SetClickHdl( LINK ( this, SvxHpLinkDlg, ClickCloseHdl_Impl ) );
diff --git a/svx/source/cui/cuiimapdlg.hrc b/cui/source/dialogs/cuiimapdlg.hrc
index 00df9f23ee7a..9424d94c1f05 100755
--- a/svx/source/cui/cuiimapdlg.hrc
+++ b/cui/source/dialogs/cuiimapdlg.hrc
@@ -27,12 +27,9 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
// ImapDlg-Dialoge
-#define RID_SVX_IMAPDLG_START RID_SVX_IMAP_START
-
-#define RID_SVXDLG_IMAPURL (RID_SVX_IMAPDLG_START + 2)
#define FT_URLDESCRIPTION 1
#define FT_URL1 2
diff --git a/svx/source/cui/cuiimapdlg.src b/cui/source/dialogs/cuiimapdlg.src
index de41ca0d1d55..de41ca0d1d55 100755
--- a/svx/source/cui/cuiimapdlg.src
+++ b/cui/source/dialogs/cuiimapdlg.src
diff --git a/svx/source/cui/cuiimapwnd.cxx b/cui/source/dialogs/cuiimapwnd.cxx
index 966fdecace00..841b9ca59b78 100644
--- a/svx/source/cui/cuiimapwnd.cxx
+++ b/cui/source/dialogs/cuiimapwnd.cxx
@@ -29,26 +29,21 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_cui.hxx"
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
#include <tools/urlobj.hxx>
#include <vcl/msgbox.hxx>
#include <vcl/help.hxx>
-#include <sfx2/sfxsids.hrc> // SID_ATTR_MACROITEM
+#include <sfx2/sfxsids.hrc>
#define _ANIMATION
#include "macroass.hxx"
#include <svtools/imaprect.hxx>
#include <svtools/imapcirc.hxx>
#include <svtools/imappoly.hxx>
-#include <svtools/urlbmk.hxx>
-
-#include <xoutbmp.hxx>
-#include <svx/dialmgr.hxx>
-#include <svx/dialogs.hrc>
-#include <svx/svxids.hrc>
+#include <svl/urlbmk.hxx>
+#include <svx/xoutbmp.hxx>
+#include <dialmgr.hxx>
+#include <cuires.hrc>
#include <cuiimapdlg.hrc>
#include <cuiimapwnd.hxx>
#include <svx/svdpage.hxx>
@@ -57,7 +52,7 @@
#include <svx/svdopath.hxx>
#include <svx/xfltrit.hxx>
#include <svx/svdpagv.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
#include <svx/xfillit.hxx>
#include <svx/xlineit.hxx>
@@ -72,21 +67,21 @@
\************************************************************************/
URLDlg::URLDlg( Window* pWindow, const String& rURL, const String& rAlternativeText, const String& rDescription, const String& rTarget, const String& rName, TargetList& rTargetList )
-: ModalDialog( pWindow, SVX_RES( RID_SVXDLG_IMAPURL ) )
-, maFtURL( this, SVX_RES( FT_URL1 ) )
-, maEdtURL( this, SVX_RES( EDT_URL ) )
-, maFtTarget( this, SVX_RES( FT_TARGET ) )
-, maCbbTargets( this, SVX_RES( CBB_TARGETS ) )
-, maFtName( this, SVX_RES( FT_NAME ) )
-, maEdtName( this, SVX_RES( EDT_NAME ) )
-, maFtAlternativeText( this, SVX_RES( FT_URLDESCRIPTION ) )
-, maEdtAlternativeText( this, SVX_RES( EDT_URLDESCRIPTION ) )
-, maFtDescription( this, SVX_RES( FT_DESCRIPTION ) )
-, maEdtDescription( this, SVX_RES( EDT_DESCRIPTION ) )
-, maFlURL( this, SVX_RES( FL_URL ) )
-, maBtnHelp( this, SVX_RES( BTN_HELP1 ) )
-, maBtnOk( this, SVX_RES( BTN_OK1 ) )
-, maBtnCancel( this, SVX_RES( BTN_CANCEL1 ) )
+: ModalDialog( pWindow, CUI_RES( RID_SVXDLG_IMAPURL ) )
+, maFtURL( this, CUI_RES( FT_URL1 ) )
+, maEdtURL( this, CUI_RES( EDT_URL ) )
+, maFtTarget( this, CUI_RES( FT_TARGET ) )
+, maCbbTargets( this, CUI_RES( CBB_TARGETS ) )
+, maFtName( this, CUI_RES( FT_NAME ) )
+, maEdtName( this, CUI_RES( EDT_NAME ) )
+, maFtAlternativeText( this, CUI_RES( FT_URLDESCRIPTION ) )
+, maEdtAlternativeText( this, CUI_RES( EDT_URLDESCRIPTION ) )
+, maFtDescription( this, CUI_RES( FT_DESCRIPTION ) )
+, maEdtDescription( this, CUI_RES( EDT_DESCRIPTION ) )
+, maFlURL( this, CUI_RES( FL_URL ) )
+, maBtnHelp( this, CUI_RES( BTN_HELP1 ) )
+, maBtnOk( this, CUI_RES( BTN_OK1 ) )
+, maBtnCancel( this, CUI_RES( BTN_CANCEL1 ) )
{
FreeResource();
diff --git a/svx/source/cui/cuitbxform.cxx b/cui/source/dialogs/cuitbxform.cxx
index 87affa0bc995..1ca37f425a10 100644
--- a/svx/source/cui/cuitbxform.cxx
+++ b/cui/source/dialogs/cuitbxform.cxx
@@ -29,51 +29,35 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
#include <string> // HACK: prevent conflict between STLPORT and Workshop headers
#include <tools/ref.hxx>
#include <tools/shl.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/stritem.hxx>
#include <sfx2/dispatch.hxx>
#include <vcl/toolbox.hxx>
#include <vcl/fixed.hxx>
-#include "fmitems.hxx"
#include <vcl/sound.hxx>
-#include <svx/dialmgr.hxx>
-#ifndef _SVX_DIALOGS_HRC
-#include <svx/dialogs.hrc>
-#endif
-/*
-#include "tbxctl.hxx"
-#include "tbxdraw.hxx"
-*/
+#include <dialmgr.hxx>
+#include <cuires.hrc>
#include "cuitbxform.hxx"
-#ifndef _SVX_FMRESIDS_HRC
-#include "fmresids.hrc"
-#endif
-#include "fmitems.hxx"
-#ifndef _SVX_FMHELP_HRC
-#include "fmhelp.hrc"
-#endif
#include <sfx2/viewfrm.hxx>
#include <sfx2/viewsh.hxx>
+#include "fmsearch.hrc"
+
//========================================================================
// class FmInputRecordNoDialog
//========================================================================
FmInputRecordNoDialog::FmInputRecordNoDialog(Window * pParent)
- :ModalDialog( pParent, SVX_RES(RID_SVX_DLG_INPUTRECORDNO))
- ,m_aLabel(this, SVX_RES(1))
- ,m_aRecordNo(this, SVX_RES(1))
- ,m_aOk(this, SVX_RES(1))
- ,m_aCancel(this, SVX_RES(1))
+ :ModalDialog( pParent, CUI_RES(RID_SVX_DLG_INPUTRECORDNO))
+ ,m_aLabel(this, CUI_RES(1))
+ ,m_aRecordNo(this, CUI_RES(1))
+ ,m_aOk(this, CUI_RES(1))
+ ,m_aCancel(this, CUI_RES(1))
{
m_aRecordNo.SetMin(1);
m_aRecordNo.SetMax(0x7FFFFFFF);
diff --git a/svx/source/cui/dlgname.cxx b/cui/source/dialogs/dlgname.cxx
index 4b50dcbc6dfa..8cf36980decf 100644
--- a/svx/source/cui/dlgname.cxx
+++ b/cui/source/dialogs/dlgname.cxx
@@ -29,11 +29,7 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
#include <tools/ref.hxx>
#include <tools/list.hxx>
@@ -41,12 +37,12 @@
#include <tools/debug.hxx>
#include <vcl/msgbox.hxx>
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "dlgname.hxx"
#include "defdlgname.hxx" //CHINA001
#include "dlgname.hrc"
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
#define MAX_DESCRIPTION_LINES ((long)5)
@@ -57,12 +53,12 @@
\************************************************************************/
SvxNameDialog::SvxNameDialog( Window* pWindow, const String& rName, const String& rDesc ) :
- ModalDialog ( pWindow, SVX_RES( RID_SVXDLG_NAME ) ),
- aFtDescription ( this, SVX_RES( FT_DESCRIPTION ) ),
- aEdtName ( this, SVX_RES( EDT_STRING ) ),
- aBtnOK ( this, SVX_RES( BTN_OK ) ),
- aBtnCancel ( this, SVX_RES( BTN_CANCEL ) ),
- aBtnHelp ( this, SVX_RES( BTN_HELP ) )
+ ModalDialog ( pWindow, CUI_RES( RID_SVXDLG_NAME ) ),
+ aFtDescription ( this, CUI_RES( FT_DESCRIPTION ) ),
+ aEdtName ( this, CUI_RES( EDT_STRING ) ),
+ aBtnOK ( this, CUI_RES( BTN_OK ) ),
+ aBtnCancel ( this, CUI_RES( BTN_CANCEL ) ),
+ aBtnHelp ( this, CUI_RES( BTN_HELP ) )
{
FreeResource();
@@ -105,13 +101,13 @@ IMPL_LINK(SvxNameDialog, ModifyHdl, Edit*, EMPTYARG)
SvxObjectNameDialog::SvxObjectNameDialog(
Window* pWindow,
const String& rName)
-: ModalDialog(pWindow, SVX_RES(RID_SVXDLG_OBJECT_NAME)),
- aFtName(this, SVX_RES(NTD_FT_NAME)),
- aEdtName(this, SVX_RES(NTD_EDT_NAME)),
- aFlSeparator(this, SVX_RES(FL_SEPARATOR_A)),
- aBtnHelp(this, SVX_RES(BTN_HELP)),
- aBtnOK(this, SVX_RES(BTN_OK)),
- aBtnCancel(this, SVX_RES(BTN_CANCEL))
+: ModalDialog(pWindow, CUI_RES(RID_SVXDLG_OBJECT_NAME)),
+ aFtName(this, CUI_RES(NTD_FT_NAME)),
+ aEdtName(this, CUI_RES(NTD_EDT_NAME)),
+ aFlSeparator(this, CUI_RES(FL_SEPARATOR_A)),
+ aBtnHelp(this, CUI_RES(BTN_HELP)),
+ aBtnOK(this, CUI_RES(BTN_OK)),
+ aBtnCancel(this, CUI_RES(BTN_CANCEL))
{
FreeResource();
@@ -142,15 +138,15 @@ SvxObjectTitleDescDialog::SvxObjectTitleDescDialog(
Window* pWindow,
const String& rTitle,
const String& rDescription)
-: ModalDialog(pWindow, SVX_RES(RID_SVXDLG_OBJECT_TITLE_DESC)),
- aFtTitle(this, SVX_RES(NTD_FT_TITLE)),
- aEdtTitle(this, SVX_RES(NTD_EDT_TITLE)),
- aFtDescription(this, SVX_RES(NTD_FT_DESC)),
- aEdtDescription(this, SVX_RES(NTD_EDT_DESC)),
- aFlSeparator(this, SVX_RES(FL_SEPARATOR_B)),
- aBtnHelp(this, SVX_RES(BTN_HELP)),
- aBtnOK(this, SVX_RES(BTN_OK)),
- aBtnCancel(this, SVX_RES(BTN_CANCEL))
+: ModalDialog(pWindow, CUI_RES(RID_SVXDLG_OBJECT_TITLE_DESC)),
+ aFtTitle(this, CUI_RES(NTD_FT_TITLE)),
+ aEdtTitle(this, CUI_RES(NTD_EDT_TITLE)),
+ aFtDescription(this, CUI_RES(NTD_FT_DESC)),
+ aEdtDescription(this, CUI_RES(NTD_EDT_DESC)),
+ aFlSeparator(this, CUI_RES(FL_SEPARATOR_B)),
+ aBtnHelp(this, CUI_RES(BTN_HELP)),
+ aBtnOK(this, CUI_RES(BTN_OK)),
+ aBtnCancel(this, CUI_RES(BTN_CANCEL))
{
FreeResource();
@@ -171,11 +167,11 @@ SvxObjectTitleDescDialog::SvxObjectTitleDescDialog(
\************************************************************************/
SvxMessDialog::SvxMessDialog( Window* pWindow, const String& rText, const String& rDesc, Image* pImg ) :
- ModalDialog ( pWindow, SVX_RES( RID_SVXDLG_MESSBOX ) ),
- aFtDescription ( this, SVX_RES( FT_DESCRIPTION ) ),
- aBtn1 ( this, SVX_RES( BTN_1 ) ),
- aBtn2 ( this, SVX_RES( BTN_2 ) ),
- aBtnCancel ( this, SVX_RES( BTN_CANCEL ) ),
+ ModalDialog ( pWindow, CUI_RES( RID_SVXDLG_MESSBOX ) ),
+ aFtDescription ( this, CUI_RES( FT_DESCRIPTION ) ),
+ aBtn1 ( this, CUI_RES( BTN_1 ) ),
+ aBtn2 ( this, CUI_RES( BTN_2 ) ),
+ aBtnCancel ( this, CUI_RES( BTN_CANCEL ) ),
aFtImage ( this )
{
FreeResource();
diff --git a/svx/source/cui/dlgname.hrc b/cui/source/dialogs/dlgname.hrc
index 787a5b9bd6df..787a5b9bd6df 100644
--- a/svx/source/cui/dlgname.hrc
+++ b/cui/source/dialogs/dlgname.hrc
diff --git a/svx/source/cui/dlgname.src b/cui/source/dialogs/dlgname.src
index 5647bb347e69..93a2e5979671 100644
--- a/svx/source/cui/dlgname.src
+++ b/cui/source/dialogs/dlgname.src
@@ -30,7 +30,7 @@
// include ------------------------------------------------------------------
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "helpid.hrc"
#include "dlgname.hrc"
diff --git a/svx/source/inc/fmsearch.hrc b/cui/source/dialogs/fmsearch.hrc
index c9a1de900791..579602ec2b5f 100644
--- a/svx/source/inc/fmsearch.hrc
+++ b/cui/source/dialogs/fmsearch.hrc
@@ -30,6 +30,23 @@
#ifndef _FMSEARCH_HRC
#define _FMSEARCH_HRC
+#include "svl/solar.hrc"
+
+#define RID_SVX_DLG_INPUTRECORDNO (RID_FORMS_START + 10)
+#define RID_SVX_DLG_SHOWGRIDCOLUMNS (RID_FORMS_START + 11)
+#define RID_SVXDLG_SEARCHFORM (RID_FORMS_START + 7)
+#define RID_STR_SEARCH_ANYWHERE (RID_FORMS_START + 85)
+#define RID_STR_SEARCH_BEGINNING (RID_FORMS_START + 86)
+#define RID_STR_SEARCH_END (RID_FORMS_START + 87)
+#define RID_STR_SEARCH_WHOLE (RID_FORMS_START + 88)
+#define RID_STR_FROM_TOP (RID_FORMS_START + 74)
+#define RID_STR_FROM_BOTTOM (RID_FORMS_START + 75)
+#define RID_SVXERR_SEARCH_NORECORD (RID_FORMS_START + 8)
+#define RID_SVXERR_SEARCH_GENERAL_ERROR (RID_FORMS_START + 9)
+#define RID_STR_OVERFLOW_FORWARD (RID_FORMS_START + 34)
+#define RID_STR_OVERFLOW_BACKWARD (RID_FORMS_START + 35)
+#define RID_STR_SEARCH_COUNTING (RID_FORMS_START + 76)
+
#define FT_SEARCHTEXT 1
#define FT_FORM 2
#define FT_POSITION 3
diff --git a/svx/source/form/fmsearch.src b/cui/source/dialogs/fmsearch.src
index 593baf90c755..83b04a138b0d 100644
--- a/svx/source/form/fmsearch.src
+++ b/cui/source/dialogs/fmsearch.src
@@ -28,9 +28,8 @@
*
************************************************************************/
-#include "fmresids.hrc"
#include "fmsearch.hrc"
-#include "fmhelp.hrc"
+#include "helpid.hrc"
ModalDialog RID_SVXDLG_SEARCHFORM
{
diff --git a/cui/source/dialogs/gallery.src b/cui/source/dialogs/gallery.src
new file mode 100644
index 000000000000..e4db69f6f73d
--- /dev/null
+++ b/cui/source/dialogs/gallery.src
@@ -0,0 +1,482 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: gallery.src,v $
+ * $Revision: 1.79 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <sfx2/sfxsids.hrc>
+#include "helpid.hrc"
+#include "gallery.hrc"
+#include <svx/exthelpid.hrc>
+
+#define MASKCOLOR MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };
+
+TabDialog RID_SVXTABDLG_GALLERY
+{
+ OutputSize = TRUE ;
+ SVLook = TRUE ;
+ Text [ en-US ] = "Properties of " ;
+ Moveable = TRUE ;
+ TabControl 1
+ {
+ OutputSize = TRUE ;
+ PageList =
+ {
+ PageItem
+ {
+ Identifier = RID_SVXTABPAGE_GALLERY_GENERAL ;
+ Text [ en-US ] = "General" ;
+ };
+ };
+ };
+};
+
+/******************************************************************************/
+
+TabDialog RID_SVXTABDLG_GALLERYTHEME
+{
+ OutputSize = TRUE ;
+ SVLook = TRUE ;
+ Text [ en-US ] = "Properties of " ;
+ Moveable = TRUE ;
+ TabControl 1
+ {
+ OutputSize = TRUE ;
+ PageList =
+ {
+ PageItem
+ {
+ Identifier = RID_SVXTABPAGE_GALLERY_GENERAL ;
+ Text [ en-US ] = "General" ;
+ };
+ PageItem
+ {
+ Identifier = RID_SVXTABPAGE_GALLERYTHEME_FILES ;
+ Text [ en-US ] = "Files" ;
+ };
+ };
+ };
+};
+
+/******************************************************************************/
+
+TabPage RID_SVXTABPAGE_GALLERY_GENERAL
+{
+ HelpId = HID_GALLERY_PROPERTIES_GENERAL;
+ SVLook = TRUE ;
+ Hide = TRUE ;
+ Size = MAP_APPFONT ( 260 , 185 ) ;
+ FixedImage FI_MS_IMAGE
+ {
+ Pos = MAP_APPFONT ( 6 , 6 ) ;
+ Size = MAP_APPFONT ( 20 , 20 ) ;
+ };
+ Edit EDT_MS_NAME
+ {
+ Border = TRUE ;
+ Pos = MAP_APPFONT ( 60 , 10 ) ;
+ Size = MAP_APPFONT ( 194 , 12 ) ;
+ };
+ FixedLine FL_MS_GENERAL_FIRST
+ {
+ Pos = MAP_APPFONT ( 6 , 36 ) ;
+ Size = MAP_APPFONT ( 248 , 1 ) ;
+ };
+ FixedText FT_MS_TYPE
+ {
+ Pos = MAP_APPFONT ( 6 , 43 ) ;
+ Size = MAP_APPFONT ( 51 , 10 ) ;
+ LeftLabel = TRUE ;
+ Text [ en-US ] = "Type:" ;
+ };
+ FixedText FT_MS_SHOW_TYPE
+ {
+ Pos = MAP_APPFONT ( 60 , 43 ) ;
+ Size = MAP_APPFONT ( 194 , 10 ) ;
+ };
+ FixedText FT_MS_PATH
+ {
+ Pos = MAP_APPFONT ( 6 , 57 ) ;
+ Size = MAP_APPFONT ( 51 , 10 ) ;
+ LeftLabel = TRUE ;
+ Text [ en-US ] = "Location:" ;
+ };
+ FixedText FT_MS_SHOW_PATH
+ {
+ Pos = MAP_APPFONT ( 60 , 57 ) ;
+ Size = MAP_APPFONT ( 194 , 10 ) ;
+ };
+ FixedText FT_MS_CONTENT
+ {
+ Pos = MAP_APPFONT ( 6 , 71 ) ;
+ Size = MAP_APPFONT ( 51 , 10 ) ;
+ LeftLabel = TRUE ;
+ Text [ en-US ] = "Contents:" ;
+ };
+ FixedText FT_MS_SHOW_CONTENT
+ {
+ Pos = MAP_APPFONT ( 60 , 71 ) ;
+ Size = MAP_APPFONT ( 194 , 10 ) ;
+ };
+ FixedLine FL_MS_GENERAL_SECOND
+ {
+ Pos = MAP_APPFONT ( 6 , 91 ) ;
+ Size = MAP_APPFONT ( 248 , 1 ) ;
+ };
+ FixedText FT_MS_CHANGEDATE
+ {
+ Pos = MAP_APPFONT ( 6 , 98 ) ;
+ Size = MAP_APPFONT ( 51 , 10 ) ;
+ LeftLabel = TRUE ;
+ Text [ en-US ] = "Modified:" ;
+ };
+ FixedText FT_MS_SHOW_CHANGEDATE
+ {
+ Pos = MAP_APPFONT ( 60 , 98 ) ;
+ Size = MAP_APPFONT ( 194 , 10 ) ;
+ };
+};
+
+/******************************************************************************/
+
+TabPage RID_SVXTABPAGE_GALLERYTHEME_FILES
+{
+ HelpId = HID_GALLERY_BROWSER ;
+ Hide = TRUE ;
+ SVLook = TRUE ;
+ Size = MAP_APPFONT ( 260 , 185 ) ;
+ FixedText FT_FILETYPE
+ {
+ Pos = MAP_APPFONT ( 6 , 8 ) ;
+ Size = MAP_APPFONT ( 48 , 10 ) ;
+ Text [ en-US ] = "~File type" ;
+ };
+ ComboBox CBB_FILETYPE
+ {
+ Pos = MAP_APPFONT ( 57 , 6 ) ;
+ Size = MAP_APPFONT ( 121 , 69 ) ;
+ TabStop = TRUE ;
+ DropDown = TRUE ;
+ AutoSize = TRUE;
+ AutoHScroll = TRUE ;
+ };
+ MultiListBox LBX_FOUND
+ {
+ Border = TRUE ;
+ Pos = MAP_APPFONT ( 6 , 23 ) ;
+ Size = MAP_APPFONT ( 172 , 156 ) ;
+ TabStop = TRUE ;
+ SimpleMode = TRUE ;
+ };
+ PushButton BTN_SEARCH
+ {
+ Pos = MAP_APPFONT ( 184 , 6 ) ;
+ Size = MAP_APPFONT ( 70 , 14 ) ;
+ TabStop = TRUE ;
+ Text [ en-US ] = "~Find Files..." ;
+ };
+ PushButton BTN_TAKE
+ {
+ Pos = MAP_APPFONT ( 184 , 24 ) ;
+ Size = MAP_APPFONT ( 70 , 14 ) ;
+ TabStop = TRUE ;
+ Text [ en-US ] = "~Add" ;
+ };
+ PushButton BTN_TAKEALL
+ {
+ Pos = MAP_APPFONT ( 184 , 42 ) ;
+ Size = MAP_APPFONT ( 70 , 14 ) ;
+ TabStop = TRUE ;
+ Text [ en-US ] = "A~dd All" ;
+ };
+ CheckBox CBX_PREVIEW
+ {
+ Pos = MAP_APPFONT ( 184 , 76 ) ;
+ Size = MAP_APPFONT ( 70 , 12 ) ;
+ Text [ en-US ] = "Pr~eview" ;
+ };
+ Window WND_BRSPRV
+ {
+ Border = TRUE ;
+ Pos = MAP_APPFONT ( 184 , 91 ) ;
+ Size = MAP_APPFONT ( 70 , 88 ) ;
+ };
+ PushButton BTN_MADDIN1
+ {
+ Pos = MAP_APPFONT ( 220 , 63 ) ;
+ Size = MAP_APPFONT ( 50 , 14 ) ;
+ TabStop = TRUE ;
+ Text [ en-US ] = "Maddin1" ;
+ };
+ PushButton BTN_MADDIN2
+ {
+ Pos = MAP_APPFONT ( 220 , 80 ) ;
+ Size = MAP_APPFONT ( 50 , 14 ) ;
+ TabStop = TRUE ;
+ Text [ en-US ] = "Maddin2" ;
+ };
+};
+
+/******************************************************************************/
+
+ModalDialog RID_SVXDLG_GALLERY_TITLE
+{
+ HelpId = HID_GALLERY_TITLE;
+ OutputSize = TRUE ;
+ Border = TRUE ;
+ SVLook = TRUE ;
+ Size = MAP_APPFONT ( 168 , 63 ) ;
+ Text [ en-US ] = "Enter Title" ;
+ Moveable = TRUE ;
+
+ OkButton BTN_OK
+ {
+ DefButton = TRUE ;
+ Pos = MAP_APPFONT ( 112 , 6 ) ;
+ Size = MAP_APPFONT ( 50 , 14 ) ;
+ TabStop = TRUE ;
+ };
+ CancelButton BTN_CANCEL
+ {
+ Pos = MAP_APPFONT ( 112 , 23 ) ;
+ Size = MAP_APPFONT ( 50 , 14 ) ;
+ TabStop = TRUE ;
+ };
+ HelpButton BTN_HELP
+ {
+ Pos = MAP_APPFONT ( 112 , 43 ) ;
+ Size = MAP_APPFONT ( 50 , 14 ) ;
+ TabStop = TRUE ;
+ };
+
+ FixedLine FL_TITLE
+ {
+ Pos = MAP_APPFONT ( 6 , 6 ) ;
+ Size = MAP_APPFONT ( 100 , 8 ) ;
+ Text [ en-US ] = "Title" ;
+ };
+ Edit EDT_TITLE
+ {
+ HelpId = HID_GALLERY_TITLE_EDIT;
+ Border = TRUE ;
+ Pos = MAP_APPFONT ( 12 , 18 ) ;
+ Size = MAP_APPFONT ( 88, 12 ) ;
+ };
+};
+
+/******************************************************************************/
+
+ModalDialog RID_SVXDLG_GALLERY_SEARCH_PROGRESS
+{
+ HelpId = HID_GALLERY_SEARCH ;
+ OutputSize = TRUE ;
+ Border = TRUE ;
+ SVLook = TRUE ;
+ Size = MAP_APPFONT ( 124 , 86 ) ;
+ Text [ en-US ] = "Find" ;
+ Moveable = TRUE ;
+ FixedLine FL_SEARCH_DIR
+ {
+ Pos = MAP_APPFONT ( 6 , 33 ) ;
+ Size = MAP_APPFONT ( 112 , 8 ) ;
+ Text [ en-US ] = "Directory" ;
+ };
+ FixedText FT_SEARCH_DIR
+ {
+ Pos = MAP_APPFONT ( 12 , 44 ) ;
+ Size = MAP_APPFONT ( 100 , 10 ) ;
+ };
+ CancelButton BTN_CANCEL
+ {
+ Pos = MAP_APPFONT ( 37 , 66 ) ;
+ Size = MAP_APPFONT ( 50 , 14 ) ;
+ TabStop = TRUE ;
+ };
+ FixedLine FL_SEARCH_TYPE
+ {
+ Pos = MAP_APPFONT ( 6 , 3 ) ;
+ Size = MAP_APPFONT ( 112 , 8 ) ;
+ Text [ en-US ] = "File type" ;
+ };
+ FixedText FT_SEARCH_TYPE
+ {
+ Pos = MAP_APPFONT ( 12 , 14 ) ;
+ Size = MAP_APPFONT ( 100 , 10 ) ;
+ };
+};
+
+/******************************************************************************/
+
+ModalDialog RID_SVXDLG_GALLERY_TAKE_PROGRESS
+{
+ HelpId = HID_GALLERY_APPLY ;
+ OutputSize = TRUE ;
+ Border = TRUE ;
+ SVLook = TRUE ;
+ Size = MAP_APPFONT ( 124 , 56 ) ;
+ Text [ en-US ] = "Apply" ;
+ Moveable = TRUE ;
+ FixedLine FL_TAKE_PROGRESS
+ {
+ Pos = MAP_APPFONT ( 6 , 3 ) ;
+ Size = MAP_APPFONT ( 112 , 8 ) ;
+ Text [ en-US ] = "File" ;
+ };
+ FixedText FT_TAKE_FILE
+ {
+ Pos = MAP_APPFONT ( 12 , 14 ) ;
+ Size = MAP_APPFONT ( 100 , 10 ) ;
+ };
+ CancelButton BTN_CANCEL
+ {
+ Pos = MAP_APPFONT ( 37 , 36 ) ;
+ Size = MAP_APPFONT ( 50 , 14 ) ;
+ TabStop = TRUE ;
+ };
+};
+
+/******************************************************************************/
+
+ModalDialog RID_SVXDLG_GALLERY_ACTUALIZE_PROGRESS
+{
+ HelpId = HID_GALLERY_ACTUALIZE;
+ OutputSize = TRUE ;
+ Border = TRUE ;
+ SVLook = TRUE ;
+ Size = MAP_APPFONT ( 124 , 56 ) ;
+ Text [ en-US ] = "Update" ;
+ Moveable = TRUE ;
+ FixedLine FL_ACTUALIZE_PROGRESS
+ {
+ Pos = MAP_APPFONT ( 6 , 3 ) ;
+ Size = MAP_APPFONT ( 112 , 8 ) ;
+ Text [ en-US ] = "File" ;
+ };
+ FixedText FT_ACTUALIZE_FILE
+ {
+ Pos = MAP_APPFONT ( 12 , 14 ) ;
+ Size = MAP_APPFONT ( 100 , 10 ) ;
+ };
+ CancelButton BTN_CANCEL
+ {
+ Pos = MAP_APPFONT ( 37 , 36 ) ;
+ Size = MAP_APPFONT ( 50 , 14 ) ;
+ TabStop = TRUE ;
+ };
+};
+
+ModalDialog RID_SVXDLG_GALLERY_THEMEID
+{
+ OutputSize = TRUE ;
+ Border = TRUE ;
+ SVLook = TRUE ;
+ Size = MAP_APPFONT ( 180 , 63 ) ;
+ Text [ en-US ] = "Theme ID" ;
+ Moveable = TRUE ;
+ OkButton BTN_OK
+ {
+ Pos = MAP_APPFONT ( 124 , 6 ) ;
+ Size = MAP_APPFONT ( 50 , 14 ) ;
+ TabStop = TRUE ;
+ DefButton = TRUE ;
+ };
+ CancelButton BTN_CANCEL
+ {
+ Pos = MAP_APPFONT ( 124 , 23 ) ;
+ Size = MAP_APPFONT ( 50 , 14 ) ;
+ TabStop = TRUE ;
+ };
+ FixedLine FL_ID
+ {
+ Pos = MAP_APPFONT ( 6 , 3 ) ;
+ Size = MAP_APPFONT ( 112 , 8 ) ;
+ Text [ en-US ] = "ID";
+ };
+ ListBox LB_RESNAME
+ {
+ Border = TRUE ;
+ Pos = MAP_APPFONT ( 12 , 14 ) ;
+ Size = MAP_APPFONT ( 100 , 60 ) ;
+ TabStop = TRUE ;
+ DropDown = TRUE ;
+ HScroll = TRUE ;
+ VScroll = TRUE ;
+ };
+};
+
+String RID_SVXSTR_GALLERY_NOFILES
+{
+ Text [ en-US ] = "<No Files>" ;
+};
+String RID_SVXSTR_GALLERY_SEARCH
+{
+ Text [ en-US ] = "Do you want to update the file list?" ;
+};
+String RID_SVXSTR_GALLERYPROPS_OBJECT
+{
+ Text [ en-US ] = "Object;Objects" ;
+};
+String RID_SVXSTR_GALLERYPROPS_GALTHEME
+{
+ Text [ en-US ] = "Gallery Theme" ;
+};
+String RID_SVXSTR_GALLERY_READONLY
+{
+ Text [ en-US ] = " (read-only)" ;
+};
+String RID_SVXSTR_GALLERY_ALLFILES
+{
+ Text [ en-US ] = "<All Files>" ;
+};
+String RID_SVXSTR_GALLERY_ID_EXISTS
+{
+ Text [ en-US ] = "This ID already exists..." ;
+};
+
+/******************************************************************************/
+
+Bitmap RID_SVXBMP_THEME_NORMAL_BIG
+{
+ File = "galnorl.bmp" ;
+};
+
+Bitmap RID_SVXBMP_THEME_IMPORTED_BIG
+{
+ File = "galimpl.bmp" ;
+};
+
+Bitmap RID_SVXBMP_THEME_READONLY_BIG
+{
+ File = "galrdol.bmp" ;
+};
+
+Bitmap RID_SVXBMP_THEME_DEFAULT_BIG
+{
+ File = "galdefl.bmp" ;
+};
+
+
diff --git a/svx/source/cui/grfflt.hrc b/cui/source/dialogs/grfflt.hrc
index b04d025d4d13..b04d025d4d13 100644
--- a/svx/source/cui/grfflt.hrc
+++ b/cui/source/dialogs/grfflt.hrc
diff --git a/svx/source/cui/grfflt.src b/cui/source/dialogs/grfflt.src
index ba1398d98b59..c01dc4060b6c 100644
--- a/svx/source/cui/grfflt.src
+++ b/cui/source/dialogs/grfflt.src
@@ -29,9 +29,10 @@
************************************************************************/
#include <svtools/controldims.hrc>
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "helpid.hrc"
#include "grfflt.hrc"
+#include <svx/dialogs.hrc>
// --------------------
// - DLG_FILTERMOSAIC -
diff --git a/svx/source/cui/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx
index 0d0c9348634f..afef3c1edb5f 100644
--- a/svx/source/cui/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -29,45 +29,29 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_cui.hxx"
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
#include "hangulhanjadlg.hxx"
-#ifndef SVX_HANGUL_HANJA_DLG_HRC
#include "hangulhanjadlg.hrc"
-#endif
#include "commonlingui.hxx"
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "helpid.hrc"
#include <algorithm>
#include <tools/urlobj.hxx>
#include <vcl/controllayout.hxx>
#include <vcl/msgbox.hxx>
-#include <svtools/lingucfg.hxx>
-#include <svtools/linguprops.hxx>
-//#ifndef _COM_SUN_STAR_FRAME_XSTORABLE_HPP_
-//#include <com/sun/star/frame/XStorable.hpp>
-//#endif
-#ifndef _COM_SUN_STAR_LINGUISTIC2_CONVERSIONDICTIONARYTYPE_HPP_
+#include <unotools/lingucfg.hxx>
+#include <unotools/linguprops.hxx>
#include <com/sun/star/linguistic2/ConversionDictionaryType.hpp>
-#ifndef _COM_SUN_STAR_LINGUISTIC2_CONVERSIONDIRECTION_HDL_
#include <com/sun/star/linguistic2/ConversionDirection.hdl>
-#endif
-#endif
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#ifndef _COM_SUN_STAR_I18N_TEXTCONVERSIONOPTION_HDL_
#include <com/sun/star/i18n/TextConversionOption.hdl>
-#endif
#include <com/sun/star/util/XFlushable.hpp>
#include <comphelper/processfactory.hxx>
-//#include <ucbhelper/content.hxx>
-
#define HHC HangulHanjaConversion
#define LINE_CNT static_cast< USHORT >(2)
@@ -540,28 +524,28 @@ namespace svx
//=========================================================================
//-------------------------------------------------------------------------
HangulHanjaConversionDialog::HangulHanjaConversionDialog( Window* _pParent, HHC::ConversionDirection _ePrimaryDirection )
- :ModalDialog( _pParent, SVX_RES( RID_SVX_MDLG_HANGULHANJA ) )
+ :ModalDialog( _pParent, CUI_RES( RID_SVX_MDLG_HANGULHANJA ) )
,m_pPlayground( new SvxCommonLinguisticControl( this ) )
- ,m_aFind ( m_pPlayground.get(), SVX_RES( PB_FIND ) )
- ,m_aSuggestions ( m_pPlayground.get(), SVX_RES( CTL_SUGGESTIONS ) )
- ,m_aFormat ( m_pPlayground.get(), SVX_RES( FT_FORMAT ) )
- ,m_aSimpleConversion( m_pPlayground.get(), SVX_RES( RB_SIMPLE_CONVERSION ) )
- ,m_aHangulBracketed ( m_pPlayground.get(), SVX_RES( RB_HANJA_HANGUL_BRACKETED ) )
- ,m_aHanjaBracketed ( m_pPlayground.get(), SVX_RES( RB_HANGUL_HANJA_BRACKETED ) )
- ,m_aConversion ( m_pPlayground.get(), SVX_RES( FT_CONVERSION ) )
- ,m_aHangulOnly ( m_pPlayground.get(), SVX_RES( CB_HANGUL_ONLY ) )
- ,m_aHanjaOnly ( m_pPlayground.get(), SVX_RES( CB_HANJA_ONLY ) )
- ,m_aReplaceByChar ( m_pPlayground.get(), SVX_RES( CB_REPLACE_BY_CHARACTER ) )
+ ,m_aFind ( m_pPlayground.get(), CUI_RES( PB_FIND ) )
+ ,m_aSuggestions ( m_pPlayground.get(), CUI_RES( CTL_SUGGESTIONS ) )
+ ,m_aFormat ( m_pPlayground.get(), CUI_RES( FT_FORMAT ) )
+ ,m_aSimpleConversion( m_pPlayground.get(), CUI_RES( RB_SIMPLE_CONVERSION ) )
+ ,m_aHangulBracketed ( m_pPlayground.get(), CUI_RES( RB_HANJA_HANGUL_BRACKETED ) )
+ ,m_aHanjaBracketed ( m_pPlayground.get(), CUI_RES( RB_HANGUL_HANJA_BRACKETED ) )
+ ,m_aConversion ( m_pPlayground.get(), CUI_RES( FT_CONVERSION ) )
+ ,m_aHangulOnly ( m_pPlayground.get(), CUI_RES( CB_HANGUL_ONLY ) )
+ ,m_aHanjaOnly ( m_pPlayground.get(), CUI_RES( CB_HANJA_ONLY ) )
+ ,m_aReplaceByChar ( m_pPlayground.get(), CUI_RES( CB_REPLACE_BY_CHARACTER ) )
,m_pIgnoreNonPrimary( NULL )
,m_bDocumentMode( true )
{
// special creation of the 4 pseudo-ruby radio buttons
- String sSecondaryHangul( SVX_RES( STR_HANGUL ) );
- String sSecondaryHanja( SVX_RES( STR_HANJA ) );
- m_pHanjaAbove.reset( new RubyRadioButton( m_pPlayground.get(), SVX_RES( RB_HANGUL_HANJA_ABOVE ), sSecondaryHanja, PseudoRubyText::eAbove ) );
- m_pHanjaBelow.reset( new RubyRadioButton( m_pPlayground.get(), SVX_RES( RB_HANGUL_HANJA_BELOW ), sSecondaryHanja, PseudoRubyText::eBelow ) );
- m_pHangulAbove.reset( new RubyRadioButton( m_pPlayground.get(), SVX_RES( RB_HANJA_HANGUL_ABOVE ), sSecondaryHangul, PseudoRubyText::eAbove ) );
- m_pHangulBelow.reset( new RubyRadioButton( m_pPlayground.get(), SVX_RES( RB_HANJA_HANGUL_BELOW ), sSecondaryHangul, PseudoRubyText::eBelow ) );
+ String sSecondaryHangul( CUI_RES( STR_HANGUL ) );
+ String sSecondaryHanja( CUI_RES( STR_HANJA ) );
+ m_pHanjaAbove.reset( new RubyRadioButton( m_pPlayground.get(), CUI_RES( RB_HANGUL_HANJA_ABOVE ), sSecondaryHanja, PseudoRubyText::eAbove ) );
+ m_pHanjaBelow.reset( new RubyRadioButton( m_pPlayground.get(), CUI_RES( RB_HANGUL_HANJA_BELOW ), sSecondaryHanja, PseudoRubyText::eBelow ) );
+ m_pHangulAbove.reset( new RubyRadioButton( m_pPlayground.get(), CUI_RES( RB_HANJA_HANGUL_ABOVE ), sSecondaryHangul, PseudoRubyText::eAbove ) );
+ m_pHangulBelow.reset( new RubyRadioButton( m_pPlayground.get(), CUI_RES( RB_HANJA_HANGUL_BELOW ), sSecondaryHangul, PseudoRubyText::eBelow ) );
// since these 4 buttons are not created within the other members, they have a wrong initial Z-Order
// correct this
@@ -594,7 +578,7 @@ namespace svx
// additionall, the playground is not wide enough (in it's default size)
sal_Int32 nEnlargeWidth = 0;
{
- FixedText aBottomAnchor( m_pPlayground.get(), SVX_RES( FT_RESIZE_ANCHOR ) );
+ FixedText aBottomAnchor( m_pPlayground.get(), CUI_RES( FT_RESIZE_ANCHOR ) );
Point aAnchorPos = aBottomAnchor.GetPosPixel();
nEnlargeWidth = aAnchorPos.X() - m_pPlayground->GetActionButtonsLocation().X();
@@ -1171,19 +1155,19 @@ namespace svx
}
HangulHanjaOptionsDialog::HangulHanjaOptionsDialog( Window* _pParent )
- :ModalDialog ( _pParent, SVX_RES( RID_SVX_MDLG_HANGULHANJA_OPT ) )
- ,m_aUserdefdictFT ( this, SVX_RES( FT_USERDEFDICT ) )
- ,m_aDictsLB ( this, SVX_RES( LB_DICTS ) )
- ,m_aOptionsFL ( this, SVX_RES( FL_OPTIONS ) )
- ,m_aIgnorepostCB ( this, SVX_RES( CB_IGNOREPOST ) )
- ,m_aShowrecentlyfirstCB ( this, SVX_RES( CB_SHOWRECENTLYFIRST ) )
- ,m_aAutoreplaceuniqueCB ( this, SVX_RES( CB_AUTOREPLACEUNIQUE ) )
- ,m_aNewPB ( this, SVX_RES( PB_HHO_NEW ) )
- ,m_aEditPB ( this, SVX_RES( PB_HHO_EDIT ) )
- ,m_aDeletePB ( this, SVX_RES( PB_HHO_DELETE ) )
- ,m_aOkPB ( this, SVX_RES( PB_HHO_OK ) )
- ,m_aCancelPB ( this, SVX_RES( PB_HHO_CANCEL ) )
- ,m_aHelpPB ( this, SVX_RES( PB_HHO_HELP ) )
+ :ModalDialog ( _pParent, CUI_RES( RID_SVX_MDLG_HANGULHANJA_OPT ) )
+ ,m_aUserdefdictFT ( this, CUI_RES( FT_USERDEFDICT ) )
+ ,m_aDictsLB ( this, CUI_RES( LB_DICTS ) )
+ ,m_aOptionsFL ( this, CUI_RES( FL_OPTIONS ) )
+ ,m_aIgnorepostCB ( this, CUI_RES( CB_IGNOREPOST ) )
+ ,m_aShowrecentlyfirstCB ( this, CUI_RES( CB_SHOWRECENTLYFIRST ) )
+ ,m_aAutoreplaceuniqueCB ( this, CUI_RES( CB_AUTOREPLACEUNIQUE ) )
+ ,m_aNewPB ( this, CUI_RES( PB_HHO_NEW ) )
+ ,m_aEditPB ( this, CUI_RES( PB_HHO_EDIT ) )
+ ,m_aDeletePB ( this, CUI_RES( PB_HHO_DELETE ) )
+ ,m_aOkPB ( this, CUI_RES( PB_HHO_OK ) )
+ ,m_aCancelPB ( this, CUI_RES( PB_HHO_CANCEL ) )
+ ,m_aHelpPB ( this, CUI_RES( PB_HHO_HELP ) )
,m_pCheckButtonData ( NULL )
,m_xConversionDictionaryList( NULL )
@@ -1272,13 +1256,13 @@ namespace svx
}
HangulHanjaNewDictDialog::HangulHanjaNewDictDialog( Window* _pParent )
- :ModalDialog ( _pParent, SVX_RES( RID_SVX_MDLG_HANGULHANJA_NEWDICT ) )
- ,m_aNewDictFL ( this, SVX_RES( FL_NEWDICT ) )
- ,m_aDictNameFT ( this, SVX_RES( FT_DICTNAME ) )
- ,m_aDictNameED ( this, SVX_RES( ED_DICTNAME ) )
- ,m_aOkBtn ( this, SVX_RES( PB_NEWDICT_OK ) )
- ,m_aCancelBtn ( this, SVX_RES( PB_NEWDICT_ESC ) )
- ,m_aHelpBtn ( this, SVX_RES( PB_NEWDICT_HLP ) )
+ :ModalDialog ( _pParent, CUI_RES( RID_SVX_MDLG_HANGULHANJA_NEWDICT ) )
+ ,m_aNewDictFL ( this, CUI_RES( FL_NEWDICT ) )
+ ,m_aDictNameFT ( this, CUI_RES( FT_DICTNAME ) )
+ ,m_aDictNameED ( this, CUI_RES( ED_DICTNAME ) )
+ ,m_aOkBtn ( this, CUI_RES( PB_NEWDICT_OK ) )
+ ,m_aCancelBtn ( this, CUI_RES( PB_NEWDICT_ESC ) )
+ ,m_aHelpBtn ( this, CUI_RES( PB_NEWDICT_HLP ) )
,m_bEntered ( false )
{
@@ -1841,25 +1825,25 @@ namespace svx
}
HangulHanjaEditDictDialog::HangulHanjaEditDictDialog( Window* _pParent, HHDictList& _rDictList, sal_uInt32 _nSelDict )
- :ModalDialog ( _pParent, SVX_RES( RID_SVX_MDLG_HANGULHANJA_EDIT ) )
- ,m_aEditHintText ( SVX_RES( STR_EDITHINT ) )
+ :ModalDialog ( _pParent, CUI_RES( RID_SVX_MDLG_HANGULHANJA_EDIT ) )
+ ,m_aEditHintText ( CUI_RES( STR_EDITHINT ) )
,m_rDictList ( _rDictList )
,m_nCurrentDict ( 0xFFFFFFFF )
,m_pSuggestions ( NULL )
- ,m_aBookFT ( this, SVX_RES( FT_BOOK ) )
- ,m_aBookLB ( this, SVX_RES( LB_BOOK ) )
- ,m_aOriginalFT ( this, SVX_RES( FT_ORIGINAL ) )
- ,m_aOriginalLB ( this, SVX_RES( LB_ORIGINAL ) )
- ,m_aSuggestionsFT ( this, SVX_RES( FT_SUGGESTIONS ) )
- ,m_aEdit1 ( this, SVX_RES( ED_1 ), m_aScrollSB, NULL, &m_aEdit2 )
- ,m_aEdit2 ( this, SVX_RES( ED_2 ), m_aScrollSB, &m_aEdit1, &m_aEdit3 )
- ,m_aEdit3 ( this, SVX_RES( ED_3 ), m_aScrollSB, &m_aEdit2, &m_aEdit4 )
- ,m_aEdit4 ( this, SVX_RES( ED_4 ), m_aScrollSB, &m_aEdit3, NULL )
- ,m_aScrollSB ( this, SVX_RES( SB_SCROLL ) )
- ,m_aNewPB ( this, SVX_RES( PB_HHE_NEW ) )
- ,m_aDeletePB ( this, SVX_RES( PB_HHE_DELETE ) )
- ,m_aHelpPB ( this, SVX_RES( PB_HHE_HELP ) )
- ,m_aClosePB ( this, SVX_RES( PB_HHE_CLOSE ) )
+ ,m_aBookFT ( this, CUI_RES( FT_BOOK ) )
+ ,m_aBookLB ( this, CUI_RES( LB_BOOK ) )
+ ,m_aOriginalFT ( this, CUI_RES( FT_ORIGINAL ) )
+ ,m_aOriginalLB ( this, CUI_RES( LB_ORIGINAL ) )
+ ,m_aSuggestionsFT ( this, CUI_RES( FT_SUGGESTIONS ) )
+ ,m_aEdit1 ( this, CUI_RES( ED_1 ), m_aScrollSB, NULL, &m_aEdit2 )
+ ,m_aEdit2 ( this, CUI_RES( ED_2 ), m_aScrollSB, &m_aEdit1, &m_aEdit3 )
+ ,m_aEdit3 ( this, CUI_RES( ED_3 ), m_aScrollSB, &m_aEdit2, &m_aEdit4 )
+ ,m_aEdit4 ( this, CUI_RES( ED_4 ), m_aScrollSB, &m_aEdit3, NULL )
+ ,m_aScrollSB ( this, CUI_RES( SB_SCROLL ) )
+ ,m_aNewPB ( this, CUI_RES( PB_HHE_NEW ) )
+ ,m_aDeletePB ( this, CUI_RES( PB_HHE_DELETE ) )
+ ,m_aHelpPB ( this, CUI_RES( PB_HHE_HELP ) )
+ ,m_aClosePB ( this, CUI_RES( PB_HHE_CLOSE ) )
,m_nTopPos ( 0 )
,m_bModifiedSuggestions ( false )
,m_bModifiedOriginal ( false )
diff --git a/svx/source/cui/hangulhanjadlg.hrc b/cui/source/dialogs/hangulhanjadlg.hrc
index 882d12a4c997..882d12a4c997 100644
--- a/svx/source/cui/hangulhanjadlg.hrc
+++ b/cui/source/dialogs/hangulhanjadlg.hrc
diff --git a/svx/source/cui/hangulhanjadlg.src b/cui/source/dialogs/hangulhanjadlg.src
index 920f99e03aec..93d58755b14b 100644
--- a/svx/source/cui/hangulhanjadlg.src
+++ b/cui/source/dialogs/hangulhanjadlg.src
@@ -27,7 +27,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "helpid.hrc"
#ifndef SVX_HANGUL_HANJA_DLG_HRC
diff --git a/svx/source/cui/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx
index 8ecaf7429edd..0a2dfa9955f5 100644
--- a/svx/source/cui/hldocntp.cxx
+++ b/cui/source/dialogs/hldocntp.cxx
@@ -29,11 +29,7 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
#include "hldocntp.hxx"
#include <sfx2/viewfrm.hxx>
@@ -46,8 +42,8 @@
#include <tools/config.hxx>
#include <vcl/image.hxx>
#include <tools/urlobj.hxx>
-#include <svtools/pathoptions.hxx>
-#include <svtools/dynamicmenuoptions.hxx>
+#include <unotools/pathoptions.hxx>
+#include <unotools/dynamicmenuoptions.hxx>
#include <sfx2/filedlghelper.hxx>
#include <unotools/ucbstreamhelper.hxx>
#include <unotools/ucbhelper.hxx>
@@ -119,18 +115,18 @@ sal_Bool SvxHyperlinkNewDocTp::ImplGetURLObject( const String& rPath, const Stri
|************************************************************************/
SvxHyperlinkNewDocTp::SvxHyperlinkNewDocTp ( Window *pParent, const SfxItemSet& rItemSet)
-: SvxHyperlinkTabPageBase ( pParent, SVX_RES( RID_SVXPAGE_HYPERLINK_NEWDOCUMENT ), rItemSet ),
- maGrpNewDoc ( this, SVX_RES (GRP_NEWDOCUMENT) ),
- maRbtEditNow ( this, SVX_RES (RB_EDITNOW) ),
- maRbtEditLater ( this, SVX_RES (RB_EDITLATER) ),
- maFtPath ( this, SVX_RES (FT_PATH_NEWDOC) ),
+: SvxHyperlinkTabPageBase ( pParent, CUI_RES( RID_SVXPAGE_HYPERLINK_NEWDOCUMENT ), rItemSet ),
+ maGrpNewDoc ( this, CUI_RES (GRP_NEWDOCUMENT) ),
+ maRbtEditNow ( this, CUI_RES (RB_EDITNOW) ),
+ maRbtEditLater ( this, CUI_RES (RB_EDITLATER) ),
+ maFtPath ( this, CUI_RES (FT_PATH_NEWDOC) ),
maCbbPath ( this, INET_PROT_FILE ),
- maBtCreate ( this, SVX_RES (BTN_CREATE) ),
- maFtDocTypes ( this, SVX_RES (FT_DOCUMENT_TYPES) ),
- maLbDocTypes ( this, SVX_RES (LB_DOCUMENT_TYPES) )
+ maBtCreate ( this, CUI_RES (BTN_CREATE) ),
+ maFtDocTypes ( this, CUI_RES (FT_DOCUMENT_TYPES) ),
+ maLbDocTypes ( this, CUI_RES (LB_DOCUMENT_TYPES) )
{
// Set HC bitmaps and disable display of bitmap names.
- maBtCreate.SetModeImage( Image( SVX_RES( IMG_CREATE_HC ) ), BMP_COLOR_HIGHCONTRAST );
+ maBtCreate.SetModeImage( Image( CUI_RES( IMG_CREATE_HC ) ), BMP_COLOR_HIGHCONTRAST );
maBtCreate.EnableTextDisplay (FALSE);
InitStdControls();
@@ -323,7 +319,7 @@ BOOL SvxHyperlinkNewDocTp::AskApply()
sal_Bool bRet = ImplGetURLObject( maCbbPath.GetText(), maCbbPath.GetBaseURL(), aINetURLObject );
if ( !bRet )
{
- WarningBox aWarning( this, WB_OK, SVX_RESSTR(RID_SVXSTR_HYPDLG_NOVALIDFILENAME) );
+ WarningBox aWarning( this, WB_OK, CUI_RESSTR(RID_SVXSTR_HYPDLG_NOVALIDFILENAME) );
aWarning.Execute();
}
return bRet;
@@ -373,7 +369,7 @@ void SvxHyperlinkNewDocTp::DoApply ()
if( bOk )
{
- WarningBox aWarning( this, WB_YES_NO, SVX_RESSTR(RID_SVXSTR_HYPERDLG_QUERYOVERWRITE) );
+ WarningBox aWarning( this, WB_YES_NO, CUI_RESSTR(RID_SVXSTR_HYPERDLG_QUERYOVERWRITE) );
bCreate = aWarning.Execute() == BUTTON_YES;
}
}
diff --git a/svx/source/cui/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx
index 34d8ea450e2a..1f4689c33fff 100644
--- a/svx/source/cui/hldoctp.cxx
+++ b/cui/source/dialogs/hldoctp.cxx
@@ -29,11 +29,7 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
#include "cuihyperdlg.hxx"
#include <unotools/localfilehelper.hxx>
@@ -58,23 +54,23 @@ sal_Char __READONLY_DATA sHTTPScheme[] = INET_HTTP_SCHEME;
|************************************************************************/
SvxHyperlinkDocTp::SvxHyperlinkDocTp ( Window *pParent, const SfxItemSet& rItemSet)
- : SvxHyperlinkTabPageBase ( pParent, SVX_RES( RID_SVXPAGE_HYPERLINK_DOCUMENT ), rItemSet ),
- maGrpDocument ( this, SVX_RES (GRP_DOCUMENT) ),
- maFtPath ( this, SVX_RES (FT_PATH_DOC) ),
+ : SvxHyperlinkTabPageBase ( pParent, CUI_RES( RID_SVXPAGE_HYPERLINK_DOCUMENT ), rItemSet ),
+ maGrpDocument ( this, CUI_RES (GRP_DOCUMENT) ),
+ maFtPath ( this, CUI_RES (FT_PATH_DOC) ),
maCbbPath ( this, INET_PROT_FILE ),
- maBtFileopen ( this, SVX_RES (BTN_FILEOPEN) ),
- maGrpTarget ( this, SVX_RES (GRP_TARGET) ),
- maFtTarget ( this, SVX_RES (FT_TARGET_DOC) ),
- maEdTarget ( this, SVX_RES (ED_TARGET_DOC) ),
- maFtURL ( this, SVX_RES (FT_URL) ),
- maFtFullURL ( this, SVX_RES (FT_FULL_URL) ),
- maBtBrowse ( this, SVX_RES (BTN_BROWSE) ),
+ maBtFileopen ( this, CUI_RES (BTN_FILEOPEN) ),
+ maGrpTarget ( this, CUI_RES (GRP_TARGET) ),
+ maFtTarget ( this, CUI_RES (FT_TARGET_DOC) ),
+ maEdTarget ( this, CUI_RES (ED_TARGET_DOC) ),
+ maFtURL ( this, CUI_RES (FT_URL) ),
+ maFtFullURL ( this, CUI_RES (FT_FULL_URL) ),
+ maBtBrowse ( this, CUI_RES (BTN_BROWSE) ),
mbMarkWndOpen ( FALSE )
{
// Set HC bitmaps and disable display of bitmap names.
- maBtBrowse.SetModeImage( Image( SVX_RES( IMG_BROWSE_HC ) ), BMP_COLOR_HIGHCONTRAST );
+ maBtBrowse.SetModeImage( Image( CUI_RES( IMG_BROWSE_HC ) ), BMP_COLOR_HIGHCONTRAST );
maBtBrowse.EnableTextDisplay (FALSE);
- maBtFileopen.SetModeImage( Image( SVX_RES( IMG_FILEOPEN_HC ) ), BMP_COLOR_HIGHCONTRAST );
+ maBtFileopen.SetModeImage( Image( CUI_RES( IMG_FILEOPEN_HC ) ), BMP_COLOR_HIGHCONTRAST );
maBtFileopen.EnableTextDisplay (FALSE);
InitStdControls();
diff --git a/svx/source/cui/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx
index 218cc73d8a82..ef0a330f00ef 100644
--- a/svx/source/cui/hlinettp.cxx
+++ b/cui/source/dialogs/hlinettp.cxx
@@ -29,14 +29,11 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_cui.hxx"
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
-#include <svtools/adrparse.hxx>
-#include <svtools/pathoptions.hxx>
-#include <svtools/useroptions.hxx>
+#include <unotools/pathoptions.hxx>
+#include <unotools/useroptions.hxx>
+#include <svl/adrparse.hxx>
#include "hlinettp.hxx"
#include "hyperdlg.hrc"
@@ -59,27 +56,27 @@ sal_Char __READONLY_DATA sTelnetScheme[] = INET_TELNET_SCHEME;
SvxHyperlinkInternetTp::SvxHyperlinkInternetTp ( Window *pParent,
const SfxItemSet& rItemSet)
-: SvxHyperlinkTabPageBase ( pParent, SVX_RES( RID_SVXPAGE_HYPERLINK_INTERNET ),
+: SvxHyperlinkTabPageBase ( pParent, CUI_RES( RID_SVXPAGE_HYPERLINK_INTERNET ),
rItemSet ) ,
- maGrpLinkTyp ( this, SVX_RES (GRP_LINKTYPE) ),
- maRbtLinktypInternet ( this, SVX_RES (RB_LINKTYP_INTERNET) ),
- maRbtLinktypFTP ( this, SVX_RES (RB_LINKTYP_FTP) ),
- maRbtLinktypTelnet ( this, SVX_RES (RB_LINKTYP_TELNET) ),
- maFtTarget ( this, SVX_RES (FT_TARGET_HTML) ),
+ maGrpLinkTyp ( this, CUI_RES (GRP_LINKTYPE) ),
+ maRbtLinktypInternet ( this, CUI_RES (RB_LINKTYP_INTERNET) ),
+ maRbtLinktypFTP ( this, CUI_RES (RB_LINKTYP_FTP) ),
+ maRbtLinktypTelnet ( this, CUI_RES (RB_LINKTYP_TELNET) ),
+ maFtTarget ( this, CUI_RES (FT_TARGET_HTML) ),
maCbbTarget ( this, INET_PROT_HTTP ),
- maFtLogin ( this, SVX_RES (FT_LOGIN) ),
- maEdLogin ( this, SVX_RES (ED_LOGIN) ),
- maFtPassword ( this, SVX_RES (FT_PASSWD) ),
- maEdPassword ( this, SVX_RES (ED_PASSWD) ),
- maCbAnonymous ( this, SVX_RES (CBX_ANONYMOUS) ),
- maBtBrowse ( this, SVX_RES (BTN_BROWSE) ),
- maBtTarget ( this, SVX_RES (BTN_TARGET) ),
+ maFtLogin ( this, CUI_RES (FT_LOGIN) ),
+ maEdLogin ( this, CUI_RES (ED_LOGIN) ),
+ maFtPassword ( this, CUI_RES (FT_PASSWD) ),
+ maEdPassword ( this, CUI_RES (ED_PASSWD) ),
+ maCbAnonymous ( this, CUI_RES (CBX_ANONYMOUS) ),
+ maBtBrowse ( this, CUI_RES (BTN_BROWSE) ),
+ maBtTarget ( this, CUI_RES (BTN_TARGET) ),
mbMarkWndOpen ( FALSE )
{
// Set HC bitmaps and display display of bitmap names.
- maBtBrowse.SetModeImage( Image( SVX_RES( IMG_BROWSE_HC ) ), BMP_COLOR_HIGHCONTRAST );
+ maBtBrowse.SetModeImage( Image( CUI_RES( IMG_BROWSE_HC ) ), BMP_COLOR_HIGHCONTRAST );
maBtBrowse.EnableTextDisplay (FALSE);
- maBtTarget.SetModeImage( Image( SVX_RES( IMG_TARGET_HC ) ), BMP_COLOR_HIGHCONTRAST );
+ maBtTarget.SetModeImage( Image( CUI_RES( IMG_TARGET_HC ) ), BMP_COLOR_HIGHCONTRAST );
maBtTarget.EnableTextDisplay (FALSE);
InitStdControls();
diff --git a/svx/source/cui/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx
index 982e79c9d921..389fb20bf48b 100644
--- a/svx/source/cui/hlmailtp.cxx
+++ b/cui/source/dialogs/hlmailtp.cxx
@@ -29,11 +29,8 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_cui.hxx"
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
#include <com/sun/star/frame/XDispatchProvider.hpp>
#include <com/sun/star/util/XURLTransformer.hpp>
#include <com/sun/star/frame/FrameSearchFlag.hpp>
@@ -41,8 +38,8 @@
#include <comphelper/processfactory.hxx>
#include <sfx2/viewfrm.hxx>
-#include <svtools/pathoptions.hxx>
-#include <svtools/moduleoptions.hxx>
+#include <unotools/pathoptions.hxx>
+#include <unotools/moduleoptions.hxx>
#include "hlmailtp.hxx"
#include "hyperdlg.hrc"
@@ -57,19 +54,19 @@ using namespace ::com::sun::star;
|************************************************************************/
SvxHyperlinkMailTp::SvxHyperlinkMailTp ( Window *pParent, const SfxItemSet& rItemSet)
-: SvxHyperlinkTabPageBase ( pParent, SVX_RES( RID_SVXPAGE_HYPERLINK_MAIL ),
+: SvxHyperlinkTabPageBase ( pParent, CUI_RES( RID_SVXPAGE_HYPERLINK_MAIL ),
rItemSet ),
- maGrpMailNews ( this, SVX_RES (GRP_MAILNEWS) ),
- maRbtMail ( this, SVX_RES (RB_LINKTYP_MAIL) ),
- maRbtNews ( this, SVX_RES (RB_LINKTYP_NEWS) ),
- maFtReceiver ( this, SVX_RES (FT_RECEIVER) ),
+ maGrpMailNews ( this, CUI_RES (GRP_MAILNEWS) ),
+ maRbtMail ( this, CUI_RES (RB_LINKTYP_MAIL) ),
+ maRbtNews ( this, CUI_RES (RB_LINKTYP_NEWS) ),
+ maFtReceiver ( this, CUI_RES (FT_RECEIVER) ),
maCbbReceiver ( this, INET_PROT_MAILTO ),
- maBtAdrBook ( this, SVX_RES (BTN_ADRESSBOOK) ),
- maFtSubject ( this, SVX_RES (FT_SUBJECT) ),
- maEdSubject ( this, SVX_RES (ED_SUBJECT) )
+ maBtAdrBook ( this, CUI_RES (BTN_ADRESSBOOK) ),
+ maFtSubject ( this, CUI_RES (FT_SUBJECT) ),
+ maEdSubject ( this, CUI_RES (ED_SUBJECT) )
{
// Set HC bitmaps and disable display of bitmap names.
- maBtAdrBook.SetModeImage( Image( SVX_RES( IMG_ADRESSBOOK_HC ) ), BMP_COLOR_HIGHCONTRAST );
+ maBtAdrBook.SetModeImage( Image( CUI_RES( IMG_ADRESSBOOK_HC ) ), BMP_COLOR_HIGHCONTRAST );
maBtAdrBook.EnableTextDisplay (FALSE);
InitStdControls();
diff --git a/svx/source/cui/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx
index 86dc32c6d720..f5005dbedfd7 100644
--- a/svx/source/cui/hlmarkwn.cxx
+++ b/cui/source/dialogs/hlmarkwn.cxx
@@ -29,13 +29,10 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_cui.hxx"
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
#include <vcl/wrkwin.hxx>
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
#include <sfx2/docfile.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
@@ -52,7 +49,7 @@
#include <toolkit/unohlp.hxx>
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "hlmarkwn.hrc"
#include "hlmarkwn.hxx"
#include "hltpbase.hxx"
@@ -110,10 +107,10 @@ void SvxHlmarkTreeLBox::Paint( const Rectangle& rRect )
switch( mpParentWnd->mnError )
{
case LERR_NOENTRIES :
- aStrMessage = SVX_RESSTR( RID_SVXSTR_HYPDLG_ERR_LERR_NOENTRIES );
+ aStrMessage = CUI_RESSTR( RID_SVXSTR_HYPDLG_ERR_LERR_NOENTRIES );
break;
case LERR_DOCNOTOPEN :
- aStrMessage = SVX_RESSTR( RID_SVXSTR_HYPDLG_ERR_LERR_DOCNOTOPEN );
+ aStrMessage = CUI_RESSTR( RID_SVXSTR_HYPDLG_ERR_LERR_DOCNOTOPEN );
break;
}
@@ -135,10 +132,10 @@ void SvxHlmarkTreeLBox::Paint( const Rectangle& rRect )
|************************************************************************/
SvxHlinkDlgMarkWnd::SvxHlinkDlgMarkWnd( SvxHyperlinkTabPageBase *pParent )
-: ModalDialog( (Window*)pParent, SVX_RES ( RID_SVXFLOAT_HYPERLINK_MARKWND ) ),
- maBtApply( this, SVX_RES (BT_APPLY) ),
- maBtClose( this, SVX_RES (BT_CLOSE) ),
- maLbTree ( this, SVX_RES (TLB_MARK) ),
+: ModalDialog( (Window*)pParent, CUI_RES ( RID_SVXFLOAT_HYPERLINK_MARKWND ) ),
+ maBtApply( this, CUI_RES (BT_APPLY) ),
+ maBtClose( this, CUI_RES (BT_CLOSE) ),
+ maLbTree ( this, CUI_RES (TLB_MARK) ),
mbUserMoved ( FALSE ),
mbFirst ( TRUE ),
mpParent ( pParent ),
diff --git a/svx/source/inc/hlmarkwn.hrc b/cui/source/dialogs/hlmarkwn.hrc
index d79da8b38dd6..d79da8b38dd6 100644
--- a/svx/source/inc/hlmarkwn.hrc
+++ b/cui/source/dialogs/hlmarkwn.hrc
diff --git a/svx/source/cui/hlmarkwn.src b/cui/source/dialogs/hlmarkwn.src
index 4618ee6c9549..48bf6d40fcb6 100644
--- a/svx/source/cui/hlmarkwn.src
+++ b/cui/source/dialogs/hlmarkwn.src
@@ -28,7 +28,7 @@
*
************************************************************************/
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "helpid.hrc"
#include "hlmarkwn.hrc"
diff --git a/svx/source/cui/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx
index b727602255f7..8ee78806ab0e 100644
--- a/svx/source/cui/hltpbase.cxx
+++ b/cui/source/dialogs/hltpbase.cxx
@@ -29,28 +29,21 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_cui.hxx"
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
#include <sfx2/frame.hxx>
#include <sfx2/viewfrm.hxx>
#include <sot/formats.hxx>
#include <sfx2/sfxsids.hrc>
-#include <svtools/macitem.hxx>
+#include <svl/macitem.hxx>
#include <ucbhelper/content.hxx>
#include <unotools/localfilehelper.hxx>
#include "hyperdlg.hrc"
-//CHINA001 #ifndef _SVX_TAB_HYPERLINK_HXX
-//CHINA001 #include "hyperdlg.hxx"
-//CHINA001 #endif
#include "cuihyperdlg.hxx" //CHINA001
#include "hltpbase.hxx"
#include "macroass.hxx"
-
#include <svx/svxdlg.hxx> //CHINA001
-#include <svx/dialogs.hrc> //CHINA001
+#include <cuires.hrc> //CHINA001
using namespace ::ucbhelper;
@@ -447,8 +440,8 @@ void SvxHyperlinkTabPageBase::FillStandardDlgFields ( SvxHyperlinkItem* pHyperli
mpCbbFrame->SetText ( pHyperlinkItem->GetTargetFrame() );
// Form
- String aStrFormText = SVX_RESSTR( RID_SVXSTR_HYPERDLG_FROM_TEXT );
- String aStrFormButton = SVX_RESSTR( RID_SVXSTR_HYPERDLG_FORM_BUTTON );
+ String aStrFormText = CUI_RESSTR( RID_SVXSTR_HYPERDLG_FROM_TEXT );
+ String aStrFormButton = CUI_RESSTR( RID_SVXSTR_HYPERDLG_FORM_BUTTON );
if( pHyperlinkItem->GetInsertMode() & HLINK_HTMLMODE )
{
@@ -596,13 +589,13 @@ IMPL_LINK ( SvxHyperlinkTabPageBase, ClickScriptHdl_Impl, void *, EMPTYARG )
SfxMacroTabPage *pMacroPage = (SfxMacroTabPage*) aDlg.GetTabPage();
if ( pHyperlinkItem->GetMacroEvents() & HYPERDLG_EVENT_MOUSEOVER_OBJECT )
- pMacroPage->AddEvent( String( SVX_RESSTR(RID_SVXSTR_HYPDLG_MACROACT1) ),
+ pMacroPage->AddEvent( String( CUI_RESSTR(RID_SVXSTR_HYPDLG_MACROACT1) ),
SFX_EVENT_MOUSEOVER_OBJECT );
if ( pHyperlinkItem->GetMacroEvents() & HYPERDLG_EVENT_MOUSECLICK_OBJECT )
- pMacroPage->AddEvent( String( SVX_RESSTR(RID_SVXSTR_HYPDLG_MACROACT2) ),
+ pMacroPage->AddEvent( String( CUI_RESSTR(RID_SVXSTR_HYPDLG_MACROACT2) ),
SFX_EVENT_MOUSECLICK_OBJECT);
if ( pHyperlinkItem->GetMacroEvents() & HYPERDLG_EVENT_MOUSEOUT_OBJECT )
- pMacroPage->AddEvent( String( SVX_RESSTR(RID_SVXSTR_HYPDLG_MACROACT3) ),
+ pMacroPage->AddEvent( String( CUI_RESSTR(RID_SVXSTR_HYPDLG_MACROACT3) ),
SFX_EVENT_MOUSEOUT_OBJECT);
// --> PB 2006-01-13 #123474#
diff --git a/svx/source/inc/hyperdlg.hrc b/cui/source/dialogs/hyperdlg.hrc
index 69dae5d1ce57..69dae5d1ce57 100644
--- a/svx/source/inc/hyperdlg.hrc
+++ b/cui/source/dialogs/hyperdlg.hrc
diff --git a/svx/source/dialog/hyperdlg.src b/cui/source/dialogs/hyperdlg.src
index 9375ac96ba09..4811fa4662e6 100644
--- a/svx/source/dialog/hyperdlg.src
+++ b/cui/source/dialogs/hyperdlg.src
@@ -29,7 +29,7 @@
************************************************************************/
#include <svtools/controldims.hrc>
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "helpid.hrc"
#include "hyperdlg.hrc"
diff --git a/svx/source/cui/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx
index 5099fdce6af2..95f49308acb4 100644
--- a/svx/source/cui/iconcdlg.cxx
+++ b/cui/source/dialogs/iconcdlg.cxx
@@ -29,28 +29,21 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_cui.hxx"
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
#include <sfx2/app.hxx>
#include <tools/rc.h>
#include <tools/shl.hxx>
#define _SVSTDARR_USHORTS
-#include <svtools/svstdarr.hxx>
-#include <svx/dialmgr.hxx>
+#include <svl/svstdarr.hxx>
+#include <dialmgr.hxx>
#include "iconcdlg.hxx"
-#ifndef _SVX_HELPID_HRC
#include "helpid.hrc"
-#endif
-#ifndef _SVX_DIALOGS_HRC
-#include <svx/dialogs.hrc>
-#endif
-#include <svtools/viewoptions.hxx>
+#include <cuires.hrc>
+#include <unotools/viewoptions.hxx>
#include <svtools/apearcfg.hxx>
#include <vcl/mnemonic.hxx>
#include <vcl/i18nhelp.hxx>
@@ -324,7 +317,7 @@ IconChoiceDialog::IconChoiceDialog ( Window* pParent, const ResId &rResId,
aOKBtn.SetHelpId( HID_ICCDIALOG_OK_BTN );
aCancelBtn.SetHelpId( HID_ICCDIALOG_CANCEL_BTN );
aResetBtn.SetClickHdl( LINK( this, IconChoiceDialog, ResetHdl ) );
- aResetBtn.SetText( SVX_RESSTR(RID_SVXSTR_ICONCHOICEDLG_RESETBUT) );
+ aResetBtn.SetText( CUI_RESSTR(RID_SVXSTR_ICONCHOICEDLG_RESETBUT) );
aResetBtn.SetHelpId( HID_ICCDIALOG_RESET_BTN );
aOKBtn.Show();
aCancelBtn.Show();
diff --git a/svx/source/cui/iconcdlg.src b/cui/source/dialogs/iconcdlg.src
index 1594eb43a8c7..83c8b8825aaf 100644
--- a/svx/source/cui/iconcdlg.src
+++ b/cui/source/dialogs/iconcdlg.src
@@ -27,7 +27,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
String RID_SVXSTR_ICONCHOICEDLG_RESETBUT
{
diff --git a/svx/source/cui/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index d53c300c79c7..3bbcf25643e0 100644
--- a/svx/source/cui/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -29,11 +29,8 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_cui.hxx"
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
#include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
#include <com/sun/star/ui/dialogs/XFilePicker.hpp>
@@ -49,13 +46,13 @@
#include <com/sun/star/task/XInteractionHandler.hpp>
#include "insdlg.hxx"
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
#include <svtools/sores.hxx>
#include <stdio.h>
#include <tools/urlobj.hxx>
#include <tools/debug.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
#include <svtools/svmedit.hxx>
#include <vcl/button.hxx>
#include <vcl/fixed.hxx>
@@ -67,12 +64,11 @@
#include <sfx2/frmdescr.hxx>
#include <sfx2/viewsh.hxx>
#include <sfx2/filedlghelper.hxx>
-#include <svtools/ownlist.hxx>
+#include <svl/ownlist.hxx>
#include <comphelper/seqstream.hxx>
#include "svuidlg.hrc"
-
#include <osl/file.hxx>
#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
@@ -87,7 +83,7 @@ using namespace ::com::sun::star::ui::dialogs;
using ::rtl::OUString;
#define _SVSTDARR_STRINGSDTOR
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
static String impl_getSvtResString( sal_uInt32 nId )
@@ -215,18 +211,18 @@ SvInsertOleDlg::SvInsertOleDlg
const Reference < embed::XStorage >& xStorage,
const SvObjectServerList* pServers
)
- : InsertObjectDialog_Impl( pParent, SVX_RES( MD_INSERT_OLEOBJECT ), xStorage ),
- aRbNewObject( this, SVX_RES( RB_NEW_OBJECT ) ),
- aRbObjectFromfile( this, SVX_RES( RB_OBJECT_FROMFILE ) ),
- aLbObjecttype( this, SVX_RES( LB_OBJECTTYPE ) ),
- aEdFilepath( this, SVX_RES( ED_FILEPATH ) ),
- aBtnFilepath( this, SVX_RES( BTN_FILEPATH ) ),
- aCbFilelink( this, SVX_RES( CB_FILELINK ) ),
- aGbObject( this, SVX_RES( GB_OBJECT ) ),
- aOKButton1( this, SVX_RES( 1 ) ),
- aCancelButton1( this, SVX_RES( 1 ) ),
- aHelpButton1( this, SVX_RES( 1 ) ),
- aStrFile( SVX_RES( STR_FILE ) ),
+ : InsertObjectDialog_Impl( pParent, CUI_RES( MD_INSERT_OLEOBJECT ), xStorage ),
+ aRbNewObject( this, CUI_RES( RB_NEW_OBJECT ) ),
+ aRbObjectFromfile( this, CUI_RES( RB_OBJECT_FROMFILE ) ),
+ aLbObjecttype( this, CUI_RES( LB_OBJECTTYPE ) ),
+ aEdFilepath( this, CUI_RES( ED_FILEPATH ) ),
+ aBtnFilepath( this, CUI_RES( BTN_FILEPATH ) ),
+ aCbFilelink( this, CUI_RES( CB_FILELINK ) ),
+ aGbObject( this, CUI_RES( GB_OBJECT ) ),
+ aOKButton1( this, CUI_RES( 1 ) ),
+ aCancelButton1( this, CUI_RES( 1 ) ),
+ aHelpButton1( this, CUI_RES( 1 ) ),
+ aStrFile( CUI_RES( STR_FILE ) ),
m_pServers( pServers )
{
FreeResource();
@@ -460,15 +456,15 @@ IMPL_LINK( SvInsertPlugInDialog, BrowseHdl, PushButton *, EMPTYARG )
// -----------------------------------------------------------------------
SvInsertPlugInDialog::SvInsertPlugInDialog( Window* pParent, const uno::Reference < embed::XStorage >& xStorage )
- : InsertObjectDialog_Impl( pParent, SVX_RES( MD_INSERT_OBJECT_PLUGIN ), xStorage ),
- aEdFileurl( this, SVX_RES( ED_FILEURL ) ),
- aBtnFileurl( this, SVX_RES( BTN_FILEURL ) ),
- aGbFileurl( this, SVX_RES( GB_FILEURL ) ),
- aEdPluginsOptions( this, SVX_RES( ED_PLUGINS_OPTIONS ) ),
- aGbPluginsOptions( this, SVX_RES( GB_PLUGINS_OPTIONS ) ),
- aOKButton1( this, SVX_RES( 1 ) ),
- aCancelButton1( this, SVX_RES( 1 ) ),
- aHelpButton1( this, SVX_RES( 1 ) ),
+ : InsertObjectDialog_Impl( pParent, CUI_RES( MD_INSERT_OBJECT_PLUGIN ), xStorage ),
+ aEdFileurl( this, CUI_RES( ED_FILEURL ) ),
+ aBtnFileurl( this, CUI_RES( BTN_FILEURL ) ),
+ aGbFileurl( this, CUI_RES( GB_FILEURL ) ),
+ aEdPluginsOptions( this, CUI_RES( ED_PLUGINS_OPTIONS ) ),
+ aGbPluginsOptions( this, CUI_RES( GB_PLUGINS_OPTIONS ) ),
+ aOKButton1( this, CUI_RES( 1 ) ),
+ aCancelButton1( this, CUI_RES( 1 ) ),
+ aHelpButton1( this, CUI_RES( 1 ) ),
m_pURL(0)
{
FreeResource();
@@ -604,18 +600,18 @@ IMPL_LINK( SvInsertAppletDialog, BrowseHdl, PushButton *, EMPTYARG )
// -----------------------------------------------------------------------
SvInsertAppletDialog::SvInsertAppletDialog( Window* pParent, const uno::Reference < embed::XStorage >& xStorage )
- : InsertObjectDialog_Impl( pParent, SVX_RES( MD_INSERT_OBJECT_APPLET ), xStorage ),
- aFtClassfile( this, SVX_RES( FT_CLASSFILE ) ),
- aEdClassfile( this, SVX_RES( ED_CLASSFILE ) ),
- aFtClasslocation( this, SVX_RES( FT_CLASSLOCATION ) ),
- aEdClasslocation( this, SVX_RES( ED_CLASSLOCATION ) ),
- aBtnClass( this, SVX_RES( BTN_CLASS ) ),
- aGbClass( this, SVX_RES( GB_CLASS ) ),
- aEdAppletOptions( this, SVX_RES( ED_APPLET_OPTIONS ) ),
- aGbAppletOptions( this, SVX_RES( GB_APPLET_OPTIONS ) ),
- aOKButton1( this, SVX_RES( 1 ) ),
- aCancelButton1( this, SVX_RES( 1 ) ),
- aHelpButton1( this, SVX_RES( 1 ) ),
+ : InsertObjectDialog_Impl( pParent, CUI_RES( MD_INSERT_OBJECT_APPLET ), xStorage ),
+ aFtClassfile( this, CUI_RES( FT_CLASSFILE ) ),
+ aEdClassfile( this, CUI_RES( ED_CLASSFILE ) ),
+ aFtClasslocation( this, CUI_RES( FT_CLASSLOCATION ) ),
+ aEdClasslocation( this, CUI_RES( ED_CLASSLOCATION ) ),
+ aBtnClass( this, CUI_RES( BTN_CLASS ) ),
+ aGbClass( this, CUI_RES( GB_CLASS ) ),
+ aEdAppletOptions( this, CUI_RES( ED_APPLET_OPTIONS ) ),
+ aGbAppletOptions( this, CUI_RES( GB_APPLET_OPTIONS ) ),
+ aOKButton1( this, CUI_RES( 1 ) ),
+ aCancelButton1( this, CUI_RES( 1 ) ),
+ aHelpButton1( this, CUI_RES( 1 ) ),
m_pURL(0)
{
FreeResource();
@@ -623,18 +619,18 @@ SvInsertAppletDialog::SvInsertAppletDialog( Window* pParent, const uno::Referenc
}
SvInsertAppletDialog::SvInsertAppletDialog( Window* pParent, const uno::Reference < embed::XEmbeddedObject >& xObj )
- : InsertObjectDialog_Impl( pParent, SVX_RES( MD_INSERT_OBJECT_APPLET ), uno::Reference < embed::XStorage >() ),
- aFtClassfile( this, SVX_RES( FT_CLASSFILE ) ),
- aEdClassfile( this, SVX_RES( ED_CLASSFILE ) ),
- aFtClasslocation( this, SVX_RES( FT_CLASSLOCATION ) ),
- aEdClasslocation( this, SVX_RES( ED_CLASSLOCATION ) ),
- aBtnClass( this, SVX_RES( BTN_CLASS ) ),
- aGbClass( this, SVX_RES( GB_CLASS ) ),
- aEdAppletOptions( this, SVX_RES( ED_APPLET_OPTIONS ) ),
- aGbAppletOptions( this, SVX_RES( GB_APPLET_OPTIONS ) ),
- aOKButton1( this, SVX_RES( 1 ) ),
- aCancelButton1( this, SVX_RES( 1 ) ),
- aHelpButton1( this, SVX_RES( 1 ) ),
+ : InsertObjectDialog_Impl( pParent, CUI_RES( MD_INSERT_OBJECT_APPLET ), uno::Reference < embed::XStorage >() ),
+ aFtClassfile( this, CUI_RES( FT_CLASSFILE ) ),
+ aEdClassfile( this, CUI_RES( ED_CLASSFILE ) ),
+ aFtClasslocation( this, CUI_RES( FT_CLASSLOCATION ) ),
+ aEdClasslocation( this, CUI_RES( ED_CLASSLOCATION ) ),
+ aBtnClass( this, CUI_RES( BTN_CLASS ) ),
+ aGbClass( this, CUI_RES( GB_CLASS ) ),
+ aEdAppletOptions( this, CUI_RES( ED_APPLET_OPTIONS ) ),
+ aGbAppletOptions( this, CUI_RES( GB_APPLET_OPTIONS ) ),
+ aOKButton1( this, CUI_RES( 1 ) ),
+ aCancelButton1( this, CUI_RES( 1 ) ),
+ aHelpButton1( this, CUI_RES( 1 ) ),
m_pURL(0)
{
m_xObj = xObj;
@@ -679,7 +675,7 @@ short SvInsertAppletDialog::Execute()
SetAppletOptions( aList.GetCommands() );
}
- String aText( SVX_RES( STR_EDIT_APPLET ) );
+ String aText( CUI_RES( STR_EDIT_APPLET ) );
SetText( aText );
bOK = TRUE;
}
@@ -745,31 +741,31 @@ short SvInsertAppletDialog::Execute()
SfxInsertFloatingFrameDialog::SfxInsertFloatingFrameDialog( Window *pParent,
const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage )
- : InsertObjectDialog_Impl( pParent, SVX_RES( MD_INSERT_OBJECT_IFRAME ), xStorage )
- , aFTName ( this, SVX_RES( FT_FRAMENAME ) )
- , aEDName ( this, SVX_RES( ED_FRAMENAME ) )
- , aFTURL ( this, SVX_RES( FT_URL ) )
- , aEDURL ( this, SVX_RES( ED_URL ) )
- , aBTOpen ( this, SVX_RES(BT_FILEOPEN ) )
- , aRBScrollingOn ( this, SVX_RES( RB_SCROLLINGON ) )
- , aRBScrollingOff ( this, SVX_RES( RB_SCROLLINGOFF ) )
- , aRBScrollingAuto ( this, SVX_RES( RB_SCROLLINGAUTO ) )
- , aFLScrolling ( this, SVX_RES( GB_SCROLLING ) )
- , aFLSepLeft( this, SVX_RES( FL_SEP_LEFT ) )
- , aRBFrameBorderOn ( this, SVX_RES( RB_FRMBORDER_ON ) )
- , aRBFrameBorderOff ( this, SVX_RES( RB_FRMBORDER_OFF ) )
- , aFLFrameBorder( this, SVX_RES( GB_BORDER ) )
- , aFLSepRight( this, SVX_RES( FL_SEP_RIGHT ) )
- , aFTMarginWidth ( this, SVX_RES( FT_MARGINWIDTH ) )
- , aNMMarginWidth ( this, SVX_RES( NM_MARGINWIDTH ) )
- , aCBMarginWidthDefault( this, SVX_RES( CB_MARGINHEIGHTDEFAULT ) )
- , aFTMarginHeight ( this, SVX_RES( FT_MARGINHEIGHT ) )
- , aNMMarginHeight ( this, SVX_RES( NM_MARGINHEIGHT ) )
- , aCBMarginHeightDefault( this, SVX_RES( CB_MARGINHEIGHTDEFAULT ) )
- , aFLMargin( this, SVX_RES( GB_MARGIN ) )
- , aOKButton1( this, SVX_RES( 1 ) )
- , aCancelButton1( this, SVX_RES( 1 ) )
- , aHelpButton1( this, SVX_RES( 1 ) )
+ : InsertObjectDialog_Impl( pParent, CUI_RES( MD_INSERT_OBJECT_IFRAME ), xStorage )
+ , aFTName ( this, CUI_RES( FT_FRAMENAME ) )
+ , aEDName ( this, CUI_RES( ED_FRAMENAME ) )
+ , aFTURL ( this, CUI_RES( FT_URL ) )
+ , aEDURL ( this, CUI_RES( ED_URL ) )
+ , aBTOpen ( this, CUI_RES(BT_FILEOPEN ) )
+ , aRBScrollingOn ( this, CUI_RES( RB_SCROLLINGON ) )
+ , aRBScrollingOff ( this, CUI_RES( RB_SCROLLINGOFF ) )
+ , aRBScrollingAuto ( this, CUI_RES( RB_SCROLLINGAUTO ) )
+ , aFLScrolling ( this, CUI_RES( GB_SCROLLING ) )
+ , aFLSepLeft( this, CUI_RES( FL_SEP_LEFT ) )
+ , aRBFrameBorderOn ( this, CUI_RES( RB_FRMBORDER_ON ) )
+ , aRBFrameBorderOff ( this, CUI_RES( RB_FRMBORDER_OFF ) )
+ , aFLFrameBorder( this, CUI_RES( GB_BORDER ) )
+ , aFLSepRight( this, CUI_RES( FL_SEP_RIGHT ) )
+ , aFTMarginWidth ( this, CUI_RES( FT_MARGINWIDTH ) )
+ , aNMMarginWidth ( this, CUI_RES( NM_MARGINWIDTH ) )
+ , aCBMarginWidthDefault( this, CUI_RES( CB_MARGINHEIGHTDEFAULT ) )
+ , aFTMarginHeight ( this, CUI_RES( FT_MARGINHEIGHT ) )
+ , aNMMarginHeight ( this, CUI_RES( NM_MARGINHEIGHT ) )
+ , aCBMarginHeightDefault( this, CUI_RES( CB_MARGINHEIGHTDEFAULT ) )
+ , aFLMargin( this, CUI_RES( GB_MARGIN ) )
+ , aOKButton1( this, CUI_RES( 1 ) )
+ , aCancelButton1( this, CUI_RES( 1 ) )
+ , aHelpButton1( this, CUI_RES( 1 ) )
{
FreeResource();
@@ -789,31 +785,31 @@ SfxInsertFloatingFrameDialog::SfxInsertFloatingFrameDialog( Window *pParent,
}
SfxInsertFloatingFrameDialog::SfxInsertFloatingFrameDialog( Window *pParent, const uno::Reference < embed::XEmbeddedObject >& xObj )
- : InsertObjectDialog_Impl( pParent, SVX_RES( MD_INSERT_OBJECT_IFRAME ), uno::Reference < embed::XStorage >() )
- , aFTName ( this, SVX_RES( FT_FRAMENAME ) )
- , aEDName ( this, SVX_RES( ED_FRAMENAME ) )
- , aFTURL ( this, SVX_RES( FT_URL ) )
- , aEDURL ( this, SVX_RES( ED_URL ) )
- , aBTOpen ( this, SVX_RES(BT_FILEOPEN ) )
- , aRBScrollingOn ( this, SVX_RES( RB_SCROLLINGON ) )
- , aRBScrollingOff ( this, SVX_RES( RB_SCROLLINGOFF ) )
- , aRBScrollingAuto ( this, SVX_RES( RB_SCROLLINGAUTO ) )
- , aFLScrolling ( this, SVX_RES( GB_SCROLLING ) )
- , aFLSepLeft( this, SVX_RES( FL_SEP_LEFT ) )
- , aRBFrameBorderOn ( this, SVX_RES( RB_FRMBORDER_ON ) )
- , aRBFrameBorderOff ( this, SVX_RES( RB_FRMBORDER_OFF ) )
- , aFLFrameBorder( this, SVX_RES( GB_BORDER ) )
- , aFLSepRight( this, SVX_RES( FL_SEP_RIGHT ) )
- , aFTMarginWidth ( this, SVX_RES( FT_MARGINWIDTH ) )
- , aNMMarginWidth ( this, SVX_RES( NM_MARGINWIDTH ) )
- , aCBMarginWidthDefault( this, SVX_RES( CB_MARGINHEIGHTDEFAULT ) )
- , aFTMarginHeight ( this, SVX_RES( FT_MARGINHEIGHT ) )
- , aNMMarginHeight ( this, SVX_RES( NM_MARGINHEIGHT ) )
- , aCBMarginHeightDefault( this, SVX_RES( CB_MARGINHEIGHTDEFAULT ) )
- , aFLMargin( this, SVX_RES( GB_MARGIN ) )
- , aOKButton1( this, SVX_RES( 1 ) )
- , aCancelButton1( this, SVX_RES( 1 ) )
- , aHelpButton1( this, SVX_RES( 1 ) )
+ : InsertObjectDialog_Impl( pParent, CUI_RES( MD_INSERT_OBJECT_IFRAME ), uno::Reference < embed::XStorage >() )
+ , aFTName ( this, CUI_RES( FT_FRAMENAME ) )
+ , aEDName ( this, CUI_RES( ED_FRAMENAME ) )
+ , aFTURL ( this, CUI_RES( FT_URL ) )
+ , aEDURL ( this, CUI_RES( ED_URL ) )
+ , aBTOpen ( this, CUI_RES(BT_FILEOPEN ) )
+ , aRBScrollingOn ( this, CUI_RES( RB_SCROLLINGON ) )
+ , aRBScrollingOff ( this, CUI_RES( RB_SCROLLINGOFF ) )
+ , aRBScrollingAuto ( this, CUI_RES( RB_SCROLLINGAUTO ) )
+ , aFLScrolling ( this, CUI_RES( GB_SCROLLING ) )
+ , aFLSepLeft( this, CUI_RES( FL_SEP_LEFT ) )
+ , aRBFrameBorderOn ( this, CUI_RES( RB_FRMBORDER_ON ) )
+ , aRBFrameBorderOff ( this, CUI_RES( RB_FRMBORDER_OFF ) )
+ , aFLFrameBorder( this, CUI_RES( GB_BORDER ) )
+ , aFLSepRight( this, CUI_RES( FL_SEP_RIGHT ) )
+ , aFTMarginWidth ( this, CUI_RES( FT_MARGINWIDTH ) )
+ , aNMMarginWidth ( this, CUI_RES( NM_MARGINWIDTH ) )
+ , aCBMarginWidthDefault( this, CUI_RES( CB_MARGINHEIGHTDEFAULT ) )
+ , aFTMarginHeight ( this, CUI_RES( FT_MARGINHEIGHT ) )
+ , aNMMarginHeight ( this, CUI_RES( NM_MARGINHEIGHT ) )
+ , aCBMarginHeightDefault( this, CUI_RES( CB_MARGINHEIGHTDEFAULT ) )
+ , aFLMargin( this, CUI_RES( GB_MARGIN ) )
+ , aOKButton1( this, CUI_RES( 1 ) )
+ , aCancelButton1( this, CUI_RES( 1 ) )
+ , aHelpButton1( this, CUI_RES( 1 ) )
{
FreeResource();
@@ -1051,7 +1047,7 @@ IMPL_STATIC_LINK( SfxInsertFloatingFrameDialog, OpenHdl, PushButton*, EMPTYARG )
sfx2::FileDialogHelper aFileDlg( WB_OPEN | SFXWB_PASSWORD, String() );
// set the title
- aFileDlg.SetTitle( OUString( String( SVX_RES( MD_INSERT_OBJECT_IFRAME ) ) ) );
+ aFileDlg.SetTitle( OUString( String( CUI_RES( MD_INSERT_OBJECT_IFRAME ) ) ) );
// show the dialog
if ( aFileDlg.Execute() == ERRCODE_NONE )
diff --git a/svx/source/cui/insrc.cxx b/cui/source/dialogs/insrc.cxx
index 10b0a5d713a3..270a36202c90 100644
--- a/svx/source/cui/insrc.cxx
+++ b/cui/source/dialogs/insrc.cxx
@@ -29,14 +29,11 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
#include <svx/svxdlg.hxx>
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "insrc.hxx"
#include "insrc.hrc"
@@ -51,18 +48,18 @@ sal_uInt16 SvxInsRowColDlg::getInsertCount() const
}
SvxInsRowColDlg::SvxInsRowColDlg(Window* pParent, bool bCol, ULONG nHelpId )
- : ModalDialog( pParent, SVX_RES(DLG_INS_ROW_COL) ),
- aCount( this, SVX_RES( FT_COUNT ) ),
- aCountEdit( this, SVX_RES( ED_COUNT ) ),
- aInsFL( this, SVX_RES( FL_INS ) ),
- aBeforeBtn( this, SVX_RES( CB_POS_BEFORE ) ),
- aAfterBtn( this, SVX_RES( CB_POS_AFTER ) ),
- aPosFL( this, SVX_RES( FL_POS ) ),
- aRow(SVX_RES(STR_ROW)),
- aCol(SVX_RES(STR_COL)),
- aOKBtn( this, SVX_RES( BT_OK ) ),
- aCancelBtn( this, SVX_RES( BT_CANCEL ) ),
- aHelpBtn( this, SVX_RES( BT_HELP ) ),
+ : ModalDialog( pParent, CUI_RES(DLG_INS_ROW_COL) ),
+ aCount( this, CUI_RES( FT_COUNT ) ),
+ aCountEdit( this, CUI_RES( ED_COUNT ) ),
+ aInsFL( this, CUI_RES( FL_INS ) ),
+ aBeforeBtn( this, CUI_RES( CB_POS_BEFORE ) ),
+ aAfterBtn( this, CUI_RES( CB_POS_AFTER ) ),
+ aPosFL( this, CUI_RES( FL_POS ) ),
+ aRow(CUI_RES(STR_ROW)),
+ aCol(CUI_RES(STR_COL)),
+ aOKBtn( this, CUI_RES( BT_OK ) ),
+ aCancelBtn( this, CUI_RES( BT_CANCEL ) ),
+ aHelpBtn( this, CUI_RES( BT_HELP ) ),
bColumn( bCol )
{
FreeResource();
diff --git a/svx/source/cui/insrc.hrc b/cui/source/dialogs/insrc.hrc
index e07c7cb2f1d5..e07c7cb2f1d5 100644
--- a/svx/source/cui/insrc.hrc
+++ b/cui/source/dialogs/insrc.hrc
diff --git a/svx/source/cui/insrc.src b/cui/source/dialogs/insrc.src
index 6023e94604ef..7d6845c32910 100644
--- a/svx/source/cui/insrc.src
+++ b/cui/source/dialogs/insrc.src
@@ -29,7 +29,7 @@
************************************************************************/
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "insrc.hrc"
ModalDialog DLG_INS_ROW_COL
diff --git a/svx/source/cui/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx
index b2e00cf48c0b..106e3b898243 100644
--- a/svx/source/cui/linkdlg.cxx
+++ b/cui/source/dialogs/linkdlg.cxx
@@ -29,14 +29,11 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
#include <linkdlg.hxx>
#include <vcl/svapp.hxx>
+#include "helpid.hrc"
#include <tools/urlobj.hxx>
#include <svtools/svmedit.hxx>
@@ -57,10 +54,10 @@
#include <sfx2/lnkbase.hxx>
#include <sfx2/objsh.hxx>
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
#define _SVSTDARR_USHORTS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
#define MAX_FILENAME 18
#define MAX_LINKNAME 18
@@ -81,37 +78,37 @@ static long nTabs[] =
SvBaseLinksDlg::SvBaseLinksDlg( Window * pParent, SvLinkManager* pMgr, BOOL bHtml )
- : ModalDialog( pParent, SVX_RES( MD_UPDATE_BASELINKS ) ),
- aFtFiles( this, SVX_RES( FT_FILES ) ),
- aFtLinks( this, SVX_RES( FT_LINKS ) ),
- aFtType( this, SVX_RES( FT_TYPE ) ),
- aFtStatus( this, SVX_RES( FT_STATUS ) ),
- aCancelButton1( this, SVX_RES( 1 ) ),
- aHelpButton1( this, SVX_RES( 1 ) ),
- aPbUpdateNow( this, SVX_RES( PB_UPDATE_NOW ) ),
- aPbOpenSource( this, SVX_RES( PB_OPEN_SOURCE ) ),
- aPbChangeSource( this, SVX_RES( PB_CHANGE_SOURCE ) ),
- aPbBreakLink( this, SVX_RES( PB_BREAK_LINK ) ),
- aFtFiles2( this, SVX_RES( FT_FILES2 ) ),
- aFtSource2( this, SVX_RES( FT_SOURCE2 ) ),
- aFtType2( this, SVX_RES( FT_TYPE2 ) ),
- aFtUpdate( this, SVX_RES( FT_UPDATE ) ),
- aRbAutomatic( this, SVX_RES( RB_AUTOMATIC ) ),
- aRbManual( this, SVX_RES( RB_MANUAL ) ),
- aFtFullFileName( this, SVX_RES( FT_FULL_FILE_NAME ) ),
- aFtFullSourceName( this, SVX_RES( FT_FULL_SOURCE_NAME ) ),
- aFtFullTypeName( this, SVX_RES( FT_FULL_TYPE_NAME ) ),
- aStrAutolink( SVX_RES( STR_AUTOLINK ) ),
- aStrManuallink( SVX_RES( STR_MANUALLINK ) ),
- aStrBrokenlink( SVX_RES( STR_BROKENLINK ) ),
- aStrGraphiclink( SVX_RES( STR_GRAPHICLINK ) ),
- aStrButtonclose( SVX_RES( STR_BUTTONCLOSE ) ),
- aStrCloselinkmsg( SVX_RES( STR_CLOSELINKMSG ) ),
- aStrCloselinkmsgMulti( SVX_RES( STR_CLOSELINKMSG_MULTI ) ),
- aStrWaitinglink( SVX_RES( STR_WAITINGLINK ) ),
+ : ModalDialog( pParent, CUI_RES( MD_UPDATE_BASELINKS ) ),
+ aFtFiles( this, CUI_RES( FT_FILES ) ),
+ aFtLinks( this, CUI_RES( FT_LINKS ) ),
+ aFtType( this, CUI_RES( FT_TYPE ) ),
+ aFtStatus( this, CUI_RES( FT_STATUS ) ),
+ aCancelButton1( this, CUI_RES( 1 ) ),
+ aHelpButton1( this, CUI_RES( 1 ) ),
+ aPbUpdateNow( this, CUI_RES( PB_UPDATE_NOW ) ),
+ aPbOpenSource( this, CUI_RES( PB_OPEN_SOURCE ) ),
+ aPbChangeSource( this, CUI_RES( PB_CHANGE_SOURCE ) ),
+ aPbBreakLink( this, CUI_RES( PB_BREAK_LINK ) ),
+ aFtFiles2( this, CUI_RES( FT_FILES2 ) ),
+ aFtSource2( this, CUI_RES( FT_SOURCE2 ) ),
+ aFtType2( this, CUI_RES( FT_TYPE2 ) ),
+ aFtUpdate( this, CUI_RES( FT_UPDATE ) ),
+ aRbAutomatic( this, CUI_RES( RB_AUTOMATIC ) ),
+ aRbManual( this, CUI_RES( RB_MANUAL ) ),
+ aFtFullFileName( this, CUI_RES( FT_FULL_FILE_NAME ) ),
+ aFtFullSourceName( this, CUI_RES( FT_FULL_SOURCE_NAME ) ),
+ aFtFullTypeName( this, CUI_RES( FT_FULL_TYPE_NAME ) ),
+ aStrAutolink( CUI_RES( STR_AUTOLINK ) ),
+ aStrManuallink( CUI_RES( STR_MANUALLINK ) ),
+ aStrBrokenlink( CUI_RES( STR_BROKENLINK ) ),
+ aStrGraphiclink( CUI_RES( STR_GRAPHICLINK ) ),
+ aStrButtonclose( CUI_RES( STR_BUTTONCLOSE ) ),
+ aStrCloselinkmsg( CUI_RES( STR_CLOSELINKMSG ) ),
+ aStrCloselinkmsgMulti( CUI_RES( STR_CLOSELINKMSG_MULTI ) ),
+ aStrWaitinglink( CUI_RES( STR_WAITINGLINK ) ),
pLinkMgr( NULL ),
bHtmlMode(bHtml),
- aTbLinks( this, SVX_RES(TB_LINKS ) )
+ aTbLinks( this, CUI_RES(TB_LINKS ) )
{
FreeResource();
@@ -224,7 +221,7 @@ IMPL_LINK( SvBaseLinksDlg, LinksSelectHdl, SvTabListBox *, pSvTabListBox )
String aFileName;
pLinkMgr->GetDisplayNames( pLink, &sType, &aFileName, pLinkNm, pFilter );
-
+ aFileName = INetURLObject::decode(aFileName, INET_HEX_ESCAPE, INetURLObject::DECODE_UNAMBIGUOUS);
FileName().SetText( aFileName );
SourceName().SetText( sLink );
TypeName().SetText( sType );
@@ -528,9 +525,9 @@ IMPL_LINK( SvBaseLinksDlg, UpdateWaitingHdl, Timer*, pTimer )
IMPL_LINK( SvBaseLinksDlg, EndEditHdl, sfx2::SvBaseLink*, _pLink )
{
USHORT nPos;
- SvBaseLink* pLink = GetSelEntry( &nPos );
+ GetSelEntry( &nPos );
- if ( pLink != _pLink && _pLink && _pLink->WasLastEditOK() )
+ if( _pLink && _pLink->WasLastEditOK() )
{
// JP 09.01.98:
// StarImpress/Draw tauschen die LinkObjecte selbst aus!
@@ -564,10 +561,6 @@ IMPL_LINK( SvBaseLinksDlg, EndEditHdl, sfx2::SvBaseLink*, _pLink )
if( pLinkMgr->GetPersist() )
pLinkMgr->GetPersist()->SetModified();
}
- else if ( pLink == _pLink )
- {
- DBG_ERRORFILE( "SvBaseLinksDlg::EndEditHdl(): wrong link" );
- }
return 0;
}
@@ -643,6 +636,8 @@ void SvBaseLinksDlg::InsertEntry( const SvBaseLink& rLink, USHORT nPos, sal_Bool
XubString aTxt = Links().GetEllipsisString( sFileNm, nWidthPixel, TEXT_DRAW_PATHELLIPSIS );
INetURLObject aPath( sFileNm, INET_PROT_FILE );
String aFileName = aPath.getName();
+ aFileName = INetURLObject::decode(aFileName, INET_HEX_ESCAPE, INetURLObject::DECODE_UNAMBIGUOUS);
+
if( aFileName.Len() > aTxt.Len() )
aTxt = aFileName;
else if( aTxt.Search( aFileName, aTxt.Len() - aFileName.Len() ) == STRING_NOTFOUND )
diff --git a/cui/source/dialogs/makefile.mk b/cui/source/dialogs/makefile.mk
new file mode 100755
index 000000000000..f7d597a219a1
--- /dev/null
+++ b/cui/source/dialogs/makefile.mk
@@ -0,0 +1,118 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2008 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile: makefile.mk,v $
+#
+# $Revision: 1.65 $
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+PRJ=..$/..
+PRJNAME=cui
+TARGET=dialogs
+ENABLE_EXCEPTIONS=TRUE
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE : settings.mk
+.INCLUDE : $(PRJ)$/util$/makefile.pmk
+
+.IF "$(ENABLE_LAYOUT)" == "TRUE"
+CFLAGS+= -DENABLE_LAYOUT=1 -I../$(PRJ)/layout/inc -I../$(PRJ)/layout/$(INPATH)/inc
+.ENDIF # ENABLE_LAYOUT == TRUE
+
+# --- Files --------------------------------------------------------
+
+SRS1NAME=dialogs
+SRC1FILES = \
+ charmap.src \
+ commonlingui.src \
+ cuiimapdlg.src \
+ dlgname.src \
+ fmsearch.src \
+ gallery.src \
+ grfflt.src \
+ hangulhanjadlg.src \
+ hlmarkwn.src \
+ hyperdlg.src \
+ iconcdlg.src \
+ insrc.src \
+ multipat.src \
+ newtabledlg.src \
+ postdlg.src \
+ scriptdlg.src \
+ sdrcelldlg.src \
+ showcols.src \
+ SpellDialog.src \
+ splitcelldlg.src \
+ srchxtra.src \
+ svuidlg.src \
+ tbxform.src \
+ zoom.src \
+
+
+SLOFILES+=\
+ $(SLO)$/commonlingui.obj \
+ $(SLO)$/cuicharmap.obj \
+ $(SLO)$/cuifmsearch.obj \
+ $(SLO)$/cuigaldlg.obj \
+ $(SLO)$/cuigrfflt.obj \
+ $(SLO)$/cuihyperdlg.obj \
+ $(SLO)$/cuiimapwnd.obj \
+ $(SLO)$/cuitbxform.obj \
+ $(SLO)$/dlgname.obj \
+ $(SLO)$/hangulhanjadlg.obj \
+ $(SLO)$/hldocntp.obj \
+ $(SLO)$/hldoctp.obj \
+ $(SLO)$/hlinettp.obj \
+ $(SLO)$/hlmailtp.obj \
+ $(SLO)$/hlmarkwn.obj \
+ $(SLO)$/hltpbase.obj \
+ $(SLO)$/iconcdlg.obj \
+ $(SLO)$/insdlg.obj \
+ $(SLO)$/insrc.obj \
+ $(SLO)$/linkdlg.obj \
+ $(SLO)$/multifil.obj \
+ $(SLO)$/multipat.obj \
+ $(SLO)$/newtabledlg.obj \
+ $(SLO)$/pastedlg.obj \
+ $(SLO)$/plfilter.obj \
+ $(SLO)$/postdlg.obj \
+ $(SLO)$/scriptdlg.obj \
+ $(SLO)$/sdrcelldlg.obj \
+ $(SLO)$/showcols.obj \
+ $(SLO)$/SpellAttrib.obj \
+ $(SLO)$/SpellDialog.obj \
+ $(SLO)$/splitcelldlg.obj \
+ $(SLO)$/srchxtra.obj \
+ $(SLO)$/zoom.obj \
+
+
+.IF "$(GUI)"=="WNT"
+SLOFILES+=$(SLO)$/winpluginlib.obj
+.ENDIF
+
+# --- Targets -------------------------------------------------------
+
+.INCLUDE : target.mk
diff --git a/svx/source/cui/multifil.cxx b/cui/source/dialogs/multifil.cxx
index bec7b6d5cafa..8f5eadae306a 100644
--- a/svx/source/cui/multifil.cxx
+++ b/cui/source/dialogs/multifil.cxx
@@ -29,11 +29,7 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
// include ---------------------------------------------------------------
#include <tools/shl.hxx>
@@ -44,10 +40,10 @@
#include "multipat.hxx"
#include "multifil.hxx"
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
#include "multipat.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
// #97807# -------------
#include <com/sun/star/ucb/XContentProvider.hpp>
@@ -67,8 +63,8 @@ IMPL_LINK( SvxMultiFileDialog, AddHdl_Impl, PushButton *, pBtn )
if ( IsClassPathMode() )
{
- aDlg.SetTitle( SVX_RES( RID_SVXSTR_ARCHIVE_TITLE ) );
- aDlg.AddFilter( SVX_RES( RID_SVXSTR_ARCHIVE_HEADLINE ), String::CreateFromAscii("*.jar;*.zip") );
+ aDlg.SetTitle( CUI_RES( RID_SVXSTR_ARCHIVE_TITLE ) );
+ aDlg.AddFilter( CUI_RES( RID_SVXSTR_ARCHIVE_HEADLINE ), String::CreateFromAscii("*.jar;*.zip") );
}
if ( aDlg.Execute() == ERRCODE_NONE )
@@ -135,7 +131,7 @@ IMPL_LINK( SvxMultiFileDialog, AddHdl_Impl, PushButton *, pBtn )
if ( bDuplicated ) // #97807# --------------------
{
- String sMsg( SVX_RES( RID_SVXSTR_MULTIFILE_DBL_ERR ) );
+ String sMsg( CUI_RES( RID_SVXSTR_MULTIFILE_DBL_ERR ) );
sMsg.SearchAndReplaceAscii( "%1", sInsFile );
InfoBox( pBtn, sMsg ).Execute();
}
@@ -177,8 +173,8 @@ SvxMultiFileDialog::SvxMultiFileDialog( Window* pParent, BOOL bEmptyAllowed ) :
{
aAddBtn.SetClickHdl( LINK( this, SvxMultiFileDialog, AddHdl_Impl ) );
aDelBtn.SetClickHdl( LINK( this, SvxMultiFileDialog, DelHdl_Impl ) );
- SetText( SVX_RES( RID_SVXSTR_FILE_TITLE ) );
- aPathFL.SetText( SVX_RES( RID_SVXSTR_FILE_HEADLINE ) );
+ SetText( CUI_RES( RID_SVXSTR_FILE_TITLE ) );
+ aPathFL.SetText( CUI_RES( RID_SVXSTR_FILE_HEADLINE ) );
aDelBtn.Enable();
}
diff --git a/svx/source/cui/multipat.cxx b/cui/source/dialogs/multipat.cxx
index 49357245b819..6d55f4de9f35 100644
--- a/svx/source/cui/multipat.cxx
+++ b/cui/source/dialogs/multipat.cxx
@@ -29,11 +29,7 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
// include ---------------------------------------------------------------
#include <tools/debug.hxx>
@@ -42,17 +38,17 @@
#include <sfx2/filedlghelper.hxx>
#include "multipat.hxx"
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
#include "multipat.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include <comphelper/processfactory.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/ui/dialogs/XFolderPicker.hpp>
#include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
#include <unotools/localfilehelper.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::ui::dialogs;
@@ -123,7 +119,7 @@ IMPL_LINK( SvxMultiPathDialog, AddHdl_Impl, PushButton *, EMPTYARG )
}
else
{
- String sMsg( SVX_RES( RID_MULTIPATH_DBL_ERR ) );
+ String sMsg( CUI_RES( RID_MULTIPATH_DBL_ERR ) );
sMsg.SearchAndReplaceAscii( "%1", sInsPath );
InfoBox( this, sMsg ).Execute();
}
@@ -132,7 +128,7 @@ IMPL_LINK( SvxMultiPathDialog, AddHdl_Impl, PushButton *, EMPTYARG )
{
if ( LISTBOX_ENTRY_NOTFOUND != aPathLB.GetEntryPos( sInsPath ) )
{
- String sMsg( SVX_RES( RID_MULTIPATH_DBL_ERR ) );
+ String sMsg( CUI_RES( RID_MULTIPATH_DBL_ERR ) );
sMsg.SearchAndReplaceAscii( "%1", sInsPath );
InfoBox( this, sMsg ).Execute();
}
@@ -197,23 +193,23 @@ IMPL_LINK( SvxMultiPathDialog, DelHdl_Impl, PushButton *, EMPTYARG )
SvxMultiPathDialog::SvxMultiPathDialog( Window* pParent, BOOL bEmptyAllowed ) :
- ModalDialog( pParent, SVX_RES( RID_SVXDLG_MULTIPATH ) ),
-
- aPathFL ( this, SVX_RES( FL_MULTIPATH) ),
- aPathLB ( this, SVX_RES( LB_MULTIPATH ) ),
- aRadioLB ( this, SVX_RES( LB_RADIOBUTTON ) ),
- aRadioFT ( this, SVX_RES( FT_RADIOBUTTON ) ),
- aAddBtn ( this, SVX_RES( BTN_ADD_MULTIPATH ) ),
- aDelBtn ( this, SVX_RES( BTN_DEL_MULTIPATH ) ),
- aOKBtn ( this, SVX_RES( BTN_MULTIPATH_OK ) ),
- aCancelBtn ( this, SVX_RES( BTN_MULTIPATH_CANCEL ) ),
- aHelpButton ( this, SVX_RES( BTN_MULTIPATH_HELP ) ),
+ ModalDialog( pParent, CUI_RES( RID_SVXDLG_MULTIPATH ) ),
+
+ aPathFL ( this, CUI_RES( FL_MULTIPATH) ),
+ aPathLB ( this, CUI_RES( LB_MULTIPATH ) ),
+ aRadioLB ( this, CUI_RES( LB_RADIOBUTTON ) ),
+ aRadioFT ( this, CUI_RES( FT_RADIOBUTTON ) ),
+ aAddBtn ( this, CUI_RES( BTN_ADD_MULTIPATH ) ),
+ aDelBtn ( this, CUI_RES( BTN_DEL_MULTIPATH ) ),
+ aOKBtn ( this, CUI_RES( BTN_MULTIPATH_OK ) ),
+ aCancelBtn ( this, CUI_RES( BTN_MULTIPATH_CANCEL ) ),
+ aHelpButton ( this, CUI_RES( BTN_MULTIPATH_HELP ) ),
pImpl ( new MultiPath_Impl( bEmptyAllowed ) )
{
static long aStaticTabs[]= { 2, 0, 12 };
aRadioLB.SvxSimpleTable::SetTabs( aStaticTabs );
- String sHeader( SVX_RES( STR_HEADER_PATHS ) );
+ String sHeader( CUI_RES( STR_HEADER_PATHS ) );
aRadioLB.SetQuickHelpText( sHeader );
sHeader.Insert( '\t', 0 );
aRadioLB.InsertHeaderEntry( sHeader, HEADERBAR_APPEND, HIB_LEFT );
@@ -333,8 +329,8 @@ void SvxMultiPathDialog::SetPath( const String& rPath )
void SvxMultiPathDialog::SetClassPathMode()
{
pImpl->bIsClassPathMode = TRUE;
- SetText( SVX_RES( RID_SVXSTR_ARCHIVE_TITLE ));
- aPathFL.SetText( SVX_RES( RID_SVXSTR_ARCHIVE_HEADLINE ) );
+ SetText( CUI_RES( RID_SVXSTR_ARCHIVE_TITLE ));
+ aPathFL.SetText( CUI_RES( RID_SVXSTR_ARCHIVE_HEADLINE ) );
}
// -----------------------------------------------------------------------
diff --git a/svx/inc/multipat.hrc b/cui/source/dialogs/multipat.hrc
index 6ef22855ff8b..6ef22855ff8b 100644
--- a/svx/inc/multipat.hrc
+++ b/cui/source/dialogs/multipat.hrc
diff --git a/svx/source/options/multipat.src b/cui/source/dialogs/multipat.src
index ff7e5d027202..64dc9b412311 100644
--- a/svx/source/options/multipat.src
+++ b/cui/source/dialogs/multipat.src
@@ -30,7 +30,7 @@
#include "multipat.hrc"
#include "helpid.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
// RID_SVXDLG_MULTIPATH --------------------------------------------------
diff --git a/svx/source/cui/newtabledlg.cxx b/cui/source/dialogs/newtabledlg.cxx
index c59be62607cd..6309de2c3b7d 100644
--- a/svx/source/cui/newtabledlg.cxx
+++ b/cui/source/dialogs/newtabledlg.cxx
@@ -29,29 +29,25 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
// include ---------------------------------------------------------------
-#include "svx/dialogs.hrc"
-#include "svx/dialmgr.hxx"
+#include "cuires.hrc"
+#include "dialmgr.hxx"
#include "newtabledlg.hxx"
#include "newtabledlg.hrc"
SvxNewTableDialog::SvxNewTableDialog( Window* pParent )
-: ModalDialog( pParent, SVX_RES( RID_SVX_NEWTABLE_DLG ) )
-, maFtColumns( this, SVX_RES( FT_COLUMNS ) )
-, maNumColumns( this, SVX_RES( NF_COLUMNS ) )
-, maFtRows( this, SVX_RES( FT_ROWS ) )
-, maNumRows( this, SVX_RES( NF_ROWS ) )
-, maFlSep( this, SVX_RES( FL_SEP ) )
-, maHelpButton( this, SVX_RES( BTN_HELP ) )
-, maOkButton( this, SVX_RES( BTN_OK ) )
-, maCancelButton( this, SVX_RES( BTN_CANCEL ) )
+: ModalDialog( pParent, CUI_RES( RID_SVX_NEWTABLE_DLG ) )
+, maFtColumns( this, CUI_RES( FT_COLUMNS ) )
+, maNumColumns( this, CUI_RES( NF_COLUMNS ) )
+, maFtRows( this, CUI_RES( FT_ROWS ) )
+, maNumRows( this, CUI_RES( NF_ROWS ) )
+, maFlSep( this, CUI_RES( FL_SEP ) )
+, maHelpButton( this, CUI_RES( BTN_HELP ) )
+, maOkButton( this, CUI_RES( BTN_OK ) )
+, maCancelButton( this, CUI_RES( BTN_CANCEL ) )
{
maNumRows.SetValue(2);
maNumColumns.SetValue(5);
diff --git a/svx/source/cui/newtabledlg.hrc b/cui/source/dialogs/newtabledlg.hrc
index b17631658341..b17631658341 100644
--- a/svx/source/cui/newtabledlg.hrc
+++ b/cui/source/dialogs/newtabledlg.hrc
diff --git a/svx/source/cui/newtabledlg.src b/cui/source/dialogs/newtabledlg.src
index e72756da03db..e02338d6085e 100644
--- a/svx/source/cui/newtabledlg.src
+++ b/cui/source/dialogs/newtabledlg.src
@@ -29,7 +29,7 @@
************************************************************************/
#include "newtabledlg.hrc"
-#include "svx/dialogs.hrc"
+#include "cuires.hrc"
ModalDialog RID_SVX_NEWTABLE_DLG
{
diff --git a/svx/source/cui/pastedlg.cxx b/cui/source/dialogs/pastedlg.cxx
index c9ce336448eb..e0892bfca427 100644
--- a/svx/source/cui/pastedlg.cxx
+++ b/cui/source/dialogs/pastedlg.cxx
@@ -29,11 +29,7 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
#include <com/sun/star/embed/Aspects.hpp>
#include <pastedlg.hxx>
@@ -51,23 +47,23 @@
#include <svtools/sores.hxx>
#include <vcl/svapp.hxx>
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
SvPasteObjectDialog::SvPasteObjectDialog( Window* pParent )
- : ModalDialog( pParent, SVX_RES( MD_PASTE_OBJECT ) ),
- aFtSource( this, SVX_RES( FT_SOURCE ) ),
- aFtObjectSource( this, SVX_RES( FT_OBJECT_SOURCE ) ),
- aRbPaste( this, SVX_RES( RB_PASTE ) ),
- aRbPasteLink( this, SVX_RES( RB_PASTE_LINK ) ),
- aLbInsertList( this, SVX_RES( LB_INSERT_LIST ) ),
- aCbDisplayAsIcon( this, SVX_RES( CB_DISPLAY_AS_ICON ) ),
- aPbChangeIcon( this, SVX_RES( PB_CHANGE_ICON ) ),
- aFlChoice( this, SVX_RES( FL_CHOICE ) ),
- aOKButton1( this, SVX_RES( 1 ) ),
- aCancelButton1( this, SVX_RES( 1 ) ),
- aHelpButton1( this, SVX_RES( 1 ) ),
- aSObject( SVX_RES( S_OBJECT ) )
+ : ModalDialog( pParent, CUI_RES( MD_PASTE_OBJECT ) ),
+ aFtSource( this, CUI_RES( FT_SOURCE ) ),
+ aFtObjectSource( this, CUI_RES( FT_OBJECT_SOURCE ) ),
+ aRbPaste( this, CUI_RES( RB_PASTE ) ),
+ aRbPasteLink( this, CUI_RES( RB_PASTE_LINK ) ),
+ aLbInsertList( this, CUI_RES( LB_INSERT_LIST ) ),
+ aCbDisplayAsIcon( this, CUI_RES( CB_DISPLAY_AS_ICON ) ),
+ aPbChangeIcon( this, CUI_RES( PB_CHANGE_ICON ) ),
+ aFlChoice( this, CUI_RES( FL_CHOICE ) ),
+ aOKButton1( this, CUI_RES( 1 ) ),
+ aCancelButton1( this, CUI_RES( 1 ) ),
+ aHelpButton1( this, CUI_RES( 1 ) ),
+ aSObject( CUI_RES( S_OBJECT ) )
{
FreeResource();
SetHelpId( HID_PASTE_DLG );
diff --git a/svx/source/cui/plfilter.cxx b/cui/source/dialogs/plfilter.cxx
index 882e4e751e0c..d09cc00d2a34 100644
--- a/svx/source/cui/plfilter.cxx
+++ b/cui/source/dialogs/plfilter.cxx
@@ -29,11 +29,7 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
#include <set>
#include <map>
diff --git a/svx/source/cui/postdlg.cxx b/cui/source/dialogs/postdlg.cxx
index 1f4d481f4b8e..e695aaafa420 100644
--- a/svx/source/cui/postdlg.cxx
+++ b/cui/source/dialogs/postdlg.cxx
@@ -29,40 +29,29 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
// include ---------------------------------------------------------------
#include <tools/shl.hxx>
#include <tools/date.hxx>
#include <tools/time.hxx>
#include <vcl/svapp.hxx>
-#ifndef _MSGBOX_HXX //autogen
#include <vcl/msgbox.hxx>
-#endif
-#include <svtools/itempool.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/useroptions.hxx>
+#include <svl/itempool.hxx>
+#include <svl/itemset.hxx>
+#include <unotools/useroptions.hxx>
#include <unotools/localedatawrapper.hxx>
-#ifndef _UNOTOOLS_PROCESSFACTORY_HXX
#include <comphelper/processfactory.hxx>
-#endif
+#include <svx/svxids.hrc> // SID_ATTR_...
+#include <svx/dialogs.hrc> // RID_SVXDLG_POSTIT
#define _SVX_POSTDLG_CXX
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "postdlg.hrc"
-
-
-
-
-
-#include "postattr.hxx"
+#include <svx/postattr.hxx>
#include "postdlg.hxx"
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
#include "helpid.hrc"
@@ -82,20 +71,20 @@ SvxPostItDialog::SvxPostItDialog( Window* pParent,
BOOL bPrevNext,
BOOL bRedline ) :
- SfxModalDialog( pParent, SVX_RES( RID_SVXDLG_POSTIT ) ),
-
- aPostItFL ( this, SVX_RES( FL_POSTIT ) ),
- aLastEditLabelFT( this, SVX_RES( FT_LASTEDITLABEL ) ),
- aLastEditFT ( this, SVX_RES( FT_LASTEDIT ) ),
- aEditFT ( this, SVX_RES( FT_EDIT ) ),
- aEditED ( this, SVX_RES( ED_EDIT ) ),
- aAuthorFT ( this, SVX_RES( FT_AUTHOR) ),
- aAuthorBtn ( this, SVX_RES( BTN_AUTHOR ) ),
- aOKBtn ( this, SVX_RES( BTN_POST_OK ) ),
- aCancelBtn ( this, SVX_RES( BTN_POST_CANCEL ) ),
- aHelpBtn ( this, SVX_RES( BTN_POST_HELP ) ),
- aPrevBtn ( this, SVX_RES( BTN_PREV ) ),
- aNextBtn ( this, SVX_RES( BTN_NEXT ) ),
+ SfxModalDialog( pParent, CUI_RES( RID_SVXDLG_POSTIT ) ),
+
+ aPostItFL ( this, CUI_RES( FL_POSTIT ) ),
+ aLastEditLabelFT( this, CUI_RES( FT_LASTEDITLABEL ) ),
+ aLastEditFT ( this, CUI_RES( FT_LASTEDIT ) ),
+ aEditFT ( this, CUI_RES( FT_EDIT ) ),
+ aEditED ( this, CUI_RES( ED_EDIT ) ),
+ aAuthorFT ( this, CUI_RES( FT_AUTHOR) ),
+ aAuthorBtn ( this, CUI_RES( BTN_AUTHOR ) ),
+ aOKBtn ( this, CUI_RES( BTN_POST_OK ) ),
+ aCancelBtn ( this, CUI_RES( BTN_POST_CANCEL ) ),
+ aHelpBtn ( this, CUI_RES( BTN_POST_HELP ) ),
+ aPrevBtn ( this, CUI_RES( BTN_PREV ) ),
+ aNextBtn ( this, CUI_RES( BTN_NEXT ) ),
rSet ( rCoreSet ),
pOutSet ( 0 )
@@ -167,10 +156,10 @@ SvxPostItDialog::SvxPostItDialog( Window* pParent,
aEditED.SetText( aTextStr.ConvertLineEnd() );
if ( !bNew )
- SetText( SVX_RESSTR( STR_NOTIZ_EDIT ) );
+ SetText( CUI_RESSTR( STR_NOTIZ_EDIT ) );
else
// neu anlegen
- SetText( SVX_RESSTR( STR_NOTIZ_INSERT ) );
+ SetText( CUI_RESSTR( STR_NOTIZ_INSERT ) );
FreeResource();
}
diff --git a/svx/source/cui/postdlg.hrc b/cui/source/dialogs/postdlg.hrc
index b2b615647438..b2b615647438 100644
--- a/svx/source/cui/postdlg.hrc
+++ b/cui/source/dialogs/postdlg.hrc
diff --git a/svx/source/cui/postdlg.src b/cui/source/dialogs/postdlg.src
index 23dbef26e0a8..02face52b1b5 100644
--- a/svx/source/cui/postdlg.src
+++ b/cui/source/dialogs/postdlg.src
@@ -28,10 +28,9 @@
*
************************************************************************/
// include ---------------------------------------------------------------
-#include <svx/svxids.hrc>
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "postdlg.hrc"
- // pragma ----------------------------------------------------------------
+#include <svx/dialogs.hrc> // for RID_SVXDLG_POSTIT
// RID_SVXDLG_POSTIT -----------------------------------------------------
ModalDialog RID_SVXDLG_POSTIT
diff --git a/svx/source/cui/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index 9c5e9277b3b2..d68792732d7e 100644
--- a/svx/source/cui/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -29,7 +29,7 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_cui.hxx"
#include <memory>
@@ -38,11 +38,10 @@
#include <vcl/msgbox.hxx>
#include <vos/mutex.hxx>
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "scriptdlg.hrc"
-#include "fmresids.hrc"
#include "scriptdlg.hxx"
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
#include "selector.hxx"
#include <com/sun/star/uno/XComponentContext.hpp>
@@ -488,26 +487,26 @@ void __EXPORT SFTreeListBox::ExpandedHdl()
// InputDialog ------------------------------------------------------------
// ----------------------------------------------------------------------------
InputDialog::InputDialog(Window * pParent, USHORT nMode )
- : ModalDialog( pParent, SVX_RES( RID_DLG_NEWLIB ) ),
- aText( this, SVX_RES( FT_NEWLIB ) ),
- aEdit( this, SVX_RES( ED_LIBNAME ) ),
- aOKButton( this, SVX_RES( PB_OK ) ),
- aCancelButton( this, SVX_RES( PB_CANCEL ) )
+ : ModalDialog( pParent, CUI_RES( RID_DLG_NEWLIB ) ),
+ aText( this, CUI_RES( FT_NEWLIB ) ),
+ aEdit( this, CUI_RES( ED_LIBNAME ) ),
+ aOKButton( this, CUI_RES( PB_OK ) ),
+ aCancelButton( this, CUI_RES( PB_CANCEL ) )
{
aEdit.GrabFocus();
if ( nMode == INPUTMODE_NEWLIB )
{
- SetText( String( SVX_RES( STR_NEWLIB ) ) );
+ SetText( String( CUI_RES( STR_NEWLIB ) ) );
}
else if ( nMode == INPUTMODE_NEWMACRO )
{
- SetText( String( SVX_RES( STR_NEWMACRO ) ) );
- aText.SetText( String( SVX_RES( STR_FT_NEWMACRO ) ) );
+ SetText( String( CUI_RES( STR_NEWMACRO ) ) );
+ aText.SetText( String( CUI_RES( STR_FT_NEWMACRO ) ) );
}
else if ( nMode == INPUTMODE_RENAME )
{
- SetText( String( SVX_RES( STR_RENAME ) ) );
- aText.SetText( String( SVX_RES( STR_FT_RENAME ) ) );
+ SetText( String( CUI_RES( STR_RENAME ) ) );
+ aText.SetText( String( CUI_RES( STR_FT_RENAME ) ) );
}
FreeResource();
@@ -549,26 +548,26 @@ InputDialog::~InputDialog()
// ScriptOrgDialog ------------------------------------------------------------
// ----------------------------------------------------------------------------
SvxScriptOrgDialog::SvxScriptOrgDialog( Window* pParent, ::rtl::OUString language )
- : SfxModalDialog( pParent, SVX_RES( RID_DLG_SCRIPTORGANIZER ) ),
- aScriptsTxt( this, SVX_RES( SF_TXT_SCRIPTS ) ),
- aScriptsBox( this, SVX_RES( SF_CTRL_SCRIPTSBOX ) ),
- aRunButton( this, SVX_RES( SF_PB_RUN ) ),
- aCloseButton( this, SVX_RES( SF_PB_CLOSE ) ),
- aCreateButton( this, SVX_RES( SF_PB_CREATE ) ),
- aEditButton( this, SVX_RES( SF_PB_EDIT ) ),
- aRenameButton(this, SVX_RES( SF_PB_RENAME ) ),
- aDelButton( this, SVX_RES( SF_PB_DEL ) ),
- aHelpButton( this, SVX_RES( SF_PB_HELP ) ),
+ : SfxModalDialog( pParent, CUI_RES( RID_DLG_SCRIPTORGANIZER ) ),
+ aScriptsTxt( this, CUI_RES( SF_TXT_SCRIPTS ) ),
+ aScriptsBox( this, CUI_RES( SF_CTRL_SCRIPTSBOX ) ),
+ aRunButton( this, CUI_RES( SF_PB_RUN ) ),
+ aCloseButton( this, CUI_RES( SF_PB_CLOSE ) ),
+ aCreateButton( this, CUI_RES( SF_PB_CREATE ) ),
+ aEditButton( this, CUI_RES( SF_PB_EDIT ) ),
+ aRenameButton(this, CUI_RES( SF_PB_RENAME ) ),
+ aDelButton( this, CUI_RES( SF_PB_DEL ) ),
+ aHelpButton( this, CUI_RES( SF_PB_HELP ) ),
m_sLanguage( language ),
- m_delErrStr( SVX_RES( RID_SVXSTR_DELFAILED ) ),
- m_delErrTitleStr( SVX_RES( RID_SVXSTR_DELFAILED_TITLE ) ),
- m_delQueryStr( SVX_RES( RID_SVXSTR_DELQUERY ) ),
- m_delQueryTitleStr( SVX_RES( RID_SVXSTR_DELQUERY_TITLE ) ) ,
- m_createErrStr( SVX_RES ( RID_SVXSTR_CREATEFAILED ) ),
- m_createDupStr( SVX_RES ( RID_SVXSTR_CREATEFAILEDDUP ) ),
- m_createErrTitleStr( SVX_RES( RID_SVXSTR_CREATEFAILED_TITLE ) ),
- m_renameErrStr( SVX_RES ( RID_SVXSTR_RENAMEFAILED ) ),
- m_renameErrTitleStr( SVX_RES( RID_SVXSTR_RENAMEFAILED_TITLE ) )
+ m_delErrStr( CUI_RES( RID_SVXSTR_DELFAILED ) ),
+ m_delErrTitleStr( CUI_RES( RID_SVXSTR_DELFAILED_TITLE ) ),
+ m_delQueryStr( CUI_RES( RID_SVXSTR_DELQUERY ) ),
+ m_delQueryTitleStr( CUI_RES( RID_SVXSTR_DELQUERY_TITLE ) ) ,
+ m_createErrStr( CUI_RES ( RID_SVXSTR_CREATEFAILED ) ),
+ m_createDupStr( CUI_RES ( RID_SVXSTR_CREATEFAILEDDUP ) ),
+ m_createErrTitleStr( CUI_RES( RID_SVXSTR_CREATEFAILED_TITLE ) ),
+ m_renameErrStr( CUI_RES ( RID_SVXSTR_RENAMEFAILED ) ),
+ m_renameErrTitleStr( CUI_RES( RID_SVXSTR_RENAMEFAILED_TITLE ) )
{
// must be a neater way to deal with the strings than as above
@@ -1434,7 +1433,7 @@ BOOL SFTreeListBox::dialogSort2( Reference< browse::XBrowseNode > node1,
if ( type.getLength() != 0 )
{
result += ::rtl::OUString::createFromAscii( "\n\n" );
- result += ::rtl::OUString(String(SVX_RES(RID_SVXSTR_ERROR_TYPE_LABEL)));
+ result += ::rtl::OUString(String(CUI_RES(RID_SVXSTR_ERROR_TYPE_LABEL)));
result += ::rtl::OUString::createFromAscii( " " );
result += type;
}
@@ -1442,7 +1441,7 @@ BOOL SFTreeListBox::dialogSort2( Reference< browse::XBrowseNode > node1,
if ( message.getLength() != 0 )
{
result += ::rtl::OUString::createFromAscii( "\n\n" );
- result += ::rtl::OUString(String(SVX_RES(RID_SVXSTR_ERROR_MESSAGE_LABEL)));
+ result += ::rtl::OUString(String(CUI_RES(RID_SVXSTR_ERROR_MESSAGE_LABEL)));
result += ::rtl::OUString::createFromAscii( " " );
result += message;
}
@@ -1453,7 +1452,7 @@ BOOL SFTreeListBox::dialogSort2( Reference< browse::XBrowseNode > node1,
::rtl::OUString GetErrorMessage(
const provider::ScriptErrorRaisedException& eScriptError )
{
- ::rtl::OUString unformatted = String( SVX_RES( RID_SVXSTR_ERROR_AT_LINE ) );
+ ::rtl::OUString unformatted = String( CUI_RES( RID_SVXSTR_ERROR_AT_LINE ) );
::rtl::OUString unknown = ::rtl::OUString::createFromAscii( "UNKNOWN" );
::rtl::OUString language = unknown;
@@ -1480,12 +1479,12 @@ BOOL SFTreeListBox::dialogSort2( Reference< browse::XBrowseNode > node1,
{
line = ::rtl::OUString::valueOf( eScriptError.lineNum );
unformatted = String(
- SVX_RES( RID_SVXSTR_ERROR_AT_LINE ) );
+ CUI_RES( RID_SVXSTR_ERROR_AT_LINE ) );
}
else
{
unformatted = String(
- SVX_RES( RID_SVXSTR_ERROR_RUNNING ) );
+ CUI_RES( RID_SVXSTR_ERROR_RUNNING ) );
}
return FormatErrorString(
@@ -1496,7 +1495,7 @@ BOOL SFTreeListBox::dialogSort2( Reference< browse::XBrowseNode > node1,
const provider::ScriptExceptionRaisedException& eScriptException )
{
::rtl::OUString unformatted =
- String( SVX_RES( RID_SVXSTR_EXCEPTION_AT_LINE ) );
+ String( CUI_RES( RID_SVXSTR_EXCEPTION_AT_LINE ) );
::rtl::OUString unknown = ::rtl::OUString::createFromAscii( "UNKNOWN" );
::rtl::OUString language = unknown;
@@ -1523,12 +1522,12 @@ BOOL SFTreeListBox::dialogSort2( Reference< browse::XBrowseNode > node1,
{
line = ::rtl::OUString::valueOf( eScriptException.lineNum );
unformatted = String(
- SVX_RES( RID_SVXSTR_EXCEPTION_AT_LINE ) );
+ CUI_RES( RID_SVXSTR_EXCEPTION_AT_LINE ) );
}
else
{
unformatted = String(
- SVX_RES( RID_SVXSTR_EXCEPTION_RUNNING ) );
+ CUI_RES( RID_SVXSTR_EXCEPTION_RUNNING ) );
}
if ( eScriptException.exceptionType.getLength() != 0 )
@@ -1544,7 +1543,7 @@ BOOL SFTreeListBox::dialogSort2( Reference< browse::XBrowseNode > node1,
const provider::ScriptFrameworkErrorException& sError )
{
::rtl::OUString unformatted = String(
- SVX_RES( RID_SVXSTR_FRAMEWORK_ERROR_RUNNING ) );
+ CUI_RES( RID_SVXSTR_FRAMEWORK_ERROR_RUNNING ) );
::rtl::OUString language =
::rtl::OUString::createFromAscii( "UNKNOWN" );
@@ -1565,7 +1564,7 @@ BOOL SFTreeListBox::dialogSort2( Reference< browse::XBrowseNode > node1,
if ( sError.errorType == provider::ScriptFrameworkErrorType::NOTSUPPORTED )
{
message = String(
- SVX_RES( RID_SVXSTR_ERROR_LANG_NOT_SUPPORTED ) );
+ CUI_RES( RID_SVXSTR_ERROR_LANG_NOT_SUPPORTED ) );
message = ReplaceString(
message, ::rtl::OUString::createFromAscii( "%LANGUAGENAME" ), language );
@@ -1681,11 +1680,11 @@ IMPL_LINK( SvxScriptErrorDialog, ShowDialog, ::rtl::OUString*, pMessage )
}
else
{
- message = String( SVX_RES( RID_SVXSTR_ERROR_TITLE ) );
+ message = String( CUI_RES( RID_SVXSTR_ERROR_TITLE ) );
}
MessBox* pBox = new WarningBox( NULL, WB_OK, message );
- pBox->SetText( SVX_RES( RID_SVXSTR_ERROR_TITLE ) );
+ pBox->SetText( CUI_RES( RID_SVXSTR_ERROR_TITLE ) );
pBox->Execute();
if ( pBox ) delete pBox;
diff --git a/svx/source/cui/scriptdlg.hrc b/cui/source/dialogs/scriptdlg.hrc
index f4a7a75a4416..0079037c7680 100644
--- a/svx/source/cui/scriptdlg.hrc
+++ b/cui/source/dialogs/scriptdlg.hrc
@@ -30,7 +30,7 @@
#ifndef _SCRIPTDLG_HRC
#define _SCRIPTDLG_HRC
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
#define SCRIPTDLG_OFFSET 400
diff --git a/svx/source/cui/scriptdlg.src b/cui/source/dialogs/scriptdlg.src
index 3c5b2739abfa..cceca0bc64ff 100644
--- a/svx/source/cui/scriptdlg.src
+++ b/cui/source/dialogs/scriptdlg.src
@@ -28,7 +28,7 @@
*
************************************************************************/
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "scriptdlg.hrc"
#include "helpid.hrc"
diff --git a/svx/source/cui/sdrcelldlg.cxx b/cui/source/dialogs/sdrcelldlg.cxx
index e543402330bd..a5f8e074758e 100644
--- a/svx/source/cui/sdrcelldlg.cxx
+++ b/cui/source/dialogs/sdrcelldlg.cxx
@@ -29,22 +29,20 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_cui.hxx"
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
-#include <svtools/cjkoptions.hxx>
-#include "flagsdef.hxx"
-#include "svx/dialogs.hrc"
+#include <svl/cjkoptions.hxx>
+#include <svx/flagsdef.hxx>
+#include "cuires.hrc"
#include "sdrcelldlg.hxx"
-#include "svx/dialmgr.hxx"
+#include "dialmgr.hxx"
#include "cuitabarea.hxx"
#include "svx/svdmodel.hxx"
#include "border.hxx"
+#include <svx/dialogs.hrc> // RID_SVXPAGE_...
SvxFormatCellsDialog::SvxFormatCellsDialog( Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel )
-: SfxTabDialog ( pParent, SVX_RES( RID_SVX_FORMAT_CELLS_DLG ), pAttr )
+: SfxTabDialog ( pParent, CUI_RES( RID_SVX_FORMAT_CELLS_DLG ), pAttr )
, mrOutAttrs ( *pAttr )
, mpColorTab ( pModel->GetColorTable() )
, mpGradientList ( pModel->GetGradientList() )
diff --git a/svx/source/cui/sdrcelldlg.src b/cui/source/dialogs/sdrcelldlg.src
index 71374302a276..0c721bc11d2b 100644
--- a/svx/source/cui/sdrcelldlg.src
+++ b/cui/source/dialogs/sdrcelldlg.src
@@ -28,7 +28,9 @@
*
************************************************************************/
+#include <cuires.hrc>
#include <svx/dialogs.hrc>
+
TabDialog RID_SVX_FORMAT_CELLS_DLG
{
OutputSize = TRUE ;
diff --git a/svx/source/cui/showcols.cxx b/cui/source/dialogs/showcols.cxx
index 734b59e1f6fe..4b3930a692c1 100644
--- a/svx/source/cui/showcols.cxx
+++ b/cui/source/dialogs/showcols.cxx
@@ -29,16 +29,13 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_cui.hxx"
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
#include "showcols.hxx"
+#include "fmsearch.hrc"
-#include "fmresids.hrc"
#include <tools/shl.hxx>
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
#include <vcl/msgbox.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <comphelper/extract.hxx>
@@ -53,11 +50,11 @@
DBG_NAME(FmShowColsDialog)
//--------------------------------------------------------------------------
FmShowColsDialog::FmShowColsDialog(Window* pParent)
- :ModalDialog(pParent, SVX_RES(RID_SVX_DLG_SHOWGRIDCOLUMNS))
- ,m_aList(this, SVX_RES(1))
- ,m_aLabel(this, SVX_RES(1))
- ,m_aOK(this, SVX_RES(1))
- ,m_aCancel(this, SVX_RES(1))
+ :ModalDialog(pParent, CUI_RES(RID_SVX_DLG_SHOWGRIDCOLUMNS))
+ ,m_aList(this, CUI_RES(1))
+ ,m_aLabel(this, CUI_RES(1))
+ ,m_aOK(this, CUI_RES(1))
+ ,m_aCancel(this, CUI_RES(1))
{
DBG_CTOR(FmShowColsDialog,NULL);
m_aList.EnableMultiSelection(sal_True);
diff --git a/svx/source/fmcomp/showcols.src b/cui/source/dialogs/showcols.src
index 0bdeabefb1e7..f22c0e0e3557 100644
--- a/svx/source/fmcomp/showcols.src
+++ b/cui/source/dialogs/showcols.src
@@ -27,9 +27,8 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#include "fmresids.hrc"
-#include <svx/svxids.hrc>
-#include "globlmn.hrc"
+
+#include "fmsearch.hrc"
ModalDialog RID_SVX_DLG_SHOWGRIDCOLUMNS
{
diff --git a/svx/source/cui/splitcelldlg.cxx b/cui/source/dialogs/splitcelldlg.cxx
index 82f3b1c9dff5..c6c1f173322c 100644
--- a/svx/source/cui/splitcelldlg.cxx
+++ b/cui/source/dialogs/splitcelldlg.cxx
@@ -29,39 +29,33 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
#include <sfx2/dispatch.hxx>
-
-#include <svtools/intitem.hxx>
-#include <svtools/eitem.hxx>
-
-#include "svx/dialmgr.hxx"
+#include <svl/intitem.hxx>
+#include <svl/eitem.hxx>
+#include "dialmgr.hxx"
#include "splitcelldlg.hxx"
-#include "svx/dialogs.hrc"
+#include "cuires.hrc"
#include "splitcelldlg.hrc"
SvxSplitTableDlg::SvxSplitTableDlg( Window *pParent, bool bIsTableVertical, long nMaxVertical, long nMaxHorizontal )
-: SvxStandardDialog(pParent, SVX_RES(RID_SVX_SPLITCELLDLG))
-, maCountLbl(this, SVX_RES(FT_COUNT))
-, maCountEdit(this, SVX_RES(ED_COUNT))
-, maCountFL(this, SVX_RES(FL_COUNT))
-, maHorzBox(this, SVX_RES(RB_HORZ))
-, maVertBox(this, SVX_RES(RB_VERT))
-, maPropCB(this, SVX_RES(CB_PROP))
-, maDirFL(this, SVX_RES(FL_DIR))
-, maOKBtn(this, SVX_RES(BT_OK))
-, maCancelBtn(this, SVX_RES(BT_CANCEL))
-, maHelpBtn( this, SVX_RES( BT_HELP ) )
+: SvxStandardDialog(pParent, CUI_RES(RID_SVX_SPLITCELLDLG))
+, maCountLbl(this, CUI_RES(FT_COUNT))
+, maCountEdit(this, CUI_RES(ED_COUNT))
+, maCountFL(this, CUI_RES(FL_COUNT))
+, maHorzBox(this, CUI_RES(RB_HORZ))
+, maVertBox(this, CUI_RES(RB_VERT))
+, maPropCB(this, CUI_RES(CB_PROP))
+, maDirFL(this, CUI_RES(FL_DIR))
+, maOKBtn(this, CUI_RES(BT_OK))
+, maCancelBtn(this, CUI_RES(BT_CANCEL))
+, maHelpBtn( this, CUI_RES( BT_HELP ) )
, mnMaxVertical( nMaxVertical )
, mnMaxHorizontal( nMaxHorizontal )
{
- maVertBox.SetModeRadioImage(Image(SVX_RES(BMP_SPLIT_VERT)), BMP_COLOR_HIGHCONTRAST);
- maHorzBox.SetModeRadioImage(Image(SVX_RES(BMP_SPLIT_HORZ)), BMP_COLOR_HIGHCONTRAST);
+ maVertBox.SetModeRadioImage(Image(CUI_RES(BMP_SPLIT_VERT)), BMP_COLOR_HIGHCONTRAST);
+ maHorzBox.SetModeRadioImage(Image(CUI_RES(BMP_SPLIT_HORZ)), BMP_COLOR_HIGHCONTRAST);
FreeResource();
maHorzBox.SetClickHdl( LINK( this, SvxSplitTableDlg, ClickHdl ));
maPropCB.SetClickHdl( LINK( this, SvxSplitTableDlg, ClickHdl ));
diff --git a/svx/source/cui/splitcelldlg.hrc b/cui/source/dialogs/splitcelldlg.hrc
index cab8b4ed02ad..cab8b4ed02ad 100644
--- a/svx/source/cui/splitcelldlg.hrc
+++ b/cui/source/dialogs/splitcelldlg.hrc
diff --git a/svx/source/cui/splitcelldlg.src b/cui/source/dialogs/splitcelldlg.src
index 17285cecd05f..f33243450e07 100644
--- a/svx/source/cui/splitcelldlg.src
+++ b/cui/source/dialogs/splitcelldlg.src
@@ -28,7 +28,7 @@
*
************************************************************************/
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "splitcelldlg.hrc"
ModalDialog RID_SVX_SPLITCELLDLG
diff --git a/svx/source/cui/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx
index 24966c6d4f5d..5b28029920cc 100644
--- a/svx/source/cui/srchxtra.cxx
+++ b/cui/source/dialogs/srchxtra.cxx
@@ -29,45 +29,32 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
// include ---------------------------------------------------------------
#include "srchxtra.hxx"
#include <tools/rcid.h>
#include <vcl/msgbox.hxx>
-#include <svtools/cjkoptions.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/cjkoptions.hxx>
+#include <svl/whiter.hxx>
#include <sfx2/objsh.hxx>
-
-#ifndef _SVX_DIALOGS_HRC
-#include <svx/dialogs.hrc>
-#endif
-#ifndef _SVX_SRCHXTRA_HRC
+#include <cuires.hrc>
#include "srchxtra.hrc"
-#endif
-#ifndef _SVXITEMS_HRC
-#include <svx/svxitems.hrc>
-#endif
-
-#ifndef _SVX_FLSTITEM_HXX
-
-#include "flstitem.hxx"
-#endif
+#include <svx/svxitems.hrc> // RID_ATTR_BEGIN
+#include <svx/dialmgr.hxx> // item resources
+#include <svx/flstitem.hxx>
#include "chardlg.hxx"
#include "paragrph.hxx"
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
#include "backgrnd.hxx"
+#include <svx/dialogs.hrc> // RID_SVXPAGE_...
// class SvxSearchFormatDialog -------------------------------------------
SvxSearchFormatDialog::SvxSearchFormatDialog( Window* pParent, const SfxItemSet& rSet ) :
- SfxTabDialog( pParent, SVX_RES( RID_SVXDLG_SEARCHFORMAT ), &rSet ),
+ SfxTabDialog( pParent, CUI_RES( RID_SVXDLG_SEARCHFORMAT ), &rSet ),
pFontList( NULL )
@@ -153,13 +140,13 @@ SvxSearchAttributeDialog::SvxSearchAttributeDialog( Window* pParent,
SearchAttrItemList& rLst,
const USHORT* pWhRanges ) :
- ModalDialog( pParent, SVX_RES( RID_SVXDLG_SEARCHATTR ) ),
+ ModalDialog( pParent, CUI_RES( RID_SVXDLG_SEARCHATTR ) ),
- aAttrFL ( this, SVX_RES( FL_ATTR ) ),
- aAttrLB ( this, SVX_RES( LB_ATTR ) ),
- aOKBtn ( this, SVX_RES( BTN_ATTR_OK ) ),
- aEscBtn ( this, SVX_RES( BTN_ATTR_CANCEL ) ),
- aHelpBtn( this, SVX_RES( BTN_ATTR_HELP ) ),
+ aAttrFL ( this, CUI_RES( FL_ATTR ) ),
+ aAttrLB ( this, CUI_RES( LB_ATTR ) ),
+ aOKBtn ( this, CUI_RES( BTN_ATTR_OK ) ),
+ aEscBtn ( this, CUI_RES( BTN_ATTR_CANCEL ) ),
+ aHelpBtn( this, CUI_RES( BTN_ATTR_HELP ) ),
rList( rLst )
@@ -195,12 +182,13 @@ SvxSearchAttributeDialog::SvxSearchAttributeDialog( Window* pParent,
}
}
+ // item resources are in svx
USHORT nResId = nSlot - SID_SVX_START + RID_ATTR_BEGIN;
SvLBoxEntry* pEntry = NULL;
ResId aId( nResId, DIALOG_MGR() );
aId.SetRT( RSC_STRING );
if ( DIALOG_MGR().IsAvailable( aId ) )
- pEntry = aAttrLB.SvTreeListBox::InsertEntry( SVX_RESSTR( nResId ) );
+ pEntry = aAttrLB.SvTreeListBox::InsertEntry( CUI_RESSTR( nResId ) );
else
{
ByteString sError( "no resource for slot id\nslot = " );
@@ -280,20 +268,20 @@ SvxSearchSimilarityDialog::SvxSearchSimilarityDialog
USHORT nShorter,
USHORT nLonger
) :
- ModalDialog( pParent, SVX_RES( RID_SVXDLG_SEARCHSIMILARITY ) ),
-
- aFixedLine ( this, SVX_RES( FL_SIMILARITY ) ),
- aOtherTxt ( this, SVX_RES( FT_OTHER ) ),
- aOtherFld ( this, SVX_RES( NF_OTHER ) ),
- aLongerTxt ( this, SVX_RES( FT_LONGER ) ),
- aLongerFld ( this, SVX_RES( NF_LONGER ) ),
- aShorterTxt ( this, SVX_RES( FT_SHORTER ) ),
- aShorterFld ( this, SVX_RES( NF_SHORTER ) ),
- aRelaxBox ( this, SVX_RES( CB_RELAX ) ),
-
- aOKBtn ( this, SVX_RES( BTN_ATTR_OK ) ),
- aEscBtn ( this, SVX_RES( BTN_ATTR_CANCEL ) ),
- aHelpBtn ( this, SVX_RES( BTN_ATTR_HELP ) )
+ ModalDialog( pParent, CUI_RES( RID_SVXDLG_SEARCHSIMILARITY ) ),
+
+ aFixedLine ( this, CUI_RES( FL_SIMILARITY ) ),
+ aOtherTxt ( this, CUI_RES( FT_OTHER ) ),
+ aOtherFld ( this, CUI_RES( NF_OTHER ) ),
+ aLongerTxt ( this, CUI_RES( FT_LONGER ) ),
+ aLongerFld ( this, CUI_RES( NF_LONGER ) ),
+ aShorterTxt ( this, CUI_RES( FT_SHORTER ) ),
+ aShorterFld ( this, CUI_RES( NF_SHORTER ) ),
+ aRelaxBox ( this, CUI_RES( CB_RELAX ) ),
+
+ aOKBtn ( this, CUI_RES( BTN_ATTR_OK ) ),
+ aEscBtn ( this, CUI_RES( BTN_ATTR_CANCEL ) ),
+ aHelpBtn ( this, CUI_RES( BTN_ATTR_HELP ) )
{
FreeResource();
diff --git a/svx/source/cui/srchxtra.hrc b/cui/source/dialogs/srchxtra.hrc
index 870303efd72c..870303efd72c 100644
--- a/svx/source/cui/srchxtra.hrc
+++ b/cui/source/dialogs/srchxtra.hrc
diff --git a/svx/source/cui/srchxtra.src b/cui/source/dialogs/srchxtra.src
index 980b952adc76..bde692af7447 100644
--- a/svx/source/cui/srchxtra.src
+++ b/cui/source/dialogs/srchxtra.src
@@ -29,8 +29,9 @@
************************************************************************/
// include ---------------------------------------------------------------
#include "helpid.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "srchxtra.hrc"
+#include <svx/dialogs.hrc>
// RID_SVXDLG_SEARCHFORMAT -----------------------------------------------
TabDialog RID_SVXDLG_SEARCHFORMAT
diff --git a/svx/source/cui/svuidlg.hrc b/cui/source/dialogs/svuidlg.hrc
index b4030391e6b5..ba3602fb18bd 100644
--- a/svx/source/cui/svuidlg.hrc
+++ b/cui/source/dialogs/svuidlg.hrc
@@ -28,10 +28,8 @@
*
************************************************************************/
-#include <svtools/solar.hrc>
-
-#define HID_PASTE_DLG (HID_SO2_START + 0)
-#define HID_LINKDLG_TABLB (HID_SO2_START + 1)
+#include <svl/solar.hrc>
+#include <helpid.hrc>
#define TB_LINKS 32014
diff --git a/svx/source/cui/svuidlg.src b/cui/source/dialogs/svuidlg.src
index cc8f2db676ae..cc8f2db676ae 100644
--- a/svx/source/cui/svuidlg.src
+++ b/cui/source/dialogs/svuidlg.src
diff --git a/svx/source/form/tbxform.src b/cui/source/dialogs/tbxform.src
index 7a3f84fcd300..e19818d51072 100644
--- a/svx/source/form/tbxform.src
+++ b/cui/source/dialogs/tbxform.src
@@ -27,9 +27,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#include <svx/svxids.hrc>
-#include "fmresids.hrc"
-#include "helpid.hrc"
+#include "fmsearch.hrc"
ModalDialog RID_SVX_DLG_INPUTRECORDNO
{
diff --git a/svx/source/cui/winpluginlib.cpp b/cui/source/dialogs/winpluginlib.cpp
index 0b1fced85b40..0b1fced85b40 100644
--- a/svx/source/cui/winpluginlib.cpp
+++ b/cui/source/dialogs/winpluginlib.cpp
diff --git a/svx/source/cui/zoom.cxx b/cui/source/dialogs/zoom.cxx
index e97448999564..1330f48818f6 100644
--- a/svx/source/cui/zoom.cxx
+++ b/cui/source/dialogs/zoom.cxx
@@ -29,36 +29,32 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
// include ---------------------------------------------------------------
#include <tools/shl.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itemset.hxx>
+#include <svl/itempool.hxx>
#include <sfx2/objsh.hxx>
#include <vcl/msgbox.hxx>
#define _SVX_ZOOM_CXX
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "zoom.hrc"
#include "zoom.hxx"
#include <svx/zoomitem.hxx>
#include <svx/viewlayoutitem.hxx>
-#include <svx/dialmgr.hxx>
-#include "zoom_def.hxx"
-
+#include <dialmgr.hxx>
+#include <svx/zoom_def.hxx>
+#include <svx/dialogs.hrc> // RID_SVXDLG_ZOOM
#include <layout/layout-pre.hxx>
#if ENABLE_LAYOUT
-#undef SVX_RES
-#define SVX_RES(x) #x
+#undef CUI_RES
+#define CUI_RES(x) #x
#undef SfxModalDialog
#define SfxModalDialog( parent, id ) Dialog( parent, "zoom.xml", id )
#endif /* ENABLE_LAYOUT */
@@ -197,27 +193,27 @@ void SvxZoomDialog::SetSpinSize( USHORT nNewSpin )
SvxZoomDialog::SvxZoomDialog( Window* pParent, const SfxItemSet& rCoreSet ) :
- SfxModalDialog( pParent, SVX_RES( RID_SVXDLG_ZOOM ) ),
-
- aZoomFl ( this, SVX_RES( FL_ZOOM ) ),
- aOptimalBtn ( this, SVX_RES( BTN_OPTIMAL ) ),
- aWholePageBtn ( this, SVX_RES( BTN_WHOLE_PAGE ) ),
- aPageWidthBtn ( this, SVX_RES( BTN_PAGE_WIDTH ) ),
- a100Btn ( this, SVX_RES( BTN_100 ) ),
- aUserBtn ( this, SVX_RES( BTN_USER ) ),
- aUserEdit ( this, SVX_RES( ED_USER ) ),
-
- aViewLayoutFl ( this, SVX_RES( FL_VIEWLAYOUT ) ),
- aAutomaticBtn ( this, SVX_RES( BTN_AUTOMATIC ) ),
- aSingleBtn ( this, SVX_RES( BTN_SINGLE ) ),
- aColumnsBtn ( this, SVX_RES( BTN_COLUMNS ) ),
- aColumnsEdit ( this, SVX_RES( ED_COLUMNS ) ),
- aBookModeChk ( this, SVX_RES( CHK_BOOK ) ),
-
- aBottomFl ( this, SVX_RES( FL_BOTTOM ) ),
- aOKBtn ( this, SVX_RES( BTN_ZOOM_OK ) ),
- aCancelBtn ( this, SVX_RES( BTN_ZOOM_CANCEL ) ),
- aHelpBtn ( this, SVX_RES( BTN_ZOOM_HELP ) ),
+ SfxModalDialog( pParent, CUI_RES( RID_SVXDLG_ZOOM ) ),
+
+ aZoomFl ( this, CUI_RES( FL_ZOOM ) ),
+ aOptimalBtn ( this, CUI_RES( BTN_OPTIMAL ) ),
+ aWholePageBtn ( this, CUI_RES( BTN_WHOLE_PAGE ) ),
+ aPageWidthBtn ( this, CUI_RES( BTN_PAGE_WIDTH ) ),
+ a100Btn ( this, CUI_RES( BTN_100 ) ),
+ aUserBtn ( this, CUI_RES( BTN_USER ) ),
+ aUserEdit ( this, CUI_RES( ED_USER ) ),
+
+ aViewLayoutFl ( this, CUI_RES( FL_VIEWLAYOUT ) ),
+ aAutomaticBtn ( this, CUI_RES( BTN_AUTOMATIC ) ),
+ aSingleBtn ( this, CUI_RES( BTN_SINGLE ) ),
+ aColumnsBtn ( this, CUI_RES( BTN_COLUMNS ) ),
+ aColumnsEdit ( this, CUI_RES( ED_COLUMNS ) ),
+ aBookModeChk ( this, CUI_RES( CHK_BOOK ) ),
+
+ aBottomFl ( this, CUI_RES( FL_BOTTOM ) ),
+ aOKBtn ( this, CUI_RES( BTN_ZOOM_OK ) ),
+ aCancelBtn ( this, CUI_RES( BTN_ZOOM_CANCEL ) ),
+ aHelpBtn ( this, CUI_RES( BTN_ZOOM_HELP ) ),
rSet ( rCoreSet ),
pOutSet ( NULL ),
diff --git a/svx/source/cui/zoom.hrc b/cui/source/dialogs/zoom.hrc
index 70e488c2893e..70e488c2893e 100644
--- a/svx/source/cui/zoom.hrc
+++ b/cui/source/dialogs/zoom.hrc
diff --git a/svx/source/cui/zoom.src b/cui/source/dialogs/zoom.src
index 197d1e2f2959..a27c41d7e1cc 100644
--- a/svx/source/cui/zoom.src
+++ b/cui/source/dialogs/zoom.src
@@ -28,9 +28,10 @@
*
************************************************************************/
// include ---------------------------------------------------------------
-#include <svx/svxids.hrc>
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "zoom.hrc"
+#include <svx/dialogs.hrc> // for RID_SVXDLG_ZOOM
+
// RID_SVXDLG_ZOOM -------------------------------------------------------
ModalDialog RID_SVXDLG_ZOOM
{
diff --git a/svx/source/cui/cuiexp.cxx b/cui/source/factory/cuiexp.cxx
index a0bed1362ee9..b294c3a6ea7d 100644
--- a/svx/source/cui/cuiexp.cxx
+++ b/cui/source/factory/cuiexp.cxx
@@ -29,11 +29,7 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
#include "dlgfact.hxx"
#include "sal/types.h"
diff --git a/svtools/source/misc/iniprop.cxx b/cui/source/factory/cuiresmgr.cxx
index 16e0e5bc48a7..b46f4bca2f56 100644
--- a/svtools/source/misc/iniprop.cxx
+++ b/cui/source/factory/cuiresmgr.cxx
@@ -6,8 +6,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: iniprop.cxx,v $
- * $Revision: 1.4 $
+ * $RCSfile: dialmgr.cxx,v $
+ * $Revision: 1.9 $
*
* This file is part of OpenOffice.org.
*
@@ -29,19 +29,25 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_cui.hxx"
+// include ---------------------------------------------------------------
-#include "iniprop.hxx"
+#include <dialmgr.hxx>
+#include <tools/rc.hxx>
+#include <svl/solar.hrc>
+#include <vcl/svapp.hxx>
-//-------------------------------------------------------------------------
+static ResMgr* pResMgr=0;
-TYPEINIT1(SfxAppIniManagerProperty, ApplicationProperty);
-
-//-------------------------------------------------------------------------
-
-SfxAppIniManagerProperty::~SfxAppIniManagerProperty()
+// struct DialogsResMgr --------------------------------------------------
+ResMgr* CuiResMgr::GetResMgr()
{
-}
-
+ if ( !pResMgr )
+ {
+ ByteString aName( "cui" );
+ pResMgr = ResMgr::CreateResMgr( aName.GetBuffer(), Application::GetSettings().GetUILocale() );
+ }
+ return pResMgr;
+}
diff --git a/svx/source/cui/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 996d0f63f9e9..10095922f523 100644
--- a/svx/source/cui/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -29,28 +29,21 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
-
-#include "numfmt.hxx" //add for SvxNumberFormatTabPage
+#include "precompiled_cui.hxx"
+#include "align.hxx" //add for SvxAlignmentTabPage
#include "dlgfact.hxx"
-// class ResId
#include <tools/rc.hxx>
#include <sfx2/basedlgs.hxx>
#include <sfx2/app.hxx>
#include <sfx2/request.hxx>
-#include <svx/optimprove.hxx>
-#include "splitcelldlg.hxx"
+#include <cuires.hrc>
#include <svx/dialogs.hrc>
-#include "fmresids.hrc"
+#include "numfmt.hxx"
+#include "optimprove.hxx"
+#include "splitcelldlg.hxx"
#include "gallery.hrc"
-//#include "imapdlg.hrc"
-// dialogs and tabpages
#include "dstribut.hxx"
#include "cuigaldlg.hxx"
#include "cuiimapwnd.hxx"
@@ -62,7 +55,6 @@
#include "treeopt.hxx"
#include "internationaloptions.hxx"
#include "labdlg.hxx"
-#include "dstribut.hxx"
#include "hangulhanjadlg.hxx" //add for HangulHanjaConversionDialog
#include "showcols.hxx" //add for FmShowColsDialog
#include "zoom.hxx" //add for SvxZoomDialog
@@ -87,18 +79,16 @@
#include "connect.hxx" //add for SvxConnectionDialog
#include "dbregister.hxx" // add for DatabaseRegistrationDialog
#include "cuioptgenrl.hxx" //add for SvxGeneralTabPage
-#include <optasian.hxx>
+#include "optasian.hxx"
#include "insdlg.hxx"
#include "pastedlg.hxx"
#include "linkdlg.hxx"
#include "SpellDialog.hxx"
#include "cfg.hxx" //add for SvxConfigDialog
-
#include "numpages.hxx" // add for
#include "paragrph.hxx" //add for
#include "tabstpge.hxx" // add for
#include "textattr.hxx" // add for SvxTextAttrPage
-#include "align.hxx" //add for SvxAlignmentTabPage
#include "backgrnd.hxx" //add for SvxBackgroundTabPage
#include "border.hxx" //add for SvxBorderTabPage
#include "chardlg.hxx" //add for SvxCharNamePage,SvxCharEffectsPage,SvxCharPositionPage,SvxCharTwoLinesPage
@@ -220,12 +210,12 @@ const SfxItemSet* AbstractTabDialog_Impl::GetOutputItemSet() const
{
return pDlg->GetOutputItemSet();
}
-//add by CHINA001
+
const USHORT* AbstractTabDialog_Impl::GetInputRanges(const SfxItemPool& pItem )
{
return pDlg->GetInputRanges( pItem );
}
-//add by CHINA001
+
void AbstractTabDialog_Impl::SetInputSet( const SfxItemSet* pInSet )
{
pDlg->SetInputSet( pInSet );
@@ -240,7 +230,6 @@ String AbstractTabDialog_Impl::GetText() const
return pDlg->GetText();
}
-// AbstractTabDialog_Impl end
const SfxItemSet* AbstractSfxDialog_Impl::GetOutputItemSet() const
{
@@ -257,7 +246,6 @@ String AbstractSfxDialog_Impl::GetText() const
return pDlg->GetText();
}
-//for SvxDistributeDialog begin
SvxDistributeHorizontal AbstractSvxDistributeDialog_Impl::GetDistributeHor()const
{
return pDlg->GetDistributeHor();
@@ -266,9 +254,7 @@ SvxDistributeVertical AbstractSvxDistributeDialog_Impl::GetDistributeVer()const
{
return pDlg->GetDistributeVer();
}
-//for SvxDistributeDialog end
-// for HangulHanjaConversionDialog begin
void AbstractHangulHanjaConversionDialog_Impl::EndDialog(long nResult)
{
pDlg->EndDialog(nResult);
@@ -402,16 +388,11 @@ ULONG AbstractPasteDialog_Impl::GetFormat( const TransferableDataHelper& aHelper
return pDlg->GetFormat( aHelper, pFormats, pDesc );
}
-// for HangulHanjaConversionDialog end
-// for FmShowColsDialog begin
void AbstractFmShowColsDialog_Impl::SetColumns(const ::Reference< ::com::sun::star::container::XIndexContainer>& xCols)
{
pDlg->SetColumns(xCols);
}
-//for FmShowColsDialog end
-
-//for SvxZoomDialog begin
void AbstractSvxZoomDialog_Impl::SetLimits( USHORT nMin, USHORT nMax )
{
pDlg->SetLimits( nMin, nMax );
@@ -427,74 +408,31 @@ const SfxItemSet* AbstractSvxZoomDialog_Impl::GetOutputItemSet() const
return pDlg->GetOutputItemSet();
}
-//for SvxZoomDialog end
-// svx::SvxSpellDialog
-/*-- 04.05.2004 08:26:12---------------------------------------------------
-
- -----------------------------------------------------------------------*/
void AbstractSpellDialog_Impl::SetLanguage( sal_uInt16 nLang )
{
pDlg->SetLanguage(nLang);
}
-/*-- 04.05.2004 08:26:13---------------------------------------------------
- -----------------------------------------------------------------------*/
sal_Bool AbstractSpellDialog_Impl::Close()
{
return pDlg->Close();
}
-/*-- 04.05.2004 08:26:13---------------------------------------------------
- -----------------------------------------------------------------------*/
void AbstractSpellDialog_Impl::Invalidate()
{
pDlg->InvalidateDialog();
}
-/*-- 04.05.2004 08:26:13---------------------------------------------------
- -----------------------------------------------------------------------*/
Window* AbstractSpellDialog_Impl::GetWindow()
{
return pDlg;
}
-/*-- 04.05.2004 08:26:13---------------------------------------------------
- -----------------------------------------------------------------------*/
SfxBindings& AbstractSpellDialog_Impl::GetBindings()
{
return pDlg->GetBindings();
}
-// end svx::SvxSpellDialog
-
-//for SvxSpellCheckDialog begin
-//STRIP001 void AbstractSvxSpellCheckDialog_Impl::SetNewEditWord( const String& _rNew )
-//STRIP001 {
-//STRIP001 return pDlg->SetNewEditWord(_rNew );
-//STRIP001 }
-//STRIP001
-//STRIP001 void AbstractSvxSpellCheckDialog_Impl::SetLanguage( sal_uInt16 nLang )
-//STRIP001 {
-//STRIP001 return pDlg->SetLanguage( nLang );
-//STRIP001 }
-//STRIP001
-//STRIP001 void AbstractSvxSpellCheckDialog_Impl::HideAutoCorrect()
-//STRIP001 {
-//STRIP001 return pDlg->HideAutoCorrect();
-//STRIP001 }
-//STRIP001
-//STRIP001 String AbstractSvxSpellCheckDialog_Impl::GetNewEditWord()
-//STRIP001 {
-//STRIP001 return pDlg->GetNewEditWord();
-//STRIP001 }
-//STRIP001
-//STRIP001 void AbstractSvxSpellCheckDialog_Impl::SetNewEditWord( const String& _rNew )
-//STRIP001 {
-//STRIP001 return pDlg->SetNewEditWord( _rNew );
-//STRIP001 }
-//STRIP001
-//for SvxSpellCheckDialog end
-
-//for SearchProgress begin
+
void AbstractSearchProgress_Impl::Update()
{
pDlg->Update();
@@ -518,9 +456,7 @@ PLinkStub AbstractSearchProgress_Impl::GetLinkStubCleanUpHdl()
{
return SearchProgress::LinkStubCleanUpHdl;
}
-//for SearchProgress end
-//for TakeProgress begin
void AbstractTakeProgress_Impl::Update()
{
pDlg->Update();
@@ -540,23 +476,17 @@ PLinkStub AbstractTakeProgress_Impl::GetLinkStubCleanUpHdl()
{
return TakeProgress::LinkStubCleanUpHdl;
}
-//for TakeProgress end
-//for TitleDialog begin
String AbstractTitleDialog_Impl::GetTitle() const
{
return pDlg->GetTitle();
}
-//for TitleDialog end
-//for GalleryIdDialog begin
ULONG AbstractGalleryIdDialog_Impl::GetId() const
{
return pDlg->GetId();
}
-//for GalleryIdDialog end
-//for VclAbstracRefreshableDialog begin
void VclAbstractRefreshableDialog_Impl::Update()
{
pDlg->Update();
@@ -566,9 +496,7 @@ void VclAbstractRefreshableDialog_Impl::Sync()
{
pDlg-> Sync();
}
-//for VclAbstracRefreshableDialog end
-//for URLDlg begin
String AbstractURLDlg_Impl::GetURL() const
{
return pDlg->GetURL();
@@ -593,9 +521,6 @@ String AbstractURLDlg_Impl::GetName() const
{
return pDlg->GetName();
}
-//for URLDlg end
-
-// AbstractSvxHlinkDlgMarkWnd_Impl begin
void AbstractSvxHlinkDlgMarkWnd_Impl::Hide( USHORT nFlags )
{
@@ -647,9 +572,6 @@ USHORT AbstractSvxHlinkDlgMarkWnd_Impl::SetError( USHORT nError)
return pDlg->SetError(nError);
}
-// AbstractSvxHlinkDlgMarkWnd_Impl end
-
-//for SvxSearchSimilarityDialog begin
USHORT AbstractSvxSearchSimilarityDialog_Impl::GetOther()
{
return pDlg->GetOther();
@@ -669,7 +591,6 @@ BOOL AbstractSvxSearchSimilarityDialog_Impl::IsRelaxed()
{
return pDlg-> IsRelaxed();
}
-//for SvxSearchSimilarityDialog end
// AbstractSvxTransformTabDialog implementations just forwards everything to the dialog
void AbstractSvxTransformTabDialog_Impl::SetCurPageId( USHORT nId )
@@ -703,7 +624,6 @@ void AbstractSvxTransformTabDialog_Impl::SetValidateFramePosLink( const Link& rL
{
pDlg->SetValidateFramePosLink( rLink );
}
-// AbstractSvxTransformTabDialog end
// AbstractSvxCaptionDialog implementations just forwards everything to the dialog
void AbstractSvxCaptionDialog_Impl::SetCurPageId( USHORT nId )
@@ -737,16 +657,12 @@ void AbstractSvxCaptionDialog_Impl::SetValidateFramePosLink( const Link& rLink )
{
pDlg->SetValidateFramePosLink( rLink );
}
-// SvxAbstractCaptionDialog end
-//for SvxJSearchOptionsDialog begin
INT32 AbstractSvxJSearchOptionsDialog_Impl::GetTransliterationFlags() const
{
return pDlg->GetTransliterationFlags();
}
-//for SvxJSearchOptionsDialog end
-//for FmInputRecordNoDialog begin
void AbstractFmInputRecordNoDialog_Impl::SetValue(long nNew)
{
pDlg->SetValue(nNew);
@@ -756,21 +672,18 @@ long AbstractFmInputRecordNoDialog_Impl::GetValue() const
{
return pDlg->GetValue();
}
-//for FmInputRecordNoDialog end
-//for SvxNewDictionaryDialog begin
::Reference<
::com::sun::star::linguistic2::XDictionary > AbstractSvxNewDictionaryDialog_Impl::GetNewDictionary()
{
return pDlg->GetNewDictionary();
}
-//for SvxNewDictionaryDialog end
-//for SvxNameDialog begin
void AbstractSvxNameDialog_Impl::GetName( String& rName )
{
pDlg->GetName( rName );
}
+
void AbstractSvxNameDialog_Impl::SetCheckNameHdl( const Link& rLink, bool bCheckImmediately )
{
aCheckNameHdl = rLink;
@@ -797,10 +710,6 @@ IMPL_LINK( AbstractSvxNameDialog_Impl, CheckNameHdl, Window*, EMPTYARG )
return aCheckNameHdl.Call(this);
return 0;
}
-//for SvxNameDialog end
-
-///////////////////////////////////////////////////////////////////////////////////////////////
-// #i68101#
void AbstractSvxObjectNameDialog_Impl::GetName(String& rName)
{
@@ -831,9 +740,6 @@ IMPL_LINK(AbstractSvxObjectNameDialog_Impl, CheckNameHdl, Window*, EMPTYARG)
return 0;
}
-///////////////////////////////////////////////////////////////////////////////////////////////
-// #i68101#
-
void AbstractSvxObjectTitleDescDialog_Impl::GetTitle(String& rTitle)
{
pDlg->GetTitle(rTitle);
@@ -844,16 +750,11 @@ void AbstractSvxObjectTitleDescDialog_Impl::GetDescription(String& rDescription)
pDlg->GetDescription(rDescription);
}
-///////////////////////////////////////////////////////////////////////////////////////////////
-
-//for SvxMessDialog begin
void AbstractSvxMessDialog_Impl::SetButtonText( USHORT nBtnId, const String& rNewTxt )
{
pDlg->SetButtonText( nBtnId, rNewTxt );
}
-//for SvxMessDialog end
-//for SvxMultiPathDialog begin
String AbstractSvxMultiPathDialog_Impl::GetPath() const
{
return pDlg->GetPath();
@@ -873,9 +774,7 @@ void AbstractSvxMultiPathDialog_Impl::SetTitle( const String& rNewTitle )
{
pDlg->SetText( rNewTitle );
}
-//for SvxMultiPathDialog end
-//for SvxMultiFileDialog begin
String AbstractSvxMultiFileDialog_Impl::GetPath() const
{
return pDlg->GetPath();
@@ -915,9 +814,7 @@ void AbstractSvxMultiFileDialog_Impl::SetHelpId( ULONG nHelpId )
{
pDlg->SetHelpId( nHelpId );
}
-//for SvxMultiFileDialog end
-//for SvxHpLinkDlg begin
Window * AbstractSvxHpLinkDlg_Impl::GetWindow()
{
return (Window *)pDlg;
@@ -927,10 +824,8 @@ sal_Bool AbstractSvxHpLinkDlg_Impl::QueryClose()
{
return pDlg->QueryClose();
}
-//for SvxHpLinkDlg end
-//for FmSearchDialog begin
void AbstractFmSearchDialog_Impl::SetFoundHandler(const Link& lnk)
{
pDlg->SetFoundHandler(lnk);
@@ -943,14 +838,11 @@ void AbstractFmSearchDialog_Impl::SetActiveField(const String& strField)
{
pDlg->SetActiveField(strField);
}
-//for FmSearchDialog end
-//for GraphicFilterDialog begin
Graphic AbstractGraphicFilterDialog_Impl::GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY )
{
return pDlg->GetFilteredGraphic( rGraphic, fScaleX, fScaleY );
}
-//for GraphicFilterDialog end
// AbstractSvxAreaTabDialog implementations just forwards everything to the dialog
void AbstractSvxAreaTabDialog_Impl::SetCurPageId( USHORT nId )
@@ -962,12 +854,12 @@ const SfxItemSet* AbstractSvxAreaTabDialog_Impl::GetOutputItemSet() const
{
return pDlg->GetOutputItemSet();
}
-//add by CHINA001
+
const USHORT* AbstractSvxAreaTabDialog_Impl::GetInputRanges(const SfxItemPool& pItem )
{
return pDlg->GetInputRanges( pItem );
}
-//add by CHINA001
+
void AbstractSvxAreaTabDialog_Impl::SetInputSet( const SfxItemSet* pInSet )
{
pDlg->SetInputSet( pInSet );
@@ -986,9 +878,7 @@ void AbstractSvxAreaTabDialog_Impl::DontDeleteColorTable()
{
return pDlg->DontDeleteColorTable();
}
-// AbstractSvxAreaTabDialog_Impl end
-// add SvxPostItDialog begin
void AbstractSvxPostItDialog_Impl::SetText( const XubString& rStr )
{
pDlg->SetText( rStr );
@@ -1062,9 +952,6 @@ Window * AbstractSvxPostItDialog_Impl::GetWindow()
return (Window *)pDlg;
}
-// SvxPostItDialog end
-
-//--------------------------------------------------------------
// Create dialogs with simplest interface
VclAbstractDialog* AbstractDialogFactory_Impl::CreateVclDialog( Window* pParent, sal_uInt32 nResId )
{
@@ -1188,125 +1075,50 @@ SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateTabDialog( sal_uInt32 nR
// TabDialog that use functionality of the drawing layer
SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateTextTabDialog( Window* pParent,
const SfxItemSet* pAttrSet,
- sal_uInt32 nResId,
SdrView* pView,
SdrModel* )
{
- SfxTabDialog* pDlg=NULL;
- switch ( nResId )
- {
- case RID_SVXDLG_TEXT :
- pDlg = new SvxTextTabDialog( pParent, pAttrSet, pView );
- break;
- default:
- break;
- }
-
- if ( pDlg )
- return new AbstractTabDialog_Impl( pDlg );
- return 0;
+ SfxTabDialog* pDlg = new SvxTextTabDialog( pParent, pAttrSet, pView );
+ return new AbstractTabDialog_Impl( pDlg );
}
//TabDialog that use functionality of the drawing layer and add AnchorTypes -- for SvxCaptionTabDialog CHINA001
AbstractSvxCaptionDialog* AbstractDialogFactory_Impl::CreateCaptionDialog( Window* pParent,
const SdrView* pView,
- sal_uInt32 nResId,
USHORT nAnchorTypes )
{
- SvxCaptionTabDialog* pDlg=NULL;
- switch ( nResId )
- {
- case RID_SVXDLG_CAPTION :
- pDlg = new SvxCaptionTabDialog( pParent, pView, nAnchorTypes );
- break;
- default:
- break;
- }
-
- if ( pDlg )
- return new AbstractSvxCaptionDialog_Impl( pDlg );
- return 0;
+ SvxCaptionTabDialog* pDlg = new SvxCaptionTabDialog( pParent, pView, nAnchorTypes );
+ return new AbstractSvxCaptionDialog_Impl( pDlg );
}
AbstractSvxDistributeDialog* AbstractDialogFactory_Impl::CreateSvxDistributeDialog(Window* pParent,
const SfxItemSet& rAttr,
- sal_uInt32 nResId,
SvxDistributeHorizontal eHor ,
SvxDistributeVertical eVer)
{
- SvxDistributeDialog* pDlg=NULL;
- switch ( nResId )
- {
- case RID_SVXPAGE_DISTRIBUTE :
- pDlg = new SvxDistributeDialog( pParent, rAttr, eHor, eVer);
- break;
- default:
- break;
- }
-
- if ( pDlg )
- return new AbstractSvxDistributeDialog_Impl( pDlg );
- return 0;
+ SvxDistributeDialog* pDlg = new SvxDistributeDialog( pParent, rAttr, eHor, eVer);
+ return new AbstractSvxDistributeDialog_Impl( pDlg );
}
AbstractHangulHanjaConversionDialog* AbstractDialogFactory_Impl::CreateHangulHanjaConversionDialog(Window* pParent,
- HangulHanjaConversion::ConversionDirection _ePrimaryDirection,
- sal_uInt32 nResId)
+ HangulHanjaConversion::ConversionDirection _ePrimaryDirection )
{
- HangulHanjaConversionDialog* pDlg=NULL;
- switch ( nResId )
- {
- case RID_SVX_MDLG_HANGULHANJA :
- pDlg = new HangulHanjaConversionDialog( pParent, _ePrimaryDirection);
- break;
- default:
- break;
- }
-
- if ( pDlg )
- return new AbstractHangulHanjaConversionDialog_Impl( pDlg );
- return 0;
+ HangulHanjaConversionDialog* pDlg = new HangulHanjaConversionDialog( pParent, _ePrimaryDirection);
+ return new AbstractHangulHanjaConversionDialog_Impl( pDlg );
}
-AbstractFmShowColsDialog * AbstractDialogFactory_Impl::CreateFmShowColsDialog( Window* pParent, //add for FmShowColsDialog
- sal_uInt32 nResId)
+AbstractFmShowColsDialog * AbstractDialogFactory_Impl::CreateFmShowColsDialog( Window* pParent )
{
- FmShowColsDialog* pDlg=NULL;
- switch ( nResId )
- {
- case RID_SVX_DLG_SHOWGRIDCOLUMNS :
- pDlg = new FmShowColsDialog( pParent);
- break;
- default:
- break;
- }
-
- if ( pDlg )
- return new AbstractFmShowColsDialog_Impl( pDlg );
- return 0;
+ FmShowColsDialog* pDlg = new FmShowColsDialog( pParent);
+ return new AbstractFmShowColsDialog_Impl( pDlg );
}
AbstractSvxZoomDialog * AbstractDialogFactory_Impl::CreateSvxZoomDialog( Window* pParent, //add for SvxZoomDialog
- const SfxItemSet& rCoreSet,
- sal_uInt32 nResId)
+ const SfxItemSet& rCoreSet)
{
- SvxZoomDialog* pDlg=NULL;
- switch ( nResId )
- {
- case RID_SVXDLG_ZOOM :
- pDlg = new SvxZoomDialog( pParent, rCoreSet);
- break;
- default:
- break;
- }
-
- if ( pDlg )
- return new AbstractSvxZoomDialog_Impl( pDlg );
- return 0;
+ SvxZoomDialog* pDlg = new SvxZoomDialog( pParent, rCoreSet);
+ return new AbstractSvxZoomDialog_Impl( pDlg );
}
-/*-- 04.05.2004 08:18:17---------------------------------------------------
-
- -----------------------------------------------------------------------*/
AbstractSpellDialog * AbstractDialogFactory_Impl::CreateSvxSpellDialog(
Window* pParent,
SfxBindings* pBindings,
@@ -1316,61 +1128,23 @@ AbstractSpellDialog * AbstractDialogFactory_Impl::CreateSvxSpellDialog(
return new AbstractSpellDialog_Impl(pDlg);
}
-//CHINA001 GalleryDialog start
-VclAbstractRefreshableDialog * AbstractDialogFactory_Impl::CreateActualizeProgressDialog( Window* pParent, //add for ActualizeProgress
- GalleryTheme* pThm,
- sal_uInt32 nResId)
+VclAbstractRefreshableDialog * AbstractDialogFactory_Impl::CreateActualizeProgressDialog( Window* pParent, GalleryTheme* pThm )
{
- Dialog* pDlg=NULL;
- switch ( nResId )
- {
- case RID_SVXDLG_GALLERY_ACTUALIZE_PROGRESS :
- pDlg = new ActualizeProgress( pParent, pThm);
- break;
- default:
- break;
- }
-
- if ( pDlg )
- return new VclAbstractRefreshableDialog_Impl( pDlg );
- return 0;
+ Dialog* pDlg = new ActualizeProgress( pParent, pThm);
+ return new VclAbstractRefreshableDialog_Impl( pDlg );
}
AbstractSearchProgress * AbstractDialogFactory_Impl::CreateSearchProgressDialog( Window* pParent, //add for SearchProgress
- const INetURLObject& rStartURL,
- sal_uInt32 nResId)
+ const INetURLObject& rStartURL )
{
- SearchProgress* pDlg=NULL;
- switch ( nResId )
- {
- case RID_SVXDLG_GALLERY_SEARCH_PROGRESS :
- pDlg = new SearchProgress( pParent, rStartURL);
- break;
- default:
- break;
- }
-
- if ( pDlg )
- return new AbstractSearchProgress_Impl( pDlg );
- return 0;
+ SearchProgress* pDlg = new SearchProgress( pParent, rStartURL);
+ return new AbstractSearchProgress_Impl( pDlg );
}
-AbstractTakeProgress * AbstractDialogFactory_Impl::CreateTakeProgressDialog( Window* pParent, //add for TakeProgress
- sal_uInt32 nResId)
+AbstractTakeProgress * AbstractDialogFactory_Impl::CreateTakeProgressDialog( Window* pParent )
{
- TakeProgress* pDlg=NULL;
- switch ( nResId )
- {
- case RID_SVXDLG_GALLERY_TAKE_PROGRESS :
- pDlg = new TakeProgress( pParent );
- break;
- default:
- break;
- }
-
- if ( pDlg )
- return new AbstractTakeProgress_Impl( pDlg );
- return 0;
+ TakeProgress* pDlg = new TakeProgress( pParent );
+ return new AbstractTakeProgress_Impl( pDlg );
}
VclAbstractDialog*
@@ -1422,63 +1196,26 @@ VclAbstractDialog * AbstractDialogFactory_Impl::CreateSvxScriptOrgDialog( Window
}
AbstractTitleDialog * AbstractDialogFactory_Impl::CreateTitleDialog( Window* pParent, //add for TitleDialog
- const String& rOldText,
- sal_uInt32 nResId)
+ const String& rOldText)
{
- TitleDialog* pDlg=NULL;
- switch ( nResId )
- {
- case RID_SVXDLG_GALLERY_TITLE :
- pDlg = new TitleDialog( pParent, rOldText);
- break;
- default:
- break;
- }
-
- if ( pDlg )
- return new AbstractTitleDialog_Impl( pDlg );
- return 0;
+ TitleDialog* pDlg = new TitleDialog( pParent, rOldText);
+ return new AbstractTitleDialog_Impl( pDlg );
}
AbstractGalleryIdDialog * AbstractDialogFactory_Impl::CreateGalleryIdDialog( Window* pParent, //add for SvxZoomDialog
- GalleryTheme* pThm,
- sal_uInt32 nResId)
+ GalleryTheme* pThm )
{
- GalleryIdDialog* pDlg=NULL;
- switch ( nResId )
- {
- case RID_SVXDLG_GALLERY_THEMEID :
- pDlg = new GalleryIdDialog( pParent, pThm);
- break;
- default:
- break;
- }
-
- if ( pDlg )
- return new AbstractGalleryIdDialog_Impl( pDlg );
- return 0;
+ GalleryIdDialog* pDlg = new GalleryIdDialog( pParent, pThm);
+ return new AbstractGalleryIdDialog_Impl( pDlg );
}
VclAbstractDialog2 * AbstractDialogFactory_Impl::CreateGalleryThemePropertiesDialog( Window* pParent, //add for GalleryThemeProperties
ExchangeData* pData,
- SfxItemSet* pItemSet,
- sal_uInt32 nResId)
+ SfxItemSet* pItemSet)
{
- Dialog* pDlg=NULL;
- switch ( nResId )
- {
- case RID_SVXTABDLG_GALLERYTHEME :
- pDlg = new GalleryThemeProperties( pParent, pData, pItemSet);
- break;
- default:
- break;
- }
-
- if ( pDlg )
- return new VclAbstractDialog2_Impl( pDlg );
- return 0;
+ Dialog* pDlg = new GalleryThemeProperties( pParent, pData, pItemSet);
+ return new VclAbstractDialog2_Impl( pDlg );
}
-//CHINA001 GalleryDialog end
AbstractURLDlg * AbstractDialogFactory_Impl::CreateURLDialog( Window* pParent, //add for URLDlg
const String& rURL, const String& rAltText, const String& rDescription,
@@ -1488,9 +1225,7 @@ AbstractURLDlg * AbstractDialogFactory_Impl::CreateURLDialog( Window* pParent,
URLDlg* pDlg = new URLDlg( pParent, rURL, rAltText, rDescription, rTarget, rName, rTargetList);
return new AbstractURLDlg_Impl( pDlg );
}
-//CHINA001 URLDlg end
-//CHINA001 SvxHlinkDlgMarkWnd begin
AbstractSvxHlinkDlgMarkWnd* AbstractDialogFactory_Impl::CreateSvxHlinkDlgMarkWndDialog( SvxHyperlinkTabPageBase* pParent, sal_uInt32 nResId )
{
SvxHlinkDlgMarkWnd* pDlg=NULL;
@@ -1507,7 +1242,6 @@ AbstractSvxHlinkDlgMarkWnd* AbstractDialogFactory_Impl::CreateSvxHlinkDlgMarkWnd
return new AbstractSvxHlinkDlgMarkWnd_Impl( pDlg );
return 0;
}
-//CHINA001 SvxHlinkDlgMarkWnd end
SfxAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( sal_uInt32 nResId,
Window* pParent,
@@ -1528,9 +1262,7 @@ SfxAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( sal_uInt32 nResI
return new AbstractSfxDialog_Impl( pDlg );
return 0;
}
-//CHINA001 SvxCharacterMap end
-//CHINA001 SvxSearchFormatDialog begin
SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateTabItemDialog( Window* pParent,
const SfxItemSet& rSet,
sal_uInt32 nResId)
@@ -1549,31 +1281,15 @@ SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateTabItemDialog( Window* p
return new AbstractTabDialog_Impl( pDlg );
return 0;
}
-//CHINA001 SvxSearchFormatDialog end
-//CHINA001 SvxSearchAttributeDialog begin
VclAbstractDialog* AbstractDialogFactory_Impl::CreateSvxSearchAttributeDialog( Window* pParent,
SearchAttrItemList& rLst,
- const USHORT* pWhRanges,
- sal_uInt32 nResId ) //add for SvxSearchAttributeDialog
+ const USHORT* pWhRanges )
{
- Dialog* pDlg=NULL;
- switch ( nResId )
- {
- case RID_SVXDLG_SEARCHATTR :
- pDlg = new SvxSearchAttributeDialog( pParent, rLst, pWhRanges);
- break;
- default:
- break;
- }
-
- if ( pDlg )
- return new VclAbstractDialog_Impl( pDlg );
- return 0;
+ Dialog* pDlg = new SvxSearchAttributeDialog( pParent, rLst, pWhRanges);
+ return new VclAbstractDialog_Impl( pDlg );
}
-//CHINA001 SvxSearchAttributeDialog end
-//CHINA001 SvxSearchSimilarityDialog begin
AbstractSvxSearchSimilarityDialog * AbstractDialogFactory_Impl::CreateSvxSearchSimilarityDialog( Window* pParent,
BOOL bRelax,
USHORT nOther,
@@ -1585,55 +1301,24 @@ AbstractSvxSearchSimilarityDialog * AbstractDialogFactory_Impl::CreateSvxSearchS
return new AbstractSvxSearchSimilarityDialog_Impl( pDlg );
return NULL;
}
-//CHINA001 SvxSearchSimilarityDialog end
-//CHINA001 SvxBorderBackgroundDlg begin
SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateSvxBorderBackgroundDlg( Window* pParent,
const SfxItemSet& rCoreSet,
- sal_uInt32 nResId,
BOOL bEnableSelector)
{
- SfxTabDialog* pDlg=NULL;
- switch ( nResId )
- {
- case RID_SVXDLG_BBDLG :
- pDlg = new SvxBorderBackgroundDlg( pParent, rCoreSet, bEnableSelector);
- break;
- default:
- break;
- }
-
- if ( pDlg )
- return new AbstractTabDialog_Impl( pDlg );
- return 0;
+ SfxTabDialog* pDlg = new SvxBorderBackgroundDlg( pParent, rCoreSet, bEnableSelector);
+ return new AbstractTabDialog_Impl( pDlg );
}
-//CHINA001 SvxBorderBackgroundDlg end
-//CHINA001 SvxTransformTabDialog begin
AbstractSvxTransformTabDialog* AbstractDialogFactory_Impl::CreateSvxTransformTabDialog( Window* pParent,
const SfxItemSet* pAttr,
const SdrView* pView,
- sal_uInt32 nResId,
USHORT nAnchorTypes )
{
- SvxTransformTabDialog* pDlg=NULL;
- switch ( nResId )
- {
- case RID_SVXDLG_TRANSFORM :
- pDlg = new SvxTransformTabDialog( pParent, pAttr,pView, nAnchorTypes);
- break;
- default:
- break;
- }
-
- if ( pDlg )
- return new AbstractSvxTransformTabDialog_Impl( pDlg );
- return 0;
+ SvxTransformTabDialog* pDlg = new SvxTransformTabDialog( pParent, pAttr,pView, nAnchorTypes);
+ return new AbstractSvxTransformTabDialog_Impl( pDlg );
}
-//CHINA001 SvxTransformTabDialog end
-
-//CHINA001 SchTransformTabDialog begin
SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateSchTransformTabDialog( Window* pParent,
const SfxItemSet* pAttr,
const SdrView* pSdrView,
@@ -1665,51 +1350,21 @@ SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateSchTransformTabDialog( W
return new AbstractTabDialog_Impl( pDlg );
return 0;
}
-//CHINA001 SchTransformTabDialog end
-//CHINA001 SvxJSearchOptionsDialog begin
AbstractSvxJSearchOptionsDialog * AbstractDialogFactory_Impl::CreateSvxJSearchOptionsDialog( Window* pParent,
- const SfxItemSet& rOptionsSet, USHORT nUniqueId,
- INT32 nInitialFlags,
- sal_uInt32 nResId)
+ const SfxItemSet& rOptionsSet,
+ INT32 nInitialFlags)
{
- SvxJSearchOptionsDialog* pDlg=NULL;
- switch ( nResId )
- {
- case RID_SVXPAGE_JSEARCH_OPTIONS :
- pDlg = new SvxJSearchOptionsDialog( pParent, rOptionsSet, nUniqueId, nInitialFlags );
- break;
- default:
- break;
- }
-
- if ( pDlg )
- return new AbstractSvxJSearchOptionsDialog_Impl( pDlg );
- return 0;
+ SvxJSearchOptionsDialog* pDlg = new SvxJSearchOptionsDialog( pParent, rOptionsSet, nInitialFlags );
+ return new AbstractSvxJSearchOptionsDialog_Impl( pDlg );
}
-//CHINA001 SvxJSearchOptionsDialog end
-//CHINA001 FmInputRecordNoDialog begin
-AbstractFmInputRecordNoDialog * AbstractDialogFactory_Impl::CreateFmInputRecordNoDialog( Window* pParent,
- sal_uInt32 nResId)
+AbstractFmInputRecordNoDialog * AbstractDialogFactory_Impl::CreateFmInputRecordNoDialog( Window* pParent )
{
- FmInputRecordNoDialog* pDlg=NULL;
- switch ( nResId )
- {
- case RID_SVX_DLG_INPUTRECORDNO :
- pDlg = new FmInputRecordNoDialog( pParent );
- break;
- default:
- break;
- }
-
- if ( pDlg )
- return new AbstractFmInputRecordNoDialog_Impl( pDlg );
- return 0;
+ FmInputRecordNoDialog* pDlg = new FmInputRecordNoDialog( pParent );
+ return new AbstractFmInputRecordNoDialog_Impl( pDlg );
}
-//CHINA001 FmInputRecordNoDialog end
-//CHINA001 SvxNewDictionaryDialog begin
AbstractSvxNewDictionaryDialog * AbstractDialogFactory_Impl::CreateSvxNewDictionaryDialog( Window* pParent,
::Reference< ::com::sun::star::linguistic2::XSpellChecker1 > &xSpl,
sal_uInt32 nResId )
@@ -1728,9 +1383,7 @@ AbstractSvxNewDictionaryDialog * AbstractDialogFactory_Impl::CreateSvxNewDiction
return new AbstractSvxNewDictionaryDialog_Impl( pDlg );
return 0;
}
-//CHINA001 SvxNewDictionaryDialog end
-//CHINA001 SvxEditDictionaryDialog begin
VclAbstractDialog* AbstractDialogFactory_Impl::CreateSvxEditDictionaryDialog( Window* pParent,
const String& rName,
::Reference< ::com::sun::star::linguistic2::XSpellChecker1> &xSpl,
@@ -1750,52 +1403,24 @@ VclAbstractDialog* AbstractDialogFactory_Impl::CreateSvxEditDictionaryDialo
return new VclAbstractDialog_Impl( pDlg );
return 0;
}
-//CHINA001 SvxEditDictionaryDialog end
-//CHINA001 SvxNameDialog begin
AbstractSvxNameDialog * AbstractDialogFactory_Impl::CreateSvxNameDialog( Window* pParent,
- const String& rName, const String& rDesc,
- sal_uInt32 nResId )
+ const String& rName, const String& rDesc )
{
- SvxNameDialog* pDlg=NULL;
- switch ( nResId )
- {
- case RID_SVXDLG_NAME :
- pDlg = new SvxNameDialog( pParent, rName, rDesc );
- break;
- default:
- break;
- }
-
- if ( pDlg )
- return new AbstractSvxNameDialog_Impl( pDlg );
- return 0;
+ SvxNameDialog* pDlg = new SvxNameDialog( pParent, rName, rDesc );
+ return new AbstractSvxNameDialog_Impl( pDlg );
}
-//CHINA001 SvxNameDialog end
-
-///////////////////////////////////////////////////////////////////////////////////////////////
-// #i68101#
-AbstractSvxObjectNameDialog* AbstractDialogFactory_Impl::CreateSvxObjectNameDialog(Window* pParent, const String& rName, sal_uInt32 nResId)
+AbstractSvxObjectNameDialog* AbstractDialogFactory_Impl::CreateSvxObjectNameDialog(Window* pParent, const String& rName )
{
- return ((RID_SVXDLG_OBJECT_NAME == nResId)
- ? new AbstractSvxObjectNameDialog_Impl(new SvxObjectNameDialog(pParent, rName))
- : NULL);
+ return new AbstractSvxObjectNameDialog_Impl(new SvxObjectNameDialog(pParent, rName));
}
-///////////////////////////////////////////////////////////////////////////////////////////////
-// #i68101#
-
-AbstractSvxObjectTitleDescDialog* AbstractDialogFactory_Impl::CreateSvxObjectTitleDescDialog(Window* pParent, const String& rTitle, const String& rDescription, sal_uInt32 nResId)
+AbstractSvxObjectTitleDescDialog* AbstractDialogFactory_Impl::CreateSvxObjectTitleDescDialog(Window* pParent, const String& rTitle, const String& rDescription)
{
- return ((RID_SVXDLG_OBJECT_TITLE_DESC == nResId)
- ? new AbstractSvxObjectTitleDescDialog_Impl(new SvxObjectTitleDescDialog(pParent, rTitle, rDescription))
- : NULL);
+ return new AbstractSvxObjectTitleDescDialog_Impl(new SvxObjectTitleDescDialog(pParent, rTitle, rDescription));
}
-///////////////////////////////////////////////////////////////////////////////////////////////
-
-//CHINA001 SvxMessDialog begin
AbstractSvxMessDialog * AbstractDialogFactory_Impl::CreateSvxMessDialog( Window* pParent, sal_uInt32 nResId,
const String& rText, const String& rDesc, Image* pImg )
{
@@ -1813,49 +1438,19 @@ AbstractSvxMessDialog * AbstractDialogFactory_Impl::CreateSvxMessDialog( Window*
return new AbstractSvxMessDialog_Impl( pDlg );
return 0;
}
-//CHINA001 SvxMessDialog end
-//CHINA001 SvxMultiPathDialog begin
-AbstractSvxMultiPathDialog * AbstractDialogFactory_Impl::CreateSvxMultiPathDialog( Window* pParent, sal_uInt32 nResId,
- BOOL bEmptyAllowed )
+AbstractSvxMultiPathDialog * AbstractDialogFactory_Impl::CreateSvxMultiPathDialog( Window* pParent, BOOL bEmptyAllowed )
{
- SvxMultiPathDialog* pDlg=NULL;
- switch ( nResId )
- {
- case RID_SVXDLG_MULTIPATH :
- pDlg = new SvxMultiPathDialog( pParent, bEmptyAllowed );
- break;
- default:
- break;
- }
-
- if ( pDlg )
- return new AbstractSvxMultiPathDialog_Impl( pDlg );
- return 0;
+ SvxMultiPathDialog* pDlg = new SvxMultiPathDialog( pParent, bEmptyAllowed );
+ return new AbstractSvxMultiPathDialog_Impl( pDlg );
}
-//CHINA001 SvxMultiPathDialog end
-//CHINA001 SvxMultiFileDialog begin
-AbstractSvxMultiFileDialog * AbstractDialogFactory_Impl::CreateSvxMultiFileDialog( Window* pParent, sal_uInt32 nResId,
- BOOL bEmptyAllowed )
+AbstractSvxMultiFileDialog * AbstractDialogFactory_Impl::CreateSvxMultiFileDialog( Window* pParent, BOOL bEmptyAllowed )
{
- SvxMultiFileDialog* pDlg=NULL;
- switch ( nResId )
- {
- case RID_SVXDLG_MULTIPATH :
- pDlg = new SvxMultiFileDialog( pParent, bEmptyAllowed );
- break;
- default:
- break;
- }
-
- if ( pDlg )
- return new AbstractSvxMultiFileDialog_Impl( pDlg );
- return 0;
+ SvxMultiFileDialog* pDlg = new SvxMultiFileDialog( pParent, bEmptyAllowed );
+ return new AbstractSvxMultiFileDialog_Impl( pDlg );
}
-//CHINA001 SvxMultiFileDialog end
-//CHINA001 SvxHpLinkDlg begin
AbstractSvxHpLinkDlg * AbstractDialogFactory_Impl::CreateSvxHpLinkDlg (Window* pParent, //add for SvxMultiFileDialog
SfxBindings* pBindings,
sal_uInt32 nResId)
@@ -1874,9 +1469,7 @@ AbstractSvxHpLinkDlg * AbstractDialogFactory_Impl::CreateSvxHpLinkDlg (Window* p
return new AbstractSvxHpLinkDlg_Impl( pDlg );
return 0;
}
-//CHINA001 SvxHpLinkDlg end
-//CHINA001 FmSearchDialog begin
AbstractFmSearchDialog* AbstractDialogFactory_Impl::CreateFmSearchDialog(Window* pParent, //add for FmSearchDialog
const String& strInitialText,
const ::std::vector< String >& _rContexts,
@@ -1889,32 +1482,16 @@ AbstractFmSearchDialog* AbstractDialogFactory_Impl::CreateFmSearchDialog(Window
return 0;
}
-//CHINA001 FmSearchDialog end
-
-//CHINA001 GraphicFilterEmboss begin
AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterEmboss (Window* pParent, //add for GraphicFilterEmboss
const Graphic& rGraphic,
RECT_POINT eLightSource,
- sal_uInt32 nResId)
+ sal_uInt32)
{
- GraphicFilterDialog* pDlg=NULL;
- switch ( nResId )
- {
- case RID_SVX_GRFFILTER_DLG_EMBOSS :
- pDlg = new GraphicFilterEmboss( pParent, rGraphic, eLightSource );
- break;
- default:
- break;
- }
-
- if ( pDlg )
- return new AbstractGraphicFilterDialog_Impl( pDlg );
- return 0;
+ GraphicFilterDialog* pDlg = new GraphicFilterEmboss( pParent, rGraphic, eLightSource );
+ return new AbstractGraphicFilterDialog_Impl( pDlg );
}
-//CHINA001 GraphicFilterEmboss end
-//CHINA001 GraphicFilterPoster & GraphicFilterSepia begin
-AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterPosterSepia (Window* pParent, //add for GraphicFilterPoster & GraphicFilterSepia
+AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterPosterSepia (Window* pParent,
const Graphic& rGraphic,
USHORT nCount,
sal_uInt32 nResId)
@@ -1937,31 +1514,15 @@ AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterPos
return new AbstractGraphicFilterDialog_Impl( pDlg );
return 0;
}
-//CHINA001 GraphicFilterPoster & GraphicFilterSepia end
-//CHINA001 GraphicFilterSolarize begin
AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterSolarize (Window* pParent, //add for GraphicFilterSolarize
const Graphic& rGraphic,
- BYTE nGreyThreshold, BOOL bInvert,
- sal_uInt32 nResId)
+ BYTE nGreyThreshold, BOOL bInvert, sal_uInt32 )
{
- GraphicFilterDialog* pDlg=NULL;
- switch ( nResId )
- {
- case RID_SVX_GRFFILTER_DLG_SOLARIZE :
- pDlg = new GraphicFilterSolarize( pParent, rGraphic, nGreyThreshold, bInvert );
- break;
- default:
- break;
- }
-
- if ( pDlg )
- return new AbstractGraphicFilterDialog_Impl( pDlg );
- return 0;
+ GraphicFilterDialog* pDlg = new GraphicFilterSolarize( pParent, rGraphic, nGreyThreshold, bInvert );
+ return new AbstractGraphicFilterDialog_Impl( pDlg );
}
-//CHINA001 GraphicFilterSolarize end
-//CHINA001 GraphicFilterMosaic begin
AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterMosaic (Window* pParent, //add for GraphicFilterMosaic
const Graphic& rGraphic,
USHORT nTileWidth, USHORT nTileHeight, BOOL bEnhanceEdges,
@@ -1981,51 +1542,24 @@ AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterMos
return new AbstractGraphicFilterDialog_Impl( pDlg );
return 0;
}
-//CHINA001 GraphicFilterMosaic end
-//CHINA001 SvxAreaTabDialog begin
+
AbstractSvxAreaTabDialog* AbstractDialogFactory_Impl::CreateSvxAreaTabDialog( Window* pParent,
const SfxItemSet* pAttr,
SdrModel* pModel,
- sal_uInt32 nResId,
const SdrView* pSdrView )
{
- SvxAreaTabDialog* pDlg=NULL;
- switch ( nResId )
- {
- case RID_SVXDLG_AREA :
- pDlg = new SvxAreaTabDialog( pParent, pAttr, pModel,pSdrView );
- break;
- default:
- break;
- }
-
- if ( pDlg )
- return new AbstractSvxAreaTabDialog_Impl( pDlg );
- return 0;
+ SvxAreaTabDialog* pDlg = new SvxAreaTabDialog( pParent, pAttr, pModel,pSdrView );
+ return new AbstractSvxAreaTabDialog_Impl( pDlg );
}
-//CHINA001 SvxAreaTabDialog end
-//CHINA001 SvxLineTabDialog begin
+
SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateSvxLineTabDialog( Window* pParent, const SfxItemSet* pAttr, //add forSvxLineTabDialog
SdrModel* pModel,
- sal_uInt32 nResId,
const SdrObject* pObj ,
BOOL bHasObj)
{
- SfxTabDialog* pDlg=NULL;
- switch ( nResId )
- {
- case RID_SVXDLG_LINE :
- pDlg = new SvxLineTabDialog( pParent, pAttr, pModel,pObj,bHasObj );
- break;
- default:
- break;
- }
-
- if ( pDlg )
- return new AbstractTabDialog_Impl( pDlg );
- return 0;
+ SfxTabDialog* pDlg = new SvxLineTabDialog( pParent, pAttr, pModel,pObj,bHasObj );
+ return new AbstractTabDialog_Impl( pDlg );
}
-//CHINA001 SvxLineTabDialog end
SfxAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( Window* pParent,
const SfxItemSet& rAttr,
@@ -2054,7 +1588,6 @@ SfxAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( Window* pParent,
return 0;
}
-//CHINA001 SvxMeasureDialog & SvxConnectionDialog begin
SfxAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( Window* pParent,
const SfxItemSet& rAttr,
const SdrView* pView,
@@ -2090,27 +1623,13 @@ SfxAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( Window* pParent,
return 0;
}
-//CHINA001 SvxPostItDialog begin
AbstractSvxPostItDialog* AbstractDialogFactory_Impl::CreateSvxPostItDialog( Window* pParent,
const SfxItemSet& rCoreSet,
- sal_uInt32 nResId,
BOOL bPrevNext, BOOL bRedline )
{
- SvxPostItDialog* pDlg=NULL;
- switch ( nResId )
- {
- case RID_SVXDLG_POSTIT :
- pDlg = new SvxPostItDialog( pParent, rCoreSet, bPrevNext, bRedline );
- break;
- default:
- break;
- }
-
- if ( pDlg )
- return new AbstractSvxPostItDialog_Impl( pDlg );
- return 0;
+ SvxPostItDialog* pDlg = new SvxPostItDialog( pParent, rCoreSet, bPrevNext, bRedline );
+ return new AbstractSvxPostItDialog_Impl( pDlg );
}
-//CHINA001 SvxPostItDialog end
class SvxMacroAssignDialog : public VclAbstractDialog
{
@@ -2228,18 +1747,12 @@ CreateTabPage AbstractDialogFactory_Impl::GetTabPageCreatorFunc( USHORT nId )
return 0;
}
-CreateSvxDistributePage AbstractDialogFactory_Impl::GetSvxDistributePageCreatorFunc(USHORT nId )
-{
- switch ( nId )
- {
- case RID_SVXPAGE_DISTRIBUTE:
- return SvxDistributePage::Create;
- default:
- break;
- }
- return 0;
+CreateSvxDistributePage AbstractDialogFactory_Impl::GetSvxDistributePageCreatorFunc()
+{
+ return SvxDistributePage::Create;
}
+
DialogGetRanges AbstractDialogFactory_Impl::GetDialogGetRangesFunc( USHORT nId )
{
switch ( nId )
@@ -2391,3 +1904,4 @@ SvxAbstractInsRowColDlg* AbstractDialogFactory_Impl::CreateSvxInsRowColDlg( Wind
{
return new SvxInsRowColDlg( pParent, bCol, nHelpId );
}
+
diff --git a/svx/source/cui/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index e52c21fc597a..eb3c7b932597 100644
--- a/svx/source/cui/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -29,21 +29,14 @@
************************************************************************/
#ifndef _CUI_DLGFACT_HXX
#define _CUI_DLGFACT_HXX
+
// include ---------------------------------------------------------------
-#include <svx/svxdlg.hxx> //CHINA001 #include <svx/svxdlg.hxx>
+#include <svx/svxdlg.hxx>
#include <com/sun/star/container/XNameReplace.hpp>
#include "tools/link.hxx"
#include <com/sun/star/frame/XFrame.hpp>
-//#include <sfx2/basedlgs.hxx>
-//#include "dstribut.hxx"
-//#include "cuigaldlg.hxx"
-//#include "cuiimapwnd.hxx"
-//#include "hlmarkwn.hxx"
-//#include "cuicharmap.hxx"
-//#include "srchxtra.hxx"
-
class SfxTabDialog;
class SfxModalDialog;
class Dialog;
@@ -618,7 +611,6 @@ public:
const String *pUserButtonText=0 );
virtual SfxAbstractTabDialog* CreateTextTabDialog( Window* pParent,
const SfxItemSet* pAttrSet,
- sal_uInt32 nResId,
SdrView* pView,
SdrModel* pModel=0 ); //add for SvxTextTabDialog
virtual SfxAbstractTabDialog* CreateTabItemDialog( Window* pParent,
@@ -626,11 +618,9 @@ public:
sal_uInt32 nResId); //add by CHINA001
virtual AbstractSvxCaptionDialog* CreateCaptionDialog( Window* pParent,
const SdrView* pView,
- sal_uInt32 nResId,
USHORT nAnchorTypes = 0 ); //add for SvxCaptionTabDialog CHINA001
virtual AbstractSvxDistributeDialog* CreateSvxDistributeDialog(Window* pParent,
const SfxItemSet& rAttr,
- sal_uInt32 nResId,
SvxDistributeHorizontal eHor = SvxDistributeHorizontalNone,
SvxDistributeVertical eVer = SvxDistributeVerticalNone);
virtual SfxAbstractInsertObjectDialog* CreateInsertObjectDialog( Window* pParent, USHORT nSlotId,
@@ -642,22 +632,17 @@ public:
virtual SfxAbstractLinksDialog* CreateLinksDialog( Window* pParent, sfx2::SvLinkManager* pMgr, BOOL bHTML, sfx2::SvBaseLink* p=0 );
virtual AbstractHangulHanjaConversionDialog * CreateHangulHanjaConversionDialog( Window* _pParent, //add for HangulHanjaConversionDialog CHINA001
- HangulHanjaConversion::ConversionDirection _ePrimaryDirection,
- sal_uInt32 nResId);
+ HangulHanjaConversion::ConversionDirection _ePrimaryDirection );
- virtual AbstractFmShowColsDialog * CreateFmShowColsDialog( Window* pParent, //add for FmShowColsDialog
- sal_uInt32 nResId);
+ virtual AbstractFmShowColsDialog * CreateFmShowColsDialog( Window* pParent ); //add for FmShowColsDialog
virtual AbstractSvxZoomDialog * CreateSvxZoomDialog( Window* pParent, //add for SvxZoomDialog
- const SfxItemSet& rCoreSet,
- sal_uInt32 nResId);
+ const SfxItemSet& rCoreSet);
virtual SfxAbstractTabDialog* CreateSvxBorderBackgroundDlg( Window* pParent, //add for SvxBorderBackgroundDlg
const SfxItemSet& rCoreSet,
- sal_uInt32 nResId,
BOOL bEnableSelector = FALSE) ;
virtual AbstractSvxTransformTabDialog* CreateSvxTransformTabDialog( Window* pParent, //add for SvxTransformTabDialog
const SfxItemSet* pAttr,
const SdrView* pView,
- sal_uInt32 nResId,
USHORT nAnchorTypes = 0) ;
virtual SfxAbstractTabDialog* CreateSchTransformTabDialog( Window* pParent, //add for SchTransformTabDialog
const SfxItemSet* pAttr,
@@ -675,24 +660,17 @@ public:
//STRIP001 ::com::sun::star::linguistic2::XSpellChecker1 > &xChecker,
//STRIP001 SvxSpellWrapper* pWrapper,
//STRIP001 sal_uInt32 nResId);
- virtual VclAbstractRefreshableDialog * CreateActualizeProgressDialog( Window* pParent, //add for ActualizeProgress
- GalleryTheme* pThm,
- sal_uInt32 nResId);
- virtual AbstractSearchProgress * CreateSearchProgressDialog( Window* pParent, //add for SearchProgress
- const INetURLObject& rStartURL,
- sal_uInt32 nResId);
- virtual AbstractTakeProgress * CreateTakeProgressDialog( Window* pParent, //add for TakeProgress
- sal_uInt32 nResId);
+ virtual VclAbstractRefreshableDialog * CreateActualizeProgressDialog( Window* pParent, GalleryTheme* pThm );
+ virtual AbstractSearchProgress * CreateSearchProgressDialog( Window* pParent,
+ const INetURLObject& rStartURL);
+ virtual AbstractTakeProgress * CreateTakeProgressDialog( Window* pParent );
virtual AbstractTitleDialog * CreateTitleDialog( Window* pParent, //add for TitleDialog
- const String& rOldText,
- sal_uInt32 nResId);
+ const String& rOldText);
virtual AbstractGalleryIdDialog * CreateGalleryIdDialog( Window* pParent, //add for SvxZoomDialog
- GalleryTheme* pThm,
- sal_uInt32 nResId);
+ GalleryTheme* pThm);
virtual VclAbstractDialog2 * CreateGalleryThemePropertiesDialog( Window* pParent, //add for GalleryThemeProperties
ExchangeData* pData,
- SfxItemSet* pItemSet,
- sal_uInt32 nResId);
+ SfxItemSet* pItemSet);
virtual AbstractURLDlg * CreateURLDialog( Window* pParent, //add for URLDlg
const String& rURL, const String& rAltText, const String& rDescription,
const String& rTarget, const String& rName,
@@ -701,19 +679,16 @@ public:
virtual VclAbstractDialog* CreateSvxSearchAttributeDialog( Window* pParent,
SearchAttrItemList& rLst,
- const USHORT* pWhRanges,
- sal_uInt32 nResId ); //add for SvxSearchAttributeDialog
+ const USHORT* pWhRanges);
virtual AbstractSvxSearchSimilarityDialog * CreateSvxSearchSimilarityDialog( Window* pParent,
BOOL bRelax,
USHORT nOther,
USHORT nShorter,
USHORT nLonger); //add for SvxSearchSimilarityDialog
virtual AbstractSvxJSearchOptionsDialog * CreateSvxJSearchOptionsDialog( Window* pParent,
- const SfxItemSet& rOptionsSet, USHORT nUniqueId,
- INT32 nInitialFlags,
- sal_uInt32 nResId); //add for SvxJSearchOptionsDialog
- virtual AbstractFmInputRecordNoDialog * CreateFmInputRecordNoDialog( Window* pParent,
- sal_uInt32 nResId); //add for FmInputRecordNoDialog
+ const SfxItemSet& rOptionsSet,
+ INT32 nInitialFlags);
+ virtual AbstractFmInputRecordNoDialog * CreateFmInputRecordNoDialog( Window* pParent );
virtual AbstractSvxNewDictionaryDialog* CreateSvxNewDictionaryDialog( Window* pParent,
::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1 > &xSpl,
sal_uInt32 nResId ); //add for SvxNewDictionaryDialog
@@ -722,63 +697,52 @@ public:
::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1> &xSpl,
sal_uInt32 nResId);//add for SvxEditDictionaryDialog
virtual AbstractSvxNameDialog * CreateSvxNameDialog( Window* pParent,
- const String& rName, const String& rDesc,
- sal_uInt32 nResId ); //add for SvxNameDialog
-
+ const String& rName, const String& rDesc );
// #i68101#
- virtual AbstractSvxObjectNameDialog* CreateSvxObjectNameDialog(Window* pParent, const String& rName, sal_uInt32 nResId);
- virtual AbstractSvxObjectTitleDescDialog* CreateSvxObjectTitleDescDialog(Window* pParent, const String& rTitle, const String& rDescription, sal_uInt32 nResId);
+ virtual AbstractSvxObjectNameDialog* CreateSvxObjectNameDialog(Window* pParent, const String& rName );
+ virtual AbstractSvxObjectTitleDescDialog* CreateSvxObjectTitleDescDialog(Window* pParent, const String& rTitle, const String& rDescription);
- virtual AbstractSvxMessDialog * CreateSvxMessDialog( Window* pParent, sal_uInt32 nResId,
+ virtual AbstractSvxMessDialog * CreateSvxMessDialog( Window* pParent, sal_uInt32 nResId,
const String& rText, const String& rDesc,
Image* pImg = NULL ); //add for SvxMessDialog
- virtual AbstractSvxMultiPathDialog * CreateSvxMultiPathDialog( Window* pParent, sal_uInt32 nResId,
- BOOL bEmptyAllowed = FALSE ); //add for SvxMultiPathDialog
- virtual AbstractSvxMultiFileDialog * CreateSvxMultiFileDialog( Window* pParent, sal_uInt32 nResId,
- BOOL bEmptyAllowed = FALSE ); //add for SvxMultiFileDialog
+ virtual AbstractSvxMultiPathDialog * CreateSvxMultiPathDialog( Window* pParent, BOOL bEmptyAllowed = FALSE ); //add for SvxMultiPathDialog
+ virtual AbstractSvxMultiFileDialog * CreateSvxMultiFileDialog( Window* pParent, BOOL bEmptyAllowed = FALSE ); //add for SvxMultiFileDialog
virtual AbstractSvxHpLinkDlg * CreateSvxHpLinkDlg (Window* pParent, //add for SvxHpLink
SfxBindings* pBindings,
sal_uInt32 nResId);
- virtual AbstractFmSearchDialog* CreateFmSearchDialog(Window* pParent, //add for FmSearchDialog
+ virtual AbstractFmSearchDialog* CreateFmSearchDialog(Window* pParent, //add for FmSearchDialog
const String& strInitialText,
const ::std::vector< String >& _rContexts,
sal_Int16 nInitialContext,
const Link& lnkContextSupplier);
virtual AbstractGraphicFilterDialog * CreateGraphicFilterEmboss (Window* pParent, //add for GraphicFilterEmboss
const Graphic& rGraphic,
- RECT_POINT eLightSource,
- sal_uInt32 nResId);
+ RECT_POINT eLightSource, sal_uInt32 nResId);
virtual AbstractGraphicFilterDialog * CreateGraphicFilterPosterSepia (Window* pParent, //add for GraphicFilterPoster & GraphicFilterSepia
const Graphic& rGraphic,
USHORT nCount,
sal_uInt32 nResId);
virtual AbstractGraphicFilterDialog * CreateGraphicFilterSolarize (Window* pParent, //add for GraphicFilterSolarize
const Graphic& rGraphic,
- BYTE nGreyThreshold, BOOL bInvert,
- sal_uInt32 nResId);
+ BYTE nGreyThreshold, BOOL bInvert, sal_uInt32 nResId);
virtual AbstractGraphicFilterDialog * CreateGraphicFilterMosaic (Window* pParent, //add for GraphicFilterMosaic
const Graphic& rGraphic,
- USHORT nTileWidth, USHORT nTileHeight, BOOL bEnhanceEdges,
- sal_uInt32 nResId);
+ USHORT nTileWidth, USHORT nTileHeight, BOOL bEnhanceEdges, sal_uInt32 nResId);
virtual AbstractSvxAreaTabDialog* CreateSvxAreaTabDialog( Window* pParent,//add for SvxAreaTabDialog
const SfxItemSet* pAttr,
SdrModel* pModel,
- sal_uInt32 nResId,
const SdrView* pSdrView = NULL ); //add for SvxAreaTabDialog
virtual SfxAbstractTabDialog* CreateSvxLineTabDialog( Window* pParent, const SfxItemSet* pAttr, //add for SvxLineTabDialog
SdrModel* pModel,
- sal_uInt32 nResId,
const SdrObject* pObj = NULL,
BOOL bHasObj = TRUE );
virtual AbstractSvxPostItDialog* CreateSvxPostItDialog( Window* pParent, //add for SvxPostItDialog
const SfxItemSet& rCoreSet,
- sal_uInt32 nResId,
BOOL bPrevNext = FALSE, BOOL bRedline = FALSE );
// For TabPage
virtual CreateTabPage GetTabPageCreatorFunc( USHORT nId );
- virtual CreateSvxDistributePage GetSvxDistributePageCreatorFunc(USHORT nId );
-
+ virtual CreateSvxDistributePage GetSvxDistributePageCreatorFunc();
virtual GetTabPageRanges GetTabPageRangesFunc( USHORT nId );
virtual DialogGetRanges GetDialogGetRangesFunc( USHORT nId ); //add for SvxPostItDialog
diff --git a/svx/source/cui/init.cxx b/cui/source/factory/init.cxx
index 686b5b068498..de01a2deb1b3 100644
--- a/svx/source/cui/init.cxx
+++ b/cui/source/factory/init.cxx
@@ -29,11 +29,7 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
#include <vcl/msgbox.hxx>
#include "cuicharmap.hxx"
diff --git a/cui/source/factory/makefile.mk b/cui/source/factory/makefile.mk
new file mode 100755
index 000000000000..cb374cd26aea
--- /dev/null
+++ b/cui/source/factory/makefile.mk
@@ -0,0 +1,56 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2008 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile: makefile.mk,v $
+#
+# $Revision: 1.65 $
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+PRJ=..$/..
+PRJNAME=cui
+TARGET=factory
+ENABLE_EXCEPTIONS=TRUE
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE : settings.mk
+.INCLUDE : $(PRJ)$/util$/makefile.pmk
+
+.IF "$(ENABLE_LAYOUT)" == "TRUE"
+CFLAGS+= -DENABLE_LAYOUT=1 -I../$(PRJ)/layout/inc -I../$(PRJ)/layout/$(INPATH)/inc
+.ENDIF # ENABLE_LAYOUT == TRUE
+
+# --- Files --------------------------------------------------------
+
+SLOFILES+=\
+ $(SLO)$/dlgfact.obj \
+ $(SLO)$/cuiexp.obj \
+ $(SLO)$/cuiresmgr.obj \
+ $(SLO)$/init.obj \
+
+
+# --- Targets -------------------------------------------------------
+
+.INCLUDE : target.mk
diff --git a/svx/source/cui/ControlFocusHelper.hxx b/cui/source/inc/ControlFocusHelper.hxx
index 828341da0e71..828341da0e71 100644
--- a/svx/source/cui/ControlFocusHelper.hxx
+++ b/cui/source/inc/ControlFocusHelper.hxx
diff --git a/svx/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx
index e7545eaeb6e7..86c41d17452e 100644
--- a/svx/source/inc/SpellDialog.hxx
+++ b/cui/source/inc/SpellDialog.hxx
@@ -49,7 +49,7 @@
#include <svx/langbox.hxx>
#include <memory>
#include <svtools/svmedit.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
#include <svtools/xtextedt.hxx>
#include <svx/SpellPortions.hxx>
diff --git a/svx/source/cui/acccfg.hxx b/cui/source/inc/acccfg.hxx
index 245cc81e89aa..40ce17a36b8c 100644
--- a/svx/source/cui/acccfg.hxx
+++ b/cui/source/inc/acccfg.hxx
@@ -60,7 +60,7 @@
#include <sfx2/basedlgs.hxx>
#define _SVSTDARR_STRINGSDTOR
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
#include <sfx2/minarray.hxx>
diff --git a/svx/source/cui/align.hxx b/cui/source/inc/align.hxx
index db907d7d1750..44a11eacccc9 100644
--- a/svx/source/cui/align.hxx
+++ b/cui/source/inc/align.hxx
@@ -32,24 +32,15 @@
// include ---------------------------------------------------------------
-
-#ifndef _FIELD_HXX //autogen
+#include <svx/orienthelper.hxx>
#include <vcl/field.hxx>
-#endif
-#ifndef _IMAGEBTN_HXX //autogen
#include <vcl/imagebtn.hxx>
-#endif
-#ifndef _FIXED_HXX //autogen
#include <vcl/fixed.hxx>
-#endif
-#ifndef _LSTBOX_HXX //autogen
#include <vcl/lstbox.hxx>
-#endif
#include <sfx2/tabdlg.hxx>
#include <svtools/valueset.hxx>
-#include "dialcontrol.hxx"
-#include "wrapfield.hxx"
-#include "orienthelper.hxx"
+#include <svx/dialcontrol.hxx>
+#include <svx/wrapfield.hxx>
#include <svx/frmdirlbox.hxx>
namespace svx {
diff --git a/svx/source/cui/autocdlg.hxx b/cui/source/inc/autocdlg.hxx
index dba6ce826cc3..dba6ce826cc3 100644
--- a/svx/source/cui/autocdlg.hxx
+++ b/cui/source/inc/autocdlg.hxx
diff --git a/svx/source/cui/backgrnd.hxx b/cui/source/inc/backgrnd.hxx
index e658c2ce0eb0..e658c2ce0eb0 100644
--- a/svx/source/cui/backgrnd.hxx
+++ b/cui/source/inc/backgrnd.hxx
diff --git a/svx/source/cui/bbdlg.hxx b/cui/source/inc/bbdlg.hxx
index f2d7e25e9bf9..f2d7e25e9bf9 100644
--- a/svx/source/cui/bbdlg.hxx
+++ b/cui/source/inc/bbdlg.hxx
diff --git a/svx/source/cui/border.hxx b/cui/source/inc/border.hxx
index e01f2c803ff2..ac7f9245fd49 100644
--- a/svx/source/cui/border.hxx
+++ b/cui/source/inc/border.hxx
@@ -34,39 +34,19 @@
#include <svtools/ctrlbox.hxx>
-#ifndef _GROUP_HXX //autogen
#include <vcl/group.hxx>
-#endif
-#ifndef _FIELD_HXX //autogen
#include <vcl/field.hxx>
-#endif
-#ifndef _FIXED_HXX //autogen
#include <vcl/fixed.hxx>
-#endif
#include <svtools/valueset.hxx>
#include <sfx2/tabdlg.hxx>
#include <svx/frmsel.hxx>
+
// forward ---------------------------------------------------------------
class SvxBorderLine;
class XColorTable;
-// class SvxBorderTabPage ------------------------------------------------
-/*
-{k:\svx\prototyp\dialog\border.bmp}
-[Beschreibung]
-TabPage zur Einstellung der Umrandung (Staerke, Farbe, Schatten, ...)
-[Items]
-<SvxBoxItem><SID_ATTR_BORDER_OUTER>
-<SvxBoxInfoItem><SID_ATTR_BORDER_INNER>
-<SvxShadowItem><SID_ATTR_BORDER_SHADOW>
-*/
-
-// Border-Modes for paragraphs, textframes and tables
-//CHINA001 #define SW_BORDER_MODE_PARA 0x01
-//CHINA001 #define SW_BORDER_MODE_TABLE 0x02
-//CHINA001 #define SW_BORDER_MODE_FRAME 0x04
-#include "flagsdef.hxx"//CHINA001
+#include <svx/flagsdef.hxx>
class SvxBorderTabPage : public SfxTabPage
{
diff --git a/svx/source/cui/cfg.hxx b/cui/source/inc/cfg.hxx
index c52b92ce2a0a..57dc9692f87c 100644
--- a/svx/source/cui/cfg.hxx
+++ b/cui/source/inc/cfg.hxx
@@ -54,7 +54,7 @@
#define _SVSTDARR_USHORTS
#define _SVSTDARR_STRINGSDTOR
-#include <svtools/svstdarr.hxx> // SvUShorts
+#include <svl/svstdarr.hxx> // SvUShorts
#include <sfx2/minarray.hxx>
#include <sfx2/tabdlg.hxx>
#include <vector>
diff --git a/svx/source/cui/cfgutil.hxx b/cui/source/inc/cfgutil.hxx
index c19a47495290..87b6bc8a1820 100644
--- a/svx/source/cui/cfgutil.hxx
+++ b/cui/source/inc/cfgutil.hxx
@@ -41,7 +41,7 @@
#include <com/sun/star/script/browse/XBrowseNode.hpp>
#define _SVSTDARR_STRINGSDTOR
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
#include <vcl/timer.hxx>
#include <svtools/svtabbx.hxx>
diff --git a/svx/source/cui/chardlg.hxx b/cui/source/inc/chardlg.hxx
index d767d8ddd8f3..d767d8ddd8f3 100644
--- a/svx/source/cui/chardlg.hxx
+++ b/cui/source/inc/chardlg.hxx
diff --git a/svx/source/cui/connect.hxx b/cui/source/inc/connect.hxx
index d7d0c21e34f4..db344c959e6e 100644
--- a/svx/source/cui/connect.hxx
+++ b/cui/source/inc/connect.hxx
@@ -32,24 +32,12 @@
// include ---------------------------------------------------------------
-#include "connctrl.hxx"
+#include <svx/connctrl.hxx>
#include <sfx2/tabdlg.hxx>
-
-#ifndef _FIXED_HXX //autogen
#include <vcl/fixed.hxx>
-#endif
-
-#ifndef _FIELD_HXX //autogen
#include <vcl/field.hxx>
-#endif
-
-#ifndef _LSTBOX_HXX //autogen
#include <vcl/lstbox.hxx>
-#endif
-
-#ifndef _GROUP_HXX //autogen
#include <vcl/group.hxx>
-#endif
#include <sfx2/basedlgs.hxx>
class SdrView;
diff --git a/svx/source/cui/cuicharmap.hxx b/cui/source/inc/cuicharmap.hxx
index b8544bd98dea..b8544bd98dea 100644
--- a/svx/source/cui/cuicharmap.hxx
+++ b/cui/source/inc/cuicharmap.hxx
diff --git a/svx/source/cui/cuifmsearch.hxx b/cui/source/inc/cuifmsearch.hxx
index 5d8533a7b0b6..2659054c2100 100644
--- a/svx/source/cui/cuifmsearch.hxx
+++ b/cui/source/inc/cuifmsearch.hxx
@@ -36,7 +36,7 @@
#include <svx/fmsearch.hxx> //CHINA001
#define _SVSTDARR_STRINGSDTOR
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
#ifndef _DIALOG_HXX //autogen
#include <vcl/dialog.hxx>
diff --git a/svx/source/cui/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx
index 62a5b3dc405a..ef285bb85448 100644
--- a/svx/source/cui/cuigaldlg.hxx
+++ b/cui/source/inc/cuigaldlg.hxx
@@ -40,18 +40,16 @@
#include <vcl/menu.hxx>
#include <vcl/edit.hxx>
#include <vcl/combobox.hxx>
-#include <svtools/slstitm.hxx>
+#include <svl/slstitm.hxx>
#include <svtools/transfer.hxx>
#include <goodies/grfmgr.hxx>
#include <sfx2/tabdlg.hxx>
-#include "galctrl.hxx"
-#include "galmisc.hxx"
-#include "galdlg.hxx" //CHINA001
+#include <svx/galctrl.hxx>
+#include <svx/galmisc.hxx>
#include <com/sun/star/media/XPlayer.hpp>
-#ifndef _COM_SUN_STAR_UI_XFOLDERPICKER_HPP_
#include <com/sun/star/ui/dialogs/XFolderPicker.hpp>
-#endif
#include <svtools/dialogclosedlistener.hxx>
+#include <bootstrp/sstring.hxx>
// ------------
// - Forwards -
diff --git a/svx/source/cui/cuigrfflt.hxx b/cui/source/inc/cuigrfflt.hxx
index 061ada2568d1..061ada2568d1 100644
--- a/svx/source/cui/cuigrfflt.hxx
+++ b/cui/source/inc/cuigrfflt.hxx
diff --git a/svx/source/cui/cuihyperdlg.hxx b/cui/source/inc/cuihyperdlg.hxx
index c2f247f9455c..59b39f55a7fc 100644
--- a/svx/source/cui/cuihyperdlg.hxx
+++ b/cui/source/inc/cuihyperdlg.hxx
@@ -33,7 +33,7 @@
// include ---------------------------------------------------------------
-#include <hlnkitem.hxx>
+#include <svx/hlnkitem.hxx>
#include <sfx2/childwin.hxx>
#include <sfx2/ctrlitem.hxx>
#include <sfx2/bindings.hxx>
diff --git a/svx/source/cui/cuiimapwnd.hxx b/cui/source/inc/cuiimapwnd.hxx
index 341223a2dc8d..0e62fab44318 100644
--- a/svx/source/cui/cuiimapwnd.hxx
+++ b/cui/source/inc/cuiimapwnd.hxx
@@ -6,7 +6,7 @@
#include <vcl/combobox.hxx>
#include <vcl/button.hxx>
#include <vcl/menu.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
#include <svtools/imapobj.hxx>
#include <svtools/transfer.hxx>
#include <svtools/imap.hxx>
diff --git a/svx/source/cui/cuioptgenrl.hxx b/cui/source/inc/cuioptgenrl.hxx
index 22ef5481651f..19d21ba5c255 100644
--- a/svx/source/cui/cuioptgenrl.hxx
+++ b/cui/source/inc/cuioptgenrl.hxx
@@ -32,17 +32,11 @@
// include ---------------------------------------------------------------
-#include <optgenrl.hxx>
+#include <svx/optgenrl.hxx>
#include <sfx2/tabdlg.hxx>
-#ifndef _FIXED_HXX //autogen
#include <vcl/fixed.hxx>
-#endif
-#ifndef _EDIT_HXX //autogen
#include <vcl/edit.hxx>
-#endif
-#ifndef _GROUP_HXX //autogen
#include <vcl/group.hxx>
-#endif
// forward ---------------------------------------------------------------
diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc
new file mode 100644
index 000000000000..c054d66c4645
--- /dev/null
+++ b/cui/source/inc/cuires.hrc
@@ -0,0 +1,430 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: dialogs.hrc,v $
+ * $Revision: 1.15 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef _CUI_RESID_HRC
+#define _CUI_REDID_HRC
+
+// include ------------------------------------------------------------------
+
+#include <sfx2/sfx.hrc>
+#include <sfx2/dialogs.hrc>
+
+// Resource-Id's ------------------------------------------------------------
+
+// Bitte FIRSTFREE pflegen!!! (gilt nicht f"ur Strings)
+#define RID_SVX_FIRSTFREE 305
+
+// Gallery
+#define RID_CUI_GALLERY_START (RID_SVX_START + 360)
+#define RID_CUI_GALLERY_END (RID_SVX_START + 410)
+
+// tab pages
+// used in "dialogs"
+#define RID_SVX_FORMAT_CELLS_DLG ( RID_SVX_START + 42 )
+
+// used in "tabpages"
+#define RID_SVXDLG_TEXT (RID_SVX_START + 183)
+#define RID_SVXDLG_TRANSFORM (RID_SVX_START + 45)
+#define RID_SVXDLG_LINE (RID_SVX_START + 50)
+#define RID_SVXDLG_BBDLG (RID_SVX_START + 40)
+#define RID_SVXDLG_CAPTION (RID_SVX_START + 151)
+#define RID_SVXDLG_AREA (RID_SVX_START + 55)
+#define RID_SVXSTRARY_PAPERSIZE_STD (RID_SVX_START + 142)
+#define RID_SVXSTRARY_PAPERSIZE_DRAW (RID_SVX_START + 143)
+#define RID_SVXSTR_TABLE_PRESET_NONE (RID_SVX_START + 969)
+#define RID_SVXSTR_TABLE_PRESET_ONLYOUTER (RID_SVX_START + 970)
+#define RID_SVXSTR_TABLE_PRESET_OUTERHORI (RID_SVX_START + 971)
+#define RID_SVXSTR_TABLE_PRESET_OUTERALL (RID_SVX_START + 972)
+#define RID_SVXSTR_TABLE_PRESET_OUTERINNER (RID_SVX_START + 973)
+#define RID_SVXSTR_PARA_PRESET_DIAGONAL (RID_SVX_START + 974)
+#define RID_SVXSTR_PARA_PRESET_ALL (RID_SVX_START + 975)
+#define RID_SVXSTR_PARA_PRESET_LEFTRIGHT (RID_SVX_START + 976)
+#define RID_SVXSTR_PARA_PRESET_TOPBOTTOM (RID_SVX_START + 977)
+#define RID_SVXSTR_PARA_PRESET_ONLYLEFT (RID_SVX_START + 978)
+#define RID_SVXSTR_SHADOW_STYLE_NONE (RID_SVX_START + 979)
+#define RID_SVXSTR_SHADOW_STYLE_BOTTOMRIGHT (RID_SVX_START + 980)
+#define RID_SVXSTR_SHADOW_STYLE_TOPRIGHT (RID_SVX_START + 981)
+#define RID_SVXSTR_SHADOW_STYLE_BOTTOMLEFT (RID_SVX_START + 982)
+#define RID_SVXSTR_SHADOW_STYLE_TOPLEFT (RID_SVX_START + 983)
+#define RID_SVXSTR_HOR_PRESET_ONLYHOR (RID_SVX_START + 1113)
+#define RID_SVXSTR_VER_PRESET_ONLYVER (RID_SVX_START + 1114)
+#define RID_SVXSTR_FRAMEDIR_LTR (RID_SVX_START + 960)
+#define RID_SVXSTR_FRAMEDIR_RTL (RID_SVX_START + 961)
+#define RID_SVXSTR_FRAMEDIR_SUPER (RID_SVX_START + 962)
+#define RID_SVXSTR_PAGEDIR_LTR_HORI (RID_SVX_START + 965)
+#define RID_SVXSTR_PAGEDIR_RTL_HORI (RID_SVX_START + 966)
+#define RID_SVXSTR_PAGEDIR_RTL_VERT (RID_SVX_START + 967)
+#define RID_SVXSTR_PAGEDIR_LTR_VERT (RID_SVX_START + 968)
+#define RID_STR_EDIT_GRAPHIC (RID_SVX_START + 509)
+#define RID_SVXIMG_LOAD_H (RID_SVX_START + 283)
+#define RID_SVXIMG_SAVE_H (RID_SVX_START + 284)
+
+#define RID_SVXSTR_DESC_GRADIENT (RID_SVX_START + 163)
+#define RID_SVXSTR_ASK_DEL_GRADIENT (RID_SVX_START + 165)
+#define RID_SVXSTR_ASK_CHANGE_GRADIENT (RID_SVX_START + 166)
+#define RID_SVXSTR_ASK_DEL_BITMAP (RID_SVX_START + 171)
+#define RID_SVXSTR_ASK_CHANGE_BITMAP (RID_SVX_START + 172)
+#define RID_SVXSTR_DESC_NEW_BITMAP (RID_SVX_START + 168)
+#define RID_SVXSTR_DESC_EXT_BITMAP (RID_SVX_START + 169)
+#define RID_SVXSTR_DESC_LINESTYLE (RID_SVX_START + 174)
+#define RID_SVXSTR_ASK_DEL_LINESTYLE (RID_SVX_START + 176)
+#define RID_SVXSTR_ASK_CHANGE_LINESTYLE (RID_SVX_START + 177)
+#define RID_SVXSTR_DESC_HATCH (RID_SVX_START + 232)
+#define RID_SVXSTR_ASK_DEL_HATCH (RID_SVX_START + 234)
+#define RID_SVXSTR_ASK_CHANGE_HATCH (RID_SVX_START + 235)
+#define RID_SVXSTR_CHANGE (RID_SVX_START + 181)
+#define RID_SVXSTR_ADD (RID_SVX_START + 182)
+#define RID_SVXSTR_DESC_COLOR (RID_SVX_START + 215)
+#define RID_SVXSTR_ASK_DEL_COLOR (RID_SVX_START + 217)
+#define RID_SVXSTR_ASK_CHANGE_COLOR (RID_SVX_START + 218)
+#define RID_SVXSTR_TABLE (RID_SVX_START + 220)
+#define RID_SVXSTR_WRITE_DATA_ERROR (RID_SVX_START + 229)
+#define RID_SVXSTR_READ_DATA_ERROR (RID_SVX_START + 230)
+#define RID_SVXSTR_WARN_TABLE_OVERWRITE (RID_SVX_START + 231)
+#define RID_SVXSTR_ASK_CHANGE_LINEEND (RID_SVX_START + 184)
+#define RID_SVXSTR_ASK_DEL_LINEEND (RID_SVX_START + 219)
+#define RID_SVXSTR_DESC_LINEEND (RID_SVX_START + 238)
+#define RID_SVXSTR_WARN_NAME_DUPLICATE (RID_SVX_START + 236)
+
+// autocor
+#define RID_OFAPAGE_AUTOCOMPLETE_OPTIONS (RID_OFA_START + 119)
+#define RID_OFAPAGE_AUTOCORR_OPTIONS (RID_OFA_START + 102)
+#define RID_OFAPAGE_AUTOFMT_APPLY (RID_OFA_START + 110)
+#define RID_OFAPAGE_AUTOCORR_REPLACE (RID_OFA_START + 103)
+#define RID_OFAPAGE_AUTOCORR_EXCEPT (RID_OFA_START + 104)
+#define RID_OFAPAGE_AUTOCORR_QUOTE (RID_OFA_START + 109)
+#define RID_OFADLG_PRCNT_SET (RID_OFA_START + 111)
+
+// options
+#define RID_SVXSTR_DIAGRAM_ROW (RID_SVX_START + 1162)
+#define RID_OFAPAGE_CONNPOOLOPTIONS (RID_OFA_START + 122)
+#define QUERY_DELETE_CONFIRM (RID_SVX_START + 1110)
+#define RID_SVXPAGE_JSEARCH_OPTIONS (RID_SVX_START + 840)
+#define DLG_DOCUMENTLINK (RID_OFA_START + 124)
+#define STR_LINKEDDOC_DOESNOTEXIST (RID_SVX_START + 1111)
+#define STR_LINKEDDOC_NO_SYSTEM_FILE (RID_SVX_START + 1169)
+#define STR_NAME_CONFLICT (RID_SVX_START + 1112)
+#define RID_SVX_FONT_SUBSTITUTION (RID_SVX_START + 18)
+
+// treeopt
+#define RID_SVXPAGE_COLOR (RID_SVX_START + 60)
+#define RID_SVXPAGE_SSO (RID_SVX_START + 251)
+#define OFA_TP_LANGUAGES_FOR_SET_DOCUMENT_LANGUAGE ( RID_OFA_START + 256 )
+#define RID_OFADLG_OPTIONS_TREE_PAGES (RID_OFA_START + 116)
+#define RID_OFADLG_OPTIONS_TREE (RID_OFA_START + 115)
+#define RID_IMGLIST_TREEOPT (RID_OFA_START + 174)
+#define RID_IMGLIST_TREEOPT_HC (RID_OFA_START + 175)
+#define RID_RIDER_SLL_SITE (RID_OFA_START + 100)//?
+#define RID_RIDER_SLL_PERSONAL (RID_OFA_START + 101)//?
+#define RID_OFADLG_OPTIONS_TREE_HINT (RID_OFA_START + 118)//?
+
+// options
+#define RID_SVXDLG_WEBCONNECTION_INFO (RID_SVX_START + 301)
+#define RID_SVXDLG_SECURITY_OPTIONS (RID_SVX_START + 300)
+#define RID_SVXPAGE_ONLINEUPDATE (RID_SVX_START + 298)
+#define OFA_TP_MEMORY (RID_OFA_START + 250)
+#define RID_SVXPAGE_INET_SECURITY (RID_SVX_START + 200)
+#define RID_SVXPAGE_INET_SEARCH (RID_SVX_START + 160)
+#define RID_SVXPAGE_INET_PROXY (RID_SVX_START + 157)
+#define RID_SVXPAGE_INET_MAIL (RID_SVX_START + 155)
+#define RID_SVXPAGE_INET_MOZPLUGIN (RID_SVX_START + 2161)
+#define RID_OFAPAGE_HTMLOPT (RID_OFA_START + 100)
+#define OFA_TP_LANGUAGES (RID_OFA_START + 205)
+#define OFA_TP_MISC (RID_OFA_START + 200)
+#define OFA_TP_VIEW (RID_OFA_START + 202)
+#define RID_OFAPAGE_MSFILTEROPT (RID_OFA_START + 120)
+#define RID_OFAPAGE_MSFILTEROPT2 (RID_OFA_START + 121)
+#define RID_OFAPAGE_SMARTTAG_OPTIONS (RID_OFA_START + 125)
+#define RID_SVXPAGE_OPTIONS_CTL (RID_SVX_START + 252)
+#define RID_SVXPAGE_OPTIONS_JAVA (RID_SVX_START + 253)
+#define RID_SVXPAGE_ACCESSIBILITYCONFIG (RID_SVX_START + 250)
+#define RID_SVXPAGE_ASIAN_LAYOUT (RID_SVX_START + 246)
+#define RID_OPTPAGE_CHART_DEFCOLORS (RID_SVX_START + 299)
+#define RID_SVXPAGE_COLORCONFIG (RID_SVX_START + 249)
+#define RID_SVXQB_DELETE_COLOR_CONFIG (RID_SVX_START + 324)
+#define RID_SVXSTR_COLOR_CONFIG_SAVE1 (RID_SVX_START + 853)
+#define RID_SVXSTR_COLOR_CONFIG_SAVE2 (RID_SVX_START + 854)
+#define RID_SVXSTR_COLOR_CONFIG_DELETE (RID_SVX_START + 855)
+#define RID_SVXSTR_OPT_DOUBLE_DICTS (RID_SVX_START + 320)
+#define RID_SVX_MSGBOX_LANGUAGE_RESTART ( RID_SVX_START + 2 )
+#define RID_SVXERR_OPT_PROXYPORTS (RID_SVX_START + 224)
+#define RID_SVXDLG_OPT_JAVASCRIPT_DISABLE (RID_SVX_START + 225)
+#define RID_SVXDLG_JAVA_PARAMETER (RID_SVX_START + 254)
+#define RID_SVXDLG_JAVA_CLASSPATH (RID_SVX_START + 255)
+#define RID_SVXERR_JRE_NOT_RECOGNIZED (RID_SVX_START + 256)
+#define RID_SVXERR_JRE_FAILED_VERSION (RID_SVX_START + 257)
+#define RID_SVX_MSGBOX_JAVA_RESTART ( RID_SVX_START + 0 )
+#define RID_SVX_MSGBOX_JAVA_RESTART2 ( RID_SVX_START + 1 )
+#define RID_SVXDLG_LNG_ED_NUM_PREBREAK (RID_SVX_START + 830)
+#define RID_SVXDLG_EDIT_MODULES (RID_SVX_START + 831)
+#define RID_SVXSTR_PATH_NAME_START (RID_SVX_START + 1003)
+#define RID_SVXDLG_FILTER_WARNING (RID_SVX_START + 248)
+#define RID_SVXBMP_LOCK (RID_SVX_START + 118)
+#define RID_SVXBMP_LOCK_HC (RID_SVX_START + 119)
+#define RID_SVXSTR_READONLY_CONFIG_TIP (RID_SVX_START + 1026)
+#define RID_SVXQB_CHANGEDATA (RID_SVX_START + 214) //?
+#define RID_SVXERR_OPT_DOUBLEPATHS (RID_SVX_START + 208) //?
+#define RID_SVXSTR_KEY_AUTOCORRECT_DIR (RID_SVX_START + 1004) //?
+#define RID_SVXSTR_KEY_DICTIONARY_PATH (RID_SVX_START + 1010)//?
+#define RID_SVXSTR_KEY_LINGUISTIC_DIR (RID_SVX_START + 1016)//?
+#define RID_SVXSTR_KEY_USERCONFIG_PATH (RID_SVX_START + 1023)//?
+#define RID_SVXSTR_KEY_FILTER_PATH (RID_SVX_START + 1012)//?
+#define RID_SVXSTR_KEY_ADDINS_PATH (RID_SVX_START + 1003)//?
+#define RID_SVXSTR_KEY_FAVORITES_DIR (RID_SVX_START + 1011)//?
+#define RID_SVXSTR_KEY_PLUGINS_PATH (RID_SVX_START + 1019)//?
+#define RID_SVXSTR_KEY_TEMP_PATH (RID_SVX_START + 1021)//?
+#define RID_SVXSTR_KEY_STORAGE_DIR (RID_SVX_START + 1020)//?
+#define RID_SVXSTR_KEY_GALLERY_DIR (RID_SVX_START + 1013)//?
+#define RID_SVXSTR_KEY_HELP_DIR (RID_SVX_START + 1015)//?
+#define RID_SVXSTR_KEY_GLOSSARY_PATH (RID_SVX_START + 1005)//?
+#define RID_SVXSTR_KEY_TEMPLATE_PATH (RID_SVX_START + 1022)//?
+#define RID_SVXSTR_KEY_MODULES_PATH (RID_SVX_START + 1017)//?
+#define RID_SVXSTR_KEY_BACKUP_PATH (RID_SVX_START + 1006)//?
+#define RID_SVXSTR_KEY_PALETTE_PATH (RID_SVX_START + 1018)//?
+#define RID_SVXSTR_KEY_CONFIG_DIR (RID_SVX_START + 1009)//?
+#define RID_SVXSTR_KEY_WORK_PATH (RID_SVX_START + 1024)//?
+#define RID_SVXSTR_KEY_GRAPHICS_PATH (RID_SVX_START + 1014)//?
+#define RID_SVXSTR_KEY_BASIC_PATH (RID_SVX_START + 1007)//?
+#define RID_SVXSTR_KEY_BITMAP_PATH (RID_SVX_START + 1008)//?
+#define RID_SVXSTR_KEY_USERDICTIONARY_DIR (RID_SVX_START + 1025)//?
+
+// dialogs
+#define RID_SVX_WND_COMMON_LINGU ( RID_SVX_START + 0 )
+#define RID_SVX_GRFFILTER_DLG_EMBOSS_TAB (RID_SVX_START + 337)
+#define RID_SVXDLG_SEARCHATTR (RID_SVX_START + 22)
+
+// hyperlink dialog
+#define RID_SVXDLG_NEWHYPERLINK (RID_SVX_START + 227)
+#define RID_SVXBMP_HLINETTP_H (RID_SVX_START + 272)
+#define RID_SVXBMP_HLMAILTP_H (RID_SVX_START + 273)
+#define RID_SVXBMP_HLDOCTP_H (RID_SVX_START + 274)
+#define RID_SVXBMP_HLDOCNTP_H (RID_SVX_START + 275)
+#define RID_SVXBMP_HLINETTP (RID_SVX_START + 556)
+#define RID_SVXBMP_HLMAILTP (RID_SVX_START + 557)
+#define RID_SVXBMP_HLDOCTP (RID_SVX_START + 558)
+#define RID_SVXBMP_HLDOCNTP (RID_SVX_START + 559)
+#define RID_SVXPAGE_HYPERLINK_INTERNET (RID_SVX_START + 228)
+#define RID_SVXPAGE_HYPERLINK_MAIL (RID_SVX_START + 229)
+#define RID_SVXPAGE_HYPERLINK_DOCUMENT (RID_SVX_START + 230)
+#define RID_SVXPAGE_HYPERLINK_NEWDOCUMENT (RID_SVX_START + 231)
+#define RID_SVXSTR_HYPERDLG_HLINETTP (RID_SVX_START + 581)
+#define RID_SVXSTR_HYPERDLG_HLINETTP_HELP (RID_SVX_START + 582)
+#define RID_SVXSTR_HYPERDLG_HLMAILTP (RID_SVX_START + 583)
+#define RID_SVXSTR_HYPERDLG_HLMAILTP_HELP (RID_SVX_START + 584)
+#define RID_SVXSTR_HYPERDLG_HLDOCTP (RID_SVX_START + 585)
+#define RID_SVXSTR_HYPERDLG_HLDOCTP_HELP (RID_SVX_START + 586)
+#define RID_SVXSTR_HYPERDLG_HLDOCNTP (RID_SVX_START + 587)
+#define RID_SVXSTR_HYPERDLG_HLDOCNTP_HELP (RID_SVX_START + 588)
+#define RID_SVXSTR_HYPDLG_APPLYBUT (RID_SVX_START + 548)
+#define RID_SVXSTR_HYPDLG_CLOSEBUT (RID_SVX_START + 549)
+#define RID_SVXSTR_HYPDLG_NOVALIDFILENAME (RID_SVX_START + 553)
+#define RID_SVXSTR_HYPERDLG_QUERYOVERWRITE (RID_SVX_START + 815)
+#define RID_SVXSTR_HYPDLG_ERR_LERR_NOENTRIES (RID_SVX_START + 800)
+#define RID_SVXSTR_HYPDLG_ERR_LERR_DOCNOTOPEN (RID_SVX_START + 801)
+#define RID_SVXFLOAT_HYPERLINK_MARKWND (RID_SVX_START + 232)
+#define RID_SVXSTR_HYPDLG_MACROACT1 (RID_SVX_START + 550)
+#define RID_SVXSTR_HYPDLG_MACROACT2 (RID_SVX_START + 551)
+#define RID_SVXSTR_HYPDLG_MACROACT3 (RID_SVX_START + 552)
+#define RID_SVXSTR_HYPERDLG_FORM_BUTTON (RID_SVX_START + 813)
+#define RID_SVXSTR_HYPERDLG_FROM_TEXT (RID_SVX_START + 814)
+
+// imap dialog
+#define RID_SVX_IMAPDLG_START (RID_SVX_START + 100)
+#define RID_SVXDLG_IMAPURL (RID_SVX_IMAPDLG_START + 2)
+
+// name dialog
+#define RID_SVXDLG_NAME (RID_SVX_START + 62)
+#define RID_SVXDLG_MESSBOX (RID_SVX_START + 63)
+#define RID_SVXDLG_OBJECT_NAME (RID_SVX_START + 64)
+#define RID_SVXDLG_OBJECT_TITLE_DESC (RID_SVX_START + 67)
+
+// hangulhanja
+#define RID_SVX_MDLG_HANGULHANJA (RID_SVX_START + 1 )
+#define RID_SVX_MDLG_HANGULHANJA_OPT ( RID_SVX_START + 4 )
+#define RID_SVX_MDLG_HANGULHANJA_EDIT ( RID_SVX_START + 5 )
+#define RID_SVX_MDLG_HANGULHANJA_NEWDICT ( RID_SVX_START + 6 )
+
+// icon choice
+#define RID_SVXSTR_ICONCHOICEDLG_RESETBUT (RID_SVX_START + 580)
+
+// insert rows&cols
+#define DLG_INS_ROW_COL (RID_SVX_START + 156)
+
+// SvxMultiFileDialog
+#define RID_SVXSTR_FILE_TITLE (RID_SVX_START + 482)
+#define RID_SVXSTR_FILE_HEADLINE (RID_SVX_START + 483)
+#define RID_SVXSTR_ARCHIVE_TITLE (RID_SVX_START + 484)
+#define RID_SVXSTR_ARCHIVE_HEADLINE (RID_SVX_START + 485)
+#define RID_SVXSTR_MULTIFILE_DBL_ERR (RID_SVX_START + 486)
+
+// multi path dialog
+#define RID_SVXDLG_MULTIPATH (RID_SVX_START + 201)
+#define RID_MULTIPATH_DBL_ERR (RID_SVX_START + 207)
+
+// new table dialog
+#define RID_SVX_NEWTABLE_DLG ( RID_SVX_START + 44 )
+
+// script organizer
+#define RID_DLG_SCRIPTORGANIZER (RID_SVX_START + 258)
+#define RID_DLG_NEWLIB (RID_SVX_START + 290)
+#define RID_SVXSTR_DELQUERY (RID_SVX_START + 1027)
+#define RID_SVXSTR_DELQUERY_TITLE (RID_SVX_START + 1028)
+#define RID_SVXSTR_DELFAILED (RID_SVX_START + 1029)
+#define RID_SVXSTR_DELFAILEDPERM (RID_SVX_START + 1030)
+#define RID_SVXSTR_DELFAILED_TITLE (RID_SVX_START + 1031)
+#define RID_SVXSTR_CREATEFAILED (RID_SVX_START + 1032)
+#define RID_SVXSTR_CREATEFAILEDPERM (RID_SVX_START + 1033)
+#define RID_SVXSTR_CREATEFAILEDDUP (RID_SVX_START + 1034)
+#define RID_SVXSTR_CREATEFAILED_TITLE (RID_SVX_START + 1035)
+#define RID_SVXSTR_RENAMEFAILED (RID_SVX_START + 1036)
+#define RID_SVXSTR_RENAMEFAILEDPERM (RID_SVX_START + 1037)
+#define RID_SVXSTR_RENAMEFAILED_TITLE (RID_SVX_START + 1038)
+#define RID_SVXSTR_ERROR_TITLE (RID_SVX_START + 1100)
+#define RID_SVXSTR_ERROR_LANG_NOT_SUPPORTED (RID_SVX_START + 1101)
+#define RID_SVXSTR_ERROR_RUNNING (RID_SVX_START + 1102)
+#define RID_SVXSTR_EXCEPTION_RUNNING (RID_SVX_START + 1103)
+#define RID_SVXSTR_ERROR_AT_LINE (RID_SVX_START + 1104)
+#define RID_SVXSTR_EXCEPTION_AT_LINE (RID_SVX_START + 1105)
+#define RID_SVXSTR_FRAMEWORK_ERROR_RUNNING (RID_SVX_START + 1106)
+#define RID_SVXSTR_FRAMEWORK_ERROR_AT_LINE (RID_SVX_START + 1107)
+#define RID_SVXSTR_ERROR_TYPE_LABEL (RID_SVX_START + 1108)
+#define RID_SVXSTR_ERROR_MESSAGE_LABEL (RID_SVX_START + 1109)
+
+// spell check dialog
+#define RID_SVXDLG_SPELLCHECK (RID_SVX_START + 32)
+
+// split cells
+#define RID_SVX_SPLITCELLDLG ( RID_SVX_START + 43 )
+
+// searching
+#define RID_SVXDLG_SEARCHSIMILARITY (RID_SVX_START + 23)
+
+// customize
+
+#define RID_SVXDLG_CUSTOMIZE (RID_SVX_START + 291)
+#define RID_SVXPAGE_MENUS (RID_SVX_START + 292)
+#define RID_SVXPAGE_KEYBOARD (RID_SVX_START + 293)
+#define RID_SVXPAGE_TOOLBARS (RID_SVX_START + 294)
+#define RID_SVXPAGE_EVENTS (RID_SVX_START + 295)
+#define RID_SVXPAGE_CONFIGGROUPBOX (RID_SVX_START + 304)
+#define RID_SVXDLG_ASSIGNCOMPONENT (RID_SVX_START + 297)
+#define RID_DLG_SCRIPTSELECTOR (RID_SVX_START + 259)
+#define RID_SVXSTR_NEW_MENU (RID_SVX_START + 1039)
+#define RID_SVXSTR_NEW_TOOLBAR (RID_SVX_START + 1040)
+#define RID_SVXSTR_MOVE_MENU (RID_SVX_START + 1041)
+#define RID_SVXSTR_ADD_SUBMENU (RID_SVX_START + 1048)
+#define RID_SVXSTR_SUBMENU_NAME (RID_SVX_START + 1049)
+#define RID_SVXSTR_MENU_ADDCOMMANDS_DESCRIPTION (RID_SVX_START + 1050)
+#define RID_SVXSTR_IMPORT_ICON_ERROR (RID_SVX_START + 1117)
+#define RID_SVXSTR_DELETE_ICON_CONFIRM (RID_SVX_START + 1163) //added for issue73355
+#define RID_SVXSTR_REPLACE_ICON_WARNING (RID_SVX_START + 1164) //added for issue73355
+#define RID_SVXSTR_REPLACE_ICON_CONFIRM (RID_SVX_START + 1165) //added for issue73355
+#define RID_SVXSTR_YESTOALL (RID_SVX_START + 1166) //added for issue73355
+#define RID_SVXSTR_PRODUCTNAME_TOOLBARS (RID_SVX_START + 1042)
+#define RID_SVXSTR_TOOLBAR (RID_SVX_START + 1043)
+#define RID_SVXSTR_TOOLBAR_CONTENT (RID_SVX_START + 1044)
+#define RID_SVXSTR_COMMANDS (RID_SVX_START + 1045)
+#define RID_SVXSTR_COMMAND (RID_SVX_START + 1046)
+#define RID_SVXSTR_TOOLBAR_NAME (RID_SVX_START + 1047)
+#define RID_SVXSTR_CONFIRM_MENU_RESET (RID_SVX_START + 1115)
+#define RID_SVXSTR_CONFIRM_TOOLBAR_RESET (RID_SVX_START + 1116)
+#define RID_SVXSTR_LABEL_NEW_NAME (RID_SVX_START + 1135)
+#define RID_SVXSTR_RENAME_MENU (RID_SVX_START + 1136)
+#define RID_SVXSTR_RENAME_TOOLBAR (RID_SVX_START + 1137)
+#define RID_SVXSTR_EVENT_STARTAPP (RID_SVX_START + 1051)
+#define RID_SVXSTR_EVENT_CLOSEAPP (RID_SVX_START + 1052)
+#define RID_SVXSTR_EVENT_NEWDOC (RID_SVX_START + 1053)
+#define RID_SVXSTR_EVENT_CLOSEDOC (RID_SVX_START + 1054)
+#define RID_SVXSTR_EVENT_PREPARECLOSEDOC (RID_SVX_START + 1055)
+#define RID_SVXSTR_EVENT_OPENDOC (RID_SVX_START + 1056)
+#define RID_SVXSTR_EVENT_SAVEDOC (RID_SVX_START + 1057)
+#define RID_SVXSTR_EVENT_SAVEASDOC (RID_SVX_START + 1058)
+#define RID_SVXSTR_EVENT_SAVEDOCDONE (RID_SVX_START + 1059)
+#define RID_SVXSTR_EVENT_SAVEASDOCDONE (RID_SVX_START + 1060)
+#define RID_SVXSTR_EVENT_ACTIVATEDOC (RID_SVX_START + 1061)
+#define RID_SVXSTR_EVENT_DEACTIVATEDOC (RID_SVX_START + 1062)
+#define RID_SVXSTR_EVENT_PRINTDOC (RID_SVX_START + 1063)
+#define RID_SVXSTR_EVENT_MODIFYCHANGED (RID_SVX_START + 1064)
+#define RID_SVXSTR_EVENT_MAILMERGE (RID_SVX_START + 1065)
+#define RID_SVXSTR_EVENT_PAGECOUNTCHANGE (RID_SVX_START + 1066)
+#define RID_SVXSTR_EVENT_APPROVEACTIONPERFORMED (RID_SVX_START + 1067)
+#define RID_SVXSTR_EVENT_ACTIONPERFORMED (RID_SVX_START + 1068)
+#define RID_SVXSTR_EVENT_CHANGED (RID_SVX_START + 1069)
+#define RID_SVXSTR_EVENT_TEXTCHANGED (RID_SVX_START + 1070)
+#define RID_SVXSTR_EVENT_ITEMSTATECHANGED (RID_SVX_START + 1071)
+#define RID_SVXSTR_EVENT_FOCUSGAINED (RID_SVX_START + 1072)
+#define RID_SVXSTR_EVENT_FOCUSLOST (RID_SVX_START + 1073)
+#define RID_SVXSTR_EVENT_KEYTYPED (RID_SVX_START + 1074)
+#define RID_SVXSTR_EVENT_KEYUP (RID_SVX_START + 1075)
+#define RID_SVXSTR_EVENT_MOUSEENTERED (RID_SVX_START + 1076)
+#define RID_SVXSTR_EVENT_MOUSEDRAGGED (RID_SVX_START + 1077)
+#define RID_SVXSTR_EVENT_MOUSEMOVED (RID_SVX_START + 1078)
+#define RID_SVXSTR_EVENT_MOUSEPRESSED (RID_SVX_START + 1079)
+#define RID_SVXSTR_EVENT_MOUSERELEASED (RID_SVX_START + 1080)
+#define RID_SVXSTR_EVENT_MOUSEEXITED (RID_SVX_START + 1081)
+#define RID_SVXSTR_EVENT_APPROVERESETTED (RID_SVX_START + 1082)
+#define RID_SVXSTR_EVENT_SUBMITTED (RID_SVX_START + 1083)
+#define RID_SVXSTR_EVENT_BEFOREUPDATE (RID_SVX_START + 1084)
+#define RID_SVXSTR_EVENT_AFTERUPDATE (RID_SVX_START + 1085)
+#define RID_SVXSTR_EVENT_LOADED (RID_SVX_START + 1086)
+#define RID_SVXSTR_EVENT_RELOADING (RID_SVX_START + 1087)
+#define RID_SVXSTR_EVENT_RELOADED (RID_SVX_START + 1088)
+#define RID_SVXSTR_EVENT_UNLOADING (RID_SVX_START + 1089)
+#define RID_SVXSTR_EVENT_UNLOADED (RID_SVX_START + 1090)
+#define RID_SVXSTR_EVENT_CONFIRMDELETE (RID_SVX_START + 1091)
+#define RID_SVXSTR_EVENT_APPROVEROWCHANGE (RID_SVX_START + 1092)
+#define RID_SVXSTR_EVENT_ROWCHANGE (RID_SVX_START + 1093)
+#define RID_SVXSTR_EVENT_POSITIONING (RID_SVX_START + 1094)
+#define RID_SVXSTR_EVENT_POSITIONED (RID_SVX_START + 1095)
+#define RID_SVXSTR_EVENT_APPROVEPARAMETER (RID_SVX_START + 1096)
+#define RID_SVXSTR_EVENT_ERROROCCURED (RID_SVX_START + 1097)
+#define RID_SVXSTR_EVENT_ADJUSTMENTVALUECHANGED (RID_SVX_START + 1098)
+#define RID_SVXSTR_EVENT_RESETTED (RID_SVX_START + 1099)
+#define RID_SVXSTR_EVENT_SUBCOMPONENT_OPENED (RID_SVX_START + 1170)
+#define RID_SVXSTR_EVENT_SUBCOMPONENT_CLOSED (RID_SVX_START + 1171)
+#define RID_SVXSTR_EVENT_CREATEDOC (RID_SVX_START + 1172)
+#define RID_SVXSTR_EVENT_LOADDOCFINISHED (RID_SVX_START + 1173)
+#define RID_SVXSTR_EVENT_SAVEDOCFAILED (RID_SVX_START + 1174)
+#define RID_SVXSTR_EVENT_SAVEASDOCFAILED (RID_SVX_START + 1175)
+#define RID_SVXSTR_EVENT_COPYTODOC (RID_SVX_START + 1176)
+#define RID_SVXSTR_EVENT_COPYTODOCDONE (RID_SVX_START + 1177)
+#define RID_SVXSTR_EVENT_COPYTODOCFAILED (RID_SVX_START + 1178)
+#define RID_SVXSTR_EVENT_VIEWCREATED (RID_SVX_START + 1179)
+#define RID_SVXSTR_EVENT_PREPARECLOSEVIEW (RID_SVX_START + 1180)
+#define RID_SVXSTR_EVENT_CLOSEVIEW (RID_SVX_START + 1181)
+#define RID_SVXSTR_EVENT_TITLECHANGED (RID_SVX_START + 1182)
+#define RID_SVXSTR_EVENT_MODECHANGED (RID_SVX_START + 1183)
+#define RID_SVXSTR_EVENT_VISAREACHANGED (RID_SVX_START + 1184)
+#define RID_SVXSTR_EVENT_STORAGECHANGED (RID_SVX_START + 1185)
+#define RID_SVXSTR_EVENT_MAILMERGE_END (RID_SVX_START + 1186)
+#define RID_SVXSTR_EVENT_FIELDMERGE (RID_SVX_START + 1187)
+#define RID_SVXSTR_EVENT_FIELDMERGE_FINISHED (RID_SVX_START + 1188)
+#define RID_SVXSTR_EVENT_LAYOUT_FINISHED (RID_SVX_START + 1189)
+
+#endif
diff --git a/svx/source/cui/cuisrchdlg.hxx b/cui/source/inc/cuisrchdlg.hxx
index db701ec95bb1..93c7779d0ee9 100644
--- a/svx/source/cui/cuisrchdlg.hxx
+++ b/cui/source/inc/cuisrchdlg.hxx
@@ -57,9 +57,9 @@
#endif
#include <sfx2/childwin.hxx>
#include <sfx2/basedlgs.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
#define _SVSTDARR_STRINGSDTOR
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
#include <svtools/svmedit.hxx>
#include <sfx2/srchdefs.hxx>
@@ -76,7 +76,7 @@ class SvxJSearchOptionsDialog : public SfxSingleTabDialog
public:
SvxJSearchOptionsDialog( Window *pParent,
- const SfxItemSet& rOptionsSet, USHORT nUniqueId,
+ const SfxItemSet& rOptionsSet,
INT32 nInitialFlags );
virtual ~SvxJSearchOptionsDialog();
diff --git a/svx/source/cui/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index cba81c8c096f..cba81c8c096f 100644
--- a/svx/source/cui/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
diff --git a/svx/source/cui/cuitabline.hxx b/cui/source/inc/cuitabline.hxx
index d82ad9e3d95e..d82ad9e3d95e 100644
--- a/svx/source/cui/cuitabline.hxx
+++ b/cui/source/inc/cuitabline.hxx
diff --git a/svx/source/cui/cuitbxform.hxx b/cui/source/inc/cuitbxform.hxx
index 1587dd7baaf5..1587dd7baaf5 100644
--- a/svx/source/cui/cuitbxform.hxx
+++ b/cui/source/inc/cuitbxform.hxx
diff --git a/svx/source/cui/dbregister.hxx b/cui/source/inc/dbregister.hxx
index 2e1496a42e1c..00cf4cc911c2 100644
--- a/svx/source/cui/dbregister.hxx
+++ b/cui/source/inc/dbregister.hxx
@@ -34,7 +34,7 @@
#include "optpath.hxx"
#include <tools/string.hxx>
#include <comphelper/stl_types.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
#include "ControlFocusHelper.hxx"
#include <sfx2/basedlgs.hxx>
diff --git a/svx/inc/defdlgname.hxx b/cui/source/inc/defdlgname.hxx
index 1fcc17b1f41a..1fcc17b1f41a 100644
--- a/svx/inc/defdlgname.hxx
+++ b/cui/source/inc/defdlgname.hxx
diff --git a/cui/source/inc/dialmgr.hxx b/cui/source/inc/dialmgr.hxx
new file mode 100644
index 000000000000..f4d0ad883470
--- /dev/null
+++ b/cui/source/inc/dialmgr.hxx
@@ -0,0 +1,48 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef _CUI_DIALMGR_HXX
+#define _CUI_DIALMGR_HXX
+
+// include ---------------------------------------------------------------
+
+#include <tools/resid.hxx>
+
+// forward ---------------------------------------------------------------
+
+class ResMgr;
+struct CuiResMgr
+{
+ static ResMgr* GetResMgr();
+};
+
+#define CUI_MGR() (*CuiResMgr::GetResMgr())
+#define CUI_RES(i) ResId(i,CUI_MGR())
+#define CUI_RESSTR(i) UniString(ResId(i,CUI_MGR()))
+#define CUI_RESSSTR(i) String(ResId(i,CUI_MGR()))
+
+#endif
+
diff --git a/svx/source/cui/dlgname.hxx b/cui/source/inc/dlgname.hxx
index ee78927e8931..ee78927e8931 100644
--- a/svx/source/cui/dlgname.hxx
+++ b/cui/source/inc/dlgname.hxx
diff --git a/svx/source/cui/dstribut.hxx b/cui/source/inc/dstribut.hxx
index 46d6a78115c1..46d6a78115c1 100644
--- a/svx/source/cui/dstribut.hxx
+++ b/cui/source/inc/dstribut.hxx
diff --git a/cui/source/inc/gallery.hrc b/cui/source/inc/gallery.hrc
new file mode 100644
index 000000000000..abc533e2e921
--- /dev/null
+++ b/cui/source/inc/gallery.hrc
@@ -0,0 +1,104 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: gallery.hrc,v $
+ * $Revision: 1.7 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#include <cuires.hrc>
+
+// Gallery-TabDialoge/-TabPages
+#define RID_SVXTABDLG_GALLERY (RID_CUI_GALLERY_START )
+#define RID_SVXTABDLG_GALLERYTHEME (RID_CUI_GALLERY_START + 2)
+#define RID_SVXDLG_GALLERY_TITLE (RID_CUI_GALLERY_START + 82)
+
+#define RID_SVXTABPAGE_GALLERY_GENERAL (RID_CUI_GALLERY_START + 1)
+#define RID_SVXTABPAGE_GALLERYTHEME_FILES (RID_CUI_GALLERY_START + 4)
+
+// Dialoge
+#define RID_SVXDLG_GALLERY_SEARCH_PROGRESS (RID_CUI_GALLERY_START + 6)
+#define RID_SVXDLG_GALLERY_TAKE_PROGRESS (RID_CUI_GALLERY_START + 7)
+#define RID_SVXDLG_GALLERY_ACTUALIZE_PROGRESS (RID_CUI_GALLERY_START + 8)
+#define RID_SVXDLG_GALLERY_THEMEID (RID_CUI_GALLERY_START + 9)
+
+// Gallery-Strings
+#define RID_SVXSTR_GALLERY_NOFILES (RID_CUI_GALLERY_START + 12)
+#define RID_SVXSTR_GALLERY_SEARCH (RID_CUI_GALLERY_START + 30)
+#define RID_SVXSTR_GALLERYPROPS_OBJECT (RID_CUI_GALLERY_START + 39)
+#define RID_SVXSTR_GALLERYPROPS_GALTHEME (RID_CUI_GALLERY_START + 40)
+#define RID_SVXSTR_GALLERY_READONLY (RID_CUI_GALLERY_START + 43)
+#define RID_SVXSTR_GALLERY_ALLFILES (RID_CUI_GALLERY_START + 44)
+#define RID_SVXSTR_GALLERY_ID_EXISTS (RID_CUI_GALLERY_START + 81)
+
+// Images
+#define RID_SVXBMP_THEME_NORMAL_BIG (RID_CUI_GALLERY_START + 49)
+#define RID_SVXBMP_THEME_IMPORTED_BIG (RID_CUI_GALLERY_START + 51)
+#define RID_SVXBMP_THEME_READONLY_BIG (RID_CUI_GALLERY_START + 53)
+#define RID_SVXBMP_THEME_DEFAULT_BIG (RID_CUI_GALLERY_START + 55)
+
+// lokale Defines
+#define BTN_OK 1
+#define BTN_CANCEL 1
+#define BTN_HELP 1
+
+#define LBX_FOUND 1
+#define BTN_TAKE 5
+#define BTN_SEARCH 4
+#define CBX_PREVIEW 3
+#define FT_FILETYPE 2
+#define CBB_FILETYPE 1
+#define FL_SEARCH_DIR 1
+#define FL_SEARCH_TYPE 2
+#define FT_SEARCH_DIR 1
+#define FT_SEARCH_TYPE 2
+#define FL_TAKE_PROGRESS 1
+#define FT_TAKE_FILE 1
+#define BTN_TAKEALL 1
+#define WND_BRSPRV 1
+#define BTN_MADDIN1 8
+#define BTN_MADDIN2 9
+
+#define FL_ACTUALIZE_PROGRESS 1
+#define FT_ACTUALIZE_FILE 1
+#define FL_ID 1
+#define LB_RESNAME 1
+#define EDT_TITLE 20
+#define FL_TITLE 21
+
+// Gallery-TabDialog
+#define FI_MS_IMAGE 1
+#define EDT_MS_NAME 1
+#define FL_MS_GENERAL_FIRST 1
+#define FT_MS_TYPE 2
+#define FT_MS_SHOW_TYPE 3
+#define FT_MS_PATH 4
+#define FT_MS_SHOW_PATH 5
+#define FT_MS_CONTENT 6
+#define FT_MS_SHOW_CONTENT 7
+#define FL_MS_GENERAL_SECOND 2
+#define FT_MS_CHANGEDATE 10
+#define FT_MS_SHOW_CHANGEDATE 11
+
+
diff --git a/svx/source/cui/grfpage.hxx b/cui/source/inc/grfpage.hxx
index 58ce4e5a5e63..58ce4e5a5e63 100644
--- a/svx/source/cui/grfpage.hxx
+++ b/cui/source/inc/grfpage.hxx
diff --git a/svx/source/cui/hangulhanjadlg.hxx b/cui/source/inc/hangulhanjadlg.hxx
index 7d637bed048d..6c87b8003479 100644
--- a/svx/source/cui/hangulhanjadlg.hxx
+++ b/cui/source/inc/hangulhanjadlg.hxx
@@ -31,9 +31,7 @@
#define SVX_HANGUL_HANJA_DLG_HXX
#include <vcl/dialog.hxx>
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
#include <vcl/lstbox.hxx>
#include <vcl/combobox.hxx>
#include <vcl/fixed.hxx>
@@ -41,7 +39,7 @@
#include <svx/checklbx.hxx>
#include <svx/hangulhanja.hxx>
#include <com/sun/star/uno/Sequence.hxx>
-#include "unolingu.hxx"
+#include <svx/unolingu.hxx>
#include <com/sun/star/linguistic2/XConversionDictionaryList.hpp>
#include <svtools/valueset.hxx>
diff --git a/svx/source/cui/headertablistbox.hxx b/cui/source/inc/headertablistbox.hxx
index 8738327b70bc..8738327b70bc 100755
--- a/svx/source/cui/headertablistbox.hxx
+++ b/cui/source/inc/headertablistbox.hxx
diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc
new file mode 100644
index 000000000000..ad0f7ad12a89
--- /dev/null
+++ b/cui/source/inc/helpid.hrc
@@ -0,0 +1,390 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: helpid.hrc,v $
+ * $Revision: 1.78 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef _CUI_HELPID_HRC
+#define _CUI_HELPID_HRC
+// include ---------------------------------------------------------------
+
+#include <svl/solar.hrc>
+
+// Help-Ids --------------------------------------------------------------
+
+#define HID_OPTIONS_COLOR (HID_CUI_START + 1)
+#define HID_OPTIONS_SAVE (HID_CUI_START + 2)
+#define HID_OPTIONS_PATH (HID_CUI_START + 3)
+#define HID_OPTIONS_GENERAL (HID_CUI_START + 4)
+#define HID_OPTIONS_LINGU (HID_CUI_START + 5)
+#define HID_OPTIONS_SPELL (HID_CUI_START + 6)
+#define HID_OPTIONS_DICT_NEW (HID_CUI_START + 7)
+#define HID_OPTIONS_DICT_EDIT (HID_CUI_START + 8)
+#define HID_OPTIONS_INET (HID_CUI_START + 9)
+#define HID_OPTIONS_CHART_DEFCOLORS (HID_CUI_START + 10)
+#define HID_OPTIONS_CTL (HID_CUI_START + 11)
+#define HID_OPTIONS_PROXY (HID_CUI_START + 12)
+#define HID_OPTIONS_SEARCH (HID_CUI_START + 13)
+#define HID_OPTIONS_MAIL (HID_CUI_START + 14)
+#define HID_OPTIONS_ASIAN_LAYOUT (HID_CUI_START + 15)
+#define HID_CLB_EDIT_MODULES_DICS (HID_CUI_START + 16)
+#define HID_CLB_EDIT_MODULES_MODULES (HID_CUI_START + 17)
+#define HID_CLB_LINGU_MODULES (HID_CUI_START + 18)
+#define HID_CLB_LINGU_OPTIONS (HID_CUI_START + 19)
+#define HID_EDIT_MODULES (HID_CUI_START + 20)
+#define HID_LNGDLG_NUM_PREBREAK (HID_CUI_START + 21)
+#define HID_OPTIONS_COLORCONFIG (HID_CUI_START + 22)
+#define HID_OPTIONS_COLORCONFIG_SAVE_SCHEME (HID_CUI_START + 23)
+#define HID_OPTIONS_ACCESSIBILITYCONFIG (HID_CUI_START + 24)
+#define HID_OPTIONS_COLORCONFIG_COLORLIST_WIN (HID_CUI_START + 25)
+#define HID_OPTIONS_COLORCONFIG_NAME_SCHEME (HID_CUI_START + 26)
+#define HID_OPTIONS_PATHS_SELECTFOLDER (HID_CUI_START + 27)
+#define HID_OPTIONS_JAVA (HID_CUI_START + 28)
+#define HID_OPTIONS_JAVA_LIST (HID_CUI_START + 29)
+#define HID_OPTIONS_JAVA_PARAMETER (HID_CUI_START + 30)
+#define HID_OPTIONS_JAVA_CLASSPATH (HID_CUI_START + 31)
+#define HID_SVXPAGE_JSEARCH_OPTIONS (HID_CUI_START + 32)
+#define HID_SVXDLG_FILTER_WARNING (HID_CUI_START + 33)
+#define HID_SVX_OPTIONS_ONLINEUPDATE (HID_CUI_START + 34)
+#define HID_DLG_SECURITY_OPTIONS (HID_CUI_START + 35)
+#define HID_OFADLG_OPTIONS_TREE (HID_CUI_START + 36)
+#define HID_OFA_CONNPOOL_DRIVERLIST (HID_CUI_START + 37)
+#define UID_OFA_CONNPOOL_DRIVERLIST_BACK (HID_CUI_START + 38)
+#define HID_OFA_FONT_SUBST_CLB (HID_CUI_START + 39)
+#define HID_OFA_TP_MISC (HID_CUI_START + 40)
+#define HID_OFA_TP_VIEW (HID_CUI_START + 41)
+#define HID_OFA_TP_LANGUAGES (HID_CUI_START + 42)
+#define HID_OFA_TP_MEMORY (HID_CUI_START + 43)
+#define HID_DBPATH_CTL_PATH (HID_CUI_START + 44)
+#define HID_DBPATH_HEADERBAR (HID_CUI_START + 45)
+#define HID_OFAPAGE_SMARTTAG_OPTIONS (HID_CUI_START + 46)
+#define HID_OFAPAGE_MSFLTR2_CLB (HID_CUI_START + 47)
+#define HID_OPTPATH_CTL_PATH (HID_CUI_START + 48)
+#define HID_OFADLG_TREELISTBOX (HID_CUI_START + 49)
+#define HID_DLG_WEBCONNECTION_INFO (HID_CUI_START + 50)
+#define HID_OPTIONS_DICT_EDIT_ENTRIES_LIST (HID_CUI_START + 51)
+#define HID_OPTPATH_HEADERBAR (HID_CUI_START + 52)
+#define HID_WARN_NAME_DUPLICATE (HID_CUI_START + 53)
+#define HID_COLORPAGE_LISTBOX_START (HID_CUI_START + 54)
+#define HID_COLORPAGE_DOCCOLOR_LB (HID_CUI_START + 54)
+#define HID_COLORPAGE_DOCBOUNDARIES_LB (HID_CUI_START + 55)
+#define HID_COLORPAGE_APPBACKGROUND_LB (HID_CUI_START + 56)
+#define HID_COLORPAGE_OBJECTBOUNDARIES_LB (HID_CUI_START + 57)
+#define HID_COLORPAGE_TABLEBOUNDARIES_LB (HID_CUI_START + 58)
+#define HID_COLORPAGE_FONTCOLOR_LB (HID_CUI_START + 59)
+#define HID_COLORPAGE_LINKS_LB (HID_CUI_START + 60)
+#define HID_COLORPAGE_LINKSVISITED_LB (HID_CUI_START + 61)
+#define HID_COLORPAGE_ANCHOR_LB (HID_CUI_START + 62)
+#define HID_COLORPAGE_SPELL_LB (HID_CUI_START + 63)
+#define HID_COLORPAGE_WRITERTEXTGRID_LB (HID_CUI_START + 64)
+#define HID_COLORPAGE_WRITERFIELDSHADINGS_LB (HID_CUI_START + 65)
+#define HID_COLORPAGE_WRITERIDXSHADINGS_LB (HID_CUI_START + 66)
+#define HID_COLORPAGE_WRITERDIRECTCURSOR_LB (HID_CUI_START + 67)
+#define HID_COLORPAGE_WRITERNOTESINDICATOR_LB (HID_CUI_START + 68)
+#define HID_COLORPAGE_WRITERSCRIPTINDICATOR_LB (HID_CUI_START + 69)
+#define HID_COLORPAGE_WRITERSECTIONBOUNDARIES_LB (HID_CUI_START + 70)
+#define HID_COLORPAGE_WRITERPAGEBREAKS_LB (HID_CUI_START + 71)
+#define HID_COLORPAGE_HTMLSGML_LB (HID_CUI_START + 72)
+#define HID_COLORPAGE_HTMLCOMMENT_LB (HID_CUI_START + 73)
+#define HID_COLORPAGE_HTMLKEYWORD_LB (HID_CUI_START + 74)
+#define HID_COLORPAGE_HTMLUNKNOWN_LB (HID_CUI_START + 75)
+#define HID_COLORPAGE_CALCGRID_LB (HID_CUI_START + 76)
+#define HID_COLORPAGE_CALCPAGEBREAK_LB (HID_CUI_START + 77)
+#define HID_COLORPAGE_CALCPAGEBREAKMANUAL_LB (HID_CUI_START + 78)
+#define HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_LB (HID_CUI_START + 79)
+#define HID_COLORPAGE_CALCDETECTIVE_LB (HID_CUI_START + 80)
+#define HID_COLORPAGE_CALCDETECTIVEERROR_LB (HID_CUI_START + 81)
+#define HID_COLORPAGE_CALCREFERENCE_LB (HID_CUI_START + 82)
+#define HID_COLORPAGE_CALCNOTESBACKGROUND_LB (HID_CUI_START + 83)
+#define HID_COLORPAGE_DRAWGRID_LB (HID_CUI_START + 84)
+#define HID_COLORPAGE_DRAWDRAWING_LB (HID_CUI_START + 85)
+#define HID_COLORPAGE_DRAWFILL_LB (HID_CUI_START + 86)
+#define HID_COLORPAGE_BASICIDENTIFIER_LB (HID_CUI_START + 87)
+#define HID_COLORPAGE_BASICCOMMENT_LB (HID_CUI_START + 88)
+#define HID_COLORPAGE_BASICNUMBER_LB (HID_CUI_START + 89)
+#define HID_COLORPAGE_BASICSTRING_LB (HID_CUI_START + 90)
+#define HID_COLORPAGE_BASICOPERATOR_LB (HID_CUI_START + 91)
+#define HID_COLORPAGE_BASICKEYWORD_LB (HID_CUI_START + 92)
+#define HID_COLORPAGE_BASICERROR_LB (HID_CUI_START + 93)
+#define HID_COLORPAGE_CHECKBOX_START (HID_CUI_START + 94)
+#define HID_COLORPAGE_DOCCOLOR_CB (HID_CUI_START + 94)
+#define HID_COLORPAGE_DOCBOUNDARIES_CB (HID_CUI_START + 95)
+#define HID_COLORPAGE_APPBACKGROUND_CB (HID_CUI_START + 96)
+#define HID_COLORPAGE_OBJECTBOUNDARIES_CB (HID_CUI_START + 97)
+#define HID_COLORPAGE_TABLEBOUNDARIES_CB (HID_CUI_START + 98)
+#define HID_COLORPAGE_FONTCOLOR_CB (HID_CUI_START + 99)
+#define HID_COLORPAGE_LINKS_CB (HID_CUI_START + 100)
+#define HID_COLORPAGE_LINKSVISITED_CB (HID_CUI_START + 101)
+#define HID_COLORPAGE_ANCHOR_CB (HID_CUI_START + 102)
+#define HID_COLORPAGE_SPELL_CB (HID_CUI_START + 103)
+#define HID_COLORPAGE_WRITERTEXTGRID_CB (HID_CUI_START + 104)
+#define HID_COLORPAGE_WRITERFIELDSHADINGS_CB (HID_CUI_START + 105)
+#define HID_COLORPAGE_WRITERIDXSHADINGS_CB (HID_CUI_START + 106)
+#define HID_COLORPAGE_WRITERDIRECTCURSOR_CB (HID_CUI_START + 107)
+#define HID_COLORPAGE_WRITERNOTESINDICATOR_CB (HID_CUI_START + 108)
+#define HID_COLORPAGE_WRITERSCRIPTINDICATOR_CB (HID_CUI_START + 109)
+#define HID_COLORPAGE_WRITERSECTIONBOUNDARIES_CB (HID_CUI_START + 110)
+#define HID_COLORPAGE_WRITERPAGEBREAKS_CB (HID_CUI_START + 111)
+#define HID_COLORPAGE_HTMLSGML_CB (HID_CUI_START + 112)
+#define HID_COLORPAGE_HTMLCOMMENT_CB (HID_CUI_START + 113)
+#define HID_COLORPAGE_HTMLKEYWORD_CB (HID_CUI_START + 114)
+#define HID_COLORPAGE_HTMLUNKNOWN_CB (HID_CUI_START + 115)
+#define HID_COLORPAGE_CALCGRID_CB (HID_CUI_START + 116)
+#define HID_COLORPAGE_CALCPAGEBREAK_CB (HID_CUI_START + 117)
+#define HID_COLORPAGE_CALCPAGEBREAKMANUAL_CB (HID_CUI_START + 118)
+#define HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_CB (HID_CUI_START + 119)
+#define HID_COLORPAGE_CALCDETECTIVE_CB (HID_CUI_START + 120)
+#define HID_COLORPAGE_CALCDETECTIVEERROR_CB (HID_CUI_START + 121)
+#define HID_COLORPAGE_CALCREFERENCE_CB (HID_CUI_START + 122)
+#define HID_COLORPAGE_CALCNOTESBACKGROUND_CB (HID_CUI_START + 123)
+#define HID_COLORPAGE_DRAWGRID_CB (HID_CUI_START + 124)
+#define HID_COLORPAGE_DRAWDRAWING_CB (HID_CUI_START + 125)
+#define HID_COLORPAGE_DRAWFILL_CB (HID_CUI_START + 126)
+#define HID_COLORPAGE_BASICIDENTIFIER_CB (HID_CUI_START + 127)
+#define HID_COLORPAGE_BASICCOMMENT_CB (HID_CUI_START + 128)
+#define HID_COLORPAGE_BASICNUMBER_CB (HID_CUI_START + 129)
+#define HID_COLORPAGE_BASICSTRING_CB (HID_CUI_START + 130)
+#define HID_COLORPAGE_BASICOPERATOR_CB (HID_CUI_START + 131)
+#define HID_COLORPAGE_BASICKEYWORD_CB (HID_CUI_START + 132)
+#define HID_COLORPAGE_BASICERROR_CB (HID_CUI_START + 133)
+#define HID_NUMBERINGOPT_SEL_GRF_FROM_FILE (HID_CUI_START + 134)
+#define HID_SVX_MACRO_LB_EVENT (HID_CUI_START + 135)
+#define HID_SVX_CONFIG_EVENT (HID_CUI_START + 136)
+#define HID_CONFIG_EVENT_OFFICE_BASED (HID_CUI_START + 137)
+#define HID_CONFIG_EVENT_DOCUMENT_BASED (HID_CUI_START + 138)
+#define HID_SELECTOR_DIALOG (HID_CUI_START + 139)
+#define HID_SELECTOR_CATEGORIES (HID_CUI_START + 140)
+#define HID_SVX_CONFIG_TOOLBAR (HID_CUI_START + 141)
+#define HID_SVX_CONFIG_TOOLBAR_CONTENTS (HID_CUI_START + 142)
+#define HID_SELECTOR_COMMANDS (HID_CUI_START + 143)
+#define HID_GALLERY_EDIT_MSNAME (HID_CUI_START + 144)
+#define HID_SVX_CONFIG_MENU (HID_CUI_START + 145)
+#define HID_SVX_CONFIG_MENU_CONTENTS (HID_CUI_START + 146)
+#define HID_GALLERY_NEWTHEME_FINDFILES (HID_CUI_START + 147)
+#define HID_GALLERY_NEWTHEME_ADDFILES (HID_CUI_START + 148)
+#define HID_HANGULDLG_BUTTON_OPTIONS (HID_CUI_START + 149)
+#define HID_HANGULDLG_BUTTON_CLOSE (HID_CUI_START + 150)
+#define HID_HANGULDLG_BUTTON_IGNORE (HID_CUI_START + 151)
+#define HID_HANGULDLG_BUTTON_IGNOREALL (HID_CUI_START + 152)
+#define HID_HANGULDLG_BUTTON_CHANGE (HID_CUI_START + 153)
+#define HID_HANGULDLG_BUTTON_CHANGEALL (HID_CUI_START + 154)
+#define HID_OFA_FONT_SUBSTITUTION (HID_CUI_START + 155)
+#define HID_HANGULDLG_EDIT_NEWWORD (HID_CUI_START + 156)
+#define HID_OFA_SUBST_APPLY (HID_CUI_START + 157)
+#define HID_OFA_SUBST_DELETE (HID_CUI_START + 158)
+#define HID_SPLDLG_BUTTON_CLOSE (HID_CUI_START + 159)
+#define HID_SPLDLG_BUTTON_IGNORE (HID_CUI_START + 160)
+#define HID_SPLDLG_BUTTON_IGNOREALL (HID_CUI_START + 161)
+#define HID_SPLDLG_BUTTON_CHANGE (HID_CUI_START + 162)
+#define HID_SPLDLG_BUTTON_CHANGEALL (HID_CUI_START + 163)
+#define HID_SPLDLG_BUTTON_EXPLAIN (HID_CUI_START + 164)
+#define HID_CHARMAP_CTL_SHOWSET (HID_CUI_START + 165)
+#define HID_CHARMAP_CTL_SHOWTEXT (HID_CUI_START + 166)
+#define HID_CHARMAP_CTL_SHOWCHAR (HID_CUI_START + 167)
+#define HID_DLG_NAME (HID_CUI_START + 168)
+#define HID_DLG_MESSBOX (HID_CUI_START + 169)
+#define HID_HANGULDLG_SUGGESTIONS (HID_CUI_START + 170)
+#define HID_HANGULDLG_SUGGESTIONS_GRID (HID_CUI_START + 171)
+#define HID_HANGULDLG_SUGGESTIONS_LIST (HID_CUI_START + 172)
+#define HID_DLG_OBJECT_NAME (HID_CUI_START + 173)
+#define HID_DLG_OBJECT_TITLE_DESC (HID_CUI_START + 174)
+#define HID_SVX_CONFIG_MENU_ORGANIZER (HID_CUI_START + 175)
+#define HID_SVX_CONFIG_ICON_SELECTOR (HID_CUI_START + 176)
+#define HID_SVX_CONFIG_NAME_SUBMENU (HID_CUI_START + 177)
+#define HID_SVX_CONFIG_RENAME_MENU (HID_CUI_START + 178)
+#define HID_SVX_CONFIG_RENAME_MENU_ITEM (HID_CUI_START + 179)
+#define HID_SVX_CONFIG_RENAME_TOOLBAR (HID_CUI_START + 180)
+#define HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM (HID_CUI_START + 181)
+#define HID_SVX_NEW_TOOLBAR (HID_CUI_START + 182)
+#define HID_SVX_MODIFY_TOOLBAR (HID_CUI_START + 183)
+#define HID_SVX_NEW_TOOLBAR_ITEM (HID_CUI_START + 184)
+#define HID_SVX_CONFIG_MENU_LISTBOX (HID_CUI_START + 185)
+#define HID_SVX_MODIFY_TOOLBAR_ITEM (HID_CUI_START + 186)
+#define HID_SVX_SAVE_IN (HID_CUI_START + 187)
+#define HID_OPTIONS_MULTIPATH_LIST (HID_CUI_START + 188)
+#define HID_FM_DLG_SEARCH (HID_CUI_START + 189)
+#define HID_SEARCH_TEXT (HID_CUI_START + 190)
+#define HID_SEARCH_ALLFIELDS (HID_CUI_START + 191)
+#define HID_GALLERY_PROPERTIES_GENERAL (HID_CUI_START + 192)
+#define HID_SEARCH_FIELDSELECTION (HID_CUI_START + 193)
+#define HID_SEARCH_POSITION (HID_CUI_START + 194)
+#define HID_SEARCH_FORMATTER (HID_CUI_START + 195)
+#define HID_SEARCH_CASE (HID_CUI_START + 196)
+#define HID_SEARCH_BACKWARD (HID_CUI_START + 197)
+#define HID_SEARCH_STARTOVER (HID_CUI_START + 198)
+#define HID_SEARCH_WILDCARD (HID_CUI_START + 199)
+#define HID_SEARCH_REGULAR (HID_CUI_START + 200)
+#define HID_SEARCH_APPROX (HID_CUI_START + 201)
+#define HID_SEARCH_APPROXSETTINGS (HID_CUI_START + 202)
+#define HID_SEARCH_BTN_SEARCH (HID_CUI_START + 203)
+#define HID_SEARCH_BTN_CLOSE (HID_CUI_START + 204)
+#define HID_GALLERY_BROWSER (HID_CUI_START + 205)
+#define HID_GALLERY_SEARCH (HID_CUI_START + 206)
+#define HID_GALLERY_APPLY (HID_CUI_START + 207)
+#define HID_SPLDLG_BUTTON_IGNORERULE (HID_CUI_START + 208)
+#define HID_CONFIG_ACCEL (HID_CUI_START + 209)
+#define HID_ACCELCONFIG_LISTBOX (HID_CUI_START + 210)
+#define HID_CONFIGGROUP_ACC_LISTBOX (HID_CUI_START + 211)
+#define HID_CONFIGFUNCTION_ACC_LISTBOX (HID_CUI_START + 212)
+#define HID_MACRO_LB_EVENT (HID_CUI_START + 213)
+#define HID_MACRO_GROUP (HID_CUI_START + 214)
+#define HID_MACRO_MACROS (HID_CUI_START + 215)
+#define HID_DIALOG_HANGULHANJA (HID_CUI_START + 216)
+#define HID_HANGULHANJA_OPT_DLG (HID_CUI_START + 217)
+#define HID_HANGULHANJA_NEWDICT_DLG (HID_CUI_START + 218)
+#define HID_HANGULHANJA_EDIT_DLG (HID_CUI_START + 219)
+#define HID_HANGULHANJA_OPT_DICTS_LB (HID_CUI_START + 220)
+#define HID_MULTIPATH (HID_CUI_START + 221)
+#define HID_SCRIPTORG_DIALOG (HID_CUI_START + 222)
+#define HID_SCRIPTSBOX (HID_CUI_START + 223)
+#define HID_SPELLCHECK (HID_CUI_START + 224)
+#define HID_TPSIZE_CTRL (HID_CUI_START + 225)
+#define HID_TPROTATION_CTRL1 (HID_CUI_START + 226)
+#define HID_TPROTATION_CTRL2 (HID_CUI_START + 227)
+#define HID_TRANS_ANGLE (HID_CUI_START + 228)
+#define HID_TPPOSITION_CTRL (HID_CUI_START + 229)
+#define HID_NUMBERFORMAT_LB_FORMAT (HID_CUI_START + 230)
+#define HID_NUMBERFORMAT_WND_NUMBER_PREVIEW (HID_CUI_START + 231)
+#define HID_TRANS_SLANT (HID_CUI_START + 232)
+#define HID_TPHATCH_CTRL (HID_CUI_START + 233)
+#define HID_SEARCHATTR_CTL_ATTR (HID_CUI_START + 234)
+#define HID_NUMBERFORMAT_TBI_INFO (HID_CUI_START + 235)
+#define HID_SEARCHATTR (HID_CUI_START + 236)
+#define HID_ALIGNMENT_CTR_DIAL (HID_CUI_START + 237)
+#define HID_ALIGNMENT_CTR_BORDER_LOCK (HID_CUI_START + 238)
+#define HID_SEARCHSIMILARITY (HID_CUI_START + 239)
+#define UID_SEARCH_RECORDSTATUS (HID_CUI_START + 240)
+#define HID_OFAPAGE_AUTOCORR_CLB (HID_CUI_START + 241)
+#define HID_AUTOCORR_LANGUAGE (HID_CUI_START + 242)
+#define HID_OFAPAGE_AUTOFORMAT_CLB (HID_CUI_START + 243)
+#define HID_TPCOLOR_RGB_1 (HID_CUI_START + 244)
+#define HID_TPCOLOR_RGB_2 (HID_CUI_START + 245)
+#define HID_TPCOLOR_RGB_3 (HID_CUI_START + 246)
+#define HID_TPCOLOR_CMYK_1 (HID_CUI_START + 247)
+#define HID_TPCOLOR_CMYK_2 (HID_CUI_START + 248)
+#define HID_TPCOLOR_CMYK_3 (HID_CUI_START + 249)
+#define HID_ALIGNMENT (HID_CUI_START + 250)
+#define HID_OFAPAGE_AUTOCORR_OPTIONS (HID_CUI_START + 251)
+#define HID_OFAPAGE_AUTOFMT_OPTIONS (HID_CUI_START + 252)
+#define HID_OFAPAGE_AUTOCORR_REPLACE (HID_CUI_START + 253)
+#define HID_OFACTL_AUTOCORR_REPLACE (HID_CUI_START + 254)
+#define HID_OFAPAGE_AUTOCORR_EXCEPT (HID_CUI_START + 255)
+#define HID_OFAPAGE_AUTOCORR_QUOTE (HID_CUI_START + 256)
+#define HID_OFAPAGE_AUTOCOMPLETE_OPTIONS (HID_CUI_START + 257)
+#define HID_BACKGROUND (HID_CUI_START + 258)
+#define HID_BACKGROUND_CTL_BGDCOLORSET (HID_CUI_START + 259)
+#define HID_BACKGROUND_CTL_POSITION (HID_CUI_START + 260)
+#define HID_BORDER (HID_CUI_START + 261)
+#define HID_BORDER_CTL_PRESETS (HID_CUI_START + 262)
+#define HID_BORDER_CTL_SHADOWS (HID_CUI_START + 263)
+#define HID_PAGE_CONNECTION (HID_CUI_START + 264)
+#define HID_PAGE_CONNECTION_CTL_PREVIEW (HID_CUI_START + 265)
+#define HID_PAGE_DISTRIBUTE (HID_CUI_START + 266)
+#define HID_SVXPAGE_GRFCROP (HID_CUI_START + 267)
+#define HID_CAPTION (HID_CUI_START + 268)
+#define HID_CAPTION_CTL_TYPE (HID_CUI_START + 269)
+#define HID_PAGE_MEASURE (HID_CUI_START + 270)
+#define HID_MEASURE_CTL_POSITION (HID_CUI_START + 271)
+#define HID_NUMBERFORMAT (HID_CUI_START + 272)
+#define HID_NUMBERFORMAT_TBI_ADD (HID_CUI_START + 273)
+#define HID_NUMBERFORMAT_TBI_REMOVE (HID_CUI_START + 274)
+#define HID_FORMAT_PAGE (HID_CUI_START + 275)
+#define HID_REDLINING_DLG (HID_CUI_START + 276)
+#define HID_REDLINING_EDIT (HID_CUI_START + 277)
+#define HID_REDLINING_PREV (HID_CUI_START + 278)
+#define HID_REDLINING_NEXT (HID_CUI_START + 279)
+#define HID_FORMAT_PARAGRAPH_STD (HID_CUI_START + 280)
+#define HID_VALUESET_SINGLENUM (HID_CUI_START + 281)
+#define HID_VALUESET_BULLET (HID_CUI_START + 282)
+#define HID_VALUESET_NUM (HID_CUI_START + 283)
+#define HID_VALUESET_NUMBMP (HID_CUI_START + 284)
+#define HID_SVXPAGE_PICK_NUM (HID_CUI_START + 285)
+#define HID_SVXPAGE_PICK_SINGLE_NUM (HID_CUI_START + 286)
+#define HID_SVXPAGE_PICK_BMP (HID_CUI_START + 287)
+#define HID_SVXPAGE_PICK_BULLET (HID_CUI_START + 288)
+#define HID_SVXPAGE_NUM_OPTIONS (HID_CUI_START + 289)
+#define HID_SVXPAGE_NUM_POSITION (HID_CUI_START + 290)
+#define HID_MEASURE_CTL_PREVIEW (HID_CUI_START + 291)
+#define HID_FORMAT_PARAGRAPH_EXT (HID_CUI_START + 292)
+#define HID_FORMAT_PARAGRAPH_ALIGN (HID_CUI_START + 293)
+#define HID_SVXPAGE_PARA_ASIAN (HID_CUI_START + 294)
+#define HID_SVXPAGE_SWPOSSIZE (HID_CUI_START + 295)
+#define HID_AREA_TRANSPARENCE (HID_CUI_START + 296)
+#define HID_AREA_AREA (HID_CUI_START + 297)
+#define HID_AREA_SHADOW (HID_CUI_START + 298)
+#define HID_AREA_HATCH (HID_CUI_START + 299)
+#define HID_AREA_BITMAP (HID_CUI_START + 300)
+#define HID_TPSHADOW_CTRL (HID_CUI_START + 301)
+#define HID_AREA_GRADIENT (HID_CUI_START + 302)
+#define HID_LINE_ENDDEF (HID_CUI_START + 303)
+#define HID_LINE_LINE (HID_CUI_START + 304)
+#define HID_LINE_DEF (HID_CUI_START + 305)
+#define HID_SPELLDLG_SETWORD (HID_CUI_START + 306)
+#define HID_TABULATOR (HID_CUI_START + 307)
+#define HID_PAGE_TEXTATTR (HID_CUI_START + 308)
+#define HID_TEXTATTR_CTL_POSITION (HID_CUI_START + 309)
+#define HID_TRANS_POSITION_SIZE (HID_CUI_START + 310)
+// free
+#define HID_SVXPAGE_CHAR_NAME (HID_CUI_START + 312)
+#define HID_SVXPAGE_CHAR_EFFECTS (HID_CUI_START + 313)
+#define HID_SVXPAGE_CHAR_POSITION (HID_CUI_START + 314)
+#define HID_HYPERLINK_INTERNET (HID_CUI_START + 315)
+#define HID_HYPERLINK_MAIL (HID_CUI_START + 316)
+#define HID_HYPERLINK_DOCUMENT (HID_CUI_START + 317)
+#define HID_HYPERLINK_NEWDOCUMENT (HID_CUI_START + 318)
+#define HID_HYPERLINK_MARKWND (HID_CUI_START + 319)
+#define HID_ICCDIALOG_RESET_BTN (HID_CUI_START + 320)
+#define HID_ICCDIALOG_CHOICECTRL (HID_CUI_START + 321)
+#define HID_HYPERDLG_INET_PATH (HID_CUI_START + 322)
+#define HID_HYPERDLG_MAIL_PATH (HID_CUI_START + 323)
+#define HID_HYPERDLG_DOC_PATH (HID_CUI_START + 324)
+#define HID_ICCDIALOG_OK_BTN (HID_CUI_START + 325)
+#define HID_ICCDIALOG_CANCEL_BTN (HID_CUI_START + 326)
+#define HID_HYPERLINK_MARKWND_APPLY (HID_CUI_START + 327)
+#define HID_HYPERLINK_MARKWND_CLOSE (HID_CUI_START + 328)
+#define HID_HYPERLINK_MARKWND_TREE (HID_CUI_START + 329)
+#define HID_SVXPAGE_CHAR_TWOLINES (HID_CUI_START + 330)
+#define HID_GRFFILTER_EMBOSS_LIGHT (HID_CUI_START + 331)
+#define HID_PASTE_DLG (HID_CUI_START + 333)
+#define HID_LINKDLG_TABLB (HID_CUI_START + 334)
+#define HID_MACRO_HEADERTABLISTBOX (HID_CUI_START + 335)
+#define HID_GALLERY_ENTER_TITLE (HID_CUI_START + 336)
+#define HID_GALLERY_TITLE_EDIT (HID_CUI_START + 337)
+
+// please adjust ACT_SVX_HID_END2 below if you add entries here!
+
+// -----------------------------------------------------------------------
+// Overrun check ---------------------------------------------------------
+// -----------------------------------------------------------------------
+
+#define ACT_CUI_HID_END HID_CUI_START + 337
+
+#if ACT_CUI_HID_END > HID_CUI_END
+#error Resource-Ueberlauf in #line, #file
+#endif
+
+#endif
+
diff --git a/svx/source/cui/hldocntp.hxx b/cui/source/inc/hldocntp.hxx
index c9f220c0df6f..c9f220c0df6f 100644
--- a/svx/source/cui/hldocntp.hxx
+++ b/cui/source/inc/hldocntp.hxx
diff --git a/svx/source/cui/hldoctp.hxx b/cui/source/inc/hldoctp.hxx
index 1e3dae701e7b..1e3dae701e7b 100644
--- a/svx/source/cui/hldoctp.hxx
+++ b/cui/source/inc/hldoctp.hxx
diff --git a/svx/source/cui/hlinettp.hxx b/cui/source/inc/hlinettp.hxx
index 04fe1fb6f7a6..19ddae5f6e0b 100644
--- a/svx/source/cui/hlinettp.hxx
+++ b/cui/source/inc/hlinettp.hxx
@@ -30,7 +30,7 @@
#ifndef _SVX_TABPAGE_INET_HYPERLINK_HXX
#define _SVX_TABPAGE_INET_HYPERLINK_HXX
-#include <hyperdlg.hxx>
+#include <svx/hyperdlg.hxx>
#include "cuihyperdlg.hxx"
#include "hltpbase.hxx"
diff --git a/svx/source/cui/hlmailtp.hxx b/cui/source/inc/hlmailtp.hxx
index 797695b09e00..797695b09e00 100644
--- a/svx/source/cui/hlmailtp.hxx
+++ b/cui/source/inc/hlmailtp.hxx
diff --git a/svx/source/inc/hlmarkwn.hxx b/cui/source/inc/hlmarkwn.hxx
index 6853eac1ccb6..6853eac1ccb6 100644
--- a/svx/source/inc/hlmarkwn.hxx
+++ b/cui/source/inc/hlmarkwn.hxx
diff --git a/svx/inc/hlmarkwn_def.hxx b/cui/source/inc/hlmarkwn_def.hxx
index a668737411a6..a668737411a6 100644
--- a/svx/inc/hlmarkwn_def.hxx
+++ b/cui/source/inc/hlmarkwn_def.hxx
diff --git a/svx/source/cui/hltpbase.hxx b/cui/source/inc/hltpbase.hxx
index 71bb37eade02..3f0306659b83 100644
--- a/svx/source/cui/hltpbase.hxx
+++ b/cui/source/inc/hltpbase.hxx
@@ -35,16 +35,14 @@
#include <sfx2/app.hxx>
#include <sfx2/tabdlg.hxx>
#include <vcl/group.hxx>
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
#include <vcl/fixed.hxx>
#include <vcl/combobox.hxx>
#include <vcl/edit.hxx>
#include <vcl/lstbox.hxx>
#include <tools/urlobj.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/stritem.hxx>
+#include <svl/eitem.hxx>
#include <svtools/transfer.hxx>
#include <sfx2/dispatch.hxx>
#include <vcl/msgbox.hxx>
@@ -52,17 +50,12 @@
#include <svtools/inettbc.hxx>
#include <vcl/timer.hxx>
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
#include <sfx2/docfile.hxx>
-#include <svx/dialogs.hrc>
-
+#include <cuires.hrc>
#include <com/sun/star/frame/XFrame.hpp>
-
-#ifndef _SVX_HELPID_HRC
#include "helpid.hrc"
-#endif
-
-#include "hlnkitem.hxx"
+#include <svx/hlnkitem.hxx>
#include "hlmarkwn.hxx"
#include "iconcdlg.hxx"
diff --git a/svx/source/cui/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx
index 771080a5aaac..ea74b4a66075 100644
--- a/svx/source/cui/iconcdlg.hxx
+++ b/cui/source/inc/iconcdlg.hxx
@@ -38,8 +38,8 @@
#endif
#include <vcl/image.hxx>
#include <svtools/ivctrl.hxx>
-#include <svtools/itempool.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itempool.hxx>
+#include <svl/itemset.hxx>
#include <tools/list.hxx>
#include <tools/string.hxx>
diff --git a/svx/source/cui/insdlg.hxx b/cui/source/inc/insdlg.hxx
index 1924b5ca8c7a..1924b5ca8c7a 100644
--- a/svx/source/cui/insdlg.hxx
+++ b/cui/source/inc/insdlg.hxx
diff --git a/svx/source/cui/insrc.hxx b/cui/source/inc/insrc.hxx
index e187313bdd03..e187313bdd03 100644
--- a/svx/source/cui/insrc.hxx
+++ b/cui/source/inc/insrc.hxx
diff --git a/svx/source/cui/internationaloptions.hxx b/cui/source/inc/internationaloptions.hxx
index d17625ee380e..d17625ee380e 100644
--- a/svx/source/cui/internationaloptions.hxx
+++ b/cui/source/inc/internationaloptions.hxx
diff --git a/svx/source/cui/labdlg.hxx b/cui/source/inc/labdlg.hxx
index 9581fbf9ba78..9581fbf9ba78 100644
--- a/svx/source/cui/labdlg.hxx
+++ b/cui/source/inc/labdlg.hxx
diff --git a/svx/source/cui/linkdlg.hxx b/cui/source/inc/linkdlg.hxx
index 4703079c9420..4703079c9420 100644
--- a/svx/source/cui/linkdlg.hxx
+++ b/cui/source/inc/linkdlg.hxx
diff --git a/svx/source/cui/macroass.hxx b/cui/source/inc/macroass.hxx
index da4fc49e4596..a41bd0d8da98 100755
--- a/svx/source/cui/macroass.hxx
+++ b/cui/source/inc/macroass.hxx
@@ -34,7 +34,7 @@
#include <sfx2/basedlgs.hxx>
#include <sfx2/tabdlg.hxx>
-#include <svtools/macitem.hxx>
+#include <svl/macitem.hxx>
#include <vcl/lstbox.hxx>
#include <com/sun/star/frame/XFrame.hpp>
diff --git a/svx/source/cui/macropg.hxx b/cui/source/inc/macropg.hxx
index 37f714028c82..0ed414e92751 100644
--- a/svx/source/cui/macropg.hxx
+++ b/cui/source/inc/macropg.hxx
@@ -37,7 +37,7 @@
#include <com/sun/star/util/XModifiable.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/uno/Reference.hxx>
-#include <svtools/macitem.hxx>
+#include <svl/macitem.hxx>
#ifndef _LSTBOX_HXX //autogen
#include <vcl/lstbox.hxx>
#endif
diff --git a/svx/source/cui/measure.hxx b/cui/source/inc/measure.hxx
index 1c51d94767c8..71f665bea750 100644
--- a/svx/source/cui/measure.hxx
+++ b/cui/source/inc/measure.hxx
@@ -35,10 +35,8 @@
#include <vcl/fixed.hxx>
#include <vcl/group.hxx>
#include <sfx2/basedlgs.hxx>
-#ifndef _SVX_DLGCTRL_HXX
#include <svx/dlgctrl.hxx>
-#endif
-#include "measctrl.hxx"
+#include <svx/measctrl.hxx>
class SdrView;
diff --git a/svx/source/cui/multifil.hxx b/cui/source/inc/multifil.hxx
index 242e28c17707..242e28c17707 100644
--- a/svx/source/cui/multifil.hxx
+++ b/cui/source/inc/multifil.hxx
diff --git a/svx/source/cui/multipat.hxx b/cui/source/inc/multipat.hxx
index e7fd86799955..e7fd86799955 100644
--- a/svx/source/cui/multipat.hxx
+++ b/cui/source/inc/multipat.hxx
diff --git a/svx/source/cui/newtabledlg.hxx b/cui/source/inc/newtabledlg.hxx
index 9d29152a656f..9d29152a656f 100644
--- a/svx/source/cui/newtabledlg.hxx
+++ b/cui/source/inc/newtabledlg.hxx
diff --git a/svx/source/cui/numfmt.hxx b/cui/source/inc/numfmt.hxx
index e14f397cf0ba..0c2b42d64150 100644
--- a/svx/source/cui/numfmt.hxx
+++ b/cui/source/inc/numfmt.hxx
@@ -36,28 +36,13 @@
#include <tools/color.hxx>
#include <tools/string.hxx>
#include <sfx2/tabdlg.hxx>
-
-#ifndef _FIXED_HXX //autogen
#include <vcl/fixed.hxx>
-#endif
-
-#ifndef _LSTBOX_HXX //autogen
#include <vcl/lstbox.hxx>
-#endif
-
-#ifndef _EDIT_HXX //autogen
#include <vcl/edit.hxx>
-#endif
-
-#ifndef _TOOLBOX_HXX //autogen
#include <vcl/toolbox.hxx>
-#endif
-
-#ifndef _FIELD_HXX //autogen
#include <vcl/field.hxx>
-#endif
#include <svx/langbox.hxx>
-#include "fontlb.hxx"
+#include <svx/fontlb.hxx>
//CHINA001 #define SVX_NUMVAL_STANDARD -1234.12345678901234
//CHINA001 #define SVX_NUMVAL_CURRENCY -1234
diff --git a/svx/source/cui/numpages.hxx b/cui/source/inc/numpages.hxx
index 9e3447228b45..a5d8a212d48e 100644
--- a/svx/source/cui/numpages.hxx
+++ b/cui/source/inc/numpages.hxx
@@ -43,7 +43,7 @@
#include <svx/numdef.hxx>
#endif
#include <svtools/ctrlbox.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
// -----------------------------------------------------------------------
class SvxNumRule;
diff --git a/svx/source/cui/optasian.hxx b/cui/source/inc/optasian.hxx
index 98c142031cd2..98c142031cd2 100644
--- a/svx/source/cui/optasian.hxx
+++ b/cui/source/inc/optasian.hxx
diff --git a/svx/source/cui/optdict.hxx b/cui/source/inc/optdict.hxx
index b09c1d1e773e..b09c1d1e773e 100644
--- a/svx/source/cui/optdict.hxx
+++ b/cui/source/inc/optdict.hxx
diff --git a/svx/inc/svx/optimprove.hxx b/cui/source/inc/optimprove.hxx
index 61f184239e88..61f184239e88 100644
--- a/svx/inc/svx/optimprove.hxx
+++ b/cui/source/inc/optimprove.hxx
diff --git a/svx/inc/svx/optlingu.hxx b/cui/source/inc/optlingu.hxx
index 6c2a0a7ac528..6c2a0a7ac528 100644
--- a/svx/inc/svx/optlingu.hxx
+++ b/cui/source/inc/optlingu.hxx
diff --git a/svx/source/cui/optpath.hxx b/cui/source/inc/optpath.hxx
index c05b0b778c58..c05b0b778c58 100644
--- a/svx/source/cui/optpath.hxx
+++ b/cui/source/inc/optpath.hxx
diff --git a/svx/source/cui/page.hxx b/cui/source/inc/page.hxx
index a1fae0536af8..1b716aedfd46 100644
--- a/svx/source/cui/page.hxx
+++ b/cui/source/inc/page.hxx
@@ -32,31 +32,16 @@
#include <sfx2/tabdlg.hxx>
-
-#ifndef _FIELD_HXX //autogen
#include <vcl/field.hxx>
-#endif
-
-#ifndef _FIXED_HXX //autogen
#include <vcl/fixed.hxx>
-#endif
-
-#ifndef _GROUP_HXX //autogen
#include <vcl/group.hxx>
-#endif
-
-#ifndef _LSTBOX_HXX //autogen
#include <vcl/lstbox.hxx>
-#endif
#include <svtools/stdctrl.hxx>
#include <svx/pagectrl.hxx>
#include <svx/frmdirlbox.hxx>
-
#include <svx/svxenum.hxx>
-
#include <i18npool/paper.hxx>
-
-#include "flagsdef.hxx" //CHINA001
+#include <svx/flagsdef.hxx>
// enum ------------------------------------------------------------------
diff --git a/svx/source/cui/paragrph.hxx b/cui/source/inc/paragrph.hxx
index c75869747ee2..baadcaecb0ea 100644
--- a/svx/source/cui/paragrph.hxx
+++ b/cui/source/inc/paragrph.hxx
@@ -32,21 +32,15 @@
// include ---------------------------------------------------------------
-#ifndef _BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
-#ifndef _FIXED_HXX //autogen
#include <vcl/fixed.hxx>
-#endif
#include <sfx2/tabdlg.hxx>
-#include "relfld.hxx" // SvxRelativeField
+#include <svx/relfld.hxx> // SvxRelativeField
#include <svx/paraprev.hxx> // Preview
#include <svx/frmdirlbox.hxx>
-
-#ifndef _LSTBOX_HXX //autogen
#include <vcl/lstbox.hxx>
-#endif
-#include "flagsdef.hxx"
+#include <svx/flagsdef.hxx>
+
// define ----------------------------------------------------------------
// 1/2 cm in TWIPS
diff --git a/svx/source/cui/pastedlg.hxx b/cui/source/inc/pastedlg.hxx
index edbbaf53e6ee..edbbaf53e6ee 100644
--- a/svx/source/cui/pastedlg.hxx
+++ b/cui/source/inc/pastedlg.hxx
diff --git a/svx/source/cui/postdlg.hxx b/cui/source/inc/postdlg.hxx
index 9c4f2551c09b..9c4f2551c09b 100644
--- a/svx/source/cui/postdlg.hxx
+++ b/cui/source/inc/postdlg.hxx
diff --git a/svx/inc/radiobtnbox.hxx b/cui/source/inc/radiobtnbox.hxx
index a0477d25b262..a0477d25b262 100644
--- a/svx/inc/radiobtnbox.hxx
+++ b/cui/source/inc/radiobtnbox.hxx
diff --git a/svx/source/cui/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx
index 0cb2a6d4fb5d..0cb2a6d4fb5d 100644
--- a/svx/source/cui/scriptdlg.hxx
+++ b/cui/source/inc/scriptdlg.hxx
diff --git a/svx/source/cui/sdrcelldlg.hxx b/cui/source/inc/sdrcelldlg.hxx
index b89c9ef21e8a..b89c9ef21e8a 100644
--- a/svx/source/cui/sdrcelldlg.hxx
+++ b/cui/source/inc/sdrcelldlg.hxx
diff --git a/svx/source/cui/selector.hxx b/cui/source/inc/selector.hxx
index 10346f251563..3e21a3812835 100644
--- a/svx/source/cui/selector.hxx
+++ b/cui/source/inc/selector.hxx
@@ -43,7 +43,7 @@
#define _SVSTDARR_USHORTS
#define _SVSTDARR_STRINGSDTOR
-#include <svtools/svstdarr.hxx> // SvUShorts
+#include <svl/svstdarr.hxx> // SvUShorts
#include <sfx2/minarray.hxx>
#define SVX_CFGGROUP_FUNCTION 1
diff --git a/svx/source/cui/showcols.hxx b/cui/source/inc/showcols.hxx
index fd64abf36e2c..fd64abf36e2c 100644
--- a/svx/source/cui/showcols.hxx
+++ b/cui/source/inc/showcols.hxx
diff --git a/svx/source/cui/splitcelldlg.hxx b/cui/source/inc/splitcelldlg.hxx
index e325e25a8284..e325e25a8284 100644
--- a/svx/source/cui/splitcelldlg.hxx
+++ b/cui/source/inc/splitcelldlg.hxx
diff --git a/svx/source/cui/srchxtra.hxx b/cui/source/inc/srchxtra.hxx
index cdbf37b4db66..6d2e9a1195aa 100644
--- a/svx/source/cui/srchxtra.hxx
+++ b/cui/source/inc/srchxtra.hxx
@@ -37,7 +37,7 @@
#include <sfx2/tabdlg.hxx>
#include <svx/checklbx.hxx>
-#include "srchdlg.hxx"
+#include <svx/srchdlg.hxx>
// class SvxSearchFormatDialog -------------------------------------------
diff --git a/svx/source/cui/tabstpge.hxx b/cui/source/inc/tabstpge.hxx
index 945f6acbb9e4..66d432ea37b4 100644
--- a/svx/source/cui/tabstpge.hxx
+++ b/cui/source/inc/tabstpge.hxx
@@ -39,7 +39,8 @@
#include <sfx2/tabdlg.hxx>
#include <svx/tstpitem.hxx>
-#include "flagsdef.hxx"
+#include <svx/flagsdef.hxx>
+
// forward ---------------------------------------------------------------
class TabWin_Impl;
diff --git a/svx/source/cui/textanim.hxx b/cui/source/inc/textanim.hxx
index 576bda45450a..576bda45450a 100644
--- a/svx/source/cui/textanim.hxx
+++ b/cui/source/inc/textanim.hxx
diff --git a/svx/source/cui/textattr.hxx b/cui/source/inc/textattr.hxx
index d2e8d795653f..d2e8d795653f 100644
--- a/svx/source/cui/textattr.hxx
+++ b/cui/source/inc/textattr.hxx
diff --git a/svx/source/cui/transfrm.hxx b/cui/source/inc/transfrm.hxx
index 3a5abeedf4a1..3a5abeedf4a1 100644
--- a/svx/source/cui/transfrm.hxx
+++ b/cui/source/inc/transfrm.hxx
diff --git a/svx/source/cui/treeopt.hxx b/cui/source/inc/treeopt.hxx
index cce278686b27..cce278686b27 100644
--- a/svx/source/cui/treeopt.hxx
+++ b/cui/source/inc/treeopt.hxx
diff --git a/svx/source/cui/zoom.hxx b/cui/source/inc/zoom.hxx
index d031da97bc55..d031da97bc55 100644
--- a/svx/source/cui/zoom.hxx
+++ b/cui/source/inc/zoom.hxx
diff --git a/svx/source/cui/cfgchart.cxx b/cui/source/options/cfgchart.cxx
index 344bca7fbd10..822a3632a76d 100644
--- a/svx/source/cui/cfgchart.cxx
+++ b/cui/source/options/cfgchart.cxx
@@ -29,20 +29,16 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_cui.hxx"
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
#include <com/sun/star/uno/Sequence.hxx>
// header for SvStream
#include <tools/stream.hxx>
// header for SAL_STATIC_CAST
#include <sal/types.h>
-
#include "cfgchart.hxx"
-#include <svx/dialmgr.hxx>
-#include <svx/dialogs.hrc>
+#include <dialmgr.hxx>
+#include <cuires.hrc>
#define ROW_COLOR_COUNT 12
@@ -130,7 +126,7 @@ void SvxChartColorTable::useDefault()
clear();
- String aResName( SVX_RES( RID_SVXSTR_DIAGRAM_ROW ) );
+ String aResName( CUI_RES( RID_SVXSTR_DIAGRAM_ROW ) );
String aPrefix, aPostfix, aName;
xub_StrLen nPos = aResName.SearchAscii( "$(ROW)" );
if( nPos != STRING_NOTFOUND )
@@ -220,7 +216,7 @@ BOOL SvxChartOptions::RetrieveOptions()
Color aCol;
// create strings for entry names
- String aResName( SVX_RES( RID_SVXSTR_DIAGRAM_ROW ) );
+ String aResName( CUI_RES( RID_SVXSTR_DIAGRAM_ROW ) );
String aPrefix, aPostfix, aName;
xub_StrLen nPos = aResName.SearchAscii( "$(ROW)" );
if( nPos != STRING_NOTFOUND )
@@ -270,6 +266,10 @@ void SvxChartOptions::Commit()
PutProperties( aNames, aValues );
}
+void SvxChartOptions::Notify( const com::sun::star::uno::Sequence< rtl::OUString >& )
+{
+}
+
// --------------------
// class SvxChartColorTableItem
// --------------------
diff --git a/svx/source/cui/cfgchart.hxx b/cui/source/options/cfgchart.hxx
index 86a2490a2cf8..89f18e621cff 100644
--- a/svx/source/cui/cfgchart.hxx
+++ b/cui/source/options/cfgchart.hxx
@@ -36,7 +36,7 @@
// header for ConfigItem
#include <unotools/configitem.hxx>
// header for SfxPoolItem
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
// header for XColorEntry
#include <svx/xtable.hxx>
@@ -90,6 +90,7 @@ public:
void SetDefaultColors( const SvxChartColorTable& aCol );
virtual void Commit();
+ virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& _rPropertyNames);
};
// ====================
diff --git a/svx/source/cui/connpoolconfig.cxx b/cui/source/options/connpoolconfig.cxx
index f787168f1f2d..1a681beb263e 100644
--- a/svx/source/cui/connpoolconfig.cxx
+++ b/cui/source/options/connpoolconfig.cxx
@@ -29,24 +29,19 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_cui.hxx"
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
#include "connpoolconfig.hxx"
#include "connpoolsettings.hxx"
#include "connpooloptions.hxx"
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
#include <unotools/confignode.hxx>
#include <comphelper/extract.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
#include <comphelper/processfactory.hxx>
#include "sdbcdriverenum.hxx"
-#include <svx/svxids.hrc>
-
//........................................................................
namespace offapp
{
diff --git a/svx/source/cui/connpoolconfig.hxx b/cui/source/options/connpoolconfig.hxx
index 248dd16146f0..248dd16146f0 100644
--- a/svx/source/cui/connpoolconfig.hxx
+++ b/cui/source/options/connpoolconfig.hxx
diff --git a/svx/source/cui/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx
index d7874bc8d4cb..fd195b18a7e3 100644
--- a/svx/source/cui/connpooloptions.cxx
+++ b/cui/source/options/connpooloptions.cxx
@@ -29,7 +29,7 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_cui.hxx"
#ifdef SVX_DLLIMPLEMENTATION
#undef SVX_DLLIMPLEMENTATION
@@ -41,11 +41,11 @@
#include <svtools/editbrowsebox.hxx>
#include <vcl/field.hxx>
#include "connpoolsettings.hxx"
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "helpid.hrc"
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
//........................................................................
namespace offapp
@@ -158,11 +158,11 @@ namespace offapp
DriverListControl_Base::Init();
Size aColWidth = LogicToPixel(Size(160, 0), MAP_APPFONT);
- InsertDataColumn(1, String(SVX_RES(STR_DRIVER_NAME)), aColWidth.Width());
+ InsertDataColumn(1, String(CUI_RES(STR_DRIVER_NAME)), aColWidth.Width());
aColWidth = LogicToPixel(Size(30, 0), MAP_APPFONT);
- InsertDataColumn(2, String(SVX_RES(STR_POOLED_FLAG)), aColWidth.Width());
+ InsertDataColumn(2, String(CUI_RES(STR_POOLED_FLAG)), aColWidth.Width());
aColWidth = LogicToPixel(Size(60, 0), MAP_APPFONT);
- InsertDataColumn(3, String(SVX_RES(STR_POOL_TIMEOUT)), aColWidth.Width());
+ InsertDataColumn(3, String(CUI_RES(STR_POOL_TIMEOUT)), aColWidth.Width());
// Attention: the resource of the string is local to the resource of the enclosing dialog!
}
@@ -338,16 +338,16 @@ namespace offapp
//====================================================================
//--------------------------------------------------------------------
ConnectionPoolOptionsPage::ConnectionPoolOptionsPage(Window* _pParent, const SfxItemSet& _rAttrSet)
- :SfxTabPage(_pParent, SVX_RES(RID_OFAPAGE_CONNPOOLOPTIONS ), _rAttrSet)
- ,m_aFrame (this, SVX_RES(FL_POOLING))
- ,m_aEnablePooling (this, SVX_RES(CB_POOL_CONNS))
- ,m_aDriversLabel (this, SVX_RES(FT_DRIVERS))
- ,m_pDriverList(new DriverListControl(this, SVX_RES(CTRL_DRIVER_LIST)))
- ,m_aDriverLabel (this, SVX_RES(FT_DRIVERLABEL))
- ,m_aDriver (this, SVX_RES(FT_DRIVER))
- ,m_aDriverPoolingEnabled(this, SVX_RES(CB_DRIVERPOOLING))
- ,m_aTimeoutLabel (this, SVX_RES(FT_TIMEOUT))
- ,m_aTimeout (this, SVX_RES(NF_TIMEOUT))
+ :SfxTabPage(_pParent, CUI_RES(RID_OFAPAGE_CONNPOOLOPTIONS ), _rAttrSet)
+ ,m_aFrame (this, CUI_RES(FL_POOLING))
+ ,m_aEnablePooling (this, CUI_RES(CB_POOL_CONNS))
+ ,m_aDriversLabel (this, CUI_RES(FT_DRIVERS))
+ ,m_pDriverList(new DriverListControl(this, CUI_RES(CTRL_DRIVER_LIST)))
+ ,m_aDriverLabel (this, CUI_RES(FT_DRIVERLABEL))
+ ,m_aDriver (this, CUI_RES(FT_DRIVER))
+ ,m_aDriverPoolingEnabled(this, CUI_RES(CB_DRIVERPOOLING))
+ ,m_aTimeoutLabel (this, CUI_RES(FT_TIMEOUT))
+ ,m_aTimeout (this, CUI_RES(NF_TIMEOUT))
{
m_pDriverList->Init();
m_pDriverList->Show();
diff --git a/svx/source/cui/connpooloptions.hrc b/cui/source/options/connpooloptions.hrc
index 89f3ae64e1f8..89f3ae64e1f8 100644
--- a/svx/source/cui/connpooloptions.hrc
+++ b/cui/source/options/connpooloptions.hrc
diff --git a/svx/source/cui/connpooloptions.hxx b/cui/source/options/connpooloptions.hxx
index 019061efdb2e..b2b40354f433 100644
--- a/svx/source/cui/connpooloptions.hxx
+++ b/cui/source/options/connpooloptions.hxx
@@ -31,12 +31,12 @@
#ifndef _OFFAPP_CONNPOOLOPTIONS_HXX_
#define _OFFAPP_CONNPOOLOPTIONS_HXX_
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
#include <sfx2/tabdlg.hxx>
#include <vcl/fixed.hxx>
#include <vcl/button.hxx>
#include <vcl/field.hxx>
-#include <databaseregistrationui.hxx>
+#include <svx/databaseregistrationui.hxx>
//........................................................................
namespace offapp
diff --git a/svx/source/cui/connpooloptions.src b/cui/source/options/connpooloptions.src
index 9218efda609a..c8d1dd03e47d 100644
--- a/svx/source/cui/connpooloptions.src
+++ b/cui/source/options/connpooloptions.src
@@ -29,7 +29,7 @@
************************************************************************/
#include "connpooloptions.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#define PAGE_SIZE_X 260
#define PAGE_SIZE_Y 185
diff --git a/svx/source/cui/connpoolsettings.cxx b/cui/source/options/connpoolsettings.cxx
index 6e1986f36e22..03951a4ee271 100644
--- a/svx/source/cui/connpoolsettings.cxx
+++ b/cui/source/options/connpoolsettings.cxx
@@ -29,7 +29,7 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_cui.hxx"
#ifdef SVX_DLLIMPLEMENTATION
#undef SVX_DLLIMPLEMENTATION
diff --git a/svx/source/cui/connpoolsettings.hxx b/cui/source/options/connpoolsettings.hxx
index 80ae105d0521..085732a6db74 100644
--- a/svx/source/cui/connpoolsettings.hxx
+++ b/cui/source/options/connpoolsettings.hxx
@@ -33,7 +33,7 @@
#include <tools/string.hxx>
#include <comphelper/stl_types.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
//........................................................................
namespace offapp
diff --git a/svx/source/cui/cuisrchdlg.cxx b/cui/source/options/cuisrchdlg.cxx
index efeeffebaf4f..c958204fe3c4 100644
--- a/svx/source/cui/cuisrchdlg.cxx
+++ b/cui/source/options/cuisrchdlg.cxx
@@ -29,44 +29,35 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
// include ---------------------------------------------------------------
#include <vcl/wrkwin.hxx>
#include <vcl/morebtn.hxx>
#include <vcl/msgbox.hxx>
-#include <svtools/slstitm.hxx>
-#include <svtools/itemiter.hxx>
-#include <svtools/style.hxx>
-#include <svtools/searchopt.hxx>
+#include <svl/slstitm.hxx>
+#include <svl/itemiter.hxx>
+#include <svl/style.hxx>
+#include <unotools/searchopt.hxx>
#include <sfx2/dispatch.hxx>
#include <sfx2/objsh.hxx>
#include <sfx2/module.hxx>
#include <sfx2/viewsh.hxx>
#include <sfx2/basedlgs.hxx>
-#include <svtools/cjkoptions.hxx>
+#include <svl/cjkoptions.hxx>
#include <com/sun/star/i18n/TransliterationModules.hpp>
#define _CUI_SRCHDLG_CXX
#include "cuisrchdlg.hxx"
-#include <svx/dialogs.hrc>
-#include <svx/svxitems.hrc>
-//#include "srchdlg.hrc"
-
+#include <cuires.hrc>
#define ITEMID_SETITEM 0
#include <sfx2/srchitem.hxx>
#include <svx/pageitem.hxx>
-//#include "srchctrl.hxx"
-//CHINA001 #include "srchxtra.hxx"
-#include <svx/dialmgr.hxx>
-#include "dlgutil.hxx"
+#include <dialmgr.hxx>
+#include <svx/dlgutil.hxx>
#include <optjsearch.hxx>
#include <svx/brshitem.hxx>
#include "backgrnd.hxx"
@@ -76,7 +67,7 @@
SvxJSearchOptionsDialog::SvxJSearchOptionsDialog(
Window *pParent,
- const SfxItemSet& rOptionsSet, USHORT /*nUniqueId*/, INT32 nInitialFlags ) :
+ const SfxItemSet& rOptionsSet, INT32 nInitialFlags ) :
SfxSingleTabDialog ( pParent, rOptionsSet, RID_SVXPAGE_JSEARCH_OPTIONS ),
nInitialTlFlags( nInitialFlags )
{
diff --git a/svx/source/cui/dbregister.cxx b/cui/source/options/dbregister.cxx
index a1b24691a280..23e8bf865626 100644
--- a/svx/source/cui/dbregister.cxx
+++ b/cui/source/options/dbregister.cxx
@@ -29,26 +29,19 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
#include "dbregister.hxx"
#include "dbregister.hrc"
#include "dbregistersettings.hxx"
#include "connpooloptions.hxx"
-#ifndef SVTOOLS_FILENOTATION_HXX_
-#include <svtools/filenotation.hxx>
-#endif
-#include <svx/dialogs.hrc>
-#include <svx/svxids.hrc>
+#include <svl/filenotation.hxx>
+#include <cuires.hrc>
#include "helpid.hrc"
#include <svtools/editbrowsebox.hxx>
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include <vcl/field.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
#include <comphelper/processfactory.hxx>
#include <com/sun/star/uno/Exception.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -57,15 +50,15 @@
#include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
#include <vcl/msgbox.hxx>
#include <svtools/svtabbx.hxx>
-
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
#include "doclinkdialog.hxx"
#include <tools/urlobj.hxx>
#include <unotools/localfilehelper.hxx>
#include "optHeaderTabListbox.hxx"
#include <sfx2/docfilt.hxx>
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
#include "dbregisterednamesconfig.hxx"
+#include <svx/dialogs.hrc>
#define TAB_WIDTH1 80
#define TAB_WIDTH_MIN 10
@@ -126,15 +119,15 @@ short DatabaseRegistrationDialog::Execute()
DbRegistrationOptionsPage::DbRegistrationOptionsPage( Window* pParent, const SfxItemSet& rSet ) :
- SfxTabPage( pParent, SVX_RES( RID_SFXPAGE_DBREGISTER), rSet ),
+ SfxTabPage( pParent, CUI_RES( RID_SFXPAGE_DBREGISTER), rSet ),
- aTypeText ( this, SVX_RES( FT_TYPE ) ),
- aPathText ( this, SVX_RES( FT_PATH ) ),
- aPathCtrl ( this, SVX_RES( LB_PATH ) ),
- m_aNew ( this, SVX_RES( BTN_NEW ) ),
- m_aEdit ( this, SVX_RES( BTN_EDIT ) ),
- m_aDelete ( this, SVX_RES( BTN_DELETE ) ),
- aStdBox ( this, SVX_RES( GB_STD ) ),
+ aTypeText ( this, CUI_RES( FT_TYPE ) ),
+ aPathText ( this, CUI_RES( FT_PATH ) ),
+ aPathCtrl ( this, CUI_RES( LB_PATH ) ),
+ m_aNew ( this, CUI_RES( BTN_NEW ) ),
+ m_aEdit ( this, CUI_RES( BTN_EDIT ) ),
+ m_aDelete ( this, CUI_RES( BTN_DELETE ) ),
+ aStdBox ( this, CUI_RES( GB_STD ) ),
pHeaderBar ( NULL ),
pPathBox ( NULL ),
m_pCurEntry ( NULL ),
@@ -304,7 +297,7 @@ IMPL_LINK( DbRegistrationOptionsPage, DeleteHdl, void *, EMPTYARG )
SvLBoxEntry* pEntry = pPathBox->FirstSelected();
if ( pEntry )
{
- QueryBox aQuery(this,SVX_RES(QUERY_DELETE_CONFIRM));
+ QueryBox aQuery(this,CUI_RES(QUERY_DELETE_CONFIRM));
if ( aQuery.Execute() == RET_YES )
pPathBox->GetModel()->Remove(pEntry);
}
diff --git a/svx/source/cui/dbregister.hrc b/cui/source/options/dbregister.hrc
index f2324aac186c..f2324aac186c 100644
--- a/svx/source/cui/dbregister.hrc
+++ b/cui/source/options/dbregister.hrc
diff --git a/svx/source/cui/dbregister.src b/cui/source/options/dbregister.src
index bead1ae683cf..aaa8dc5302bc 100644
--- a/svx/source/cui/dbregister.src
+++ b/cui/source/options/dbregister.src
@@ -29,13 +29,9 @@
************************************************************************/
#include "dbregister.hrc"
+#include <cuires.hrc>
+#include <cuires.hrc>
#include <svx/dialogs.hrc>
-#ifndef _SVX_SVXIDS_HRC //autogen
-#include <svx/svxids.hrc>
-#endif
-#ifndef _SVX_DIALOGS_HRC //autogen
-#include <svx/dialogs.hrc>
-#endif
// RID_SFXPAGE_PATH -----------------------------------------------------
#define STD_MASKCOLOR Color { Red=0xffff; Green=0x0000; Blue=0xffff; }
diff --git a/svx/source/cui/dbregisterednamesconfig.cxx b/cui/source/options/dbregisterednamesconfig.cxx
index 4f9cf1150422..6fd7e34b2729 100644
--- a/svx/source/cui/dbregisterednamesconfig.cxx
+++ b/cui/source/options/dbregisterednamesconfig.cxx
@@ -29,26 +29,17 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
-
+#include "precompiled_cui.hxx"
#include "dbregisterednamesconfig.hxx"
-
-
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
#include <tools/diagnose_ex.h>
-
-#include <svx/svxids.hrc>
#include <unotools/confignode.hxx>
#include <comphelper/extract.hxx>
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/uno/XNamingService.hpp>
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
#include <comphelper/processfactory.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
#include "dbregistersettings.hxx"
#include "connpooloptions.hxx"
diff --git a/svx/source/cui/dbregisterednamesconfig.hxx b/cui/source/options/dbregisterednamesconfig.hxx
index 366910c0f193..366910c0f193 100644
--- a/svx/source/cui/dbregisterednamesconfig.hxx
+++ b/cui/source/options/dbregisterednamesconfig.hxx
diff --git a/svx/source/cui/dbregistersettings.cxx b/cui/source/options/dbregistersettings.cxx
index 45745e3b59cb..c3d3b7e8c244 100644
--- a/svx/source/cui/dbregistersettings.cxx
+++ b/cui/source/options/dbregistersettings.cxx
@@ -29,11 +29,7 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
#include "dbregistersettings.hxx"
diff --git a/svx/source/cui/dbregistersettings.hxx b/cui/source/options/dbregistersettings.hxx
index ef994e4d0ee2..672d4bf63bcd 100644
--- a/svx/source/cui/dbregistersettings.hxx
+++ b/cui/source/options/dbregistersettings.hxx
@@ -32,7 +32,7 @@
#define SVX_DBREGISTERSETTING_HXX
#include <comphelper/stl_types.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
//........................................................................
namespace svx
diff --git a/svx/source/cui/doclinkdialog.cxx b/cui/source/options/doclinkdialog.cxx
index aec98ea74aba..1af621348023 100644
--- a/svx/source/cui/doclinkdialog.cxx
+++ b/cui/source/options/doclinkdialog.cxx
@@ -29,24 +29,16 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_cui.hxx"
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
#include "doclinkdialog.hxx"
-#ifndef _SVX_DOCLINKDIALOG_HRC_
#include "doclinkdialog.hrc"
-#endif
-#include <svx/dialogs.hrc>
-#include <svx/svxids.hrc>
+#include <cuires.hrc>
#include <tools/debug.hxx>
-#ifndef SVTOOLS_FILENOTATION_HXX_
-#include <svtools/filenotation.hxx>
-#endif
+#include <svl/filenotation.hxx>
#include <vcl/msgbox.hxx>
#include <ucbhelper/content.hxx>
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
#include <tools/urlobj.hxx>
#include <sfx2/filedlghelper.hxx>
#include <sfx2/docfilt.hxx>
@@ -64,19 +56,19 @@ namespace svx
//==================================================================
//------------------------------------------------------------------
ODocumentLinkDialog::ODocumentLinkDialog( Window* _pParent, sal_Bool _bCreateNew )
- :ModalDialog( _pParent, SVX_RES(DLG_DOCUMENTLINK) )
- ,m_aURLLabel (this, SVX_RES(FT_URL))
- ,m_aURL (this, SVX_RES(CMB_URL))
- ,m_aBrowseFile (this, SVX_RES(PB_BROWSEFILE))
- ,m_aNameLabel (this, SVX_RES(FT_NAME))
- ,m_aName (this, SVX_RES(ET_NAME))
- ,m_aBottomLine (this, SVX_RES(FL_BOTTOM))
- ,m_aOK (this, SVX_RES(BTN_OK))
- ,m_aCancel (this, SVX_RES(BTN_CANCEL))
- ,m_aHelp (this, SVX_RES(BTN_HELP))
+ :ModalDialog( _pParent, CUI_RES(DLG_DOCUMENTLINK) )
+ ,m_aURLLabel (this, CUI_RES(FT_URL))
+ ,m_aURL (this, CUI_RES(CMB_URL))
+ ,m_aBrowseFile (this, CUI_RES(PB_BROWSEFILE))
+ ,m_aNameLabel (this, CUI_RES(FT_NAME))
+ ,m_aName (this, CUI_RES(ET_NAME))
+ ,m_aBottomLine (this, CUI_RES(FL_BOTTOM))
+ ,m_aOK (this, CUI_RES(BTN_OK))
+ ,m_aCancel (this, CUI_RES(BTN_CANCEL))
+ ,m_aHelp (this, CUI_RES(BTN_HELP))
,m_bCreatingNew(_bCreateNew)
{
- String sText = String( SVX_RES( m_bCreatingNew ? STR_NEW_LINK : STR_EDIT_LINK ) );
+ String sText = String( CUI_RES( m_bCreatingNew ? STR_NEW_LINK : STR_EDIT_LINK ) );
SetText(sText);
FreeResource();
@@ -141,7 +133,7 @@ namespace svx
if (!bFileExists)
{
- String sMsg = String(SVX_RES(STR_LINKEDDOC_DOESNOTEXIST));
+ String sMsg = String(CUI_RES(STR_LINKEDDOC_DOESNOTEXIST));
sMsg.SearchAndReplaceAscii("$file$", m_aURL.GetText());
ErrorBox aError(this, WB_OK , sMsg);
aError.Execute();
@@ -150,7 +142,7 @@ namespace svx
INetURLObject aURL( sURL );
if ( aURL.GetProtocol() != INET_PROT_FILE )
{
- String sMsg = String(SVX_RES(STR_LINKEDDOC_NO_SYSTEM_FILE));
+ String sMsg = String(CUI_RES(STR_LINKEDDOC_NO_SYSTEM_FILE));
sMsg.SearchAndReplaceAscii("$file$", m_aURL.GetText());
ErrorBox aError(this, WB_OK , sMsg);
aError.Execute();
@@ -162,7 +154,7 @@ namespace svx
{
if ( !m_aNameValidator.Call( &sCurrentText ) )
{
- String sMsg = String(SVX_RES(STR_NAME_CONFLICT));
+ String sMsg = String(CUI_RES(STR_NAME_CONFLICT));
sMsg.SearchAndReplaceAscii("$file$", sCurrentText);
InfoBox aError(this, sMsg);
aError.Execute();
diff --git a/svx/source/cui/doclinkdialog.hrc b/cui/source/options/doclinkdialog.hrc
index 022c43b6d620..022c43b6d620 100644
--- a/svx/source/cui/doclinkdialog.hrc
+++ b/cui/source/options/doclinkdialog.hrc
diff --git a/svx/source/cui/doclinkdialog.hxx b/cui/source/options/doclinkdialog.hxx
index 81ec0c34d0c5..81ec0c34d0c5 100644
--- a/svx/source/cui/doclinkdialog.hxx
+++ b/cui/source/options/doclinkdialog.hxx
diff --git a/svx/source/cui/doclinkdialog.src b/cui/source/options/doclinkdialog.src
index e4c8ceb3de87..9fe56360b82a 100644
--- a/svx/source/cui/doclinkdialog.src
+++ b/cui/source/options/doclinkdialog.src
@@ -28,7 +28,7 @@
*
************************************************************************/
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#ifndef _SVX_DOCLINKDIALOG_HRC_
#include "doclinkdialog.hrc"
#endif
diff --git a/svx/source/cui/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index 9e957ffbb43b..614993aeb91f 100644
--- a/svx/source/cui/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -29,29 +29,18 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
-
-#ifdef PRECOMPILED
-#include "svxpch.hxx"
-#endif
+#include "precompiled_cui.hxx"
#include <tools/shl.hxx>
#include <svtools/ctrltool.hxx>
#include <vcl/svapp.hxx>
#include <vcl/wrkwin.hxx>
-#ifndef _OFA_FONTSUBSTCONFIG_HXX
#include <svtools/fontsubstconfig.hxx>
-#endif
-#include <svtools/sourceviewconfig.hxx>
-
+#include <unotools/sourceviewconfig.hxx>
#include "fontsubs.hrc"
#include "fontsubs.hxx"
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
#include "helpid.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
/*********************************************************************/
/* */
@@ -65,32 +54,32 @@
SvxFontSubstTabPage::SvxFontSubstTabPage( Window* pParent,
const SfxItemSet& rSet ) :
- SfxTabPage(pParent, SVX_RES(RID_SVX_FONT_SUBSTITUTION), rSet),
- aUseTableCB (this, SVX_RES(CB_USETABLE)),
- aFont1FT (this, SVX_RES(FT_FONT1)),
- aFont1CB (this, SVX_RES(CB_FONT1)),
- aFont2FT (this, SVX_RES(FT_FONT2)),
- aFont2CB (this, SVX_RES(CB_FONT2)),
- aNewDelTBX (this, SVX_RES(TBX_SUBSTNEWDEL)),
- aCheckLB (this, SVX_RES(CLB_SUBSTITUTES)),
-
- aSourceViewFontsFL (this, SVX_RES(FL_SOURCEVIEW )),
- aFontNameFT (this, SVX_RES(FT_FONTNAME )),
- aFontNameLB (this, SVX_RES(LB_FONTNAME )),
- aNonPropFontsOnlyCB(this, SVX_RES(CB_NONPROP )),
- aFontHeightFT (this, SVX_RES(FT_FONTHEIGHT )),
- aFontHeightLB (this, SVX_RES(LB_FONTHEIGHT )),
-
- aImageList (SVX_RES(IL_ICON)),
-
- sAutomatic (SVX_RES( STR_AUTOMATIC )),
+ SfxTabPage(pParent, CUI_RES(RID_SVX_FONT_SUBSTITUTION), rSet),
+ aUseTableCB (this, CUI_RES(CB_USETABLE)),
+ aFont1FT (this, CUI_RES(FT_FONT1)),
+ aFont1CB (this, CUI_RES(CB_FONT1)),
+ aFont2FT (this, CUI_RES(FT_FONT2)),
+ aFont2CB (this, CUI_RES(CB_FONT2)),
+ aNewDelTBX (this, CUI_RES(TBX_SUBSTNEWDEL)),
+ aCheckLB (this, CUI_RES(CLB_SUBSTITUTES)),
+
+ aSourceViewFontsFL (this, CUI_RES(FL_SOURCEVIEW )),
+ aFontNameFT (this, CUI_RES(FT_FONTNAME )),
+ aFontNameLB (this, CUI_RES(LB_FONTNAME )),
+ aNonPropFontsOnlyCB(this, CUI_RES(CB_NONPROP )),
+ aFontHeightFT (this, CUI_RES(FT_FONTHEIGHT )),
+ aFontHeightLB (this, CUI_RES(LB_FONTHEIGHT )),
+
+ aImageList (CUI_RES(IL_ICON)),
+
+ sAutomatic (CUI_RES( STR_AUTOMATIC )),
pConfig(new SvtFontSubstConfig),
- pSourceViewConfig(new svt::SourceViewConfig),
+ pSourceViewConfig(new utl::SourceViewConfig),
- sHeader1 (SVX_RES( STR_HEADER1 )),
- sHeader2 (SVX_RES( STR_HEADER2 )),
- sHeader3 (SVX_RES( STR_HEADER3 )),
- sHeader4 (SVX_RES( STR_HEADER4 )),
+ sHeader1 (CUI_RES( STR_HEADER1 )),
+ sHeader2 (CUI_RES( STR_HEADER2 )),
+ sHeader3 (CUI_RES( STR_HEADER3 )),
+ sHeader4 (CUI_RES( STR_HEADER4 )),
sFontGroup ("FontSubstitution"),
pCheckButtonData(0)
diff --git a/svx/source/cui/fontsubs.hrc b/cui/source/options/fontsubs.hrc
index 9344d41c0fc7..6ef1c7a9047a 100644
--- a/svx/source/cui/fontsubs.hrc
+++ b/cui/source/options/fontsubs.hrc
@@ -30,7 +30,7 @@
#ifndef _SVX_FONT_SUBSTITUTION
#define _SVX_FONT_SUBSTITUTION
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
// defines ------------------------------------------------------------------
diff --git a/svx/source/cui/fontsubs.hxx b/cui/source/options/fontsubs.hxx
index 8032136bdc3d..f14ce19c490b 100644
--- a/svx/source/cui/fontsubs.hxx
+++ b/cui/source/options/fontsubs.hxx
@@ -36,6 +36,11 @@
#include <vcl/toolbox.hxx>
#include <svtools/ctrlbox.hxx>
+namespace utl
+{
+ class SourceViewConfig;
+}
+
// class SvxFontSubstCheckListBox ------------------------------------------
class SvxFontSubstCheckListBox : public SvxSimpleTable
@@ -88,7 +93,7 @@ class SvxFontSubstTabPage : public SfxTabPage
String sAutomatic;
SvtFontSubstConfig* pConfig;
- svt::SourceViewConfig* pSourceViewConfig;
+ utl::SourceViewConfig* pSourceViewConfig;
String sHeader1;
String sHeader2;
diff --git a/svx/source/cui/fontsubs.src b/cui/source/options/fontsubs.src
index f3160d2f4808..3400162c6992 100644
--- a/svx/source/cui/fontsubs.src
+++ b/cui/source/options/fontsubs.src
@@ -30,7 +30,6 @@
// include ------------------------------------------------------------------
-#include <svx/svxids.hrc>
#include "fontsubs.hrc"
#include "helpid.hrc"
diff --git a/svx/source/cui/internationaloptions.cxx b/cui/source/options/internationaloptions.cxx
index 43efb498048a..c5e00404ced1 100644
--- a/svx/source/cui/internationaloptions.cxx
+++ b/cui/source/options/internationaloptions.cxx
@@ -29,20 +29,15 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_cui.hxx"
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
#include "internationaloptions.hxx"
-#ifndef _OFFAPP_INTERNATIONALOPTIONS_HRC_
#include "internationaloptions.hrc"
-#endif
-#include <svtools/eitem.hxx>
-
-#include <svx/dialogs.hrc>
+#include <svl/eitem.hxx>
+#include <cuires.hrc>
#include "helpid.hrc"
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
+#include <svx/dialogs.hrc>
namespace offapp
{
@@ -68,12 +63,12 @@ namespace offapp
};
inline InternationalOptionsPage::IMPL::IMPL( Window* _pParent ) :
- m_aFL_DefaultTextDirection ( _pParent, SVX_RES( FL_DEFTXTDIRECTION ) )
- ,m_aRB_TxtDirLeft2Right ( _pParent, SVX_RES( RB_TXTDIR_LEFT2RIGHT ) )
- ,m_aRB_TxtDirRight2Left ( _pParent, SVX_RES( RB_TXTDIR_RIGHT2LEFT ) )
- ,m_aFL_SheetView ( _pParent, SVX_RES( FL_SHEETVIEW ) )
- ,m_aCB_ShtVwRight2Left ( _pParent, SVX_RES( CB_SHTVW_RIGHT2LEFT ) )
- ,m_aCB_ShtVwCurrentDocOnly ( _pParent, SVX_RES( CB_SHTVW_CURRENTDOCONLY ) )
+ m_aFL_DefaultTextDirection ( _pParent, CUI_RES( FL_DEFTXTDIRECTION ) )
+ ,m_aRB_TxtDirLeft2Right ( _pParent, CUI_RES( RB_TXTDIR_LEFT2RIGHT ) )
+ ,m_aRB_TxtDirRight2Left ( _pParent, CUI_RES( RB_TXTDIR_RIGHT2LEFT ) )
+ ,m_aFL_SheetView ( _pParent, CUI_RES( FL_SHEETVIEW ) )
+ ,m_aCB_ShtVwRight2Left ( _pParent, CUI_RES( CB_SHTVW_RIGHT2LEFT ) )
+ ,m_aCB_ShtVwCurrentDocOnly ( _pParent, CUI_RES( CB_SHTVW_CURRENTDOCONLY ) )
,m_bEnable_SheetView_Opt ( FALSE )
{
@@ -134,7 +129,7 @@ namespace offapp
}
InternationalOptionsPage::InternationalOptionsPage( Window* _pParent, const SfxItemSet& _rAttrSet ) :
- SfxTabPage ( _pParent, SVX_RES( RID_OFA_TP_INTERNATIONAL ), _rAttrSet )
+ SfxTabPage ( _pParent, CUI_RES( RID_OFA_TP_INTERNATIONAL ), _rAttrSet )
,m_pImpl ( new IMPL( this ) )
{
diff --git a/svx/source/cui/internationaloptions.hrc b/cui/source/options/internationaloptions.hrc
index b367340ba2fe..b367340ba2fe 100644
--- a/svx/source/cui/internationaloptions.hrc
+++ b/cui/source/options/internationaloptions.hrc
diff --git a/svx/source/cui/internationaloptions.src b/cui/source/options/internationaloptions.src
index ab725d9c4f0b..846bb444c9b5 100644
--- a/svx/source/cui/internationaloptions.src
+++ b/cui/source/options/internationaloptions.src
@@ -30,6 +30,7 @@
#include "internationaloptions.hrc"
#include "helpid.hrc"
+#include <cuires.hrc>
#include <svx/dialogs.hrc>
TabPage RID_OFA_TP_INTERNATIONAL
diff --git a/cui/source/options/makefile.mk b/cui/source/options/makefile.mk
new file mode 100755
index 000000000000..b31d70f3e773
--- /dev/null
+++ b/cui/source/options/makefile.mk
@@ -0,0 +1,122 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2008 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile: makefile.mk,v $
+#
+# $Revision: 1.65 $
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+PRJ=..$/..
+PRJNAME=cui
+TARGET=options
+ENABLE_EXCEPTIONS=TRUE
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE : settings.mk
+.INCLUDE : $(PRJ)$/util$/makefile.pmk
+
+.IF "$(ENABLE_LAYOUT)" == "TRUE"
+CFLAGS+= -DENABLE_LAYOUT=1 -I../$(PRJ)/layout/inc -I../$(PRJ)/layout/$(INPATH)/inc
+.ENDIF # ENABLE_LAYOUT == TRUE
+
+# --- Files --------------------------------------------------------
+
+SRS1NAME=options
+SRC1FILES = \
+ connpooloptions.src \
+ dbregister.src \
+ doclinkdialog.src \
+ fontsubs.src \
+ internationaloptions.src \
+ optaccessibility.src \
+ optasian.src \
+ optchart.src \
+ optcolor.src \
+ optctl.src \
+ optdict.src \
+ optfltr.src \
+ optgdlg.src \
+ optgenrl.src \
+ opthtml.src \
+ optimprove.src \
+ optinet2.src \
+ optjava.src \
+ optjsearch.src \
+ optlingu.src \
+ optmemory.src \
+ optpath.src \
+ optsave.src \
+ optupdt.src \
+ readonlyimage.src \
+ securityoptions.src \
+ treeopt.src \
+ webconninfo.src \
+
+
+SLOFILES+=\
+ $(SLO)$/cfgchart.obj \
+ $(SLO)$/connpoolconfig.obj \
+ $(SLO)$/connpooloptions.obj \
+ $(SLO)$/connpoolsettings.obj \
+ $(SLO)$/cuisrchdlg.obj \
+ $(SLO)$/dbregister.obj \
+ $(SLO)$/dbregisterednamesconfig.obj \
+ $(SLO)$/dbregistersettings.obj \
+ $(SLO)$/doclinkdialog.obj \
+ $(SLO)$/fontsubs.obj \
+ $(SLO)$/internationaloptions.obj \
+ $(SLO)$/optaccessibility.obj \
+ $(SLO)$/optasian.obj \
+ $(SLO)$/optchart.obj \
+ $(SLO)$/optcolor.obj \
+ $(SLO)$/optctl.obj \
+ $(SLO)$/optdict.obj \
+ $(SLO)$/optfltr.obj \
+ $(SLO)$/optgdlg.obj \
+ $(SLO)$/optgenrl.obj \
+ $(SLO)$/optHeaderTabListbox.obj \
+ $(SLO)$/opthtml.obj \
+ $(SLO)$/optimprove.obj \
+ $(SLO)$/optimprove2.obj \
+ $(SLO)$/optinet2.obj \
+ $(SLO)$/optjava.obj \
+ $(SLO)$/optjsearch.obj \
+ $(SLO)$/optlingu.obj \
+ $(SLO)$/optmemory.obj \
+ $(SLO)$/optpath.obj \
+ $(SLO)$/optsave.obj \
+ $(SLO)$/optupdt.obj \
+ $(SLO)$/radiobtnbox.obj \
+ $(SLO)$/readonlyimage.obj \
+ $(SLO)$/sdbcdriverenum.obj \
+ $(SLO)$/securityoptions.obj \
+ $(SLO)$/treeopt.obj \
+ $(SLO)$/webconninfo.obj \
+
+
+# --- Targets -------------------------------------------------------
+
+.INCLUDE : target.mk
diff --git a/svx/source/cui/optHeaderTabListbox.cxx b/cui/source/options/optHeaderTabListbox.cxx
index 4ffbd122dbab..a3107df7069b 100644
--- a/svx/source/cui/optHeaderTabListbox.cxx
+++ b/cui/source/options/optHeaderTabListbox.cxx
@@ -29,11 +29,8 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_cui.hxx"
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
#include "optHeaderTabListbox.hxx"
#include <vcl/svapp.hxx>
#include <svtools/headbar.hxx>
diff --git a/svx/source/cui/optHeaderTabListbox.hxx b/cui/source/options/optHeaderTabListbox.hxx
index 26608d9791b8..26608d9791b8 100644
--- a/svx/source/cui/optHeaderTabListbox.hxx
+++ b/cui/source/options/optHeaderTabListbox.hxx
diff --git a/svx/source/cui/optaccessibility.cxx b/cui/source/options/optaccessibility.cxx
index 4f47bbf168ae..3ceacf56d082 100644
--- a/svx/source/cui/optaccessibility.cxx
+++ b/cui/source/options/optaccessibility.cxx
@@ -29,15 +29,12 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_cui.hxx"
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
#include <optaccessibility.hxx>
#include <optaccessibility.hrc>
-#include <svx/dialmgr.hxx>
-#include <svx/dialogs.hrc>
+#include <dialmgr.hxx>
+#include <cuires.hrc>
#include <svtools/accessibilityoptions.hxx>
#include <vcl/settings.hxx>
#include <vcl/svapp.hxx>
@@ -58,19 +55,19 @@ struct SvxAccessibilityOptionsTabPage_Impl
};
SvxAccessibilityOptionsTabPage::SvxAccessibilityOptionsTabPage( Window* pParent, const SfxItemSet& rSet )
- :SfxTabPage(pParent, SVX_RES( RID_SVXPAGE_ACCESSIBILITYCONFIG ), rSet)
- ,m_aMiscellaneousLabel (this, SVX_RES(FL_MISCELLANEOUS ))
- ,m_aAccessibilityTool (this, SVX_RES(CB_ACCESSIBILITY_TOOL ))
- ,m_aTextSelectionInReadonly (this, SVX_RES(CB_TEXTSELECTION ))
- ,m_aAnimatedGraphics (this, SVX_RES(CB_ANIMATED_GRAPHICS ))
- ,m_aAnimatedTexts (this, SVX_RES(CB_ANIMATED_TEXTS ))
- ,m_aTipHelpCB (this, SVX_RES(CB_TIPHELP ))
- ,m_aTipHelpNF (this, SVX_RES(NF_TIPHELP ))
- ,m_aTipHelpFT (this, SVX_RES(FT_TIPHELP ))
- ,m_aHCOptionsLabel (this, SVX_RES(FL_HC_OPTIONS ))
- ,m_aAutoDetectHC (this, SVX_RES(CB_AUTO_DETECT_HC ))
- ,m_aAutomaticFontColor (this, SVX_RES(CB_AUTOMATIC_FONT_COLOR))
- ,m_aPagePreviews (this, SVX_RES(CB_PAGE_PREVIEWS ))
+ :SfxTabPage(pParent, CUI_RES( RID_SVXPAGE_ACCESSIBILITYCONFIG ), rSet)
+ ,m_aMiscellaneousLabel (this, CUI_RES(FL_MISCELLANEOUS ))
+ ,m_aAccessibilityTool (this, CUI_RES(CB_ACCESSIBILITY_TOOL ))
+ ,m_aTextSelectionInReadonly (this, CUI_RES(CB_TEXTSELECTION ))
+ ,m_aAnimatedGraphics (this, CUI_RES(CB_ANIMATED_GRAPHICS ))
+ ,m_aAnimatedTexts (this, CUI_RES(CB_ANIMATED_TEXTS ))
+ ,m_aTipHelpCB (this, CUI_RES(CB_TIPHELP ))
+ ,m_aTipHelpNF (this, CUI_RES(NF_TIPHELP ))
+ ,m_aTipHelpFT (this, CUI_RES(FT_TIPHELP ))
+ ,m_aHCOptionsLabel (this, CUI_RES(FL_HC_OPTIONS ))
+ ,m_aAutoDetectHC (this, CUI_RES(CB_AUTO_DETECT_HC ))
+ ,m_aAutomaticFontColor (this, CUI_RES(CB_AUTOMATIC_FONT_COLOR))
+ ,m_aPagePreviews (this, CUI_RES(CB_PAGE_PREVIEWS ))
,m_pImpl(new SvxAccessibilityOptionsTabPage_Impl)
{
FreeResource();
diff --git a/svx/inc/optaccessibility.hrc b/cui/source/options/optaccessibility.hrc
index 248cf16bc96e..248cf16bc96e 100644
--- a/svx/inc/optaccessibility.hrc
+++ b/cui/source/options/optaccessibility.hrc
diff --git a/svx/source/cui/optaccessibility.hxx b/cui/source/options/optaccessibility.hxx
index ff0eee457c1a..ff0eee457c1a 100644
--- a/svx/source/cui/optaccessibility.hxx
+++ b/cui/source/options/optaccessibility.hxx
diff --git a/svx/source/options/optaccessibility.src b/cui/source/options/optaccessibility.src
index 676c54f6ee61..ef375fb80117 100644
--- a/svx/source/options/optaccessibility.src
+++ b/cui/source/options/optaccessibility.src
@@ -31,7 +31,7 @@
#include <optaccessibility.hrc>
#include <sfx2/sfx.hrc>
#include "helpid.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
TabPage RID_SVXPAGE_ACCESSIBILITYCONFIG
{
diff --git a/svx/source/cui/optasian.cxx b/cui/source/options/optasian.cxx
index d96dcdd13c1f..0bbf0ac287bd 100644
--- a/svx/source/cui/optasian.cxx
+++ b/cui/source/options/optasian.cxx
@@ -29,22 +29,17 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_cui.hxx"
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
#include <optasian.hxx>
#include <svx/langitem.hxx>
-#include <unolingu.hxx>
+#include <svx/unolingu.hxx>
#include <optasian.hrc>
-#include <svx/dialmgr.hxx>
-#include <svx/dialogs.hrc>
-#ifndef _TABLE_HXX //autogen
+#include <dialmgr.hxx>
+#include <cuires.hrc>
#include <tools/table.hxx>
-#endif
#include <tools/shl.hxx>
-#include <asiancfg.hxx>
+#include <svx/asiancfg.hxx>
#include <com/sun/star/lang/Locale.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/i18n/XForbiddenCharacters.hpp>
@@ -156,23 +151,23 @@ void SvxAsianLayoutPage_Impl::addForbiddenCharacters(
static LanguageType eLastUsedLanguageTypeForForbiddenCharacters = USHRT_MAX;
SvxAsianLayoutPage::SvxAsianLayoutPage( Window* pParent, const SfxItemSet& rSet ) :
- SfxTabPage(pParent, SVX_RES( RID_SVXPAGE_ASIAN_LAYOUT ), rSet),
- aKerningGB( this, SVX_RES(GB_KERNING )),
- aCharKerningRB( this, SVX_RES(RB_CHAR_KERNING )),
- aCharPunctKerningRB( this, SVX_RES(RB_CHAR_PUNCT )),
- aCharDistGB( this, SVX_RES(GB_CHAR_DIST )),
- aNoCompressionRB( this, SVX_RES(RB_NO_COMP )),
- aPunctCompressionRB( this, SVX_RES(RB_PUNCT_COMP )),
- aPunctKanaCompressionRB(this, SVX_RES(RB_PUNCT_KANA_COMP )),
- aStartEndGB( this, SVX_RES(GB_START_END )),
- aLanguageFT( this, SVX_RES(FT_LANGUAGE )),
- aLanguageLB( this, SVX_RES(LB_LANGUAGE )),
- aStandardCB( this, SVX_RES(CB_STANDARD )),
- aStartFT( this, SVX_RES(FT_START )),
- aStartED( this, SVX_RES(ED_START )),
- aEndFT( this, SVX_RES(FT_END )),
- aEndED( this, SVX_RES(ED_END )),
- aHintFT( this, SVX_RES(FT_HINT )),
+ SfxTabPage(pParent, CUI_RES( RID_SVXPAGE_ASIAN_LAYOUT ), rSet),
+ aKerningGB( this, CUI_RES(GB_KERNING )),
+ aCharKerningRB( this, CUI_RES(RB_CHAR_KERNING )),
+ aCharPunctKerningRB( this, CUI_RES(RB_CHAR_PUNCT )),
+ aCharDistGB( this, CUI_RES(GB_CHAR_DIST )),
+ aNoCompressionRB( this, CUI_RES(RB_NO_COMP )),
+ aPunctCompressionRB( this, CUI_RES(RB_PUNCT_COMP )),
+ aPunctKanaCompressionRB(this, CUI_RES(RB_PUNCT_KANA_COMP )),
+ aStartEndGB( this, CUI_RES(GB_START_END )),
+ aLanguageFT( this, CUI_RES(FT_LANGUAGE )),
+ aLanguageLB( this, CUI_RES(LB_LANGUAGE )),
+ aStandardCB( this, CUI_RES(CB_STANDARD )),
+ aStartFT( this, CUI_RES(FT_START )),
+ aStartED( this, CUI_RES(ED_START )),
+ aEndFT( this, CUI_RES(FT_END )),
+ aEndED( this, CUI_RES(ED_END )),
+ aHintFT( this, CUI_RES(FT_HINT )),
pImpl(new SvxAsianLayoutPage_Impl)
{
FreeResource();
diff --git a/svx/inc/optasian.hrc b/cui/source/options/optasian.hrc
index 2d9c8a282352..2d9c8a282352 100644
--- a/svx/inc/optasian.hrc
+++ b/cui/source/options/optasian.hrc
diff --git a/svx/source/options/optasian.src b/cui/source/options/optasian.src
index 6a09421fcf2c..f8286ea1186c 100644
--- a/svx/source/options/optasian.src
+++ b/cui/source/options/optasian.src
@@ -31,7 +31,7 @@
#include <optasian.hrc>
#include <sfx2/sfx.hrc>
#include "helpid.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
TabPage RID_SVXPAGE_ASIAN_LAYOUT
{
diff --git a/svx/source/cui/optchart.cxx b/cui/source/options/optchart.cxx
index 652c0500a8d9..c32bffe730c9 100644
--- a/svx/source/cui/optchart.cxx
+++ b/cui/source/options/optchart.cxx
@@ -29,18 +29,13 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
-#include <svtools/pathoptions.hxx>
-
-#include <svx/dialogs.hrc>
-
+#include "precompiled_cui.hxx"
+#include <unotools/pathoptions.hxx>
+#include <cuires.hrc>
#include "optchart.hxx"
#include "optchart.hrc"
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
+#include <svx/svxids.hrc> // for SID_SCH_EDITOPTIONS
// ====================
// class ChartColorLB
@@ -63,13 +58,13 @@ void ChartColorLB::FillBox( const SvxChartColorTable & rTab )
// ====================
SvxDefaultColorOptPage::SvxDefaultColorOptPage( Window* pParent, const SfxItemSet& rInAttrs ) :
- SfxTabPage( pParent, SVX_RES( RID_OPTPAGE_CHART_DEFCOLORS ), rInAttrs ),
+ SfxTabPage( pParent, CUI_RES( RID_OPTPAGE_CHART_DEFCOLORS ), rInAttrs ),
- aGbChartColors ( this, SVX_RES( FL_CHART_COLOR_LIST ) ),
- aLbChartColors ( this, SVX_RES( LB_CHART_COLOR_LIST ) ),
- aGbColorBox ( this, SVX_RES( FL_COLOR_BOX ) ),
- aValSetColorBox ( this, SVX_RES( CT_COLOR_BOX ) ),
- aPBDefault ( this, SVX_RES( PB_RESET_TO_DEFAULT ) )
+ aGbChartColors ( this, CUI_RES( FL_CHART_COLOR_LIST ) ),
+ aLbChartColors ( this, CUI_RES( LB_CHART_COLOR_LIST ) ),
+ aGbColorBox ( this, CUI_RES( FL_COLOR_BOX ) ),
+ aValSetColorBox ( this, CUI_RES( CT_COLOR_BOX ) ),
+ aPBDefault ( this, CUI_RES( PB_RESET_TO_DEFAULT ) )
{
FreeResource();
diff --git a/svx/source/inc/optchart.hrc b/cui/source/options/optchart.hrc
index ac42f857f8ea..ac42f857f8ea 100644
--- a/svx/source/inc/optchart.hrc
+++ b/cui/source/options/optchart.hrc
diff --git a/svx/source/cui/optchart.hxx b/cui/source/options/optchart.hxx
index 9316d2a8ea85..9316d2a8ea85 100644
--- a/svx/source/cui/optchart.hxx
+++ b/cui/source/options/optchart.hxx
diff --git a/svx/source/options/optchart.src b/cui/source/options/optchart.src
index bab97295d291..1008f5383a11 100644
--- a/svx/source/options/optchart.src
+++ b/cui/source/options/optchart.src
@@ -29,7 +29,7 @@
************************************************************************/
#include "optchart.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "helpid.hrc"
// tab page for setting the default colors used for new charts
diff --git a/svx/source/cui/optcolor.cxx b/cui/source/options/optcolor.cxx
index e20c2284314c..6d451c53cab9 100644
--- a/svx/source/cui/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -29,11 +29,7 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
// include ---------------------------------------------------------------
#include <svtools/colorcfg.hxx>
@@ -42,23 +38,18 @@
#include <svtools/ctrlbox.hxx>
#include <vcl/scrbar.hxx>
#include <svx/xtable.hxx>
-#include <svtools/moduleoptions.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/moduleoptions.hxx>
+#include <unotools/pathoptions.hxx>
#include <vcl/msgbox.hxx>
#include <boost/shared_ptr.hpp>
-//CHINA001 #ifndef _SVX_DLG_NAME_HXX
-//CHINA001 #include <dlgname.hxx>
-//CHINA001 #endif
-#include <svx/svxdlg.hxx> //CHINA001
-#ifndef _SVX_HELPID_HRC
+#include <svx/svxdlg.hxx>
#include <helpid.hrc>
-#endif
-#include <svx/svxids.hrc>
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
#include "optcolor.hxx"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "optcolor.hrc"
-#include "dlgutil.hxx"
+#include <svx/dlgutil.hxx>
+
using namespace ::com::sun::star;
using namespace ::svtools;
@@ -1443,17 +1434,17 @@ IMPL_LINK(ColorConfigCtrl_Impl, ControlFocusHdl, Control*, pCtrl)
---------------------------------------------------------------------------*/
SvxColorOptionsTabPage::SvxColorOptionsTabPage(
Window* pParent, const SfxItemSet& rCoreSet) :
- SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_COLORCONFIG ), rCoreSet ),
- aColorSchemeFL( this, SVX_RES( FL_COLORSCHEME ) ),
- aColorSchemeFT( this, SVX_RES( FT_COLORSCHEME ) ),
- aColorSchemeLB( this, SVX_RES( LB_COLORSCHEME ) ),
- aSaveSchemePB( this, SVX_RES( PB_SAVESCHEME) ),
- aDeleteSchemePB( this, SVX_RES( PB_DELETESCHEME ) ),
- aCustomColorsFL( this, SVX_RES( FL_CUSTOMCOLORS ) ),
+ SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_COLORCONFIG ), rCoreSet ),
+ aColorSchemeFL( this, CUI_RES( FL_COLORSCHEME ) ),
+ aColorSchemeFT( this, CUI_RES( FT_COLORSCHEME ) ),
+ aColorSchemeLB( this, CUI_RES( LB_COLORSCHEME ) ),
+ aSaveSchemePB( this, CUI_RES( PB_SAVESCHEME) ),
+ aDeleteSchemePB( this, CUI_RES( PB_DELETESCHEME ) ),
+ aCustomColorsFL( this, CUI_RES( FL_CUSTOMCOLORS ) ),
bFillItemSetCalled(FALSE),
pColorConfig(0),
pExtColorConfig(0),
- pColorConfigCT( new ColorConfigCtrl_Impl(this, SVX_RES( CT_COLORCONFIG ) ))
+ pColorConfigCT( new ColorConfigCtrl_Impl(this, CUI_RES( CT_COLORCONFIG ) ))
{
FreeResource();
aColorSchemeLB.SetSelectHdl(LINK(this, SvxColorOptionsTabPage, SchemeChangedHdl_Impl));
@@ -1582,14 +1573,14 @@ IMPL_LINK(SvxColorOptionsTabPage, SaveDeleteHdl_Impl, PushButton*, pButton )
String sName;
//CHINA001 SvxNameDialog aNameDlg(pButton,
//CHINA001 sName,
- //CHINA001 String(SVX_RES(RID_SVXSTR_COLOR_CONFIG_SAVE2)));
+ //CHINA001 String(CUI_RES(RID_SVXSTR_COLOR_CONFIG_SAVE2)));
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
AbstractSvxNameDialog* aNameDlg = pFact->CreateSvxNameDialog( pButton,
- sName, String(SVX_RES(RID_SVXSTR_COLOR_CONFIG_SAVE2)), RID_SVXDLG_NAME );
+ sName, String(CUI_RES(RID_SVXSTR_COLOR_CONFIG_SAVE2)) );
DBG_ASSERT(aNameDlg, "Dialogdiet fail!");//CHINA001
aNameDlg->SetCheckNameHdl( LINK(this, SvxColorOptionsTabPage, CheckNameHdl_Impl));
- aNameDlg->SetText(String(SVX_RES(RID_SVXSTR_COLOR_CONFIG_SAVE1)));
+ aNameDlg->SetText(String(CUI_RES(RID_SVXSTR_COLOR_CONFIG_SAVE1)));
aNameDlg->SetHelpId(HID_OPTIONS_COLORCONFIG_SAVE_SCHEME);
aNameDlg->SetEditHelpId(HID_OPTIONS_COLORCONFIG_NAME_SCHEME);
aNameDlg->SetCheckNameHdl( LINK(this, SvxColorOptionsTabPage, CheckNameHdl_Impl));
@@ -1607,8 +1598,8 @@ IMPL_LINK(SvxColorOptionsTabPage, SaveDeleteHdl_Impl, PushButton*, pButton )
else
{
DBG_ASSERT(aColorSchemeLB.GetEntryCount() > 1, "don't delete the last scheme");
- QueryBox aQuery(pButton, SVX_RES(RID_SVXQB_DELETE_COLOR_CONFIG));
- aQuery.SetText(String(SVX_RES(RID_SVXSTR_COLOR_CONFIG_DELETE)));
+ QueryBox aQuery(pButton, CUI_RES(RID_SVXQB_DELETE_COLOR_CONFIG));
+ aQuery.SetText(String(CUI_RES(RID_SVXSTR_COLOR_CONFIG_DELETE)));
if(RET_YES == aQuery.Execute())
{
rtl::OUString sDeleteScheme(aColorSchemeLB.GetSelectEntry());
diff --git a/svx/inc/optcolor.hrc b/cui/source/options/optcolor.hrc
index 06730cf196c0..06730cf196c0 100644
--- a/svx/inc/optcolor.hrc
+++ b/cui/source/options/optcolor.hrc
diff --git a/svx/source/cui/optcolor.hxx b/cui/source/options/optcolor.hxx
index c50062f15366..c50062f15366 100644
--- a/svx/source/cui/optcolor.hxx
+++ b/cui/source/options/optcolor.hxx
diff --git a/svx/source/options/optcolor.src b/cui/source/options/optcolor.src
index 593439807c14..9f3b42e0be30 100644
--- a/svx/source/options/optcolor.src
+++ b/cui/source/options/optcolor.src
@@ -30,7 +30,7 @@
// include ---------------------------------------------------------------
#include <sfx2/sfx.hrc>
#include "helpid.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "optcolor.hrc"
// pragma ----------------------------------------------------------------
diff --git a/svx/source/cui/optctl.cxx b/cui/source/options/optctl.cxx
index a2a2b2cc461c..199fcc38090b 100644
--- a/svx/source/cui/optctl.cxx
+++ b/cui/source/options/optctl.cxx
@@ -29,21 +29,12 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
#include "optctl.hxx"
-#include <svx/dialmgr.hxx>
-
-#ifndef _SVX_OPTCTL_HRC
+#include <dialmgr.hxx>
#include "optctl.hrc"
-#endif
-#ifndef _SVX_DIALOGS_HRC
-#include <svx/dialogs.hrc>
-#endif
-#include <svtools/ctloptions.hxx>
+#include <cuires.hrc>
+#include <svl/ctloptions.hxx>
// class SvxCTLOptionsPage -----------------------------------------------------
@@ -63,19 +54,19 @@ IMPL_LINK( SvxCTLOptionsPage, SequenceCheckingCB_Hdl, void*, EMPTYARG )
SvxCTLOptionsPage::SvxCTLOptionsPage( Window* pParent, const SfxItemSet& rSet ) :
- SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_OPTIONS_CTL ), rSet ),
-
- m_aSequenceCheckingFL ( this, SVX_RES( FL_SEQUENCECHECKING ) ),
- m_aSequenceCheckingCB ( this, SVX_RES( CB_SEQUENCECHECKING ) ),
- m_aRestrictedCB ( this, SVX_RES( CB_RESTRICTED ) ),
- m_aTypeReplaceCB ( this, SVX_RES( CB_TYPE_REPLACE ) ),
- m_aCursorControlFL ( this, SVX_RES( FL_CURSORCONTROL ) ),
- m_aMovementFT ( this, SVX_RES( FT_MOVEMENT ) ),
- m_aMovementLogicalRB ( this, SVX_RES( RB_MOVEMENT_LOGICAL ) ),
- m_aMovementVisualRB ( this, SVX_RES( RB_MOVEMENT_VISUAL ) ),
- m_aGeneralFL ( this, SVX_RES( FL_GENERAL ) ),
- m_aNumeralsFT ( this, SVX_RES( FT_NUMERALS ) ),
- m_aNumeralsLB ( this, SVX_RES( LB_NUMERALS ) )
+ SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_OPTIONS_CTL ), rSet ),
+
+ m_aSequenceCheckingFL ( this, CUI_RES( FL_SEQUENCECHECKING ) ),
+ m_aSequenceCheckingCB ( this, CUI_RES( CB_SEQUENCECHECKING ) ),
+ m_aRestrictedCB ( this, CUI_RES( CB_RESTRICTED ) ),
+ m_aTypeReplaceCB ( this, CUI_RES( CB_TYPE_REPLACE ) ),
+ m_aCursorControlFL ( this, CUI_RES( FL_CURSORCONTROL ) ),
+ m_aMovementFT ( this, CUI_RES( FT_MOVEMENT ) ),
+ m_aMovementLogicalRB ( this, CUI_RES( RB_MOVEMENT_LOGICAL ) ),
+ m_aMovementVisualRB ( this, CUI_RES( RB_MOVEMENT_VISUAL ) ),
+ m_aGeneralFL ( this, CUI_RES( FL_GENERAL ) ),
+ m_aNumeralsFT ( this, CUI_RES( FT_NUMERALS ) ),
+ m_aNumeralsLB ( this, CUI_RES( LB_NUMERALS ) )
{
FreeResource();
diff --git a/svx/inc/optctl.hrc b/cui/source/options/optctl.hrc
index 4897926f610c..4897926f610c 100644
--- a/svx/inc/optctl.hrc
+++ b/cui/source/options/optctl.hrc
diff --git a/svx/source/cui/optctl.hxx b/cui/source/options/optctl.hxx
index 0dae0e24f180..0dae0e24f180 100644
--- a/svx/source/cui/optctl.hxx
+++ b/cui/source/options/optctl.hxx
diff --git a/svx/source/options/optctl.src b/cui/source/options/optctl.src
index 2cf9ad051f67..f750264a1df1 100644
--- a/svx/source/options/optctl.src
+++ b/cui/source/options/optctl.src
@@ -30,7 +30,7 @@
#include "optctl.hrc"
#include "helpid.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include <sfx2/sfx.hrc>
diff --git a/svx/source/cui/optdict.cxx b/cui/source/options/optdict.cxx
index 88674c141b36..e56089dd351e 100644
--- a/svx/source/cui/optdict.cxx
+++ b/cui/source/options/optdict.cxx
@@ -29,41 +29,29 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
// include ---------------------------------------------------------------
#include <tools/shl.hxx>
-
-
-#include <unolingu.hxx>
-#include <dlgutil.hxx>
+#include <svx/unolingu.hxx>
+#include <svx/dlgutil.hxx>
#include <sfx2/sfxuno.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
#include <com/sun/star/frame/XStorable.hpp>
-#ifndef _UNOTOOLS_PROCESSFACTORY_HXX
#include <comphelper/processfactory.hxx>
-#endif
#include <unotools/intlwrapper.hxx>
#include <vcl/svapp.hxx>
#include <vcl/msgbox.hxx>
+#include <svx/dialogs.hrc>
#define _SVX_OPTDICT_CXX
-#ifndef _LINGUISTIC_MISC_HHX_
#include <linguistic/misc.hxx>
-#endif
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "optdict.hrc"
-
-
-
#include "optdict.hxx"
-#include <svx/dialmgr.hxx>
-#include "svxerr.hxx"
+#include <dialmgr.hxx>
+#include <svx/svxerr.hxx>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -114,17 +102,17 @@ static CDE_RESULT cmpDicEntry_Impl( const String &rText1, const String &rText2 )
SvxNewDictionaryDialog::SvxNewDictionaryDialog( Window* pParent,
Reference< XSpellChecker1 > &xSpl ) :
- ModalDialog( pParent, SVX_RES( RID_SFXDLG_NEWDICT ) ),
-
- aNameText ( this, SVX_RES( FT_DICTNAME ) ),
- aNameEdit ( this, SVX_RES( ED_DICTNAME ) ),
- aLanguageText ( this, SVX_RES( FT_DICTLANG ) ),
- aLanguageLB ( this, SVX_RES( LB_DICTLANG ) ),
- aExceptBtn ( this, SVX_RES( BTN_EXCEPT ) ),
- aNewDictBox ( this, SVX_RES( GB_NEWDICT ) ),
- aOKBtn ( this, SVX_RES( BTN_NEWDICT_OK ) ),
- aCancelBtn ( this, SVX_RES( BTN_NEWDICT_ESC ) ),
- aHelpBtn ( this, SVX_RES( BTN_NEWDICT_HLP ) ),
+ ModalDialog( pParent, CUI_RES( RID_SFXDLG_NEWDICT ) ),
+
+ aNameText ( this, CUI_RES( FT_DICTNAME ) ),
+ aNameEdit ( this, CUI_RES( ED_DICTNAME ) ),
+ aLanguageText ( this, CUI_RES( FT_DICTLANG ) ),
+ aLanguageLB ( this, CUI_RES( LB_DICTLANG ) ),
+ aExceptBtn ( this, CUI_RES( BTN_EXCEPT ) ),
+ aNewDictBox ( this, CUI_RES( GB_NEWDICT ) ),
+ aOKBtn ( this, CUI_RES( BTN_NEWDICT_OK ) ),
+ aCancelBtn ( this, CUI_RES( BTN_NEWDICT_ESC ) ),
+ aHelpBtn ( this, CUI_RES( BTN_NEWDICT_HLP ) ),
xSpell( xSpl )
{
// Handler installieren
@@ -165,7 +153,7 @@ IMPL_LINK( SvxNewDictionaryDialog, OKHdl_Impl, Button *, EMPTYARG )
if ( bFound )
{
// Doppelte Namen?
- InfoBox( this, SVX_RESSTR( RID_SVXSTR_OPT_DOUBLE_DICTS ) ).Execute();
+ InfoBox( this, CUI_RESSTR( RID_SVXSTR_OPT_DOUBLE_DICTS ) ).Execute();
aNameEdit.GrabFocus();
return 0;
}
@@ -192,7 +180,7 @@ IMPL_LINK( SvxNewDictionaryDialog, OKHdl_Impl, Button *, EMPTYARG )
// Fehler: konnte neues W"orterbuch nicht anlegen
SfxErrorContext aContext( ERRCTX_SVX_LINGU_DICTIONARY, String(),
- this, RID_SVXERRCTX, &DIALOG_MGR() );
+ this, RID_SVXERRCTX, &CUI_MGR() );
ErrorHandler::HandleError( *new StringErrorInfo(
ERRCODE_SVX_LINGU_DICT_NOTWRITEABLE, sDict ) );
@@ -238,23 +226,23 @@ SvxEditDictionaryDialog::SvxEditDictionaryDialog(
const String& rName,
Reference< XSpellChecker1 > &xSpl ) :
- ModalDialog( pParent, SVX_RES( RID_SFXDLG_EDITDICT ) ),
-
- aBookFT ( this, SVX_RES( FT_BOOK ) ),
- aAllDictsLB ( this, SVX_RES( LB_ALLDICTS ) ),
- aLangFT ( this, SVX_RES( FT_DICTLANG ) ),
- aLangLB ( this, SVX_RES( LB_DICTLANG ) ),
- aWordFT ( this, SVX_RES( FT_WORD ) ),
- aWordED ( this, SVX_RES( ED_WORD ) ),
- aReplaceFT ( this, SVX_RES( FT_REPLACE ) ),
- aReplaceED ( this, SVX_RES( ED_REPLACE ) ),
- aWordsLB ( this, SVX_RES( TLB_REPLACE ) ),
- aNewReplacePB ( this, SVX_RES( PB_NEW_REPLACE ) ),
- aDeletePB ( this, SVX_RES( PB_DELETE_REPLACE ) ),
- aEditDictsBox ( this, SVX_RES( GB_EDITDICTS ) ),
- aCloseBtn ( this, SVX_RES( BTN_EDITCLOSE ) ),
- aHelpBtn ( this, SVX_RES( BTN_EDITHELP ) ),
- sModify (SVX_RES(STR_MODIFY)),
+ ModalDialog( pParent, CUI_RES( RID_SFXDLG_EDITDICT ) ),
+
+ aBookFT ( this, CUI_RES( FT_BOOK ) ),
+ aAllDictsLB ( this, CUI_RES( LB_ALLDICTS ) ),
+ aLangFT ( this, CUI_RES( FT_DICTLANG ) ),
+ aLangLB ( this, CUI_RES( LB_DICTLANG ) ),
+ aWordFT ( this, CUI_RES( FT_WORD ) ),
+ aWordED ( this, CUI_RES( ED_WORD ) ),
+ aReplaceFT ( this, CUI_RES( FT_REPLACE ) ),
+ aReplaceED ( this, CUI_RES( ED_REPLACE ) ),
+ aWordsLB ( this, CUI_RES( TLB_REPLACE ) ),
+ aNewReplacePB ( this, CUI_RES( PB_NEW_REPLACE ) ),
+ aDeletePB ( this, CUI_RES( PB_DELETE_REPLACE ) ),
+ aEditDictsBox ( this, CUI_RES( GB_EDITDICTS ) ),
+ aCloseBtn ( this, CUI_RES( BTN_EDITCLOSE ) ),
+ aHelpBtn ( this, CUI_RES( BTN_EDITHELP ) ),
+ sModify (CUI_RES(STR_MODIFY)),
sNew (aNewReplacePB.GetText()),
aDecoView ( this),
xSpell ( xSpl ),
@@ -471,7 +459,7 @@ IMPL_LINK( SvxEditDictionaryDialog, SelectLangHdl_Impl, ListBox *, EMPTYARG )
if ( nLang != nOldLang )
{
- QueryBox aBox( this, SVX_RES( RID_SFXQB_SET_LANGUAGE ) );
+ QueryBox aBox( this, CUI_RES( RID_SFXQB_SET_LANGUAGE ) );
String sTxt( aBox.GetMessText() );
sTxt.SearchAndReplaceAscii( "%1", aAllDictsLB.GetSelectEntry() );
aBox.SetMessText( sTxt );
diff --git a/svx/source/inc/optdict.hrc b/cui/source/options/optdict.hrc
index af9e9302d7d5..af9e9302d7d5 100644
--- a/svx/source/inc/optdict.hrc
+++ b/cui/source/options/optdict.hrc
diff --git a/svx/source/options/optdict.src b/cui/source/options/optdict.src
index 740853410a61..589f73b4f46b 100644
--- a/svx/source/options/optdict.src
+++ b/cui/source/options/optdict.src
@@ -30,7 +30,7 @@
// include ---------------------------------------------------------------
#include <sfx2/sfx.hrc>
#include "helpid.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "optdict.hrc"
// pragma ----------------------------------------------------------------
diff --git a/svx/source/cui/optfltr.cxx b/cui/source/options/optfltr.cxx
index d6c838a13314..feb38daff447 100644
--- a/svx/source/cui/optfltr.cxx
+++ b/cui/source/options/optfltr.cxx
@@ -29,21 +29,16 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
// include ---------------------------------------------------------------
-#include <svtools/moduleoptions.hxx>
-
-#include <svtools/fltrcfg.hxx>
+#include <unotools/moduleoptions.hxx>
+#include <unotools/fltrcfg.hxx>
#include "optfltr.hxx"
#include "optfltr.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "helpid.hrc"
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
enum MSFltrPg2_CheckBoxEntries {
Math,
@@ -59,17 +54,17 @@ enum MSFltrPg2_CheckBoxEntries {
// -----------------------------------------------------------------------
OfaMSFilterTabPage::OfaMSFilterTabPage(Window* pParent, const SfxItemSet& rSet)
- : SfxTabPage( pParent, SVX_RES( RID_OFAPAGE_MSFILTEROPT ), rSet ),
- aMSWordGB ( this, SVX_RES( GB_WORD ) ),
- aWBasicCodeCB ( this, SVX_RES( CB_WBAS_CODE ) ),
- aWBasicStgCB ( this, SVX_RES( CB_WBAS_STG ) ),
- aMSExcelGB ( this, SVX_RES( GB_EXCEL ) ),
- aEBasicCodeCB ( this, SVX_RES( CB_EBAS_CODE ) ),
- aEBasicExectblCB( this, SVX_RES( CB_EBAS_EXECTBL ) ),
- aEBasicStgCB ( this, SVX_RES( CB_EBAS_STG ) ),
- aMSPPointGB ( this, SVX_RES( GB_PPOINT ) ),
- aPBasicCodeCB ( this, SVX_RES( CB_PBAS_CODE ) ),
- aPBasicStgCB ( this, SVX_RES( CB_PBAS_STG ) )
+ : SfxTabPage( pParent, CUI_RES( RID_OFAPAGE_MSFILTEROPT ), rSet ),
+ aMSWordGB ( this, CUI_RES( GB_WORD ) ),
+ aWBasicCodeCB ( this, CUI_RES( CB_WBAS_CODE ) ),
+ aWBasicStgCB ( this, CUI_RES( CB_WBAS_STG ) ),
+ aMSExcelGB ( this, CUI_RES( GB_EXCEL ) ),
+ aEBasicCodeCB ( this, CUI_RES( CB_EBAS_CODE ) ),
+ aEBasicExectblCB( this, CUI_RES( CB_EBAS_EXECTBL ) ),
+ aEBasicStgCB ( this, CUI_RES( CB_EBAS_STG ) ),
+ aMSPPointGB ( this, CUI_RES( GB_PPOINT ) ),
+ aPBasicCodeCB ( this, CUI_RES( CB_PBAS_CODE ) ),
+ aPBasicStgCB ( this, CUI_RES( CB_PBAS_STG ) )
{
FreeResource();
@@ -150,16 +145,16 @@ void OfaMSFilterTabPage::Reset( const SfxItemSet& )
* --------------------------------------------------*/
OfaMSFilterTabPage2::OfaMSFilterTabPage2( Window* pParent,
const SfxItemSet& rSet )
- : SfxTabPage( pParent, SVX_RES( RID_OFAPAGE_MSFILTEROPT2 ), rSet ),
- aCheckLB ( this, SVX_RES( CLB_SETTINGS )),
- aHeader1FT ( this, SVX_RES( FT_HEADER1_EXPLANATION )),
- aHeader2FT ( this, SVX_RES( FT_HEADER2_EXPLANATION )),
- sHeader1 ( SVX_RES( ST_HEADER1 )),
- sHeader2 ( SVX_RES( ST_HEADER2 )),
- sChgToFromMath ( SVX_RES( ST_CHG_MATH )),
- sChgToFromWriter ( SVX_RES( ST_CHG_WRITER )),
- sChgToFromCalc ( SVX_RES( ST_CHG_CALC )),
- sChgToFromImpress ( SVX_RES( ST_CHG_IMPRESS )),
+ : SfxTabPage( pParent, CUI_RES( RID_OFAPAGE_MSFILTEROPT2 ), rSet ),
+ aCheckLB ( this, CUI_RES( CLB_SETTINGS )),
+ aHeader1FT ( this, CUI_RES( FT_HEADER1_EXPLANATION )),
+ aHeader2FT ( this, CUI_RES( FT_HEADER2_EXPLANATION )),
+ sHeader1 ( CUI_RES( ST_HEADER1 )),
+ sHeader2 ( CUI_RES( ST_HEADER2 )),
+ sChgToFromMath ( CUI_RES( ST_CHG_MATH )),
+ sChgToFromWriter ( CUI_RES( ST_CHG_WRITER )),
+ sChgToFromCalc ( CUI_RES( ST_CHG_CALC )),
+ sChgToFromImpress ( CUI_RES( ST_CHG_IMPRESS )),
pCheckButtonData(0)
{
FreeResource();
diff --git a/svx/source/cui/optfltr.hrc b/cui/source/options/optfltr.hrc
index dad722916860..dad722916860 100644
--- a/svx/source/cui/optfltr.hrc
+++ b/cui/source/options/optfltr.hrc
diff --git a/svx/source/cui/optfltr.hxx b/cui/source/options/optfltr.hxx
index 6f8c975098db..6f8c975098db 100644
--- a/svx/source/cui/optfltr.hxx
+++ b/cui/source/options/optfltr.hxx
diff --git a/svx/source/cui/optfltr.src b/cui/source/options/optfltr.src
index 9e932406b265..a03a3bc1cc9c 100644
--- a/svx/source/cui/optfltr.src
+++ b/cui/source/options/optfltr.src
@@ -29,7 +29,7 @@
************************************************************************/
// include -----------------------------------------------------------------
#include "optfltr.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
// pragma ------------------------------------------------------------------
// RID_OFAPAGE_MSFILTEROPT -----------------------------------------------------
diff --git a/svx/source/cui/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 9a53de6bea72..656eca17fd22 100644
--- a/svx/source/cui/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -29,16 +29,13 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
-#include <svtools/zforlist.hxx>
+#include "precompiled_cui.hxx"
+#include <svl/zforlist.hxx>
#include <goodies/grfmgr.hxx>
-#include <svtools/flagitem.hxx>
+#include <svl/flagitem.hxx>
#include <sfx2/dispatch.hxx>
-#include <svtools/lingucfg.hxx>
-#include <svtools/szitem.hxx>
+#include <unotools/lingucfg.hxx>
+#include <svl/szitem.hxx>
#include <sfx2/viewsh.hxx>
#include <sfx2/viewfrm.hxx>
#include <sfx2/imgmgr.hxx>
@@ -46,50 +43,41 @@
#include <vcl/msgbox.hxx>
#include <vcl/mnemonic.hxx>
#include <i18npool/mslangid.hxx>
-#include <svtools/useroptions.hxx>
-#include <svtools/cacheoptions.hxx>
-#include <svtools/fontoptions.hxx>
+#include <unotools/useroptions.hxx>
+#include <unotools/cacheoptions.hxx>
+#include <unotools/fontoptions.hxx>
#include <svtools/menuoptions.hxx>
-#include <svtools/startoptions.hxx>
-#include <svtools/languageoptions.hxx>
+#include <unotools/startoptions.hxx>
+#include <svl/languageoptions.hxx>
#include <svtools/miscopt.hxx>
-#include <svtools/printwarningoptions.hxx>
-#include <svtools/syslocaleoptions.hxx>
+#include <unotools/printwarningoptions.hxx>
+#include <unotools/syslocaleoptions.hxx>
#include <svtools/helpopt.hxx>
#include <svtools/accessibilityoptions.hxx>
#include <unotools/configitem.hxx>
#include <sfx2/objsh.hxx>
#include <comphelper/types.hxx>
-#include <svtools/ctloptions.hxx>
+#include <svl/ctloptions.hxx>
#include <svtools/langtab.hxx>
#include <unotools/localfilehelper.hxx>
#include <unotools/configmgr.hxx>
#include "cuioptgenrl.hxx"
#include "optpath.hxx"
#include "optsave.hxx"
-#include <svx/optlingu.hxx>
+#include "optlingu.hxx"
#include <svx/xpool.hxx>
-#include "dlgutil.hxx"
-#ifndef _SVX_TAB_AREA_HXX
+#include <svx/dlgutil.hxx>
#include "cuitabarea.hxx"
-#endif
-#ifndef _SVX_DIALOGS_HRC
-#include <svx/dialogs.hrc>
-#endif
-#include "unolingu.hxx"
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
+#include <cuires.hrc>
+#include <svx/unolingu.hxx>
#include <svx/langitem.hxx>
-#ifndef _UNOTOOLS_PROCESSFACTORY_HXX
#include <comphelper/processfactory.hxx>
-#endif
#include <rtl/ustrbuf.hxx>
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
#include <svtools/helpopt.hxx>
-#include <svtools/saveopt.hxx>
+#include <unotools/saveopt.hxx>
#include <com/sun/star/container/XContentEnumerationAccess.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
@@ -109,7 +97,7 @@
#include "optgdlg.hrc"
#include "optgdlg.hxx"
-#include "ofaitem.hxx"
+#include <svx/ofaitem.hxx>
#include <svtools/apearcfg.hxx>
#include <svtools/optionsdrawinglayer.hxx>
@@ -206,26 +194,26 @@ namespace
OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const SfxItemSet& rSet ) :
- SfxTabPage( pParent, SVX_RES( OFA_TP_MISC ), rSet ),
-
- aHelpFL ( this, SVX_RES( FL_HELP ) ),
- aToolTipsCB ( this, SVX_RES( CB_TOOLTIP ) ),
- aExtHelpCB ( this, SVX_RES( CB_EXTHELP ) ),
- aHelpAgentCB ( this, SVX_RES( CB_HELPAGENT ) ),
- aHelpAgentResetBtn ( this, SVX_RES( PB_HELPAGENT_RESET ) ),
- aHelpFormatFT ( this, SVX_RES( FT_HELPFORMAT ) ),
- aHelpFormatLB ( this, SVX_RES( LB_HELPFORMAT ) ),
- aFileDlgFL ( this, SVX_RES( FL_FILEDLG ) ),
- aFileDlgROImage ( this, SVX_RES( FI_FILEDLG_RO ) ),
- aFileDlgCB ( this, SVX_RES( CB_FILEDLG ) ),
- aPrintDlgFL ( this, SVX_RES( FL_PRINTDLG ) ),
- aPrintDlgCB ( this, SVX_RES( CB_PRINTDLG ) ),
- aDocStatusFL ( this, SVX_RES( FL_DOCSTATUS ) ),
- aDocStatusCB ( this, SVX_RES( CB_DOCSTATUS ) ),
- aTwoFigureFL ( this, SVX_RES( FL_TWOFIGURE ) ),
- aInterpretFT ( this, SVX_RES( FT_INTERPRET ) ),
- aYearValueField ( this, SVX_RES( NF_YEARVALUE ) ),
- aToYearFT ( this, SVX_RES( FT_TOYEAR ) )
+ SfxTabPage( pParent, CUI_RES( OFA_TP_MISC ), rSet ),
+
+ aHelpFL ( this, CUI_RES( FL_HELP ) ),
+ aToolTipsCB ( this, CUI_RES( CB_TOOLTIP ) ),
+ aExtHelpCB ( this, CUI_RES( CB_EXTHELP ) ),
+ aHelpAgentCB ( this, CUI_RES( CB_HELPAGENT ) ),
+ aHelpAgentResetBtn ( this, CUI_RES( PB_HELPAGENT_RESET ) ),
+ aHelpFormatFT ( this, CUI_RES( FT_HELPFORMAT ) ),
+ aHelpFormatLB ( this, CUI_RES( LB_HELPFORMAT ) ),
+ aFileDlgFL ( this, CUI_RES( FL_FILEDLG ) ),
+ aFileDlgROImage ( this, CUI_RES( FI_FILEDLG_RO ) ),
+ aFileDlgCB ( this, CUI_RES( CB_FILEDLG ) ),
+ aPrintDlgFL ( this, CUI_RES( FL_PRINTDLG ) ),
+ aPrintDlgCB ( this, CUI_RES( CB_PRINTDLG ) ),
+ aDocStatusFL ( this, CUI_RES( FL_DOCSTATUS ) ),
+ aDocStatusCB ( this, CUI_RES( CB_DOCSTATUS ) ),
+ aTwoFigureFL ( this, CUI_RES( FL_TWOFIGURE ) ),
+ aInterpretFT ( this, CUI_RES( FT_INTERPRET ) ),
+ aYearValueField ( this, CUI_RES( NF_YEARVALUE ) ),
+ aToYearFT ( this, CUI_RES( FT_TOYEAR ) )
{
FreeResource();
@@ -673,40 +661,40 @@ void CanvasSettings::EnabledHardwareAcceleration( BOOL _bEnabled ) const
OfaViewTabPage::OfaViewTabPage(Window* pParent, const SfxItemSet& rSet ) :
- SfxTabPage( pParent, SVX_RES( OFA_TP_VIEW ), rSet ),
+ SfxTabPage( pParent, CUI_RES( OFA_TP_VIEW ), rSet ),
- aUserInterfaceFL ( this, SVX_RES( FL_USERINTERFACE ) ),
- aWindowSizeFT ( this, SVX_RES( FT_WINDOWSIZE ) ),
- aWindowSizeMF ( this, SVX_RES( MF_WINDOWSIZE ) ),
- aIconSizeStyleFT ( this, SVX_RES( FT_ICONSIZESTYLE ) ),
- aIconSizeLB ( this, SVX_RES( LB_ICONSIZE ) ),
- aIconStyleLB ( this, SVX_RES( LB_ICONSTYLE ) ),
- m_aSystemFont (this, SVX_RES( CB_SYSTEM_FONT ) ),
+ aUserInterfaceFL ( this, CUI_RES( FL_USERINTERFACE ) ),
+ aWindowSizeFT ( this, CUI_RES( FT_WINDOWSIZE ) ),
+ aWindowSizeMF ( this, CUI_RES( MF_WINDOWSIZE ) ),
+ aIconSizeStyleFT ( this, CUI_RES( FT_ICONSIZESTYLE ) ),
+ aIconSizeLB ( this, CUI_RES( LB_ICONSIZE ) ),
+ aIconStyleLB ( this, CUI_RES( LB_ICONSTYLE ) ),
+ m_aSystemFont (this, CUI_RES( CB_SYSTEM_FONT ) ),
#if defined( UNX )
- aFontAntiAliasing ( this, SVX_RES( CB_FONTANTIALIASING )),
- aAAPointLimitLabel ( this, SVX_RES( FT_POINTLIMIT_LABEL )),
- aAAPointLimit ( this, SVX_RES( NF_AA_POINTLIMIT )),
- aAAPointLimitUnits ( this, SVX_RES( FT_POINTLIMIT_UNIT )),
+ aFontAntiAliasing ( this, CUI_RES( CB_FONTANTIALIASING )),
+ aAAPointLimitLabel ( this, CUI_RES( FT_POINTLIMIT_LABEL )),
+ aAAPointLimit ( this, CUI_RES( NF_AA_POINTLIMIT )),
+ aAAPointLimitUnits ( this, CUI_RES( FT_POINTLIMIT_UNIT )),
#endif
- aMenuFL ( this, SVX_RES( FL_MENU ) ),
- aMenuIconsFT ( this, SVX_RES( FT_MENU_ICONS )),
- aMenuIconsLB ( this, SVX_RES( LB_MENU_ICONS )),
- aFontListsFL ( this, SVX_RES( FL_FONTLISTS) ),
- aFontShowCB ( this, SVX_RES( CB_FONT_SHOW ) ),
- aFontHistoryCB ( this, SVX_RES( CB_FONT_HISTORY ) ),
- aRenderingFL ( this, SVX_RES( FL_RENDERING ) ),
- aUseHardwareAccell ( this, SVX_RES( CB_USE_HARDACCELL ) ),
- aUseAntiAliase ( this, SVX_RES( CB_USE_ANTIALIASE ) ),
- aMouseFL ( this, SVX_RES( FL_MOUSE ) ),
- aMousePosFT ( this, SVX_RES( FT_MOUSEPOS ) ),
- aMousePosLB ( this, SVX_RES( LB_MOUSEPOS ) ),
- aMouseMiddleFT ( this, SVX_RES( FT_MOUSEMIDDLE ) ),
- aMouseMiddleLB ( this, SVX_RES( LB_MOUSEMIDDLE ) ),
+ aMenuFL ( this, CUI_RES( FL_MENU ) ),
+ aMenuIconsFT ( this, CUI_RES( FT_MENU_ICONS )),
+ aMenuIconsLB ( this, CUI_RES( LB_MENU_ICONS )),
+ aFontListsFL ( this, CUI_RES( FL_FONTLISTS) ),
+ aFontShowCB ( this, CUI_RES( CB_FONT_SHOW ) ),
+ aFontHistoryCB ( this, CUI_RES( CB_FONT_HISTORY ) ),
+ aRenderingFL ( this, CUI_RES( FL_RENDERING ) ),
+ aUseHardwareAccell ( this, CUI_RES( CB_USE_HARDACCELL ) ),
+ aUseAntiAliase ( this, CUI_RES( CB_USE_ANTIALIASE ) ),
+ aMouseFL ( this, CUI_RES( FL_MOUSE ) ),
+ aMousePosFT ( this, CUI_RES( FT_MOUSEPOS ) ),
+ aMousePosLB ( this, CUI_RES( LB_MOUSEPOS ) ),
+ aMouseMiddleFT ( this, CUI_RES( FT_MOUSEMIDDLE ) ),
+ aMouseMiddleLB ( this, CUI_RES( LB_MOUSEMIDDLE ) ),
// #i97672#
- maSelectionFL(this, SVX_RES(FL_SELECTION)),
- maSelectionCB(this, SVX_RES(CB_SELECTION)),
- maSelectionMF(this, SVX_RES(MF_SELECTION)),
+ maSelectionFL(this, CUI_RES(FL_SELECTION)),
+ maSelectionCB(this, CUI_RES(CB_SELECTION)),
+ maSelectionMF(this, CUI_RES(MF_SELECTION)),
nSizeLB_InitialSelection(0),
nStyleLB_InitialSelection(0),
@@ -756,7 +744,7 @@ OfaViewTabPage::OfaViewTabPage(Window* pParent, const SfxItemSet& rSet ) :
};
// temporaryly create the checkbox for the anti aliasing (we need to to determine it's pos)
- CheckBox* pFontAntiAliasing = new CheckBox( this, SVX_RES( CB_FONTANTIALIASING ) );
+ CheckBox* pFontAntiAliasing = new CheckBox( this, CUI_RES( CB_FONTANTIALIASING ) );
sal_Int32 nMoveUp = aMenuFL.GetPosPixel().Y() - pFontAntiAliasing->GetPosPixel().Y();
DELETEZ( pFontAntiAliasing );
@@ -781,6 +769,30 @@ OfaViewTabPage::OfaViewTabPage(Window* pParent, const SfxItemSet& rSet ) :
m_aSystemFont.Enable( FALSE );
}
+ const StyleSettings& aStyleSettings = Application::GetSettings().GetStyleSettings();
+
+ // remove non-installed icon themes
+ if( aIconStyleLB.GetEntryCount() == STYLE_SYMBOLS_THEMES_MAX )
+ {
+ // do not check 0th item == auto; it is not a real theme
+ aIconStyleItemId[0] = 0;
+ ULONG nItem = 1;
+ for ( ULONG n=0; ++n < STYLE_SYMBOLS_THEMES_MAX; )
+ {
+ if ( aStyleSettings.CheckSymbolStyle( n ) )
+ {
+ // existing style => save the item id
+ aIconStyleItemId[n] = nItem++;
+ }
+ else
+ {
+ // non-existing style => remove item;
+ aIconStyleLB.RemoveEntry( nItem );
+ aIconStyleItemId[n] = 0;
+ }
+ }
+ }
+
// add real theme name to 'auto' theme, e.g. 'auto' => 'auto (classic)'
if( aIconStyleLB.GetEntryCount() > 1 )
{
@@ -788,19 +800,14 @@ OfaViewTabPage::OfaViewTabPage(Window* pParent, const SfxItemSet& rSet ) :
aAutoStr += ::rtl::OUString::createFromAscii( " (" );
- switch( Application::GetSettings().GetStyleSettings().GetAutoSymbolsStyle() )
- {
- case STYLE_SYMBOLS_DEFAULT: aAutoStr += aIconStyleLB.GetEntry( 1 ); break;
- case STYLE_SYMBOLS_INDUSTRIAL: aAutoStr += aIconStyleLB.GetEntry( 2 ); break;
- case STYLE_SYMBOLS_CRYSTAL: aAutoStr += aIconStyleLB.GetEntry( 3 ); break;
- case STYLE_SYMBOLS_TANGO: aAutoStr += aIconStyleLB.GetEntry( 4 ); break;
- case STYLE_SYMBOLS_CLASSIC: aAutoStr += aIconStyleLB.GetEntry( 5 ); break;
- case STYLE_SYMBOLS_HICONTRAST: aAutoStr += aIconStyleLB.GetEntry( 6 ); break;
- }
+ ULONG nAutoStyle = aStyleSettings.GetAutoSymbolsStyle();
+ if ( aIconStyleItemId[nAutoStyle] )
+ aAutoStr += aIconStyleLB.GetEntry( aIconStyleItemId[nAutoStyle] );
aIconStyleLB.RemoveEntry( 0 );
aIconStyleLB.InsertEntry( aAutoStr += ::rtl::OUString::createFromAscii( ")" ), 0 );
- aIconStyleLB.SetSeparatorPos( aIconStyleLB.GetEntryCount() - 2 );
+ // separate auto and other icon themes
+ aIconStyleLB.SetSeparatorPos( 0 );
}
}
@@ -879,20 +886,16 @@ BOOL OfaViewTabPage::FillItemSet( SfxItemSet& )
UINT16 nStyleLB_NewSelection = aIconStyleLB.GetSelectEntryPos();
if( nStyleLB_InitialSelection != nStyleLB_NewSelection )
{
- sal_Int16 eSet = SFX_SYMBOLS_STYLE_AUTO;
- switch( nStyleLB_NewSelection )
+ // find the style name in the aIconStyleItemId table
+ // items from the non-installed icon themes were removed
+ for ( ULONG n=0; n < STYLE_SYMBOLS_THEMES_MAX; n++ )
{
- case 0: eSet = SFX_SYMBOLS_STYLE_AUTO; break;
- case 1: eSet = SFX_SYMBOLS_STYLE_DEFAULT; break;
- case 2: eSet = SFX_SYMBOLS_STYLE_HICONTRAST; break;
- case 3: eSet = SFX_SYMBOLS_STYLE_INDUSTRIAL; break;
- case 4: eSet = SFX_SYMBOLS_STYLE_CRYSTAL; break;
- case 5: eSet = SFX_SYMBOLS_STYLE_TANGO; break;
- case 6: eSet = SFX_SYMBOLS_STYLE_CLASSIC; break;
- default:
- DBG_ERROR( "OfaViewTabPage::FillItemSet(): This state of aIconStyleLB should not be possible!" );
+ if ( aIconStyleItemId[n] == nStyleLB_NewSelection )
+ {
+ aMiscOptions.SetSymbolsStyle( n );
+ n = STYLE_SYMBOLS_THEMES_MAX;
+ }
}
- aMiscOptions.SetSymbolsStyle( eSet );
}
BOOL bAppearanceChanged = FALSE;
@@ -1063,19 +1066,8 @@ void OfaViewTabPage::Reset( const SfxItemSet& )
aIconSizeLB.SelectEntryPos( nSizeLB_InitialSelection );
aIconSizeLB.SaveValue();
- if( aMiscOptions.GetSymbolsStyle() != SFX_SYMBOLS_STYLE_AUTO )
- {
- switch ( aMiscOptions.GetCurrentSymbolsStyle() )
- {
- case SFX_SYMBOLS_STYLE_DEFAULT: nStyleLB_InitialSelection = 1; break;
- case SFX_SYMBOLS_STYLE_HICONTRAST: nStyleLB_InitialSelection = 2; break;
- case SFX_SYMBOLS_STYLE_INDUSTRIAL: nStyleLB_InitialSelection = 3; break;
- case SFX_SYMBOLS_STYLE_CRYSTAL: nStyleLB_InitialSelection = 4; break;
- case SFX_SYMBOLS_STYLE_TANGO: nStyleLB_InitialSelection = 5; break;
- case SFX_SYMBOLS_STYLE_CLASSIC: nStyleLB_InitialSelection = 6; break;
- default: nStyleLB_InitialSelection = 0; break;
- }
- }
+ if( aMiscOptions.GetSymbolsStyle() != STYLE_SYMBOLS_AUTO )
+ nStyleLB_InitialSelection = aIconStyleItemId[aMiscOptions.GetCurrentSymbolsStyle()];
aIconStyleLB.SelectEntryPos( nStyleLB_InitialSelection );
aIconStyleLB.SaveValue();
@@ -1243,34 +1235,34 @@ static const OUString sOfficeLocaleKey = OUString::createFromAscii("ooLocale");
static Sequence< OUString > seqInstalledLanguages;
OfaLanguagesTabPage::OfaLanguagesTabPage( Window* pParent, const SfxItemSet& rSet ) :
- SfxTabPage( pParent, SVX_RES( OFA_TP_LANGUAGES ), rSet ),
- aUILanguageGB(this, SVX_RES(FL_UI_LANG )),
- aLocaleSettingFI(this, SVX_RES(FI_LOCALESETTING)),
- aUserInterfaceFT(this, SVX_RES(FT_USERINTERFACE)),
- aUserInterfaceLB(this, SVX_RES(LB_USERINTERFACE)),
- aLocaleSettingFT(this, SVX_RES(FT_LOCALESETTING)),
- aLocaleSettingLB(this, SVX_RES(LB_LOCALESETTING)),
- aCurrencyFI( this, SVX_RES(FI_CURRENCY )),
- aDecimalSeparatorFT(this, SVX_RES(FT_DECIMALSEPARATOR)),
- aDecimalSeparatorCB(this, SVX_RES(CB_DECIMALSEPARATOR)),
- aCurrencyFT( this, SVX_RES(FT_CURRENCY )),
- aCurrencyLB( this, SVX_RES(LB_CURRENCY )),
- aLinguLanguageGB(this, SVX_RES(FL_LINGU_LANG )),
- aWesternLanguageFI(this, SVX_RES(FI_WEST_LANG )),
- aWesternLanguageFT(this, SVX_RES(FT_WEST_LANG )),
- aWesternLanguageLB(this, SVX_RES(LB_WEST_LANG )),
- aAsianLanguageFI(this, SVX_RES(FI_ASIAN_LANG )),
- aAsianLanguageFT(this, SVX_RES(FT_ASIAN_LANG )),
- aAsianLanguageLB(this, SVX_RES(LB_ASIAN_LANG )),
- aComplexLanguageFI(this, SVX_RES(FI_COMPLEX_LANG )),
- aComplexLanguageFT(this, SVX_RES(FT_COMPLEX_LANG )),
- aComplexLanguageLB(this, SVX_RES(LB_COMPLEX_LANG )),
- aCurrentDocCB(this, SVX_RES(CB_CURRENT_DOC )),
- aEnhancedFL(this, SVX_RES(FL_ENHANCED )),
- aAsianSupportFI(this, SVX_RES(FI_ASIANSUPPORT )),
- aAsianSupportCB(this, SVX_RES(CB_ASIANSUPPORT )),
- aCTLSupportFI(this, SVX_RES(FI_CTLSUPPORT )),
- aCTLSupportCB(this, SVX_RES(CB_CTLSUPPORT )),
+ SfxTabPage( pParent, CUI_RES( OFA_TP_LANGUAGES ), rSet ),
+ aUILanguageGB(this, CUI_RES(FL_UI_LANG )),
+ aLocaleSettingFI(this, CUI_RES(FI_LOCALESETTING)),
+ aUserInterfaceFT(this, CUI_RES(FT_USERINTERFACE)),
+ aUserInterfaceLB(this, CUI_RES(LB_USERINTERFACE)),
+ aLocaleSettingFT(this, CUI_RES(FT_LOCALESETTING)),
+ aLocaleSettingLB(this, CUI_RES(LB_LOCALESETTING)),
+ aCurrencyFI( this, CUI_RES(FI_CURRENCY )),
+ aDecimalSeparatorFT(this, CUI_RES(FT_DECIMALSEPARATOR)),
+ aDecimalSeparatorCB(this, CUI_RES(CB_DECIMALSEPARATOR)),
+ aCurrencyFT( this, CUI_RES(FT_CURRENCY )),
+ aCurrencyLB( this, CUI_RES(LB_CURRENCY )),
+ aLinguLanguageGB(this, CUI_RES(FL_LINGU_LANG )),
+ aWesternLanguageFI(this, CUI_RES(FI_WEST_LANG )),
+ aWesternLanguageFT(this, CUI_RES(FT_WEST_LANG )),
+ aWesternLanguageLB(this, CUI_RES(LB_WEST_LANG )),
+ aAsianLanguageFI(this, CUI_RES(FI_ASIAN_LANG )),
+ aAsianLanguageFT(this, CUI_RES(FT_ASIAN_LANG )),
+ aAsianLanguageLB(this, CUI_RES(LB_ASIAN_LANG )),
+ aComplexLanguageFI(this, CUI_RES(FI_COMPLEX_LANG )),
+ aComplexLanguageFT(this, CUI_RES(FT_COMPLEX_LANG )),
+ aComplexLanguageLB(this, CUI_RES(LB_COMPLEX_LANG )),
+ aCurrentDocCB(this, CUI_RES(CB_CURRENT_DOC )),
+ aEnhancedFL(this, CUI_RES(FL_ENHANCED )),
+ aAsianSupportFI(this, CUI_RES(FI_ASIANSUPPORT )),
+ aAsianSupportCB(this, CUI_RES(CB_ASIANSUPPORT )),
+ aCTLSupportFI(this, CUI_RES(FI_CTLSUPPORT )),
+ aCTLSupportCB(this, CUI_RES(CB_CTLSUPPORT )),
sDecimalSeparatorLabel(aDecimalSeparatorCB.GetText()),
pLangConfig(new LanguageConfig_Impl)
{
@@ -1460,6 +1452,11 @@ void lcl_UpdateAndDelete(SfxVoidItem* pInvalidItems[], SfxBoolItem* pBoolItems[]
BOOL OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet )
{
+ // lock configuration broadcasters so that we can coordinate the notifications
+ pLangConfig->aSysLocaleOptions.BlockBroadcasts( TRUE );
+ pLangConfig->aLanguageOptions.BlockBroadcasts( TRUE );
+ pLangConfig->aLinguConfig.BlockBroadcasts( TRUE );
+
if(aCTLSupportCB.IsChecked() &&
(aCTLSupportCB.GetSavedValue() != aCTLSupportCB.IsChecked()) ||
(aComplexLanguageLB.GetSavedValue() != aComplexLanguageLB.GetSelectEntryPos()))
@@ -1498,7 +1495,7 @@ BOOL OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet )
xProp->setPropertyValue(sUserLocaleKey, makeAny(aLangString));
Reference< XChangesBatch >(xProp, UNO_QUERY_THROW)->commitChanges();
// display info
- InfoBox aBox(this, SVX_RES(RID_SVX_MSGBOX_LANGUAGE_RESTART));
+ InfoBox aBox(this, CUI_RES(RID_SVX_MSGBOX_LANGUAGE_RESTART));
aBox.Execute();
// tell quickstarter to stop being a veto listener
@@ -1523,8 +1520,6 @@ BOOL OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet )
OSL_ENSURE(sal_False, aMsg.getStr());
}
- pLangConfig->aSysLocaleOptions.BlockBroadcasts( TRUE );
-
OUString sLang = pLangConfig->aSysLocaleOptions.GetLocaleConfigString();
LanguageType eOldLocale = (sLang.getLength() ?
lcl_LangStringToLangType( sLang ) : LANGUAGE_SYSTEM);
@@ -1544,22 +1539,18 @@ BOOL OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet )
sNewLang += aLocale.Country;
}
}
- // Set application settings before options, so listeners at the
- // options will access the new locale.
- AllSettings aSettings( Application::GetSettings() );
- aSettings.SetLanguage( eNewLocale );
- Application::SetSettings( aSettings );
+
+ // locale nowadays get to AppSettings via notification
+ // this will happen after releasing the lock on the ConfigurationBroadcaster at
+ // the end of this method
pLangConfig->aSysLocaleOptions.SetLocaleConfigString( sNewLang );
rSet.Put( SfxBoolItem( SID_OPT_LOCALE_CHANGED, TRUE ) );
}
- //
if(aDecimalSeparatorCB.GetSavedValue() != aDecimalSeparatorCB.IsChecked())
pLangConfig->aSysLocaleOptions.SetDecimalSeparatorAsLocale(aDecimalSeparatorCB.IsChecked());
- // Configured currency, for example, USD-en-US or EUR-de-DE, or empty for
- // locale default. This must be set _after_ the locale above in order to
- // have a valid locale for broadcasting the currency change.
+ // Configured currency, for example, USD-en-US or EUR-de-DE, or empty for locale default.
OUString sOldCurr = pLangConfig->aSysLocaleOptions.GetCurrencyConfigString();
USHORT nCurrPos = aCurrencyLB.GetSelectEntryPos();
const NfCurrencyEntry* pCurr = (const NfCurrencyEntry*)
@@ -1647,19 +1638,19 @@ BOOL OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet )
{
sal_Bool bChecked = aAsianSupportCB.IsChecked();
pLangConfig->aLanguageOptions.SetAll(bChecked);
- //iterate over all bindings to invalidate vertical text direction
- const sal_uInt16 STATE_COUNT = 2;
+ //iterate over all bindings to invalidate vertical text direction
+ const sal_uInt16 STATE_COUNT = 2;
- SfxBoolItem* pBoolItems[STATE_COUNT];
- pBoolItems[0] = new SfxBoolItem(SID_VERTICALTEXT_STATE, FALSE);
- pBoolItems[1] = new SfxBoolItem(SID_TEXT_FITTOSIZE_VERTICAL, FALSE);
+ SfxBoolItem* pBoolItems[STATE_COUNT];
+ pBoolItems[0] = new SfxBoolItem(SID_VERTICALTEXT_STATE, FALSE);
+ pBoolItems[1] = new SfxBoolItem(SID_TEXT_FITTOSIZE_VERTICAL, FALSE);
- SfxVoidItem* pInvalidItems[STATE_COUNT];
- pInvalidItems[0] = new SfxVoidItem(SID_VERTICALTEXT_STATE);
- pInvalidItems[1] = new SfxVoidItem(SID_TEXT_FITTOSIZE_VERTICAL);
+ SfxVoidItem* pInvalidItems[STATE_COUNT];
+ pInvalidItems[0] = new SfxVoidItem(SID_VERTICALTEXT_STATE);
+ pInvalidItems[1] = new SfxVoidItem(SID_TEXT_FITTOSIZE_VERTICAL);
- lcl_UpdateAndDelete(pInvalidItems, pBoolItems, STATE_COUNT);
+ lcl_UpdateAndDelete(pInvalidItems, pBoolItems, STATE_COUNT);
}
if ( aCTLSupportCB.GetSavedValue() != aCTLSupportCB.IsChecked() )
@@ -1674,11 +1665,15 @@ BOOL OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet )
lcl_UpdateAndDelete(pInvalidItems, pBoolItems, STATE_COUNT);
}
-
-
if ( pLangConfig->aSysLocaleOptions.IsModified() )
pLangConfig->aSysLocaleOptions.Commit();
+
+ // first release the lock on the ConfigurationBroadcaster for Locale changes
+ // it seems that our code relies on the fact that before other changes like e.g. currency
+ // are broadcasted locale changes have been done
pLangConfig->aSysLocaleOptions.BlockBroadcasts( FALSE );
+ pLangConfig->aLanguageOptions.BlockBroadcasts( FALSE );
+ pLangConfig->aLinguConfig.BlockBroadcasts( FALSE );
return FALSE;
}
diff --git a/svx/source/cui/optgdlg.hrc b/cui/source/options/optgdlg.hrc
index 3ad985caa706..3ad985caa706 100644
--- a/svx/source/cui/optgdlg.hrc
+++ b/cui/source/options/optgdlg.hrc
diff --git a/svx/source/cui/optgdlg.hxx b/cui/source/options/optgdlg.hxx
index 4b86896fa58f..4813e23c4305 100644
--- a/svx/source/cui/optgdlg.hxx
+++ b/cui/source/options/optgdlg.hxx
@@ -138,6 +138,9 @@ private:
UINT16 nStyleLB_InitialSelection;
BOOL bSfxSymbolsAuto;
+ // item ID for the given icon theme
+ // might be zero when the theme is not installed and the item is removed
+ ULONG aIconStyleItemId[STYLE_SYMBOLS_THEMES_MAX];
SvtTabAppearanceCfg* pAppearanceCfg;
CanvasSettings* pCanvasSettings;
SvtOptionsDrawinglayer* mpDrawinglayerOpt;
diff --git a/svx/source/cui/optgdlg.src b/cui/source/options/optgdlg.src
index f663a7ed44ef..8318d4eccd10 100644
--- a/svx/source/cui/optgdlg.src
+++ b/cui/source/options/optgdlg.src
@@ -29,7 +29,7 @@
************************************************************************/
// include ---------------------------------------------------------------
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "optgdlg.hrc"
#include "helpid.hrc"
@@ -250,6 +250,7 @@ TabPage OFA_TP_VIEW
< "Industrial" ; > ;
< "Crystal" ; > ;
< "Tango" ; > ;
+ < "Oxygen" ; > ;
< "Classic" ; > ;
};
};
diff --git a/svx/source/cui/optgenrl.cxx b/cui/source/options/optgenrl.cxx
index 7159cfdd7e61..85c0d450cc47 100644
--- a/svx/source/cui/optgenrl.cxx
+++ b/cui/source/options/optgenrl.cxx
@@ -29,27 +29,24 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
// include ---------------------------------------------------------------
#include <tools/shl.hxx>
#include <vcl/svapp.hxx>
#include <vcl/msgbox.hxx>
-#include <svtools/saveopt.hxx>
+#include <unotools/saveopt.hxx>
#define _SVX_OPTGENRL_CXX
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "optgenrl.hrc"
-#include <svtools/useroptions.hxx>
+#include <unotools/useroptions.hxx>
#include "cuioptgenrl.hxx"
-#include <svx/dialmgr.hxx>
-#include "dlgutil.hxx"
+#include <dialmgr.hxx>
+#include <svx/dlgutil.hxx>
#include <svx/strarray.hxx>
+#include <svx/svxids.hrc> // SID_FIELD_GRABFOCUS
#define TRIM(s) s.EraseLeadingChars().EraseTrailingChars()
@@ -97,53 +94,53 @@ String ConvertToStore_Impl( const String& rText )
SvxGeneralTabPage::SvxGeneralTabPage( Window* pParent, const SfxItemSet& rCoreSet ) :
- SfxTabPage( pParent, SVX_RES(RID_SFXPAGE_GENERAL), rCoreSet ),
-
- aCompanyLbl ( this, SVX_RES( FT_COMPANY ), true ),
- aCompanyEdit ( this, SVX_RES( ED_COMPANY ), INDEX_NOTSET, &aCompanyLbl ),
- aNameLbl ( this, SVX_RES( FT_NAME ), true ),
- aNameLblRuss ( this, SVX_RES( FT_NAME_RUSS ), true ),
- aNameLblEastern ( this, SVX_RES( FT_NAME_EASTERN ), true ),
- aFirstName ( this, SVX_RES( ED_FIRSTNAME ), 0, &aNameLbl ),
- aFatherName ( this, SVX_RES( ED_FATHERNAME ) ),
- aName ( this, SVX_RES( ED_NAME ), 1, &aNameLbl ),
- aShortName ( this, SVX_RES( ED_SHORTNAME ), 2, &aNameLbl ),
- aStreetLbl ( this, SVX_RES( FT_STREET ), true ),
- aStreetLblRuss ( this, SVX_RES( FT_STREET_RUSS ), true ),
- aStreetEdit ( this, SVX_RES( ED_STREET ), 0, &aStreetLbl ),
- aApartmentNrEdit( this, SVX_RES( ED_APARTMENTNR ), 1, &aStreetLblRuss ),
- aCityLbl ( this, SVX_RES( FT_CITY ), true ),
- aPLZEdit ( this, SVX_RES( ED_PLZ ), 0, &aCityLbl ),
- aCityEdit ( this, SVX_RES( ED_CITY ), 1, &aCityLbl ),
- aUsCityEdit ( this, SVX_RES( ED_US_CITY ), 0, &aCityLbl ),
- aUsStateEdit ( this, SVX_RES( ED_US_STATE ), 1, &aCityLbl ),
- aUsZipEdit ( this, SVX_RES( ED_US_ZIPCODE ), 2, &aCityLbl ),
- aCountryLbl ( this, SVX_RES( FT_COUNTRY ), true ),
- aCountryEdit ( this, SVX_RES( ED_COUNTRY ), INDEX_NOTSET, &aCountryLbl ),
- aTitlePosLbl ( this, SVX_RES( FT_TITLEPOS ), true ),
- aTitleEdit ( this, SVX_RES( ED_TITLE ), 0, &aTitlePosLbl ),
- aPositionEdit ( this, SVX_RES( ED_POSITION ), 1, &aTitlePosLbl ),
- aPhoneLbl ( this, SVX_RES( FT_PHONE ), true ),
- aTelPrivEdit ( this, SVX_RES( ED_TELPRIVAT ), 0, &aPhoneLbl ),
- aTelCompanyEdit ( this, SVX_RES( ED_TELCOMPANY ), 1, &aPhoneLbl ),
- aFaxMailLbl ( this, SVX_RES( FT_FAXMAIL ), true ),
- aFaxEdit ( this, SVX_RES( ED_FAX ), 0, &aFaxMailLbl ),
- aEmailEdit ( this, SVX_RES( ED_EMAIL ), 1, &aFaxMailLbl ),
- aAddrFrm ( this, SVX_RES( GB_ADDRESS ) ),
- aUseDataCB ( this, SVX_RES( CB_USEDATA ) ),
+ SfxTabPage( pParent, CUI_RES(RID_SFXPAGE_GENERAL), rCoreSet ),
+
+ aCompanyLbl ( this, CUI_RES( FT_COMPANY ), true ),
+ aCompanyEdit ( this, CUI_RES( ED_COMPANY ), INDEX_NOTSET, &aCompanyLbl ),
+ aNameLbl ( this, CUI_RES( FT_NAME ), true ),
+ aNameLblRuss ( this, CUI_RES( FT_NAME_RUSS ), true ),
+ aNameLblEastern ( this, CUI_RES( FT_NAME_EASTERN ), true ),
+ aFirstName ( this, CUI_RES( ED_FIRSTNAME ), 0, &aNameLbl ),
+ aFatherName ( this, CUI_RES( ED_FATHERNAME ) ),
+ aName ( this, CUI_RES( ED_NAME ), 1, &aNameLbl ),
+ aShortName ( this, CUI_RES( ED_SHORTNAME ), 2, &aNameLbl ),
+ aStreetLbl ( this, CUI_RES( FT_STREET ), true ),
+ aStreetLblRuss ( this, CUI_RES( FT_STREET_RUSS ), true ),
+ aStreetEdit ( this, CUI_RES( ED_STREET ), 0, &aStreetLbl ),
+ aApartmentNrEdit( this, CUI_RES( ED_APARTMENTNR ), 1, &aStreetLblRuss ),
+ aCityLbl ( this, CUI_RES( FT_CITY ), true ),
+ aPLZEdit ( this, CUI_RES( ED_PLZ ), 0, &aCityLbl ),
+ aCityEdit ( this, CUI_RES( ED_CITY ), 1, &aCityLbl ),
+ aUsCityEdit ( this, CUI_RES( ED_US_CITY ), 0, &aCityLbl ),
+ aUsStateEdit ( this, CUI_RES( ED_US_STATE ), 1, &aCityLbl ),
+ aUsZipEdit ( this, CUI_RES( ED_US_ZIPCODE ), 2, &aCityLbl ),
+ aCountryLbl ( this, CUI_RES( FT_COUNTRY ), true ),
+ aCountryEdit ( this, CUI_RES( ED_COUNTRY ), INDEX_NOTSET, &aCountryLbl ),
+ aTitlePosLbl ( this, CUI_RES( FT_TITLEPOS ), true ),
+ aTitleEdit ( this, CUI_RES( ED_TITLE ), 0, &aTitlePosLbl ),
+ aPositionEdit ( this, CUI_RES( ED_POSITION ), 1, &aTitlePosLbl ),
+ aPhoneLbl ( this, CUI_RES( FT_PHONE ), true ),
+ aTelPrivEdit ( this, CUI_RES( ED_TELPRIVAT ), 0, &aPhoneLbl ),
+ aTelCompanyEdit ( this, CUI_RES( ED_TELCOMPANY ), 1, &aPhoneLbl ),
+ aFaxMailLbl ( this, CUI_RES( FT_FAXMAIL ), true ),
+ aFaxEdit ( this, CUI_RES( ED_FAX ), 0, &aFaxMailLbl ),
+ aEmailEdit ( this, CUI_RES( ED_EMAIL ), 1, &aFaxMailLbl ),
+ aAddrFrm ( this, CUI_RES( GB_ADDRESS ) ),
+ aUseDataCB ( this, CUI_RES( CB_USEDATA ) ),
pImpl ( new GeneralTabPage_Impl )
{
LanguageType eLang = Application::GetSettings().GetUILanguage();
- pImpl->maQueryStr = String( SVX_RES( STR_QUERY_REG ) );
+ pImpl->maQueryStr = String( CUI_RES( STR_QUERY_REG ) );
if ( LANGUAGE_ENGLISH_US == eLang )
{
// amerikanische Postadresse aufbauen
aPLZEdit.Hide();
aCityEdit.Hide();
- aCityLbl.SetText( SVX_RES( STR_US_STATE ) );
+ aCityLbl.SetText( CUI_RES( STR_US_STATE ) );
}
else if ( LANGUAGE_RUSSIAN == eLang )
{
diff --git a/svx/inc/optgenrl.hrc b/cui/source/options/optgenrl.hrc
index 4c519d5ebb70..4c519d5ebb70 100644
--- a/svx/inc/optgenrl.hrc
+++ b/cui/source/options/optgenrl.hrc
diff --git a/svx/source/options/optgenrl.src b/cui/source/options/optgenrl.src
index cff6f8d4216c..1d0b049dd204 100644
--- a/svx/source/options/optgenrl.src
+++ b/cui/source/options/optgenrl.src
@@ -33,7 +33,7 @@
#include <sfx2/sfx.hrc>
#include "helpid.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "optgenrl.hrc"
// RID_SFXPAGE_GENERAL ------------------------------------------------------
@@ -276,24 +276,6 @@ QueryBox RID_SVXQB_CHANGEDATA
Message [ en-US ] = "The User Data have been changed.\nNote that, if you continue, the registration key will become invalid.\nTherefore, a new registration key is needed within 30 days.\nYou can find the registration form in the menu Help - Registration...\nDo you really want to change your User Data?";
};
- // RID_SVXSTR_FIELDUNIT_TABLE --------------------------------------------
-
-StringArray RID_SVXSTR_FIELDUNIT_TABLE
-{
- ItemList [ en-US ] =
- {
- < "Millimeter" ; FUNIT_MM ; > ;
- < "Centimeter" ; FUNIT_CM ; > ;
- < "Meter" ; FUNIT_M ; > ;
- < "Kilometer" ; FUNIT_KM ; > ;
- < "Inch" ; FUNIT_INCH ; > ;
- < "Foot" ; FUNIT_FOOT ; > ;
- < "Miles" ; FUNIT_MILE ; > ;
- < "Pica" ; FUNIT_PICA ; > ;
- < "Point" ; FUNIT_POINT ; > ;
- };
- };
-
// ********************************************************************** EOF
diff --git a/svx/source/cui/opthtml.cxx b/cui/source/options/opthtml.cxx
index 837768dded1a..bddcd4a9e182 100644
--- a/svx/source/cui/opthtml.cxx
+++ b/cui/source/options/opthtml.cxx
@@ -29,22 +29,18 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
// include ---------------------------------------------------------------
#include <svtools/langtab.hxx>
-#include "htmlcfg.hxx"
+#include <svx/htmlcfg.hxx>
#include "opthtml.hxx"
#include "opthtml.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "helpid.hrc"
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
// Umwandlung der Modi zu den Positionen in der Listbox
const USHORT aPosToExportArr[] =
@@ -67,34 +63,34 @@ const USHORT aExportToPosArr[] =
// -----------------------------------------------------------------------
OfaHtmlTabPage::OfaHtmlTabPage(Window* pParent, const SfxItemSet& rSet) :
- SfxTabPage( pParent, SVX_RES( RID_OFAPAGE_HTMLOPT ), rSet ),
- aFontSizeGB ( this, SVX_RES( GB_FONTSIZE ) ),
- aSize1FT ( this, SVX_RES( FT_SIZE1 ) ),
- aSize1NF ( this, SVX_RES( NF_SIZE1 ) ),
- aSize2FT ( this, SVX_RES( FT_SIZE2 ) ),
- aSize2NF ( this, SVX_RES( NF_SIZE2 ) ),
- aSize3FT ( this, SVX_RES( FT_SIZE3 ) ),
- aSize3NF ( this, SVX_RES( NF_SIZE3 ) ),
- aSize4FT ( this, SVX_RES( FT_SIZE4 ) ),
- aSize4NF ( this, SVX_RES( NF_SIZE4 ) ),
- aSize5FT ( this, SVX_RES( FT_SIZE5 ) ),
- aSize5NF ( this, SVX_RES( NF_SIZE5 ) ),
- aSize6FT ( this, SVX_RES( FT_SIZE6 ) ),
- aSize6NF ( this, SVX_RES( NF_SIZE6 ) ),
- aSize7FT ( this, SVX_RES( FT_SIZE7 ) ),
- aSize7NF ( this, SVX_RES( NF_SIZE7 ) ),
- aImportGB ( this, SVX_RES( GB_IMPORT ) ),
- aNumbersEnglishUSCB ( this, SVX_RES( CB_NUMBERS_ENGLISH_US ) ),
- aUnknownTagCB ( this, SVX_RES( CB_UNKNOWN_TAGS ) ),
- aIgnoreFontNamesCB( this, SVX_RES( CB_IGNORE_FONTNAMES ) ),
- aExportGB ( this, SVX_RES( GB_EXPORT ) ),
- aExportLB ( this, SVX_RES( LB_EXPORT ) ),
- aStarBasicCB ( this, SVX_RES( CB_STARBASIC ) ),
- aStarBasicWarningCB(this, SVX_RES( CB_STARBASIC_WARNING ) ),
- aPrintExtensionCB( this,SVX_RES(CB_PRINT_EXTENSION )),
- aSaveGrfLocalCB ( this, SVX_RES( CB_LOCAL_GRF ) ),
- aCharSetFT ( this, SVX_RES( FT_CHARSET ) ),
- aCharSetLB ( this, SVX_RES( LB_CHARSET ) )
+ SfxTabPage( pParent, CUI_RES( RID_OFAPAGE_HTMLOPT ), rSet ),
+ aFontSizeGB ( this, CUI_RES( GB_FONTSIZE ) ),
+ aSize1FT ( this, CUI_RES( FT_SIZE1 ) ),
+ aSize1NF ( this, CUI_RES( NF_SIZE1 ) ),
+ aSize2FT ( this, CUI_RES( FT_SIZE2 ) ),
+ aSize2NF ( this, CUI_RES( NF_SIZE2 ) ),
+ aSize3FT ( this, CUI_RES( FT_SIZE3 ) ),
+ aSize3NF ( this, CUI_RES( NF_SIZE3 ) ),
+ aSize4FT ( this, CUI_RES( FT_SIZE4 ) ),
+ aSize4NF ( this, CUI_RES( NF_SIZE4 ) ),
+ aSize5FT ( this, CUI_RES( FT_SIZE5 ) ),
+ aSize5NF ( this, CUI_RES( NF_SIZE5 ) ),
+ aSize6FT ( this, CUI_RES( FT_SIZE6 ) ),
+ aSize6NF ( this, CUI_RES( NF_SIZE6 ) ),
+ aSize7FT ( this, CUI_RES( FT_SIZE7 ) ),
+ aSize7NF ( this, CUI_RES( NF_SIZE7 ) ),
+ aImportGB ( this, CUI_RES( GB_IMPORT ) ),
+ aNumbersEnglishUSCB ( this, CUI_RES( CB_NUMBERS_ENGLISH_US ) ),
+ aUnknownTagCB ( this, CUI_RES( CB_UNKNOWN_TAGS ) ),
+ aIgnoreFontNamesCB( this, CUI_RES( CB_IGNORE_FONTNAMES ) ),
+ aExportGB ( this, CUI_RES( GB_EXPORT ) ),
+ aExportLB ( this, CUI_RES( LB_EXPORT ) ),
+ aStarBasicCB ( this, CUI_RES( CB_STARBASIC ) ),
+ aStarBasicWarningCB(this, CUI_RES( CB_STARBASIC_WARNING ) ),
+ aPrintExtensionCB( this,CUI_RES(CB_PRINT_EXTENSION )),
+ aSaveGrfLocalCB ( this, CUI_RES( CB_LOCAL_GRF ) ),
+ aCharSetFT ( this, CUI_RES( FT_CHARSET ) ),
+ aCharSetLB ( this, CUI_RES( LB_CHARSET ) )
{
FreeResource();
diff --git a/svx/source/cui/opthtml.hrc b/cui/source/options/opthtml.hrc
index 6525a31fc877..6525a31fc877 100644
--- a/svx/source/cui/opthtml.hrc
+++ b/cui/source/options/opthtml.hrc
diff --git a/svx/source/cui/opthtml.hxx b/cui/source/options/opthtml.hxx
index cfdb8821bec4..3d630ea692ff 100644
--- a/svx/source/cui/opthtml.hxx
+++ b/cui/source/options/opthtml.hxx
@@ -30,25 +30,13 @@
#ifndef _OFA_OPTHTML_HXX
#define _OFA_OPTHTML_HXX
-
-#ifndef _BUTTON_HXX
#include <vcl/button.hxx>
-#endif
-#ifndef _FIELD_HXX
#include <vcl/field.hxx>
-#endif
-#ifndef _FIXED_HXX
#include <vcl/fixed.hxx>
-#endif
-#ifndef _VCL_LSTBOX_HXX
#include <vcl/lstbox.hxx>
-#endif
-#ifndef _GROUP_HXX
#include <vcl/group.hxx>
-#endif
#include <sfx2/tabdlg.hxx>
-#include "txencbox.hxx"
-
+#include <svx/txencbox.hxx>
class OfaHtmlTabPage : public SfxTabPage
{
diff --git a/svx/source/cui/opthtml.src b/cui/source/options/opthtml.src
index dc5b5f9431c7..29f5ff1fe78e 100644
--- a/svx/source/cui/opthtml.src
+++ b/cui/source/options/opthtml.src
@@ -30,7 +30,7 @@
// include -----------------------------------------------------------------
#include "opthtml.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
// RID_OFAPAGE_HTMLOPT -----------------------------------------------------
TabPage RID_OFAPAGE_HTMLOPT
diff --git a/svx/source/cui/optimprove.cxx b/cui/source/options/optimprove.cxx
index e644cc58d7b8..c8f52a63e708 100644
--- a/svx/source/cui/optimprove.cxx
+++ b/cui/source/options/optimprove.cxx
@@ -29,22 +29,19 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_cui.hxx"
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
// include ---------------------------------------------------------------
#define _SVX_OPTIMPROVE_CXX
-#include <svx/optimprove.hxx>
-#include <svx/dialmgr.hxx>
+#include <optimprove.hxx>
+#include <dialmgr.hxx>
#include <vcl/msgbox.hxx>
-
+#include <svx/dialogs.hrc>
#include "optimprove.hrc"
#include "helpid.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -64,21 +61,21 @@ using namespace com::sun::star::system;
SvxImprovementPage::SvxImprovementPage( Window* pParent ) :
- TabPage( pParent, SVX_RES( RID_SVXPAGE_IMPROVEMENT ) ),
-
- m_aImproveFL ( this, SVX_RES( FL_IMPROVE ) ),
- m_aInvitationFT ( this, SVX_RES( FT_INVITATION ) ),
- m_aYesRB ( this, SVX_RES( RB_YES ) ),
- m_aNoRB ( this, SVX_RES( RB_NO ) ),
- m_aDataFL ( this, SVX_RES( FL_DATA ) ),
- m_aNumberOfReportsFT ( this, SVX_RES( FT_NR_REPORTS ) ),
- m_aNumberOfReportsValueFT ( this, SVX_RES( FT_NR_REPORTS_VALUE ) ),
- m_aNumberOfActionsFT ( this, SVX_RES( FT_NR_ACTIONS ) ),
- m_aNumberOfActionsValueFT ( this, SVX_RES( FT_NR_ACTIONS_VALUE ) ),
- m_aShowDataPB ( this, SVX_RES( PB_SHOWDATA ) ),
-
- m_sInfo ( SVX_RES( STR_INFO ) ),
- m_sMoreInfo ( SVX_RES( STR_MOREINFO ) )
+ TabPage( pParent, CUI_RES( RID_SVXPAGE_IMPROVEMENT ) ),
+
+ m_aImproveFL ( this, CUI_RES( FL_IMPROVE ) ),
+ m_aInvitationFT ( this, CUI_RES( FT_INVITATION ) ),
+ m_aYesRB ( this, CUI_RES( RB_YES ) ),
+ m_aNoRB ( this, CUI_RES( RB_NO ) ),
+ m_aDataFL ( this, CUI_RES( FL_DATA ) ),
+ m_aNumberOfReportsFT ( this, CUI_RES( FT_NR_REPORTS ) ),
+ m_aNumberOfReportsValueFT ( this, CUI_RES( FT_NR_REPORTS_VALUE ) ),
+ m_aNumberOfActionsFT ( this, CUI_RES( FT_NR_ACTIONS ) ),
+ m_aNumberOfActionsValueFT ( this, CUI_RES( FT_NR_ACTIONS_VALUE ) ),
+ m_aShowDataPB ( this, CUI_RES( PB_SHOWDATA ) ),
+
+ m_sInfo ( CUI_RES( STR_INFO ) ),
+ m_sMoreInfo ( CUI_RES( STR_MOREINFO ) )
{
FreeResource();
diff --git a/svx/inc/optimprove.hrc b/cui/source/options/optimprove.hrc
index 919b01c6fb6a..919b01c6fb6a 100644
--- a/svx/inc/optimprove.hrc
+++ b/cui/source/options/optimprove.hrc
diff --git a/svx/source/options/optimprove.src b/cui/source/options/optimprove.src
index 86fc6d1c1a5d..d8782144cdb3 100644
--- a/svx/source/options/optimprove.src
+++ b/cui/source/options/optimprove.src
@@ -31,8 +31,9 @@
// include --------------------------------------------------------------
#include "optimprove.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "helpid.hrc"
+#include <svx/dialogs.hrc>
TabPage RID_SVXPAGE_IMPROVEMENT
{
diff --git a/svx/source/cui/optimprove2.cxx b/cui/source/options/optimprove2.cxx
index b988c7b75bad..1509b88ce186 100644
--- a/svx/source/cui/optimprove2.cxx
+++ b/cui/source/options/optimprove2.cxx
@@ -29,24 +29,20 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
// include ---------------------------------------------------------------
#define _SVX_OPTIMPROVE_CXX
-#include <svx/optimprove.hxx>
-#include <svx/dialmgr.hxx>
+#include <optimprove.hxx>
+#include <dialmgr.hxx>
#include <vcl/msgbox.hxx>
#include "optimprove.hrc"
#include "helpid.hrc"
+#include <cuires.hrc>
#include <svx/dialogs.hrc>
-
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/oooimprovement/XCore.hpp>
@@ -72,7 +68,7 @@ using namespace com::sun::star::system;
SvxEmptyPage::SvxEmptyPage( Window* pParent ) :
- TabPage( pParent, SVX_RES( RID_SVXPAGE_IMPROVEMENT ) )
+ TabPage( pParent, CUI_RES( RID_SVXPAGE_IMPROVEMENT ) )
{
FreeResource();
@@ -82,22 +78,22 @@ SvxEmptyPage::SvxEmptyPage( Window* pParent ) :
SvxImprovementOptionsPage::SvxImprovementOptionsPage( Window* pParent, const SfxItemSet& rSet ) :
- SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_IMPROVEMENT ), rSet ),
-
- m_aImproveFL ( this, SVX_RES( FL_IMPROVE ) ),
- m_aInvitationFT ( this, SVX_RES( FT_INVITATION ) ),
- m_aYesRB ( this, SVX_RES( RB_YES ) ),
- m_aNoRB ( this, SVX_RES( RB_NO ) ),
- m_aInfoFI ( this, SVX_RES( FI_INFO ) ),
- m_aDataFL ( this, SVX_RES( FL_DATA ) ),
- m_aNumberOfReportsFT ( this, SVX_RES( FT_NR_REPORTS ) ),
- m_aNumberOfReportsValueFT ( this, SVX_RES( FT_NR_REPORTS_VALUE ) ),
- m_aNumberOfActionsFT ( this, SVX_RES( FT_NR_ACTIONS ) ),
- m_aNumberOfActionsValueFT ( this, SVX_RES( FT_NR_ACTIONS_VALUE ) ),
- m_aShowDataPB ( this, SVX_RES( PB_SHOWDATA ) ),
-
- m_sInfo ( SVX_RES( STR_INFO ) ),
- m_sMoreInfo ( SVX_RES( STR_MOREINFO ) )
+ SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_IMPROVEMENT ), rSet ),
+
+ m_aImproveFL ( this, CUI_RES( FL_IMPROVE ) ),
+ m_aInvitationFT ( this, CUI_RES( FT_INVITATION ) ),
+ m_aYesRB ( this, CUI_RES( RB_YES ) ),
+ m_aNoRB ( this, CUI_RES( RB_NO ) ),
+ m_aInfoFI ( this, CUI_RES( FI_INFO ) ),
+ m_aDataFL ( this, CUI_RES( FL_DATA ) ),
+ m_aNumberOfReportsFT ( this, CUI_RES( FT_NR_REPORTS ) ),
+ m_aNumberOfReportsValueFT ( this, CUI_RES( FT_NR_REPORTS_VALUE ) ),
+ m_aNumberOfActionsFT ( this, CUI_RES( FT_NR_ACTIONS ) ),
+ m_aNumberOfActionsValueFT ( this, CUI_RES( FT_NR_ACTIONS_VALUE ) ),
+ m_aShowDataPB ( this, CUI_RES( PB_SHOWDATA ) ),
+
+ m_sInfo ( CUI_RES( STR_INFO ) ),
+ m_sMoreInfo ( CUI_RES( STR_MOREINFO ) )
{
FreeResource();
diff --git a/svx/source/cui/optinet2.cxx b/cui/source/options/optinet2.cxx
index 01d97a9e7e0b..b8d7fec16efc 100644
--- a/svx/source/cui/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -29,20 +29,16 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
// include ---------------------------------------------------------------
#include <tools/shl.hxx>
#include <tools/config.hxx>
#include <vcl/msgbox.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/slstitm.hxx>
+#include <svl/intitem.hxx>
+#include <svl/stritem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/slstitm.hxx>
#include <sfx2/fcontnr.hxx>
#include <sfx2/dispatch.hxx>
#include <sfx2/docfilt.hxx>
@@ -50,48 +46,31 @@
#include <sfx2/sfxsids.hrc>
#include <sfx2/filedlghelper.hxx>
#include <tools/inetdef.hxx>
-#include <svtools/urihelper.hxx>
-
-#ifndef _CNTWIDS_HRC
-#include <svtools/cntwids.hrc>
-#endif
-#include <svtools/inetoptions.hxx>
-#ifndef _SV_SVAPP_HXX
+#include <svl/urihelper.hxx>
+#include <svl/cntwids.hrc>
+#include <unotools/inetoptions.hxx>
#include <sfx2/app.hxx>
-#endif
#include <sfx2/objsh.hxx>
#include <unotools/bootstrap.hxx>
#include <vcl/help.hxx>
#include <sfx2/viewfrm.hxx>
#include <tools/urlobj.hxx>
-#include <svtools/pathoptions.hxx>
-#ifndef INCLUDED_SVTOOLS_SECURITIYOPTIONS_HXX
-#include <svtools/securityoptions.hxx>
-#endif
-#ifndef _SVTOOLS_JAVAPTIONS_HXX
-#include <svtools/javaoptions.hxx>
-#endif
+#include <unotools/pathoptions.hxx>
+#include <unotools/securityoptions.hxx>
+#include <unotools/javaoptions.hxx>
#include <unotools/localfilehelper.hxx>
-#include <svtools/extendedsecurityoptions.hxx>
+#include <unotools/extendedsecurityoptions.hxx>
#include <com/sun/star/uno/Sequence.hxx>
#define _SVX_OPTINET2_CXX
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
#include "optinet2.hxx"
-//CHINA001 #ifndef _SVX_MULTIFIL_HXX
-//CHINA001 #include "multifil.hxx"
-//CHINA001 #endif
#include <svx/svxdlg.hxx> //CHINA001
-#ifndef _SVX_DIALOGS_HRC
-#include <svx/dialogs.hrc>
-#endif
-#ifndef _SVX_OPTINET_HRC
+#include <cuires.hrc>
#include "optinet2.hrc"
-#endif
-#ifndef _SVX_HELPID_HRC
#include "helpid.hrc"
-#endif
-#include "ofaitem.hxx"
-#include "htmlmode.hxx"
+#include <svx/ofaitem.hxx>
+#include <svx/htmlmode.hxx>
+#include <svx/svxids.hrc> // slot ids, mostly for changetracking
// for security TP
#include <comphelper/processfactory.hxx>
@@ -234,7 +213,7 @@ void SvxNoSpaceEdit::Modify()
if ( !ByteString(::rtl::OUStringToOString(aValue,RTL_TEXTENCODING_UTF8)).IsNumericAscii() || (long)aValue.ToInt32() > USHRT_MAX )
// der H�chstwert einer Portnummer ist USHRT_MAX
- ErrorBox( this, SVX_RES( RID_SVXERR_OPT_PROXYPORTS ) ).Execute();
+ ErrorBox( this, CUI_RES( RID_SVXERR_OPT_PROXYPORTS ) ).Execute();
}
}
@@ -248,31 +227,31 @@ void SvxNoSpaceEdit::Modify()
/********************************************************************/
SvxProxyTabPage::SvxProxyTabPage(Window* pParent, const SfxItemSet& rSet ) :
- SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_INET_PROXY ), rSet ),
- aOptionGB (this, SVX_RES(GB_SETTINGS)),
-
- aProxyModeFT (this, SVX_RES(FT_PROXYMODE)),
- aProxyModeLB (this, SVX_RES(LB_PROXYMODE)),
-
- aHttpProxyFT (this, SVX_RES( FT_HTTP_PROXY )),
- aHttpProxyED (this, SVX_RES( ED_HTTP_PROXY )),
- aHttpPortFT (this, SVX_RES( FT_HTTP_PORT )),
- aHttpPortED (this, SVX_RES( ED_HTTP_PORT ), TRUE),
-
- aHttpsProxyFT (this, SVX_RES( FT_HTTPS_PROXY )),
- aHttpsProxyED (this, SVX_RES( ED_HTTPS_PROXY )),
- aHttpsPortFT (this, SVX_RES( FT_HTTPS_PORT )),
- aHttpsPortED (this, SVX_RES( ED_HTTPS_PORT ), TRUE),
-
- aFtpProxyFT (this, SVX_RES( FT_FTP_PROXY )),
- aFtpProxyED (this, SVX_RES( ED_FTP_PROXY )),
- aFtpPortFT (this, SVX_RES( FT_FTP_PORT )),
- aFtpPortED (this, SVX_RES( ED_FTP_PORT ), TRUE),
-
- aNoProxyForFT (this, SVX_RES( FT_NOPROXYFOR )),
- aNoProxyForED (this, SVX_RES( ED_NOPROXYFOR )),
- aNoProxyDescFT (this, SVX_RES( ED_NOPROXYDESC )),
- sFromBrowser ( SVX_RES( ST_PROXY_FROM_BROWSER ) ),
+ SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_INET_PROXY ), rSet ),
+ aOptionGB (this, CUI_RES(GB_SETTINGS)),
+
+ aProxyModeFT (this, CUI_RES(FT_PROXYMODE)),
+ aProxyModeLB (this, CUI_RES(LB_PROXYMODE)),
+
+ aHttpProxyFT (this, CUI_RES( FT_HTTP_PROXY )),
+ aHttpProxyED (this, CUI_RES( ED_HTTP_PROXY )),
+ aHttpPortFT (this, CUI_RES( FT_HTTP_PORT )),
+ aHttpPortED (this, CUI_RES( ED_HTTP_PORT ), TRUE),
+
+ aHttpsProxyFT (this, CUI_RES( FT_HTTPS_PROXY )),
+ aHttpsProxyED (this, CUI_RES( ED_HTTPS_PROXY )),
+ aHttpsPortFT (this, CUI_RES( FT_HTTPS_PORT )),
+ aHttpsPortED (this, CUI_RES( ED_HTTPS_PORT ), TRUE),
+
+ aFtpProxyFT (this, CUI_RES( FT_FTP_PROXY )),
+ aFtpProxyED (this, CUI_RES( ED_FTP_PROXY )),
+ aFtpPortFT (this, CUI_RES( FT_FTP_PORT )),
+ aFtpPortED (this, CUI_RES( ED_FTP_PORT ), TRUE),
+
+ aNoProxyForFT (this, CUI_RES( FT_NOPROXYFOR )),
+ aNoProxyForED (this, CUI_RES( ED_NOPROXYFOR )),
+ aNoProxyDescFT (this, CUI_RES( ED_NOPROXYDESC )),
+ sFromBrowser ( CUI_RES( ST_PROXY_FROM_BROWSER ) ),
aProxyModePN(RTL_CONSTASCII_USTRINGPARAM("ooInetProxyType")),
aHttpProxyPN(RTL_CONSTASCII_USTRINGPARAM("ooInetHTTPProxyName")),
aHttpPortPN(RTL_CONSTASCII_USTRINGPARAM("ooInetHTTPProxyPort")),
@@ -748,33 +727,33 @@ IMPL_LINK( SvxProxyTabPage, LoseFocusHdl_Impl, Edit *, pEdit )
SvxSearchTabPage::SvxSearchTabPage(Window* pParent, const SfxItemSet& rSet ) :
- SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_INET_SEARCH ), rSet ),
+ SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_INET_SEARCH ), rSet ),
- aSearchGB ( this, SVX_RES( GB_SEARCH ) ),
- aSearchLB ( this, SVX_RES( LB_SEARCH ) ),
- aSearchNameFT ( this, SVX_RES( FT_SEARCH_NAME ) ),
- aSearchNameED ( this, SVX_RES( ED_SEARCH_NAME ) ),
- aSearchFT ( this, SVX_RES( FT_SEARCH ) ),
- aAndRB ( this, SVX_RES( RB_AND ) ),
- aOrRB ( this, SVX_RES( RB_OR ) ),
- aExactRB ( this, SVX_RES( RB_EXACT ) ),
+ aSearchGB ( this, CUI_RES( GB_SEARCH ) ),
+ aSearchLB ( this, CUI_RES( LB_SEARCH ) ),
+ aSearchNameFT ( this, CUI_RES( FT_SEARCH_NAME ) ),
+ aSearchNameED ( this, CUI_RES( ED_SEARCH_NAME ) ),
+ aSearchFT ( this, CUI_RES( FT_SEARCH ) ),
+ aAndRB ( this, CUI_RES( RB_AND ) ),
+ aOrRB ( this, CUI_RES( RB_OR ) ),
+ aExactRB ( this, CUI_RES( RB_EXACT ) ),
- aURLFT ( this, SVX_RES( FT_URL ) ),
- aURLED ( this, SVX_RES( ED_URL ) ),
+ aURLFT ( this, CUI_RES( FT_URL ) ),
+ aURLED ( this, CUI_RES( ED_URL ) ),
- aPostFixFT ( this, SVX_RES( FT_POSTFIX ) ),
- aPostFixED ( this, SVX_RES( ED_POSTFIX ) ),
- aSeparatorFT ( this, SVX_RES( FT_SEPARATOR ) ),
- aSeparatorED ( this, SVX_RES( ED_SEPARATOR ) ),
- aCaseFT ( this, SVX_RES( FT_CASE ) ),
- aCaseED ( this, SVX_RES( ED_CASE ) ),
+ aPostFixFT ( this, CUI_RES( FT_POSTFIX ) ),
+ aPostFixED ( this, CUI_RES( ED_POSTFIX ) ),
+ aSeparatorFT ( this, CUI_RES( FT_SEPARATOR ) ),
+ aSeparatorED ( this, CUI_RES( ED_SEPARATOR ) ),
+ aCaseFT ( this, CUI_RES( FT_CASE ) ),
+ aCaseED ( this, CUI_RES( ED_CASE ) ),
- aNewPB ( this, SVX_RES( PB_NEW ) ),
- aAddPB ( this, SVX_RES( PB_ADD ) ),
- aChangePB ( this, SVX_RES( PB_CHANGE ) ),
- aDeletePB ( this, SVX_RES( PB_DELETE ) ),
+ aNewPB ( this, CUI_RES( PB_NEW ) ),
+ aAddPB ( this, CUI_RES( PB_ADD ) ),
+ aChangePB ( this, CUI_RES( PB_CHANGE ) ),
+ aDeletePB ( this, CUI_RES( PB_DELETE ) ),
- sModifyMsg(SVX_RES(MSG_MODIFY))
+ sModifyMsg(CUI_RES(MSG_MODIFY))
{
FreeResource();
@@ -1278,13 +1257,13 @@ public:
JavaScriptDisableQueryBox_Impl::JavaScriptDisableQueryBox_Impl( Window* pParent ) :
- ModalDialog( pParent, SVX_RES( RID_SVXDLG_OPT_JAVASCRIPT_DISABLE ) ),
+ ModalDialog( pParent, CUI_RES( RID_SVXDLG_OPT_JAVASCRIPT_DISABLE ) ),
- aImage ( this, SVX_RES( IMG_JSCPT_WARNING ) ),
- aWarningFT ( this, SVX_RES( FT_JSCPT_WARNING ) ),
- aDisableCB ( this, SVX_RES( CB_JSCPT_DISABLE ) ),
- aYesBtn ( this, SVX_RES( BTN_JSCPT_YES ) ),
- aNoBtn ( this, SVX_RES( BTN_JSCPT_NO ) )
+ aImage ( this, CUI_RES( IMG_JSCPT_WARNING ) ),
+ aWarningFT ( this, CUI_RES( FT_JSCPT_WARNING ) ),
+ aDisableCB ( this, CUI_RES( CB_JSCPT_DISABLE ) ),
+ aYesBtn ( this, CUI_RES( BTN_JSCPT_YES ) ),
+ aNoBtn ( this, CUI_RES( BTN_JSCPT_NO ) )
{
FreeResource();
@@ -1337,34 +1316,34 @@ void SvxScriptExecListBox::RequestHelp( const HelpEvent& rHEvt )
/********************************************************************/
SvxSecurityTabPage::SvxSecurityTabPage( Window* pParent, const SfxItemSet& rSet )
- :SfxTabPage ( pParent, SVX_RES( RID_SVXPAGE_INET_SECURITY ), rSet )
-
- ,maSecurityOptionsFL( this, SVX_RES( FL_SEC_SECURITYOPTIONS ) )
- ,maSecurityOptionsFI( this, SVX_RES( FI_SEC_SECURITYOPTIONS ) )
- ,maSecurityOptionsPB( this, SVX_RES( PB_SEC_SECURITYOPTIONS ) )
-
- ,maPasswordsFL ( this, SVX_RES( FL_SEC_PASSWORDS ) )
- ,maSavePasswordsCB ( this, SVX_RES( CB_SEC_SAVEPASSWORDS ) )
- ,maShowConnectionsPB( this, SVX_RES( PB_SEC_CONNECTIONS ) )
- ,maMasterPasswordCB ( this, SVX_RES( CB_SEC_MASTERPASSWORD ) )
- ,maMasterPasswordFI ( this, SVX_RES( FI_SEC_MASTERPASSWORD ) )
- ,maMasterPasswordPB ( this, SVX_RES( PB_SEC_MASTERPASSWORD ) )
-
- ,maMacroSecFL ( this, SVX_RES( FL_SEC_MACROSEC ) )
- ,maMacroSecFI ( this, SVX_RES( FI_SEC_MACROSEC ) )
- ,maMacroSecPB ( this, SVX_RES( PB_SEC_MACROSEC ) )
- ,maFilesharingFL ( this, SVX_RES( FL_SEC_FILESHARING ) )
- ,maRecommReadOnlyCB ( this, SVX_RES( CB_SEC_RECOMMREADONLY ) )
- ,maRecordChangesCB ( this, SVX_RES( CB_SEC_RECORDCHANGES ) )
- ,maProtectRecordsPB ( this, SVX_RES( PB_SEC_PROTRECORDS ) )
+ :SfxTabPage ( pParent, CUI_RES( RID_SVXPAGE_INET_SECURITY ), rSet )
+
+ ,maSecurityOptionsFL( this, CUI_RES( FL_SEC_SECURITYOPTIONS ) )
+ ,maSecurityOptionsFI( this, CUI_RES( FI_SEC_SECURITYOPTIONS ) )
+ ,maSecurityOptionsPB( this, CUI_RES( PB_SEC_SECURITYOPTIONS ) )
+
+ ,maPasswordsFL ( this, CUI_RES( FL_SEC_PASSWORDS ) )
+ ,maSavePasswordsCB ( this, CUI_RES( CB_SEC_SAVEPASSWORDS ) )
+ ,maShowConnectionsPB( this, CUI_RES( PB_SEC_CONNECTIONS ) )
+ ,maMasterPasswordCB ( this, CUI_RES( CB_SEC_MASTERPASSWORD ) )
+ ,maMasterPasswordFI ( this, CUI_RES( FI_SEC_MASTERPASSWORD ) )
+ ,maMasterPasswordPB ( this, CUI_RES( PB_SEC_MASTERPASSWORD ) )
+
+ ,maMacroSecFL ( this, CUI_RES( FL_SEC_MACROSEC ) )
+ ,maMacroSecFI ( this, CUI_RES( FI_SEC_MACROSEC ) )
+ ,maMacroSecPB ( this, CUI_RES( PB_SEC_MACROSEC ) )
+ ,maFilesharingFL ( this, CUI_RES( FL_SEC_FILESHARING ) )
+ ,maRecommReadOnlyCB ( this, CUI_RES( CB_SEC_RECOMMREADONLY ) )
+ ,maRecordChangesCB ( this, CUI_RES( CB_SEC_RECORDCHANGES ) )
+ ,maProtectRecordsPB ( this, CUI_RES( PB_SEC_PROTRECORDS ) )
,mpSecOptions ( new SvtSecurityOptions )
,mpSecOptDlg ( NULL )
,meRedlingMode ( RL_NONE )
- ,msProtectRecordsStr( SVX_RES( STR_SEC_PROTRECORDS ) )
- ,msUnprotectRecordsStr( SVX_RES( STR_SEC_UNPROTRECORDS ) )
- ,msPasswordStoringDeactivateStr( SVX_RES( STR_SEC_NOPASSWDSAVE ) )
+ ,msProtectRecordsStr( CUI_RES( STR_SEC_PROTRECORDS ) )
+ ,msUnprotectRecordsStr( CUI_RES( STR_SEC_UNPROTRECORDS ) )
+ ,msPasswordStoringDeactivateStr( CUI_RES( STR_SEC_NOPASSWDSAVE ) )
{
FreeResource();
@@ -1947,9 +1926,9 @@ void SvxSecurityTabPage::Reset( const SfxItemSet& )
//added by jmeng begin
MozPluginTabPage::MozPluginTabPage(Window* pParent, const SfxItemSet& rSet)
- : SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_INET_MOZPLUGIN ), rSet ),
- aMSWordGB ( this, SVX_RES( GB_MOZPLUGIN ) ),
- aWBasicCodeCB ( this, SVX_RES( CB_MOZPLUGIN_CODE ) )
+ : SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_INET_MOZPLUGIN ), rSet ),
+ aMSWordGB ( this, CUI_RES( GB_MOZPLUGIN ) ),
+ aWBasicCodeCB ( this, CUI_RES( CB_MOZPLUGIN_CODE ) )
{
FreeResource();
}
@@ -2154,7 +2133,7 @@ public:
virtual ~MailerProgramCfg_Impl();
virtual void Commit();
-
+ virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& _rPropertyNames);
};
/* -------------------------------------------------------------------------*/
@@ -2234,6 +2213,10 @@ void MailerProgramCfg_Impl::Commit()
PutProperties(aNames, aValues);
}
+void MailerProgramCfg_Impl::Notify( const com::sun::star::uno::Sequence< rtl::OUString >& )
+{
+}
+
/* -------------------------------------------------------------------------*/
struct SvxEMailTabPage_Impl
@@ -2242,13 +2225,13 @@ struct SvxEMailTabPage_Impl
};
SvxEMailTabPage::SvxEMailTabPage(Window* pParent, const SfxItemSet& rSet) :
- SfxTabPage(pParent, SVX_RES( RID_SVXPAGE_INET_MAIL ), rSet),
- aMailFL(this, SVX_RES(FL_MAIL )),
- aMailerURLFI(this, SVX_RES(FI_MAILERURL )),
- aMailerURLFT(this, SVX_RES(FT_MAILERURL )),
- aMailerURLED(this, SVX_RES(ED_MAILERURL )),
- aMailerURLPB(this, SVX_RES(PB_MAILERURL )),
- m_sDefaultFilterName( SVX_RES(STR_DEFAULT_FILENAME )),
+ SfxTabPage(pParent, CUI_RES( RID_SVXPAGE_INET_MAIL ), rSet),
+ aMailFL(this, CUI_RES(FL_MAIL )),
+ aMailerURLFI(this, CUI_RES(FI_MAILERURL )),
+ aMailerURLFT(this, CUI_RES(FT_MAILERURL )),
+ aMailerURLED(this, CUI_RES(ED_MAILERURL )),
+ aMailerURLPB(this, CUI_RES(PB_MAILERURL )),
+ m_sDefaultFilterName( CUI_RES(STR_DEFAULT_FILENAME )),
pImpl(new SvxEMailTabPage_Impl)
{
FreeResource();
diff --git a/svx/inc/optinet2.hrc b/cui/source/options/optinet2.hrc
index da394d6d249f..1e9a3f65efeb 100644
--- a/svx/inc/optinet2.hrc
+++ b/cui/source/options/optinet2.hrc
@@ -169,6 +169,11 @@
#define PB_MAILERURL 5
#define STR_DEFAULT_FILENAME 6
+// plugin
+#define GB_MOZPLUGIN 1
+#define CB_MOZPLUGIN_CODE 2
+
+
#endif // #ifndef _SVX_OPTINET_HRC
// ******************************************************************* EOF
diff --git a/svx/source/cui/optinet2.hxx b/cui/source/options/optinet2.hxx
index 0f1364b716f8..00d1aaadc4fc 100644
--- a/svx/source/cui/optinet2.hxx
+++ b/cui/source/options/optinet2.hxx
@@ -34,13 +34,11 @@
#include <vcl/lstbox.hxx>
#include <vcl/group.hxx>
#include <vcl/field.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
#include <svtools/stdctrl.hxx>
#include <svtools/svtabbx.hxx>
#include <sfx2/tabdlg.hxx>
-#ifndef _SVX_SRCHNCFG_HXX
-#include "srchcfg.hxx"
-#endif
+#include <svx/srchcfg.hxx>
#ifdef _SVX_OPTINET2_CXX
#include <svtools/headbar.hxx>
diff --git a/svx/source/options/optinet2.src b/cui/source/options/optinet2.src
index 2ef6dc59c2e4..e7bdc9eff17c 100644
--- a/svx/source/options/optinet2.src
+++ b/cui/source/options/optinet2.src
@@ -30,7 +30,7 @@
// include ------------------------------------------------------------------
#include <sfx2/sfx.hrc>
#include "helpid.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "optinet2.hrc"
// pragma -------------------------------------------------------------------
diff --git a/svx/source/cui/optjava.cxx b/cui/source/options/optjava.cxx
index 549a4c09c96d..fdc36dadbbb7 100644
--- a/svx/source/cui/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -29,26 +29,22 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
// include ---------------------------------------------------------------
#include "optjava.hxx"
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
#include "optjava.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "helpid.hrc"
#include <vcl/svapp.hxx>
#include <vcl/help.hxx>
#include <tools/urlobj.hxx>
#include <vcl/msgbox.hxx>
#include <vcl/waitobj.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
#include <svtools/imagemgr.hxx>
#include <sfx2/filedlghelper.hxx>
#include <comphelper/processfactory.hxx>
@@ -153,16 +149,16 @@ bool areListsEqual( const Sequence< ::rtl::OUString >& rListA, const Sequence< :
SvxJavaOptionsPage::SvxJavaOptionsPage( Window* pParent, const SfxItemSet& rSet ) :
- SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_OPTIONS_JAVA ), rSet ),
+ SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_OPTIONS_JAVA ), rSet ),
- m_aJavaLine ( this, SVX_RES( FL_JAVA ) ),
- m_aJavaEnableCB ( this, SVX_RES( CB_JAVA_ENABLE ) ),
- m_aJavaFoundLabel ( this, SVX_RES( FT_JAVA_FOUND ) ),
- m_aJavaList ( this, SVX_RES( LB_JAVA ) ),
- m_aJavaPathText ( this, SVX_RES( FT_JAVA_PATH ) ),
- m_aAddBtn ( this, SVX_RES( PB_ADD ) ),
- m_aParameterBtn ( this, SVX_RES( PB_PARAMETER ) ),
- m_aClassPathBtn ( this, SVX_RES( PB_CLASSPATH ) ),
+ m_aJavaLine ( this, CUI_RES( FL_JAVA ) ),
+ m_aJavaEnableCB ( this, CUI_RES( CB_JAVA_ENABLE ) ),
+ m_aJavaFoundLabel ( this, CUI_RES( FT_JAVA_FOUND ) ),
+ m_aJavaList ( this, CUI_RES( LB_JAVA ) ),
+ m_aJavaPathText ( this, CUI_RES( FT_JAVA_PATH ) ),
+ m_aAddBtn ( this, CUI_RES( PB_ADD ) ),
+ m_aParameterBtn ( this, CUI_RES( PB_PARAMETER ) ),
+ m_aClassPathBtn ( this, CUI_RES( PB_CLASSPATH ) ),
m_pParamDlg ( NULL ),
m_pPathDlg ( NULL ),
@@ -171,9 +167,9 @@ SvxJavaOptionsPage::SvxJavaOptionsPage( Window* pParent, const SfxItemSet& rSet
m_pClassPath ( NULL ),
m_nInfoSize ( 0 ),
m_nParamSize ( 0 ),
- m_sInstallText ( SVX_RES( STR_INSTALLED_IN ) ),
- m_sAccessibilityText( SVX_RES( STR_ACCESSIBILITY ) ),
- m_sAddDialogText ( SVX_RES( STR_ADDDLGTEXT ) ),
+ m_sInstallText ( CUI_RES( STR_INSTALLED_IN ) ),
+ m_sAccessibilityText( CUI_RES( STR_ACCESSIBILITY ) ),
+ m_sAddDialogText ( CUI_RES( STR_ADDDLGTEXT ) ),
xDialogListener ( new ::svt::DialogClosedListener() )
@@ -196,11 +192,11 @@ SvxJavaOptionsPage::SvxJavaOptionsPage( Window* pParent, const SfxItemSet& rSet
m_aJavaList.SvxSimpleTable::SetTabs( aStaticTabs );
String sHeader( '\t' );
- sHeader += String( SVX_RES( STR_HEADER_VENDOR ) );
+ sHeader += String( CUI_RES( STR_HEADER_VENDOR ) );
sHeader += '\t';
- sHeader += String( SVX_RES( STR_HEADER_VERSION ) );
+ sHeader += String( CUI_RES( STR_HEADER_VERSION ) );
sHeader += '\t';
- sHeader += String( SVX_RES( STR_HEADER_FEATURES ) );
+ sHeader += String( CUI_RES( STR_HEADER_FEATURES ) );
sHeader += '\t';
m_aJavaList.InsertHeaderEntry( sHeader, HEADERBAR_APPEND, HIB_LEFT );
@@ -369,7 +365,7 @@ IMPL_LINK( SvxJavaOptionsPage, ParameterHdl_Impl, PushButton *, EMPTYARG )
(void)eErr;
if ( bRunning )
{
- WarningBox aWarnBox( this, SVX_RES( RID_SVX_MSGBOX_JAVA_RESTART2 ) );
+ WarningBox aWarnBox( this, CUI_RES( RID_SVX_MSGBOX_JAVA_RESTART2 ) );
aWarnBox.Execute();
}
}
@@ -413,7 +409,7 @@ IMPL_LINK( SvxJavaOptionsPage, ClassPathHdl_Impl, PushButton *, EMPTYARG )
(void)eErr;
if ( bRunning )
{
- WarningBox aWarnBox( this, SVX_RES( RID_SVX_MSGBOX_JAVA_RESTART2 ) );
+ WarningBox aWarnBox( this, CUI_RES( RID_SVX_MSGBOX_JAVA_RESTART2 ) );
aWarnBox.Execute();
}
}
@@ -638,12 +634,12 @@ void SvxJavaOptionsPage::AddFolder( const ::rtl::OUString& _rFolder )
}
else if ( JFW_E_NOT_RECOGNIZED == eErr )
{
- ErrorBox aErrBox( this, SVX_RES( RID_SVXERR_JRE_NOT_RECOGNIZED ) );
+ ErrorBox aErrBox( this, CUI_RES( RID_SVXERR_JRE_NOT_RECOGNIZED ) );
aErrBox.Execute();
}
else if ( JFW_E_FAILED_VERSION == eErr )
{
- ErrorBox aErrBox( this, SVX_RES( RID_SVXERR_JRE_FAILED_VERSION ) );
+ ErrorBox aErrBox( this, CUI_RES( RID_SVXERR_JRE_FAILED_VERSION ) );
aErrBox.Execute();
}
@@ -720,7 +716,7 @@ BOOL SvxJavaOptionsPage::FillItemSet( SfxItemSet& /*rCoreSet*/ )
if ( bRunning ||
( ( pInfo->nRequirements & JFW_REQUIRE_NEEDRESTART ) == JFW_REQUIRE_NEEDRESTART ) )
{
- WarningBox aWarnBox( this, SVX_RES( RID_SVX_MSGBOX_JAVA_RESTART ) );
+ WarningBox aWarnBox( this, CUI_RES( RID_SVX_MSGBOX_JAVA_RESTART ) );
aWarnBox.Execute();
}
@@ -779,19 +775,19 @@ void SvxJavaOptionsPage::FillUserData()
SvxJavaParameterDlg::SvxJavaParameterDlg( Window* pParent ) :
- ModalDialog( pParent, SVX_RES( RID_SVXDLG_JAVA_PARAMETER ) ),
+ ModalDialog( pParent, CUI_RES( RID_SVXDLG_JAVA_PARAMETER ) ),
- m_aParameterLabel ( this, SVX_RES( FT_PARAMETER ) ),
- m_aParameterEdit ( this, SVX_RES( ED_PARAMETER ) ),
- m_aAssignBtn ( this, SVX_RES( PB_ASSIGN ) ),
- m_aAssignedLabel ( this, SVX_RES( FT_ASSIGNED ) ),
- m_aAssignedList ( this, SVX_RES( LB_ASSIGNED ) ),
- m_aExampleText ( this, SVX_RES( FT_EXAMPLE ) ),
- m_aRemoveBtn ( this, SVX_RES( PB_REMOVE ) ),
- m_aButtonsLine ( this, SVX_RES( FL_BUTTONS ) ),
- m_aOKBtn ( this, SVX_RES( PB_PARAMETER_OK ) ),
- m_aCancelBtn ( this, SVX_RES( PB_PARAMETER_ESC ) ),
- m_aHelpBtn ( this, SVX_RES( PB_PARAMETER_HLP ) )
+ m_aParameterLabel ( this, CUI_RES( FT_PARAMETER ) ),
+ m_aParameterEdit ( this, CUI_RES( ED_PARAMETER ) ),
+ m_aAssignBtn ( this, CUI_RES( PB_ASSIGN ) ),
+ m_aAssignedLabel ( this, CUI_RES( FT_ASSIGNED ) ),
+ m_aAssignedList ( this, CUI_RES( LB_ASSIGNED ) ),
+ m_aExampleText ( this, CUI_RES( FT_EXAMPLE ) ),
+ m_aRemoveBtn ( this, CUI_RES( PB_REMOVE ) ),
+ m_aButtonsLine ( this, CUI_RES( FL_BUTTONS ) ),
+ m_aOKBtn ( this, CUI_RES( PB_PARAMETER_OK ) ),
+ m_aCancelBtn ( this, CUI_RES( PB_PARAMETER_ESC ) ),
+ m_aHelpBtn ( this, CUI_RES( PB_PARAMETER_HLP ) )
{
FreeResource();
@@ -919,17 +915,17 @@ void SvxJavaParameterDlg::SetParameters( Sequence< ::rtl::OUString >& rParams )
SvxJavaClassPathDlg::SvxJavaClassPathDlg( Window* pParent ) :
- ModalDialog( pParent, SVX_RES( RID_SVXDLG_JAVA_CLASSPATH ) ),
+ ModalDialog( pParent, CUI_RES( RID_SVXDLG_JAVA_CLASSPATH ) ),
- m_aPathLabel ( this, SVX_RES( FT_PATH ) ),
- m_aPathList ( this, SVX_RES( LB_PATH ) ),
- m_aAddArchiveBtn ( this, SVX_RES( PB_ADDARCHIVE ) ),
- m_aAddPathBtn ( this, SVX_RES( PB_ADDPATH ) ),
- m_aRemoveBtn ( this, SVX_RES( PB_REMOVE_PATH ) ),
- m_aButtonsLine ( this, SVX_RES( FL_PATH_BUTTONS ) ),
- m_aOKBtn ( this, SVX_RES( PB_PATH_OK ) ),
- m_aCancelBtn ( this, SVX_RES( PB_PATH_ESC ) ),
- m_aHelpBtn ( this, SVX_RES( PB_PATH_HLP ) )
+ m_aPathLabel ( this, CUI_RES( FT_PATH ) ),
+ m_aPathList ( this, CUI_RES( LB_PATH ) ),
+ m_aAddArchiveBtn ( this, CUI_RES( PB_ADDARCHIVE ) ),
+ m_aAddPathBtn ( this, CUI_RES( PB_ADDPATH ) ),
+ m_aRemoveBtn ( this, CUI_RES( PB_REMOVE_PATH ) ),
+ m_aButtonsLine ( this, CUI_RES( FL_PATH_BUTTONS ) ),
+ m_aOKBtn ( this, CUI_RES( PB_PATH_OK ) ),
+ m_aCancelBtn ( this, CUI_RES( PB_PATH_ESC ) ),
+ m_aHelpBtn ( this, CUI_RES( PB_PATH_HLP ) )
{
FreeResource();
@@ -981,8 +977,8 @@ SvxJavaClassPathDlg::~SvxJavaClassPathDlg()
IMPL_LINK( SvxJavaClassPathDlg, AddArchiveHdl_Impl, PushButton *, EMPTYARG )
{
sfx2::FileDialogHelper aDlg( TemplateDescription::FILEOPEN_SIMPLE, 0 );
- aDlg.SetTitle( SVX_RES( RID_SVXSTR_ARCHIVE_TITLE ) );
- aDlg.AddFilter( SVX_RES( RID_SVXSTR_ARCHIVE_HEADLINE ), String::CreateFromAscii("*.jar;*.zip") );
+ aDlg.SetTitle( CUI_RES( RID_SVXSTR_ARCHIVE_TITLE ) );
+ aDlg.AddFilter( CUI_RES( RID_SVXSTR_ARCHIVE_HEADLINE ), String::CreateFromAscii("*.jar;*.zip") );
String sFolder;
if ( m_aPathList.GetSelectEntryCount() > 0 )
{
@@ -1004,7 +1000,7 @@ IMPL_LINK( SvxJavaClassPathDlg, AddArchiveHdl_Impl, PushButton *, EMPTYARG )
}
else
{
- String sMsg( SVX_RES( RID_SVXSTR_MULTIFILE_DBL_ERR ) );
+ String sMsg( CUI_RES( RID_SVXSTR_MULTIFILE_DBL_ERR ) );
sMsg.SearchAndReplaceAscii( "%1", sFile );
ErrorBox( this, WB_OK, sMsg ).Execute();
}
@@ -1042,7 +1038,7 @@ IMPL_LINK( SvxJavaClassPathDlg, AddPathHdl_Impl, PushButton *, EMPTYARG )
}
else
{
- String sMsg( SVX_RES( RID_SVXSTR_MULTIFILE_DBL_ERR ) );
+ String sMsg( CUI_RES( RID_SVXSTR_MULTIFILE_DBL_ERR ) );
sMsg.SearchAndReplaceAscii( "%1", sNewFolder );
ErrorBox( this, WB_OK, sMsg ).Execute();
}
diff --git a/svx/source/cui/optjava.hrc b/cui/source/options/optjava.hrc
index ac4b0108cc47..ac4b0108cc47 100644
--- a/svx/source/cui/optjava.hrc
+++ b/cui/source/options/optjava.hrc
diff --git a/svx/source/cui/optjava.hxx b/cui/source/options/optjava.hxx
index fb2a56162175..2b2ac090ca07 100644
--- a/svx/source/cui/optjava.hxx
+++ b/cui/source/options/optjava.hxx
@@ -34,16 +34,12 @@
#include <vector>
#include <ucbhelper/content.hxx>
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
#include <vcl/fixed.hxx>
#include <vcl/timer.hxx>
#include <sfx2/tabdlg.hxx>
#include <svx/simptabl.hxx>
-#ifndef _COM_SUN_STAR_UI_XFOLDERPICKER_HPP_
#include <com/sun/star/ui/dialogs/XFolderPicker.hpp>
-#endif
#include <svtools/dialogclosedlistener.hxx>
#include "radiobtnbox.hxx"
diff --git a/svx/source/cui/optjava.src b/cui/source/options/optjava.src
index 56ea49e1b3fd..b1cce0a3e50b 100644
--- a/svx/source/cui/optjava.src
+++ b/cui/source/options/optjava.src
@@ -31,7 +31,7 @@
// include --------------------------------------------------------------
#include "optjava.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "helpid.hrc"
// RID_SVXPAGE_OPTIONS_JAVA ----------------------------------------------
diff --git a/svx/source/cui/optjsearch.cxx b/cui/source/options/optjsearch.cxx
index cbc6d605ba03..ab08478e6caa 100644
--- a/svx/source/cui/optjsearch.cxx
+++ b/cui/source/options/optjsearch.cxx
@@ -29,21 +29,13 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
-
+#include "precompiled_cui.hxx"
#include <tools/shl.hxx>
-#include <svtools/searchopt.hxx>
+#include <unotools/searchopt.hxx>
#include <com/sun/star/i18n/TransliterationModules.hpp>
-
-#ifndef _SVX_DIALOGS_HRC
-#include <svx/dialogs.hrc>
-#endif
-#include <svx/dialmgr.hxx>
+#include <cuires.hrc>
+#include <dialmgr.hxx>
#include <optjsearch.hxx>
#include "optjsearch.hrc"
@@ -52,29 +44,29 @@ using namespace com::sun::star::i18n;
//////////////////////////////////////////////////////////////////////
SvxJSearchOptionsPage::SvxJSearchOptionsPage( Window* pParent, const SfxItemSet& rSet ) :
- SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_JSEARCH_OPTIONS ), rSet ),
-
- aTreatAsEqual ( this, SVX_RES( FL_TREAT_AS_EQUAL ) ),
- aMatchCase ( this, SVX_RES( CB_MATCH_CASE ) ),
- aMatchFullHalfWidth ( this, SVX_RES( CB_MATCH_FULL_HALF_WIDTH ) ),
- aMatchHiraganaKatakana ( this, SVX_RES( CB_MATCH_HIRAGANA_KATAKANA ) ),
- aMatchContractions ( this, SVX_RES( CB_MATCH_CONTRACTIONS ) ),
- aMatchMinusDashChoon ( this, SVX_RES( CB_MATCH_MINUS_DASH_CHOON ) ),
- aMatchRepeatCharMarks ( this, SVX_RES( CB_MATCH_REPEAT_CHAR_MARKS ) ),
- aMatchVariantFormKanji ( this, SVX_RES( CB_MATCH_VARIANT_FORM_KANJI ) ),
- aMatchOldKanaForms ( this, SVX_RES( CB_MATCH_OLD_KANA_FORMS ) ),
- aMatchDiziDuzu ( this, SVX_RES( CB_MATCH_DIZI_DUZU ) ),
- aMatchBavaHafa ( this, SVX_RES( CB_MATCH_BAVA_HAFA ) ),
- aMatchTsithichiDhizi ( this, SVX_RES( CB_MATCH_TSITHICHI_DHIZI ) ),
- aMatchHyuiyuByuvyu ( this, SVX_RES( CB_MATCH_HYUFYU_BYUVYU ) ),
- aMatchSesheZeje ( this, SVX_RES( CB_MATCH_SESHE_ZEJE ) ),
- aMatchIaiya ( this, SVX_RES( CB_MATCH_IAIYA ) ),
- aMatchKiku ( this, SVX_RES( CB_MATCH_KIKU ) ),
- aMatchProlongedSoundMark ( this, SVX_RES( CB_MATCH_PROLONGED_SOUNDMARK ) ),
- aIgnore ( this, SVX_RES( FL_IGNORE ) ),
- aIgnorePunctuation ( this, SVX_RES( CB_IGNORE_PUNCTUATION ) ),
- aIgnoreWhitespace ( this, SVX_RES( CB_IGNORE_WHITESPACES ) ),
- aIgnoreMiddleDot ( this, SVX_RES( CB_IGNORE_MIDDLE_DOT ) )
+ SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_JSEARCH_OPTIONS ), rSet ),
+
+ aTreatAsEqual ( this, CUI_RES( FL_TREAT_AS_EQUAL ) ),
+ aMatchCase ( this, CUI_RES( CB_MATCH_CASE ) ),
+ aMatchFullHalfWidth ( this, CUI_RES( CB_MATCH_FULL_HALF_WIDTH ) ),
+ aMatchHiraganaKatakana ( this, CUI_RES( CB_MATCH_HIRAGANA_KATAKANA ) ),
+ aMatchContractions ( this, CUI_RES( CB_MATCH_CONTRACTIONS ) ),
+ aMatchMinusDashChoon ( this, CUI_RES( CB_MATCH_MINUS_DASH_CHOON ) ),
+ aMatchRepeatCharMarks ( this, CUI_RES( CB_MATCH_REPEAT_CHAR_MARKS ) ),
+ aMatchVariantFormKanji ( this, CUI_RES( CB_MATCH_VARIANT_FORM_KANJI ) ),
+ aMatchOldKanaForms ( this, CUI_RES( CB_MATCH_OLD_KANA_FORMS ) ),
+ aMatchDiziDuzu ( this, CUI_RES( CB_MATCH_DIZI_DUZU ) ),
+ aMatchBavaHafa ( this, CUI_RES( CB_MATCH_BAVA_HAFA ) ),
+ aMatchTsithichiDhizi ( this, CUI_RES( CB_MATCH_TSITHICHI_DHIZI ) ),
+ aMatchHyuiyuByuvyu ( this, CUI_RES( CB_MATCH_HYUFYU_BYUVYU ) ),
+ aMatchSesheZeje ( this, CUI_RES( CB_MATCH_SESHE_ZEJE ) ),
+ aMatchIaiya ( this, CUI_RES( CB_MATCH_IAIYA ) ),
+ aMatchKiku ( this, CUI_RES( CB_MATCH_KIKU ) ),
+ aMatchProlongedSoundMark ( this, CUI_RES( CB_MATCH_PROLONGED_SOUNDMARK ) ),
+ aIgnore ( this, CUI_RES( FL_IGNORE ) ),
+ aIgnorePunctuation ( this, CUI_RES( CB_IGNORE_PUNCTUATION ) ),
+ aIgnoreWhitespace ( this, CUI_RES( CB_IGNORE_WHITESPACES ) ),
+ aIgnoreMiddleDot ( this, CUI_RES( CB_IGNORE_MIDDLE_DOT ) )
{
FreeResource();
bSaveOptions = TRUE;
diff --git a/svx/inc/optjsearch.hrc b/cui/source/options/optjsearch.hrc
index dfe6b7bdb07a..dfe6b7bdb07a 100644
--- a/svx/inc/optjsearch.hrc
+++ b/cui/source/options/optjsearch.hrc
diff --git a/svx/source/cui/optjsearch.hxx b/cui/source/options/optjsearch.hxx
index e1d1de79ae2e..e1d1de79ae2e 100644
--- a/svx/source/cui/optjsearch.hxx
+++ b/cui/source/options/optjsearch.hxx
diff --git a/svx/source/options/optjsearch.src b/cui/source/options/optjsearch.src
index a0480b7492df..00496ecf8d6b 100644
--- a/svx/source/options/optjsearch.src
+++ b/cui/source/options/optjsearch.src
@@ -29,7 +29,7 @@
************************************************************************/
#include <helpid.hrc>
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "optjsearch.hrc"
diff --git a/svx/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index f4ed552d7d27..7ca67a553278 100644
--- a/svx/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -29,28 +29,21 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_cui.hxx"
// include ---------------------------------------------------------------
-#define _SVSTDARR_STRINGSDTOR
-#define _SVSTDARR_USHORTS
-//#ifndef _SVSTDARR_HXX
-//#include <svtools/svstdarr.hxx>
-//#endif
#include <vcl/msgbox.hxx>
#include <vcl/field.hxx>
#include <vcl/fixed.hxx>
#include <tools/shl.hxx>
#include <tools/dynary.hxx>
#include <i18npool/mslangid.hxx>
-//#include <svtools/svarray.hxx>
-#include <svtools/lingucfg.hxx>
-#include <unolingu.hxx>
-#include <dlgutil.hxx>
+#include <unotools/lingucfg.hxx>
+#include <svx/unolingu.hxx>
+#include <svx/dlgutil.hxx>
#include <linguistic/lngprops.hxx>
#include <linguistic/misc.hxx>
-#include <unolingu.hxx>
#include <sfx2/sfxuno.hxx>
#include <sfx2/dispatch.hxx>
#include <tools/urlobj.hxx>
@@ -70,21 +63,20 @@
#include <com/sun/star/ucb/CommandAbortedException.hpp>
#include <com/sun/star/system/XSystemShellExecute.hpp>
#include <com/sun/star/system/SystemShellExecuteFlags.hpp>
-#include <svtools/extendedsecurityoptions.hxx>
+#include <unotools/extendedsecurityoptions.hxx>
#include <svtools/svlbox.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/intitem.hxx>
#include <sfx2/viewfrm.hxx>
#include <vcl/svapp.hxx>
#define _SVX_OPTLINGU_CXX
-
#include "optlingu.hrc"
#include <svx/svxdlg.hxx>
-#include "optitems.hxx"
-#include <svx/optlingu.hxx>
-#include <svx/dialmgr.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/optitems.hxx>
+#include "optlingu.hxx"
+#include <dialmgr.hxx>
+#include <cuires.hrc>
#include "helpid.hrc"
#include <ucbhelper/content.hxx>
@@ -357,18 +349,18 @@ class OptionsBreakSet : public ModalDialog
public:
OptionsBreakSet(Window* pParent, int nRID) :
- ModalDialog(pParent, SVX_RES(RID_SVXDLG_LNG_ED_NUM_PREBREAK )),
- aOKPB (this, SVX_RES(BT_OK_PREBREAK)),
- aCancelPB (this, SVX_RES(BT_CANCEL_PREBREAK)),
- aValFL (this, SVX_RES(FL_NUMVAL_PREBREAK)),
- aValNF (this, SVX_RES(ED_PREBREAK))
+ ModalDialog(pParent, CUI_RES(RID_SVXDLG_LNG_ED_NUM_PREBREAK )),
+ aOKPB (this, CUI_RES(BT_OK_PREBREAK)),
+ aCancelPB (this, CUI_RES(BT_CANCEL_PREBREAK)),
+ aValFL (this, CUI_RES(FL_NUMVAL_PREBREAK)),
+ aValNF (this, CUI_RES(ED_PREBREAK))
{
DBG_ASSERT( STR_NUM_PRE_BREAK_DLG == nRID ||
STR_NUM_POST_BREAK_DLG == nRID ||
STR_NUM_MIN_WORDLEN_DLG == nRID, "unexpected RID" );
if (nRID != -1)
- aValFL.SetText( String( SVX_RES(nRID) ) );
+ aValFL.SetText( String( CUI_RES(nRID) ) );
FreeResource();
}
@@ -1120,32 +1112,32 @@ void SvxLinguData_Impl::Reconfigure( const OUString &rDisplayName, BOOL bEnable
SvxLinguTabPage::SvxLinguTabPage( Window* pParent,
const SfxItemSet& rSet ):
- SfxTabPage( pParent, SVX_RES( RID_SFXPAGE_LINGU ), rSet ),
-
- aLinguisticFL ( this, SVX_RES( FL_LINGUISTIC ) ),
- aLinguModulesFT ( this, SVX_RES( FT_LINGU_MODULES ) ),
- aLinguModulesCLB ( this, SVX_RES( CLB_LINGU_MODULES ) ),
- aLinguModulesEditPB ( this, SVX_RES( PB_LINGU_MODULES_EDIT ) ),
- aLinguDicsFT ( this, SVX_RES( FT_LINGU_DICS ) ),
- aLinguDicsCLB ( this, SVX_RES( CLB_LINGU_DICS ) ),
- aLinguDicsNewPB ( this, SVX_RES( PB_LINGU_DICS_NEW_DIC ) ),
- aLinguDicsEditPB ( this, SVX_RES( PB_LINGU_DICS_EDIT_DIC ) ),
- aLinguDicsDelPB ( this, SVX_RES( PB_LINGU_DICS_DEL_DIC ) ),
- aLinguOptionsFT ( this, SVX_RES( FT_LINGU_OPTIONS ) ),
- aLinguOptionsCLB ( this, SVX_RES( CLB_LINGU_OPTIONS ) ),
- aLinguOptionsEditPB ( this, SVX_RES( PB_LINGU_OPTIONS_EDIT ) ),
- aMoreDictsLink ( this, SVX_RES( FT_LINGU_OPTIONS_MOREDICTS ) ),
- sCapitalWords ( SVX_RES( STR_CAPITAL_WORDS ) ),
- sWordsWithDigits ( SVX_RES( STR_WORDS_WITH_DIGITS ) ),
- sCapitalization ( SVX_RES( STR_CAPITALIZATION ) ),
- sSpellSpecial ( SVX_RES( STR_SPELL_SPECIAL ) ),
- sSpellAuto ( SVX_RES( STR_SPELL_AUTO ) ),
- sGrammarAuto ( SVX_RES( STR_GRAMMAR_AUTO ) ),
- sNumMinWordlen ( SVX_RES( STR_NUM_MIN_WORDLEN ) ),
- sNumPreBreak ( SVX_RES( STR_NUM_PRE_BREAK ) ),
- sNumPostBreak ( SVX_RES( STR_NUM_POST_BREAK ) ),
- sHyphAuto ( SVX_RES( STR_HYPH_AUTO ) ),
- sHyphSpecial ( SVX_RES( STR_HYPH_SPECIAL ) ),
+ SfxTabPage( pParent, CUI_RES( RID_SFXPAGE_LINGU ), rSet ),
+
+ aLinguisticFL ( this, CUI_RES( FL_LINGUISTIC ) ),
+ aLinguModulesFT ( this, CUI_RES( FT_LINGU_MODULES ) ),
+ aLinguModulesCLB ( this, CUI_RES( CLB_LINGU_MODULES ) ),
+ aLinguModulesEditPB ( this, CUI_RES( PB_LINGU_MODULES_EDIT ) ),
+ aLinguDicsFT ( this, CUI_RES( FT_LINGU_DICS ) ),
+ aLinguDicsCLB ( this, CUI_RES( CLB_LINGU_DICS ) ),
+ aLinguDicsNewPB ( this, CUI_RES( PB_LINGU_DICS_NEW_DIC ) ),
+ aLinguDicsEditPB ( this, CUI_RES( PB_LINGU_DICS_EDIT_DIC ) ),
+ aLinguDicsDelPB ( this, CUI_RES( PB_LINGU_DICS_DEL_DIC ) ),
+ aLinguOptionsFT ( this, CUI_RES( FT_LINGU_OPTIONS ) ),
+ aLinguOptionsCLB ( this, CUI_RES( CLB_LINGU_OPTIONS ) ),
+ aLinguOptionsEditPB ( this, CUI_RES( PB_LINGU_OPTIONS_EDIT ) ),
+ aMoreDictsLink ( this, CUI_RES( FT_LINGU_OPTIONS_MOREDICTS ) ),
+ sCapitalWords ( CUI_RES( STR_CAPITAL_WORDS ) ),
+ sWordsWithDigits ( CUI_RES( STR_WORDS_WITH_DIGITS ) ),
+ sCapitalization ( CUI_RES( STR_CAPITALIZATION ) ),
+ sSpellSpecial ( CUI_RES( STR_SPELL_SPECIAL ) ),
+ sSpellAuto ( CUI_RES( STR_SPELL_AUTO ) ),
+ sGrammarAuto ( CUI_RES( STR_GRAMMAR_AUTO ) ),
+ sNumMinWordlen ( CUI_RES( STR_NUM_MIN_WORDLEN ) ),
+ sNumPreBreak ( CUI_RES( STR_NUM_PRE_BREAK ) ),
+ sNumPostBreak ( CUI_RES( STR_NUM_POST_BREAK ) ),
+ sHyphAuto ( CUI_RES( STR_HYPH_AUTO ) ),
+ sHyphSpecial ( CUI_RES( STR_HYPH_SPECIAL ) ),
pLinguData ( NULL )
{
@@ -1819,7 +1811,7 @@ IMPL_LINK( SvxLinguTabPage, ClickHdl_Impl, PushButton *, pBtn )
else if (&aLinguDicsDelPB == pBtn)
{
if ( RET_NO ==
- QueryBox( this, SVX_RES( RID_SFXQB_DELDICT ) ).Execute() )
+ QueryBox( this, CUI_RES( RID_SFXQB_DELDICT ) ).Execute() )
return 0;
SvLBoxEntry *pEntry = aLinguDicsCLB.GetCurEntry();
@@ -2038,22 +2030,22 @@ void SvxLinguTabPage::HideGroups( sal_uInt16 nGrp )
--------------------------------------------------*/
SvxEditModulesDlg::SvxEditModulesDlg(Window* pParent, SvxLinguData_Impl& rData) :
- ModalDialog( pParent, SVX_RES(RID_SVXDLG_EDIT_MODULES ) ),
- aModulesFL ( this, SVX_RES( FL_EDIT_MODULES_OPTIONS ) ),
- aLanguageFT ( this, SVX_RES( FT_EDIT_MODULES_LANGUAGE ) ),
- aLanguageLB ( this, SVX_RES( LB_EDIT_MODULES_LANGUAGE ), FALSE ),
- aModulesCLB ( this, SVX_RES( CLB_EDIT_MODULES_MODULES ) ),
- aPrioUpPB ( this, SVX_RES( PB_EDIT_MODULES_PRIO_UP ) ),
- aPrioDownPB ( this, SVX_RES( PB_EDIT_MODULES_PRIO_DOWN ) ),
- aBackPB ( this, SVX_RES( PB_EDIT_MODULES_PRIO_BACK ) ),
- aMoreDictsLink ( this, SVX_RES( FT_EDIT_MODULES_NEWDICTSLINK ) ),
- aButtonsFL ( this, SVX_RES( FL_EDIT_MODULES_BUTTONS ) ),
- aHelpPB ( this, SVX_RES( PB_HELP ) ),
- aClosePB ( this, SVX_RES( PB_OK ) ),
- sSpell ( SVX_RES( ST_SPELL ) ),
- sHyph ( SVX_RES( ST_HYPH ) ),
- sThes ( SVX_RES( ST_THES ) ),
- sGrammar ( SVX_RES( ST_GRAMMAR ) ),
+ ModalDialog( pParent, CUI_RES(RID_SVXDLG_EDIT_MODULES ) ),
+ aModulesFL ( this, CUI_RES( FL_EDIT_MODULES_OPTIONS ) ),
+ aLanguageFT ( this, CUI_RES( FT_EDIT_MODULES_LANGUAGE ) ),
+ aLanguageLB ( this, CUI_RES( LB_EDIT_MODULES_LANGUAGE ), FALSE ),
+ aModulesCLB ( this, CUI_RES( CLB_EDIT_MODULES_MODULES ) ),
+ aPrioUpPB ( this, CUI_RES( PB_EDIT_MODULES_PRIO_UP ) ),
+ aPrioDownPB ( this, CUI_RES( PB_EDIT_MODULES_PRIO_DOWN ) ),
+ aBackPB ( this, CUI_RES( PB_EDIT_MODULES_PRIO_BACK ) ),
+ aMoreDictsLink ( this, CUI_RES( FT_EDIT_MODULES_NEWDICTSLINK ) ),
+ aButtonsFL ( this, CUI_RES( FL_EDIT_MODULES_BUTTONS ) ),
+ aHelpPB ( this, CUI_RES( PB_HELP ) ),
+ aClosePB ( this, CUI_RES( PB_OK ) ),
+ sSpell ( CUI_RES( ST_SPELL ) ),
+ sHyph ( CUI_RES( ST_HYPH ) ),
+ sThes ( CUI_RES( ST_THES ) ),
+ sGrammar ( CUI_RES( ST_GRAMMAR ) ),
rLinguData ( rData )
{
pCheckButtonData = NULL;
diff --git a/svx/source/options/optlingu.hrc b/cui/source/options/optlingu.hrc
index 73b481cbb6a3..73b481cbb6a3 100644
--- a/svx/source/options/optlingu.hrc
+++ b/cui/source/options/optlingu.hrc
diff --git a/svx/source/options/optlingu.src b/cui/source/options/optlingu.src
index a550451193f2..c0cb4489cd59 100644
--- a/svx/source/options/optlingu.src
+++ b/cui/source/options/optlingu.src
@@ -35,7 +35,7 @@
#include <svtools/controldims.hrc>
#include <sfx2/sfx.hrc>
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
// RID_SVXDLG_EDIT_MODULES ---------------------------------------------------
diff --git a/svx/source/cui/optmemory.cxx b/cui/source/options/optmemory.cxx
index ac5a1809fc7b..a72660ba2e0f 100644
--- a/svx/source/cui/optmemory.cxx
+++ b/cui/source/options/optmemory.cxx
@@ -29,61 +29,48 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
-
+#include "precompiled_cui.hxx"
#include <svtools/langtab.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
#include <goodies/grfmgr.hxx>
-#include <svtools/flagitem.hxx>
+#include <svl/flagitem.hxx>
#include <sfx2/dispatch.hxx>
-#include <svtools/lingucfg.hxx>
-#include <svtools/szitem.hxx>
+#include <unotools/lingucfg.hxx>
+#include <svl/szitem.hxx>
#include <sfx2/viewsh.hxx>
#include <sfx2/viewfrm.hxx>
#include <sfx2/filedlghelper.hxx>
#include <vcl/msgbox.hxx>
#include <rtl/math.hxx>
-#include <svtools/undoopt.hxx>
-#include <svtools/useroptions.hxx>
-#include <svtools/cacheoptions.hxx>
-#include <svtools/fontoptions.hxx>
+#include <unotools/undoopt.hxx>
+#include <unotools/useroptions.hxx>
+#include <unotools/cacheoptions.hxx>
+#include <unotools/fontoptions.hxx>
#include <svtools/menuoptions.hxx>
-#include <svtools/startoptions.hxx>
-#include <svtools/cjkoptions.hxx>
-#ifndef INCLUDED_SVTOOLS_MISCPOPT_HXX
+#include <unotools/startoptions.hxx>
+#include <svl/cjkoptions.hxx>
#include <svtools/miscopt.hxx>
-#endif
-#include <svtools/syslocaleoptions.hxx>
+#include <unotools/syslocaleoptions.hxx>
#include <svtools/helpopt.hxx>
#include <unotools/configitem.hxx>
#include <sfx2/objsh.hxx>
#include <comphelper/types.hxx>
-#include "unolingu.hxx"
+#include <svx/unolingu.hxx>
#include <svx/langitem.hxx>
#include "cuioptgenrl.hxx"
#include "optpath.hxx"
#include "optsave.hxx"
-#include <svx/optlingu.hxx>
+#include "optlingu.hxx"
#include <svx/xpool.hxx>
-#include "dlgutil.hxx"
-#ifndef _SVX_TAB_AREA_HXX
+#include <svx/dlgutil.hxx>
#include "cuitabarea.hxx"
-#endif
-#ifndef _SVX_DIALOGS_HRC
-#include <svx/dialogs.hrc>
-#endif
-
-
+#include <cuires.hrc>
#include "optmemory.hrc"
#include "optmemory.hxx"
-#include "ofaitem.hxx"
-#include <svx/dialogs.hrc>
+#include <svx/ofaitem.hxx>
+#include <cuires.hrc>
#include "helpid.hrc"
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
#define CONFIG_LANGUAGES "OfficeLanguages"
@@ -140,30 +127,30 @@ int OfaMemoryOptionsPage::DeactivatePage( SfxItemSet* _pSet )
OfaMemoryOptionsPage::OfaMemoryOptionsPage(Window* pParent, const SfxItemSet& rSet ) :
- SfxTabPage( pParent, SVX_RES( OFA_TP_MEMORY ), rSet ),
-
- aUndoBox ( this, SVX_RES( GB_UNDO ) ),
- aUndoText ( this, SVX_RES( FT_UNDO ) ),
- aUndoEdit ( this, SVX_RES( ED_UNDO ) ),
- aGbGraphicCache ( this, SVX_RES( GB_GRAPHICCACHE ) ),
- aFtGraphicCache ( this, SVX_RES( FT_GRAPHICCACHE ) ),
- aNfGraphicCache ( this, SVX_RES( NF_GRAPHICCACHE ) ),
- aFtGraphicCacheUnit ( this, SVX_RES( FT_GRAPHICCACHE_UNIT ) ),
- aFtGraphicObjectCache ( this, SVX_RES( FT_GRAPHICOBJECTCACHE ) ),
- aNfGraphicObjectCache ( this, SVX_RES( NF_GRAPHICOBJECTCACHE ) ),
- aFtGraphicObjectCacheUnit(this, SVX_RES( FT_GRAPHICOBJECTCACHE_UNIT ) ),
- aFtGraphicObjectTime ( this, SVX_RES( FT_GRAPHICOBJECTTIME ) ),
- aTfGraphicObjectTime ( this, SVX_RES( TF_GRAPHICOBJECTTIME ) ),
- aFtGraphicObjectTimeUnit( this, SVX_RES( FT_GRAPHICOBJECTTIME_UNIT ) ),
-
- aGbOLECache ( this, SVX_RES( GB_OLECACHE ) ),
- aFtOLECache ( this, SVX_RES( FT_OLECACHE ) ),
- aNfOLECache ( this, SVX_RES( NF_OLECACHE ) ),
- aQuickLaunchFL ( this, SVX_RES( FL_QUICKLAUNCH ) ),
- aQuickLaunchCB ( this, SVX_RES( CB_QUICKLAUNCH ) )//,
+ SfxTabPage( pParent, CUI_RES( OFA_TP_MEMORY ), rSet ),
+
+ aUndoBox ( this, CUI_RES( GB_UNDO ) ),
+ aUndoText ( this, CUI_RES( FT_UNDO ) ),
+ aUndoEdit ( this, CUI_RES( ED_UNDO ) ),
+ aGbGraphicCache ( this, CUI_RES( GB_GRAPHICCACHE ) ),
+ aFtGraphicCache ( this, CUI_RES( FT_GRAPHICCACHE ) ),
+ aNfGraphicCache ( this, CUI_RES( NF_GRAPHICCACHE ) ),
+ aFtGraphicCacheUnit ( this, CUI_RES( FT_GRAPHICCACHE_UNIT ) ),
+ aFtGraphicObjectCache ( this, CUI_RES( FT_GRAPHICOBJECTCACHE ) ),
+ aNfGraphicObjectCache ( this, CUI_RES( NF_GRAPHICOBJECTCACHE ) ),
+ aFtGraphicObjectCacheUnit(this, CUI_RES( FT_GRAPHICOBJECTCACHE_UNIT ) ),
+ aFtGraphicObjectTime ( this, CUI_RES( FT_GRAPHICOBJECTTIME ) ),
+ aTfGraphicObjectTime ( this, CUI_RES( TF_GRAPHICOBJECTTIME ) ),
+ aFtGraphicObjectTimeUnit( this, CUI_RES( FT_GRAPHICOBJECTTIME_UNIT ) ),
+
+ aGbOLECache ( this, CUI_RES( GB_OLECACHE ) ),
+ aFtOLECache ( this, CUI_RES( FT_OLECACHE ) ),
+ aNfOLECache ( this, CUI_RES( NF_OLECACHE ) ),
+ aQuickLaunchFL ( this, CUI_RES( FL_QUICKLAUNCH ) ),
+ aQuickLaunchCB ( this, CUI_RES( CB_QUICKLAUNCH ) )//,
{
#if defined(UNX)
- aQuickLaunchCB.SetText( SVX_RES( STR_QUICKLAUNCH_UNX ) );
+ aQuickLaunchCB.SetText( CUI_RES( STR_QUICKLAUNCH_UNX ) );
#endif
FreeResource();
diff --git a/svx/source/cui/optmemory.hrc b/cui/source/options/optmemory.hrc
index 0ba3f833d2e7..0ba3f833d2e7 100644
--- a/svx/source/cui/optmemory.hrc
+++ b/cui/source/options/optmemory.hrc
diff --git a/svx/source/cui/optmemory.hxx b/cui/source/options/optmemory.hxx
index f385dd60875f..f385dd60875f 100644
--- a/svx/source/cui/optmemory.hxx
+++ b/cui/source/options/optmemory.hxx
diff --git a/svx/source/cui/optmemory.src b/cui/source/options/optmemory.src
index fce14b15551d..e54dbde11eb7 100644
--- a/svx/source/cui/optmemory.src
+++ b/cui/source/options/optmemory.src
@@ -30,7 +30,7 @@
// include ---------------------------------------------------------------
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "optmemory.hrc"
#include "helpid.hrc"
diff --git a/svx/source/cui/optpath.cxx b/cui/source/options/optpath.cxx
index eeef9ec75fea..8e004b54b018 100644
--- a/svx/source/cui/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -29,39 +29,34 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
// include ---------------------------------------------------------------
-#include <svx/svxdlg.hxx> //CHINA001
+#include <svx/svxdlg.hxx>
#include <tools/shl.hxx>
#include <vcl/msgbox.hxx>
#include <sfx2/filedlghelper.hxx>
#include <sfx2/app.hxx>
-#include <svtools/pickerhelper.hxx>
-#include <svtools/aeitem.hxx>
+#include <svl/pickerhelper.hxx>
+#include <svl/aeitem.hxx>
#include <svtools/svtabbx.hxx>
#include <svtools/filedlg.hxx>
#include <tools/config.hxx>
#include <tools/urlobj.hxx>
#include <vcl/svapp.hxx>
-#include <svtools/defaultoptions.hxx>
+#include <unotools/defaultoptions.hxx>
#include <unotools/localfilehelper.hxx>
-#include <svtools/pathoptions.hxx>
-#include <svtools/moduleoptions.hxx>
-#include <svtools/viewoptions.hxx>
+#include <unotools/pathoptions.hxx>
+#include <unotools/moduleoptions.hxx>
+#include <unotools/viewoptions.hxx>
#define _SVX_OPTPATH_CXX
#include "optpath.hxx"
-#include <svx/dialmgr.hxx>
-//CHINA001 #include "multipat.hxx"
+#include <dialmgr.hxx>
#include "optpath.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "helpid.hrc"
#include <comphelper/processfactory.hxx>
#include <comphelper/configurationhelper.hxx>
@@ -223,22 +218,22 @@ BOOL IsMultiPath_Impl( const USHORT nIndex )
SvxPathTabPage::SvxPathTabPage( Window* pParent, const SfxItemSet& rSet ) :
- SfxTabPage( pParent, SVX_RES( RID_SFXPAGE_PATH ), rSet ),
+ SfxTabPage( pParent, CUI_RES( RID_SFXPAGE_PATH ), rSet ),
- aTypeText ( this, SVX_RES( FT_TYPE ) ),
- aPathText ( this, SVX_RES( FT_PATH ) ),
- aPathCtrl ( this, SVX_RES( LB_PATH ) ),
- aStandardBtn ( this, SVX_RES( BTN_STANDARD ) ),
- aPathBtn ( this, SVX_RES( BTN_PATH ) ),
- aStdBox ( this, SVX_RES( GB_STD ) ),
+ aTypeText ( this, CUI_RES( FT_TYPE ) ),
+ aPathText ( this, CUI_RES( FT_PATH ) ),
+ aPathCtrl ( this, CUI_RES( LB_PATH ) ),
+ aStandardBtn ( this, CUI_RES( BTN_STANDARD ) ),
+ aPathBtn ( this, CUI_RES( BTN_PATH ) ),
+ aStdBox ( this, CUI_RES( GB_STD ) ),
pHeaderBar ( NULL ),
pPathBox ( NULL ),
- pImpl ( new OptPath_Impl( SVX_RES(IMG_LOCK), SVX_RES(IMG_LOCK_HC) ) ),
+ pImpl ( new OptPath_Impl( CUI_RES(IMG_LOCK), CUI_RES(IMG_LOCK_HC) ) ),
xDialogListener ( new ::svt::DialogClosedListener() )
{
- pImpl->m_sMultiPathDlg = String( SVX_RES( STR_MULTIPATHDLG ) );
+ pImpl->m_sMultiPathDlg = String( CUI_RES( STR_MULTIPATHDLG ) );
aStandardBtn.SetClickHdl( LINK( this, SvxPathTabPage, StandardHdl_Impl ) );
Link aLink = LINK( this, SvxPathTabPage, PathHdl_Impl );
aPathBtn.SetClickHdl( aLink );
@@ -349,7 +344,7 @@ void SvxPathTabPage::Reset( const SfxItemSet& )
#endif
case SvtPathOptions::PATH_WORK:
{
- String aStr( SVX_RES( RID_SVXSTR_PATH_NAME_START + i ) );
+ String aStr( CUI_RES( RID_SVXSTR_PATH_NAME_START + i ) );
String sInternal, sUser, sWritable;
sal_Bool bReadOnly = sal_False;
GetPathList( i, sInternal, sUser, sWritable, bReadOnly );
@@ -588,7 +583,7 @@ IMPL_LINK( SvxPathTabPage, PathHdl_Impl, PushButton *, EMPTYARG )
if ( pFact )
{
AbstractSvxMultiPathDialog* pMultiDlg =
- pFact->CreateSvxMultiPathDialog( this, RID_SVXDLG_MULTIPATH );
+ pFact->CreateSvxMultiPathDialog( this );
DBG_ASSERT( pMultiDlg, "Dialogdiet fail!" );
pMultiDlg->EnableRadioButtonMode();
diff --git a/svx/inc/optpath.hrc b/cui/source/options/optpath.hrc
index 0fcef57dcf4c..0fcef57dcf4c 100644
--- a/svx/inc/optpath.hrc
+++ b/cui/source/options/optpath.hrc
diff --git a/svx/source/options/optpath.src b/cui/source/options/optpath.src
index 65280895a506..7d0c3425636d 100644
--- a/svx/source/options/optpath.src
+++ b/cui/source/options/optpath.src
@@ -29,7 +29,7 @@
************************************************************************/
// include --------------------------------------------------------------
#include "optpath.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#ifndef _SFX_HRC
#include <sfx2/sfx.hrc>
#endif
diff --git a/svx/source/cui/optsave.cxx b/cui/source/options/optsave.cxx
index 893300d10e01..caf332fb4048 100644
--- a/svx/source/cui/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -29,28 +29,24 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
// include ---------------------------------------------------------------
#include <tools/shl.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/intitem.hxx>
#define _SVX_OPTSAVE_CXX
#include "optsave.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "optsave.hxx"
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/sequenceasvector.hxx>
#include <comphelper/sequenceashashmap.hxx>
-#include <svtools/moduleoptions.hxx>
-#include <svtools/saveopt.hxx>
+#include <unotools/moduleoptions.hxx>
+#include <unotools/saveopt.hxx>
#include <comphelper/sequenceasvector.hxx>
#include <comphelper/sequenceashashmap.hxx>
#include <com/sun/star/container/XContainerQuery.hpp>
@@ -66,7 +62,7 @@
#include <vcl/fixed.hxx>
#include <vcl/msgbox.hxx>
#include <unotools/configitem.hxx>
-#include <svtools/optionsdlg.hxx>
+#include <unotools/optionsdlg.hxx>
#include <vcl/msgbox.hxx>
@@ -100,11 +96,11 @@ class FilterWarningDialog_Impl : public ModalDialog
};
// ----------------------------------------------------------------------
FilterWarningDialog_Impl::FilterWarningDialog_Impl(Window* pParent) :
- ModalDialog(pParent, SVX_RES( RID_SVXDLG_FILTER_WARNING ) ),
- aOk( this, SVX_RES(PB_OK )),
- aCancel( this, SVX_RES(PB_CANCEL )),
- aImage( this, SVX_RES(IMG_WARNING )),
- aFilterWarningFT( this, SVX_RES(FT_FILTER_WARNING ))
+ ModalDialog(pParent, CUI_RES( RID_SVXDLG_FILTER_WARNING ) ),
+ aOk( this, CUI_RES(PB_OK )),
+ aCancel( this, CUI_RES(PB_CANCEL )),
+ aImage( this, CUI_RES(IMG_WARNING )),
+ aFilterWarningFT( this, CUI_RES(FT_FILTER_WARNING ))
{
FreeResource();
aImage.SetImage(WarningBox::GetStandardImage());
@@ -201,41 +197,41 @@ SvxSaveTabPage_Impl::~SvxSaveTabPage_Impl()
SfxSaveTabPage::SfxSaveTabPage( Window* pParent, const SfxItemSet& rCoreSet ) :
- SfxTabPage( pParent, SVX_RES( RID_SFXPAGE_SAVE ), rCoreSet ),
-
- aLoadFL ( this, SVX_RES( LB_LOAD ) ),
- aLoadUserSettingsCB ( this, SVX_RES( CB_LOAD_SETTINGS ) ),
- aLoadDocPrinterCB ( this, SVX_RES( CB_LOAD_DOCPRINTER ) ),
-
- aSaveFL ( this, SVX_RES( GB_SAVE ) ),
- aDocInfoCB ( this, SVX_RES( BTN_DOCINFO ) ),
- aBackupFI ( this, SVX_RES( FI_BACKUP ) ),
- aBackupCB ( this, SVX_RES( BTN_BACKUP ) ),
- aAutoSaveCB ( this, SVX_RES( BTN_AUTOSAVE ) ),
- aAutoSaveEdit ( this, SVX_RES( ED_AUTOSAVE ) ),
- aMinuteFT ( this, SVX_RES( FT_MINUTE ) ),
- aRelativeFsysCB ( this, SVX_RES( BTN_RELATIVE_FSYS ) ),
- aRelativeInetCB ( this, SVX_RES( BTN_RELATIVE_INET ) ),
-
- aDefaultFormatFL ( this, SVX_RES( FL_FILTER ) ),
- aODFVersionFT ( this, SVX_RES( FT_ODF_VERSION ) ),
- aODFVersionLB ( this, SVX_RES( LB_ODF_VERSION ) ),
- aSizeOptimizationCB ( this, SVX_RES( BTN_NOPRETTYPRINTING ) ),
- aWarnAlienFormatCB ( this, SVX_RES( BTN_WARNALIENFORMAT ) ),
- aDocTypeFT ( this, SVX_RES( FT_APP ) ),
- aDocTypeLB ( this, SVX_RES( LB_APP ) ),
- aSaveAsFT ( this, SVX_RES( FT_FILTER ) ),
- aSaveAsFI ( this, SVX_RES( FI_FILTER ) ),
- aSaveAsLB ( this, SVX_RES( LB_FILTER ) ),
- aODFWarningFI ( this, SVX_RES( FI_ODF_WARNING ) ),
- aODFWarningFT ( this, SVX_RES( FT_WARN ) ),
+ SfxTabPage( pParent, CUI_RES( RID_SFXPAGE_SAVE ), rCoreSet ),
+
+ aLoadFL ( this, CUI_RES( LB_LOAD ) ),
+ aLoadUserSettingsCB ( this, CUI_RES( CB_LOAD_SETTINGS ) ),
+ aLoadDocPrinterCB ( this, CUI_RES( CB_LOAD_DOCPRINTER ) ),
+
+ aSaveFL ( this, CUI_RES( GB_SAVE ) ),
+ aDocInfoCB ( this, CUI_RES( BTN_DOCINFO ) ),
+ aBackupFI ( this, CUI_RES( FI_BACKUP ) ),
+ aBackupCB ( this, CUI_RES( BTN_BACKUP ) ),
+ aAutoSaveCB ( this, CUI_RES( BTN_AUTOSAVE ) ),
+ aAutoSaveEdit ( this, CUI_RES( ED_AUTOSAVE ) ),
+ aMinuteFT ( this, CUI_RES( FT_MINUTE ) ),
+ aRelativeFsysCB ( this, CUI_RES( BTN_RELATIVE_FSYS ) ),
+ aRelativeInetCB ( this, CUI_RES( BTN_RELATIVE_INET ) ),
+
+ aDefaultFormatFL ( this, CUI_RES( FL_FILTER ) ),
+ aODFVersionFT ( this, CUI_RES( FT_ODF_VERSION ) ),
+ aODFVersionLB ( this, CUI_RES( LB_ODF_VERSION ) ),
+ aSizeOptimizationCB ( this, CUI_RES( BTN_NOPRETTYPRINTING ) ),
+ aWarnAlienFormatCB ( this, CUI_RES( BTN_WARNALIENFORMAT ) ),
+ aDocTypeFT ( this, CUI_RES( FT_APP ) ),
+ aDocTypeLB ( this, CUI_RES( LB_APP ) ),
+ aSaveAsFT ( this, CUI_RES( FT_FILTER ) ),
+ aSaveAsFI ( this, CUI_RES( FI_FILTER ) ),
+ aSaveAsLB ( this, CUI_RES( LB_FILTER ) ),
+ aODFWarningFI ( this, CUI_RES( FI_ODF_WARNING ) ),
+ aODFWarningFT ( this, CUI_RES( FT_WARN ) ),
pImpl ( new SvxSaveTabPage_Impl )
{
sal_Bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
aODFWarningFI.SetImage(
- Image( SVX_RES( bHighContrast ? IMG_ODF_WARNING_HC : IMG_ODF_WARNING ) ) );
+ Image( CUI_RES( bHighContrast ? IMG_ODF_WARNING_HC : IMG_ODF_WARNING ) ) );
FreeResource();
diff --git a/svx/inc/optsave.hrc b/cui/source/options/optsave.hrc
index c5b2ab5e765a..c5b2ab5e765a 100644
--- a/svx/inc/optsave.hrc
+++ b/cui/source/options/optsave.hrc
diff --git a/svx/source/cui/optsave.hxx b/cui/source/options/optsave.hxx
index 8c9fcbc75ac8..8c9fcbc75ac8 100644
--- a/svx/source/cui/optsave.hxx
+++ b/cui/source/options/optsave.hxx
diff --git a/svx/source/options/optsave.src b/cui/source/options/optsave.src
index 374f53ef618f..cffff43cd23a 100644
--- a/svx/source/options/optsave.src
+++ b/cui/source/options/optsave.src
@@ -30,7 +30,7 @@
// include ---------------------------------------------------------------
#include <sfx2/sfx.hrc>
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "helpid.hrc"
#include "optsave.hrc"
diff --git a/svx/inc/optspell.hrc b/cui/source/options/optspell.hrc
index e13ba3ea09a2..e13ba3ea09a2 100644
--- a/svx/inc/optspell.hrc
+++ b/cui/source/options/optspell.hrc
diff --git a/svx/source/options/optspell.src b/cui/source/options/optspell.src
index bc6f3ad37fce..bc6f3ad37fce 100644
--- a/svx/source/options/optspell.src
+++ b/cui/source/options/optspell.src
diff --git a/svx/source/cui/optupdt.cxx b/cui/source/options/optupdt.cxx
index ebe23d52b66d..0fb6e113c40d 100644
--- a/svx/source/cui/optupdt.cxx
+++ b/cui/source/options/optupdt.cxx
@@ -29,24 +29,16 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
// include ---------------------------------------------------------------
#include <vcl/svapp.hxx>
#include <sfx2/filedlghelper.hxx>
-#include <svtools/zforlist.hxx>
-
+#include <svl/zforlist.hxx>
#include "optupdt.hxx"
#include "optupdt.hrc"
-
-#include <svx/dialmgr.hxx>
-#include <svx/dialogs.hrc>
-
-
+#include <dialmgr.hxx>
+#include <cuires.hrc>
#include <comphelper/processfactory.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/ui/dialogs/XFolderPicker.hpp>
@@ -55,7 +47,6 @@
#include <com/sun/star/frame/XDispatchProvider.hpp>
#include <com/sun/star/util/XChangesBatch.hpp>
#include <com/sun/star/util/XURLTransformer.hpp>
-
#include <osl/file.hxx>
#include <osl/security.hxx>
@@ -75,20 +66,20 @@ namespace util = ::com::sun::star::util;
SvxOnlineUpdateTabPage::SvxOnlineUpdateTabPage( Window* pParent, const SfxItemSet& rSet ) :
- SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_ONLINEUPDATE ), rSet ),
- m_aOptionsLine( this, SVX_RES( FL_OPTIONS ) ),
- m_aAutoCheckCheckBox( this, SVX_RES( CB_AUTOCHECK ) ),
- m_aEveryDayButton( this, SVX_RES( RB_EVERYDAY ) ),
- m_aEveryWeekButton( this, SVX_RES( RB_EVERYWEEK ) ),
- m_aEveryMonthButton( this, SVX_RES( RB_EVERYMONTH ) ),
- m_aCheckNowButton( this, SVX_RES( PB_CHECKNOW ) ),
- m_aAutoDownloadCheckBox( this, SVX_RES( CB_AUTODOWNLOAD ) ),
- m_aDestPathLabel( this, SVX_RES( FT_DESTPATHLABEL ) ),
- m_aDestPath( this, SVX_RES( FT_DESTPATH ) ),
- m_aChangePathButton( this, SVX_RES( PB_CHANGEPATH ) ),
- m_aLastChecked( this, SVX_RES( FT_LASTCHECKED ) )
+ SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_ONLINEUPDATE ), rSet ),
+ m_aOptionsLine( this, CUI_RES( FL_OPTIONS ) ),
+ m_aAutoCheckCheckBox( this, CUI_RES( CB_AUTOCHECK ) ),
+ m_aEveryDayButton( this, CUI_RES( RB_EVERYDAY ) ),
+ m_aEveryWeekButton( this, CUI_RES( RB_EVERYWEEK ) ),
+ m_aEveryMonthButton( this, CUI_RES( RB_EVERYMONTH ) ),
+ m_aCheckNowButton( this, CUI_RES( PB_CHECKNOW ) ),
+ m_aAutoDownloadCheckBox( this, CUI_RES( CB_AUTODOWNLOAD ) ),
+ m_aDestPathLabel( this, CUI_RES( FT_DESTPATHLABEL ) ),
+ m_aDestPath( this, CUI_RES( FT_DESTPATH ) ),
+ m_aChangePathButton( this, CUI_RES( PB_CHANGEPATH ) ),
+ m_aLastChecked( this, CUI_RES( FT_LASTCHECKED ) )
{
- m_aNeverChecked = String( SVX_RES( STR_NEVERCHECKED ) );
+ m_aNeverChecked = String( CUI_RES( STR_NEVERCHECKED ) );
FreeResource();
m_aAutoCheckCheckBox.SetClickHdl( LINK( this, SvxOnlineUpdateTabPage, AutoCheckHdl_Impl ) );
diff --git a/svx/source/cui/optupdt.hrc b/cui/source/options/optupdt.hrc
index d9e77f7f1403..d9e77f7f1403 100644
--- a/svx/source/cui/optupdt.hrc
+++ b/cui/source/options/optupdt.hrc
diff --git a/svx/source/cui/optupdt.hxx b/cui/source/options/optupdt.hxx
index 4aa380844602..4aa380844602 100644
--- a/svx/source/cui/optupdt.hxx
+++ b/cui/source/options/optupdt.hxx
diff --git a/svx/source/cui/optupdt.src b/cui/source/options/optupdt.src
index 043abb8b6a95..55d213978672 100644
--- a/svx/source/cui/optupdt.src
+++ b/cui/source/options/optupdt.src
@@ -30,7 +30,7 @@
// include --------------------------------------------------------------
#include "optupdt.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "helpid.hrc"
// RID_SVXPAGE_ONLINEUPDATE --------------------------------------------
diff --git a/svx/source/dialog/radiobtnbox.cxx b/cui/source/options/radiobtnbox.cxx
index 7aecbb95a91a..a3cf9719bf59 100644
--- a/svx/source/dialog/radiobtnbox.cxx
+++ b/cui/source/options/radiobtnbox.cxx
@@ -29,18 +29,12 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-/*
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
-*/
+#include "precompiled_cui.hxx"
// include ---------------------------------------------------------------
#include "radiobtnbox.hxx"
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
namespace svx {
diff --git a/svx/source/cui/readonlyimage.cxx b/cui/source/options/readonlyimage.cxx
index b22ee80f3a4c..508c4e6cfaec 100644
--- a/svx/source/cui/readonlyimage.cxx
+++ b/cui/source/options/readonlyimage.cxx
@@ -29,17 +29,13 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_cui.hxx"
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
#include <readonlyimage.hxx>
#include <vcl/help.hxx>
-#include <svx/dialmgr.hxx>
-#ifndef _SVX_DIALOGS_HRC
-#include <svx/dialogs.hrc>
-#endif
+#include <dialmgr.hxx>
+#include <cuires.hrc>
+
/*-- 26.02.2004 13:31:04---------------------------------------------------
-----------------------------------------------------------------------*/
@@ -47,7 +43,7 @@ ReadOnlyImage::ReadOnlyImage(Window* pParent, const ResId rResId) :
FixedImage(pParent, rResId)
{
sal_Bool bHighContrast = pParent->GetSettings().GetStyleSettings().GetHighContrastMode();
- SetImage( Image(SVX_RES(bHighContrast ? RID_SVXBMP_LOCK_HC : RID_SVXBMP_LOCK )));
+ SetImage( Image(CUI_RES(bHighContrast ? RID_SVXBMP_LOCK_HC : RID_SVXBMP_LOCK )));
}
/*-- 26.02.2004 13:31:04---------------------------------------------------
@@ -83,6 +79,6 @@ void ReadOnlyImage::RequestHelp( const HelpEvent& rHEvt )
-----------------------------------------------------------------------*/
const String& ReadOnlyImage::GetHelpTip()
{
- static String aStr(SVX_RES(RID_SVXSTR_READONLY_CONFIG_TIP));
+ static String aStr(CUI_RES(RID_SVXSTR_READONLY_CONFIG_TIP));
return aStr;
}
diff --git a/svx/source/cui/readonlyimage.hxx b/cui/source/options/readonlyimage.hxx
index 10e44989e9e9..10e44989e9e9 100644
--- a/svx/source/cui/readonlyimage.hxx
+++ b/cui/source/options/readonlyimage.hxx
diff --git a/svx/source/cui/readonlyimage.src b/cui/source/options/readonlyimage.src
index 0f698a833c46..92b7d2b73fb3 100644
--- a/svx/source/cui/readonlyimage.src
+++ b/cui/source/options/readonlyimage.src
@@ -30,7 +30,7 @@
// include ---------------------------------------------------------------
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
String RID_SVXSTR_READONLY_CONFIG_TIP
{
diff --git a/svx/source/cui/sdbcdriverenum.cxx b/cui/source/options/sdbcdriverenum.cxx
index d8be80bea651..5da5d649a969 100644
--- a/svx/source/cui/sdbcdriverenum.cxx
+++ b/cui/source/options/sdbcdriverenum.cxx
@@ -29,11 +29,7 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
#include "sdbcdriverenum.hxx"
#include <comphelper/stl_types.hxx>
#include <comphelper/processfactory.hxx>
diff --git a/svx/source/cui/sdbcdriverenum.hxx b/cui/source/options/sdbcdriverenum.hxx
index eaee591b22f3..eaee591b22f3 100644
--- a/svx/source/cui/sdbcdriverenum.hxx
+++ b/cui/source/options/sdbcdriverenum.hxx
diff --git a/svx/source/cui/securityoptions.cxx b/cui/source/options/securityoptions.cxx
index e033b9010868..85afe1476d5b 100644
--- a/svx/source/cui/securityoptions.cxx
+++ b/cui/source/options/securityoptions.cxx
@@ -29,23 +29,14 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
// include ---------------------------------------------------------------
-#ifndef INCLUDED_SVTOOLS_SECURITIYOPTIONS_HXX
-#include <svtools/securityoptions.hxx>
-#endif
+#include <unotools/securityoptions.hxx>
#include <svtools/stdctrl.hxx>
-#include <svx/dialmgr.hxx>
-#ifndef _SVX_DIALOGS_HRC
-#include <svx/dialogs.hrc>
-#endif
-
+#include <dialmgr.hxx>
+#include <cuires.hrc>
#include "securityoptions.hxx"
#include "securityoptions.hrc"
@@ -69,29 +60,29 @@ namespace svx
//........................................................................
SecurityOptionsDialog::SecurityOptionsDialog( Window* pParent, SvtSecurityOptions* pOptions ) :
- ModalDialog( pParent, SVX_RES( RID_SVXDLG_SECURITY_OPTIONS ) )
- ,m_aWarningsFL ( this, SVX_RES( FL_WARNINGS ) )
- ,m_aWarningsFI ( this, SVX_RES( FI_WARNINGS ) )
- ,m_aSaveOrSendDocsFI( this, SVX_RES( FI_SAVESENDDOCS ) )
- ,m_aSaveOrSendDocsCB( this, SVX_RES( CB_SAVESENDDOCS ) )
- ,m_aSignDocsFI ( this, SVX_RES( FI_SIGNDOCS ) )
- ,m_aSignDocsCB ( this, SVX_RES( CB_SIGNDOCS ) )
- ,m_aPrintDocsFI ( this, SVX_RES( FI_PRINTDOCS ) )
- ,m_aPrintDocsCB ( this, SVX_RES( CB_PRINTDOCS ) )
- ,m_aCreatePdfFI ( this, SVX_RES( FI_CREATEPDF ) )
- ,m_aCreatePdfCB ( this, SVX_RES( CB_CREATEPDF ) )
- ,m_aOptionsFL ( this, SVX_RES( FL_OPTIONS ) )
- ,m_aRemovePersInfoFI( this, SVX_RES( FI_REMOVEINFO ) )
- ,m_aRemovePersInfoCB( this, SVX_RES( CB_REMOVEINFO ) )
- ,m_aRecommPasswdFI ( this, SVX_RES( FI_RECOMMENDPWD ) )
- ,m_aRecommPasswdCB ( this, SVX_RES( CB_RECOMMENDPWD ) )
- ,m_aCtrlHyperlinkFI ( this, SVX_RES( FI_CTRLHYPERLINK ) )
- ,m_aCtrlHyperlinkCB ( this, SVX_RES( CB_CTRLHYPERLINK ) )
+ ModalDialog( pParent, CUI_RES( RID_SVXDLG_SECURITY_OPTIONS ) )
+ ,m_aWarningsFL ( this, CUI_RES( FL_WARNINGS ) )
+ ,m_aWarningsFI ( this, CUI_RES( FI_WARNINGS ) )
+ ,m_aSaveOrSendDocsFI( this, CUI_RES( FI_SAVESENDDOCS ) )
+ ,m_aSaveOrSendDocsCB( this, CUI_RES( CB_SAVESENDDOCS ) )
+ ,m_aSignDocsFI ( this, CUI_RES( FI_SIGNDOCS ) )
+ ,m_aSignDocsCB ( this, CUI_RES( CB_SIGNDOCS ) )
+ ,m_aPrintDocsFI ( this, CUI_RES( FI_PRINTDOCS ) )
+ ,m_aPrintDocsCB ( this, CUI_RES( CB_PRINTDOCS ) )
+ ,m_aCreatePdfFI ( this, CUI_RES( FI_CREATEPDF ) )
+ ,m_aCreatePdfCB ( this, CUI_RES( CB_CREATEPDF ) )
+ ,m_aOptionsFL ( this, CUI_RES( FL_OPTIONS ) )
+ ,m_aRemovePersInfoFI( this, CUI_RES( FI_REMOVEINFO ) )
+ ,m_aRemovePersInfoCB( this, CUI_RES( CB_REMOVEINFO ) )
+ ,m_aRecommPasswdFI ( this, CUI_RES( FI_RECOMMENDPWD ) )
+ ,m_aRecommPasswdCB ( this, CUI_RES( CB_RECOMMENDPWD ) )
+ ,m_aCtrlHyperlinkFI ( this, CUI_RES( FI_CTRLHYPERLINK ) )
+ ,m_aCtrlHyperlinkCB ( this, CUI_RES( CB_CTRLHYPERLINK ) )
- ,m_aButtonsFL ( this, SVX_RES( FL_BUTTONS ) )
- ,m_aOKBtn ( this, SVX_RES( PB_OK ) )
- ,m_aCancelBtn ( this, SVX_RES( PB_CANCEL ) )
- ,m_aHelpBtn ( this, SVX_RES( PB_HELP ) )
+ ,m_aButtonsFL ( this, CUI_RES( FL_BUTTONS ) )
+ ,m_aOKBtn ( this, CUI_RES( PB_OK ) )
+ ,m_aCancelBtn ( this, CUI_RES( PB_CANCEL ) )
+ ,m_aHelpBtn ( this, CUI_RES( PB_HELP ) )
{
FreeResource();
diff --git a/svx/source/cui/securityoptions.hrc b/cui/source/options/securityoptions.hrc
index c0358d5f151b..c0358d5f151b 100644
--- a/svx/source/cui/securityoptions.hrc
+++ b/cui/source/options/securityoptions.hrc
diff --git a/svx/source/cui/securityoptions.hxx b/cui/source/options/securityoptions.hxx
index 0e78e328edd8..0e78e328edd8 100644
--- a/svx/source/cui/securityoptions.hxx
+++ b/cui/source/options/securityoptions.hxx
diff --git a/svx/source/cui/securityoptions.src b/cui/source/options/securityoptions.src
index 7f921bea1dd2..386f92a91fe3 100644
--- a/svx/source/cui/securityoptions.src
+++ b/cui/source/options/securityoptions.src
@@ -32,7 +32,7 @@
#include <svtools/controldims.hrc>
#include "securityoptions.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "helpid.hrc"
ModalDialog RID_SVXDLG_SECURITY_OPTIONS
diff --git a/svx/source/cui/treeopt.cxx b/cui/source/options/treeopt.cxx
index f33efffc2416..b45a19af4a70 100644
--- a/svx/source/cui/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -29,11 +29,7 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/loader/CannotActivateFactoryException.hpp>
@@ -43,13 +39,10 @@
#include <com/sun/star/frame/XModuleManager.hpp>
#include <com/sun/star/util/XMacroExpander.hpp>
#include <osl/module.hxx>
-
#include <com/sun/star/util/XCloseable.hpp>
#include <com/sun/star/frame/XLoadable.hpp>
#include <tools/rcid.h>
-
#include <tools/shl.hxx>
-
#include <comphelper/processfactory.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <com/sun/star/beans/PropertyValue.hpp>
@@ -67,39 +60,34 @@
#include <com/sun/star/awt/XControl.hpp>
#include <com/sun/star/awt/XTabController.hpp>
#include <vcl/help.hxx>
-#ifndef _LINGUISTIC_MISC_HHX_
#include <linguistic/misc.hxx>
-#endif
#include <svtools/helpopt.hxx>
-#include <svtools/moduleoptions.hxx>
-#include <svtools/languageoptions.hxx>
-#include <svtools/optionsdlg.hxx>
+#include <unotools/moduleoptions.hxx>
+#include <svl/languageoptions.hxx>
+#include <unotools/optionsdlg.hxx>
#include <sfx2/module.hxx>
#include <vcl/msgbox.hxx>
#include <sfx2/dispatch.hxx>
#include <vcl/waitobj.hxx>
-#include <svtools/slstitm.hxx>
+#include <svl/slstitm.hxx>
#include <sfx2/viewfrm.hxx>
-#include <svtools/viewoptions.hxx>
+#include <unotools/viewoptions.hxx>
#include <sfx2/printopt.hxx>
#include <osl/module.h>
#include <osl/process.h>
#include <rtl/bootstrap.hxx>
-
-#include <svtools/misccfg.hxx>
+#include <unotools/misccfg.hxx>
#include <sfx2/objsh.hxx>
#include <sfx2/viewsh.hxx>
#include <sfx2/tplpitem.hxx>
#include <svtools/apearcfg.hxx>
-#include <svtools/linguprops.hxx>
+#include <unotools/linguprops.hxx>
#include <sfx2/app.hxx>
#include <svx/xdef.hxx>
#include <svx/xflclit.hxx>
#include <svx/xpool.hxx>
-#ifndef _SVX_TAB_AREA_HXX //autogen
#include "cuitabarea.hxx"
-#endif
-#include "ofaitem.hxx"
+#include <svx/ofaitem.hxx>
#include "opthtml.hxx"
#include "optcolor.hxx"
#include "optctl.hxx"
@@ -107,45 +95,41 @@
#include "optsave.hxx"
#include "optpath.hxx"
#include "cuioptgenrl.hxx"
-#include <svx/optlingu.hxx>
-#ifndef _SVX_TAB_AREA_HXX //autogen
-#include "cuitabarea.hxx"
-#endif
+#include "optlingu.hxx"
#include "optinet2.hxx"
#include "optasian.hxx"
#include "optaccessibility.hxx"
#include "optjsearch.hxx"
#include "connpooloptions.hxx"
#include "optupdt.hxx"
-#include "svx/optimprove.hxx"
+#include <optimprove.hxx>
#include "optchart.hxx"
-
#include "optgdlg.hxx"
#include "optmemory.hxx"
#include "optfltr.hxx"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "helpid.hrc"
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
#include "treeopt.hxx"
#include "treeopt.hrc"
#include "fontsubs.hxx"
-#include "unolingu.hxx"
+#include <svx/unolingu.hxx>
#include <svx/xtable.hxx>
#include "connpoolconfig.hxx"
#include "dbregister.hxx"
#include "dbregisterednamesconfig.hxx"
#include "cfgchart.hxx"
+#include <svx/dialogs.hrc>
#ifndef _SVX_LANGITEM_HXX
#define ITEMID_LANGUAGE SID_ATTR_CHAR_LANGUAGE
#include <svx/langitem.hxx>
#endif
-#ifndef _SVX_OPTITEMS_HXX
-#include <optitems.hxx>
-#endif
-#include <drawitem.hxx>
+#include <svx/optitems.hxx>
+
+#include <svx/drawitem.hxx>
#include <rtl/uri.hxx>
using namespace ::com::sun::star;
@@ -312,6 +296,7 @@ public:
virtual ~MailMergeCfg_Impl();
virtual void Commit();
+ virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& _rPropertyNames);
sal_Bool IsEmailSupported() const {return bIsEmailSupported;}
@@ -341,6 +326,10 @@ void MailMergeCfg_Impl::Commit()
{
}
+void MailMergeCfg_Impl::Notify( const com::sun::star::uno::Sequence< rtl::OUString >& )
+{
+}
+
//typedef SfxTabPage* (*FNCreateTabPage)( Window *pParent, const SfxItemSet &rAttrSet );
SfxTabPage* CreateGeneralTabPage( sal_uInt16 nId, Window* pParent, const SfxItemSet& rSet )
{
@@ -560,19 +549,19 @@ sal_Bool OfaOptionsTreeListBox::Collapse( SvLBoxEntry* pParent )
// -----------------------------------------------------------------------
#define INI_LIST() \
- aOkPB ( this, SVX_RES( PB_OK ) ),\
- aCancelPB ( this, SVX_RES( PB_CANCEL ) ),\
- aHelpPB ( this, SVX_RES( PB_HELP ) ),\
- aBackPB ( this, SVX_RES( PB_BACK ) ),\
- aHiddenGB ( this, SVX_RES( FB_BORDER ) ),\
- aPageTitleFT ( this, SVX_RES( FT_PAGE_TITLE ) ),\
- aLine1FL ( this, SVX_RES( FL_LINE_1 ) ),\
- aHelpFT ( this, SVX_RES( FT_HELPTEXT ) ),\
- aHelpImg ( this, SVX_RES( IMG_HELP ) ),\
- aHelpTextsArr ( SVX_RES( STR_HELPTEXTS ) ),\
- aTreeLB ( this, SVX_RES( TLB_PAGES ) ),\
+ aOkPB ( this, CUI_RES( PB_OK ) ),\
+ aCancelPB ( this, CUI_RES( PB_CANCEL ) ),\
+ aHelpPB ( this, CUI_RES( PB_HELP ) ),\
+ aBackPB ( this, CUI_RES( PB_BACK ) ),\
+ aHiddenGB ( this, CUI_RES( FB_BORDER ) ),\
+ aPageTitleFT ( this, CUI_RES( FT_PAGE_TITLE ) ),\
+ aLine1FL ( this, CUI_RES( FL_LINE_1 ) ),\
+ aHelpFT ( this, CUI_RES( FT_HELPTEXT ) ),\
+ aHelpImg ( this, CUI_RES( IMG_HELP ) ),\
+ aHelpTextsArr ( CUI_RES( STR_HELPTEXTS ) ),\
+ aTreeLB ( this, CUI_RES( TLB_PAGES ) ),\
sTitle ( GetText() ),\
- sNotLoadedError ( SVX_RES( ST_LOAD_ERROR ) ),\
+ sNotLoadedError ( CUI_RES( ST_LOAD_ERROR ) ),\
pCurrentPageEntry ( NULL ),\
pColorPageItemSet ( NULL ),\
pColorTab ( NULL ),\
@@ -593,7 +582,7 @@ OfaTreeOptionsDialog::OfaTreeOptionsDialog(
const Reference< XFrame >& _xFrame,
bool bActivateLastSelection ) :
- SfxModalDialog( pParent, SVX_RES( RID_OFADLG_OPTIONS_TREE ) ),
+ SfxModalDialog( pParent, CUI_RES( RID_OFADLG_OPTIONS_TREE ) ),
INI_LIST()
{
FreeResource();
@@ -610,7 +599,7 @@ OfaTreeOptionsDialog::OfaTreeOptionsDialog(
OfaTreeOptionsDialog::OfaTreeOptionsDialog( Window* pParent, const rtl::OUString& rExtensionId ) :
- SfxModalDialog( pParent, SVX_RES( RID_OFADLG_OPTIONS_TREE ) ),
+ SfxModalDialog( pParent, CUI_RES( RID_OFADLG_OPTIONS_TREE ) ),
INI_LIST()
@@ -1450,19 +1439,19 @@ IMPL_LINK( OfaTreeOptionsDialog, SelectHdl_Impl, Timer*, EMPTYARG )
* --------------------------------------------------*/
OfaPageResource::OfaPageResource() :
- Resource(SVX_RES(RID_OFADLG_OPTIONS_TREE_PAGES)),
- aGeneralDlgAry(SVX_RES(SID_GENERAL_OPTIONS)),
- aInetDlgAry(SVX_RES(SID_INET_DLG)),
- aLangDlgAry(SVX_RES(SID_LANGUAGE_OPTIONS)),
- aTextDlgAry(SVX_RES(SID_SW_EDITOPTIONS)),
- aHTMLDlgAry(SVX_RES(SID_SW_ONLINEOPTIONS)),
- aCalcDlgAry(SVX_RES(SID_SC_EDITOPTIONS)),
- aStarMathDlgAry(SVX_RES(SID_SM_EDITOPTIONS)),
- aImpressDlgAry(SVX_RES(SID_SD_EDITOPTIONS)),
- aDrawDlgAry(SVX_RES(SID_SD_GRAPHIC_OPTIONS)),
- aChartDlgAry(SVX_RES(SID_SCH_EDITOPTIONS)),
- aFilterDlgAry(SVX_RES(SID_FILTER_DLG)),
- aDatasourcesDlgAry(SVX_RES(SID_SB_STARBASEOPTIONS))
+ Resource(CUI_RES(RID_OFADLG_OPTIONS_TREE_PAGES)),
+ aGeneralDlgAry(CUI_RES(SID_GENERAL_OPTIONS)),
+ aInetDlgAry(CUI_RES(SID_INET_DLG)),
+ aLangDlgAry(CUI_RES(SID_LANGUAGE_OPTIONS)),
+ aTextDlgAry(CUI_RES(SID_SW_EDITOPTIONS)),
+ aHTMLDlgAry(CUI_RES(SID_SW_ONLINEOPTIONS)),
+ aCalcDlgAry(CUI_RES(SID_SC_EDITOPTIONS)),
+ aStarMathDlgAry(CUI_RES(SID_SM_EDITOPTIONS)),
+ aImpressDlgAry(CUI_RES(SID_SD_EDITOPTIONS)),
+ aDrawDlgAry(CUI_RES(SID_SD_GRAPHIC_OPTIONS)),
+ aChartDlgAry(CUI_RES(SID_SCH_EDITOPTIONS)),
+ aFilterDlgAry(CUI_RES(SID_FILTER_DLG)),
+ aDatasourcesDlgAry(CUI_RES(SID_SB_STARBASEOPTIONS))
{
FreeResource();
}
@@ -1551,7 +1540,7 @@ SfxItemSet* OfaTreeOptionsDialog::CreateItemSet( sal_uInt16 nId )
SFX_APP()->GetOptions(aOptSet);
pRet->Put(aOptSet);
- SfxMiscCfg* pMisc = SFX_APP()->GetMiscConfig();
+ utl::MiscCfg aMisc;
const SfxPoolItem* pItem;
SfxViewFrame* pViewFrame = SfxViewFrame::Current();
if ( pViewFrame )
@@ -1562,17 +1551,17 @@ SfxItemSet* OfaTreeOptionsDialog::CreateItemSet( sal_uInt16 nId )
if( SFX_ITEM_AVAILABLE <= pDispatch->QueryState( SID_ATTR_YEAR2000, pItem ) )
pRet->Put( SfxUInt16Item( SID_ATTR_YEAR2000, ((const SfxUInt16Item*)pItem)->GetValue() ) );
else
- pRet->Put( SfxUInt16Item( SID_ATTR_YEAR2000, (USHORT)pMisc->GetYear2000() ) );
+ pRet->Put( SfxUInt16Item( SID_ATTR_YEAR2000, (USHORT)aMisc.GetYear2000() ) );
}
else
- pRet->Put( SfxUInt16Item( SID_ATTR_YEAR2000, (USHORT)pMisc->GetYear2000() ) );
+ pRet->Put( SfxUInt16Item( SID_ATTR_YEAR2000, (USHORT)aMisc.GetYear2000() ) );
// Sonstiges - Tabulator
- pRet->Put(SfxBoolItem(SID_PRINTER_NOTFOUND_WARN, pMisc->IsNotFoundWarning()));
+ pRet->Put(SfxBoolItem(SID_PRINTER_NOTFOUND_WARN, aMisc.IsNotFoundWarning()));
- sal_uInt16 nFlag = pMisc->IsPaperSizeWarning() ? SFX_PRINTER_CHG_SIZE : 0;
- nFlag |= pMisc->IsPaperOrientationWarning() ? SFX_PRINTER_CHG_ORIENTATION : 0;
+ sal_uInt16 nFlag = aMisc.IsPaperSizeWarning() ? SFX_PRINTER_CHG_SIZE : 0;
+ nFlag |= aMisc.IsPaperOrientationWarning() ? SFX_PRINTER_CHG_ORIENTATION : 0;
pRet->Put( SfxFlagItem( SID_PRINTER_CHANGESTODOC, nFlag ));
}
@@ -1686,7 +1675,7 @@ void OfaTreeOptionsDialog::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet
{
case SID_GENERAL_OPTIONS:
{
- SfxMiscCfg* pMisc = SFX_APP()->GetMiscConfig();
+ utl::MiscCfg aMisc;
const SfxPoolItem* pItem;
SfxItemSet aOptSet(SFX_APP()->GetPool(), SID_ATTR_QUICKLAUNCHER, SID_ATTR_QUICKLAUNCHER );
aOptSet.Put(rSet);
@@ -1707,20 +1696,20 @@ void OfaTreeOptionsDialog::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet
SfxDispatcher* pDispatch = pViewFrame->GetDispatcher();
pDispatch->Execute( SID_ATTR_YEAR2000, SFX_CALLMODE_ASYNCHRON, pItem, 0L);
}
- pMisc->SetYear2000(nY2K);
+ aMisc.SetYear2000(nY2K);
}
// -------------------------------------------------------------------------
// Drucken auswerten
// -------------------------------------------------------------------------
if(SFX_ITEM_SET == rSet.GetItemState(SID_PRINTER_NOTFOUND_WARN, sal_False, &pItem))
- pMisc->SetNotFoundWarning(((const SfxBoolItem*)pItem)->GetValue());
+ aMisc.SetNotFoundWarning(((const SfxBoolItem*)pItem)->GetValue());
if(SFX_ITEM_SET == rSet.GetItemState(SID_PRINTER_CHANGESTODOC, sal_False, &pItem))
{
const SfxFlagItem* pFlag = (const SfxFlagItem*)pItem;
- pMisc->SetPaperSizeWarning(0 != (pFlag->GetValue() & SFX_PRINTER_CHG_SIZE ));
- pMisc->SetPaperOrientationWarning(0 != (pFlag->GetValue() & SFX_PRINTER_CHG_ORIENTATION ));
+ aMisc.SetPaperSizeWarning(0 != (pFlag->GetValue() & SFX_PRINTER_CHG_SIZE ));
+ aMisc.SetPaperOrientationWarning(0 != (pFlag->GetValue() & SFX_PRINTER_CHG_ORIENTATION ));
}
// -------------------------------------------------------------------------
// evaluate help options
@@ -2034,7 +2023,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame )
( RID_SW_TP_MAILCONFIG != nPageId || MailMergeCfg_Impl().IsEmailSupported() ) )
AddTabPage( nPageId, rTextArray.GetString(i), nGroup );
}
-#ifndef PRODUCT
+#ifdef DBG_UTIL
AddTabPage( RID_SW_TP_OPTTEST_PAGE, String::CreateFromAscii("Interner Test"), nGroup );
#endif
}
@@ -2050,7 +2039,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame )
if ( !lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) )
AddTabPage( nPageId, rHTMLArray.GetString(i), nGroup );
}
-#ifndef PRODUCT
+#ifdef DBG_UTIL
AddTabPage( RID_SW_TP_OPTTEST_PAGE, String::CreateFromAscii("Interner Test"), nGroup );
#endif
}
diff --git a/svx/source/cui/treeopt.hrc b/cui/source/options/treeopt.hrc
index 7f8fab812dc2..7f8fab812dc2 100644
--- a/svx/source/cui/treeopt.hrc
+++ b/cui/source/options/treeopt.hrc
diff --git a/svx/source/cui/treeopt.src b/cui/source/options/treeopt.src
index 2bf5d0825cdc..05a67948da04 100644
--- a/svx/source/cui/treeopt.src
+++ b/cui/source/options/treeopt.src
@@ -29,8 +29,9 @@
************************************************************************/
#include "treeopt.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "helpid.hrc"
+#include <svx/dialogs.hrc>
#define IMAGE_STDBTN_COLOR Color { Red = 0xC000; Green = 0xC000; Blue = 0xC000; }
diff --git a/svx/source/cui/webconninfo.cxx b/cui/source/options/webconninfo.cxx
index 997c246abf1e..162758a524fe 100644
--- a/svx/source/cui/webconninfo.cxx
+++ b/cui/source/options/webconninfo.cxx
@@ -29,26 +29,17 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
// include ---------------------------------------------------------------
-#include <svx/dialmgr.hxx>
-#ifndef _SVX_DIALOGS_HRC
-#include <svx/dialogs.hrc>
-#endif
-
+#include <dialmgr.hxx>
+#include <cuires.hrc>
#include <com/sun/star/task/UrlRecord.hpp>
#include <com/sun/star/task/XPasswordContainer.hpp>
#include <com/sun/star/task/XMasterPasswordHandling.hpp>
#include "com/sun/star/task/XUrlContainer.hpp"
-
#include <comphelper/processfactory.hxx>
#include <comphelper/docpasswordrequest.hxx>
-
#include "webconninfo.hxx"
#include "webconninfo.hrc"
@@ -108,22 +99,22 @@ void PasswordTable::Resort( bool bForced )
// -----------------------------------------------------------------------
WebConnectionInfoDialog::WebConnectionInfoDialog( Window* pParent ) :
- ModalDialog( pParent, SVX_RES( RID_SVXDLG_WEBCONNECTION_INFO ) )
- ,m_aNeverShownFI ( this, SVX_RES( FI_NEVERSHOWN ) )
- ,m_aPasswordsLB ( this, SVX_RES( LB_PASSWORDS ) )
- ,m_aRemoveBtn ( this, SVX_RES( PB_REMOVE ) )
- ,m_aRemoveAllBtn ( this, SVX_RES( PB_REMOVEALL ) )
- ,m_aChangeBtn ( this, SVX_RES( PB_CHANGE ) )
- ,m_aButtonsFL ( this, SVX_RES( FL_BUTTONS ) )
- ,m_aCloseBtn ( this, SVX_RES( PB_CLOSE ) )
- ,m_aHelpBtn ( this, SVX_RES( PB_HELP ) )
+ ModalDialog( pParent, CUI_RES( RID_SVXDLG_WEBCONNECTION_INFO ) )
+ ,m_aNeverShownFI ( this, CUI_RES( FI_NEVERSHOWN ) )
+ ,m_aPasswordsLB ( this, CUI_RES( LB_PASSWORDS ) )
+ ,m_aRemoveBtn ( this, CUI_RES( PB_REMOVE ) )
+ ,m_aRemoveAllBtn ( this, CUI_RES( PB_REMOVEALL ) )
+ ,m_aChangeBtn ( this, CUI_RES( PB_CHANGE ) )
+ ,m_aButtonsFL ( this, CUI_RES( FL_BUTTONS ) )
+ ,m_aCloseBtn ( this, CUI_RES( PB_CLOSE ) )
+ ,m_aHelpBtn ( this, CUI_RES( PB_HELP ) )
,m_nPos ( -1 )
{
static long aStaticTabs[]= { 3, 0, 150, 250 };
m_aPasswordsLB.SetTabs( aStaticTabs );
- m_aPasswordsLB.InsertHeaderItem( 1, SVX_RESSTR( STR_WEBSITE ),
+ m_aPasswordsLB.InsertHeaderItem( 1, CUI_RESSTR( STR_WEBSITE ),
HIB_LEFT | HIB_VCENTER | HIB_FIXEDPOS | HIB_CLICKABLE | HIB_UPARROW );
- m_aPasswordsLB.InsertHeaderItem( 2, SVX_RESSTR( STR_USERNAME ),
+ m_aPasswordsLB.InsertHeaderItem( 2, CUI_RESSTR( STR_USERNAME ),
HIB_LEFT | HIB_VCENTER | HIB_FIXEDPOS );
m_aPasswordsLB.ResetTabs();
diff --git a/svx/source/cui/webconninfo.hrc b/cui/source/options/webconninfo.hrc
index de040b302d89..de040b302d89 100644
--- a/svx/source/cui/webconninfo.hrc
+++ b/cui/source/options/webconninfo.hrc
diff --git a/svx/source/cui/webconninfo.hxx b/cui/source/options/webconninfo.hxx
index f24b9f0dd4c8..f24b9f0dd4c8 100644
--- a/svx/source/cui/webconninfo.hxx
+++ b/cui/source/options/webconninfo.hxx
diff --git a/svx/source/cui/webconninfo.src b/cui/source/options/webconninfo.src
index 328478c56e83..9252a698b29c 100644
--- a/svx/source/cui/webconninfo.src
+++ b/cui/source/options/webconninfo.src
@@ -32,7 +32,7 @@
#include <svtools/controldims.hrc>
#include "webconninfo.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "helpid.hrc"
ModalDialog RID_SVXDLG_WEBCONNECTION_INFO
diff --git a/svx/source/cui/align.cxx b/cui/source/tabpages/align.cxx
index 641ee0717b96..f275cc084877 100644
--- a/svx/source/cui/align.cxx
+++ b/cui/source/tabpages/align.cxx
@@ -29,35 +29,31 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
// include ---------------------------------------------------------------
-#include <svx/svxenum.hxx>
+#include "align.hxx"
+#include <svx/svxenum.hxx>
#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "align.hrc"
-#include "rotmodit.hxx"
+#include <svx/rotmodit.hxx>
#include <svx/algitem.hxx>
#include <svx/frmdiritem.hxx>
-#include "align.hxx"
-#include <svx/dialmgr.hxx>
-#include "dlgutil.hxx"
+#include <dialmgr.hxx>
+#include <svx/dlgutil.hxx>
#include <tools/shl.hxx>
#include <sfx2/app.hxx>
#include <sfx2/module.hxx>
#include <sfx2/itemconnect.hxx>
-#include <svtools/cjkoptions.hxx>
-#include <svtools/languageoptions.hxx>
+#include <svl/cjkoptions.hxx>
+#include <svl/languageoptions.hxx>
#include <svtools/localresaccess.hxx>
-#include <svx/svxids.hrc> //CHINA001
-#include "flagsdef.hxx" //CHINA001
-#include <svtools/intitem.hxx> //CHINA001
+#include <svx/flagsdef.hxx> //CHINA001
+#include <svl/intitem.hxx> //CHINA001
#include <sfx2/request.hxx> //CHINA001
namespace svx {
@@ -127,32 +123,32 @@ static USHORT s_pRanges[] =
AlignmentTabPage::AlignmentTabPage( Window* pParent, const SfxItemSet& rCoreAttrs ) :
- SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_ALIGNMENT ), rCoreAttrs ),
-
- maFlAlignment ( this, SVX_RES( FL_ALIGNMENT ) ),
- maFtHorAlign ( this, SVX_RES( FT_HORALIGN ) ),
- maLbHorAlign ( this, SVX_RES( LB_HORALIGN ) ),
- maFtIndent ( this, SVX_RES( FT_INDENT ) ),
- maEdIndent ( this, SVX_RES( ED_INDENT ) ),
- maFtVerAlign ( this, SVX_RES( FT_VERALIGN ) ),
- maLbVerAlign ( this, SVX_RES( LB_VERALIGN ) ),
-
- maFlOrient ( this, SVX_RES( FL_ORIENTATION ) ),
- maCtrlDial ( this, SVX_RES( CTR_DIAL ) ),
- maFtRotate ( this, SVX_RES( FT_DEGREES ) ),
- maNfRotate ( this, SVX_RES( NF_DEGREES ) ),
- maFtRefEdge ( this, SVX_RES( FT_BORDER_LOCK ) ),
- maVsRefEdge ( this, SVX_RES( CTR_BORDER_LOCK ) ),
- maCbStacked ( this, SVX_RES( BTN_TXTSTACKED ) ),
- maCbAsianMode ( this, SVX_RES( BTN_ASIAN_VERTICAL ) ),
+ SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_ALIGNMENT ), rCoreAttrs ),
+
+ maFlAlignment ( this, CUI_RES( FL_ALIGNMENT ) ),
+ maFtHorAlign ( this, CUI_RES( FT_HORALIGN ) ),
+ maLbHorAlign ( this, CUI_RES( LB_HORALIGN ) ),
+ maFtIndent ( this, CUI_RES( FT_INDENT ) ),
+ maEdIndent ( this, CUI_RES( ED_INDENT ) ),
+ maFtVerAlign ( this, CUI_RES( FT_VERALIGN ) ),
+ maLbVerAlign ( this, CUI_RES( LB_VERALIGN ) ),
+
+ maFlOrient ( this, CUI_RES( FL_ORIENTATION ) ),
+ maCtrlDial ( this, CUI_RES( CTR_DIAL ) ),
+ maFtRotate ( this, CUI_RES( FT_DEGREES ) ),
+ maNfRotate ( this, CUI_RES( NF_DEGREES ) ),
+ maFtRefEdge ( this, CUI_RES( FT_BORDER_LOCK ) ),
+ maVsRefEdge ( this, CUI_RES( CTR_BORDER_LOCK ) ),
+ maCbStacked ( this, CUI_RES( BTN_TXTSTACKED ) ),
+ maCbAsianMode ( this, CUI_RES( BTN_ASIAN_VERTICAL ) ),
maOrientHlp ( maCtrlDial, maNfRotate, maCbStacked ),
- maFlProperties ( this, SVX_RES( FL_WRAP ) ),
- maBtnWrap ( this, SVX_RES( BTN_WRAP ) ),
- maBtnHyphen ( this, SVX_RES( BTN_HYPH ) ),
- maBtnShrink ( this, SVX_RES( BTN_SHRINK ) ),
- maFtFrameDir ( this, SVX_RES( FT_TEXTFLOW ) ),
- maLbFrameDir ( this, SVX_RES( LB_FRAMEDIR ) )
+ maFlProperties ( this, CUI_RES( FL_WRAP ) ),
+ maBtnWrap ( this, CUI_RES( BTN_WRAP ) ),
+ maBtnHyphen ( this, CUI_RES( BTN_HYPH ) ),
+ maBtnShrink ( this, CUI_RES( BTN_SHRINK ) ),
+ maFtFrameDir ( this, CUI_RES( FT_TEXTFLOW ) ),
+ maLbFrameDir ( this, CUI_RES( LB_FRAMEDIR ) )
{
InitVsRefEgde();
@@ -172,9 +168,9 @@ AlignmentTabPage::AlignmentTabPage( Window* pParent, const SfxItemSet& rCoreAttr
maCbAsianMode.Show( SvtCJKOptions().IsVerticalTextEnabled() );
// CTL frame direction
- maLbFrameDir.InsertEntryValue( SVX_RESSTR( RID_SVXSTR_FRAMEDIR_LTR ), FRMDIR_HORI_LEFT_TOP );
- maLbFrameDir.InsertEntryValue( SVX_RESSTR( RID_SVXSTR_FRAMEDIR_RTL ), FRMDIR_HORI_RIGHT_TOP );
- maLbFrameDir.InsertEntryValue( SVX_RESSTR( RID_SVXSTR_FRAMEDIR_SUPER ), FRMDIR_ENVIRONMENT );
+ maLbFrameDir.InsertEntryValue( CUI_RESSTR( RID_SVXSTR_FRAMEDIR_LTR ), FRMDIR_HORI_LEFT_TOP );
+ maLbFrameDir.InsertEntryValue( CUI_RESSTR( RID_SVXSTR_FRAMEDIR_RTL ), FRMDIR_HORI_RIGHT_TOP );
+ maLbFrameDir.InsertEntryValue( CUI_RESSTR( RID_SVXSTR_FRAMEDIR_SUPER ), FRMDIR_ENVIRONMENT );
if( !SvtLanguageOptions().IsCTLFontEnabled() )
{
maFtFrameDir.Hide();
@@ -238,7 +234,7 @@ void AlignmentTabPage::DataChanged( const DataChangedEvent& rDCEvt )
SfxTabPage::DataChanged( rDCEvt );
if( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE) )
{
- svt::OLocalResourceAccess aLocalResAcc( SVX_RES( RID_SVXPAGE_ALIGNMENT ), RSC_TABPAGE );
+ svt::OLocalResourceAccess aLocalResAcc( CUI_RES( RID_SVXPAGE_ALIGNMENT ), RSC_TABPAGE );
InitVsRefEgde();
}
}
@@ -248,7 +244,7 @@ void AlignmentTabPage::InitVsRefEgde()
// remember selection - is deleted in call to ValueSet::Clear()
USHORT nSel = maVsRefEdge.GetSelectItemId();
- ResId aResId( GetSettings().GetStyleSettings().GetHighContrastMode() ? IL_LOCK_BMPS_HC : IL_LOCK_BMPS, DIALOG_MGR() );
+ ResId aResId( GetSettings().GetStyleSettings().GetHighContrastMode() ? IL_LOCK_BMPS_HC : IL_LOCK_BMPS, CUI_MGR() );
ImageList aImageList( aResId );
Size aItemSize( aImageList.GetImage( IID_BOTTOMLOCK ).GetSizePixel() );
@@ -256,9 +252,9 @@ void AlignmentTabPage::InitVsRefEgde()
maVsRefEdge.SetStyle( maVsRefEdge.GetStyle() | WB_ITEMBORDER | WB_DOUBLEBORDER );
maVsRefEdge.SetColCount( 3 );
- maVsRefEdge.InsertItem( IID_BOTTOMLOCK, aImageList.GetImage( IID_BOTTOMLOCK ), String( SVX_RES( STR_BOTTOMLOCK ) ) );
- maVsRefEdge.InsertItem( IID_TOPLOCK, aImageList.GetImage( IID_TOPLOCK ), String( SVX_RES( STR_TOPLOCK ) ) );
- maVsRefEdge.InsertItem( IID_CELLLOCK, aImageList.GetImage( IID_CELLLOCK ), String( SVX_RES( STR_CELLLOCK ) ) );
+ maVsRefEdge.InsertItem( IID_BOTTOMLOCK, aImageList.GetImage( IID_BOTTOMLOCK ), String( CUI_RES( STR_BOTTOMLOCK ) ) );
+ maVsRefEdge.InsertItem( IID_TOPLOCK, aImageList.GetImage( IID_TOPLOCK ), String( CUI_RES( STR_TOPLOCK ) ) );
+ maVsRefEdge.InsertItem( IID_CELLLOCK, aImageList.GetImage( IID_CELLLOCK ), String( CUI_RES( STR_CELLLOCK ) ) );
maVsRefEdge.SetSizePixel( maVsRefEdge.CalcWindowSizePixel( aItemSize ) );
diff --git a/svx/source/cui/align.hrc b/cui/source/tabpages/align.hrc
index d9138200d381..d9138200d381 100644
--- a/svx/source/cui/align.hrc
+++ b/cui/source/tabpages/align.hrc
diff --git a/svx/source/cui/align.src b/cui/source/tabpages/align.src
index 24e88b77a8a0..077e38105271 100644
--- a/svx/source/cui/align.src
+++ b/cui/source/tabpages/align.src
@@ -28,10 +28,10 @@
*
************************************************************************/
// include ---------------------------------------------------------------
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "helpid.hrc"
#include "align.hrc"
- // pragma ----------------------------------------------------------------
+#include <svx/dialogs.hrc>
#define MASKCOLOR \
MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; }
diff --git a/svx/source/cui/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 330459b224f1..764a5e0b163e 100644
--- a/svx/source/cui/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -29,21 +29,17 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
#define _SVSTDARR_STRINGSISORTDTOR
#define _SVSTDARR_STRINGSDTOR
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
#include <vcl/msgbox.hxx>
#include <vcl/field.hxx>
#include <vcl/keycodes.hxx>
#include <sot/exchange.hxx>
#include <svtools/transfer.hxx>
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
#include <sfx2/objsh.hxx>
#include <sfx2/viewsh.hxx>
#include <unotools/charclass.hxx>
@@ -51,13 +47,12 @@
#include <com/sun/star/i18n/CollatorOptions.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <comphelper/processfactory.hxx>
-
#include <vcl/svapp.hxx>
#include <sfx2/module.hxx>
#include <sfx2/request.hxx>
#include <sfx2/sfxsids.hrc>
-#include <svtools/eitem.hxx>
-#include <svtools/languageoptions.hxx>
+#include <svl/eitem.hxx>
+#include <svl/languageoptions.hxx>
#include <svx/SmartTagMgr.hxx>
#include <com/sun/star/smarttags/XSmartTagRecognizer.hpp>
#include <com/sun/star/smarttags/XSmartTagAction.hpp>
@@ -66,11 +61,12 @@
#include "autocdlg.hxx"
#include "autocdlg.hrc"
#include "helpid.hrc"
-#include "acorrcfg.hxx"
+#include <svx/acorrcfg.hxx>
#include <svx/svxacorr.hxx>
#include "cuicharmap.hxx"
-#include "unolingu.hxx"
-#include <svx/dialmgr.hxx>
+#include <svx/unolingu.hxx>
+#include <dialmgr.hxx>
+#include <svx/svxids.hrc> // SID_OPEN_SMARTTAGSOPTIONS
static LanguageType eLastDialogLanguage = LANGUAGE_SYSTEM;
@@ -92,9 +88,9 @@ static ::com::sun::star::uno::Reference<
--------------------------------------------------*/
OfaAutoCorrDlg::OfaAutoCorrDlg(Window* pParent, const SfxItemSet* _pSet ) :
- SfxTabDialog(pParent, SVX_RES( RID_OFA_AUTOCORR_DLG ), _pSet),
- aLanguageFT( this, SVX_RES(FT_LANG )),
- aLanguageLB( this, SVX_RES(LB_LANG ))
+ SfxTabDialog(pParent, CUI_RES( RID_OFA_AUTOCORR_DLG ), _pSet),
+ aLanguageFT( this, CUI_RES(FT_LANG )),
+ aLanguageLB( this, CUI_RES(LB_LANG ))
{
BOOL bShowSWOptions = FALSE;
BOOL bOpenSmartTagOptions = FALSE;
@@ -222,18 +218,18 @@ IMPL_LINK(OfaAutoCorrDlg, SelectLanguageHdl, ListBox*, pBox)
OfaAutocorrOptionsPage::OfaAutocorrOptionsPage( Window* pParent,
const SfxItemSet& rSet ) :
- SfxTabPage(pParent, SVX_RES( RID_OFAPAGE_AUTOCORR_OPTIONS ), rSet),
- aCheckLB (this, SVX_RES(CLB_SETTINGS )),
-
- sInput (SVX_RES(ST_USE_REPLACE )),
- sDoubleCaps (SVX_RES(ST_CPTL_STT_WORD )),
- sStartCap (SVX_RES(ST_CPTL_STT_SENT )),
- sBoldUnderline (SVX_RES(ST_BOLD_UNDER )),
- sURL (SVX_RES(ST_DETECT_URL )),
- sNoDblSpaces (SVX_RES(STR_NO_DBL_SPACES )),
- sHalf (SVX_RES(ST_FRACTION )),
- sDash (SVX_RES(ST_DASH )),
- sFirst (SVX_RES(ST_ORDINAL ))
+ SfxTabPage(pParent, CUI_RES( RID_OFAPAGE_AUTOCORR_OPTIONS ), rSet),
+ aCheckLB (this, CUI_RES(CLB_SETTINGS )),
+
+ sInput (CUI_RES(ST_USE_REPLACE )),
+ sDoubleCaps (CUI_RES(ST_CPTL_STT_WORD )),
+ sStartCap (CUI_RES(ST_CPTL_STT_SENT )),
+ sBoldUnderline (CUI_RES(ST_BOLD_UNDER )),
+ sURL (CUI_RES(ST_DETECT_URL )),
+ sNoDblSpaces (CUI_RES(STR_NO_DBL_SPACES )),
+ sHalf (CUI_RES(ST_FRACTION )),
+ sDash (CUI_RES(ST_DASH )),
+ sFirst (CUI_RES(ST_ORDINAL ))
{
FreeResource();
@@ -366,11 +362,11 @@ class OfaAutoFmtPrcntSet : public ModalDialog
public:
OfaAutoFmtPrcntSet(Window* pParent) :
- ModalDialog(pParent, SVX_RES(RID_OFADLG_PRCNT_SET)),
- aOKPB(this, SVX_RES(BT_OK)),
- aCancelPB(this, SVX_RES(BT_CANCEL)),
- aPrcntFL(this, SVX_RES(FL_PRCNT)),
- aPrcntMF(this, SVX_RES(ED_RIGHT_MARGIN))
+ ModalDialog(pParent, CUI_RES(RID_OFADLG_PRCNT_SET)),
+ aOKPB(this, CUI_RES(BT_OK)),
+ aCancelPB(this, CUI_RES(BT_CANCEL)),
+ aPrcntFL(this, CUI_RES(FL_PRCNT)),
+ aPrcntMF(this, CUI_RES(ED_RIGHT_MARGIN))
{
FreeResource();
}
@@ -476,33 +472,33 @@ enum OfaAutoFmtOptions
OfaSwAutoFmtOptionsPage::OfaSwAutoFmtOptionsPage( Window* pParent,
const SfxItemSet& rSet ) :
- SfxTabPage(pParent, SVX_RES(RID_OFAPAGE_AUTOFMT_APPLY), rSet),
- aCheckLB (this, SVX_RES(CLB_SETTINGS)),
- aEditPB (this, SVX_RES(PB_EDIT)),
- aHeader1Expl (this, SVX_RES(FT_HEADER1_EXPLANATION)),
- aHeader2Expl (this, SVX_RES(FT_HEADER2_EXPLANATION)),
- sHeader1 (SVX_RES( STR_HEADER1 )),
- sHeader2 (SVX_RES( STR_HEADER2 )),
- sDeleteEmptyPara (SVX_RES( ST_DEL_EMPTY_PARA)),
- sUseReplaceTbl (SVX_RES( ST_USE_REPLACE )),
- sCptlSttWord (SVX_RES( ST_CPTL_STT_WORD)),
- sCptlSttSent (SVX_RES( ST_CPTL_STT_SENT)),
- sTypo (SVX_RES( ST_TYPO )),
- sUserStyle (SVX_RES( ST_USER_STYLE )),
- sBullet (SVX_RES( ST_BULLET )),
- sBoldUnder (SVX_RES( ST_BOLD_UNDER )),
- sNoDblSpaces (SVX_RES( STR_NO_DBL_SPACES)),
- sFraction (SVX_RES( ST_FRACTION )),
- sDetectURL (SVX_RES( ST_DETECT_URL )),
- sDash (SVX_RES( ST_DASH )),
- sOrdinal (SVX_RES( ST_ORDINAL )),
- sRightMargin (SVX_RES( ST_RIGHT_MARGIN )),
- sNum (SVX_RES( STR_NUM )),
- sBorder (SVX_RES( STR_BORDER )),
- sTable (SVX_RES( STR_TABLE )),
- sReplaceTemplates (SVX_RES( STR_REPLACE_TEMPLATES)),
- sDelSpaceAtSttEnd (SVX_RES( STR_DEL_SPACES_AT_STT_END)),
- sDelSpaceBetweenLines(SVX_RES(STR_DEL_SPACES_BETWEEN_LINES)),
+ SfxTabPage(pParent, CUI_RES(RID_OFAPAGE_AUTOFMT_APPLY), rSet),
+ aCheckLB (this, CUI_RES(CLB_SETTINGS)),
+ aEditPB (this, CUI_RES(PB_EDIT)),
+ aHeader1Expl (this, CUI_RES(FT_HEADER1_EXPLANATION)),
+ aHeader2Expl (this, CUI_RES(FT_HEADER2_EXPLANATION)),
+ sHeader1 (CUI_RES( STR_HEADER1 )),
+ sHeader2 (CUI_RES( STR_HEADER2 )),
+ sDeleteEmptyPara (CUI_RES( ST_DEL_EMPTY_PARA)),
+ sUseReplaceTbl (CUI_RES( ST_USE_REPLACE )),
+ sCptlSttWord (CUI_RES( ST_CPTL_STT_WORD)),
+ sCptlSttSent (CUI_RES( ST_CPTL_STT_SENT)),
+ sTypo (CUI_RES( ST_TYPO )),
+ sUserStyle (CUI_RES( ST_USER_STYLE )),
+ sBullet (CUI_RES( ST_BULLET )),
+ sBoldUnder (CUI_RES( ST_BOLD_UNDER )),
+ sNoDblSpaces (CUI_RES( STR_NO_DBL_SPACES)),
+ sFraction (CUI_RES( ST_FRACTION )),
+ sDetectURL (CUI_RES( ST_DETECT_URL )),
+ sDash (CUI_RES( ST_DASH )),
+ sOrdinal (CUI_RES( ST_ORDINAL )),
+ sRightMargin (CUI_RES( ST_RIGHT_MARGIN )),
+ sNum (CUI_RES( STR_NUM )),
+ sBorder (CUI_RES( STR_BORDER )),
+ sTable (CUI_RES( STR_TABLE )),
+ sReplaceTemplates (CUI_RES( STR_REPLACE_TEMPLATES)),
+ sDelSpaceAtSttEnd (CUI_RES( STR_DEL_SPACES_AT_STT_END)),
+ sDelSpaceBetweenLines(CUI_RES(STR_DEL_SPACES_BETWEEN_LINES)),
nPercent ( 50 ),
pCheckButtonData( NULL )
@@ -1039,16 +1035,16 @@ void lcl_ClearTable(DoubleStringTable& rTable)
OfaAutocorrReplacePage::OfaAutocorrReplacePage( Window* pParent,
const SfxItemSet& rSet ) :
- SfxTabPage(pParent, SVX_RES( RID_OFAPAGE_AUTOCORR_REPLACE ), rSet),
- aTextOnlyCB( this, SVX_RES(CB_TEXT_ONLY )),
- aShortFT ( this, SVX_RES(FT_SHORT )),
- aShortED ( this, SVX_RES(ED_SHORT )),
- aReplaceFT( this, SVX_RES(FT_REPLACE )),
- aReplaceED( this, SVX_RES(ED_REPLACE )),
- aReplaceTLB( this, SVX_RES(TLB_REPLACE )),
- aNewReplacePB( this, SVX_RES(PB_NEW_REPLACE )),
- aDeleteReplacePB(this,SVX_RES(PB_DELETE_REPLACE )),
- sModify(SVX_RES(STR_MODIFY)),
+ SfxTabPage(pParent, CUI_RES( RID_OFAPAGE_AUTOCORR_REPLACE ), rSet),
+ aTextOnlyCB( this, CUI_RES(CB_TEXT_ONLY )),
+ aShortFT ( this, CUI_RES(FT_SHORT )),
+ aShortED ( this, CUI_RES(ED_SHORT )),
+ aReplaceFT( this, CUI_RES(FT_REPLACE )),
+ aReplaceED( this, CUI_RES(ED_REPLACE )),
+ aReplaceTLB( this, CUI_RES(TLB_REPLACE )),
+ aNewReplacePB( this, CUI_RES(PB_NEW_REPLACE )),
+ aDeleteReplacePB(this,CUI_RES(PB_DELETE_REPLACE )),
+ sModify(CUI_RES(STR_MODIFY)),
sNew(aNewReplacePB.GetText()),
pFormatText(0),
eLang(eLastDialogLanguage),
@@ -1642,19 +1638,19 @@ void lcl_ClearTable(StringsTable& rTable)
OfaAutocorrExceptPage::OfaAutocorrExceptPage( Window* pParent,
const SfxItemSet& rSet ) :
- SfxTabPage(pParent, SVX_RES( RID_OFAPAGE_AUTOCORR_EXCEPT ), rSet),
- aAbbrevFL (this, SVX_RES(FL_ABBREV )),
- aAbbrevED (this, SVX_RES(ED_ABBREV )),
- aAbbrevLB (this, SVX_RES(LB_ABBREV )),
- aNewAbbrevPB (this, SVX_RES(PB_NEWABBREV )),
- aDelAbbrevPB (this, SVX_RES(PB_DELABBREV )),
- aAutoAbbrevCB (this, SVX_RES(CB_AUTOABBREV )),
- aDoubleCapsFL (this, SVX_RES(FL_DOUBLECAPS )),
- aDoubleCapsED (this, SVX_RES(ED_DOUBLE_CAPS )),
- aDoubleCapsLB (this, SVX_RES(LB_DOUBLE_CAPS )),
- aNewDoublePB (this, SVX_RES(PB_NEWDOUBLECAPS)),
- aDelDoublePB (this, SVX_RES(PB_DELDOUBLECAPS)),
- aAutoCapsCB (this, SVX_RES(CB_AUTOCAPS )),
+ SfxTabPage(pParent, CUI_RES( RID_OFAPAGE_AUTOCORR_EXCEPT ), rSet),
+ aAbbrevFL (this, CUI_RES(FL_ABBREV )),
+ aAbbrevED (this, CUI_RES(ED_ABBREV )),
+ aAbbrevLB (this, CUI_RES(LB_ABBREV )),
+ aNewAbbrevPB (this, CUI_RES(PB_NEWABBREV )),
+ aDelAbbrevPB (this, CUI_RES(PB_DELABBREV )),
+ aAutoAbbrevCB (this, CUI_RES(CB_AUTOABBREV )),
+ aDoubleCapsFL (this, CUI_RES(FL_DOUBLECAPS )),
+ aDoubleCapsED (this, CUI_RES(ED_DOUBLE_CAPS )),
+ aDoubleCapsLB (this, CUI_RES(LB_DOUBLE_CAPS )),
+ aNewDoublePB (this, CUI_RES(PB_NEWDOUBLECAPS)),
+ aDelDoublePB (this, CUI_RES(PB_DELDOUBLECAPS)),
+ aAutoCapsCB (this, CUI_RES(CB_AUTOCAPS )),
eLang(eLastDialogLanguage)
{
FreeResource();
@@ -2040,31 +2036,31 @@ void AutoCorrEdit::KeyInput( const KeyEvent& rKEvt )
--------------------------------------------------*/
OfaQuoteTabPage::OfaQuoteTabPage( Window* pParent, const SfxItemSet& rSet ) :
- SfxTabPage(pParent, SVX_RES( RID_OFAPAGE_AUTOCORR_QUOTE ), rSet),
- aSingleFL (this, SVX_RES(FL_SINGLE )),
- aSingleTypoCB (this, SVX_RES(CB_SGL_TYPO )),
- aSglStartQuoteFT (this, SVX_RES(FT_SGL_STARTQUOTE )),
- aSglStartQuotePB (this, SVX_RES(PB_SGL_STARTQUOTE )),
- aSglStartExFT (this, SVX_RES(FT_SGSTEX )),
- aSglEndQuoteFT (this, SVX_RES(FT_SGL_ENDQUOTE )),
- aSglEndQuotePB (this, SVX_RES(PB_SGL_ENDQUOTE )),
- aSglEndExFT (this, SVX_RES(FT_SGENEX )),
- aSglStandardPB (this, SVX_RES(PB_SGL_STD )),
-
- aDoubleFL (this, SVX_RES(FL_DOUBLE )),
- aTypoCB (this, SVX_RES(CB_TYPO )),
- aStartQuoteFT (this, SVX_RES(FT_STARTQUOTE )),
- aStartQuotePB (this, SVX_RES(PB_STARTQUOTE )),
- aDblStartExFT (this, SVX_RES(FT_DBSTEX )),
- aEndQuoteFT (this, SVX_RES(FT_ENDQUOTE )),
- aEndQuotePB (this, SVX_RES(PB_ENDQUOTE )),
- aDblEndExFT (this, SVX_RES(FT_DBECEX )),
- aDblStandardPB (this, SVX_RES(PB_DBL_STD )),
-
- sStartQuoteDlg (SVX_RES(STR_CHANGE_START)),
- sEndQuoteDlg (SVX_RES(STR_CHANGE_END)),
-
- sStandard(SVX_RES(ST_STANDARD))
+ SfxTabPage(pParent, CUI_RES( RID_OFAPAGE_AUTOCORR_QUOTE ), rSet),
+ aSingleFL (this, CUI_RES(FL_SINGLE )),
+ aSingleTypoCB (this, CUI_RES(CB_SGL_TYPO )),
+ aSglStartQuoteFT (this, CUI_RES(FT_SGL_STARTQUOTE )),
+ aSglStartQuotePB (this, CUI_RES(PB_SGL_STARTQUOTE )),
+ aSglStartExFT (this, CUI_RES(FT_SGSTEX )),
+ aSglEndQuoteFT (this, CUI_RES(FT_SGL_ENDQUOTE )),
+ aSglEndQuotePB (this, CUI_RES(PB_SGL_ENDQUOTE )),
+ aSglEndExFT (this, CUI_RES(FT_SGENEX )),
+ aSglStandardPB (this, CUI_RES(PB_SGL_STD )),
+
+ aDoubleFL (this, CUI_RES(FL_DOUBLE )),
+ aTypoCB (this, CUI_RES(CB_TYPO )),
+ aStartQuoteFT (this, CUI_RES(FT_STARTQUOTE )),
+ aStartQuotePB (this, CUI_RES(PB_STARTQUOTE )),
+ aDblStartExFT (this, CUI_RES(FT_DBSTEX )),
+ aEndQuoteFT (this, CUI_RES(FT_ENDQUOTE )),
+ aEndQuotePB (this, CUI_RES(PB_ENDQUOTE )),
+ aDblEndExFT (this, CUI_RES(FT_DBECEX )),
+ aDblStandardPB (this, CUI_RES(PB_DBL_STD )),
+
+ sStartQuoteDlg (CUI_RES(STR_CHANGE_START)),
+ sEndQuoteDlg (CUI_RES(STR_CHANGE_END)),
+
+ sStandard(CUI_RES(ST_STANDARD))
{
FreeResource();
@@ -2303,20 +2299,20 @@ String OfaQuoteTabPage::ChangeStringExt_Impl( sal_UCS4 cChar )
OfaAutoCompleteTabPage::OfaAutoCompleteTabPage( Window* pParent,
const SfxItemSet& rSet )
- : SfxTabPage(pParent, SVX_RES( RID_OFAPAGE_AUTOCOMPLETE_OPTIONS ), rSet),
- aCBActiv (this, SVX_RES(CB_ACTIV)),
- aCBAppendSpace (this, SVX_RES(CB_APPEND_SPACE)),
- aCBAsTip (this, SVX_RES(CB_AS_TIP)),
- aCBCollect (this, SVX_RES(CB_COLLECT)),
- aCBRemoveList (this, SVX_RES(CB_REMOVE_LIST)),
- aFTExpandKey (this, SVX_RES(FT_EXPAND_KEY)),
- aDCBExpandKey (this, SVX_RES(DCB_EXPAND_KEY)),
- aFTMinWordlen (this, SVX_RES(FT_MIN_WORDLEN)),
- aNFMinWordlen (this, SVX_RES(NF_MIN_WORDLEN)),
- aFTMaxEntries (this, SVX_RES(FT_MAX_ENTRIES)),
- aNFMaxEntries (this, SVX_RES(NF_MAX_ENTRIES)),
- aLBEntries (*this, SVX_RES(LB_ENTRIES)),
- aPBEntries (this, SVX_RES(PB_ENTRIES)),
+ : SfxTabPage(pParent, CUI_RES( RID_OFAPAGE_AUTOCOMPLETE_OPTIONS ), rSet),
+ aCBActiv (this, CUI_RES(CB_ACTIV)),
+ aCBAppendSpace (this, CUI_RES(CB_APPEND_SPACE)),
+ aCBAsTip (this, CUI_RES(CB_AS_TIP)),
+ aCBCollect (this, CUI_RES(CB_COLLECT)),
+ aCBRemoveList (this, CUI_RES(CB_REMOVE_LIST)),
+ aFTExpandKey (this, CUI_RES(FT_EXPAND_KEY)),
+ aDCBExpandKey (this, CUI_RES(DCB_EXPAND_KEY)),
+ aFTMinWordlen (this, CUI_RES(FT_MIN_WORDLEN)),
+ aNFMinWordlen (this, CUI_RES(NF_MIN_WORDLEN)),
+ aFTMaxEntries (this, CUI_RES(FT_MAX_ENTRIES)),
+ aNFMaxEntries (this, CUI_RES(NF_MAX_ENTRIES)),
+ aLBEntries (*this, CUI_RES(LB_ENTRIES)),
+ aPBEntries (this, CUI_RES(PB_ENTRIES)),
pAutoCmpltList( 0 ),
nAutoCmpltListCnt( 0 )
{
@@ -2551,11 +2547,11 @@ long OfaAutoCompleteTabPage::AutoCompleteMultiListBox::PreNotify(
OfaSmartTagOptionsTabPage::OfaSmartTagOptionsTabPage( Window* pParent,
const SfxItemSet& rSet )
- : SfxTabPage(pParent, SVX_RES( RID_OFAPAGE_SMARTTAG_OPTIONS ), rSet),
- m_aMainCB( this, SVX_RES(CB_SMARTTAGS) ),
- m_aSmartTagTypesLB( this, SVX_RES(LB_SMARTTAGS) ),
- m_aPropertiesPB( this, SVX_RES(PB_SMARTTAGS) ),
- m_aTitleFT( this, SVX_RES(FT_SMARTTAGS) )
+ : SfxTabPage(pParent, CUI_RES( RID_OFAPAGE_SMARTTAG_OPTIONS ), rSet),
+ m_aMainCB( this, CUI_RES(CB_SMARTTAGS) ),
+ m_aSmartTagTypesLB( this, CUI_RES(LB_SMARTTAGS) ),
+ m_aPropertiesPB( this, CUI_RES(PB_SMARTTAGS) ),
+ m_aTitleFT( this, CUI_RES(FT_SMARTTAGS) )
{
FreeResource();
diff --git a/svx/source/cui/autocdlg.hrc b/cui/source/tabpages/autocdlg.hrc
index 6a698b4397d7..f1817b3f3f36 100644
--- a/svx/source/cui/autocdlg.hrc
+++ b/cui/source/tabpages/autocdlg.hrc
@@ -30,7 +30,7 @@
#ifndef _SVX_AUTOCDLG_HRC
#define _SVX_AUTOCDLG_HRC
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
// defines ------------------------------------------------------------------
diff --git a/svx/source/cui/autocdlg.src b/cui/source/tabpages/autocdlg.src
index a087bd7d59dc..030a47aae26b 100644
--- a/svx/source/cui/autocdlg.src
+++ b/cui/source/tabpages/autocdlg.src
@@ -28,10 +28,10 @@
*
************************************************************************/
// include ------------------------------------------------------------------
-#include <svx/svxids.hrc>
#include "autocdlg.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "helpid.hrc"
+#include <svx/svxids.hrc> // SID_AUTOFORMAT
// pragma -------------------------------------------------------------------
/**************************************************************************/
diff --git a/svx/source/cui/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index 9ba19816b1bf..004b79817b32 100644
--- a/svx/source/cui/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -29,33 +29,26 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
// include ---------------------------------------------------------------
-#include <svtools/pathoptions.hxx>
-#include <svtools/intitem.hxx>
+#include <unotools/pathoptions.hxx>
+#include <svl/intitem.hxx>
#include <vcl/msgbox.hxx>
#include <tools/urlobj.hxx>
#include <sfx2/objsh.hxx>
#include <sfx2/docfile.hxx>
#include <svtools/wallitem.hxx>
-#include <svtools/cntwall.hxx>
-#ifndef _CNTIDS_HRC
+#include <svl/cntwall.hxx>
#include <sfx2/cntids.hrc>
-#endif
+#include <svx/dialogs.hrc>
#define _SVX_BACKGRND_CXX
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "backgrnd.hrc"
-#include <svx/svxitems.hrc>
-
-
-
+#include <svx/svxitems.hrc> // RID_SVXITEM_COL_WHITE
+#include <svx/dialmgr.hxx>
// Tabellenhintergrund
#define TBL_DEST_CELL 0
@@ -66,18 +59,15 @@
#include "backgrnd.hxx"
#include <svx/xtable.hxx>
-#include "opengrf.hxx"
-#include "impgrf.hxx"
-#include "svxerr.hxx"
-#include "drawitem.hxx"
-#include <svx/dialmgr.hxx>
-#include "htmlmode.hxx"
-#ifndef _SVT_CONTROLDIMS_HRC_
+#include <svx/opengrf.hxx>
+#include <svx/impgrf.hxx>
+#include <svx/svxerr.hxx>
+#include <svx/drawitem.hxx>
+#include <dialmgr.hxx>
+#include <svx/htmlmode.hxx>
#include <svtools/controldims.hrc>
-#endif
-#include <svx/svxids.hrc> //CHINA001
-#include "flagsdef.hxx" //CHINA001
-#include <svtools/intitem.hxx> //CHINA001
+#include <svx/flagsdef.hxx> //CHINA001
+#include <svl/intitem.hxx> //CHINA001
#include <sfx2/request.hxx> //CHINA001
using namespace ::com::sun::star;
// static ----------------------------------------------------------------
@@ -353,36 +343,36 @@ SvxBackgroundTabPage::SvxBackgroundTabPage( Window* pParent,
*/
- SvxTabPage( pParent, SVX_RES( RID_SVXPAGE_BACKGROUND ), rCoreSet ),
+ SvxTabPage( pParent, CUI_RES( RID_SVXPAGE_BACKGROUND ), rCoreSet ),
- aBorderWin ( this, SVX_RES(CT_BORDER) ),
- aBackgroundColorSet ( &aBorderWin, SVX_RES( SET_BGDCOLOR ) ),
- aBackgroundColorBox ( this, SVX_RES( GB_BGDCOLOR ) ),
+ aBorderWin ( this, CUI_RES(CT_BORDER) ),
+ aBackgroundColorSet ( &aBorderWin, CUI_RES( SET_BGDCOLOR ) ),
+ aBackgroundColorBox ( this, CUI_RES( GB_BGDCOLOR ) ),
pPreviewWin1 ( new BackgroundPreviewImpl(
- this, SVX_RES( WIN_PREVIEW1 ), FALSE ) ),
- aColTransFT ( this, SVX_RES( FT_COL_TRANS ) ),
- aColTransMF ( this, SVX_RES( MF_COL_TRANS ) ),
- aBtnBrowse ( this, SVX_RES( BTN_BROWSE ) ),
- aBtnLink ( this, SVX_RES( BTN_LINK ) ),
- aBtnPreview ( this, SVX_RES( BTN_PREVIEW ) ),
- aFtFile ( this, SVX_RES( FT_FILE ) ),
- aGbFile ( this, SVX_RES( GB_FILE ) ),
- aBtnPosition ( this, SVX_RES( BTN_POSITION ) ),
- aBtnArea ( this, SVX_RES( BTN_AREA ) ),
- aBtnTile ( this, SVX_RES( BTN_TILE ) ),
- aWndPosition ( this, SVX_RES( WND_POSITION ), RP_MM ),
- aGbPosition ( this, SVX_RES( GB_POSITION ) ),
- aGraphTransFL ( this, SVX_RES( FL_GRAPH_TRANS ) ),
- aGraphTransMF ( this, SVX_RES( MF_GRAPH_TRANS ) ),
+ this, CUI_RES( WIN_PREVIEW1 ), FALSE ) ),
+ aColTransFT ( this, CUI_RES( FT_COL_TRANS ) ),
+ aColTransMF ( this, CUI_RES( MF_COL_TRANS ) ),
+ aBtnBrowse ( this, CUI_RES( BTN_BROWSE ) ),
+ aBtnLink ( this, CUI_RES( BTN_LINK ) ),
+ aBtnPreview ( this, CUI_RES( BTN_PREVIEW ) ),
+ aFtFile ( this, CUI_RES( FT_FILE ) ),
+ aGbFile ( this, CUI_RES( GB_FILE ) ),
+ aBtnPosition ( this, CUI_RES( BTN_POSITION ) ),
+ aBtnArea ( this, CUI_RES( BTN_AREA ) ),
+ aBtnTile ( this, CUI_RES( BTN_TILE ) ),
+ aWndPosition ( this, CUI_RES( WND_POSITION ), RP_MM ),
+ aGbPosition ( this, CUI_RES( GB_POSITION ) ),
+ aGraphTransFL ( this, CUI_RES( FL_GRAPH_TRANS ) ),
+ aGraphTransMF ( this, CUI_RES( MF_GRAPH_TRANS ) ),
pPreviewWin2 ( new BackgroundPreviewImpl(
- this, SVX_RES( WIN_PREVIEW2 ), TRUE ) ),
- aSelectTxt ( this, SVX_RES( FT_SELECTOR ) ),
- aLbSelect ( this, SVX_RES( LB_SELECTOR ) ),
- aStrBrowse ( SVX_RES( STR_BROWSE ) ),
- aStrUnlinked ( SVX_RES( STR_UNLINKED ) ),
- aTblDesc ( this, SVX_RES( FT_TBL_DESC ) ),
- aTblLBox ( this, SVX_RES( LB_TBL_BOX ) ),
- aParaLBox ( this, SVX_RES( LB_PARA_BOX ) ),
+ this, CUI_RES( WIN_PREVIEW2 ), TRUE ) ),
+ aSelectTxt ( this, CUI_RES( FT_SELECTOR ) ),
+ aLbSelect ( this, CUI_RES( LB_SELECTOR ) ),
+ aStrBrowse ( CUI_RES( STR_BROWSE ) ),
+ aStrUnlinked ( CUI_RES( STR_UNLINKED ) ),
+ aTblDesc ( this, CUI_RES( FT_TBL_DESC ) ),
+ aTblLBox ( this, CUI_RES( LB_TBL_BOX ) ),
+ aParaLBox ( this, CUI_RES( LB_PARA_BOX ) ),
nHtmlMode ( 0 ),
bAllowShowSelector ( TRUE ),
bIsGraphicValid ( FALSE ),
@@ -1164,7 +1154,7 @@ void SvxBackgroundTabPage::RaiseLoadError_Impl()
String(),
this,
RID_SVXERRCTX,
- &DIALOG_MGR() );
+ &CUI_MGR() );
ErrorHandler::HandleError(
*new StringErrorInfo( ERRCODE_SVX_GRAPHIC_NOTREADABLE,
@@ -1221,7 +1211,7 @@ void SvxBackgroundTabPage::FillColorValueSets_Impl()
Color aColWhite( COL_WHITE );
String aStrWhite( SVX_RES( RID_SVXITEMS_COLOR_WHITE ) );
WinBits nBits = ( aBackgroundColorSet.GetStyle() | WB_ITEMBORDER | WB_NAMEFIELD | WB_NONEFIELD );
- aBackgroundColorSet.SetText( String( SVX_RES( RID_SVXSTR_TRANSPARENT ) ) );
+ aBackgroundColorSet.SetText( SVX_RESSTR( RID_SVXSTR_TRANSPARENT ) );
aBackgroundColorSet.SetStyle( nBits );
for ( i = 0; i < nCount; i++ )
{
diff --git a/svx/source/cui/backgrnd.hrc b/cui/source/tabpages/backgrnd.hrc
index ce154afa54b6..ce154afa54b6 100644
--- a/svx/source/cui/backgrnd.hrc
+++ b/cui/source/tabpages/backgrnd.hrc
diff --git a/svx/source/cui/backgrnd.src b/cui/source/tabpages/backgrnd.src
index c89361a18ae3..1ad9beca658c 100644
--- a/svx/source/cui/backgrnd.src
+++ b/cui/source/tabpages/backgrnd.src
@@ -30,8 +30,10 @@
// include ---------------------------------------------------------------
#include <svtools/controldims.hrc>
#include "helpid.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "backgrnd.hrc"
+#include <svx/dialogs.hrc>
+
// define ----------------------------------------------------------------
#define UNLINKED_IMAGE \
Text [ en-US ] = "Unlinked graphic" ; \
diff --git a/svx/source/cui/bbdlg.cxx b/cui/source/tabpages/bbdlg.cxx
index bf711acdb22b..bc50eaecca07 100644
--- a/svx/source/cui/bbdlg.cxx
+++ b/cui/source/tabpages/bbdlg.cxx
@@ -29,22 +29,18 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
// include ---------------------------------------------------------------
#include <tools/shl.hxx>
-
#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "page.hrc"
#include "bbdlg.hxx"
#include "border.hxx"
#include "backgrnd.hxx"
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
// class SvxBorderBackgroundDlg ------------------------------------------
@@ -52,7 +48,7 @@ SvxBorderBackgroundDlg::SvxBorderBackgroundDlg( Window *pParent,
const SfxItemSet& rCoreSet,
BOOL bEnableSelector ) :
- SfxTabDialog( pParent, SVX_RES( RID_SVXDLG_BBDLG ), &rCoreSet ),
+ SfxTabDialog( pParent, CUI_RES( RID_SVXDLG_BBDLG ), &rCoreSet ),
bEnableBackgroundSelector( bEnableSelector )
{
FreeResource();
diff --git a/svx/source/cui/bbdlg.src b/cui/source/tabpages/bbdlg.src
index 98b4bf01767e..b87576b9c975 100644
--- a/svx/source/cui/bbdlg.src
+++ b/cui/source/tabpages/bbdlg.src
@@ -28,8 +28,8 @@
*
************************************************************************/
// include ---------------------------------------------------------------
+#include <cuires.hrc>
#include <svx/dialogs.hrc>
- // pragma ----------------------------------------------------------------
// RID_SVXDLG_BBDLG ------------------------------------------------------
TabDialog RID_SVXDLG_BBDLG
diff --git a/svx/source/cui/border.cxx b/cui/source/tabpages/border.cxx
index 101afc828371..31191b4dffe1 100644
--- a/svx/source/cui/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -29,38 +29,34 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
// include ---------------------------------------------------------------
#include <sfx2/app.hxx>
#include <sfx2/objsh.hxx>
#include <sfx2/module.hxx>
-
+#include <svx/dialogs.hrc>
+#include <svx/dialmgr.hxx>
#define _SVX_BORDER_CXX
-#include <svx/dialogs.hrc>
-#include <svx/svxitems.hrc>
+#include <cuires.hrc>
#include "border.hrc"
#include "helpid.hrc"
#define LINESTYLE_HTML_MAX 5
#include <svx/xtable.hxx> // XColorTable
-#include "drawitem.hxx"
+#include <svx/drawitem.hxx>
#include <svx/boxitem.hxx>
#include <svx/shaditem.hxx>
#include "border.hxx"
-#include "dlgutil.hxx"
-#include <svx/dialmgr.hxx>
-#include "htmlmode.hxx"
+#include <svx/dlgutil.hxx>
+#include <dialmgr.hxx>
+#include "svx/htmlmode.hxx"
#include <vcl/msgbox.hxx>
-#include <svx/svxids.hrc> //CHINA001
-#include "flagsdef.hxx" //CHINA001
+#include "svx/flagsdef.hxx" //CHINA001
#include <sfx2/request.hxx>
-#include <svtools/intitem.hxx> //CHINA001
+#include <svl/intitem.hxx> //CHINA001
#include <sfx2/itemconnect.hxx>
#include "borderconn.hxx"
@@ -184,47 +180,47 @@ void lcl_SetDecimalDigitsTo1(MetricField& rField)
SvxBorderTabPage::SvxBorderTabPage( Window* pParent,
const SfxItemSet& rCoreAttrs )
- : SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_BORDER ), rCoreAttrs ),
-
- aFlBorder ( this, SVX_RES( FL_BORDER ) ),
- aDefaultFT ( this, SVX_RES( FT_DEFAULT ) ),
- aWndPresets ( this, SVX_RES( WIN_PRESETS ) ),
- aUserDefFT ( this, SVX_RES( FT_USERDEF ) ),
- aFrameSel ( this, SVX_RES( WIN_FRAMESEL ) ),
-
- aFlSep1 ( this, SVX_RES( FL_SEPARATOR1 ) ),
- aFlLine ( this, SVX_RES( FL_LINE ) ),
- aStyleFT ( this, SVX_RES( FT_STYLE ) ),
- aLbLineStyle ( this, SVX_RES( LB_LINESTYLE ) ),
- aColorFT ( this, SVX_RES( FT_COLOR ) ),
- aLbLineColor ( this, SVX_RES( LB_LINECOLOR ) ),
-
- aFlSep2 ( this, SVX_RES( FL_SEPARATOR2 ) ),
- aDistanceFL ( this, SVX_RES( FL_DISTANCE ) ),
- aLeftFT ( this, SVX_RES( FT_LEFT ) ),
- aLeftMF ( this, SVX_RES( MF_LEFT ) ),
- aRightFT ( this, SVX_RES( FT_RIGHT ) ),
- aRightMF ( this, SVX_RES( MF_RIGHT ) ),
- aTopFT ( this, SVX_RES( FT_TOP ) ),
- aTopMF ( this, SVX_RES( MF_TOP ) ),
- aBottomFT ( this, SVX_RES( FT_BOTTOM ) ),
- aBottomMF ( this, SVX_RES( MF_BOTTOM ) ),
- aSynchronizeCB ( this, SVX_RES( CB_SYNC ) ),
-
- aFlShadow ( this, SVX_RES( FL_SHADOW ) ),
- aFtShadowPos ( this, SVX_RES( FT_SHADOWPOS ) ),
- aWndShadows ( this, SVX_RES( WIN_SHADOWS ) ),
- aFtShadowSize ( this, SVX_RES( FT_SHADOWSIZE ) ),
- aEdShadowSize ( this, SVX_RES( ED_SHADOWSIZE ) ),
- aFtShadowColor ( this, SVX_RES( FT_SHADOWCOLOR ) ),
- aLbShadowColor ( this, SVX_RES( LB_SHADOWCOLOR ) ),
- aPropertiesFL ( this, SVX_RES( FL_PROPERTIES ) ),
- aMergeWithNextCB( this, SVX_RES( CB_MERGEWITHNEXT ) ),
- aMergeAdjacentBordersCB( this, SVX_RES( CB_MERGEADJACENTBORDERS ) ),
- aShadowImgLstH( SVX_RES(ILH_SDW_BITMAPS)),
- aShadowImgLst( SVX_RES(IL_SDW_BITMAPS)),
- aBorderImgLstH( SVX_RES(ILH_PRE_BITMAPS)),
- aBorderImgLst( SVX_RES(IL_PRE_BITMAPS)),
+ : SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_BORDER ), rCoreAttrs ),
+
+ aFlBorder ( this, CUI_RES( FL_BORDER ) ),
+ aDefaultFT ( this, CUI_RES( FT_DEFAULT ) ),
+ aWndPresets ( this, CUI_RES( WIN_PRESETS ) ),
+ aUserDefFT ( this, CUI_RES( FT_USERDEF ) ),
+ aFrameSel ( this, CUI_RES( WIN_FRAMESEL ) ),
+
+ aFlSep1 ( this, CUI_RES( FL_SEPARATOR1 ) ),
+ aFlLine ( this, CUI_RES( FL_LINE ) ),
+ aStyleFT ( this, CUI_RES( FT_STYLE ) ),
+ aLbLineStyle ( this, CUI_RES( LB_LINESTYLE ) ),
+ aColorFT ( this, CUI_RES( FT_COLOR ) ),
+ aLbLineColor ( this, CUI_RES( LB_LINECOLOR ) ),
+
+ aFlSep2 ( this, CUI_RES( FL_SEPARATOR2 ) ),
+ aDistanceFL ( this, CUI_RES( FL_DISTANCE ) ),
+ aLeftFT ( this, CUI_RES( FT_LEFT ) ),
+ aLeftMF ( this, CUI_RES( MF_LEFT ) ),
+ aRightFT ( this, CUI_RES( FT_RIGHT ) ),
+ aRightMF ( this, CUI_RES( MF_RIGHT ) ),
+ aTopFT ( this, CUI_RES( FT_TOP ) ),
+ aTopMF ( this, CUI_RES( MF_TOP ) ),
+ aBottomFT ( this, CUI_RES( FT_BOTTOM ) ),
+ aBottomMF ( this, CUI_RES( MF_BOTTOM ) ),
+ aSynchronizeCB ( this, CUI_RES( CB_SYNC ) ),
+
+ aFlShadow ( this, CUI_RES( FL_SHADOW ) ),
+ aFtShadowPos ( this, CUI_RES( FT_SHADOWPOS ) ),
+ aWndShadows ( this, CUI_RES( WIN_SHADOWS ) ),
+ aFtShadowSize ( this, CUI_RES( FT_SHADOWSIZE ) ),
+ aEdShadowSize ( this, CUI_RES( ED_SHADOWSIZE ) ),
+ aFtShadowColor ( this, CUI_RES( FT_SHADOWCOLOR ) ),
+ aLbShadowColor ( this, CUI_RES( LB_SHADOWCOLOR ) ),
+ aPropertiesFL ( this, CUI_RES( FL_PROPERTIES ) ),
+ aMergeWithNextCB( this, CUI_RES( CB_MERGEWITHNEXT ) ),
+ aMergeAdjacentBordersCB( this, CUI_RES( CB_MERGEADJACENTBORDERS ) ),
+ aShadowImgLstH( CUI_RES(ILH_SDW_BITMAPS)),
+ aShadowImgLst( CUI_RES(IL_SDW_BITMAPS)),
+ aBorderImgLstH( CUI_RES(ILH_PRE_BITMAPS)),
+ aBorderImgLst( CUI_RES(IL_PRE_BITMAPS)),
nMinValue(0),
nSWMode(0),
mbHorEnabled( false ),
@@ -1047,7 +1043,7 @@ void SvxBorderTabPage::FillPresetVS()
{
aWndPresets.InsertItem( nVSIdx );
aWndPresets.SetItemImage( nVSIdx, rImgList.GetImage( GetPresetImageId( nVSIdx ) ) );
- aWndPresets.SetItemText( nVSIdx, SVX_RESSTR( GetPresetStringId( nVSIdx ) ) );
+ aWndPresets.SetItemText( nVSIdx, CUI_RESSTR( GetPresetStringId( nVSIdx ) ) );
}
// show the control
@@ -1081,7 +1077,7 @@ void SvxBorderTabPage::FillShadowVS()
{
aWndShadows.InsertItem( nVSIdx );
aWndShadows.SetItemImage( nVSIdx, rImgList.GetImage( pnImgIds[ nVSIdx - 1 ] ) );
- aWndShadows.SetItemText( nVSIdx, SVX_RESSTR( pnStrIds[ nVSIdx - 1 ] ) );
+ aWndShadows.SetItemText( nVSIdx, CUI_RESSTR( pnStrIds[ nVSIdx - 1 ] ) );
}
// show the control
@@ -1105,7 +1101,7 @@ void SvxBorderTabPage::FillLineListBox_Impl()
aLbLineStyle.SetSourceUnit( FUNIT_TWIP );
// Writer 2.0 Defaults:
- aLbLineStyle.InsertEntry( SVX_RESSTR( STR_NONE ) );
+ aLbLineStyle.InsertEntry( SVX_RESSTR( RID_SVXSTR_NONE ) );
aLbLineStyle.InsertEntry( LINE_WIDTH0 );
aLbLineStyle.InsertEntry( LINE_WIDTH5 );
diff --git a/svx/source/cui/border.hrc b/cui/source/tabpages/border.hrc
index 7ba1b8cfc757..7ba1b8cfc757 100644
--- a/svx/source/cui/border.hrc
+++ b/cui/source/tabpages/border.hrc
diff --git a/svx/source/cui/border.src b/cui/source/tabpages/border.src
index 27f977a6dc3b..4359e78e84d6 100644
--- a/svx/source/cui/border.src
+++ b/cui/source/tabpages/border.src
@@ -29,9 +29,9 @@
************************************************************************/
// include ---------------------------------------------------------------
#include "helpid.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "border.hrc"
- // pragma ----------------------------------------------------------------
+#include <svx/dialogs.hrc>
// define ---------------------------------------------------------------
#define STD_MASKCOLOR Color { Red=0xFFFF; Green=0x0000; Blue=0xFFFF; }
diff --git a/svx/source/cui/borderconn.cxx b/cui/source/tabpages/borderconn.cxx
index 7ed44720f989..c117e631abbd 100644
--- a/svx/source/cui/borderconn.cxx
+++ b/cui/source/tabpages/borderconn.cxx
@@ -29,15 +29,11 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
#include "borderconn.hxx"
#include <svx/frmsel.hxx>
-#include "bolnitem.hxx"
+#include "svx/bolnitem.hxx"
#include <svx/boxitem.hxx>
#include <svx/algitem.hxx>
#include <svx/shaditem.hxx>
diff --git a/svx/source/cui/borderconn.hxx b/cui/source/tabpages/borderconn.hxx
index 740c9c79f283..740c9c79f283 100644
--- a/svx/source/cui/borderconn.hxx
+++ b/cui/source/tabpages/borderconn.hxx
diff --git a/svx/source/cui/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 0d0b6de205de..6028fdf97ab9 100644
--- a/svx/source/cui/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -29,37 +29,32 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
// include ---------------------------------------------------------------
-#include <unolingu.hxx>
+#include <svx/unolingu.hxx>
#include <vcl/svapp.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
#include <svtools/ctrltool.hxx>
-#include <svtools/sfontitm.hxx>
+#include <svl/sfontitm.hxx>
#include <sfx2/printer.hxx>
#include <sfx2/objsh.hxx>
#include <sfx2/viewsh.hxx>
#include <sfx2/bindings.hxx>
#include <sfx2/viewfrm.hxx>
#include <vcl/msgbox.hxx>
+#include <svx/dialmgr.hxx>
+#include <svx/dialogs.hrc>
#define _SVX_CHARDLG_CXX
-#include <svtools/languageoptions.hxx>
+#include <svl/languageoptions.hxx>
-#include <svx/dialogs.hrc>
-#include <svx/svxitems.hrc>
+#include <cuires.hrc>
#include "chardlg.hrc"
-//Erstmal definieren, damit die Klassendeklarionen angezogen werden.
-
#include <svx/xtable.hxx> // XColorTable
#include "chardlg.hxx"
-#include "fontitem.hxx"
+#include "svx/fontitem.hxx"
#include <svx/postitem.hxx>
#include <svx/udlnitem.hxx>
#include <svx/crsditem.hxx>
@@ -74,28 +69,28 @@
#include <svx/cmapitem.hxx>
#include <svx/kernitem.hxx>
#include <svx/blnkitem.hxx>
-#include "flstitem.hxx"
+#include "svx/flstitem.hxx"
#include <svx/akrnitem.hxx>
#include <svx/brshitem.hxx>
#include <svx/colritem.hxx>
-#include "drawitem.hxx"
-#include "dlgutil.hxx"
-#include <svx/dialmgr.hxx>
-#include "htmlmode.hxx"
+#include "svx/drawitem.hxx"
+#include "svx/dlgutil.hxx"
+#include <dialmgr.hxx>
+#include "svx/htmlmode.hxx"
#include "cuicharmap.hxx"
#include "chardlg.h"
#include <svx/emphitem.hxx>
#include <svx/charreliefitem.hxx>
#include <svx/twolinesitem.hxx>
-#include <charhiddenitem.hxx>
-#include <svtools/stritem.hxx>
+#include <svx/charhiddenitem.hxx>
+#include <svl/stritem.hxx>
#include <svx/charscaleitem.hxx>
#include <svx/charrotateitem.hxx>
#include <svx/svxdlg.hxx> //CHINA001
-#include <svx/dialogs.hrc> //CHINA001
-#include <svtools/intitem.hxx> //CHINA001
+#include <cuires.hrc> //CHINA001
+#include <svl/intitem.hxx> //CHINA001
#include <sfx2/request.hxx> //CHINA001
-#include "flagsdef.hxx" //CHINA001
+#include "svx/flagsdef.hxx" //CHINA001
using namespace ::com::sun::star;
@@ -574,58 +569,58 @@ struct SvxCharNamePage_Impl
SvxCharNamePage::SvxCharNamePage( Window* pParent, const SfxItemSet& rInSet ) :
- SvxCharBasePage( pParent, SVX_RES( RID_SVXPAGE_CHAR_NAME ), rInSet, WIN_CHAR_PREVIEW, FT_CHAR_FONTTYPE ),
+ SvxCharBasePage( pParent, CUI_RES( RID_SVXPAGE_CHAR_NAME ), rInSet, WIN_CHAR_PREVIEW, FT_CHAR_FONTTYPE ),
m_pImpl ( new SvxCharNamePage_Impl )
{
- m_pImpl->m_aNoStyleText = String( SVX_RES( STR_CHARNAME_NOSTYLE ) );
- m_pImpl->m_aTransparentText = String( SVX_RES( STR_CHARNAME_TRANSPARENT ) );
+ m_pImpl->m_aNoStyleText = String( CUI_RES( STR_CHARNAME_NOSTYLE ) );
+ m_pImpl->m_aTransparentText = String( CUI_RES( STR_CHARNAME_TRANSPARENT ) );
SvtLanguageOptions aLanguageOptions;
sal_Bool bCJK = ( aLanguageOptions.IsCJKFontEnabled() || aLanguageOptions.IsCTLFontEnabled() );
- m_pWestLine = new FixedLine( this, SVX_RES( FL_WEST ) );
- m_pWestFontNameFT = new FixedText( this, SVX_RES( bCJK ? FT_WEST_NAME : FT_WEST_NAME_NOCJK ) );
- m_pWestFontNameLB = new FontNameBox( this, SVX_RES( bCJK ? LB_WEST_NAME : LB_WEST_NAME_NOCJK ) );
- m_pWestFontStyleFT = new FixedText( this, SVX_RES( bCJK ? FT_WEST_STYLE : FT_WEST_STYLE_NOCJK ) );
- m_pWestFontStyleLB = new FontStyleBox( this, SVX_RES( bCJK ? LB_WEST_STYLE : LB_WEST_STYLE_NOCJK ) );
- m_pWestFontSizeFT = new FixedText( this, SVX_RES( bCJK ? FT_WEST_SIZE : FT_WEST_SIZE_NOCJK ) );
- m_pWestFontSizeLB = new FontSizeBox( this, SVX_RES( bCJK ? LB_WEST_SIZE : LB_WEST_SIZE_NOCJK ) );
+ m_pWestLine = new FixedLine( this, CUI_RES( FL_WEST ) );
+ m_pWestFontNameFT = new FixedText( this, CUI_RES( bCJK ? FT_WEST_NAME : FT_WEST_NAME_NOCJK ) );
+ m_pWestFontNameLB = new FontNameBox( this, CUI_RES( bCJK ? LB_WEST_NAME : LB_WEST_NAME_NOCJK ) );
+ m_pWestFontStyleFT = new FixedText( this, CUI_RES( bCJK ? FT_WEST_STYLE : FT_WEST_STYLE_NOCJK ) );
+ m_pWestFontStyleLB = new FontStyleBox( this, CUI_RES( bCJK ? LB_WEST_STYLE : LB_WEST_STYLE_NOCJK ) );
+ m_pWestFontSizeFT = new FixedText( this, CUI_RES( bCJK ? FT_WEST_SIZE : FT_WEST_SIZE_NOCJK ) );
+ m_pWestFontSizeLB = new FontSizeBox( this, CUI_RES( bCJK ? LB_WEST_SIZE : LB_WEST_SIZE_NOCJK ) );
if( !bCJK )
{
- m_pColorFL = new FixedLine( this, SVX_RES( FL_COLOR2 ) );
- m_pColorFT = new FixedText( this, SVX_RES( FT_COLOR2 ) );
- m_pColorLB = new ColorListBox( this, SVX_RES( LB_COLOR2 ) );
- }
-
- m_pWestFontLanguageFT = new FixedText( this, SVX_RES( bCJK ? FT_WEST_LANG : FT_WEST_LANG_NOCJK ) );
- m_pWestFontLanguageLB = new SvxLanguageBox( this, SVX_RES( bCJK ? LB_WEST_LANG : LB_WEST_LANG_NOCJK ) );
-
- m_pEastLine = new FixedLine( this, SVX_RES( FL_EAST ) );
- m_pEastFontNameFT = new FixedText( this, SVX_RES( FT_EAST_NAME ) );
- m_pEastFontNameLB = new FontNameBox( this, SVX_RES( LB_EAST_NAME ) );
- m_pEastFontStyleFT = new FixedText( this, SVX_RES( FT_EAST_STYLE ) );
- m_pEastFontStyleLB = new FontStyleBox( this, SVX_RES( LB_EAST_STYLE ) );
- m_pEastFontSizeFT = new FixedText( this, SVX_RES( FT_EAST_SIZE ) );
- m_pEastFontSizeLB = new FontSizeBox( this, SVX_RES( LB_EAST_SIZE ) );
- m_pEastFontLanguageFT = new FixedText( this, SVX_RES( FT_EAST_LANG ) );
- m_pEastFontLanguageLB = new SvxLanguageBox( this, SVX_RES( LB_EAST_LANG ) );
-
- m_pCTLLine = new FixedLine( this, SVX_RES( FL_CTL ) );
- m_pCTLFontNameFT = new FixedText( this, SVX_RES( FT_CTL_NAME ) );
- m_pCTLFontNameLB = new FontNameBox( this, SVX_RES( LB_CTL_NAME ) );
- m_pCTLFontStyleFT = new FixedText( this, SVX_RES( FT_CTL_STYLE ) );
- m_pCTLFontStyleLB = new FontStyleBox( this, SVX_RES( LB_CTL_STYLE ) );
- m_pCTLFontSizeFT = new FixedText( this, SVX_RES( FT_CTL_SIZE ) );
- m_pCTLFontSizeLB = new FontSizeBox( this, SVX_RES( LB_CTL_SIZE ) );
- m_pCTLFontLanguageFT = new FixedText( this, SVX_RES( FT_CTL_LANG ) );
- m_pCTLFontLanguageLB = new SvxLanguageBox( this, SVX_RES( LB_CTL_LANG ) );
+ m_pColorFL = new FixedLine( this, CUI_RES( FL_COLOR2 ) );
+ m_pColorFT = new FixedText( this, CUI_RES( FT_COLOR2 ) );
+ m_pColorLB = new ColorListBox( this, CUI_RES( LB_COLOR2 ) );
+ }
+
+ m_pWestFontLanguageFT = new FixedText( this, CUI_RES( bCJK ? FT_WEST_LANG : FT_WEST_LANG_NOCJK ) );
+ m_pWestFontLanguageLB = new SvxLanguageBox( this, CUI_RES( bCJK ? LB_WEST_LANG : LB_WEST_LANG_NOCJK ) );
+
+ m_pEastLine = new FixedLine( this, CUI_RES( FL_EAST ) );
+ m_pEastFontNameFT = new FixedText( this, CUI_RES( FT_EAST_NAME ) );
+ m_pEastFontNameLB = new FontNameBox( this, CUI_RES( LB_EAST_NAME ) );
+ m_pEastFontStyleFT = new FixedText( this, CUI_RES( FT_EAST_STYLE ) );
+ m_pEastFontStyleLB = new FontStyleBox( this, CUI_RES( LB_EAST_STYLE ) );
+ m_pEastFontSizeFT = new FixedText( this, CUI_RES( FT_EAST_SIZE ) );
+ m_pEastFontSizeLB = new FontSizeBox( this, CUI_RES( LB_EAST_SIZE ) );
+ m_pEastFontLanguageFT = new FixedText( this, CUI_RES( FT_EAST_LANG ) );
+ m_pEastFontLanguageLB = new SvxLanguageBox( this, CUI_RES( LB_EAST_LANG ) );
+
+ m_pCTLLine = new FixedLine( this, CUI_RES( FL_CTL ) );
+ m_pCTLFontNameFT = new FixedText( this, CUI_RES( FT_CTL_NAME ) );
+ m_pCTLFontNameLB = new FontNameBox( this, CUI_RES( LB_CTL_NAME ) );
+ m_pCTLFontStyleFT = new FixedText( this, CUI_RES( FT_CTL_STYLE ) );
+ m_pCTLFontStyleLB = new FontStyleBox( this, CUI_RES( LB_CTL_STYLE ) );
+ m_pCTLFontSizeFT = new FixedText( this, CUI_RES( FT_CTL_SIZE ) );
+ m_pCTLFontSizeLB = new FontSizeBox( this, CUI_RES( LB_CTL_SIZE ) );
+ m_pCTLFontLanguageFT = new FixedText( this, CUI_RES( FT_CTL_LANG ) );
+ m_pCTLFontLanguageLB = new SvxLanguageBox( this, CUI_RES( LB_CTL_LANG ) );
if( bCJK )
{
- m_pColorFL = new FixedLine( this, SVX_RES( FL_COLOR2 ) );
- m_pColorFT = new FixedText( this, SVX_RES( FT_COLOR2 ) );
- m_pColorLB = new ColorListBox( this, SVX_RES( LB_COLOR2 ) );
+ m_pColorFL = new FixedLine( this, CUI_RES( FL_COLOR2 ) );
+ m_pColorFT = new FixedText( this, CUI_RES( FT_COLOR2 ) );
+ m_pColorLB = new ColorListBox( this, CUI_RES( LB_COLOR2 ) );
}
m_pWestLine ->Show( bCJK );
@@ -1769,46 +1764,46 @@ void SvxCharNamePage::PageCreated (SfxAllItemSet aSet) //add CHINA001
SvxCharEffectsPage::SvxCharEffectsPage( Window* pParent, const SfxItemSet& rInSet ) :
- SvxCharBasePage( pParent, SVX_RES( RID_SVXPAGE_CHAR_EFFECTS ), rInSet, WIN_EFFECTS_PREVIEW, FT_EFFECTS_FONTTYPE ),
+ SvxCharBasePage( pParent, CUI_RES( RID_SVXPAGE_CHAR_EFFECTS ), rInSet, WIN_EFFECTS_PREVIEW, FT_EFFECTS_FONTTYPE ),
- m_aFontColorFT ( this, SVX_RES( FT_FONTCOLOR ) ),
- m_aFontColorLB ( this, SVX_RES( LB_FONTCOLOR ) ),
+ m_aFontColorFT ( this, CUI_RES( FT_FONTCOLOR ) ),
+ m_aFontColorLB ( this, CUI_RES( LB_FONTCOLOR ) ),
- m_aEffectsFT ( this, SVX_RES( FT_EFFECTS ) ),
+ m_aEffectsFT ( this, CUI_RES( FT_EFFECTS ) ),
m_aEffectsLB ( this, 0 ),
- m_aEffects2LB ( this, SVX_RES( LB_EFFECTS2 ) ),
+ m_aEffects2LB ( this, CUI_RES( LB_EFFECTS2 ) ),
- m_aReliefFT ( this, SVX_RES( FT_RELIEF ) ),
- m_aReliefLB ( this, SVX_RES( LB_RELIEF ) ),
+ m_aReliefFT ( this, CUI_RES( FT_RELIEF ) ),
+ m_aReliefLB ( this, CUI_RES( LB_RELIEF ) ),
- m_aOutlineBtn ( this, SVX_RES( CB_OUTLINE ) ),
- m_aShadowBtn ( this, SVX_RES( CB_SHADOW ) ),
- m_aBlinkingBtn ( this, SVX_RES( CB_BLINKING ) ),
- m_aHiddenBtn ( this, SVX_RES( CB_CHARHIDDEN ) ),
+ m_aOutlineBtn ( this, CUI_RES( CB_OUTLINE ) ),
+ m_aShadowBtn ( this, CUI_RES( CB_SHADOW ) ),
+ m_aBlinkingBtn ( this, CUI_RES( CB_BLINKING ) ),
+ m_aHiddenBtn ( this, CUI_RES( CB_CHARHIDDEN ) ),
- m_aVerticalLine ( this, SVX_RES( FL_EFFECTS_VERTICAL ) ),
+ m_aVerticalLine ( this, CUI_RES( FL_EFFECTS_VERTICAL ) ),
- m_aOverlineFT ( this, SVX_RES( FT_OVERLINE ) ),
- m_aOverlineLB ( this, SVX_RES( LB_OVERLINE ) ),
- m_aOverlineColorFT ( this, SVX_RES( FT_OVERLINE_COLOR ) ),
- m_aOverlineColorLB ( this, SVX_RES( LB_OVERLINE_COLOR ) ),
- m_aStrikeoutFT ( this, SVX_RES( FT_STRIKEOUT ) ),
- m_aStrikeoutLB ( this, SVX_RES( LB_STRIKEOUT ) ),
- m_aUnderlineFT ( this, SVX_RES( FT_UNDERLINE ) ),
- m_aUnderlineLB ( this, SVX_RES( LB_UNDERLINE ) ),
- m_aUnderlineColorFT ( this, SVX_RES( FT_UNDERLINE_COLOR ) ),
- m_aUnderlineColorLB ( this, SVX_RES( LB_UNDERLINE_COLOR ) ),
- m_aIndividualWordsBtn ( this, SVX_RES( CB_INDIVIDUALWORDS ) ),
+ m_aOverlineFT ( this, CUI_RES( FT_OVERLINE ) ),
+ m_aOverlineLB ( this, CUI_RES( LB_OVERLINE ) ),
+ m_aOverlineColorFT ( this, CUI_RES( FT_OVERLINE_COLOR ) ),
+ m_aOverlineColorLB ( this, CUI_RES( LB_OVERLINE_COLOR ) ),
+ m_aStrikeoutFT ( this, CUI_RES( FT_STRIKEOUT ) ),
+ m_aStrikeoutLB ( this, CUI_RES( LB_STRIKEOUT ) ),
+ m_aUnderlineFT ( this, CUI_RES( FT_UNDERLINE ) ),
+ m_aUnderlineLB ( this, CUI_RES( LB_UNDERLINE ) ),
+ m_aUnderlineColorFT ( this, CUI_RES( FT_UNDERLINE_COLOR ) ),
+ m_aUnderlineColorLB ( this, CUI_RES( LB_UNDERLINE_COLOR ) ),
+ m_aIndividualWordsBtn ( this, CUI_RES( CB_INDIVIDUALWORDS ) ),
- m_aAsianLine ( this, SVX_RES( FL_EFFECTS_ASIAN ) ),
+ m_aAsianLine ( this, CUI_RES( FL_EFFECTS_ASIAN ) ),
- m_aEmphasisFT ( this, SVX_RES( FT_EMPHASIS ) ),
- m_aEmphasisLB ( this, SVX_RES( LB_EMPHASIS ) ),
- m_aPositionFT ( this, SVX_RES( FT_POSITION ) ),
- m_aPositionLB ( this, SVX_RES( LB_POSITION ) ),
+ m_aEmphasisFT ( this, CUI_RES( FT_EMPHASIS ) ),
+ m_aEmphasisLB ( this, CUI_RES( LB_EMPHASIS ) ),
+ m_aPositionFT ( this, CUI_RES( FT_POSITION ) ),
+ m_aPositionLB ( this, CUI_RES( LB_POSITION ) ),
- m_aTransparentColorName ( SVX_RES( STR_CHARNAME_TRANSPARENT ) )
+ m_aTransparentColorName ( CUI_RES( STR_CHARNAME_TRANSPARENT ) )
{
m_aEffectsLB.Hide();
@@ -3042,31 +3037,31 @@ void SvxCharEffectsPage::PageCreated (SfxAllItemSet aSet) //add CHINA001
SvxCharPositionPage::SvxCharPositionPage( Window* pParent, const SfxItemSet& rInSet ) :
- SvxCharBasePage( pParent, SVX_RES( RID_SVXPAGE_CHAR_POSITION ), rInSet, WIN_POS_PREVIEW, FT_POS_FONTTYPE ),
-
- m_aPositionLine ( this, SVX_RES( FL_POSITION ) ),
- m_aHighPosBtn ( this, SVX_RES( RB_HIGHPOS ) ),
- m_aNormalPosBtn ( this, SVX_RES( RB_NORMALPOS ) ),
- m_aLowPosBtn ( this, SVX_RES( RB_LOWPOS ) ),
- m_aHighLowFT ( this, SVX_RES( FT_HIGHLOW ) ),
- m_aHighLowEdit ( this, SVX_RES( ED_HIGHLOW ) ),
- m_aHighLowRB ( this, SVX_RES( CB_HIGHLOW ) ),
- m_aFontSizeFT ( this, SVX_RES( FT_FONTSIZE ) ),
- m_aFontSizeEdit ( this, SVX_RES( ED_FONTSIZE ) ),
- m_aRotationScalingFL( this, SVX_RES( FL_ROTATION_SCALING ) ),
- m_aScalingFL ( this, SVX_RES( FL_SCALING ) ),
- m_a0degRB ( this, SVX_RES( RB_0_DEG ) ),
- m_a90degRB ( this, SVX_RES( RB_90_DEG ) ),
- m_a270degRB ( this, SVX_RES( RB_270_DEG ) ),
- m_aFitToLineCB ( this, SVX_RES( CB_FIT_TO_LINE ) ),
- m_aScaleWidthFT ( this, SVX_RES( FT_SCALE_WIDTH ) ),
- m_aScaleWidthMF ( this, SVX_RES( MF_SCALE_WIDTH ) ),
-
- m_aKerningLine ( this, SVX_RES( FL_KERNING2 ) ),
- m_aKerningLB ( this, SVX_RES( LB_KERNING2 ) ),
- m_aKerningFT ( this, SVX_RES( FT_KERNING2 ) ),
- m_aKerningEdit ( this, SVX_RES( ED_KERNING2 ) ),
- m_aPairKerningBtn ( this, SVX_RES( CB_PAIRKERNING ) ),
+ SvxCharBasePage( pParent, CUI_RES( RID_SVXPAGE_CHAR_POSITION ), rInSet, WIN_POS_PREVIEW, FT_POS_FONTTYPE ),
+
+ m_aPositionLine ( this, CUI_RES( FL_POSITION ) ),
+ m_aHighPosBtn ( this, CUI_RES( RB_HIGHPOS ) ),
+ m_aNormalPosBtn ( this, CUI_RES( RB_NORMALPOS ) ),
+ m_aLowPosBtn ( this, CUI_RES( RB_LOWPOS ) ),
+ m_aHighLowFT ( this, CUI_RES( FT_HIGHLOW ) ),
+ m_aHighLowEdit ( this, CUI_RES( ED_HIGHLOW ) ),
+ m_aHighLowRB ( this, CUI_RES( CB_HIGHLOW ) ),
+ m_aFontSizeFT ( this, CUI_RES( FT_FONTSIZE ) ),
+ m_aFontSizeEdit ( this, CUI_RES( ED_FONTSIZE ) ),
+ m_aRotationScalingFL( this, CUI_RES( FL_ROTATION_SCALING ) ),
+ m_aScalingFL ( this, CUI_RES( FL_SCALING ) ),
+ m_a0degRB ( this, CUI_RES( RB_0_DEG ) ),
+ m_a90degRB ( this, CUI_RES( RB_90_DEG ) ),
+ m_a270degRB ( this, CUI_RES( RB_270_DEG ) ),
+ m_aFitToLineCB ( this, CUI_RES( CB_FIT_TO_LINE ) ),
+ m_aScaleWidthFT ( this, CUI_RES( FT_SCALE_WIDTH ) ),
+ m_aScaleWidthMF ( this, CUI_RES( MF_SCALE_WIDTH ) ),
+
+ m_aKerningLine ( this, CUI_RES( FL_KERNING2 ) ),
+ m_aKerningLB ( this, CUI_RES( LB_KERNING2 ) ),
+ m_aKerningFT ( this, CUI_RES( FT_KERNING2 ) ),
+ m_aKerningEdit ( this, CUI_RES( ED_KERNING2 ) ),
+ m_aPairKerningBtn ( this, CUI_RES( CB_PAIRKERNING ) ),
m_nSuperEsc ( (short)DFLT_ESC_SUPER ),
m_nSubEsc ( (short)DFLT_ESC_SUB ),
@@ -3810,16 +3805,16 @@ void SvxCharPositionPage::PageCreated (SfxAllItemSet aSet) //add CHINA001
SvxCharTwoLinesPage::SvxCharTwoLinesPage( Window* pParent, const SfxItemSet& rInSet ) :
- SvxCharBasePage( pParent, SVX_RES( RID_SVXPAGE_CHAR_TWOLINES ), rInSet, WIN_TWOLINES_PREVIEW, FT_TWOLINES_FONTTYPE ),
+ SvxCharBasePage( pParent, CUI_RES( RID_SVXPAGE_CHAR_TWOLINES ), rInSet, WIN_TWOLINES_PREVIEW, FT_TWOLINES_FONTTYPE ),
- m_aSwitchOnLine ( this, SVX_RES( FL_SWITCHON ) ),
- m_aTwoLinesBtn ( this, SVX_RES( CB_TWOLINES ) ),
+ m_aSwitchOnLine ( this, CUI_RES( FL_SWITCHON ) ),
+ m_aTwoLinesBtn ( this, CUI_RES( CB_TWOLINES ) ),
- m_aEncloseLine ( this, SVX_RES( FL_ENCLOSE ) ),
- m_aStartBracketFT ( this, SVX_RES( FT_STARTBRACKET ) ),
- m_aStartBracketLB ( this, SVX_RES( ED_STARTBRACKET ) ),
- m_aEndBracketFT ( this, SVX_RES( FT_ENDBRACKET ) ),
- m_aEndBracketLB ( this, SVX_RES( ED_ENDBRACKET ) ),
+ m_aEncloseLine ( this, CUI_RES( FL_ENCLOSE ) ),
+ m_aStartBracketFT ( this, CUI_RES( FT_STARTBRACKET ) ),
+ m_aStartBracketLB ( this, CUI_RES( ED_STARTBRACKET ) ),
+ m_aEndBracketFT ( this, CUI_RES( FT_ENDBRACKET ) ),
+ m_aEndBracketLB ( this, CUI_RES( ED_ENDBRACKET ) ),
m_nStartBracketPosition( 0 ),
m_nEndBracketPosition( 0 )
{
diff --git a/svx/source/cui/chardlg.h b/cui/source/tabpages/chardlg.h
index 83af82c3118c..83af82c3118c 100644
--- a/svx/source/cui/chardlg.h
+++ b/cui/source/tabpages/chardlg.h
diff --git a/svx/source/cui/chardlg.hrc b/cui/source/tabpages/chardlg.hrc
index 63faba788bbe..63faba788bbe 100644
--- a/svx/source/cui/chardlg.hrc
+++ b/cui/source/tabpages/chardlg.hrc
diff --git a/svx/source/cui/chardlg.src b/cui/source/tabpages/chardlg.src
index 19ad1e090435..2fd998b88d18 100644
--- a/svx/source/cui/chardlg.src
+++ b/cui/source/tabpages/chardlg.src
@@ -29,15 +29,10 @@
************************************************************************/
// include ---------------------------------------------------------------
#include "helpid.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "chardlg.hrc"
#include "chardlg.h"
-
-// unbekannte Zeichenfarbe
-String RID_SVXSTR_COLOR_USER
-{
- Text [ en-US ] = "User" ;
-};
+#include <svx/dialogs.hrc>
// RID_SVXPAGE_CHAR_NAME ----------------------------------------------------
diff --git a/svx/source/cui/connect.cxx b/cui/source/tabpages/connect.cxx
index 739828ec9ccb..cd62234aeb2d 100644
--- a/svx/source/cui/connect.cxx
+++ b/cui/source/tabpages/connect.cxx
@@ -29,18 +29,16 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
// include ---------------------------------------------------------------
#include <sfx2/app.hxx>
#include <sfx2/module.hxx>
#include <tools/shl.hxx>
-#include "ofaitem.hxx" // add CHINA001
+#include "svx/ofaitem.hxx" // add CHINA001
#include <sfx2/request.hxx> // add CHINA001
+#include <svx/dialogs.hrc>
+
#define _SVX_CONNECT_CXX
#include <svx/svdoedge.hxx>
@@ -48,13 +46,13 @@
#include <svx/svdattrx.hxx>
#include <svx/svdview.hxx>
-#include "connctrl.hxx"
+#include "svx/connctrl.hxx"
#include "connect.hxx"
#include "connect.hrc"
-#include <svx/dialmgr.hxx>
-#include "dlgutil.hxx"
+#include <dialmgr.hxx>
+#include "svx/dlgutil.hxx"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
static USHORT pRanges[] =
{
@@ -99,31 +97,31 @@ SvxConnectionDialog::~SvxConnectionDialog()
\************************************************************************/
SvxConnectionPage::SvxConnectionPage( Window* pWindow, const SfxItemSet& rInAttrs ) :
- SfxTabPage ( pWindow, SVX_RES( RID_SVXPAGE_CONNECTION ),
+ SfxTabPage ( pWindow, CUI_RES( RID_SVXPAGE_CONNECTION ),
rInAttrs ),
- aFtType ( this, SVX_RES( FT_TYPE ) ),
- aLbType ( this, SVX_RES( LB_TYPE ) ),
-
- aFlDelta ( this, SVX_RES( FL_DELTA ) ),
- aFtLine1 ( this, SVX_RES( FT_LINE_1 ) ),
- aMtrFldLine1 ( this, SVX_RES( MTR_FLD_LINE_1 ) ),
- aFtLine2 ( this, SVX_RES( FT_LINE_2 ) ),
- aMtrFldLine2 ( this, SVX_RES( MTR_FLD_LINE_2 ) ),
- aFtLine3 ( this, SVX_RES( FT_LINE_3 ) ),
- aMtrFldLine3 ( this, SVX_RES( MTR_FLD_LINE_3 ) ),
-
- aFlDistance ( this, SVX_RES( FL_DISTANCE ) ),
- aFtHorz1 ( this, SVX_RES( FT_HORZ_1 ) ),
- aMtrFldHorz1 ( this, SVX_RES( MTR_FLD_HORZ_1 ) ),
- aFtVert1 ( this, SVX_RES( FT_VERT_1 ) ),
- aMtrFldVert1 ( this, SVX_RES( MTR_FLD_VERT_1 ) ),
- aFtHorz2 ( this, SVX_RES( FT_HORZ_2 ) ),
- aMtrFldHorz2 ( this, SVX_RES( MTR_FLD_HORZ_2 ) ),
- aFtVert2 ( this, SVX_RES( FT_VERT_2 ) ),
- aMtrFldVert2 ( this, SVX_RES( MTR_FLD_VERT_2 ) ),
-
- aCtlPreview ( this, SVX_RES( CTL_PREVIEW ), rInAttrs ),
+ aFtType ( this, CUI_RES( FT_TYPE ) ),
+ aLbType ( this, CUI_RES( LB_TYPE ) ),
+
+ aFlDelta ( this, CUI_RES( FL_DELTA ) ),
+ aFtLine1 ( this, CUI_RES( FT_LINE_1 ) ),
+ aMtrFldLine1 ( this, CUI_RES( MTR_FLD_LINE_1 ) ),
+ aFtLine2 ( this, CUI_RES( FT_LINE_2 ) ),
+ aMtrFldLine2 ( this, CUI_RES( MTR_FLD_LINE_2 ) ),
+ aFtLine3 ( this, CUI_RES( FT_LINE_3 ) ),
+ aMtrFldLine3 ( this, CUI_RES( MTR_FLD_LINE_3 ) ),
+
+ aFlDistance ( this, CUI_RES( FL_DISTANCE ) ),
+ aFtHorz1 ( this, CUI_RES( FT_HORZ_1 ) ),
+ aMtrFldHorz1 ( this, CUI_RES( MTR_FLD_HORZ_1 ) ),
+ aFtVert1 ( this, CUI_RES( FT_VERT_1 ) ),
+ aMtrFldVert1 ( this, CUI_RES( MTR_FLD_VERT_1 ) ),
+ aFtHorz2 ( this, CUI_RES( FT_HORZ_2 ) ),
+ aMtrFldHorz2 ( this, CUI_RES( MTR_FLD_HORZ_2 ) ),
+ aFtVert2 ( this, CUI_RES( FT_VERT_2 ) ),
+ aMtrFldVert2 ( this, CUI_RES( MTR_FLD_VERT_2 ) ),
+
+ aCtlPreview ( this, CUI_RES( CTL_PREVIEW ), rInAttrs ),
rOutAttrs ( rInAttrs ),
aAttrSet ( *rInAttrs.GetPool() )
{
diff --git a/svx/inc/connect.hrc b/cui/source/tabpages/connect.hrc
index f6c49e5c7d6e..f6c49e5c7d6e 100644
--- a/svx/inc/connect.hrc
+++ b/cui/source/tabpages/connect.hrc
diff --git a/svx/source/cui/connect.src b/cui/source/tabpages/connect.src
index a2bd502e1717..9193dd4808cb 100644
--- a/svx/source/cui/connect.src
+++ b/cui/source/tabpages/connect.src
@@ -32,8 +32,10 @@
// include ---------------------------------------------------------------
#include <svtools/controldims.hrc>
#include "connect.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "helpid.hrc"
+#include <svx/dialogs.hrc>
+
// RID_SVXPAGE_CONNECTION ------------------------------------------------
TabPage RID_SVXPAGE_CONNECTION
{
diff --git a/svx/source/cui/dstribut.cxx b/cui/source/tabpages/dstribut.cxx
index 7ac9e82741b4..e7ec2a0e8ef6 100644
--- a/svx/source/cui/dstribut.cxx
+++ b/cui/source/tabpages/dstribut.cxx
@@ -29,19 +29,15 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_cui.hxx"
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
#include <sfx2/basedlgs.hxx>
-
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "dstribut.hxx"
#include "dstribut.hrc"
-
+#include <svx/dialogs.hrc>
#include <svx/svddef.hxx>
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
#include <tools/shl.hxx>
static USHORT pRanges[] =
@@ -91,38 +87,38 @@ SvxDistributePage::SvxDistributePage(
const SfxItemSet& rInAttrs,
SvxDistributeHorizontal eHor,
SvxDistributeVertical eVer)
-: SvxTabPage(pWindow, SVX_RES(RID_SVXPAGE_DISTRIBUTE), rInAttrs),
+: SvxTabPage(pWindow, CUI_RES(RID_SVXPAGE_DISTRIBUTE), rInAttrs),
meDistributeHor(eHor),
meDistributeVer(eVer),
- maFlHorizontal (this, SVX_RES(FL_HORIZONTAL )),
- maBtnHorNone (this, SVX_RES(BTN_HOR_NONE )),
- maBtnHorLeft (this, SVX_RES(BTN_HOR_LEFT )),
- maBtnHorCenter (this, SVX_RES(BTN_HOR_CENTER )),
- maBtnHorDistance (this, SVX_RES(BTN_HOR_DISTANCE )),
- maBtnHorRight (this, SVX_RES(BTN_HOR_RIGHT )),
- maHorLow (this, SVX_RES(IMG_HOR_LOW )),
- maHorCenter (this, SVX_RES(IMG_HOR_CENTER )),
- maHorDistance (this, SVX_RES(IMG_HOR_DISTANCE )),
- maHorHigh (this, SVX_RES(IMG_HOR_HIGH )),
- maFlVertical (this, SVX_RES(FL_VERTICAL )),
- maBtnVerNone (this, SVX_RES(BTN_VER_NONE )),
- maBtnVerTop (this, SVX_RES(BTN_VER_TOP )),
- maBtnVerCenter (this, SVX_RES(BTN_VER_CENTER )),
- maBtnVerDistance (this, SVX_RES(BTN_VER_DISTANCE )),
- maBtnVerBottom (this, SVX_RES(BTN_VER_BOTTOM )),
- maVerLow (this, SVX_RES(IMG_VER_LOW )),
- maVerCenter (this, SVX_RES(IMG_VER_CENTER )),
- maVerDistance (this, SVX_RES(IMG_VER_DISTANCE )),
- maVerHigh (this, SVX_RES(IMG_VER_HIGH ))
+ maFlHorizontal (this, CUI_RES(FL_HORIZONTAL )),
+ maBtnHorNone (this, CUI_RES(BTN_HOR_NONE )),
+ maBtnHorLeft (this, CUI_RES(BTN_HOR_LEFT )),
+ maBtnHorCenter (this, CUI_RES(BTN_HOR_CENTER )),
+ maBtnHorDistance (this, CUI_RES(BTN_HOR_DISTANCE )),
+ maBtnHorRight (this, CUI_RES(BTN_HOR_RIGHT )),
+ maHorLow (this, CUI_RES(IMG_HOR_LOW )),
+ maHorCenter (this, CUI_RES(IMG_HOR_CENTER )),
+ maHorDistance (this, CUI_RES(IMG_HOR_DISTANCE )),
+ maHorHigh (this, CUI_RES(IMG_HOR_HIGH )),
+ maFlVertical (this, CUI_RES(FL_VERTICAL )),
+ maBtnVerNone (this, CUI_RES(BTN_VER_NONE )),
+ maBtnVerTop (this, CUI_RES(BTN_VER_TOP )),
+ maBtnVerCenter (this, CUI_RES(BTN_VER_CENTER )),
+ maBtnVerDistance (this, CUI_RES(BTN_VER_DISTANCE )),
+ maBtnVerBottom (this, CUI_RES(BTN_VER_BOTTOM )),
+ maVerLow (this, CUI_RES(IMG_VER_LOW )),
+ maVerCenter (this, CUI_RES(IMG_VER_CENTER )),
+ maVerDistance (this, CUI_RES(IMG_VER_DISTANCE )),
+ maVerHigh (this, CUI_RES(IMG_VER_HIGH ))
{
- maHorLow.SetModeImage( Image( SVX_RES( IMG_HOR_LOW_H ) ), BMP_COLOR_HIGHCONTRAST );
- maHorCenter.SetModeImage( Image( SVX_RES( IMG_HOR_CENTER_H ) ), BMP_COLOR_HIGHCONTRAST );
- maHorDistance.SetModeImage( Image( SVX_RES( IMG_HOR_DISTANCE_H ) ), BMP_COLOR_HIGHCONTRAST );
- maHorHigh.SetModeImage( Image( SVX_RES( IMG_HOR_HIGH_H ) ), BMP_COLOR_HIGHCONTRAST );
- maVerDistance.SetModeImage( Image( SVX_RES( IMG_VER_DISTANCE_H ) ), BMP_COLOR_HIGHCONTRAST );
- maVerLow.SetModeImage( Image( SVX_RES( IMG_VER_LOW_H ) ), BMP_COLOR_HIGHCONTRAST );
- maVerCenter.SetModeImage( Image( SVX_RES( IMG_VER_CENTER_H ) ), BMP_COLOR_HIGHCONTRAST );
- maVerHigh.SetModeImage( Image( SVX_RES( IMG_VER_HIGH_H ) ), BMP_COLOR_HIGHCONTRAST );
+ maHorLow.SetModeImage( Image( CUI_RES( IMG_HOR_LOW_H ) ), BMP_COLOR_HIGHCONTRAST );
+ maHorCenter.SetModeImage( Image( CUI_RES( IMG_HOR_CENTER_H ) ), BMP_COLOR_HIGHCONTRAST );
+ maHorDistance.SetModeImage( Image( CUI_RES( IMG_HOR_DISTANCE_H ) ), BMP_COLOR_HIGHCONTRAST );
+ maHorHigh.SetModeImage( Image( CUI_RES( IMG_HOR_HIGH_H ) ), BMP_COLOR_HIGHCONTRAST );
+ maVerDistance.SetModeImage( Image( CUI_RES( IMG_VER_DISTANCE_H ) ), BMP_COLOR_HIGHCONTRAST );
+ maVerLow.SetModeImage( Image( CUI_RES( IMG_VER_LOW_H ) ), BMP_COLOR_HIGHCONTRAST );
+ maVerCenter.SetModeImage( Image( CUI_RES( IMG_VER_CENTER_H ) ), BMP_COLOR_HIGHCONTRAST );
+ maVerHigh.SetModeImage( Image( CUI_RES( IMG_VER_HIGH_H ) ), BMP_COLOR_HIGHCONTRAST );
FreeResource();
}
diff --git a/svx/source/cui/dstribut.hrc b/cui/source/tabpages/dstribut.hrc
index 0834c8640785..0834c8640785 100644
--- a/svx/source/cui/dstribut.hrc
+++ b/cui/source/tabpages/dstribut.hrc
diff --git a/svx/source/cui/dstribut.src b/cui/source/tabpages/dstribut.src
index e9e0ede56590..88998dc674c5 100644
--- a/svx/source/cui/dstribut.src
+++ b/cui/source/tabpages/dstribut.src
@@ -29,9 +29,10 @@
************************************************************************/
// include ---------------------------------------------------------------
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "dstribut.hrc"
#include "helpid.hrc"
+#include <svx/dialogs.hrc>
// RID_SVXPAGE_DISTRIBUTE ---------------------------------------------------
#define STD_MASKCOLOR Color { Red=0xffff; Green=0x0000; Blue=0xffff; }
diff --git a/svx/source/dialog/frmdirlbox.src b/cui/source/tabpages/frmdirlbox.src
index 4edc347908e0..063d70d1b81a 100644
--- a/svx/source/dialog/frmdirlbox.src
+++ b/cui/source/tabpages/frmdirlbox.src
@@ -28,7 +28,7 @@
*
************************************************************************/
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
// frame direction ------------------------------------------------------------
diff --git a/svx/source/cui/grfpage.cxx b/cui/source/tabpages/grfpage.cxx
index c80d7b0d2b87..5afb0e817aa3 100644
--- a/svx/source/cui/grfpage.cxx
+++ b/cui/source/tabpages/grfpage.cxx
@@ -29,42 +29,22 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
-
-
-
+#include "precompiled_cui.hxx"
#include <tools/shl.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
#include <sfx2/app.hxx>
#include <sfx2/module.hxx>
#include <sfx2/sfxsids.hrc>
-
-
-#include <svx/dialmgr.hxx>
-#include <dlgutil.hxx>
+#include <dialmgr.hxx>
+#include <svx/dlgutil.hxx>
#include <svx/sizeitem.hxx>
#include <svx/brshitem.hxx>
-
-#ifndef _GRFPAGE_HXX
#include <grfpage.hxx>
-#endif
#include <svx/grfcrop.hxx>
-
-#ifndef _GRFPAGE_HRC
#include <grfpage.hrc>
-#endif
-#ifndef _SVX_DIALOGS_HRC
-#include <svx/dialogs.hrc>
-#endif
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-
+#include <cuires.hrc>
+#include <svx/dialogs.hrc> // for RID_SVXPAGE_GRFCROP
#define CM_1_TO_TWIP 567
@@ -79,31 +59,31 @@ inline long lcl_GetValue( MetricField& rMetric, FieldUnit eUnit )
--------------------------------------------------------------------*/
SvxGrfCropPage::SvxGrfCropPage ( Window *pParent, const SfxItemSet &rSet )
- : SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_GRFCROP ), rSet ),
- aCropFL( this, SVX_RES( FL_CROP )),
- aZoomConstRB( this, SVX_RES( RB_ZOOMCONST)),
- aSizeConstRB( this, SVX_RES( RB_SIZECONST)),
- aLeftFT( this, SVX_RES( FT_LEFT )),
- aLeftMF( this, SVX_RES( MF_LEFT )),
- aRightFT( this, SVX_RES( FT_RIGHT )),
- aRightMF( this, SVX_RES( MF_RIGHT )),
- aTopFT( this, SVX_RES( FT_TOP )),
- aTopMF( this, SVX_RES( MF_TOP )),
- aBottomFT( this, SVX_RES( FT_BOTTOM )),
- aBottomMF( this, SVX_RES( MF_BOTTOM )),
- aZoomFL( this, SVX_RES( FL_ZOOM )),
- aWidthZoomFT( this, SVX_RES( FT_WIDTHZOOM )),
- aWidthZoomMF( this, SVX_RES( MF_WIDTHZOOM )),
- aHeightZoomFT( this, SVX_RES( FT_HEIGHTZOOM)),
- aHeightZoomMF( this, SVX_RES( MF_HEIGHTZOOM)),
- aSizeFL( this, SVX_RES( FL_SIZE )),
- aWidthFT( this, SVX_RES( FT_WIDTH )),
- aWidthMF( this, SVX_RES( MF_WIDTH )),
- aHeightFT( this, SVX_RES( FT_HEIGHT )),
- aHeightMF( this, SVX_RES( MF_HEIGHT )),
- aOrigSizeFT( this, SVX_RES(FT_ORIG_SIZE)),
- aOrigSizePB( this, SVX_RES( PB_ORGSIZE )),
- aExampleWN( this, SVX_RES( WN_BSP )),
+ : SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_GRFCROP ), rSet ),
+ aCropFL( this, CUI_RES( FL_CROP )),
+ aZoomConstRB( this, CUI_RES( RB_ZOOMCONST)),
+ aSizeConstRB( this, CUI_RES( RB_SIZECONST)),
+ aLeftFT( this, CUI_RES( FT_LEFT )),
+ aLeftMF( this, CUI_RES( MF_LEFT )),
+ aRightFT( this, CUI_RES( FT_RIGHT )),
+ aRightMF( this, CUI_RES( MF_RIGHT )),
+ aTopFT( this, CUI_RES( FT_TOP )),
+ aTopMF( this, CUI_RES( MF_TOP )),
+ aBottomFT( this, CUI_RES( FT_BOTTOM )),
+ aBottomMF( this, CUI_RES( MF_BOTTOM )),
+ aZoomFL( this, CUI_RES( FL_ZOOM )),
+ aWidthZoomFT( this, CUI_RES( FT_WIDTHZOOM )),
+ aWidthZoomMF( this, CUI_RES( MF_WIDTHZOOM )),
+ aHeightZoomFT( this, CUI_RES( FT_HEIGHTZOOM)),
+ aHeightZoomMF( this, CUI_RES( MF_HEIGHTZOOM)),
+ aSizeFL( this, CUI_RES( FL_SIZE )),
+ aWidthFT( this, CUI_RES( FT_WIDTH )),
+ aWidthMF( this, CUI_RES( MF_WIDTH )),
+ aHeightFT( this, CUI_RES( FT_HEIGHT )),
+ aHeightMF( this, CUI_RES( MF_HEIGHT )),
+ aOrigSizeFT( this, CUI_RES(FT_ORIG_SIZE)),
+ aOrigSizePB( this, CUI_RES( PB_ORGSIZE )),
+ aExampleWN( this, CUI_RES( WN_BSP )),
pLastCropField(0),
bInitialized(FALSE),
bSetOrigSize(FALSE)
diff --git a/svx/source/cui/grfpage.hrc b/cui/source/tabpages/grfpage.hrc
index 5743645f3eb0..5743645f3eb0 100644
--- a/svx/source/cui/grfpage.hrc
+++ b/cui/source/tabpages/grfpage.hrc
diff --git a/svx/source/cui/grfpage.src b/cui/source/tabpages/grfpage.src
index 0d6791fd917d..23004c704582 100644
--- a/svx/source/cui/grfpage.src
+++ b/cui/source/tabpages/grfpage.src
@@ -28,9 +28,10 @@
*
************************************************************************/
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "helpid.hrc"
#include "grfpage.hrc"
+#include <svx/dialogs.hrc>
/************************************************************/
/* */
diff --git a/svx/source/cui/labdlg.cxx b/cui/source/tabpages/labdlg.cxx
index 327300d3a603..a311fadca64b 100644
--- a/svx/source/cui/labdlg.cxx
+++ b/cui/source/tabpages/labdlg.cxx
@@ -29,24 +29,20 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
// include ---------------------------------------------------------------
#include <tools/shl.hxx>
#include <sfx2/app.hxx>
#include <sfx2/module.hxx>
#include <swpossizetabpage.hxx>
-
+#include <svx/dialogs.hrc>
#define _SVX_LABDLG_CXX
#include <svx/svdattrx.hxx>
-#include <svx/dialogs.hrc>
-#include <svx/dialmgr.hxx>
-#include "dlgutil.hxx"
+#include <cuires.hrc>
+#include <dialmgr.hxx>
+#include "svx/dlgutil.hxx"
#include "transfrm.hxx"
#include "labdlg.hrc"
@@ -90,25 +86,25 @@ static USHORT pCaptionRanges[] =
// -----------------------------------------------------------------------
SvxCaptionTabPage::SvxCaptionTabPage(Window* pParent, const SfxItemSet& rInAttrs)
- : SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_CAPTION ), rInAttrs ),
-
- aCT_CAPTTYPE( this, SVX_RES( CT_CAPTTYPE ) ),
- aFT_ABSTAND( this, SVX_RES( FT_ABSTAND ) ),
- aMF_ABSTAND( this, SVX_RES( MF_ABSTAND ) ),
- aFT_WINKEL( this, SVX_RES( FT_WINKEL ) ),
- aLB_WINKEL( this, SVX_RES( LB_WINKEL ) ),
- aFT_ANSATZ( this, SVX_RES( FT_ANSATZ ) ),
- aLB_ANSATZ( this, SVX_RES( LB_ANSATZ ) ),
- aFT_UM( this, SVX_RES( FT_UM ) ),
- aMF_ANSATZ( this, SVX_RES( MF_ANSATZ ) ),
- aFT_ANSATZ_REL( this, SVX_RES( FT_ANSATZ_REL ) ),
- aLB_ANSATZ_REL( this, SVX_RES( LB_ANSATZ_REL ) ),
- aFT_LAENGE( this, SVX_RES( FT_LAENGE ) ),
- aMF_LAENGE( this, SVX_RES( MF_LAENGE ) ),
- aCB_LAENGE( this, SVX_RES( CB_LAENGE ) ),
-
- aStrHorzList( SVX_RES(STR_HORZ_LIST) ),
- aStrVertList( SVX_RES(STR_VERT_LIST) ),
+ : SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_CAPTION ), rInAttrs ),
+
+ aCT_CAPTTYPE( this, CUI_RES( CT_CAPTTYPE ) ),
+ aFT_ABSTAND( this, CUI_RES( FT_ABSTAND ) ),
+ aMF_ABSTAND( this, CUI_RES( MF_ABSTAND ) ),
+ aFT_WINKEL( this, CUI_RES( FT_WINKEL ) ),
+ aLB_WINKEL( this, CUI_RES( LB_WINKEL ) ),
+ aFT_ANSATZ( this, CUI_RES( FT_ANSATZ ) ),
+ aLB_ANSATZ( this, CUI_RES( LB_ANSATZ ) ),
+ aFT_UM( this, CUI_RES( FT_UM ) ),
+ aMF_ANSATZ( this, CUI_RES( MF_ANSATZ ) ),
+ aFT_ANSATZ_REL( this, CUI_RES( FT_ANSATZ_REL ) ),
+ aLB_ANSATZ_REL( this, CUI_RES( LB_ANSATZ_REL ) ),
+ aFT_LAENGE( this, CUI_RES( FT_LAENGE ) ),
+ aMF_LAENGE( this, CUI_RES( MF_LAENGE ) ),
+ aCB_LAENGE( this, CUI_RES( CB_LAENGE ) ),
+
+ aStrHorzList( CUI_RES(STR_HORZ_LIST) ),
+ aStrVertList( CUI_RES(STR_VERT_LIST) ),
rOutAttrs ( rInAttrs )
{
@@ -133,8 +129,8 @@ SvxCaptionTabPage::SvxCaptionTabPage(Window* pParent, const SfxItemSet& rInAttrs
sal_uInt16 nBitmap;
for( nBitmap = 0; nBitmap < CAPTYPE_BITMAPS_COUNT; nBitmap++ )
{
- mpBmpCapTypes[nBitmap] = new Image(Bitmap(SVX_RES(BMP_CAPTTYPE_1 + nBitmap)), COL_LIGHTMAGENTA );
- mpBmpCapTypesH[nBitmap] = new Image(Bitmap(SVX_RES(BMP_CAPTTYPE_1_H + nBitmap)), COL_LIGHTMAGENTA );
+ mpBmpCapTypes[nBitmap] = new Image(Bitmap(CUI_RES(BMP_CAPTTYPE_1 + nBitmap)), COL_LIGHTMAGENTA );
+ mpBmpCapTypesH[nBitmap] = new Image(Bitmap(CUI_RES(BMP_CAPTTYPE_1_H + nBitmap)), COL_LIGHTMAGENTA );
}
//------------ValueSet installieren--------------------------
@@ -144,9 +140,9 @@ SvxCaptionTabPage::SvxCaptionTabPage(Window* pParent, const SfxItemSet& rInAttrs
aCT_CAPTTYPE.SetSelectHdl(LINK( this, SvxCaptionTabPage, SelectCaptTypeHdl_Impl));
Image aImage;
- aCT_CAPTTYPE.InsertItem(BMP_CAPTTYPE_1, aImage, String(SVX_RES(STR_CAPTTYPE_1)));
- aCT_CAPTTYPE.InsertItem(BMP_CAPTTYPE_2, aImage, String(SVX_RES(STR_CAPTTYPE_2)));
- aCT_CAPTTYPE.InsertItem(BMP_CAPTTYPE_3, aImage, String(SVX_RES(STR_CAPTTYPE_3)));
+ aCT_CAPTTYPE.InsertItem(BMP_CAPTTYPE_1, aImage, String(CUI_RES(STR_CAPTTYPE_1)));
+ aCT_CAPTTYPE.InsertItem(BMP_CAPTTYPE_2, aImage, String(CUI_RES(STR_CAPTTYPE_2)));
+ aCT_CAPTTYPE.InsertItem(BMP_CAPTTYPE_3, aImage, String(CUI_RES(STR_CAPTTYPE_3)));
FillValueSet();
@@ -586,7 +582,7 @@ void SvxCaptionTabPage::FillValueSet()
SvxCaptionTabDialog::SvxCaptionTabDialog(Window* pParent, const SdrView* pSdrView, USHORT nAnchorTypes)
- : SfxTabDialog( pParent, SVX_RES( RID_SVXDLG_CAPTION ) ),
+ : SfxTabDialog( pParent, CUI_RES( RID_SVXDLG_CAPTION ) ),
pView ( pSdrView ),
nAnchorCtrls(nAnchorTypes)
{
diff --git a/svx/source/cui/labdlg.hrc b/cui/source/tabpages/labdlg.hrc
index 82ea64c1620c..f75da680a0e0 100644
--- a/svx/source/cui/labdlg.hrc
+++ b/cui/source/tabpages/labdlg.hrc
@@ -27,7 +27,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
//#define RID_SVXPAGE_CAPTION 1000
//#define RID_SVXDLG_CAPTION 1001
diff --git a/svx/source/cui/labdlg.src b/cui/source/tabpages/labdlg.src
index f3d464a1558e..e128fe7c1734 100644
--- a/svx/source/cui/labdlg.src
+++ b/cui/source/tabpages/labdlg.src
@@ -30,7 +30,7 @@
// include ---------------------------------------------------------------
#include "helpid.hrc"
#include "labdlg.hrc"
- // pragma ----------------------------------------------------------------
+#include <svx/dialogs.hrc>
// RID_SVXPAGE_CAPTION ---------------------------------------------------
TabPage RID_SVXPAGE_CAPTION
diff --git a/svx/source/cui/macroass.cxx b/cui/source/tabpages/macroass.cxx
index ac4eeffd6a68..3839bc5034ea 100644
--- a/svx/source/cui/macroass.cxx
+++ b/cui/source/tabpages/macroass.cxx
@@ -29,26 +29,26 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_cui.hxx"
#define ITEMID_MACRO 0
-#include <svtools/macitem.hxx>
+#include <svl/macitem.hxx>
#undef ITEMID_MACRO
#include "macroass.hxx"
#include <basic/basmgr.hxx>
-#include <svx/dialmgr.hxx>
-
+#include <dialmgr.hxx>
+#include <svx/dialogs.hrc>
#define _SVSTDARR_STRINGSDTOR
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
#include <svtools/svmedit.hxx>
#include "cfgutil.hxx"
#include <sfx2/app.hxx>
#include <sfx2/objsh.hxx>
#include "macroass.hrc"
-#include "svx/dialogs.hrc"
+#include "cuires.hrc"
#include <sfx2/macrconf.hxx>
#include "headertablistbox.hxx"
@@ -676,19 +676,19 @@ SvStringsDtor* __EXPORT _ImpGetMacrosOfRangeHdl(
SfxMacroTabPage::SfxMacroTabPage( Window* pParent, const ResId& rResId, const Reference< XFrame >& rxDocumentFrame, const SfxItemSet& rSet )
: _SfxMacroTabPage( pParent, rResId, rSet )
{
- mpImpl->pStrEvent = new String( SVX_RES( STR_EVENT ) );
- mpImpl->pAssignedMacro = new String( SVX_RES( STR_ASSMACRO ) );
- mpImpl->pEventLB = new _HeaderTabListBox( this, SVX_RES( LB_EVENT ) );
- mpImpl->pAssignPB = new PushButton( this, SVX_RES( PB_ASSIGN ) );
- mpImpl->pDeletePB = new PushButton( this, SVX_RES( PB_DELETE ) );
- mpImpl->pScriptTypeLB = new ListBox(this, SVX_RES( LB_SCRIPTTYPE ) );
+ mpImpl->pStrEvent = new String( CUI_RES( STR_EVENT ) );
+ mpImpl->pAssignedMacro = new String( CUI_RES( STR_ASSMACRO ) );
+ mpImpl->pEventLB = new _HeaderTabListBox( this, CUI_RES( LB_EVENT ) );
+ mpImpl->pAssignPB = new PushButton( this, CUI_RES( PB_ASSIGN ) );
+ mpImpl->pDeletePB = new PushButton( this, CUI_RES( PB_DELETE ) );
+ mpImpl->pScriptTypeLB = new ListBox(this, CUI_RES( LB_SCRIPTTYPE ) );
mpImpl->pScriptTypeLB->Hide();
- mpImpl->pMacroFT = new FixedText( this, SVX_RES( FT_MACRO ) );
- mpImpl->pGroupLB = new SfxConfigGroupListBox_Impl( this, SVX_RES( LB_GROUP ) );
- mpImpl->pFT_MacroLBLabel = new FixedText( this, SVX_RES( FT_LABEL4LB_MACROS ) );
+ mpImpl->pMacroFT = new FixedText( this, CUI_RES( FT_MACRO ) );
+ mpImpl->pGroupLB = new SfxConfigGroupListBox_Impl( this, CUI_RES( LB_GROUP ) );
+ mpImpl->pFT_MacroLBLabel = new FixedText( this, CUI_RES( FT_LABEL4LB_MACROS ) );
mpImpl->maStaticMacroLBLabel= mpImpl->pFT_MacroLBLabel->GetText();
- mpImpl->pMacroLB = new SfxConfigFunctionListBox_Impl( this, SVX_RES( LB_MACROS ) );
- mpImpl->pMacroStr = new String( SVX_RES( STR_MACROS ) );
+ mpImpl->pMacroLB = new SfxConfigFunctionListBox_Impl( this, CUI_RES( LB_MACROS ) );
+ mpImpl->pMacroStr = new String( CUI_RES( STR_MACROS ) );
FreeResource();
@@ -701,7 +701,7 @@ SfxMacroTabPage::SfxMacroTabPage( Window* pParent, const ResId& rResId, const Re
SfxTabPage* SfxMacroTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet )
{
- return new SfxMacroTabPage( pParent, SVX_RES( RID_SVXPAGE_EVENTASSIGN ), NULL, rAttrSet );
+ return new SfxMacroTabPage( pParent, CUI_RES( RID_SVXPAGE_EVENTASSIGN ), NULL, rAttrSet );
}
SfxMacroAssignDlg::SfxMacroAssignDlg( Window* pParent, const Reference< XFrame >& rxDocumentFrame, const SfxItemSet& rSet )
diff --git a/svx/source/cui/macroass.hrc b/cui/source/tabpages/macroass.hrc
index 626cf010adf9..626cf010adf9 100644
--- a/svx/source/cui/macroass.hrc
+++ b/cui/source/tabpages/macroass.hrc
diff --git a/svx/source/cui/macroass.src b/cui/source/tabpages/macroass.src
index bb56baae45f6..3f8fad19cf59 100644
--- a/svx/source/cui/macroass.src
+++ b/cui/source/tabpages/macroass.src
@@ -29,8 +29,10 @@
************************************************************************/
#include "macroass.hrc"
-#include "svx/dialogs.hrc"
+#include "cuires.hrc"
#include "helpid.hrc"
+#include <svx/dialogs.hrc>
+
TabPage RID_SVXPAGE_EVENTASSIGN
{
Hide = TRUE ;
diff --git a/cui/source/tabpages/makefile.mk b/cui/source/tabpages/makefile.mk
new file mode 100755
index 000000000000..544803603907
--- /dev/null
+++ b/cui/source/tabpages/makefile.mk
@@ -0,0 +1,114 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2008 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile: makefile.mk,v $
+#
+# $Revision: 1.65 $
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+PRJ=..$/..
+PRJNAME=cui
+TARGET=tabpages
+ENABLE_EXCEPTIONS=TRUE
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE : settings.mk
+.INCLUDE : $(PRJ)$/util$/makefile.pmk
+
+.IF "$(ENABLE_LAYOUT)" == "TRUE"
+CFLAGS+= -DENABLE_LAYOUT=1 -I../$(PRJ)/layout/inc -I../$(PRJ)/layout/$(INPATH)/inc
+.ENDIF # ENABLE_LAYOUT == TRUE
+
+# --- Files --------------------------------------------------------
+
+SRS1NAME=tabpages
+SRC1FILES = \
+ align.src \
+ autocdlg.src \
+ backgrnd.src \
+ bbdlg.src \
+ border.src \
+ chardlg.src \
+ connect.src \
+ dstribut.src \
+ frmdirlbox.src \
+ grfpage.src \
+ labdlg.src \
+ macroass.src \
+ measure.src \
+ numfmt.src \
+ numpages.src \
+ page.src \
+ paragrph.src \
+ strings.src \
+ swpossizetabpage.src \
+ tabarea.src \
+ tabline.src \
+ tabstpge.src \
+ textanim.src \
+ textattr.src \
+ transfrm.src
+
+
+SLOFILES+=\
+ $(SLO)$/align.obj \
+ $(SLO)$/autocdlg.obj \
+ $(SLO)$/backgrnd.obj \
+ $(SLO)$/bbdlg.obj \
+ $(SLO)$/border.obj \
+ $(SLO)$/borderconn.obj \
+ $(SLO)$/chardlg.obj \
+ $(SLO)$/connect.obj \
+ $(SLO)$/dstribut.obj \
+ $(SLO)$/grfpage.obj \
+ $(SLO)$/labdlg.obj \
+ $(SLO)$/macroass.obj \
+ $(SLO)$/measure.obj \
+ $(SLO)$/numfmt.obj \
+ $(SLO)$/numpages.obj \
+ $(SLO)$/page.obj \
+ $(SLO)$/paragrph.obj \
+ $(SLO)$/swpossizetabpage.obj \
+ $(SLO)$/tabarea.obj \
+ $(SLO)$/tabline.obj \
+ $(SLO)$/tabstpge.obj \
+ $(SLO)$/textanim.obj \
+ $(SLO)$/textattr.obj \
+ $(SLO)$/tparea.obj \
+ $(SLO)$/tpbitmap.obj \
+ $(SLO)$/tpcolor.obj \
+ $(SLO)$/tpgradnt.obj \
+ $(SLO)$/tphatch.obj \
+ $(SLO)$/tpline.obj \
+ $(SLO)$/tplnedef.obj \
+ $(SLO)$/tplneend.obj \
+ $(SLO)$/tpshadow.obj \
+ $(SLO)$/transfrm.obj \
+
+
+# --- Targets -------------------------------------------------------
+
+.INCLUDE : target.mk
diff --git a/svx/source/cui/measure.cxx b/cui/source/tabpages/measure.cxx
index 38eaf11ced7a..4b00f3289338 100644
--- a/svx/source/cui/measure.cxx
+++ b/cui/source/tabpages/measure.cxx
@@ -29,19 +29,14 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
-
+#include "precompiled_cui.hxx"
// include ---------------------------------------------------------------
#include <sfx2/app.hxx>
#include <sfx2/module.hxx>
#include <tools/shl.hxx>
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#define _SVX_MEASURE_CXX
@@ -49,15 +44,16 @@
#include <svx/svdattr.hxx>
#include <svx/svdattrx.hxx>
#include <svx/svdview.hxx>
-
-#include "measctrl.hxx"
+#include <svx/dialogs.hrc>
+#include <svx/dialmgr.hxx>
+#include "svx/measctrl.hxx"
#include "measure.hxx"
#include "measure.hrc"
-#include <svx/dialmgr.hxx>
-#include "dlgutil.hxx"
+#include <dialmgr.hxx>
+#include "svx/dlgutil.hxx"
#include <svx/strarray.hxx>
#include <sfx2/request.hxx> //add CHINA001
-#include "ofaitem.hxx" //add CHINA001
+#include "svx/ofaitem.hxx" //add CHINA001
static USHORT pRanges[] =
{
@@ -102,35 +98,35 @@ SvxMeasureDialog::~SvxMeasureDialog()
\************************************************************************/
SvxMeasurePage::SvxMeasurePage( Window* pWindow, const SfxItemSet& rInAttrs ) :
- SvxTabPage ( pWindow, SVX_RES( RID_SVXPAGE_MEASURE ),
+ SvxTabPage ( pWindow, CUI_RES( RID_SVXPAGE_MEASURE ),
rInAttrs ),
- aFlLine ( this, SVX_RES( FL_LINE ) ),
- aFtLineDist ( this, SVX_RES( FT_LINE_DIST ) ),
- aMtrFldLineDist ( this, SVX_RES( MTR_LINE_DIST ) ),
- aFtHelplineOverhang ( this, SVX_RES( FT_HELPLINE_OVERHANG ) ),
- aMtrFldHelplineOverhang ( this, SVX_RES( MTR_FLD_HELPLINE_OVERHANG ) ),
- aFtHelplineDist ( this, SVX_RES( FT_HELPLINE_DIST ) ),
- aMtrFldHelplineDist ( this, SVX_RES( MTR_FLD_HELPLINE_DIST ) ),
- aFtHelpline1Len ( this, SVX_RES( FT_HELPLINE1_LEN ) ),
- aMtrFldHelpline1Len ( this, SVX_RES( MTR_FLD_HELPLINE1_LEN ) ),
- aFtHelpline2Len ( this, SVX_RES( FT_HELPLINE2_LEN ) ),
- aMtrFldHelpline2Len ( this, SVX_RES( MTR_FLD_HELPLINE2_LEN ) ),
- aTsbBelowRefEdge ( this, SVX_RES( TSB_BELOW_REF_EDGE ) ),
- aFtDecimalPlaces ( this, SVX_RES( FT_DECIMALPLACES ) ),
- aMtrFldDecimalPlaces ( this, SVX_RES( MTR_FLD_DECIMALPLACES ) ),
-
- aFlLabel ( this, SVX_RES( FL_LABEL ) ),
- aFtPosition ( this, SVX_RES( FT_POSITION ) ),
- aCtlPosition ( this, SVX_RES( CTL_POSITION ) ),
- aTsbAutoPosV ( this, SVX_RES( TSB_AUTOPOSV ) ),
- aTsbAutoPosH ( this, SVX_RES( TSB_AUTOPOSH ) ),
- aTsbShowUnit ( this, SVX_RES( TSB_SHOW_UNIT ) ),
- aLbUnit ( this, SVX_RES( LB_UNIT ) ),
- aTsbParallel ( this, SVX_RES( TSB_PARALLEL ) ),
- aCtlPreview ( this, SVX_RES( CTL_PREVIEW ), rInAttrs ),
-
- aFlVert ( this, SVX_RES( FL_VERT ) ),
+ aFlLine ( this, CUI_RES( FL_LINE ) ),
+ aFtLineDist ( this, CUI_RES( FT_LINE_DIST ) ),
+ aMtrFldLineDist ( this, CUI_RES( MTR_LINE_DIST ) ),
+ aFtHelplineOverhang ( this, CUI_RES( FT_HELPLINE_OVERHANG ) ),
+ aMtrFldHelplineOverhang ( this, CUI_RES( MTR_FLD_HELPLINE_OVERHANG ) ),
+ aFtHelplineDist ( this, CUI_RES( FT_HELPLINE_DIST ) ),
+ aMtrFldHelplineDist ( this, CUI_RES( MTR_FLD_HELPLINE_DIST ) ),
+ aFtHelpline1Len ( this, CUI_RES( FT_HELPLINE1_LEN ) ),
+ aMtrFldHelpline1Len ( this, CUI_RES( MTR_FLD_HELPLINE1_LEN ) ),
+ aFtHelpline2Len ( this, CUI_RES( FT_HELPLINE2_LEN ) ),
+ aMtrFldHelpline2Len ( this, CUI_RES( MTR_FLD_HELPLINE2_LEN ) ),
+ aTsbBelowRefEdge ( this, CUI_RES( TSB_BELOW_REF_EDGE ) ),
+ aFtDecimalPlaces ( this, CUI_RES( FT_DECIMALPLACES ) ),
+ aMtrFldDecimalPlaces ( this, CUI_RES( MTR_FLD_DECIMALPLACES ) ),
+
+ aFlLabel ( this, CUI_RES( FL_LABEL ) ),
+ aFtPosition ( this, CUI_RES( FT_POSITION ) ),
+ aCtlPosition ( this, CUI_RES( CTL_POSITION ) ),
+ aTsbAutoPosV ( this, CUI_RES( TSB_AUTOPOSV ) ),
+ aTsbAutoPosH ( this, CUI_RES( TSB_AUTOPOSH ) ),
+ aTsbShowUnit ( this, CUI_RES( TSB_SHOW_UNIT ) ),
+ aLbUnit ( this, CUI_RES( LB_UNIT ) ),
+ aTsbParallel ( this, CUI_RES( TSB_PARALLEL ) ),
+ aCtlPreview ( this, CUI_RES( CTL_PREVIEW ), rInAttrs ),
+
+ aFlVert ( this, CUI_RES( FL_VERT ) ),
rOutAttrs ( rInAttrs ),
aAttrSet ( *rInAttrs.GetPool() ),
pView( 0 ),
@@ -854,10 +850,10 @@ IMPL_LINK( SvxMeasurePage, ChangeAttrHdl_Impl, void *, p )
void SvxMeasurePage::FillUnitLB()
{
// fill ListBox with metrics
- SvxStringArray aMetricArr( RID_SVXSTR_FIELDUNIT_TABLE );
+ SvxStringArray aMetricArr( SVX_RES( RID_SVXSTR_FIELDUNIT_TABLE ) );
long nUnit = FUNIT_NONE;
- String aStrMetric( SVX_RES( STR_MEASURE_AUTOMATIC ) );
+ String aStrMetric( CUI_RES( STR_MEASURE_AUTOMATIC ) );
USHORT nPos = aLbUnit.InsertEntry( aStrMetric );
aLbUnit.SetEntryData( nPos, (void*)nUnit );
diff --git a/svx/source/cui/measure.hrc b/cui/source/tabpages/measure.hrc
index b06a36775b3b..b06a36775b3b 100644
--- a/svx/source/cui/measure.hrc
+++ b/cui/source/tabpages/measure.hrc
diff --git a/svx/source/cui/measure.src b/cui/source/tabpages/measure.src
index df394e4bdbe3..75cb09737766 100644
--- a/svx/source/cui/measure.src
+++ b/cui/source/tabpages/measure.src
@@ -28,9 +28,11 @@
*
************************************************************************/
// include ---------------------------------------------------------------
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "measure.hrc"
#include "helpid.hrc"
+#include <svx/dialogs.hrc>
+
#define DELTA 20
// pragma ----------------------------------------------------------------
diff --git a/svx/source/cui/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index d6978ea008b8..7a4fe198e6fe 100644
--- a/svx/source/cui/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -33,39 +33,35 @@
#endif
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
// include ---------------------------------------------------------------
-#include <svtools/eitem.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/intitem.hxx>
#include <sfx2/objsh.hxx>
#include <vcl/svapp.hxx>
#include <unotools/localedatawrapper.hxx>
#include <i18npool/lang.h>
-
+#include <svx/dialogs.hrc>
#define _SVSTDARR_STRINGS
#define _SVSTDARR_STRINGSDTOR
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
#include <svtools/colorcfg.hxx>
#define _SVX_NUMFMT_CXX
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "numfmt.hrc"
#include <svx/numinf.hxx>
#include "numfmt.hxx"
#include <svx/numfmtsh.hxx>
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
#include <sfx2/request.hxx> //CHINA001
#include <sfx2/app.hxx> //CHINA001
#include <sfx2/basedlgs.hxx>
-#include "flagsdef.hxx" //CHINA001
+#include "svx/flagsdef.hxx" //CHINA001
#define NUMKEY_UNDEFINED SAL_MAX_UINT32
@@ -243,56 +239,56 @@ void SvxNumberPreviewImpl::DataChanged( const DataChangedEvent& rDCEvt )
#include <layout/layout-pre.hxx>
#if ENABLE_LAYOUT
-#undef SVX_RES
-#define SVX_RES(x) #x
-#define SVX_RES_PLAIN(x) ResId (x, DIALOG_MGR ())
-#define THIS_SVX_RES(x) this, #x
+#undef CUI_RES
+#define CUI_RES(x) #x
+#define CUI_RES_PLAIN(x) ResId (x, CUI_MGR ())
+#define THIS_CUI_RES(x) this, #x
#undef SfxTabPage
#define SfxTabPage( parent, id, args ) SfxTabPage( parent, "number-format.xml", id, &args )
#else /* !ENABLE_LAYOUT */
-#define SVX_RES_PLAIN SVX_RES
-#define THIS_SVX_RES SVX_RES
+#define CUI_RES_PLAIN CUI_RES
+#define THIS_CUI_RES CUI_RES
#endif /* !ENABLE_LAYOUT */
SvxNumberFormatTabPage::SvxNumberFormatTabPage( Window* pParent,
const SfxItemSet& rCoreAttrs )
- : SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_NUMBERFORMAT ), rCoreAttrs ),
-
- aFtCategory ( this, SVX_RES( FT_CATEGORY ) ),
- aLbCategory ( this, SVX_RES( LB_CATEGORY ) ),
- aFtFormat ( this, SVX_RES( FT_FORMAT ) ),
- aLbCurrency ( this, SVX_RES( LB_CURRENCY) ),
- aLbFormat ( this, SVX_RES( LB_FORMAT ) ),
- aFtLanguage ( this, SVX_RES( FT_LANGUAGE ) ),
- aLbLanguage ( this, SVX_RES( LB_LANGUAGE ), FALSE ),
- aCbSourceFormat ( this, SVX_RES( CB_SOURCEFORMAT ) ),
- aFtDecimals ( this, SVX_RES( FT_DECIMALS ) ),
- aEdDecimals ( this, SVX_RES( ED_DECIMALS ) ),
- aFtLeadZeroes ( this, SVX_RES( FT_LEADZEROES ) ),
- aEdLeadZeroes ( this, SVX_RES( ED_LEADZEROES ) ),
- aBtnNegRed ( this, SVX_RES( BTN_NEGRED ) ),
- aBtnThousand ( this, SVX_RES( BTN_THOUSAND ) ),
- aFlOptions ( this, SVX_RES( FL_OPTIONS ) ),
-
- aFtEdFormat ( this, SVX_RES( FT_EDFORMAT ) ),
- aEdFormat ( this, SVX_RES( ED_FORMAT ) ),
- aIbAdd ( this, SVX_RES( IB_ADD ) ),
- aIbInfo ( this, SVX_RES( IB_INFO ) ),
- aIbRemove ( this, SVX_RES( IB_REMOVE ) ),
- aFtComment ( this, SVX_RES( FT_COMMENT ) ),
- aEdComment ( this, SVX_RES( ED_COMMENT ) ),
+ : SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_NUMBERFORMAT ), rCoreAttrs ),
+
+ aFtCategory ( this, CUI_RES( FT_CATEGORY ) ),
+ aLbCategory ( this, CUI_RES( LB_CATEGORY ) ),
+ aFtFormat ( this, CUI_RES( FT_FORMAT ) ),
+ aLbCurrency ( this, CUI_RES( LB_CURRENCY) ),
+ aLbFormat ( this, CUI_RES( LB_FORMAT ) ),
+ aFtLanguage ( this, CUI_RES( FT_LANGUAGE ) ),
+ aLbLanguage ( this, CUI_RES( LB_LANGUAGE ), FALSE ),
+ aCbSourceFormat ( this, CUI_RES( CB_SOURCEFORMAT ) ),
+ aFtDecimals ( this, CUI_RES( FT_DECIMALS ) ),
+ aEdDecimals ( this, CUI_RES( ED_DECIMALS ) ),
+ aFtLeadZeroes ( this, CUI_RES( FT_LEADZEROES ) ),
+ aEdLeadZeroes ( this, CUI_RES( ED_LEADZEROES ) ),
+ aBtnNegRed ( this, CUI_RES( BTN_NEGRED ) ),
+ aBtnThousand ( this, CUI_RES( BTN_THOUSAND ) ),
+ aFlOptions ( this, CUI_RES( FL_OPTIONS ) ),
+
+ aFtEdFormat ( this, CUI_RES( FT_EDFORMAT ) ),
+ aEdFormat ( this, CUI_RES( ED_FORMAT ) ),
+ aIbAdd ( this, CUI_RES( IB_ADD ) ),
+ aIbInfo ( this, CUI_RES( IB_INFO ) ),
+ aIbRemove ( this, CUI_RES( IB_REMOVE ) ),
+ aFtComment ( this, CUI_RES( FT_COMMENT ) ),
+ aEdComment ( this, CUI_RES( ED_COMMENT ) ),
#if ENABLE_LAYOUT
- aWndPreview ( LAYOUT_THIS_WINDOW(this), SVX_RES_PLAIN( WND_NUMBER_PREVIEW ) ),
+ aWndPreview ( LAYOUT_THIS_WINDOW(this), CUI_RES_PLAIN( WND_NUMBER_PREVIEW ) ),
#else
- aWndPreview ( this, SVX_RES_PLAIN( WND_NUMBER_PREVIEW ) ),
+ aWndPreview ( this, CUI_RES_PLAIN( WND_NUMBER_PREVIEW ) ),
#endif
pNumItem ( NULL ),
pNumFmtShell ( NULL ),
nInitFormat ( ULONG_MAX ),
- sAutomaticEntry ( THIS_SVX_RES( STR_AUTO_ENTRY)),
+ sAutomaticEntry ( THIS_CUI_RES( STR_AUTO_ENTRY)),
pLastActivWindow( NULL )
{
#if ENABLE_LAYOUT
@@ -313,8 +309,8 @@ SvxNumberFormatTabPage::~SvxNumberFormatTabPage()
void SvxNumberFormatTabPage::Init_Impl()
{
- ImageList aIconList( SVX_RES_PLAIN ( IL_ICON ) );
- ImageList aIconListHC( SVX_RES_PLAIN ( IL_ICON_HC ) );
+ ImageList aIconList( CUI_RES_PLAIN ( IL_ICON ) );
+ ImageList aIconListHC( CUI_RES_PLAIN ( IL_ICON_HC ) );
bNumItemFlag=TRUE;
bOneAreaFlag=FALSE;
diff --git a/svx/source/cui/numfmt.hrc b/cui/source/tabpages/numfmt.hrc
index 102c5a212ac6..102c5a212ac6 100644
--- a/svx/source/cui/numfmt.hrc
+++ b/cui/source/tabpages/numfmt.hrc
diff --git a/svx/source/cui/numfmt.src b/cui/source/tabpages/numfmt.src
index 96269bb9ec09..7e2b5706fb70 100644
--- a/svx/source/cui/numfmt.src
+++ b/cui/source/tabpages/numfmt.src
@@ -28,10 +28,10 @@
*
************************************************************************/
// include ---------------------------------------------------------------
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "helpid.hrc"
#include "numfmt.hrc"
- // pragma ----------------------------------------------------------------
+#include <svx/dialogs.hrc>
// RID_SVXPAGE_NUMBERFORMAT ----------------------------------------------
TabPage RID_SVXPAGE_NUMBERFORMAT
diff --git a/svx/source/cui/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 92b5934baed7..22c13efa37ab 100644
--- a/svx/source/cui/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -29,11 +29,7 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
#include <com/sun/star/text/HoriOrientation.hpp>
#include <com/sun/star/text/VertOrientation.hpp>
@@ -41,36 +37,32 @@
#include <numpages.hxx>
#include <numpages.hrc>
-#include <svx/dialmgr.hxx>
-#ifndef _SVX_DIALOGS_HRC
-#include <svx/dialogs.hrc>
-#endif
+#include <dialmgr.hxx>
+#include <cuires.hrc>
#include <tools/shl.hxx>
#include <i18npool/mslangid.hxx>
#include <svtools/valueset.hxx>
-#ifndef _SVX_HELPID_HRC
#include <helpid.hrc>
-#endif
#include <svx/numitem.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
#include <vcl/svapp.hxx>
-#include <gallery.hxx>
-#include <svtools/urihelper.hxx>
+#include <svx/gallery.hxx>
+#include <svl/urihelper.hxx>
#include <svx/brshitem.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
#include <sfx2/objsh.hxx>
#include <vcl/graph.hxx>
#include <vcl/msgbox.hxx>
#include "cuicharmap.hxx"
-#include <flstitem.hxx>
-#include <dlgutil.hxx>
+#include <svx/flstitem.hxx>
+#include <svx/dlgutil.hxx>
#include <svx/xtable.hxx>
-#include <drawitem.hxx>
-#include <numvset.hxx>
-#include <htmlmode.hxx>
-#include <svtools/pathoptions.hxx>
+#include <svx/drawitem.hxx>
+#include <svx/numvset.hxx>
+#include <svx/htmlmode.hxx>
+#include <unotools/pathoptions.hxx>
#include <svtools/ctrltool.hxx>
-#include <unolingu.hxx>
+#include <svx/unolingu.hxx>
#include <com/sun/star/style/NumberingType.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/container/XIndexAccess.hpp>
@@ -79,16 +71,18 @@
#include <com/sun/star/beans/PropertyValue.hpp>
#include <comphelper/processfactory.hxx>
#include <com/sun/star/text/XNumberingTypeInfo.hpp>
+#include <svx/dialmgr.hxx>
+#include <svx/dialogs.hrc>
#include <algorithm>
#include <vector>
-#include "opengrf.hxx"
+#include "svx/opengrf.hxx"
-#include <svx/dialogs.hrc> //CHINA001
+#include <cuires.hrc> //CHINA001
#include <sfx2/request.hxx> //CHINA001
-#include <svtools/aeitem.hxx> //add CHINA001
-#include <svtools/stritem.hxx>//add CHINA001
-#include <svtools/slstitm.hxx> //add CHINA001
+#include <svl/aeitem.hxx> //add CHINA001
+#include <svl/stritem.hxx>//add CHINA001
+#include <svl/slstitm.hxx> //add CHINA001
using namespace com::sun::star;
using namespace com::sun::star::uno;
@@ -238,9 +232,9 @@ Font& lcl_GetDefaultBulletFont()
SvxSingleNumPickTabPage::SvxSingleNumPickTabPage(Window* pParent,
const SfxItemSet& rSet) :
- SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_PICK_SINGLE_NUM ), rSet ),
- aValuesFL( this, SVX_RES(FL_VALUES) ),
- pExamplesVS( new SvxNumValueSet(this, SVX_RES(VS_VALUES), NUM_PAGETYPE_SINGLENUM )),
+ SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_PICK_SINGLE_NUM ), rSet ),
+ aValuesFL( this, CUI_RES(FL_VALUES) ),
+ pExamplesVS( new SvxNumValueSet(this, CUI_RES(VS_VALUES), NUM_PAGETYPE_SINGLENUM )),
pActNum(0),
pSaveNum(0),
nActNumLvl( USHRT_MAX ),
@@ -311,7 +305,7 @@ SfxTabPage* SvxSingleNumPickTabPage::Create( Window* pParent,
BOOL SvxSingleNumPickTabPage::FillItemSet( SfxItemSet& rSet )
{
- if(bPreset || bModified && pSaveNum)
+ if( (bPreset || bModified) && pSaveNum)
{
*pSaveNum = *pActNum;
rSet.Put(SvxNumBulletItem( *pSaveNum ), nNumItemId);
@@ -467,9 +461,9 @@ IMPL_LINK(SvxSingleNumPickTabPage, DoubleClickHdl_Impl, ValueSet*, EMPTYARG)
SvxBulletPickTabPage::SvxBulletPickTabPage(Window* pParent,
const SfxItemSet& rSet) :
- SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_PICK_BULLET ), rSet ),
- aValuesFL( this, SVX_RES(FL_VALUES) ),
- pExamplesVS( new SvxNumValueSet(this, SVX_RES(VS_VALUES), NUM_PAGETYPE_BULLET )),
+ SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_PICK_BULLET ), rSet ),
+ aValuesFL( this, CUI_RES(FL_VALUES) ),
+ pExamplesVS( new SvxNumValueSet(this, CUI_RES(VS_VALUES), NUM_PAGETYPE_BULLET )),
pActNum(0),
pSaveNum(0),
nActNumLvl( USHRT_MAX ),
@@ -513,7 +507,7 @@ SfxTabPage* SvxBulletPickTabPage::Create( Window* pParent,
BOOL SvxBulletPickTabPage::FillItemSet( SfxItemSet& rSet )
{
- if(bPreset || bModified && pActNum)
+ if( (bPreset || bModified) && pActNum)
{
*pSaveNum = *pActNum;
rSet.Put(SvxNumBulletItem( *pSaveNum ), nNumItemId);
@@ -667,9 +661,9 @@ void SvxBulletPickTabPage::PageCreated(SfxAllItemSet aSet)
SvxNumPickTabPage::SvxNumPickTabPage(Window* pParent,
const SfxItemSet& rSet) :
- SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_PICK_NUM ), rSet ),
- aValuesFL( this, SVX_RES(FL_VALUES) ),
- pExamplesVS( new SvxNumValueSet(this, SVX_RES(VS_VALUES), NUM_PAGETYPE_NUM )),
+ SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_PICK_NUM ), rSet ),
+ aValuesFL( this, CUI_RES(FL_VALUES) ),
+ pExamplesVS( new SvxNumValueSet(this, CUI_RES(VS_VALUES), NUM_PAGETYPE_NUM )),
pActNum(0),
pSaveNum(0),
nActNumLvl( USHRT_MAX ),
@@ -750,7 +744,7 @@ SfxTabPage* SvxNumPickTabPage::Create( Window* pParent,
BOOL SvxNumPickTabPage::FillItemSet( SfxItemSet& rSet )
{
- if(bPreset || bModified && pActNum)
+ if( (bPreset || bModified) && pActNum)
{
*pSaveNum = *pActNum;
rSet.Put(SvxNumBulletItem( *pSaveNum ), nNumItemId);
@@ -978,11 +972,11 @@ void lcl_PaintLevel(OutputDevice* pVDev, sal_Int16 nNumberingType,
SvxBitmapPickTabPage::SvxBitmapPickTabPage(Window* pParent,
const SfxItemSet& rSet) :
- SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_PICK_BMP ), rSet ),
- aValuesFL( this, SVX_RES(FL_VALUES) ),
- pExamplesVS( new SvxBmpNumValueSet(this, SVX_RES(VS_VALUES)/*, aGrfNames*/ )),
- aErrorText( this, SVX_RES(FT_ERROR)),
- aLinkedCB( this, SVX_RES(CB_LINKED)),
+ SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_PICK_BMP ), rSet ),
+ aValuesFL( this, CUI_RES(FL_VALUES) ),
+ pExamplesVS( new SvxBmpNumValueSet(this, CUI_RES(VS_VALUES)/*, aGrfNames*/ )),
+ aErrorText( this, CUI_RES(FT_ERROR)),
+ aLinkedCB( this, CUI_RES(CB_LINKED)),
pActNum(0),
pSaveNum(0),
nActNumLvl( USHRT_MAX ),
@@ -1110,7 +1104,7 @@ BOOL SvxBitmapPickTabPage::FillItemSet( SfxItemSet& rSet )
// rSet.DisableItem(SID_ATTR_NUMBERING_RULE);
return FALSE;
}
- if(bPreset || bModified && pActNum)
+ if( (bPreset || bModified) && pActNum)
{
*pSaveNum = *pActNum;
rSet.Put(SvxNumBulletItem( *pSaveNum ), nNumItemId);
@@ -1314,42 +1308,42 @@ IMPL_LINK(SvxBitmapPickTabPage, LinkBmpHdl_Impl, CheckBox*, EMPTYARG )
#define NUM_NO_GRAPHIC 1000
SvxNumOptionsTabPage::SvxNumOptionsTabPage(Window* pParent,
const SfxItemSet& rSet) :
- SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_NUM_OPTIONS ), rSet ),
-
- aFormatFL( this, SVX_RES(FL_FORMAT )),
- aLevelFT( this, SVX_RES(FT_LEVEL )),
- aLevelLB( this, SVX_RES(LB_LEVEL )),
- aFmtFT( this, SVX_RES(FT_FMT )),
- aFmtLB( this, SVX_RES(LB_FMT )),
- aPrefixFT( this, SVX_RES(FT_PREFIX )),
- aPrefixED( this, SVX_RES(ED_PREFIX )),
- aSuffixFT( this, SVX_RES(FT_SUFFIX )),
- aSuffixED( this, SVX_RES(ED_SUFFIX )),
- aCharFmtFT( this, SVX_RES(FT_CHARFMT )),
- aCharFmtLB( this, SVX_RES(LB_CHARFMT )),
- aBulColorFT( this, SVX_RES(FT_BUL_COLOR)),
- aBulColLB( this, SVX_RES(LB_BUL_COLOR)),
- aBulRelSizeFT( this, SVX_RES(FT_BUL_REL_SIZE)),
- aBulRelSizeMF( this, SVX_RES(MF_BUL_REL_SIZE)),
- aAllLevelFT( this, SVX_RES(FT_ALL_LEVEL)),
- aAllLevelNF( this, SVX_RES(NF_ALL_LEVEL)),
- aStartFT( this, SVX_RES(FT_START )),
- aStartED( this, SVX_RES(ED_START )),
- aBulletPB( this, SVX_RES(PB_BULLET )),
- aAlignFT( this, SVX_RES(FT_ALIGN )),
- aAlignLB( this, SVX_RES(LB_ALIGN )),
- aBitmapFT( this, SVX_RES(FT_BITMAP )),
- aBitmapMB( this, SVX_RES(MB_BITMAP )),
- aSizeFT( this, SVX_RES(FT_SIZE )),
- aWidthMF( this, SVX_RES(MF_WIDTH )),
- aMultFT( this, SVX_RES(FT_MULT )),
- aHeightMF( this, SVX_RES(MF_HEIGHT )),
- aRatioCB( this, SVX_RES(CB_RATIO )),
- aOrientFT( this, SVX_RES(FT_ORIENT )),
- aOrientLB( this, SVX_RES(LB_ORIENT )),
- aSameLevelFL( this, SVX_RES(FL_SAME_LEVEL)),
- aSameLevelCB( this, SVX_RES(CB_SAME_LEVEL)),
- pPreviewWIN( new SvxNumberingPreview(this, SVX_RES(WIN_PREVIEW ))),
+ SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_NUM_OPTIONS ), rSet ),
+
+ aFormatFL( this, CUI_RES(FL_FORMAT )),
+ aLevelFT( this, CUI_RES(FT_LEVEL )),
+ aLevelLB( this, CUI_RES(LB_LEVEL )),
+ aFmtFT( this, CUI_RES(FT_FMT )),
+ aFmtLB( this, CUI_RES(LB_FMT )),
+ aPrefixFT( this, CUI_RES(FT_PREFIX )),
+ aPrefixED( this, CUI_RES(ED_PREFIX )),
+ aSuffixFT( this, CUI_RES(FT_SUFFIX )),
+ aSuffixED( this, CUI_RES(ED_SUFFIX )),
+ aCharFmtFT( this, CUI_RES(FT_CHARFMT )),
+ aCharFmtLB( this, CUI_RES(LB_CHARFMT )),
+ aBulColorFT( this, CUI_RES(FT_BUL_COLOR)),
+ aBulColLB( this, CUI_RES(LB_BUL_COLOR)),
+ aBulRelSizeFT( this, CUI_RES(FT_BUL_REL_SIZE)),
+ aBulRelSizeMF( this, CUI_RES(MF_BUL_REL_SIZE)),
+ aAllLevelFT( this, CUI_RES(FT_ALL_LEVEL)),
+ aAllLevelNF( this, CUI_RES(NF_ALL_LEVEL)),
+ aStartFT( this, CUI_RES(FT_START )),
+ aStartED( this, CUI_RES(ED_START )),
+ aBulletPB( this, CUI_RES(PB_BULLET )),
+ aAlignFT( this, CUI_RES(FT_ALIGN )),
+ aAlignLB( this, CUI_RES(LB_ALIGN )),
+ aBitmapFT( this, CUI_RES(FT_BITMAP )),
+ aBitmapMB( this, CUI_RES(MB_BITMAP )),
+ aSizeFT( this, CUI_RES(FT_SIZE )),
+ aWidthMF( this, CUI_RES(MF_WIDTH )),
+ aMultFT( this, CUI_RES(FT_MULT )),
+ aHeightMF( this, CUI_RES(MF_HEIGHT )),
+ aRatioCB( this, CUI_RES(CB_RATIO )),
+ aOrientFT( this, CUI_RES(FT_ORIENT )),
+ aOrientLB( this, CUI_RES(LB_ORIENT )),
+ aSameLevelFL( this, CUI_RES(FL_SAME_LEVEL)),
+ aSameLevelCB( this, CUI_RES(CB_SAME_LEVEL)),
+ pPreviewWIN( new SvxNumberingPreview(this, CUI_RES(WIN_PREVIEW ))),
pActNum(0),
pSaveNum(0),
bLastWidthModified(FALSE),
@@ -1358,7 +1352,7 @@ SvxNumOptionsTabPage::SvxNumOptionsTabPage(Window* pParent,
bAutomaticCharStyles(TRUE),
bHTMLMode(FALSE),
bMenuButtonInitialized(FALSE),
- sBullet(SVX_RES(STR_BULLET)),
+ sBullet(CUI_RES(STR_BULLET)),
nBullet(0xff),
nActNumLvl(USHRT_MAX),
nNumItemId(SID_ATTR_NUMBERING_RULE)
@@ -1391,7 +1385,7 @@ SvxNumOptionsTabPage::SvxNumOptionsTabPage(Window* pParent,
PopupMenu* pPopup = new PopupMenu;
aBitmapMB.GetPopupMenu()->SetPopupMenu( MN_GALLERY, pPopup );
- pPopup->InsertItem( NUM_NO_GRAPHIC, String(SVX_RES(ST_POPUP_EMPTY_ENTRY)) );
+ pPopup->InsertItem( NUM_NO_GRAPHIC, String(CUI_RES(ST_POPUP_EMPTY_ENTRY)) );
pPopup->EnableItem( NUM_NO_GRAPHIC, FALSE );
eCoreUnit = rSet.GetPool()->GetMetric(rSet.GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE));
@@ -2277,7 +2271,7 @@ IMPL_LINK( SvxNumOptionsTabPage, GraphicHdl_Impl, MenuButton *, pButton )
String aGrfName;
Size aSize;
sal_Bool bSucc(sal_False);
- SvxOpenGraphicDialog aGrfDlg( SVX_RES(RID_STR_EDIT_GRAPHIC) );
+ SvxOpenGraphicDialog aGrfDlg( CUI_RES(RID_STR_EDIT_GRAPHIC) );
// aGrfDlg.SetDialogHelpId( HID_NUMBERINGOPT_SEL_GRF_FROM_FILE );
if(MN_GALLERY_ENTRY <= nItemId )
@@ -2999,33 +2993,33 @@ void SvxNumberingPreview::Paint( const Rectangle& /*rRect*/ )
--------------------------------------------------*/
SvxNumPositionTabPage::SvxNumPositionTabPage(Window* pParent,
const SfxItemSet& rSet) :
- SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_NUM_POSITION ), rSet ),
- aPositionFL( this, SVX_RES(FL_POSITION )),
- aLevelFT( this, SVX_RES(FT_LEVEL )),
- aLevelLB( this, SVX_RES(LB_LEVEL )),
- aDistBorderFT( this, SVX_RES(FT_BORDERDIST )),
- aDistBorderMF( this, SVX_RES(MF_BORDERDIST )),
- aRelativeCB( this, SVX_RES(CB_RELATIVE )),
- aIndentFT( this, SVX_RES(FT_INDENT )),
- aIndentMF( this, SVX_RES(MF_INDENT )),
- aDistNumFT( this, SVX_RES(FT_NUMDIST )),
- aDistNumMF( this, SVX_RES(MF_NUMDIST )),
- aAlignFT( this, SVX_RES(FT_ALIGN )),
- aAlignLB( this, SVX_RES(LB_ALIGN )),
+ SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_NUM_POSITION ), rSet ),
+ aPositionFL( this, CUI_RES(FL_POSITION )),
+ aLevelFT( this, CUI_RES(FT_LEVEL )),
+ aLevelLB( this, CUI_RES(LB_LEVEL )),
+ aDistBorderFT( this, CUI_RES(FT_BORDERDIST )),
+ aDistBorderMF( this, CUI_RES(MF_BORDERDIST )),
+ aRelativeCB( this, CUI_RES(CB_RELATIVE )),
+ aIndentFT( this, CUI_RES(FT_INDENT )),
+ aIndentMF( this, CUI_RES(MF_INDENT )),
+ aDistNumFT( this, CUI_RES(FT_NUMDIST )),
+ aDistNumMF( this, CUI_RES(MF_NUMDIST )),
+ aAlignFT( this, CUI_RES(FT_ALIGN )),
+ aAlignLB( this, CUI_RES(LB_ALIGN )),
// --> OD 2008-01-10 #newlistlevelattrs#
- aLabelFollowedByFT( this, SVX_RES(FT_LABEL_FOLLOWED_BY) ),
- aLabelFollowedByLB( this, SVX_RES(LB_LABEL_FOLLOWED_BY) ),
- aListtabFT( this, SVX_RES(FT_LISTTAB) ),
- aListtabMF( this, SVX_RES(MF_LISTTAB) ),
- aAlign2FT( this, SVX_RES(FT_ALIGN_2) ),
- aAlign2LB( this, SVX_RES(LB_ALIGN_2) ),
- aAlignedAtFT( this, SVX_RES(FT_ALIGNED_AT) ),
- aAlignedAtMF( this, SVX_RES(MF_ALIGNED_AT) ),
- aIndentAtFT( this, SVX_RES(FT_INDENT_AT) ),
- aIndentAtMF( this, SVX_RES(MF_INDENT_AT) ),
+ aLabelFollowedByFT( this, CUI_RES(FT_LABEL_FOLLOWED_BY) ),
+ aLabelFollowedByLB( this, CUI_RES(LB_LABEL_FOLLOWED_BY) ),
+ aListtabFT( this, CUI_RES(FT_LISTTAB) ),
+ aListtabMF( this, CUI_RES(MF_LISTTAB) ),
+ aAlign2FT( this, CUI_RES(FT_ALIGN_2) ),
+ aAlign2LB( this, CUI_RES(LB_ALIGN_2) ),
+ aAlignedAtFT( this, CUI_RES(FT_ALIGNED_AT) ),
+ aAlignedAtMF( this, CUI_RES(MF_ALIGNED_AT) ),
+ aIndentAtFT( this, CUI_RES(FT_INDENT_AT) ),
+ aIndentAtMF( this, CUI_RES(MF_INDENT_AT) ),
// <--
- aStandardPB( this, SVX_RES(PB_STANDARD )),
- pPreviewWIN( new SvxNumberingPreview(this, SVX_RES(WIN_PREVIEW ))),
+ aStandardPB( this, CUI_RES(PB_STANDARD )),
+ pPreviewWIN( new SvxNumberingPreview(this, CUI_RES(WIN_PREVIEW ))),
pActNum(0),
pSaveNum(0),
nActNumLvl( USHRT_MAX ),
diff --git a/svx/source/cui/numpages.hrc b/cui/source/tabpages/numpages.hrc
index 59ea5d0e8a94..59ea5d0e8a94 100644
--- a/svx/source/cui/numpages.hrc
+++ b/cui/source/tabpages/numpages.hrc
diff --git a/svx/source/cui/numpages.src b/cui/source/tabpages/numpages.src
index e202b2d13a84..731630b29840 100644
--- a/svx/source/cui/numpages.src
+++ b/cui/source/tabpages/numpages.src
@@ -28,9 +28,10 @@
*
************************************************************************/
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include <helpid.hrc>
#include <numpages.hrc>
+#include <svx/dialogs.hrc>
/**************************************************************************/
/* */
@@ -772,6 +773,7 @@ String RID_STR_EDIT_GRAPHIC
{
Text [ en-US ] = "Link" ;
};
+/*
String RID_STR_FULLNUMS_1 { Text = "1.|1.1|a)|61589|61589" ; };
String RID_STR_FULLNUMS_2 { Text = "1.|a)|61589|61589|61589" ; };
String RID_STR_FULLNUMS_3 { Text = "1.|(a)|i.|A.|61589" ; };
@@ -781,105 +783,7 @@ String RID_STR_FULLNUMS_6 { Text = "A.|I.|a.|i.|61589" ; };
String RID_STR_FULLNUMS_7 { Text = "1|1.1|1.1.1|1.1.1.1|1.1.1.1.1" ; };
String RID_STR_FULLNUMS_8 { Text = "61487|61488|61485|61589|61589" ; };
String RID_STR_FULLNUMS_7_HTML { Text = "I.|I.|I|I.|I." ; };
-
-String RID_SVXSTR_BULLET_DESCRIPTION_0
-{
- Text [en-US] = "Solid small circular bullets";
-};
-String RID_SVXSTR_BULLET_DESCRIPTION_1
-{
- Text [en-US] = "Solid large circular bullets";
-};
-String RID_SVXSTR_BULLET_DESCRIPTION_2
-{
- Text [en-US] = "Solid diamond bullets";
-};
-String RID_SVXSTR_BULLET_DESCRIPTION_3
-{
- Text [en-US] = "Solid large square bullets";
-};
-String RID_SVXSTR_BULLET_DESCRIPTION_4
-{
- Text [en-US] = "Right pointing arrow bullets filled out";
-};
-String RID_SVXSTR_BULLET_DESCRIPTION_5
-{
- Text [en-US] = "Right pointing arrow bullets";
-};
-String RID_SVXSTR_BULLET_DESCRIPTION_6
-{
- Text [en-US] = "Check mark bullets";
-};
-String RID_SVXSTR_BULLET_DESCRIPTION_7
-{
- Text [en-US] = "Tick mark bullets";
-};
-String RID_SVXSTR_SINGLENUM_DESCRIPTION_0
-{
- Text [en-US] = "Number 1) 2) 3)";
-};
-String RID_SVXSTR_SINGLENUM_DESCRIPTION_1
-{
- Text [en-US] = "Number 1. 2. 3.";
-};
-String RID_SVXSTR_SINGLENUM_DESCRIPTION_2
-{
- Text [en-US] = "Number (1) (2) (3)";
-};
-String RID_SVXSTR_SINGLENUM_DESCRIPTION_3
-{
- Text [en-US] = "Uppercase Roman number I. II. III.";
-};
-String RID_SVXSTR_SINGLENUM_DESCRIPTION_4
-{
- Text [en-US] = "Uppercase letter A) B) C)";
-};
-String RID_SVXSTR_SINGLENUM_DESCRIPTION_5
-{
- Text [en-US] = "Lowercase letter a) b) c)";
-};
-String RID_SVXSTR_SINGLENUM_DESCRIPTION_6
-{
- Text [en-US] = "Lowercase letter (a) (b) (c)";
-};
-String RID_SVXSTR_SINGLENUM_DESCRIPTION_7
-{
- Text [en-US] = "Lowercase Roman number i. ii. iii.";
-};
-
-String RID_SVXSTR_OUTLINENUM_DESCRIPTION_0
-{
- Text [en-US] = "Numeric, numeric, lowercase letters, solid small circular bullet";
-};
-String RID_SVXSTR_OUTLINENUM_DESCRIPTION_1
-{
- Text [en-US] = "Numeric, lowercase letters, solid small circular bullet";
-};
-String RID_SVXSTR_OUTLINENUM_DESCRIPTION_2
-{
- Text [en-US] = "Numeric, lowercase letters, lowercase Roman, uppercase letters, solid small circular bullet";
-};
-String RID_SVXSTR_OUTLINENUM_DESCRIPTION_3
-{
- Text [en-US] = "Numeric";
-};
-String RID_SVXSTR_OUTLINENUM_DESCRIPTION_4
-{
- Text [en-US] = "Uppercase Roman, uppercase letters, lowercase Roman, lowercase letters, solid small circular bullet";
-};
-String RID_SVXSTR_OUTLINENUM_DESCRIPTION_5
-{
- Text [en-US] = "Uppercase letters, uppercase Roman, lowercase letters, lowercase Roman, solid small circular bullet";
-};
-String RID_SVXSTR_OUTLINENUM_DESCRIPTION_6
-{
- Text [en-US] = "Numeric with all sublevels";
-};
-String RID_SVXSTR_OUTLINENUM_DESCRIPTION_7
-{
- Text [en-US] = "Right pointing bullet, right pointing arrow bullet, solid diamond bullet, solid small circular bullet";
-};
-
+*/
diff --git a/svx/source/cui/page.cxx b/cui/source/tabpages/page.cxx
index f842af6b7559..27db31f684fa 100644
--- a/svx/source/cui/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -29,48 +29,25 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
// include ---------------------------------------------------------------
-
-
-
-
-
-
-
-
-
-
#include <sfx2/app.hxx>
#include <sfx2/objsh.hxx>
-#ifndef _RESARY_HXX //autogen
#include <tools/resary.hxx>
-#endif
-#ifndef _GRAPH_HXX //autogen
#include <vcl/graph.hxx>
-#endif
#include <sfx2/viewsh.hxx>
-#include <svtools/itemiter.hxx>
-#include <svtools/languageoptions.hxx>
+#include <svl/itemiter.hxx>
+#include <svl/languageoptions.hxx>
#include <vcl/msgbox.hxx>
#include <unotools/configitem.hxx>
-#include "htmlmode.hxx"
+#include "svx/htmlmode.hxx"
#define _SVX_PAGE_CXX
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "page.hrc"
#include "helpid.hrc"
-
-
-
-
-
#include "page.hxx"
#include <svx/pageitem.hxx>
#include <svx/brshitem.hxx>
@@ -81,22 +58,19 @@
#include <svx/ulspitem.hxx>
#include <svx/sizeitem.hxx>
#include <svx/frmdiritem.hxx>
-//CHINA001 #include "bbdlg.hxx"
-#include "dlgutil.hxx"
-#include <svx/dialmgr.hxx>
+#include "svx/dlgutil.hxx"
+#include <dialmgr.hxx>
#include <svx/paperinf.hxx>
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
#include <sfx2/module.hxx>
-
-
-#include <svtools/stritem.hxx>
-
-#include <svx/svxids.hrc> //CHINA001
+#include <svl/stritem.hxx>
+#include <svx/dialmgr.hxx> // for RID_SVXSTR_PAPERBIN...
+#include <svx/dialogs.hrc> // for RID_SVXSTR_PAPERBIN..., RID_SVXPAGE_PAGE
// #i4219#
#include <svtools/optionsdrawinglayer.hxx>
-#include <svtools/slstitm.hxx> //CHINA001
-#include <svtools/aeitem.hxx> //CHINA001
+#include <svl/slstitm.hxx> //CHINA001
+#include <svl/aeitem.hxx> //CHINA001
#include <sfx2/request.hxx> //CHINA001
// configuration helper =======================================================
@@ -121,6 +95,9 @@ public:
/** Returns true, if the current HTML export mode is set to HTML 3.2. */
inline bool IsExportModeHTML32() const { return mnExpMode == 0; } // 0 == HTML_CFG_HTML32, see offmgr/htmlcfg.hxx
+ virtual void Commit();
+ virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& _rPropertyNames);
+
private:
sal_Int32 mnExpMode;
};
@@ -139,6 +116,13 @@ SvxHtmlExportModeConfigItem_Impl::SvxHtmlExportModeConfigItem_Impl() :
aPropValues[ 0 ] >>= mnExpMode;
}
+void SvxHtmlExportModeConfigItem_Impl::Commit()
+{
+}
+
+void SvxHtmlExportModeConfigItem_Impl::Notify( const com::sun::star::uno::Sequence< rtl::OUString >& )
+{
+}
// static ----------------------------------------------------------------
@@ -263,50 +247,50 @@ SfxTabPage* SvxPageDescPage::Create( Window* pParent, const SfxItemSet& rSet )
SvxPageDescPage::SvxPageDescPage( Window* pParent, const SfxItemSet& rAttr ) :
- SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_PAGE ), rAttr ),
-
- aPaperSizeFl ( this, SVX_RES( FL_PAPER_SIZE ) ),
- aPaperFormatText ( this, SVX_RES( FT_PAPER_FORMAT ) ),
- aPaperSizeBox ( this, SVX_RES( LB_PAPER_SIZE ) ),
- aPaperWidthText ( this, SVX_RES( FT_PAPER_WIDTH ) ),
- aPaperWidthEdit ( this, SVX_RES( ED_PAPER_WIDTH ) ),
- aPaperHeightText ( this, SVX_RES( FT_PAPER_HEIGHT ) ),
- aPaperHeightEdit ( this, SVX_RES( ED_PAPER_HEIGHT ) ),
- aOrientationFT ( this, SVX_RES( FT_ORIENTATION ) ),
- aPortraitBtn ( this, SVX_RES( RB_PORTRAIT ) ),
- aLandscapeBtn ( this, SVX_RES( RB_LANDSCAPE ) ),
- aBspWin ( this, SVX_RES( WN_BSP ) ),
- aTextFlowLbl ( this, SVX_RES( FT_TEXT_FLOW ) ),
- aTextFlowBox ( this, SVX_RES( LB_TEXT_FLOW ) ),
- aPaperTrayLbl ( this, SVX_RES( FT_PAPER_TRAY ) ),
- aPaperTrayBox ( this, SVX_RES( LB_PAPER_TRAY ) ),
- aMarginFl ( this, SVX_RES( FL_MARGIN ) ),
- aLeftMarginLbl ( this, SVX_RES( FT_LEFT_MARGIN ) ),
- aLeftMarginEdit ( this, SVX_RES( ED_LEFT_MARGIN ) ),
- aRightMarginLbl ( this, SVX_RES( FT_RIGHT_MARGIN ) ),
- aRightMarginEdit ( this, SVX_RES( ED_RIGHT_MARGIN ) ),
- aTopMarginLbl ( this, SVX_RES( FT_TOP_MARGIN ) ),
- aTopMarginEdit ( this, SVX_RES( ED_TOP_MARGIN ) ),
- aBottomMarginLbl ( this, SVX_RES( FT_BOTTOM_MARGIN ) ),
- aBottomMarginEdit ( this, SVX_RES( ED_BOTTOM_MARGIN ) ),
-
- aLayoutFL ( this, SVX_RES( FL_LAYOUT ) ),
- aPageText ( this, SVX_RES( FT_PAGELAYOUT ) ),
- aLayoutBox ( this, SVX_RES( LB_LAYOUT ) ),
- aNumberFormatText ( this, SVX_RES( FT_NUMBER_FORMAT ) ),
- aNumberFormatBox ( this, SVX_RES( LB_NUMBER_FORMAT ) ),
- aBottomSeparatorFl ( this, SVX_RES( FL_BOTTOM_SEP ) ),
- aTblAlignFT ( this, SVX_RES( FT_TBL_ALIGN ) ),
- aHorzBox ( this, SVX_RES( CB_HORZ ) ),
- aVertBox ( this, SVX_RES( CB_VERT ) ),
- aAdaptBox ( this, SVX_RES( CB_ADAPT ) ),
- aRegisterCB ( this, SVX_RES( CB_REGISTER ) ),
- aRegisterFT ( this, SVX_RES( FT_REGISTER ) ),
- aRegisterLB ( this, SVX_RES( LB_REGISTER ) ),
-
- aInsideText ( SVX_RES( STR_INSIDE ) ),
- aOutsideText ( SVX_RES( STR_OUTSIDE ) ),
- aPrintRangeQueryText( SVX_RES( STR_QUERY_PRINTRANGE ) ),
+ SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_PAGE ), rAttr ),
+
+ aPaperSizeFl ( this, CUI_RES( FL_PAPER_SIZE ) ),
+ aPaperFormatText ( this, CUI_RES( FT_PAPER_FORMAT ) ),
+ aPaperSizeBox ( this, CUI_RES( LB_PAPER_SIZE ) ),
+ aPaperWidthText ( this, CUI_RES( FT_PAPER_WIDTH ) ),
+ aPaperWidthEdit ( this, CUI_RES( ED_PAPER_WIDTH ) ),
+ aPaperHeightText ( this, CUI_RES( FT_PAPER_HEIGHT ) ),
+ aPaperHeightEdit ( this, CUI_RES( ED_PAPER_HEIGHT ) ),
+ aOrientationFT ( this, CUI_RES( FT_ORIENTATION ) ),
+ aPortraitBtn ( this, CUI_RES( RB_PORTRAIT ) ),
+ aLandscapeBtn ( this, CUI_RES( RB_LANDSCAPE ) ),
+ aBspWin ( this, CUI_RES( WN_BSP ) ),
+ aTextFlowLbl ( this, CUI_RES( FT_TEXT_FLOW ) ),
+ aTextFlowBox ( this, CUI_RES( LB_TEXT_FLOW ) ),
+ aPaperTrayLbl ( this, CUI_RES( FT_PAPER_TRAY ) ),
+ aPaperTrayBox ( this, CUI_RES( LB_PAPER_TRAY ) ),
+ aMarginFl ( this, CUI_RES( FL_MARGIN ) ),
+ aLeftMarginLbl ( this, CUI_RES( FT_LEFT_MARGIN ) ),
+ aLeftMarginEdit ( this, CUI_RES( ED_LEFT_MARGIN ) ),
+ aRightMarginLbl ( this, CUI_RES( FT_RIGHT_MARGIN ) ),
+ aRightMarginEdit ( this, CUI_RES( ED_RIGHT_MARGIN ) ),
+ aTopMarginLbl ( this, CUI_RES( FT_TOP_MARGIN ) ),
+ aTopMarginEdit ( this, CUI_RES( ED_TOP_MARGIN ) ),
+ aBottomMarginLbl ( this, CUI_RES( FT_BOTTOM_MARGIN ) ),
+ aBottomMarginEdit ( this, CUI_RES( ED_BOTTOM_MARGIN ) ),
+
+ aLayoutFL ( this, CUI_RES( FL_LAYOUT ) ),
+ aPageText ( this, CUI_RES( FT_PAGELAYOUT ) ),
+ aLayoutBox ( this, CUI_RES( LB_LAYOUT ) ),
+ aNumberFormatText ( this, CUI_RES( FT_NUMBER_FORMAT ) ),
+ aNumberFormatBox ( this, CUI_RES( LB_NUMBER_FORMAT ) ),
+ aBottomSeparatorFl ( this, CUI_RES( FL_BOTTOM_SEP ) ),
+ aTblAlignFT ( this, CUI_RES( FT_TBL_ALIGN ) ),
+ aHorzBox ( this, CUI_RES( CB_HORZ ) ),
+ aVertBox ( this, CUI_RES( CB_VERT ) ),
+ aAdaptBox ( this, CUI_RES( CB_ADAPT ) ),
+ aRegisterCB ( this, CUI_RES( CB_REGISTER ) ),
+ aRegisterFT ( this, CUI_RES( FT_REGISTER ) ),
+ aRegisterLB ( this, CUI_RES( LB_REGISTER ) ),
+
+ aInsideText ( CUI_RES( STR_INSIDE ) ),
+ aOutsideText ( CUI_RES( STR_OUTSIDE ) ),
+ aPrintRangeQueryText( CUI_RES( STR_QUERY_PRINTRANGE ) ),
bLandscape ( FALSE ),
eMode ( SVX_PAGE_MODE_STANDARD ),
@@ -339,16 +323,16 @@ SvxPageDescPage::SvxPageDescPage( Window* pParent, const SfxItemSet& rAttr ) :
bool bHTML32 = SvxHtmlExportModeConfigItem_Impl().IsExportModeHTML32();
// fill text flow listbox with valid entries
- aTextFlowBox.InsertEntryValue( SVX_RESSTR( RID_SVXSTR_PAGEDIR_LTR_HORI ), FRMDIR_HORI_LEFT_TOP );
+ aTextFlowBox.InsertEntryValue( CUI_RESSTR( RID_SVXSTR_PAGEDIR_LTR_HORI ), FRMDIR_HORI_LEFT_TOP );
if( bCTL )
- aTextFlowBox.InsertEntryValue( SVX_RESSTR( RID_SVXSTR_PAGEDIR_RTL_HORI ), FRMDIR_HORI_RIGHT_TOP );
+ aTextFlowBox.InsertEntryValue( CUI_RESSTR( RID_SVXSTR_PAGEDIR_RTL_HORI ), FRMDIR_HORI_RIGHT_TOP );
// #109989# do not show vertical directions in Writer/Web
if( !bWeb )
{
if( bCJK )
- aTextFlowBox.InsertEntryValue( SVX_RESSTR( RID_SVXSTR_PAGEDIR_RTL_VERT ), FRMDIR_VERT_TOP_RIGHT );
+ aTextFlowBox.InsertEntryValue( CUI_RESSTR( RID_SVXSTR_PAGEDIR_RTL_VERT ), FRMDIR_VERT_TOP_RIGHT );
// if( ... )
-// aTextFlowBox.InsertEntryValue( SVX_RESSTR( RID_SVXSTR_PAGEDIR_LTR_VERT ), FRMDIR_VERT_TOP_LEFT );
+// aTextFlowBox.InsertEntryValue( CUI_RESSTR( RID_SVXSTR_PAGEDIR_LTR_VERT ), FRMDIR_VERT_TOP_LEFT );
}
// #109989# show the text direction box in Writer/Web too, but only, if HTML export mode is not HTML3.2.
@@ -619,7 +603,7 @@ void SvxPageDescPage::Reset( const SfxItemSet& rSet )
if ( ePaperStart != PAPER_A3 )
nAryId = RID_SVXSTRARY_PAPERSIZE_DRAW;
- ResStringArray aPaperAry( SVX_RES( nAryId ) );
+ ResStringArray aPaperAry( CUI_RES( nAryId ) );
sal_uInt32 nCnt = aPaperAry.Count();
for ( sal_uInt32 i = 0; i < nCnt; ++i )
diff --git a/svx/source/cui/page.h b/cui/source/tabpages/page.h
index 98aefdc79cc4..98aefdc79cc4 100644
--- a/svx/source/cui/page.h
+++ b/cui/source/tabpages/page.h
diff --git a/svx/source/cui/page.hrc b/cui/source/tabpages/page.hrc
index bd2810a39061..bd2810a39061 100644
--- a/svx/source/cui/page.hrc
+++ b/cui/source/tabpages/page.hrc
diff --git a/svx/source/cui/page.src b/cui/source/tabpages/page.src
index 6a44e41729a7..e8b83078f26a 100644
--- a/svx/source/cui/page.src
+++ b/cui/source/tabpages/page.src
@@ -30,10 +30,11 @@
// include ---------------------------------------------------------------
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "helpid.hrc"
#include "page.hrc"
#include "page.h"
+#include <svx/dialogs.hrc>
// RID_SVXPAGE_PAGE ------------------------------------------------------
@@ -369,160 +370,6 @@ TabPage RID_SVXPAGE_PAGE
Text [ en-US ] = "The margin settings are out of print range.\n\nDo you still want to apply these settings?";
};
};
- // App-spezifische Res
-String RID_SVXSTR_WRITER_PAGE
-{
- Text [ en-US ] = "Continuation page" ;
-};
- // Papierformate
-String RID_SVXSTR_PAPER_A0
-{
- Text = "A0" ;
-};
-String RID_SVXSTR_PAPER_A1
-{
- Text = "A1" ;
-};
-String RID_SVXSTR_PAPER_A2
-{
- Text = "A2" ;
-};
-String RID_SVXSTR_PAPER_A3
-{
- Text = "A3" ;
-};
-String RID_SVXSTR_PAPER_A4
-{
- Text = "A4" ;
-};
-String RID_SVXSTR_PAPER_A5
-{
- Text = "A5" ;
-};
-String RID_SVXSTR_PAPER_B4_ISO
-{
- Text = "B4 (ISO)" ;
-};
-String RID_SVXSTR_PAPER_B5_ISO
-{
- Text = "B5 (ISO)" ;
-};
-String RID_SVXSTR_PAPER_LETTER
-{
- Text = "Letter" ;
-};
-String RID_SVXSTR_PAPER_LEGAL
-{
- Text = "Legal" ;
-};
-String RID_SVXSTR_PAPER_TABLOID
-{
- Text = "Tabloid" ;
-};
-String RID_SVXSTR_PAPER_USER
-{
- Text [ en-US ] = "User Defined" ;
-};
-String RID_SVXSTR_PAPER_B6_ISO
-{
- Text = "B6 (ISO)" ;
-};
-String RID_SVXSTR_PAPER_C4
-{
- Text = "C4 Envelope" ;
-};
-String RID_SVXSTR_PAPER_C5
-{
- Text = "C5 Envelope" ;
-};
-String RID_SVXSTR_PAPER_C6
-{
- Text = "C6 Envelope" ;
-};
-String RID_SVXSTR_PAPER_C65
-{
- Text = "C6/5 Envelope" ;
-};
-String RID_SVXSTR_PAPER_DL
-{
- Text = "DL Envelope" ;
-};
-String RID_SVXSTR_PAPER_DIA
-{
- Text = "Dia Slide" ;
-};
-String RID_SVXSTR_PAPER_SCREEN
-{
- Text [ en-US ] = "Screen" ;
-};
-String RID_SVXSTR_PAPER_C
-{
- Text = "C" ;
-};
-String RID_SVXSTR_PAPER_D
-{
- Text = "D" ;
-};
-String RID_SVXSTR_PAPER_E
-{
- Text = "E" ;
-};
-String RID_SVXSTR_PAPER_EXECUTIVE
-{
- Text = "Executive" ;
-};
-String RID_SVXSTR_PAPER_LEGAL2
-{
- Text = "Long Bond" ;
-};
-String RID_SVXSTR_PAPER_MONARCH
-{
- Text = "#8 (Monarch) Envelope" ;
-};
-String RID_SVXSTR_PAPER_COM675
-{
- Text = "#6 3/4 (Personal) Envelope" ;
-};
-String RID_SVXSTR_PAPER_COM9
-{
- Text = "#9 Envelope" ;
-};
-String RID_SVXSTR_PAPER_COM10
-{
- Text = "#10 Envelope" ;
-};
-String RID_SVXSTR_PAPER_COM11
-{
- Text = "#11 Envelope" ;
-};
-String RID_SVXSTR_PAPER_COM12
-{
- Text = "#12 Envelope" ;
-};
-String RID_SVXSTR_PAPER_KAI16
-{
- Text = "16 Kai" ;
-};
-String RID_SVXSTR_PAPER_KAI32
-{
- Text = "32 Kai" ;
-};
-String RID_SVXSTR_PAPER_KAI32BIG
-{
- Text = "Big 32 Kai" ;
-};
-String RID_SVXSTR_PAPER_B4_JIS
-{
- Text = "B4 (JIS)" ;
-};
-String RID_SVXSTR_PAPER_B5_JIS
-{
- Text = "B5 (JIS)" ;
-};
-String RID_SVXSTR_PAPER_B6_JIS
-{
- Text = "B6 (JIS)" ;
-};
StringArray RID_SVXSTRARY_PAPERSIZE_STD
{
ItemList [ en-US ] =
@@ -590,14 +437,6 @@ StringArray RID_SVXSTRARY_PAPERSIZE_DRAW
< "Screen" ; PAPERSIZE_SCREEN ; > ;
};
};
-String RID_SVXSTR_PAPERBIN
-{
- Text [ en-US ] = "Paper tray" ;
-};
-String RID_SVXSTR_PAPERBIN_SETTINGS
-{
- Text [ en-US ] = "[From printer settings]" ;
-};
// ********************************************************************** EOF
diff --git a/svx/source/cui/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index c0b72b573099..4c2a1446755c 100644
--- a/svx/source/cui/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -29,42 +29,23 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_cui.hxx"
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
#include <sfx2/app.hxx>
#include <sfx2/objsh.hxx>
#include <sfx2/module.hxx>
#include <vcl/mnemonic.hxx>
-
-
-
-
-
-
-
-
-
-
-
-
-
+#include <svx/dialogs.hrc>
#define _SVX_PARAGRPH_CXX 0
-
-
-
-#include <svtools/languageoptions.hxx>
-#include <pgrditem.hxx>
-#include <svx/dialogs.hrc>
+#include <svl/languageoptions.hxx>
+#include <svx/pgrditem.hxx>
+#include <cuires.hrc>
#include "paragrph.hrc"
#include "paragrph.hxx"
#include <svx/frmdiritem.hxx>
-
#include <svx/lspcitem.hxx>
#include <svx/adjitem.hxx>
#include <svx/orphitem.hxx>
@@ -77,13 +58,13 @@
#include <svx/lrspitem.hxx>
#include <svx/brkitem.hxx>
#include <svx/keepitem.hxx>
-#include "dlgutil.hxx"
-#include <svx/dialmgr.hxx>
-#include "htmlmode.hxx"
+#include "svx/dlgutil.hxx"
+#include <dialmgr.hxx>
+#include "svx/htmlmode.hxx"
#include <svx/paravertalignitem.hxx>
-#include <svtools/eitem.hxx> //add CHINA001
+#include <svl/eitem.hxx> //add CHINA001
#include <sfx2/request.hxx> //add CHINA001
-#include <svtools/intitem.hxx> //add CHINA001
+#include <svl/intitem.hxx> //add CHINA001
// static ----------------------------------------------------------------
@@ -657,31 +638,31 @@ int SvxStdParagraphTabPage::DeactivatePage( SfxItemSet* _pSet )
SvxStdParagraphTabPage::SvxStdParagraphTabPage( Window* pParent,
const SfxItemSet& rAttr ) :
- SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_STD_PARAGRAPH ), rAttr ),
-
- aLeftLabel ( this, SVX_RES( FT_LEFTINDENT ) ),
- aLeftIndent ( this, SVX_RES( ED_LEFTINDENT ) ),
- aRightLabel ( this, SVX_RES( FT_RIGHTINDENT ) ),
- aRightIndent ( this, SVX_RES( ED_RIGHTINDENT ) ),
-
- aFLineLabel ( this, SVX_RES( FT_FLINEINDENT ) ),
- aFLineIndent ( this, SVX_RES( ED_FLINEINDENT ) ),
- aAutoCB ( this, SVX_RES( CB_AUTO ) ),
- aIndentFrm ( this, SVX_RES( FL_INDENT ) ),
- aTopLabel ( this, SVX_RES( FT_TOPDIST ) ),
- aTopDist ( this, SVX_RES( ED_TOPDIST ) ),
- aBottomLabel ( this, SVX_RES( FT_BOTTOMDIST ) ),
- aBottomDist ( this, SVX_RES( ED_BOTTOMDIST ) ),
- aDistFrm ( this, SVX_RES( FL_DIST ) ),
- aLineDist ( this, SVX_RES( LB_LINEDIST ) ),
- aLineDistAtLabel ( this, SVX_RES( FT_LINEDIST ) ),
- aLineDistAtPercentBox ( this, SVX_RES( ED_LINEDISTPERCENT ) ),
- aLineDistAtMetricBox ( this, SVX_RES( ED_LINEDISTMETRIC ) ),
- aLineDistFrm ( this, SVX_RES( FL_LINEDIST ) ),
- sAbsDist ( SVX_RES(ST_LINEDIST_ABS) ),
- aExampleWin ( this, SVX_RES( WN_EXAMPLE ) ),
- aRegisterCB ( this, SVX_RES( CB_REGISTER ) ),
- aRegisterFL ( this, SVX_RES( FL_REGISTER ) ),
+ SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_STD_PARAGRAPH ), rAttr ),
+
+ aLeftLabel ( this, CUI_RES( FT_LEFTINDENT ) ),
+ aLeftIndent ( this, CUI_RES( ED_LEFTINDENT ) ),
+ aRightLabel ( this, CUI_RES( FT_RIGHTINDENT ) ),
+ aRightIndent ( this, CUI_RES( ED_RIGHTINDENT ) ),
+
+ aFLineLabel ( this, CUI_RES( FT_FLINEINDENT ) ),
+ aFLineIndent ( this, CUI_RES( ED_FLINEINDENT ) ),
+ aAutoCB ( this, CUI_RES( CB_AUTO ) ),
+ aIndentFrm ( this, CUI_RES( FL_INDENT ) ),
+ aTopLabel ( this, CUI_RES( FT_TOPDIST ) ),
+ aTopDist ( this, CUI_RES( ED_TOPDIST ) ),
+ aBottomLabel ( this, CUI_RES( FT_BOTTOMDIST ) ),
+ aBottomDist ( this, CUI_RES( ED_BOTTOMDIST ) ),
+ aDistFrm ( this, CUI_RES( FL_DIST ) ),
+ aLineDist ( this, CUI_RES( LB_LINEDIST ) ),
+ aLineDistAtLabel ( this, CUI_RES( FT_LINEDIST ) ),
+ aLineDistAtPercentBox ( this, CUI_RES( ED_LINEDISTPERCENT ) ),
+ aLineDistAtMetricBox ( this, CUI_RES( ED_LINEDISTMETRIC ) ),
+ aLineDistFrm ( this, CUI_RES( FL_LINEDIST ) ),
+ sAbsDist ( CUI_RES(ST_LINEDIST_ABS) ),
+ aExampleWin ( this, CUI_RES( WN_EXAMPLE ) ),
+ aRegisterCB ( this, CUI_RES( CB_REGISTER ) ),
+ aRegisterFL ( this, CUI_RES( FL_REGISTER ) ),
pActLineDistFld ( &aLineDistAtPercentBox ),
nAbst ( MAX_DURCH ),
nWidth ( 11905 /*567 * 50*/ ),
@@ -1057,34 +1038,34 @@ void SvxStdParagraphTabPage::PageCreated(SfxAllItemSet aSet)
--------------------------------------------------*/
SvxParaAlignTabPage::SvxParaAlignTabPage( Window* pParent, const SfxItemSet& rSet )
- : SfxTabPage(pParent, SVX_RES( RID_SVXPAGE_ALIGN_PARAGRAPH ),rSet),
- aAlignFrm ( this, SVX_RES( FL_ALIGN ) ),
- aLeft ( this, SVX_RES( BTN_LEFTALIGN ) ),
- aRight ( this, SVX_RES( BTN_RIGHTALIGN ) ),
- aCenter ( this, SVX_RES( BTN_CENTERALIGN ) ),
- aJustify ( this, SVX_RES( BTN_JUSTIFYALIGN ) ),
- aLastLineFT ( this, SVX_RES( FT_LASTLINE ) ),
- aLastLineLB ( this, SVX_RES( LB_LASTLINE ) ),
- aExpandCB ( this, SVX_RES( CB_EXPAND ) ),
- aSnapToGridCB ( this, SVX_RES( CB_SNAP ) ),
- aExampleWin ( this, SVX_RES( WN_EXAMPLE ) ),
-
- aVertAlignFL ( this, SVX_RES( FL_VERTALIGN ) ),
- aVertAlignFT ( this, SVX_RES( FT_VERTALIGN ) ),
- aVertAlignLB ( this, SVX_RES( LB_VERTALIGN ) ),
-
- aPropertiesFL ( this, SVX_RES( FL_PROPERTIES )),
- aTextDirectionFT ( this, SVX_RES( FT_TEXTDIRECTION )),
- aTextDirectionLB ( this, SVX_RES( LB_TEXTDIRECTION ))
+ : SfxTabPage(pParent, CUI_RES( RID_SVXPAGE_ALIGN_PARAGRAPH ),rSet),
+ aAlignFrm ( this, CUI_RES( FL_ALIGN ) ),
+ aLeft ( this, CUI_RES( BTN_LEFTALIGN ) ),
+ aRight ( this, CUI_RES( BTN_RIGHTALIGN ) ),
+ aCenter ( this, CUI_RES( BTN_CENTERALIGN ) ),
+ aJustify ( this, CUI_RES( BTN_JUSTIFYALIGN ) ),
+ aLastLineFT ( this, CUI_RES( FT_LASTLINE ) ),
+ aLastLineLB ( this, CUI_RES( LB_LASTLINE ) ),
+ aExpandCB ( this, CUI_RES( CB_EXPAND ) ),
+ aSnapToGridCB ( this, CUI_RES( CB_SNAP ) ),
+ aExampleWin ( this, CUI_RES( WN_EXAMPLE ) ),
+
+ aVertAlignFL ( this, CUI_RES( FL_VERTALIGN ) ),
+ aVertAlignFT ( this, CUI_RES( FT_VERTALIGN ) ),
+ aVertAlignLB ( this, CUI_RES( LB_VERTALIGN ) ),
+
+ aPropertiesFL ( this, CUI_RES( FL_PROPERTIES )),
+ aTextDirectionFT ( this, CUI_RES( FT_TEXTDIRECTION )),
+ aTextDirectionLB ( this, CUI_RES( LB_TEXTDIRECTION ))
{
SvtLanguageOptions aLangOptions;
USHORT nLastLinePos = LASTLINEPOS_DEFAULT;
if ( aLangOptions.IsAsianTypographyEnabled() )
{
- String sLeft(SVX_RES(ST_LEFTALIGN_ASIAN));
+ String sLeft(CUI_RES(ST_LEFTALIGN_ASIAN));
aLeft.SetText(sLeft);
- aRight.SetText(String(SVX_RES(ST_RIGHTALIGN_ASIAN)));
+ aRight.SetText(String(CUI_RES(ST_RIGHTALIGN_ASIAN)));
sLeft = MnemonicGenerator::EraseAllMnemonicChars( sLeft );
if ( aLastLineLB.GetEntryCount() == LASTLINECOUNT_OLD )
@@ -1113,9 +1094,9 @@ SvxParaAlignTabPage::SvxParaAlignTabPage( Window* pParent, const SfxItemSet& rSe
{
if( aLangOptions.IsCTLFontEnabled() )
{
- aTextDirectionLB.InsertEntryValue( SVX_RESSTR( RID_SVXSTR_FRAMEDIR_LTR ), FRMDIR_HORI_LEFT_TOP );
- aTextDirectionLB.InsertEntryValue( SVX_RESSTR( RID_SVXSTR_FRAMEDIR_RTL ), FRMDIR_HORI_RIGHT_TOP );
- aTextDirectionLB.InsertEntryValue( SVX_RESSTR( RID_SVXSTR_FRAMEDIR_SUPER ), FRMDIR_ENVIRONMENT );
+ aTextDirectionLB.InsertEntryValue( CUI_RESSTR( RID_SVXSTR_FRAMEDIR_LTR ), FRMDIR_HORI_LEFT_TOP );
+ aTextDirectionLB.InsertEntryValue( CUI_RESSTR( RID_SVXSTR_FRAMEDIR_RTL ), FRMDIR_HORI_RIGHT_TOP );
+ aTextDirectionLB.InsertEntryValue( CUI_RESSTR( RID_SVXSTR_FRAMEDIR_SUPER ), FRMDIR_ENVIRONMENT );
aPropertiesFL.Show();
aTextDirectionFT.Show();
@@ -1307,7 +1288,7 @@ void SvxParaAlignTabPage::Reset( const SfxItemSet& rSet )
aLastLineLB.Hide();
aLastLineFT.Hide();
aExpandCB.Hide();
- if(!(nHtmlMode & HTMLMODE_FULL_STYLES|HTMLMODE_FIRSTLINE) )
+ if(!(nHtmlMode & (HTMLMODE_FULL_STYLES|HTMLMODE_FIRSTLINE)) )
aJustify.Disable();
aSnapToGridCB.Show(FALSE);
}
@@ -1960,39 +1941,39 @@ void SvxExtParagraphTabPage::DisablePageBreak()
SvxExtParagraphTabPage::SvxExtParagraphTabPage( Window* pParent, const SfxItemSet& rAttr ) :
- SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_EXT_PARAGRAPH ), rAttr ),
-
- aHyphenBox ( this, SVX_RES( BTN_HYPHEN ) ),
- aBeforeText ( this, SVX_RES( FT_HYPHENBEFORE ) ),
- aExtHyphenBeforeBox ( this, SVX_RES( ED_HYPHENBEFORE ) ),
- aAfterText ( this, SVX_RES( FT_HYPHENAFTER ) ),
- aExtHyphenAfterBox ( this, SVX_RES( ED_HYPHENAFTER ) ),
- aMaxHyphenLabel ( this, SVX_RES( FT_MAXHYPH ) ),
- aMaxHyphenEdit ( this, SVX_RES( ED_MAXHYPH ) ),
- aExtFL ( this, SVX_RES( FL_HYPHEN ) ),
- aBreaksFL ( this, SVX_RES( FL_BREAKS ) ),
- aPageBreakBox ( this, SVX_RES( BTN_PAGEBREAK ) ),
- aBreakTypeFT ( this, SVX_RES( FT_BREAKTYPE )),
- aBreakTypeLB ( this, SVX_RES( LB_BREAKTYPE )),
- aBreakPositionFT ( this, SVX_RES( FT_BREAKPOSITION )),
- aBreakPositionLB ( this, SVX_RES( LB_BREAKPOSITION )),
-// aPageBox ( this, SVX_RES( BTN_BREAKPAGE ) ),
-// aColumnBox ( this, SVX_RES( BTN_BREAKCOLUMN ) ),
-// aBeforeBox ( this, SVX_RES( BTN_PAGEBREAKBEFORE ) ),
-// aAfterBox ( this, SVX_RES( BTN_PAGEBREAKAFTER ) ),
- aApplyCollBtn ( this, SVX_RES( BTN_PAGECOLL ) ),
- aApplyCollBox ( this, SVX_RES( LB_PAGECOLL ) ),
- aPagenumText ( this, SVX_RES( FT_PAGENUM ) ),
- aPagenumEdit ( this, SVX_RES( ED_PAGENUM ) ),
- aExtendFL ( this, SVX_RES( FL_OPTIONS ) ),
- aKeepTogetherBox ( this, SVX_RES( BTN_KEEPTOGETHER ) ),
- aKeepParaBox ( this, SVX_RES( CB_KEEPTOGETHER ) ),
- aOrphanBox ( this, SVX_RES( BTN_ORPHANS ) ),
- aOrphanRowNo ( this, SVX_RES( ED_ORPHANS ) ),
- aOrphanRowLabel ( this, SVX_RES( FT_ORPHANS ) ),
- aWidowBox ( this, SVX_RES( BTN_WIDOWS ) ),
- aWidowRowNo ( this, SVX_RES( ED_WIDOWS ) ),
- aWidowRowLabel ( this, SVX_RES( FT_WIDOWS ) ),
+ SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_EXT_PARAGRAPH ), rAttr ),
+
+ aHyphenBox ( this, CUI_RES( BTN_HYPHEN ) ),
+ aBeforeText ( this, CUI_RES( FT_HYPHENBEFORE ) ),
+ aExtHyphenBeforeBox ( this, CUI_RES( ED_HYPHENBEFORE ) ),
+ aAfterText ( this, CUI_RES( FT_HYPHENAFTER ) ),
+ aExtHyphenAfterBox ( this, CUI_RES( ED_HYPHENAFTER ) ),
+ aMaxHyphenLabel ( this, CUI_RES( FT_MAXHYPH ) ),
+ aMaxHyphenEdit ( this, CUI_RES( ED_MAXHYPH ) ),
+ aExtFL ( this, CUI_RES( FL_HYPHEN ) ),
+ aBreaksFL ( this, CUI_RES( FL_BREAKS ) ),
+ aPageBreakBox ( this, CUI_RES( BTN_PAGEBREAK ) ),
+ aBreakTypeFT ( this, CUI_RES( FT_BREAKTYPE )),
+ aBreakTypeLB ( this, CUI_RES( LB_BREAKTYPE )),
+ aBreakPositionFT ( this, CUI_RES( FT_BREAKPOSITION )),
+ aBreakPositionLB ( this, CUI_RES( LB_BREAKPOSITION )),
+// aPageBox ( this, CUI_RES( BTN_BREAKPAGE ) ),
+// aColumnBox ( this, CUI_RES( BTN_BREAKCOLUMN ) ),
+// aBeforeBox ( this, CUI_RES( BTN_PAGEBREAKBEFORE ) ),
+// aAfterBox ( this, CUI_RES( BTN_PAGEBREAKAFTER ) ),
+ aApplyCollBtn ( this, CUI_RES( BTN_PAGECOLL ) ),
+ aApplyCollBox ( this, CUI_RES( LB_PAGECOLL ) ),
+ aPagenumText ( this, CUI_RES( FT_PAGENUM ) ),
+ aPagenumEdit ( this, CUI_RES( ED_PAGENUM ) ),
+ aExtendFL ( this, CUI_RES( FL_OPTIONS ) ),
+ aKeepTogetherBox ( this, CUI_RES( BTN_KEEPTOGETHER ) ),
+ aKeepParaBox ( this, CUI_RES( CB_KEEPTOGETHER ) ),
+ aOrphanBox ( this, CUI_RES( BTN_ORPHANS ) ),
+ aOrphanRowNo ( this, CUI_RES( ED_ORPHANS ) ),
+ aOrphanRowLabel ( this, CUI_RES( FT_ORPHANS ) ),
+ aWidowBox ( this, CUI_RES( BTN_WIDOWS ) ),
+ aWidowRowNo ( this, CUI_RES( ED_WIDOWS ) ),
+ aWidowRowLabel ( this, CUI_RES( FT_WIDOWS ) ),
bPageBreak ( TRUE ),
bHtmlMode ( FALSE ),
nStdPos ( 0 )
@@ -2273,11 +2254,11 @@ void SvxExtParagraphTabPage::PageCreated(SfxAllItemSet aSet)
-----------------------------------------------------------------------*/
SvxAsianTabPage::SvxAsianTabPage( Window* pParent, const SfxItemSet& rSet ) :
- SfxTabPage(pParent, SVX_RES( RID_SVXPAGE_PARA_ASIAN ), rSet),
- aOptionsFL( this, SVX_RES(FL_AS_OPTIONS )),
- aForbiddenRulesCB( this, SVX_RES(CB_AS_FORBIDDEN )),
- aHangingPunctCB( this, SVX_RES(CB_AS_HANG_PUNC )),
- aScriptSpaceCB( this, SVX_RES(CB_AS_SCRIPT_SPACE ))//,
+ SfxTabPage(pParent, CUI_RES( RID_SVXPAGE_PARA_ASIAN ), rSet),
+ aOptionsFL( this, CUI_RES(FL_AS_OPTIONS )),
+ aForbiddenRulesCB( this, CUI_RES(CB_AS_FORBIDDEN )),
+ aHangingPunctCB( this, CUI_RES(CB_AS_HANG_PUNC )),
+ aScriptSpaceCB( this, CUI_RES(CB_AS_SCRIPT_SPACE ))//,
{
FreeResource();
diff --git a/svx/source/cui/paragrph.hrc b/cui/source/tabpages/paragrph.hrc
index 6b0b835b07e3..6b0b835b07e3 100644
--- a/svx/source/cui/paragrph.hrc
+++ b/cui/source/tabpages/paragrph.hrc
diff --git a/svx/source/cui/paragrph.src b/cui/source/tabpages/paragrph.src
index 996242dccbda..2e4ad98da17a 100644
--- a/svx/source/cui/paragrph.src
+++ b/cui/source/tabpages/paragrph.src
@@ -28,9 +28,10 @@
*
************************************************************************/
// include ---------------------------------------------------------------
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "helpid.hrc"
#include "paragrph.hrc"
+#include <svx/dialogs.hrc>
// RID_SVXPAGE_STD_PARAGRAPH ---------------------------------------------
TabPage RID_SVXPAGE_STD_PARAGRAPH
diff --git a/cui/source/tabpages/strings.src b/cui/source/tabpages/strings.src
new file mode 100644
index 000000000000..316e8741dcc9
--- /dev/null
+++ b/cui/source/tabpages/strings.src
@@ -0,0 +1,178 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+ // include ------------------------------------------------------------------
+#include <cuires.hrc>
+
+String RID_SVXSTR_DESC_GRADIENT
+{
+ /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für den Farbverlauf ein: : Geben Sie hier bitte den Namen f³r den Farbverlauf ein: */
+ /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für den Farbverlauf ein: : Geben Sie hier bitte den Namen f³r den Farbverlauf ein: */
+ Text [ en-US ] = "Please enter a name for the gradient:" ;
+};
+String RID_SVXSTR_ASK_DEL_GRADIENT
+{
+ /* ### ACHTUNG: Neuer Text in Resource? Soll der Farbverlauf wirklich gelöscht werden? : Soll der Farbverlauf wirklich gel÷scht werden? */
+ /* ### ACHTUNG: Neuer Text in Resource? Soll der Farbverlauf wirklich gelöscht werden? : Soll der Farbverlauf wirklich gel÷scht werden? */
+ Text [ en-US ] = "Do you want to delete the gradient?" ;
+};
+String RID_SVXSTR_ASK_CHANGE_GRADIENT
+{
+ /* ### ACHTUNG: Neuer Text in Resource? Der Farbverlauf wurde geändert und nicht gesichert. \nSie können den selektierten Farbverlauf ändern \noder einen neuen Farbverlauf hinzufügen. : Der Farbverlauf wurde geõndert und nicht gesichert. \nSie k÷nnen den selektierten Farbverlauf õndern \noder einen neuen Farbverlauf hinzuf³gen. */
+ /* ### ACHTUNG: Neuer Text in Resource? Der Farbverlauf wurde geändert und nicht gesichert. \nSie können den selektierten Farbverlauf ändern \noder einen neuen Farbverlauf hinzufügen. : Der Farbverlauf wurde geõndert und nicht gesichert. \nSie k÷nnen den selektierten Farbverlauf õndern \noder einen neuen Farbverlauf hinzuf³gen. */
+ Text [ en-US ] = "The gradient was modified without saving. \nModify the selected gradient or add a new gradient." ;
+};
+String RID_SVXSTR_DESC_NEW_BITMAP
+{
+ /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für die Bitmap ein: : Geben Sie hier bitte den Namen f³r die Bitmap ein: */
+ /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für die Bitmap ein: : Geben Sie hier bitte den Namen f³r die Bitmap ein: */
+ Text [ en-US ] = "Please enter a name for the bitmap:" ;
+};
+String RID_SVXSTR_DESC_EXT_BITMAP
+{
+ /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für die externe Bitmap ein: : Geben Sie hier bitte den Namen f³r die externe Bitmap ein: */
+ /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für die externe Bitmap ein: : Geben Sie hier bitte den Namen f³r die externe Bitmap ein: */
+ Text [ en-US ] = "Please enter a name for the external bitmap:" ;
+};
+String RID_SVXSTR_ASK_DEL_BITMAP
+{
+ /* ### ACHTUNG: Neuer Text in Resource? Soll die Bitmap wirklich gelöscht werden? : Soll die Bitmap wirklich gel÷scht werden? */
+ /* ### ACHTUNG: Neuer Text in Resource? Soll die Bitmap wirklich gelöscht werden? : Soll die Bitmap wirklich gel÷scht werden? */
+ Text [ en-US ] = "Are you sure you want to delete the bitmap?" ;
+};
+String RID_SVXSTR_ASK_CHANGE_BITMAP
+{
+ /* ### ACHTUNG: Neuer Text in Resource? Die Bitmap wurde geändert und nicht gesichert. \nSie können die selektierte Bitmap ändern \noder eine neue Bitmap hinzufügen. : Die Bitmap wurde geõndert und nicht gesichert. \nSie k÷nnen die selektierte Bitmap õndern \noder eine neue Bitmap hinzuf³gen. */
+ /* ### ACHTUNG: Neuer Text in Resource? Die Bitmap wurde geändert und nicht gesichert. \nSie können die selektierte Bitmap ändern \noder eine neue Bitmap hinzufügen. : Die Bitmap wurde geõndert und nicht gesichert. \nSie k÷nnen die selektierte Bitmap õndern \noder eine neue Bitmap hinzuf³gen. */
+ Text [ en-US ] = "The bitmap was modified without saving. \nModify the selected bitmap or add a new bitmap." ;
+};
+String RID_SVXSTR_DESC_LINESTYLE
+{
+ /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für den Linienstil ein: : Geben Sie hier bitte den Namen f³r den Linienstil ein: */
+ /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für den Linienstil ein: : Geben Sie hier bitte den Namen f³r den Linienstil ein: */
+ Text [ en-US ] = "Please enter a name for the line style:" ;
+};
+String RID_SVXSTR_ASK_DEL_LINESTYLE
+{
+ /* ### ACHTUNG: Neuer Text in Resource? Soll der Linienstil wirklich gelöscht werden? : Soll der Linienstil wirklich gel÷scht werden? */
+ /* ### ACHTUNG: Neuer Text in Resource? Soll der Linienstil wirklich gelöscht werden? : Soll der Linienstil wirklich gel÷scht werden? */
+ Text [ en-US ] = "Do you want to delete the line style?" ;
+};
+String RID_SVXSTR_ASK_CHANGE_LINESTYLE
+{
+ /* ### ACHTUNG: Neuer Text in Resource? Der Linienstil wurde geändert und nicht gesichert. \nSie können den selektierten Linienstil ändern \noder einen neuen Linienstil hinzufügen. : Der Linienstil wurde geõndert und nicht gesichert. \nSie k÷nnen den selektierten Linienstil õndern \noder einen neuen Linienstil hinzuf³gen. */
+ /* ### ACHTUNG: Neuer Text in Resource? Der Linienstil wurde geändert und nicht gesichert. \nSie können den selektierten Linienstil ändern \noder einen neuen Linienstil hinzufügen. : Der Linienstil wurde geõndert und nicht gesichert. \nSie k÷nnen den selektierten Linienstil õndern \noder einen neuen Linienstil hinzuf³gen. */
+ Text [ en-US ] = "The line style was modified without saving. \nModify the selected line style or add a new line style." ;
+};
+String RID_SVXSTR_DESC_HATCH
+{
+ /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für die Schraffur ein: : Geben Sie hier bitte den Namen f³r die Schraffur ein: */
+ /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für die Schraffur ein: : Geben Sie hier bitte den Namen f³r die Schraffur ein: */
+ Text [ en-US ] = "Please enter a name for the hatching:" ;
+};
+String RID_SVXSTR_ASK_DEL_HATCH
+{
+ /* ### ACHTUNG: Neuer Text in Resource? Soll die Schraffur wirklich gelöscht werden? : Soll die Schraffur wirklich gel÷scht werden? */
+ /* ### ACHTUNG: Neuer Text in Resource? Soll die Schraffur wirklich gelöscht werden? : Soll die Schraffur wirklich gel÷scht werden? */
+ Text [ en-US ] = "Do you want to delete the hatching?" ;
+};
+String RID_SVXSTR_ASK_CHANGE_HATCH
+{
+ /* ### ACHTUNG: Neuer Text in Resource? Die Schraffur wurde geändert und nicht gesichert. \nSie können die selektierte Schraffur ändern \noder eine neue Schraffur hinzufügen. : Die Schraffur wurde geõndert und nicht gesichert. \nSie k÷nnen die selektierte Schraffur õndern \noder eine neue Schraffur hinzuf³gen. */
+ /* ### ACHTUNG: Neuer Text in Resource? Die Schraffur wurde geändert und nicht gesichert. \nSie können die selektierte Schraffur ändern \noder eine neue Schraffur hinzufügen. : Die Schraffur wurde geõndert und nicht gesichert. \nSie k÷nnen die selektierte Schraffur õndern \noder eine neue Schraffur hinzuf³gen. */
+ Text [ en-US ] = "The hatching type was modified but not saved. \nModify the selected hatching type or add a new hatching type." ;
+};
+String RID_SVXSTR_CHANGE
+{
+ /* ### ACHTUNG: Neuer Text in Resource? Ändern : Žndern */
+ /* ### ACHTUNG: Neuer Text in Resource? Ändern : Žndern */
+ Text [ en-US ] = "Modify" ;
+};
+String RID_SVXSTR_ADD
+{
+ /* ### ACHTUNG: Neuer Text in Resource? Hinzufügen : Hinzuf³gen */
+ /* ### ACHTUNG: Neuer Text in Resource? Hinzufügen : Hinzuf³gen */
+ Text [ en-US ] = "Add" ;
+};
+String RID_SVXSTR_DESC_COLOR
+{
+ /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für die neue Farbe ein: : Geben Sie hier bitte den Namen f³r die neue Farbe ein: */
+ /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für die neue Farbe ein: : Geben Sie hier bitte den Namen f³r die neue Farbe ein: */
+ Text [ en-US ] = "Please enter a name for the new color:" ;
+};
+String RID_SVXSTR_ASK_DEL_COLOR
+{
+ /* ### ACHTUNG: Neuer Text in Resource? Soll die Farbe wirklich gelöscht werden? : Soll die Farbe wirklich gel÷scht werden? */
+ /* ### ACHTUNG: Neuer Text in Resource? Soll die Farbe wirklich gelöscht werden? : Soll die Farbe wirklich gel÷scht werden? */
+ Text [ en-US ] = "Do you want to delete the color?" ;
+};
+String RID_SVXSTR_ASK_CHANGE_COLOR
+{
+ /* ### ACHTUNG: Neuer Text in Resource? Die Farbe wurde geändert und nicht gesichert. \nSie können die selektierte Farbe ändern \noder eine neue Farbe hinzufügen. : Die Farbe wurde geõndert und nicht gesichert. \nSie k÷nnen die selektierte Farbe õndern \noder eine neue Farbe hinzuf³gen. */
+ /* ### ACHTUNG: Neuer Text in Resource? Die Farbe wurde geändert und nicht gesichert. \nSie können die selektierte Farbe ändern \noder eine neue Farbe hinzufügen. : Die Farbe wurde geõndert und nicht gesichert. \nSie k÷nnen die selektierte Farbe õndern \noder eine neue Farbe hinzuf³gen. */
+ Text [ en-US ] = "The color was modified without saving.\nModify the selected color or add a new color." ;
+};
+String RID_SVXSTR_TABLE
+{
+ Text [ en-US ] = "Table" ;
+};
+String RID_SVXSTR_WRITE_DATA_ERROR
+{
+ Text [ en-US ] = "The file could not be saved!" ;
+};
+String RID_SVXSTR_READ_DATA_ERROR
+{
+ Text [ en-US ] = "The file could not be loaded!" ;
+};
+String RID_SVXSTR_WARN_TABLE_OVERWRITE
+{
+ /* ### ACHTUNG: Neuer Text in Resource? Die Tabelle wurde geändert und nicht gespeichert. \nSoll die Tabelle gespeichert werden? : Die Tabelle wurde geõndert und nicht gespeichert. \nSoll die Tabelle gespeichert werden? */
+ /* ### ACHTUNG: Neuer Text in Resource? Die Tabelle wurde geändert und nicht gespeichert. \nSoll die Tabelle gespeichert werden? : Die Tabelle wurde geõndert und nicht gespeichert. \nSoll die Tabelle gespeichert werden? */
+ Text [ en-US ] = "The list was modified without saving. Would you like to save the list now?" ;
+};
+String RID_SVXSTR_WARN_NAME_DUPLICATE
+{
+ Text [ en-US ] = "The name you have entered already exists. \nPlease choose another name." ;
+};
+String RID_SVXSTR_DESC_LINEEND
+{
+ /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für das neue Linienende ein: : Geben Sie hier bitte den Namen f³r das neue Linienende ein: */
+ /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für das neue Linienende ein: : Geben Sie hier bitte den Namen f³r das neue Linienende ein: */
+ Text [ en-US ] = "Please enter a name for the new arrowhead:" ;
+};
+String RID_SVXSTR_ASK_DEL_LINEEND
+{
+ /* ### ACHTUNG: Neuer Text in Resource? Soll das Linienende wirklich gelöscht werden? : Soll das Linienende wirklich gel÷scht werden? */
+ /* ### ACHTUNG: Neuer Text in Resource? Soll das Linienende wirklich gelöscht werden? : Soll das Linienende wirklich gel÷scht werden? */
+ Text [ en-US ] = "Do you want to delete the arrowhead?" ;
+};
+String RID_SVXSTR_ASK_CHANGE_LINEEND
+{
+ /* ### ACHTUNG: Neuer Text in Resource? Das Linienende wurde geändert und nicht gesichert. \nMöchten Sie das Linienende jetzt sichern? : Das Linienende wurde geõndert und nicht gesichert. \nM÷chten Sie das Linienende jetzt sichern? */
+ /* ### ACHTUNG: Neuer Text in Resource? Das Linienende wurde geändert und nicht gesichert. \nMöchten Sie das Linienende jetzt sichern? : Das Linienende wurde geõndert und nicht gesichert. \nM÷chten Sie das Linienende jetzt sichern? */
+ Text [ en-US ] = "The arrowhead was modified without saving.\nWould you like to save the arrowhead now?" ;
+};
+
diff --git a/svx/source/cui/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx
index 685fc03145f2..488eb057418f 100644
--- a/svx/source/cui/swpossizetabpage.cxx
+++ b/cui/source/tabpages/swpossizetabpage.cxx
@@ -29,23 +29,19 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
#include <cstddef>
#include <swpossizetabpage.hxx>
-#include <svx/dialmgr.hxx>
-#include <dlgutil.hxx>
-#include <anchorid.hxx>
-#include <svtools/aeitem.hxx>
-#include <swframevalidation.hxx>
+#include <dialmgr.hxx>
+#include <svx/dlgutil.hxx>
+#include <svx/anchorid.hxx>
+#include <svl/aeitem.hxx>
+#include <svx/swframevalidation.hxx>
#include <tools/debug.hxx>
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include <swpossizetabpage.hrc>
-#include <htmlmode.hxx>
+#include <svx/htmlmode.hxx>
#include <svx/svdview.hxx>
#include <svx/svdpagv.hxx>
#include <svx/rectenum.hxx>
@@ -53,6 +49,7 @@
#include <com/sun/star/text/HoriOrientation.hpp>
#include <com/sun/star/text/VertOrientation.hpp>
#include <com/sun/star/text/RelOrientation.hpp>
+#include <svx/dialogs.hrc>
using namespace ::com::sun::star::text;
#define SwFPos SvxSwFramePosString
@@ -529,48 +526,48 @@ ULONG lcl_GetLBRelationsForStrID( const FrmMap* _pMap,
-----------------------------------------------------------------------*/
SvxSwPosSizeTabPage::SvxSwPosSizeTabPage( Window* pParent, const SfxItemSet& rInAttrs ) :
- SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_SWPOSSIZE ), rInAttrs ),
+ SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_SWPOSSIZE ), rInAttrs ),
#ifdef _MSC_VER
#pragma warning (disable : 4355)
#endif
- m_aSizeFL( this, SVX_RES( FL_SIZE ) ),
- m_aWidthFT( this, SVX_RES( FT_WIDTH ) ),
- m_aWidthMF( this, SVX_RES( MF_WIDTH ) ),
- m_aHeightFT( this, SVX_RES( FT_HEIGHT ) ),
- m_aHeightMF( this, SVX_RES( MF_HEIGHT ) ),
- m_aKeepRatioCB(this,SVX_RES( CB_KEEPRATIO) ),
- m_aSeparatorFL(this,SVX_RES( FL_SEPARATOR) ),
-
- m_aAnchorFL( this, SVX_RES( FL_ANCHOR ) ),
- m_aToPageRB( this, SVX_RES( RB_TOPAGE ) ),
- m_aToParaRB( this, SVX_RES( RB_TOPARA ) ),
- m_aToCharRB( this, SVX_RES( RB_TOCHAR ) ),
- m_aAsCharRB( this, SVX_RES( RB_ASCHAR ) ),
- m_aToFrameRB( this, SVX_RES( RB_TOFRAME) ),
-
- m_aProtectionFL( this, SVX_RES( FL_PROTECTION ) ),
- m_aPositionCB( this, SVX_RES( CB_POSITION ) ),
- m_aSizeCB( this, SVX_RES( CB_SIZE ) ),
-
- m_aPositionFL( this, SVX_RES( FL_POSITION ) ),
- m_aHoriFT( this, SVX_RES( FT_HORI ) ),
- m_aHoriLB( this, SVX_RES( LB_HORI ) ),
- m_aHoriByFT( this, SVX_RES( FT_HORIBY ) ),
- m_aHoriByMF( this, SVX_RES( MF_HORIBY ) ),
- m_aHoriToFT( this, SVX_RES( FT_HORITO ) ),
- m_aHoriToLB( this, SVX_RES( LB_HORITO ) ),
-
- m_aHoriMirrorCB( this, SVX_RES( CB_HORIMIRROR ) ),
-
- m_aVertFT( this, SVX_RES( FT_VERT ) ),
- m_aVertLB( this, SVX_RES( LB_VERT ) ),
- m_aVertByFT( this, SVX_RES( FT_VERTBY ) ),
- m_aVertByMF( this, SVX_RES( MF_VERTBY ) ),
- m_aVertToFT( this, SVX_RES( FT_VERTTO ) ),
- m_aVertToLB( this, SVX_RES( LB_VERTTO ) ),
-
- m_aFollowCB( this, SVX_RES( CB_FOLLOW ) ),
- m_aExampleWN( this, SVX_RES( WN_EXAMPLE ) ),
+ m_aSizeFL( this, CUI_RES( FL_SIZE ) ),
+ m_aWidthFT( this, CUI_RES( FT_WIDTH ) ),
+ m_aWidthMF( this, CUI_RES( MF_WIDTH ) ),
+ m_aHeightFT( this, CUI_RES( FT_HEIGHT ) ),
+ m_aHeightMF( this, CUI_RES( MF_HEIGHT ) ),
+ m_aKeepRatioCB(this,CUI_RES( CB_KEEPRATIO) ),
+ m_aSeparatorFL(this,CUI_RES( FL_SEPARATOR) ),
+
+ m_aAnchorFL( this, CUI_RES( FL_ANCHOR ) ),
+ m_aToPageRB( this, CUI_RES( RB_TOPAGE ) ),
+ m_aToParaRB( this, CUI_RES( RB_TOPARA ) ),
+ m_aToCharRB( this, CUI_RES( RB_TOCHAR ) ),
+ m_aAsCharRB( this, CUI_RES( RB_ASCHAR ) ),
+ m_aToFrameRB( this, CUI_RES( RB_TOFRAME) ),
+
+ m_aProtectionFL( this, CUI_RES( FL_PROTECTION ) ),
+ m_aPositionCB( this, CUI_RES( CB_POSITION ) ),
+ m_aSizeCB( this, CUI_RES( CB_SIZE ) ),
+
+ m_aPositionFL( this, CUI_RES( FL_POSITION ) ),
+ m_aHoriFT( this, CUI_RES( FT_HORI ) ),
+ m_aHoriLB( this, CUI_RES( LB_HORI ) ),
+ m_aHoriByFT( this, CUI_RES( FT_HORIBY ) ),
+ m_aHoriByMF( this, CUI_RES( MF_HORIBY ) ),
+ m_aHoriToFT( this, CUI_RES( FT_HORITO ) ),
+ m_aHoriToLB( this, CUI_RES( LB_HORITO ) ),
+
+ m_aHoriMirrorCB( this, CUI_RES( CB_HORIMIRROR ) ),
+
+ m_aVertFT( this, CUI_RES( FT_VERT ) ),
+ m_aVertLB( this, CUI_RES( LB_VERT ) ),
+ m_aVertByFT( this, CUI_RES( FT_VERTBY ) ),
+ m_aVertByMF( this, CUI_RES( MF_VERTBY ) ),
+ m_aVertToFT( this, CUI_RES( FT_VERTTO ) ),
+ m_aVertToLB( this, CUI_RES( LB_VERTTO ) ),
+
+ m_aFollowCB( this, CUI_RES( CB_FOLLOW ) ),
+ m_aExampleWN( this, CUI_RES( WN_EXAMPLE ) ),
#ifdef _MSC_VER
#pragma warning (default : 4355)
#endif
diff --git a/svx/source/cui/swpossizetabpage.hrc b/cui/source/tabpages/swpossizetabpage.hrc
index af4a081cb045..af4a081cb045 100644
--- a/svx/source/cui/swpossizetabpage.hrc
+++ b/cui/source/tabpages/swpossizetabpage.hrc
diff --git a/svx/source/cui/swpossizetabpage.hxx b/cui/source/tabpages/swpossizetabpage.hxx
index e6458c27fb6c..911d72de1f48 100644
--- a/svx/source/cui/swpossizetabpage.hxx
+++ b/cui/source/tabpages/swpossizetabpage.hxx
@@ -31,13 +31,11 @@
#define _SVX_SWPOSSIZETABPAGE_HXX
#include <sfx2/tabdlg.hxx>
-#ifndef _FIXED_HXX //autogen
#include <vcl/fixed.hxx>
-#endif
#include <vcl/field.hxx>
#include <vcl/lstbox.hxx>
-#include <swframeposstrings.hxx>
-#include <swframeexample.hxx>
+#include <svx/swframeposstrings.hxx>
+#include <svx/swframeexample.hxx>
/*-- 01.03.2004 15:45:01---------------------------------------------------
SvxSwPosSizeTabPage - position and size page for Writer drawing objects
diff --git a/svx/source/cui/swpossizetabpage.src b/cui/source/tabpages/swpossizetabpage.src
index ee8bac14f688..e84893c37457 100644
--- a/svx/source/cui/swpossizetabpage.src
+++ b/cui/source/tabpages/swpossizetabpage.src
@@ -29,10 +29,9 @@
************************************************************************/
// include ------------------------------------------------------------------
#include "helpid.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "swpossizetabpage.hrc"
- // pragma -------------------------------------------------------------------
-
+#include <svx/dialogs.hrc>
// RID_SVXPAGE_POSITION_SIZE ------------------------------------------------
TabPage RID_SVXPAGE_SWPOSSIZE
diff --git a/svx/source/cui/tabarea.cxx b/cui/source/tabpages/tabarea.cxx
index 219009eb15a1..86361fe2fea5 100644
--- a/svx/source/cui/tabarea.cxx
+++ b/cui/source/tabpages/tabarea.cxx
@@ -29,43 +29,32 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
// include ---------------------------------------------------------------
#include <tools/ref.hxx>
#include <sfx2/app.hxx>
#include <sfx2/objsh.hxx>
-#ifndef _MSGBOX_HXX //autogen
#include <vcl/msgbox.hxx>
-#endif
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
#include <svx/svdmark.hxx>
#include <svx/svdobj.hxx>
#include <svx/svdview.hxx>
-
-#define _SVX_TABAREA_CXX
-
#include <svx/dialogs.hrc>
+#define _SVX_TABAREA_CXX
-
-
-
-
+#include <cuires.hrc>
#include <svx/xtable.hxx>
-#include "globl3d.hxx"
+#include "svx/globl3d.hxx"
#include <svx/svdmodel.hxx>
-#include "drawitem.hxx"
+#include "svx/drawitem.hxx"
#include "cuitabarea.hxx"
#include "tabarea.hrc"
#include "dlgname.hxx"
-#include "dlgname.hrc"
-#include <svx/dialmgr.hxx>
+//#include "dlgname.hrc"
+#include <dialmgr.hxx>
#define DLGWIN this->GetParent()->GetParent()
@@ -83,7 +72,7 @@ SvxAreaTabDialog::SvxAreaTabDialog
const SdrView* /* pSdrView */
) :
- SfxTabDialog( pParent, SVX_RES( RID_SVXDLG_AREA ), pAttr ),
+ SfxTabDialog( pParent, CUI_RES( RID_SVXDLG_AREA ), pAttr ),
mpDrawModel ( pModel ),
// mpView ( pSdrView ),
@@ -120,7 +109,7 @@ SvxAreaTabDialog::SvxAreaTabDialog
CancelButton& rBtnCancel = GetCancelButton();
rBtnCancel.SetClickHdl( LINK( this, SvxAreaTabDialog, CancelHdlImpl ) );
-//! rBtnCancel.SetText( SVX_RESSTR( RID_SVXSTR_CLOSE ) );
+//! rBtnCancel.SetText( CUI_RESSTR( RID_SVXSTR_CLOSE ) );
}
// -----------------------------------------------------------------------
diff --git a/svx/source/cui/tabarea.hrc b/cui/source/tabpages/tabarea.hrc
index c79e52d82380..c79e52d82380 100644
--- a/svx/source/cui/tabarea.hrc
+++ b/cui/source/tabpages/tabarea.hrc
diff --git a/svx/source/cui/tabarea.src b/cui/source/tabpages/tabarea.src
index 877d1c5799fd..cbb4020b6bd3 100644
--- a/svx/source/cui/tabarea.src
+++ b/cui/source/tabpages/tabarea.src
@@ -29,8 +29,9 @@
************************************************************************/
// include ---------------------------------------------------------------
#include "helpid.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "tabarea.hrc"
+#include <svx/dialogs.hrc>
#define MASKCOLOR MaskColor = Color{ Red = 0xff00 ; Green = 0x0000 ; Blue = 0xff00 ; };
diff --git a/svx/source/cui/tabline.cxx b/cui/source/tabpages/tabline.cxx
index 456842f93171..fe344770a7db 100644
--- a/svx/source/cui/tabline.cxx
+++ b/cui/source/tabpages/tabline.cxx
@@ -29,33 +29,28 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
// include ---------------------------------------------------------------
#include <tools/shl.hxx>
-#ifndef _MSGBOX_HXX //autogen
#include <vcl/msgbox.hxx>
-#endif
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
#include <sfx2/app.hxx>
#include <sfx2/objsh.hxx>
+#include <svx/dialogs.hrc>
#define _SVX_TABLINE_CXX
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "tabline.hrc"
-#include "dlgname.hrc"
+//#include "dlgname.hrc"
#include "cuitabarea.hxx"
#include "cuitabline.hxx"
#include "dlgname.hxx"
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
#include <svx/svdmodel.hxx>
#include <svx/xtable.hxx>
-#include "drawitem.hxx"
+#include "svx/drawitem.hxx"
#define DLGWIN this->GetParent()->GetParent()
@@ -78,7 +73,7 @@ SvxLineTabDialog::SvxLineTabDialog
BOOL bHasObj
) :
- SfxTabDialog ( pParent, SVX_RES( RID_SVXDLG_LINE ), pAttr ),
+ SfxTabDialog ( pParent, CUI_RES( RID_SVXDLG_LINE ), pAttr ),
pDrawModel ( pModel ),
pObj ( pSdrObj ),
rOutAttrs ( *pAttr ),
@@ -136,7 +131,7 @@ SvxLineTabDialog::SvxLineTabDialog
CancelButton& rBtnCancel = GetCancelButton();
rBtnCancel.SetClickHdl( LINK( this, SvxLineTabDialog, CancelHdlImpl ) );
-//! rBtnCancel.SetText( SVX_RESSTR( RID_SVXSTR_CLOSE ) );
+//! rBtnCancel.SetText( CUI_RESSTR( RID_SVXSTR_CLOSE ) );
}
// -----------------------------------------------------------------------
diff --git a/svx/source/cui/tabline.hrc b/cui/source/tabpages/tabline.hrc
index c1e884ad4ab3..c1e884ad4ab3 100644
--- a/svx/source/cui/tabline.hrc
+++ b/cui/source/tabpages/tabline.hrc
diff --git a/svx/source/cui/tabline.src b/cui/source/tabpages/tabline.src
index 55e50c0e78b4..ed2d308970db 100644
--- a/svx/source/cui/tabline.src
+++ b/cui/source/tabpages/tabline.src
@@ -28,9 +28,10 @@
*
************************************************************************/
// include ------------------------------------------------------------------
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "helpid.hrc"
#include "tabline.hrc"
+#include <svx/dialogs.hrc>
// Selecting LineStyle / Color / Width --------------------
diff --git a/svx/source/cui/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx
index 991e809827ea..12b6fd870419 100644
--- a/svx/source/cui/tabstpge.cxx
+++ b/cui/source/tabpages/tabstpge.cxx
@@ -29,38 +29,30 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
// include ---------------------------------------------------------------
-
#include <sfx2/app.hxx>
#include <tools/shl.hxx>
#include <svtools/ruler.hxx>
+#include <svx/dialogs.hrc>
+#include <svx/dialogs.hrc>
#define _SVX_TABSTPGE_CXX
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "tabstpge.hrc"
-
#include <svx/lrspitem.hxx>
#include "tabstpge.hxx"
-#include <svx/dialmgr.hxx>
-#include "dlgutil.hxx"
+#include <dialmgr.hxx>
+#include "svx/dlgutil.hxx"
#include <sfx2/module.hxx>
-#include <svtools/cjkoptions.hxx>
+#include <svl/cjkoptions.hxx>
#include <unotools/localedatawrapper.hxx>
-#ifndef _UNOTOOLS_PROCESSFACTORY_HXX
#include <comphelper/processfactory.hxx>
-#endif
#include <sfx2/request.hxx> //CHINA001
-#include <svx/svxids.hrc> //add CHINA001
-#include <svtools/intitem.hxx> //add CHINA001
-
+#include <svl/intitem.hxx> //add CHINA001
// class TabWin_Impl -----------------------------------------------------
@@ -115,32 +107,32 @@ void TabWin_Impl::Paint( const Rectangle& )
SvxTabulatorTabPage::SvxTabulatorTabPage( Window* pParent,
const SfxItemSet& rAttr ):
- SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_TABULATOR ), rAttr ),
-
- aTabBox ( this, SVX_RES( ED_TABPOS ) ),
- aTabLabel ( this, SVX_RES( FL_TABPOS ) ),
- aTabLabelVert ( this, SVX_RES( FL_TABPOS_VERT ) ),
- aLeftTab ( this, SVX_RES( BTN_TABTYPE_LEFT ) ),
- aRightTab ( this, SVX_RES( BTN_TABTYPE_RIGHT ) ),
- aCenterTab ( this, SVX_RES( BTN_TABTYPE_CENTER ) ),
- aDezTab ( this, SVX_RES( BTN_TABTYPE_DECIMAL ) ),
- pLeftWin ( new TabWin_Impl( this, SVX_RES( WIN_TABLEFT ), (USHORT)(RULER_TAB_LEFT|WB_HORZ) ) ),
- pRightWin ( new TabWin_Impl( this, SVX_RES( WIN_TABRIGHT ), (USHORT)(RULER_TAB_RIGHT|WB_HORZ) ) ),
- pCenterWin ( new TabWin_Impl( this, SVX_RES( WIN_TABCENTER ), (USHORT)(RULER_TAB_CENTER|WB_HORZ) ) ),
- pDezWin ( new TabWin_Impl( this, SVX_RES( WIN_TABDECIMAL ), (USHORT)(RULER_TAB_DECIMAL|WB_HORZ) ) ),
- aDezCharLabel ( this, SVX_RES( FT_TABTYPE_DECCHAR ) ),
- aDezChar ( this, SVX_RES( ED_TABTYPE_DECCHAR ) ),
- aTabTypeLabel ( this, SVX_RES( FL_TABTYPE ) ),
- aNoFillChar ( this, SVX_RES( BTN_FILLCHAR_NO ) ),
- aFillPoints ( this, SVX_RES( BTN_FILLCHAR_POINTS ) ),
- aFillDashLine ( this, SVX_RES( BTN_FILLCHAR_DASHLINE ) ),
- aFillSolidLine ( this, SVX_RES( BTN_FILLCHAR_UNDERSCORE ) ),
- aFillSpecial ( this, SVX_RES( BTN_FILLCHAR_OTHER ) ),
- aFillChar ( this, SVX_RES( ED_FILLCHAR_OTHER ) ),
- aFillLabel ( this, SVX_RES( FL_FILLCHAR ) ),
- aNewBtn ( this, SVX_RES( BTN_NEW ) ),
- aDelAllBtn ( this, SVX_RES( BTN_DELALL ) ),
- aDelBtn ( this, SVX_RES( BTN_DEL ) ),
+ SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_TABULATOR ), rAttr ),
+
+ aTabBox ( this, CUI_RES( ED_TABPOS ) ),
+ aTabLabel ( this, CUI_RES( FL_TABPOS ) ),
+ aTabLabelVert ( this, CUI_RES( FL_TABPOS_VERT ) ),
+ aLeftTab ( this, CUI_RES( BTN_TABTYPE_LEFT ) ),
+ aRightTab ( this, CUI_RES( BTN_TABTYPE_RIGHT ) ),
+ aCenterTab ( this, CUI_RES( BTN_TABTYPE_CENTER ) ),
+ aDezTab ( this, CUI_RES( BTN_TABTYPE_DECIMAL ) ),
+ pLeftWin ( new TabWin_Impl( this, CUI_RES( WIN_TABLEFT ), (USHORT)(RULER_TAB_LEFT|WB_HORZ) ) ),
+ pRightWin ( new TabWin_Impl( this, CUI_RES( WIN_TABRIGHT ), (USHORT)(RULER_TAB_RIGHT|WB_HORZ) ) ),
+ pCenterWin ( new TabWin_Impl( this, CUI_RES( WIN_TABCENTER ), (USHORT)(RULER_TAB_CENTER|WB_HORZ) ) ),
+ pDezWin ( new TabWin_Impl( this, CUI_RES( WIN_TABDECIMAL ), (USHORT)(RULER_TAB_DECIMAL|WB_HORZ) ) ),
+ aDezCharLabel ( this, CUI_RES( FT_TABTYPE_DECCHAR ) ),
+ aDezChar ( this, CUI_RES( ED_TABTYPE_DECCHAR ) ),
+ aTabTypeLabel ( this, CUI_RES( FL_TABTYPE ) ),
+ aNoFillChar ( this, CUI_RES( BTN_FILLCHAR_NO ) ),
+ aFillPoints ( this, CUI_RES( BTN_FILLCHAR_POINTS ) ),
+ aFillDashLine ( this, CUI_RES( BTN_FILLCHAR_DASHLINE ) ),
+ aFillSolidLine ( this, CUI_RES( BTN_FILLCHAR_UNDERSCORE ) ),
+ aFillSpecial ( this, CUI_RES( BTN_FILLCHAR_OTHER ) ),
+ aFillChar ( this, CUI_RES( ED_FILLCHAR_OTHER ) ),
+ aFillLabel ( this, CUI_RES( FL_FILLCHAR ) ),
+ aNewBtn ( this, CUI_RES( BTN_NEW ) ),
+ aDelAllBtn ( this, CUI_RES( BTN_DELALL ) ),
+ aDelBtn ( this, CUI_RES( BTN_DEL ) ),
aAktTab ( 0 ),
aNewTabs ( 0, 0, SVX_TAB_ADJUST_LEFT, GetWhich( SID_ATTR_TABSTOP ) ),
@@ -152,8 +144,8 @@ SvxTabulatorTabPage::SvxTabulatorTabPage( Window* pParent,
SvtCJKOptions aCJKOptions;
if(aCJKOptions.IsAsianTypographyEnabled())
{
- aLeftTab .SetText(String(SVX_RES( ST_LEFTTAB_ASIAN )));
- aRightTab .SetText(String(SVX_RES( ST_RIGHTTAB_ASIAN )));
+ aLeftTab .SetText(String(CUI_RES( ST_LEFTTAB_ASIAN )));
+ aRightTab .SetText(String(CUI_RES( ST_RIGHTTAB_ASIAN )));
}
// diese Page braucht ExchangeSupport
diff --git a/svx/source/cui/tabstpge.hrc b/cui/source/tabpages/tabstpge.hrc
index 60752fa70109..60752fa70109 100644
--- a/svx/source/cui/tabstpge.hrc
+++ b/cui/source/tabpages/tabstpge.hrc
diff --git a/svx/source/cui/tabstpge.src b/cui/source/tabpages/tabstpge.src
index 2b3649ef968f..b314e0ef53fb 100644
--- a/svx/source/cui/tabstpge.src
+++ b/cui/source/tabpages/tabstpge.src
@@ -29,9 +29,9 @@
************************************************************************/
// include ---------------------------------------------------------------
#include "helpid.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "tabstpge.hrc"
- // pragma ----------------------------------------------------------------
+#include <svx/dialogs.hrc>
// RID_SVXPAGE_TABULATOR -------------------------------------------------
TabPage RID_SVXPAGE_TABULATOR
diff --git a/svx/source/cui/textanim.cxx b/cui/source/tabpages/textanim.cxx
index 6251d4c970e1..3c7bdbcd4653 100644
--- a/svx/source/cui/textanim.cxx
+++ b/cui/source/tabpages/textanim.cxx
@@ -29,17 +29,14 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
// include ---------------------------------------------------------------
#include <sfx2/app.hxx>
#include <sfx2/module.hxx>
#include <tools/shl.hxx>
+#include <cuires.hrc>
#include <svx/dialogs.hrc>
#ifndef _SVX_TEXTANIM_CXX
@@ -48,8 +45,8 @@
#include "textanim.hxx"
#include "textanim.hrc"
#include "textattr.hxx"
-#include <svx/dialmgr.hxx>
-#include "dlgutil.hxx"
+#include <dialmgr.hxx>
+#include "svx/dlgutil.hxx"
static USHORT pRanges[] =
{
@@ -67,7 +64,7 @@ static USHORT pRanges[] =
__EXPORT SvxTextTabDialog::SvxTextTabDialog( Window* pParent,
const SfxItemSet* pAttr,
const SdrView* pSdrView ) :
- SfxTabDialog ( pParent, SVX_RES( RID_SVXDLG_TEXT ), pAttr ),
+ SfxTabDialog ( pParent, CUI_RES( RID_SVXDLG_TEXT ), pAttr ),
rOutAttrs ( *pAttr ),
pView ( pSdrView )
{
@@ -110,33 +107,33 @@ void __EXPORT SvxTextTabDialog::PageCreated( USHORT nId, SfxTabPage &rPage )
\************************************************************************/
SvxTextAnimationPage::SvxTextAnimationPage( Window* pWindow, const SfxItemSet& rInAttrs ) :
- SfxTabPage ( pWindow, SVX_RES( RID_SVXPAGE_TEXTANIMATION ),
+ SfxTabPage ( pWindow, CUI_RES( RID_SVXPAGE_TEXTANIMATION ),
rInAttrs ),
- aFlEffect ( this, SVX_RES(FL_EFFECT)),
- aFtEffects ( this, SVX_RES(FT_EFFECTS)),
- aLbEffect ( this, SVX_RES( LB_EFFECT ) ),
- //aCtlEffect ( this, SVX_RES( CTL_EFFECT ) ),
- aFtDirection ( this, SVX_RES(FT_DIRECTION) ),
- aBtnUp ( this, SVX_RES( BTN_UP ) ),
- aBtnLeft ( this, SVX_RES( BTN_LEFT ) ),
- aBtnRight ( this, SVX_RES( BTN_RIGHT ) ),
- aBtnDown ( this, SVX_RES( BTN_DOWN ) ),
-
- aFlProperties ( this, SVX_RES(FL_PROPERTIES)),
- aTsbStartInside ( this, SVX_RES( TSB_START_INSIDE ) ),
- aTsbStopInside ( this, SVX_RES( TSB_STOP_INSIDE ) ),
-
- aFtCount ( this, SVX_RES(FT_COUNT)),
- aTsbEndless ( this, SVX_RES( TSB_ENDLESS ) ),
- aNumFldCount ( this, SVX_RES( NUM_FLD_COUNT ) ),
-
- aFtAmount ( this, SVX_RES(FT_AMOUNT)),
- aTsbPixel ( this, SVX_RES( TSB_PIXEL ) ),
- aMtrFldAmount ( this, SVX_RES( MTR_FLD_AMOUNT ) ),
-
- aFtDelay ( this, SVX_RES(FT_DELAY)),
- aTsbAuto ( this, SVX_RES( TSB_AUTO ) ),
- aMtrFldDelay ( this, SVX_RES( MTR_FLD_DELAY ) ),
+ aFlEffect ( this, CUI_RES(FL_EFFECT)),
+ aFtEffects ( this, CUI_RES(FT_EFFECTS)),
+ aLbEffect ( this, CUI_RES( LB_EFFECT ) ),
+ //aCtlEffect ( this, CUI_RES( CTL_EFFECT ) ),
+ aFtDirection ( this, CUI_RES(FT_DIRECTION) ),
+ aBtnUp ( this, CUI_RES( BTN_UP ) ),
+ aBtnLeft ( this, CUI_RES( BTN_LEFT ) ),
+ aBtnRight ( this, CUI_RES( BTN_RIGHT ) ),
+ aBtnDown ( this, CUI_RES( BTN_DOWN ) ),
+
+ aFlProperties ( this, CUI_RES(FL_PROPERTIES)),
+ aTsbStartInside ( this, CUI_RES( TSB_START_INSIDE ) ),
+ aTsbStopInside ( this, CUI_RES( TSB_STOP_INSIDE ) ),
+
+ aFtCount ( this, CUI_RES(FT_COUNT)),
+ aTsbEndless ( this, CUI_RES( TSB_ENDLESS ) ),
+ aNumFldCount ( this, CUI_RES( NUM_FLD_COUNT ) ),
+
+ aFtAmount ( this, CUI_RES(FT_AMOUNT)),
+ aTsbPixel ( this, CUI_RES( TSB_PIXEL ) ),
+ aMtrFldAmount ( this, CUI_RES( MTR_FLD_AMOUNT ) ),
+
+ aFtDelay ( this, CUI_RES(FT_DELAY)),
+ aTsbAuto ( this, CUI_RES( TSB_AUTO ) ),
+ aMtrFldDelay ( this, CUI_RES( MTR_FLD_DELAY ) ),
rOutAttrs ( rInAttrs ),
eAniKind ( SDRTEXTANI_NONE )
diff --git a/svx/source/cui/textanim.hrc b/cui/source/tabpages/textanim.hrc
index 97d6b7c64525..97d6b7c64525 100644
--- a/svx/source/cui/textanim.hrc
+++ b/cui/source/tabpages/textanim.hrc
diff --git a/svx/source/cui/textanim.src b/cui/source/tabpages/textanim.src
index d9c211a020f5..851096104479 100644
--- a/svx/source/cui/textanim.src
+++ b/cui/source/tabpages/textanim.src
@@ -30,8 +30,9 @@
// pragma ----------------------------------------------------------------
#include <svtools/controldims.hrc>
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "textanim.hrc"
+#include <svx/dialogs.hrc>
// direction image buttons
#define MA_HALFBUTTON_WIDTH 7
diff --git a/svx/source/cui/textattr.cxx b/cui/source/tabpages/textattr.cxx
index a7eb3069026a..6c81356cb334 100644
--- a/svx/source/cui/textattr.cxx
+++ b/cui/source/tabpages/textattr.cxx
@@ -29,18 +29,13 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
// include ---------------------------------------------------------------
#include <sfx2/app.hxx>
#include <sfx2/module.hxx>
#include <tools/shl.hxx>
-
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include <svx/svddef.hxx>
#include <svx/sdtditm.hxx>
#include <svx/sdtagitm.hxx>
@@ -51,18 +46,17 @@
#include <svx/svdmark.hxx>
#include <svx/svdview.hxx>
#include <svx/svdotext.hxx>
-
+#include <svx/dialogs.hrc>
#ifndef _SVX_TEXTATTR_CXX
#define _SVX_TEXTATTR_CXX
#endif
#include "textattr.hxx"
#include "textattr.hrc"
-#include <svx/dialmgr.hxx>
-#include "dlgutil.hxx"
+#include <dialmgr.hxx>
+#include "svx/dlgutil.hxx"
#include <sfx2/request.hxx> //add CHINA001
-#include <ofaitem.hxx> //add CHINA001
-#include <svx/svxids.hrc> //add CHINA001
+#include <svx/ofaitem.hxx> //add CHINA001
#include <svx/writingmodeitem.hxx>
static USHORT pRanges[] =
@@ -108,32 +102,32 @@ static USHORT pRanges[] =
\************************************************************************/
SvxTextAttrPage::SvxTextAttrPage( Window* pWindow, const SfxItemSet& rInAttrs ) :
- SvxTabPage ( pWindow, SVX_RES( RID_SVXPAGE_TEXTATTR ),
+ SvxTabPage ( pWindow, CUI_RES( RID_SVXPAGE_TEXTATTR ),
rInAttrs ),
- aFlText ( this, SVX_RES( FL_TEXT ) ),
- aTsbAutoGrowWidth ( this, SVX_RES( TSB_AUTOGROW_WIDTH ) ),
- aTsbAutoGrowHeight ( this, SVX_RES( TSB_AUTOGROW_HEIGHT ) ),
- aTsbFitToSize ( this, SVX_RES( TSB_FIT_TO_SIZE ) ),
- aTsbContour ( this, SVX_RES( TSB_CONTOUR ) ),
- aTsbWordWrapText( this, SVX_RES( TSB_WORDWRAP_TEXT ) ),
- aTsbAutoGrowSize( this, SVX_RES( TSB_AUTOGROW_SIZE ) ),
- aFlDistance ( this, SVX_RES( FL_DISTANCE ) ),
- aFtLeft ( this, SVX_RES( FT_LEFT ) ),
- aMtrFldLeft ( this, SVX_RES( MTR_FLD_LEFT ) ),
- aFtRight ( this, SVX_RES( FT_RIGHT ) ),
- aMtrFldRight ( this, SVX_RES( MTR_FLD_RIGHT ) ),
- aFtTop ( this, SVX_RES( FT_TOP ) ),
- aMtrFldTop ( this, SVX_RES( MTR_FLD_TOP ) ),
- aFtBottom ( this, SVX_RES( FT_BOTTOM ) ),
- aMtrFldBottom ( this, SVX_RES( MTR_FLD_BOTTOM ) ),
-
- aFlSeparator ( this, SVX_RES( FL_SEPARATOR ) ),
-
- aFlPosition ( this, SVX_RES( FL_POSITION ) ),
- aCtlPosition ( this, SVX_RES( CTL_POSITION ),
+ aFlText ( this, CUI_RES( FL_TEXT ) ),
+ aTsbAutoGrowWidth ( this, CUI_RES( TSB_AUTOGROW_WIDTH ) ),
+ aTsbAutoGrowHeight ( this, CUI_RES( TSB_AUTOGROW_HEIGHT ) ),
+ aTsbFitToSize ( this, CUI_RES( TSB_FIT_TO_SIZE ) ),
+ aTsbContour ( this, CUI_RES( TSB_CONTOUR ) ),
+ aTsbWordWrapText( this, CUI_RES( TSB_WORDWRAP_TEXT ) ),
+ aTsbAutoGrowSize( this, CUI_RES( TSB_AUTOGROW_SIZE ) ),
+ aFlDistance ( this, CUI_RES( FL_DISTANCE ) ),
+ aFtLeft ( this, CUI_RES( FT_LEFT ) ),
+ aMtrFldLeft ( this, CUI_RES( MTR_FLD_LEFT ) ),
+ aFtRight ( this, CUI_RES( FT_RIGHT ) ),
+ aMtrFldRight ( this, CUI_RES( MTR_FLD_RIGHT ) ),
+ aFtTop ( this, CUI_RES( FT_TOP ) ),
+ aMtrFldTop ( this, CUI_RES( MTR_FLD_TOP ) ),
+ aFtBottom ( this, CUI_RES( FT_BOTTOM ) ),
+ aMtrFldBottom ( this, CUI_RES( MTR_FLD_BOTTOM ) ),
+
+ aFlSeparator ( this, CUI_RES( FL_SEPARATOR ) ),
+
+ aFlPosition ( this, CUI_RES( FL_POSITION ) ),
+ aCtlPosition ( this, CUI_RES( CTL_POSITION ),
RP_MM, 240, 100 ),
- aTsbFullWidth ( this, SVX_RES( TSB_FULL_WIDTH ) ),
+ aTsbFullWidth ( this, CUI_RES( TSB_FULL_WIDTH ) ),
rOutAttrs ( rInAttrs )
{
diff --git a/svx/source/cui/textattr.hrc b/cui/source/tabpages/textattr.hrc
index 5abc50f04250..5abc50f04250 100644
--- a/svx/source/cui/textattr.hrc
+++ b/cui/source/tabpages/textattr.hrc
diff --git a/svx/source/cui/textattr.src b/cui/source/tabpages/textattr.src
index d0d22044bb51..c5636d15cbfa 100644
--- a/svx/source/cui/textattr.src
+++ b/cui/source/tabpages/textattr.src
@@ -29,10 +29,10 @@
************************************************************************/
// include ---------------------------------------------------------------
#include <svtools/controldims.hrc>
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "textattr.hrc"
#include "helpid.hrc"
- // pragma ----------------------------------------------------------------
+#include <svx/dialogs.hrc>
// RID_SVXPAGE_TEXTATTR --------------------------------------------------
TabPage RID_SVXPAGE_TEXTATTR
diff --git a/svx/source/cui/tparea.cxx b/cui/source/tabpages/tparea.cxx
index 720de9cb00ef..ddeb02a20c1d 100644
--- a/svx/source/cui/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -29,17 +29,14 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
// include ---------------------------------------------------------------
#include <tools/shl.hxx>
#include <tools/urlobj.hxx>
#include <sfx2/app.hxx>
#include <sfx2/module.hxx>
+#include <svx/dialogs.hrc>
#define _SVX_TPAREA_CXX
@@ -47,21 +44,21 @@
#include <stdlib.h>
#endif
-#include "xattr.hxx"
+#include "svx/xattr.hxx"
#include <svx/xpool.hxx>
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "tabarea.hrc"
-#include "dlgname.hrc"
+//#include "dlgname.hrc"
#include <svx/xflbckit.hxx>
#include <svx/svdattr.hxx>
#include <svx/xtable.hxx>
#include <svx/xlineit0.hxx>
-#include "drawitem.hxx"
+#include "svx/drawitem.hxx"
#include "cuitabarea.hxx"
#include "dlgname.hxx"
-#include <svx/dialmgr.hxx>
-#include "dlgutil.hxx"
-#include <svtools/intitem.hxx> //add CHINA001
+#include <dialmgr.hxx>
+#include "svx/dlgutil.hxx"
+#include <svl/intitem.hxx> //add CHINA001
#include <sfx2/request.hxx>//add CHINA001
#define DLGWIN this->GetParent()->GetParent()
@@ -258,35 +255,35 @@ void SvxTransparenceTabPage::SetControlState_Impl(XGradientStyle eXGS)
}
SvxTransparenceTabPage::SvxTransparenceTabPage(Window* pParent, const SfxItemSet& rInAttrs)
-: SvxTabPage ( pParent, SVX_RES( RID_SVXPAGE_TRANSPARENCE ), rInAttrs),
+: SvxTabPage ( pParent, CUI_RES( RID_SVXPAGE_TRANSPARENCE ), rInAttrs),
rOutAttrs ( rInAttrs ),
nPageType(0),
nDlgType(0),
- aFlProp ( this, SVX_RES( FL_PROP ) ),
- aRbtTransOff ( this, SVX_RES( RBT_TRANS_OFF ) ),
- aRbtTransLinear ( this, SVX_RES( RBT_TRANS_LINEAR ) ),
- aRbtTransGradient ( this, SVX_RES( RBT_TRANS_GRADIENT ) ),
-
- aMtrTransparent ( this, SVX_RES( MTR_TRANSPARENT ) ),
-
- aFtTrgrType ( this, SVX_RES( FT_TRGR_TYPE ) ),
- aLbTrgrGradientType ( this, SVX_RES( LB_TRGR_GRADIENT_TYPES ) ),
- aFtTrgrCenterX ( this, SVX_RES( FT_TRGR_CENTER_X ) ),
- aMtrTrgrCenterX ( this, SVX_RES( MTR_TRGR_CENTER_X ) ),
- aFtTrgrCenterY ( this, SVX_RES( FT_TRGR_CENTER_Y ) ),
- aMtrTrgrCenterY ( this, SVX_RES( MTR_TRGR_CENTER_Y ) ),
- aFtTrgrAngle ( this, SVX_RES( FT_TRGR_ANGLE ) ),
- aMtrTrgrAngle ( this, SVX_RES( MTR_TRGR_ANGLE ) ),
- aFtTrgrBorder ( this, SVX_RES( FT_TRGR_BORDER ) ),
- aMtrTrgrBorder ( this, SVX_RES( MTR_TRGR_BORDER ) ),
- aFtTrgrStartValue ( this, SVX_RES( FT_TRGR_START_VALUE ) ),
- aMtrTrgrStartValue ( this, SVX_RES( MTR_TRGR_START_VALUE ) ),
- aFtTrgrEndValue ( this, SVX_RES( FT_TRGR_END_VALUE ) ),
- aMtrTrgrEndValue ( this, SVX_RES( MTR_TRGR_END_VALUE ) ),
-
- aCtlBitmapPreview ( this, SVX_RES( CTL_BITMAP_PREVIEW ) ),
- aCtlXRectPreview ( this, SVX_RES( CTL_TRANS_PREVIEW ) ),
+ aFlProp ( this, CUI_RES( FL_PROP ) ),
+ aRbtTransOff ( this, CUI_RES( RBT_TRANS_OFF ) ),
+ aRbtTransLinear ( this, CUI_RES( RBT_TRANS_LINEAR ) ),
+ aRbtTransGradient ( this, CUI_RES( RBT_TRANS_GRADIENT ) ),
+
+ aMtrTransparent ( this, CUI_RES( MTR_TRANSPARENT ) ),
+
+ aFtTrgrType ( this, CUI_RES( FT_TRGR_TYPE ) ),
+ aLbTrgrGradientType ( this, CUI_RES( LB_TRGR_GRADIENT_TYPES ) ),
+ aFtTrgrCenterX ( this, CUI_RES( FT_TRGR_CENTER_X ) ),
+ aMtrTrgrCenterX ( this, CUI_RES( MTR_TRGR_CENTER_X ) ),
+ aFtTrgrCenterY ( this, CUI_RES( FT_TRGR_CENTER_Y ) ),
+ aMtrTrgrCenterY ( this, CUI_RES( MTR_TRGR_CENTER_Y ) ),
+ aFtTrgrAngle ( this, CUI_RES( FT_TRGR_ANGLE ) ),
+ aMtrTrgrAngle ( this, CUI_RES( MTR_TRGR_ANGLE ) ),
+ aFtTrgrBorder ( this, CUI_RES( FT_TRGR_BORDER ) ),
+ aMtrTrgrBorder ( this, CUI_RES( MTR_TRGR_BORDER ) ),
+ aFtTrgrStartValue ( this, CUI_RES( FT_TRGR_START_VALUE ) ),
+ aMtrTrgrStartValue ( this, CUI_RES( MTR_TRGR_START_VALUE ) ),
+ aFtTrgrEndValue ( this, CUI_RES( FT_TRGR_END_VALUE ) ),
+ aMtrTrgrEndValue ( this, CUI_RES( MTR_TRGR_END_VALUE ) ),
+
+ aCtlBitmapPreview ( this, CUI_RES( CTL_BITMAP_PREVIEW ) ),
+ aCtlXRectPreview ( this, CUI_RES( CTL_TRANS_PREVIEW ) ),
bBitmap ( FALSE ),
pXPool ( (XOutdevItemPool*) rInAttrs.GetPool() ),
aXFillAttr ( pXPool ),
@@ -623,45 +620,45 @@ void SvxTransparenceTabPage::PageCreated (SfxAllItemSet aSet) //add CHINA001
SvxAreaTabPage::SvxAreaTabPage( Window* pParent, const SfxItemSet& rInAttrs ) :
- SvxTabPage ( pParent, SVX_RES( RID_SVXPAGE_AREA ), rInAttrs ),
-
- aFlProp ( this, SVX_RES( FL_PROP ) ),
- aTypeLB ( this, SVX_RES( LB_AREA_TYPE ) ),
-
- aLbColor ( this, SVX_RES( LB_COLOR ) ),
- aLbGradient ( this, SVX_RES( LB_GRADIENT ) ),
- aLbHatching ( this, SVX_RES( LB_HATCHING ) ),
- aLbBitmap ( this, SVX_RES( LB_BITMAP ) ),
- aCtlBitmapPreview ( this, SVX_RES( CTL_BITMAP_PREVIEW ) ),
-
- aTsbStepCount ( this, SVX_RES( TSB_STEPCOUNT ) ),
- aFlStepCount ( this, SVX_RES( FL_STEPCOUNT ) ),
- aNumFldStepCount ( this, SVX_RES( NUM_FLD_STEPCOUNT ) ),
-
- aCbxHatchBckgrd ( this, SVX_RES( CB_HATCHBCKGRD ) ),
- aLbHatchBckgrdColor ( this, SVX_RES( LB_HATCHBCKGRDCOLOR ) ),
-
- aFlSize ( this, SVX_RES( FL_SIZE ) ),
- aTsbOriginal ( this, SVX_RES( TSB_ORIGINAL ) ),
- aTsbScale ( this, SVX_RES( TSB_SCALE ) ),
- aFtXSize ( this, SVX_RES( FT_X_SIZE ) ),
- aMtrFldXSize ( this, SVX_RES( MTR_FLD_X_SIZE ) ),
- aFtYSize ( this, SVX_RES( FT_Y_SIZE ) ),
- aMtrFldYSize ( this, SVX_RES( MTR_FLD_Y_SIZE ) ),
- aFlPosition ( this, SVX_RES( FL_POSITION ) ),
- aCtlPosition ( this, SVX_RES( CTL_POSITION ), RP_RM, 110, 80, CS_RECT ),
- aFtXOffset ( this, SVX_RES( FT_X_OFFSET ) ),
- aMtrFldXOffset ( this, SVX_RES( MTR_FLD_X_OFFSET ) ),
- aFtYOffset ( this, SVX_RES( FT_Y_OFFSET ) ),
- aMtrFldYOffset ( this, SVX_RES( MTR_FLD_Y_OFFSET ) ),
- aTsbTile ( this, SVX_RES( TSB_TILE ) ),
- aTsbStretch ( this, SVX_RES( TSB_STRETCH ) ),
- aFlOffset ( this, SVX_RES( FL_OFFSET ) ),
- aRbtRow ( this, SVX_RES( RBT_ROW ) ),
- aRbtColumn ( this, SVX_RES( RBT_COLUMN ) ),
- aMtrFldOffset ( this, SVX_RES( MTR_FLD_OFFSET ) ),
-
- aCtlXRectPreview ( this, SVX_RES( CTL_COLOR_PREVIEW ) ),
+ SvxTabPage ( pParent, CUI_RES( RID_SVXPAGE_AREA ), rInAttrs ),
+
+ aFlProp ( this, CUI_RES( FL_PROP ) ),
+ aTypeLB ( this, CUI_RES( LB_AREA_TYPE ) ),
+
+ aLbColor ( this, CUI_RES( LB_COLOR ) ),
+ aLbGradient ( this, CUI_RES( LB_GRADIENT ) ),
+ aLbHatching ( this, CUI_RES( LB_HATCHING ) ),
+ aLbBitmap ( this, CUI_RES( LB_BITMAP ) ),
+ aCtlBitmapPreview ( this, CUI_RES( CTL_BITMAP_PREVIEW ) ),
+
+ aTsbStepCount ( this, CUI_RES( TSB_STEPCOUNT ) ),
+ aFlStepCount ( this, CUI_RES( FL_STEPCOUNT ) ),
+ aNumFldStepCount ( this, CUI_RES( NUM_FLD_STEPCOUNT ) ),
+
+ aCbxHatchBckgrd ( this, CUI_RES( CB_HATCHBCKGRD ) ),
+ aLbHatchBckgrdColor ( this, CUI_RES( LB_HATCHBCKGRDCOLOR ) ),
+
+ aFlSize ( this, CUI_RES( FL_SIZE ) ),
+ aTsbOriginal ( this, CUI_RES( TSB_ORIGINAL ) ),
+ aTsbScale ( this, CUI_RES( TSB_SCALE ) ),
+ aFtXSize ( this, CUI_RES( FT_X_SIZE ) ),
+ aMtrFldXSize ( this, CUI_RES( MTR_FLD_X_SIZE ) ),
+ aFtYSize ( this, CUI_RES( FT_Y_SIZE ) ),
+ aMtrFldYSize ( this, CUI_RES( MTR_FLD_Y_SIZE ) ),
+ aFlPosition ( this, CUI_RES( FL_POSITION ) ),
+ aCtlPosition ( this, CUI_RES( CTL_POSITION ), RP_RM, 110, 80, CS_RECT ),
+ aFtXOffset ( this, CUI_RES( FT_X_OFFSET ) ),
+ aMtrFldXOffset ( this, CUI_RES( MTR_FLD_X_OFFSET ) ),
+ aFtYOffset ( this, CUI_RES( FT_Y_OFFSET ) ),
+ aMtrFldYOffset ( this, CUI_RES( MTR_FLD_Y_OFFSET ) ),
+ aTsbTile ( this, CUI_RES( TSB_TILE ) ),
+ aTsbStretch ( this, CUI_RES( TSB_STRETCH ) ),
+ aFlOffset ( this, CUI_RES( FL_OFFSET ) ),
+ aRbtRow ( this, CUI_RES( RBT_ROW ) ),
+ aRbtColumn ( this, CUI_RES( RBT_COLUMN ) ),
+ aMtrFldOffset ( this, CUI_RES( MTR_FLD_OFFSET ) ),
+
+ aCtlXRectPreview ( this, CUI_RES( CTL_COLOR_PREVIEW ) ),
rOutAttrs ( rInAttrs ),
@@ -1861,7 +1858,7 @@ IMPL_LINK( SvxAreaTabPage, ClickColorHdl_Impl, void *, EMPTYARG )
aLbHatchBckgrdColor.Hide();
// Text der Tabelle setzen
- String aString( SVX_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
+ String aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
INetURLObject aURL( pColorTab->GetPath() );
aURL.Append( pColorTab->GetName() );
@@ -1951,7 +1948,7 @@ IMPL_LINK( SvxAreaTabPage, ClickGradientHdl_Impl, void *, EMPTYARG )
aLbHatchBckgrdColor.Hide();
// Text der Tabelle setzen
- String aString( SVX_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
+ String aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
INetURLObject aURL( pGradientList->GetPath() );
aURL.Append( pGradientList->GetName() );
@@ -2046,7 +2043,7 @@ IMPL_LINK( SvxAreaTabPage, ClickHatchingHdl_Impl, void *, EMPTYARG )
aLbHatchBckgrdColor.Enable();
// Text der Tabelle setzen
- String aString( SVX_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
+ String aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
INetURLObject aURL( pHatchingList->GetPath() );
aURL.Append( pHatchingList->GetName() );
@@ -2214,7 +2211,7 @@ IMPL_LINK( SvxAreaTabPage, ClickBitmapHdl_Impl, void *, EMPTYARG )
aFlOffset.Show();
// Text der Tabelle setzen
- String aString( SVX_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
+ String aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
INetURLObject aURL( pBitmapList->GetPath() );
aURL.Append( pBitmapList->GetName() );
diff --git a/svx/source/cui/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index 47a516e65f3b..f34afb49a823 100644
--- a/svx/source/cui/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -29,11 +29,7 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
// include ---------------------------------------------------------------
@@ -52,35 +48,32 @@
#include <tools/shl.hxx>
#include <vcl/msgbox.hxx>
#include <tools/urlobj.hxx>
-#ifndef _UNOTOOLS_UCBSTREAMHELPER_HXX
#include <unotools/ucbstreamhelper.hxx>
-#endif
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
#include <sfx2/app.hxx>
#include <sfx2/filedlghelper.hxx>
#include <unotools/localfilehelper.hxx>
#include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
+#include <svx/dialmgr.hxx>
#include <vcl/bmpacc.hxx>
+#include <svx/dialogs.hrc>
#define _SVX_TPBITMAP_CXX
-
-
-#include <svx/dialogs.hrc>
-
+#include <cuires.hrc>
#include "helpid.hrc"
-#include "xattr.hxx"
+#include "svx/xattr.hxx"
#include <svx/xpool.hxx>
#include <svx/xtable.hxx>
-#include "xoutbmp.hxx"
-#include "drawitem.hxx"
+#include "svx/xoutbmp.hxx"
+#include "svx/drawitem.hxx"
#include "cuitabarea.hxx"
#include "tabarea.hrc"
#include "defdlgname.hxx" //CHINA001 #include "dlgname.hxx"
-#include "dlgname.hrc"
+//#include "dlgname.hrc"
#include <svx/svxdlg.hxx> //CHINA001
-#include <svx/dialmgr.hxx>
-#include "opengrf.hxx"
+#include <dialmgr.hxx>
+#include "svx/opengrf.hxx"
#define DLGWIN this->GetParent()->GetParent()
@@ -96,26 +89,26 @@ SvxBitmapTabPage::SvxBitmapTabPage
const SfxItemSet& rInAttrs
) :
- SvxTabPage ( pParent, SVX_RES( RID_SVXPAGE_BITMAP ), rInAttrs ),
+ SvxTabPage ( pParent, CUI_RES( RID_SVXPAGE_BITMAP ), rInAttrs ),
- aCtlPixel ( this, SVX_RES( CTL_PIXEL ) ),
- aFtPixelEdit ( this, SVX_RES( FT_PIXEL_EDIT ) ),
- aFtColor ( this, SVX_RES( FT_COLOR ) ),
- aLbColor ( this, SVX_RES( LB_COLOR ) ),
- aFtBackgroundColor ( this, SVX_RES( FT_BACKGROUND_COLOR ) ),
- aLbBackgroundColor ( this, SVX_RES( LB_BACKGROUND_COLOR ) ),
+ aCtlPixel ( this, CUI_RES( CTL_PIXEL ) ),
+ aFtPixelEdit ( this, CUI_RES( FT_PIXEL_EDIT ) ),
+ aFtColor ( this, CUI_RES( FT_COLOR ) ),
+ aLbColor ( this, CUI_RES( LB_COLOR ) ),
+ aFtBackgroundColor ( this, CUI_RES( FT_BACKGROUND_COLOR ) ),
+ aLbBackgroundColor ( this, CUI_RES( LB_BACKGROUND_COLOR ) ),
// This fix text is used only to provide the name for the following
// bitmap list box. The fixed text is not displayed.
- aLbBitmapsHidden ( this, SVX_RES( FT_BITMAPS_HIDDEN ) ),
- aLbBitmaps ( this, SVX_RES( LB_BITMAPS ) ),
- aFlProp ( this, SVX_RES( FL_PROP ) ),
- aCtlPreview ( this, SVX_RES( CTL_PREVIEW ) ),
- aBtnAdd ( this, SVX_RES( BTN_ADD ) ),
- aBtnModify ( this, SVX_RES( BTN_MODIFY ) ),
- aBtnImport ( this, SVX_RES( BTN_IMPORT ) ),
- aBtnDelete ( this, SVX_RES( BTN_DELETE ) ),
- aBtnLoad ( this, SVX_RES( BTN_LOAD ) ),
- aBtnSave ( this, SVX_RES( BTN_SAVE ) ),
+ aLbBitmapsHidden ( this, CUI_RES( FT_BITMAPS_HIDDEN ) ),
+ aLbBitmaps ( this, CUI_RES( LB_BITMAPS ) ),
+ aFlProp ( this, CUI_RES( FL_PROP ) ),
+ aCtlPreview ( this, CUI_RES( CTL_PREVIEW ) ),
+ aBtnAdd ( this, CUI_RES( BTN_ADD ) ),
+ aBtnModify ( this, CUI_RES( BTN_MODIFY ) ),
+ aBtnImport ( this, CUI_RES( BTN_IMPORT ) ),
+ aBtnDelete ( this, CUI_RES( BTN_DELETE ) ),
+ aBtnLoad ( this, CUI_RES( BTN_LOAD ) ),
+ aBtnSave ( this, CUI_RES( BTN_SAVE ) ),
aBitmapCtl ( this, aCtlPreview.GetSizePixel() ),
rOutAttrs ( rInAttrs ),
@@ -129,8 +122,8 @@ SvxBitmapTabPage::SvxBitmapTabPage
aXFillAttr ( pXPool ),
rXFSet ( aXFillAttr.GetItemSet() )
{
- aBtnLoad.SetModeImage( Image( SVX_RES( RID_SVXIMG_LOAD_H ) ), BMP_COLOR_HIGHCONTRAST );
- aBtnSave.SetModeImage( Image( SVX_RES( RID_SVXIMG_SAVE_H ) ), BMP_COLOR_HIGHCONTRAST );
+ aBtnLoad.SetModeImage( Image( CUI_RES( RID_SVXIMG_LOAD_H ) ), BMP_COLOR_HIGHCONTRAST );
+ aBtnSave.SetModeImage( Image( CUI_RES( RID_SVXIMG_SAVE_H ) ), BMP_COLOR_HIGHCONTRAST );
FreeResource();
// diese Page braucht ExchangeSupport
@@ -222,7 +215,7 @@ void SvxBitmapTabPage::ActivatePage( const SfxItemSet& )
// Ermitteln (evtl. abschneiden) des Namens und in
// der GroupBox darstellen
- String aString( SVX_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
+ String aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
INetURLObject aURL( pBitmapList->GetPath() );
aURL.Append( pBitmapList->GetName() );
@@ -558,17 +551,13 @@ long SvxBitmapTabPage::CheckChanges_Impl()
if( bBmpChanged )
{
- ResMgr& rMgr = DIALOG_MGR();
+ ResMgr& rMgr = CUI_MGR();
Image aWarningBoxImage = WarningBox::GetStandardImage();
- //CHINA001 SvxMessDialog aMessDlg( DLGWIN,
- //CHINA001 String( SVX_RES( RID_SVXSTR_BITMAP, rMgr ) ),
- //CHINA001 String( SVX_RES( RID_SVXSTR_ASK_CHANGE_BITMAP, rMgr ) ),
- //CHINA001 &aWarningBoxImage );
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
AbstractSvxMessDialog* aMessDlg = pFact->CreateSvxMessDialog( DLGWIN, RID_SVXDLG_MESSBOX,
- String( ResId( RID_SVXSTR_BITMAP, rMgr ) ),
- String( ResId( RID_SVXSTR_ASK_CHANGE_BITMAP, rMgr ) ),
+ String( SVX_RES( RID_SVXSTR_BITMAP ) ),
+ String( CUI_RES( RID_SVXSTR_ASK_CHANGE_BITMAP ) ),
&aWarningBoxImage );
DBG_ASSERT(aMessDlg, "Dialogdiet fail!");//CHINA001
aMessDlg->SetButtonText( MESS_BTN_1, //CHINA001 aMessDlg.SetButtonText( MESS_BTN_1,
@@ -611,9 +600,9 @@ long SvxBitmapTabPage::CheckChanges_Impl()
IMPL_LINK( SvxBitmapTabPage, ClickAddHdl_Impl, void *, EMPTYARG )
{
- ResMgr& rMgr = DIALOG_MGR();
- String aNewName( ResId( RID_SVXSTR_BITMAP, rMgr ) );
- String aDesc( ResId( RID_SVXSTR_DESC_NEW_BITMAP, rMgr ) );
+ ResMgr& rMgr = CUI_MGR();
+ String aNewName( SVX_RES( RID_SVXSTR_BITMAP ) );
+ String aDesc( CUI_RES( RID_SVXSTR_DESC_NEW_BITMAP ) );
String aName;
long nCount = pBitmapList->Count();
@@ -632,10 +621,9 @@ IMPL_LINK( SvxBitmapTabPage, ClickAddHdl_Impl, void *, EMPTYARG )
bDifferent = FALSE;
}
- //CHINA001 SvxNameDialog* pDlg = new SvxNameDialog( DLGWIN, aName, aDesc );
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
- AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc, RID_SVXDLG_NAME );
+ AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc );
DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
WarningBox* pWarnBox = NULL;
USHORT nError = RID_SVXSTR_WARN_NAME_DUPLICATE;
@@ -742,7 +730,7 @@ IMPL_LINK( SvxBitmapTabPage, ClickAddHdl_Impl, void *, EMPTYARG )
IMPL_LINK( SvxBitmapTabPage, ClickImportHdl_Impl, void *, EMPTYARG )
{
- ResMgr& rMgr = DIALOG_MGR();
+ ResMgr& rMgr = CUI_MGR();
SvxOpenGraphicDialog aDlg( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "Import" ) ) );
aDlg.EnableLink(sal_False);
@@ -763,10 +751,9 @@ IMPL_LINK( SvxBitmapTabPage, ClickImportHdl_Impl, void *, EMPTYARG )
// convert file URL to UI name
String aName;
INetURLObject aURL( aDlg.GetPath() );
- //CHINA001 SvxNameDialog* pDlg = new SvxNameDialog( DLGWIN, aURL.GetName().GetToken( 0, '.' ), aDesc );
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
- AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, String(aURL.GetName()).GetToken( 0, '.' ), aDesc, RID_SVXDLG_NAME );
+ AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, String(aURL.GetName()).GetToken( 0, '.' ), aDesc );
DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
nError = RID_SVXSTR_WARN_NAME_DUPLICATE;
@@ -850,16 +837,15 @@ IMPL_LINK( SvxBitmapTabPage, ClickModifyHdl_Impl, void *, EMPTYARG )
if ( nPos != LISTBOX_ENTRY_NOTFOUND )
{
- ResMgr& rMgr = DIALOG_MGR();
- String aNewName( ResId( RID_SVXSTR_BITMAP, rMgr ) );
+ ResMgr& rMgr = CUI_MGR();
+ String aNewName( SVX_RES( RID_SVXSTR_BITMAP ) );
String aDesc( ResId( RID_SVXSTR_DESC_NEW_BITMAP, rMgr ) );
String aName( pBitmapList->GetBitmap( nPos )->GetName() );
String aOldName = aName;
- //CHINA001 SvxNameDialog* pDlg = new SvxNameDialog( DLGWIN, aName, aDesc );
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
- AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc, RID_SVXDLG_NAME );
+ AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc );
DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
long nCount = pBitmapList->Count();
@@ -922,8 +908,7 @@ IMPL_LINK( SvxBitmapTabPage, ClickDeleteHdl_Impl, void *, EMPTYARG )
if( nPos != LISTBOX_ENTRY_NOTFOUND )
{
QueryBox aQueryBox( DLGWIN, WinBits( WB_YES_NO | WB_DEF_NO ),
-//! SVX_RES( RID_SVXSTR_DEL_BITMAP ),
- String( SVX_RES( RID_SVXSTR_ASK_DEL_BITMAP ) ) );
+ String( CUI_RES( RID_SVXSTR_ASK_DEL_BITMAP ) ) );
if( aQueryBox.Execute() == RET_YES )
{
@@ -955,7 +940,7 @@ IMPL_LINK( SvxBitmapTabPage, ClickDeleteHdl_Impl, void *, EMPTYARG )
IMPL_LINK( SvxBitmapTabPage, ClickLoadHdl_Impl, void *, EMPTYARG )
{
USHORT nReturn = RET_YES;
- ResMgr& rMgr = DIALOG_MGR();
+ ResMgr& rMgr = CUI_MGR();
if ( *pnBitmapListState & CT_MODIFIED )
{
@@ -1086,7 +1071,7 @@ IMPL_LINK( SvxBitmapTabPage, ClickSaveHdl_Impl, void *, EMPTYARG )
{
// Ermitteln (evtl. abschneiden) des Namens und in
// der GroupBox darstellen
- String aString( SVX_RES( RID_SVXSTR_TABLE ) );
+ String aString( CUI_RES( RID_SVXSTR_TABLE ) );
aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
if ( aURL.getBase().getLength() > 18 )
@@ -1105,7 +1090,7 @@ IMPL_LINK( SvxBitmapTabPage, ClickSaveHdl_Impl, void *, EMPTYARG )
else
{
ErrorBox( DLGWIN, WinBits( WB_OK ),
- String( SVX_RES( RID_SVXSTR_WRITE_DATA_ERROR ) ) ).Execute();
+ String( CUI_RES( RID_SVXSTR_WRITE_DATA_ERROR ) ) ).Execute();
}
}
diff --git a/svx/source/cui/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index 3a7399ae073d..616dba0169e8 100644
--- a/svx/source/cui/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -29,16 +29,12 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
// include ---------------------------------------------------------------
#include <tools/shl.hxx>
#include <tools/urlobj.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
#include <sfx2/app.hxx>
#include <sfx2/module.hxx>
#include <svtools/colrdlg.hxx>
@@ -48,21 +44,21 @@
#define _SVX_TPCOLOR_CXX
-
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "helpid.hrc"
-
-#include "xattr.hxx"
+#include "svx/xattr.hxx"
#include <svx/xpool.hxx>
#include <svx/xtable.hxx>
-#include "drawitem.hxx"
+#include "svx/drawitem.hxx"
#include "cuitabarea.hxx"
#include "tabarea.hrc"
#include "defdlgname.hxx" //CHINA001 #include "dlgname.hxx"
-#include "dlgname.hrc"
+//#include "dlgname.hrc"
#include <svx/svxdlg.hxx> //CHINA001
-#include <svx/dialmgr.hxx>
+#include <dialmgr.hxx>
#include <cuitabline.hxx>
+#include <svx/dialmgr.hxx>
+#include <svx/dialogs.hrc>
#define DLGWIN GetParentDialog( this )
@@ -91,35 +87,35 @@ SvxColorTabPage::SvxColorTabPage
const SfxItemSet& rInAttrs
) :
- SfxTabPage ( pParent, SVX_RES( RID_SVXPAGE_COLOR ), rInAttrs ),
-
- aFlProp ( this, SVX_RES( FL_PROP ) ),
- aFtName ( this, SVX_RES( FT_NAME ) ),
- aEdtName ( this, SVX_RES( EDT_NAME ) ),
- aFtColor ( this, SVX_RES( FT_COLOR ) ),
- aLbColor ( this, SVX_RES( LB_COLOR ) ),
-
- aTableNameFT ( this, SVX_RES( FT_TABLE_NAME ) ),
- aValSetColorTable ( this, SVX_RES( CTL_COLORTABLE ) ),
-
- aCtlPreviewOld ( this, SVX_RES( CTL_PREVIEW_OLD ) ),
- aCtlPreviewNew ( this, SVX_RES( CTL_PREVIEW_NEW ) ),
-
- aLbColorModel ( this, SVX_RES( LB_COLORMODEL ) ),
- aFtColorModel1 ( this, SVX_RES( FT_1 ) ),
- aMtrFldColorModel1 ( this, SVX_RES( MTR_FLD_1 ) ),
- aFtColorModel2 ( this, SVX_RES( FT_2 ) ),
- aMtrFldColorModel2 ( this, SVX_RES( MTR_FLD_2 ) ),
- aFtColorModel3 ( this, SVX_RES( FT_3 ) ),
- aMtrFldColorModel3 ( this, SVX_RES( MTR_FLD_3 ) ),
- aFtColorModel4 ( this, SVX_RES( FT_4 ) ),
- aMtrFldColorModel4 ( this, SVX_RES( MTR_FLD_4 ) ),
- aBtnAdd ( this, SVX_RES( BTN_ADD ) ),
- aBtnModify ( this, SVX_RES( BTN_MODIFY ) ),
- aBtnWorkOn ( this, SVX_RES( BTN_WORK_ON ) ),
- aBtnDelete ( this, SVX_RES( BTN_DELETE ) ),
- aBtnLoad ( this, SVX_RES( BTN_LOAD ) ),
- aBtnSave ( this, SVX_RES( BTN_SAVE ) ),
+ SfxTabPage ( pParent, CUI_RES( RID_SVXPAGE_COLOR ), rInAttrs ),
+
+ aFlProp ( this, CUI_RES( FL_PROP ) ),
+ aFtName ( this, CUI_RES( FT_NAME ) ),
+ aEdtName ( this, CUI_RES( EDT_NAME ) ),
+ aFtColor ( this, CUI_RES( FT_COLOR ) ),
+ aLbColor ( this, CUI_RES( LB_COLOR ) ),
+
+ aTableNameFT ( this, CUI_RES( FT_TABLE_NAME ) ),
+ aValSetColorTable ( this, CUI_RES( CTL_COLORTABLE ) ),
+
+ aCtlPreviewOld ( this, CUI_RES( CTL_PREVIEW_OLD ) ),
+ aCtlPreviewNew ( this, CUI_RES( CTL_PREVIEW_NEW ) ),
+
+ aLbColorModel ( this, CUI_RES( LB_COLORMODEL ) ),
+ aFtColorModel1 ( this, CUI_RES( FT_1 ) ),
+ aMtrFldColorModel1 ( this, CUI_RES( MTR_FLD_1 ) ),
+ aFtColorModel2 ( this, CUI_RES( FT_2 ) ),
+ aMtrFldColorModel2 ( this, CUI_RES( MTR_FLD_2 ) ),
+ aFtColorModel3 ( this, CUI_RES( FT_3 ) ),
+ aMtrFldColorModel3 ( this, CUI_RES( MTR_FLD_3 ) ),
+ aFtColorModel4 ( this, CUI_RES( FT_4 ) ),
+ aMtrFldColorModel4 ( this, CUI_RES( MTR_FLD_4 ) ),
+ aBtnAdd ( this, CUI_RES( BTN_ADD ) ),
+ aBtnModify ( this, CUI_RES( BTN_MODIFY ) ),
+ aBtnWorkOn ( this, CUI_RES( BTN_WORK_ON ) ),
+ aBtnDelete ( this, CUI_RES( BTN_DELETE ) ),
+ aBtnLoad ( this, CUI_RES( BTN_LOAD ) ),
+ aBtnSave ( this, CUI_RES( BTN_SAVE ) ),
rOutAttrs ( rInAttrs ),
pColorTab( NULL ),
@@ -135,8 +131,8 @@ SvxColorTabPage::SvxColorTabPage
eCM ( CM_RGB )
{
- aBtnLoad.SetModeImage( Image( SVX_RES( RID_SVXIMG_LOAD_H ) ), BMP_COLOR_HIGHCONTRAST );
- aBtnSave.SetModeImage( Image( SVX_RES( RID_SVXIMG_SAVE_H ) ), BMP_COLOR_HIGHCONTRAST );
+ aBtnLoad.SetModeImage( Image( CUI_RES( RID_SVXIMG_LOAD_H ) ), BMP_COLOR_HIGHCONTRAST );
+ aBtnSave.SetModeImage( Image( CUI_RES( RID_SVXIMG_SAVE_H ) ), BMP_COLOR_HIGHCONTRAST );
FreeResource();
@@ -235,7 +231,7 @@ void SvxColorTabPage::ActivatePage( const SfxItemSet& )
// Ermitteln (evtl. abschneiden) des Namens und in
// der GroupBox darstellen
- String aString( SVX_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
+ String aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
INetURLObject aURL( pColorTab->GetPath() );
aURL.Append( pColorTab->GetName() );
@@ -307,16 +303,12 @@ long SvxColorTabPage::CheckChanges_Impl()
ColorToPercent_Impl( aTmpColor.GetBlue() ) != ColorToPercent_Impl( aColor.GetBlue() ) ||
aString != aEdtName.GetText() )
{
- ResMgr& rMgr = DIALOG_MGR();
+ ResMgr& rMgr = CUI_MGR();
Image aWarningBoxImage = WarningBox::GetStandardImage();
- //CHINA001 SvxMessDialog aMessDlg( DLGWIN,
- //CHINA001 String( SVX_RES( RID_SVXSTR_COLOR, pMgr ) ),
- //CHINA001 String( ResId( RID_SVXSTR_ASK_CHANGE_COLOR, pMgr ) ),
- //CHINA001 &aWarningBoxImage );
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
AbstractSvxMessDialog* aMessDlg = pFact->CreateSvxMessDialog( DLGWIN, RID_SVXDLG_MESSBOX,
- String( ResId( RID_SVXSTR_COLOR, rMgr ) ),
+ SVX_RESSTR( RID_SVXSTR_COLOR ),
String( ResId( RID_SVXSTR_ASK_CHANGE_COLOR, rMgr ) ),
&aWarningBoxImage );
DBG_ASSERT(aMessDlg, "Dialogdiet fail!");//CHINA001
@@ -482,7 +474,7 @@ IMPL_LINK( SvxColorTabPage, ClickAddHdl_Impl, void *, EMPTYARG )
pWindow = pWindow->GetParent();
}
- ResMgr& rMgr = DIALOG_MGR();
+ ResMgr& rMgr = CUI_MGR();
String aDesc( ResId( RID_SVXSTR_DESC_COLOR, rMgr ) );
String aName( aEdtName.GetText() );
XColorEntry* pEntry;
@@ -502,10 +494,9 @@ IMPL_LINK( SvxColorTabPage, ClickAddHdl_Impl, void *, EMPTYARG )
aWarningBox.SetHelpId( HID_WARN_NAME_DUPLICATE );
aWarningBox.Execute();
- //CHINA001 SvxNameDialog* pDlg = new SvxNameDialog( DLGWIN, aName, aDesc );
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
- AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc, RID_SVXDLG_NAME );
+ AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc );
DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
BOOL bLoop = TRUE;
@@ -570,7 +561,7 @@ IMPL_LINK( SvxColorTabPage, ClickModifyHdl_Impl, void *, EMPTYARG )
if( nPos != LISTBOX_ENTRY_NOTFOUND )
{
- ResMgr& rMgr = DIALOG_MGR();
+ ResMgr& rMgr = CUI_MGR();
String aDesc( ResId( RID_SVXSTR_DESC_COLOR, rMgr ) );
String aName( aEdtName.GetText() );
long nCount = pColorTab->Count();
@@ -589,10 +580,9 @@ IMPL_LINK( SvxColorTabPage, ClickModifyHdl_Impl, void *, EMPTYARG )
aWarningBox.SetHelpId( HID_WARN_NAME_DUPLICATE );
aWarningBox.Execute();
- //CHINA001 SvxNameDialog* pDlg = new SvxNameDialog( DLGWIN, aName, aDesc );
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
- AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc, RID_SVXDLG_NAME );
+ AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc );
DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
BOOL bLoop = TRUE;
@@ -693,7 +683,7 @@ IMPL_LINK( SvxColorTabPage, ClickDeleteHdl_Impl, void *, EMPTYARG )
if( nPos != LISTBOX_ENTRY_NOTFOUND )
{
QueryBox aQueryBox( DLGWIN, WinBits( WB_YES_NO | WB_DEF_NO ),
- String( SVX_RES( RID_SVXSTR_ASK_DEL_COLOR ) ) );
+ String( CUI_RES( RID_SVXSTR_ASK_DEL_COLOR ) ) );
if( aQueryBox.Execute() == RET_YES )
{
@@ -745,7 +735,7 @@ IMPL_LINK( SvxColorTabPage, ClickDeleteHdl_Impl, void *, EMPTYARG )
//
IMPL_LINK( SvxColorTabPage, ClickLoadHdl_Impl, void *, EMPTYARG )
{
- ResMgr& rMgr = DIALOG_MGR();
+ ResMgr& rMgr = CUI_MGR();
USHORT nReturn = RET_YES;
if( *pnColorTableState & CT_MODIFIED )
@@ -916,7 +906,7 @@ IMPL_LINK( SvxColorTabPage, ClickSaveHdl_Impl, void *, EMPTYARG )
{
// Ermitteln (evtl. abschneiden) des Namens und in
// der GroupBox darstellen
- String aString( SVX_RES( RID_SVXSTR_TABLE ) );
+ String aString( CUI_RES( RID_SVXSTR_TABLE ) );
aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
if ( aURL.getBase().getLength() > 18 )
@@ -936,7 +926,7 @@ IMPL_LINK( SvxColorTabPage, ClickSaveHdl_Impl, void *, EMPTYARG )
else
{
ErrorBox aErrorBox( DLGWIN, WinBits( WB_OK ),
- String( SVX_RES( RID_SVXSTR_WRITE_DATA_ERROR ) ) );
+ String( CUI_RES( RID_SVXSTR_WRITE_DATA_ERROR ) ) );
aErrorBox.Execute();
}
}
diff --git a/svx/source/cui/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index 2624738baaa4..01381602b0a9 100644
--- a/svx/source/cui/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -29,37 +29,34 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
// include ---------------------------------------------------------------
#include <vcl/wrkwin.hxx>
#include <tools/shl.hxx>
#include <tools/urlobj.hxx>
#include <vcl/msgbox.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
#include <sfx2/app.hxx>
#include <sfx2/filedlghelper.hxx>
#include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
#define _SVX_TPGRADNT_CXX
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "helpid.hrc"
-
-#include "xattr.hxx"
+#include "svx/xattr.hxx"
#include <svx/xtable.hxx>
#include <svx/xpool.hxx>
-#include "drawitem.hxx"
+#include "svx/drawitem.hxx"
#include "cuitabarea.hxx"
#include "tabarea.hrc"
#include "defdlgname.hxx" //CHINA001 #include "dlgname.hxx"
-#include "dlgname.hrc"
+//#include "dlgname.hrc"
#include <svx/svxdlg.hxx> //CHINA001
+#include <dialmgr.hxx>
#include <svx/dialmgr.hxx>
+#include <svx/dialogs.hrc>
#define DLGWIN this->GetParent()->GetParent()
@@ -77,32 +74,32 @@ SvxGradientTabPage::SvxGradientTabPage
Window* pParent,
const SfxItemSet& rInAttrs
) :
- SfxTabPage ( pParent, SVX_RES( RID_SVXPAGE_GRADIENT ), rInAttrs ),
-
- aFlProp ( this, SVX_RES( FL_PROP ) ),
- aFtType ( this, SVX_RES( FT_TYPE ) ),
- aLbGradientType ( this, SVX_RES( LB_GRADIENT_TYPES ) ),
- aFtCenterX ( this, SVX_RES( FT_CENTER_X ) ),
- aMtrCenterX ( this, SVX_RES( MTR_CENTER_X ) ),
- aFtCenterY ( this, SVX_RES( FT_CENTER_Y ) ),
- aMtrCenterY ( this, SVX_RES( MTR_CENTER_Y ) ),
- aFtAngle ( this, SVX_RES( FT_ANGLE ) ),
- aMtrAngle ( this, SVX_RES( MTR_ANGLE ) ),
- aFtBorder ( this, SVX_RES( FT_BORDER ) ),
- aMtrBorder ( this, SVX_RES( MTR_BORDER ) ),
- aFtColorFrom ( this, SVX_RES( FT_COLOR_FROM ) ),
- aLbColorFrom ( this, SVX_RES( LB_COLOR_FROM ) ),
- aMtrColorFrom ( this, SVX_RES( MTR_COLOR_FROM ) ),
- aFtColorTo ( this, SVX_RES( FT_COLOR_TO ) ),
- aLbColorTo ( this, SVX_RES( LB_COLOR_TO ) ),
- aMtrColorTo ( this, SVX_RES( MTR_COLOR_TO ) ),
- aLbGradients ( this, SVX_RES( LB_GRADIENTS ) ),
- aCtlPreview ( this, SVX_RES( CTL_PREVIEW ) ),
- aBtnAdd ( this, SVX_RES( BTN_ADD ) ),
- aBtnModify ( this, SVX_RES( BTN_MODIFY ) ),
- aBtnDelete ( this, SVX_RES( BTN_DELETE ) ),
- aBtnLoad ( this, SVX_RES( BTN_LOAD ) ),
- aBtnSave ( this, SVX_RES( BTN_SAVE ) ),
+ SfxTabPage ( pParent, CUI_RES( RID_SVXPAGE_GRADIENT ), rInAttrs ),
+
+ aFlProp ( this, CUI_RES( FL_PROP ) ),
+ aFtType ( this, CUI_RES( FT_TYPE ) ),
+ aLbGradientType ( this, CUI_RES( LB_GRADIENT_TYPES ) ),
+ aFtCenterX ( this, CUI_RES( FT_CENTER_X ) ),
+ aMtrCenterX ( this, CUI_RES( MTR_CENTER_X ) ),
+ aFtCenterY ( this, CUI_RES( FT_CENTER_Y ) ),
+ aMtrCenterY ( this, CUI_RES( MTR_CENTER_Y ) ),
+ aFtAngle ( this, CUI_RES( FT_ANGLE ) ),
+ aMtrAngle ( this, CUI_RES( MTR_ANGLE ) ),
+ aFtBorder ( this, CUI_RES( FT_BORDER ) ),
+ aMtrBorder ( this, CUI_RES( MTR_BORDER ) ),
+ aFtColorFrom ( this, CUI_RES( FT_COLOR_FROM ) ),
+ aLbColorFrom ( this, CUI_RES( LB_COLOR_FROM ) ),
+ aMtrColorFrom ( this, CUI_RES( MTR_COLOR_FROM ) ),
+ aFtColorTo ( this, CUI_RES( FT_COLOR_TO ) ),
+ aLbColorTo ( this, CUI_RES( LB_COLOR_TO ) ),
+ aMtrColorTo ( this, CUI_RES( MTR_COLOR_TO ) ),
+ aLbGradients ( this, CUI_RES( LB_GRADIENTS ) ),
+ aCtlPreview ( this, CUI_RES( CTL_PREVIEW ) ),
+ aBtnAdd ( this, CUI_RES( BTN_ADD ) ),
+ aBtnModify ( this, CUI_RES( BTN_MODIFY ) ),
+ aBtnDelete ( this, CUI_RES( BTN_DELETE ) ),
+ aBtnLoad ( this, CUI_RES( BTN_LOAD ) ),
+ aBtnSave ( this, CUI_RES( BTN_SAVE ) ),
rOutAttrs ( rInAttrs ),
@@ -115,8 +112,8 @@ SvxGradientTabPage::SvxGradientTabPage
aXFillAttr ( pXPool ),
rXFSet ( aXFillAttr.GetItemSet() )
{
- aBtnLoad.SetModeImage( Image( SVX_RES( RID_SVXIMG_LOAD_H ) ), BMP_COLOR_HIGHCONTRAST );
- aBtnSave.SetModeImage( Image( SVX_RES( RID_SVXIMG_SAVE_H ) ), BMP_COLOR_HIGHCONTRAST );
+ aBtnLoad.SetModeImage( Image( CUI_RES( RID_SVXIMG_LOAD_H ) ), BMP_COLOR_HIGHCONTRAST );
+ aBtnSave.SetModeImage( Image( CUI_RES( RID_SVXIMG_SAVE_H ) ), BMP_COLOR_HIGHCONTRAST );
FreeResource();
@@ -225,7 +222,7 @@ void SvxGradientTabPage::ActivatePage( const SfxItemSet& )
// Ermitteln (evtl. abschneiden) des Namens und in
// der GroupBox darstellen
- String aString( SVX_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
+ String aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
INetURLObject aURL( pGradientList->GetPath() );
aURL.Append( pGradientList->GetName() );
@@ -288,17 +285,13 @@ long SvxGradientTabPage::CheckChanges_Impl()
if( !( aTmpGradient == aGradient ) )
{
- ResMgr& rMgr = DIALOG_MGR();
+ ResMgr& rMgr = CUI_MGR();
Image aWarningBoxImage = WarningBox::GetStandardImage();
- //CHINA001 SvxMessDialog aMessDlg( DLGWIN,
- //CHINA001 String( ResId( RID_SVXSTR_GRADIENT, rMgr ) ),
- //CHINA001 String( ResId( RID_SVXSTR_ASK_CHANGE_GRADIENT, rMgr ) ),
- //CHINA001 &aWarningBoxImage );
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
AbstractSvxMessDialog* aMessDlg = pFact->CreateSvxMessDialog( DLGWIN, RID_SVXDLG_MESSBOX,
- String( ResId( RID_SVXSTR_GRADIENT, rMgr ) ),
- String( ResId( RID_SVXSTR_ASK_CHANGE_GRADIENT, rMgr ) ),
+ SVX_RESSTR( RID_SVXSTR_GRADIENT ),
+ CUI_RESSTR( RID_SVXSTR_ASK_CHANGE_GRADIENT ),
&aWarningBoxImage );
DBG_ASSERT(aMessDlg, "Dialogdiet fail!");//CHINA001
aMessDlg->SetButtonText( MESS_BTN_1, //CHINA001 aMessDlg.SetButtonText( MESS_BTN_1,
@@ -443,9 +436,9 @@ IMPL_LINK( SvxGradientTabPage, ModifiedHdl_Impl, void *, pControl )
IMPL_LINK( SvxGradientTabPage, ClickAddHdl_Impl, void *, EMPTYARG )
{
- ResMgr& rMgr = DIALOG_MGR();
- String aNewName( ResId( RID_SVXSTR_GRADIENT, rMgr ) );
- String aDesc( ResId( RID_SVXSTR_DESC_GRADIENT, rMgr ) );
+ ResMgr& rMgr = CUI_MGR();
+ String aNewName( SVX_RES( RID_SVXSTR_GRADIENT ) );
+ String aDesc( CUI_RES( RID_SVXSTR_DESC_GRADIENT ) );
String aName;
long nCount = pGradientList->Count();
@@ -464,10 +457,9 @@ IMPL_LINK( SvxGradientTabPage, ClickAddHdl_Impl, void *, EMPTYARG )
bDifferent = FALSE;
}
- //CHINA001 SvxNameDialog* pDlg = new SvxNameDialog( DLGWIN, aName, aDesc );
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
- AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc, RID_SVXDLG_NAME );
+ AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc );
DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
WarningBox* pWarnBox = NULL;
USHORT nError = RID_SVXSTR_WARN_NAME_DUPLICATE;
@@ -556,16 +548,15 @@ IMPL_LINK( SvxGradientTabPage, ClickModifyHdl_Impl, void *, EMPTYARG )
if ( nPos != LISTBOX_ENTRY_NOTFOUND )
{
- ResMgr& rMgr = DIALOG_MGR();
- String aNewName( ResId( RID_SVXSTR_GRADIENT, rMgr ) );
- String aDesc( ResId( RID_SVXSTR_DESC_GRADIENT, rMgr ) );
+ ResMgr& rMgr = CUI_MGR();
+ String aNewName( SVX_RES( RID_SVXSTR_GRADIENT ) );
+ String aDesc( CUI_RES( RID_SVXSTR_DESC_GRADIENT ) );
String aName( pGradientList->GetGradient( nPos )->GetName() );
String aOldName = aName;
- //CHINA001 SvxNameDialog* pDlg = new SvxNameDialog( DLGWIN, aName, aDesc );
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
- AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc, RID_SVXDLG_NAME );
+ AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc );
DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
long nCount = pGradientList->Count();
@@ -630,8 +621,7 @@ IMPL_LINK( SvxGradientTabPage, ClickDeleteHdl_Impl, void *, EMPTYARG )
if( nPos != LISTBOX_ENTRY_NOTFOUND )
{
QueryBox aQueryBox( DLGWIN, WinBits( WB_YES_NO | WB_DEF_NO ),
-//! SVX_RES( RID_SVXSTR_DEL_GRADIENT ),
- String( SVX_RES( RID_SVXSTR_ASK_DEL_GRADIENT ) ) );
+ String( CUI_RES( RID_SVXSTR_ASK_DEL_GRADIENT ) ) );
if ( aQueryBox.Execute() == RET_YES )
{
@@ -661,7 +651,7 @@ IMPL_LINK( SvxGradientTabPage, ClickDeleteHdl_Impl, void *, EMPTYARG )
IMPL_LINK( SvxGradientTabPage, ClickLoadHdl_Impl, void *, EMPTYARG )
{
- ResMgr& rMgr = DIALOG_MGR();
+ ResMgr& rMgr = CUI_MGR();
USHORT nReturn = RET_YES;
if ( *pnGradientListState & CT_MODIFIED )
@@ -798,7 +788,7 @@ IMPL_LINK( SvxGradientTabPage, ClickSaveHdl_Impl, void *, EMPTYARG )
{
// Ermitteln (evtl. abschneiden) des Namens und in
// der GroupBox darstellen
- String aString( SVX_RES( RID_SVXSTR_TABLE ) );
+ String aString( CUI_RES( RID_SVXSTR_TABLE ) );
aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
if ( aURL.getBase().getLength() > 18 )
@@ -817,7 +807,7 @@ IMPL_LINK( SvxGradientTabPage, ClickSaveHdl_Impl, void *, EMPTYARG )
else
{
ErrorBox( DLGWIN, WinBits( WB_OK ),
- String( SVX_RES( RID_SVXSTR_WRITE_DATA_ERROR ) ) ).Execute();
+ String( CUI_RES( RID_SVXSTR_WRITE_DATA_ERROR ) ) ).Execute();
}
}
diff --git a/svx/source/cui/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index 58c55321195a..006099f1fde6 100644
--- a/svx/source/cui/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -29,19 +29,13 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
// include ---------------------------------------------------------------
#include <tools/shl.hxx>
#include <tools/urlobj.hxx>
-#ifndef _MSGBOX_HXX //autogen
#include <vcl/msgbox.hxx>
-#endif
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
#include <sfx2/app.hxx>
#include <sfx2/module.hxx>
#include <sfx2/filedlghelper.hxx>
@@ -49,24 +43,21 @@
#define _SVX_TPHATCH_CXX
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "tabarea.hrc"
-#include "dlgname.hrc"
+//#include "dlgname.hrc"
#include "helpid.hrc"
-
-
-
-
-#include "xattr.hxx"
+#include "svx/xattr.hxx"
#include <svx/xpool.hxx>
#include <svx/xtable.hxx>
-
-#include "drawitem.hxx"
+#include "svx/drawitem.hxx"
#include "cuitabarea.hxx"
#include "defdlgname.hxx" //CHINA001 #include "dlgname.hxx"
#include <svx/svxdlg.hxx> //CHINA001
+#include <dialmgr.hxx>
+#include "svx/dlgutil.hxx"
#include <svx/dialmgr.hxx>
-#include "dlgutil.hxx"
+#include <svx/dialogs.hrc>
#define DLGWIN this->GetParent()->GetParent()
@@ -85,26 +76,26 @@ SvxHatchTabPage::SvxHatchTabPage
const SfxItemSet& rInAttrs
) :
- SvxTabPage ( pParent, SVX_RES( RID_SVXPAGE_HATCH ), rInAttrs ),
+ SvxTabPage ( pParent, CUI_RES( RID_SVXPAGE_HATCH ), rInAttrs ),
- aFtDistance ( this, SVX_RES( FT_LINE_DISTANCE ) ),
- aMtrDistance ( this, SVX_RES( MTR_FLD_DISTANCE ) ),
- aFtAngle ( this, SVX_RES( FT_LINE_ANGLE ) ),
- aMtrAngle ( this, SVX_RES( MTR_FLD_ANGLE ) ),
- aCtlAngle ( this, SVX_RES( CTL_ANGLE ),
+ aFtDistance ( this, CUI_RES( FT_LINE_DISTANCE ) ),
+ aMtrDistance ( this, CUI_RES( MTR_FLD_DISTANCE ) ),
+ aFtAngle ( this, CUI_RES( FT_LINE_ANGLE ) ),
+ aMtrAngle ( this, CUI_RES( MTR_FLD_ANGLE ) ),
+ aCtlAngle ( this, CUI_RES( CTL_ANGLE ),
RP_RB, 200, 80, CS_ANGLE ),
- aFlProp ( this, SVX_RES( FL_PROP ) ),
- aFtLineType ( this, SVX_RES( FT_LINE_TYPE ) ),
- aLbLineType ( this, SVX_RES( LB_LINE_TYPE ) ),
- aFtLineColor ( this, SVX_RES( FT_LINE_COLOR ) ),
- aLbLineColor ( this, SVX_RES( LB_LINE_COLOR ) ),
- aLbHatchings ( this, SVX_RES( LB_HATCHINGS ) ),
- aCtlPreview ( this, SVX_RES( CTL_PREVIEW ) ),
- aBtnAdd ( this, SVX_RES( BTN_ADD ) ),
- aBtnModify ( this, SVX_RES( BTN_MODIFY ) ),
- aBtnDelete ( this, SVX_RES( BTN_DELETE ) ),
- aBtnLoad ( this, SVX_RES( BTN_LOAD ) ),
- aBtnSave ( this, SVX_RES( BTN_SAVE ) ),
+ aFlProp ( this, CUI_RES( FL_PROP ) ),
+ aFtLineType ( this, CUI_RES( FT_LINE_TYPE ) ),
+ aLbLineType ( this, CUI_RES( LB_LINE_TYPE ) ),
+ aFtLineColor ( this, CUI_RES( FT_LINE_COLOR ) ),
+ aLbLineColor ( this, CUI_RES( LB_LINE_COLOR ) ),
+ aLbHatchings ( this, CUI_RES( LB_HATCHINGS ) ),
+ aCtlPreview ( this, CUI_RES( CTL_PREVIEW ) ),
+ aBtnAdd ( this, CUI_RES( BTN_ADD ) ),
+ aBtnModify ( this, CUI_RES( BTN_MODIFY ) ),
+ aBtnDelete ( this, CUI_RES( BTN_DELETE ) ),
+ aBtnLoad ( this, CUI_RES( BTN_LOAD ) ),
+ aBtnSave ( this, CUI_RES( BTN_SAVE ) ),
rOutAttrs ( rInAttrs ),
pColorTab( NULL ),
@@ -117,8 +108,8 @@ SvxHatchTabPage::SvxHatchTabPage
rXFSet ( aXFillAttr.GetItemSet() )
{
- aBtnLoad.SetModeImage( Image( SVX_RES( RID_SVXIMG_LOAD_H ) ), BMP_COLOR_HIGHCONTRAST );
- aBtnSave.SetModeImage( Image( SVX_RES( RID_SVXIMG_SAVE_H ) ), BMP_COLOR_HIGHCONTRAST );
+ aBtnLoad.SetModeImage( Image( CUI_RES( RID_SVXIMG_LOAD_H ) ), BMP_COLOR_HIGHCONTRAST );
+ aBtnSave.SetModeImage( Image( CUI_RES( RID_SVXIMG_SAVE_H ) ), BMP_COLOR_HIGHCONTRAST );
FreeResource();
@@ -215,7 +206,7 @@ void SvxHatchTabPage::ActivatePage( const SfxItemSet& rSet )
// Ermitteln (evtl. abschneiden) des Namens und in
// der GroupBox darstellen
- String aString( SVX_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
+ String aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
INetURLObject aURL( pHatchingList->GetPath() );
aURL.Append( pHatchingList->GetName() );
@@ -270,17 +261,13 @@ long SvxHatchTabPage::CheckChanges_Impl()
aLbLineColor.GetSelectEntryPos() != aLbLineColor.GetSavedValue() ||
aLbHatchings.GetSelectEntryPos() != aLbHatchings.GetSavedValue() )
{
- ResMgr& rMgr = DIALOG_MGR();
+ ResMgr& rMgr = CUI_MGR();
Image aWarningBoxImage = WarningBox::GetStandardImage();
- //CHINA001 SvxMessDialog aMessDlg( DLGWIN,
- //CHINA001 String( ResId( RID_SVXSTR_HATCH, rMgr ) ),
- //CHINA001 String( ResId( RID_SVXSTR_ASK_CHANGE_HATCH, rMgr ) ),
- //CHINA001 &aWarningBoxImage );
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
AbstractSvxMessDialog* aMessDlg = pFact->CreateSvxMessDialog( DLGWIN, RID_SVXDLG_MESSBOX,
- String( ResId( RID_SVXSTR_HATCH, rMgr ) ),
- String( ResId( RID_SVXSTR_ASK_CHANGE_HATCH, rMgr ) ),
+ SVX_RESSTR( RID_SVXSTR_HATCH ),
+ CUI_RESSTR( RID_SVXSTR_ASK_CHANGE_HATCH ),
&aWarningBoxImage );
DBG_ASSERT(aMessDlg, "Dialogdiet fail!");//CHINA001
aMessDlg->SetButtonText( MESS_BTN_1, //CHINA001 aMessDlg.SetButtonText( MESS_BTN_1,
@@ -514,9 +501,9 @@ IMPL_LINK( SvxHatchTabPage, ChangeHatchHdl_Impl, void *, EMPTYARG )
IMPL_LINK( SvxHatchTabPage, ClickAddHdl_Impl, void *, EMPTYARG )
{
- ResMgr& rMgr = DIALOG_MGR();
- String aNewName( ResId( RID_SVXSTR_HATCH, rMgr ) );
- String aDesc( ResId( RID_SVXSTR_DESC_HATCH, rMgr ) );
+ ResMgr& rMgr = CUI_MGR();
+ String aNewName( SVX_RES( RID_SVXSTR_HATCH ) );
+ String aDesc( CUI_RES( RID_SVXSTR_DESC_HATCH ) );
String aName;
long nCount = pHatchingList->Count();
@@ -535,10 +522,9 @@ IMPL_LINK( SvxHatchTabPage, ClickAddHdl_Impl, void *, EMPTYARG )
bDifferent = FALSE;
}
- //CHINA001 SvxNameDialog* pDlg = new SvxNameDialog( DLGWIN, aName, aDesc );
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
- AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc, RID_SVXDLG_NAME );
+ AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc );
DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
WarningBox* pWarnBox = NULL;
USHORT nError = RID_SVXSTR_WARN_NAME_DUPLICATE;
@@ -621,16 +607,15 @@ IMPL_LINK( SvxHatchTabPage, ClickModifyHdl_Impl, void *, EMPTYARG )
if ( nPos != LISTBOX_ENTRY_NOTFOUND )
{
- ResMgr& rMgr = DIALOG_MGR();
- String aNewName( ResId( RID_SVXSTR_HATCH, rMgr ) );
- String aDesc( ResId( RID_SVXSTR_DESC_HATCH, rMgr ) );
+ ResMgr& rMgr = CUI_MGR();
+ String aNewName( SVX_RES( RID_SVXSTR_HATCH ) );
+ String aDesc( CUI_RES( RID_SVXSTR_DESC_HATCH ) );
String aName( pHatchingList->GetHatch( nPos )->GetName() );
String aOldName = aName;
- //CHINA001 SvxNameDialog* pDlg = new SvxNameDialog( DLGWIN, aName, aDesc );
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
- AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc, RID_SVXDLG_NAME );
+ AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc );
DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
long nCount = pHatchingList->Count();
@@ -695,8 +680,7 @@ IMPL_LINK( SvxHatchTabPage, ClickDeleteHdl_Impl, void *, EMPTYARG )
if( nPos != LISTBOX_ENTRY_NOTFOUND )
{
QueryBox aQueryBox( DLGWIN, WinBits( WB_YES_NO | WB_DEF_NO ),
-//! SVX_RES( RID_SVXSTR_DEL_HATCH ),
- String( SVX_RES( RID_SVXSTR_ASK_DEL_HATCH ) ) );
+ String( CUI_RES( RID_SVXSTR_ASK_DEL_HATCH ) ) );
if( aQueryBox.Execute() == RET_YES )
{
@@ -726,7 +710,7 @@ IMPL_LINK( SvxHatchTabPage, ClickDeleteHdl_Impl, void *, EMPTYARG )
IMPL_LINK( SvxHatchTabPage, ClickLoadHdl_Impl, void *, EMPTYARG )
{
- ResMgr& rMgr = DIALOG_MGR();
+ ResMgr& rMgr = CUI_MGR();
USHORT nReturn = RET_YES;
if ( *pnHatchingListState & CT_MODIFIED )
@@ -853,7 +837,7 @@ IMPL_LINK( SvxHatchTabPage, ClickSaveHdl_Impl, void *, EMPTYARG )
{
// Ermitteln (evtl. abschneiden) des Namens und in
// der GroupBox darstellen
- String aString( SVX_RES( RID_SVXSTR_TABLE ) );
+ String aString( CUI_RES( RID_SVXSTR_TABLE ) );
aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
if ( aURL.getBase().getLength() > 18 )
@@ -872,7 +856,7 @@ IMPL_LINK( SvxHatchTabPage, ClickSaveHdl_Impl, void *, EMPTYARG )
else
{
ErrorBox( DLGWIN, WinBits( WB_OK ),
- String( SVX_RES( RID_SVXSTR_WRITE_DATA_ERROR ) ) ).Execute();
+ String( CUI_RES( RID_SVXSTR_WRITE_DATA_ERROR ) ) ).Execute();
}
}
diff --git a/svx/source/cui/tpline.cxx b/cui/source/tabpages/tpline.cxx
index c6cc30cbb0ba..09a5daadfe1d 100644
--- a/svx/source/cui/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -29,11 +29,7 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
// include ---------------------------------------------------------------
@@ -48,43 +44,36 @@
#define _SVX_TPLINE_CXX
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "tabline.hrc"
-#include "dlgname.hrc"
-
-
-
-
-
-#include "xattr.hxx"
+#include "svx/xattr.hxx"
#include <svx/xpool.hxx>
#include <svx/xtable.hxx>
-
-#include "drawitem.hxx"
+#include "svx/drawitem.hxx"
#include "cuitabline.hxx"
#include "dlgname.hxx"
-#include <svx/dialmgr.hxx>
-#include "dlgutil.hxx"
+#include <dialmgr.hxx>
+#include "svx/dlgutil.hxx"
#include <svx/svdmodel.hxx>
-#include "svxgrahicitem.hxx"
-#include "linectrl.hrc"
-#include <sfx2/request.hxx> //add CHINA001
-#include "ofaitem.hxx" //add CHINA001
-//#58425# Symbole auf einer Linie (z.B. StarChart) Includes:
+#include "svx/svxgrahicitem.hxx"
+//#include "linectrl.hrc"
+#include <sfx2/request.hxx>
+#include "svx/ofaitem.hxx"
#include <svx/svdobj.hxx>
#include <svx/svdview.hxx>
#include <svx/svdmodel.hxx>
-#include <numvset.hxx>
+#include <svx/numvset.hxx>
#include <vcl/msgbox.hxx>
#include <svx/numitem.hxx>
#include <svx/svxenum.hxx>
#include <sfx2/objsh.hxx>
#include <svx/brshitem.hxx>
-#include <gallery.hxx>
+#include <svx/gallery.hxx>
#include <svx/xbitmap.hxx>
#include <unotools/localfilehelper.hxx>
-
-#include "opengrf.hxx"
+#include "svx/opengrf.hxx"
+#include <svx/dialmgr.hxx>
+#include <svx/dialogs.hrc>
#define MAX_BMP_WIDTH 16
#define MAX_BMP_HEIGHT 16
@@ -118,33 +107,33 @@ SvxLineTabPage::SvxLineTabPage
Window* pParent,
const SfxItemSet& rInAttrs
) :
- SvxTabPage ( pParent, SVX_RES( RID_SVXPAGE_LINE ), rInAttrs ),
- aFtLineStyle ( this, SVX_RES( FT_LINE_STYLE ) ),
- aLbLineStyle ( this, SVX_RES( LB_LINE_STYLE ) ),
- aFtColor ( this, SVX_RES( FT_COLOR ) ),
- aLbColor ( this, SVX_RES( LB_COLOR ) ),
- aFtLineWidth ( this, SVX_RES( FT_LINE_WIDTH ) ),
- aMtrLineWidth ( this, SVX_RES( MTR_FLD_LINE_WIDTH ) ),
- aFtTransparent ( this, SVX_RES( FT_TRANSPARENT ) ),
- aMtrTransparent ( this, SVX_RES( MTR_LINE_TRANSPARENT ) ),
- aFlLine ( this, SVX_RES( FL_LINE ) ),
- aFtLineEndsStyle ( this, SVX_RES( FT_LINE_ENDS_STYLE ) ),
- aLbStartStyle ( this, SVX_RES( LB_START_STYLE ) ),
- aFtLineEndsWidth ( this, SVX_RES( FT_LINE_ENDS_WIDTH ) ),
- aMtrStartWidth ( this, SVX_RES( MTR_FLD_START_WIDTH ) ),
- aTsbCenterStart ( this, SVX_RES( TSB_CENTER_START ) ),
- aLbEndStyle ( this, SVX_RES( LB_END_STYLE ) ),
- aMtrEndWidth ( this, SVX_RES( MTR_FLD_END_WIDTH ) ),
- aTsbCenterEnd ( this, SVX_RES( TSB_CENTER_END ) ),
- aCbxSynchronize ( this, SVX_RES( CBX_SYNCHRONIZE ) ),
- aFlLineEnds ( this, SVX_RES( FL_LINE_ENDS ) ),
- aCtlPreview ( this, SVX_RES( CTL_PREVIEW ) ),
- aFLSeparator ( this, SVX_RES( FL_SEPARATOR ) ),
+ SvxTabPage ( pParent, CUI_RES( RID_SVXPAGE_LINE ), rInAttrs ),
+ aFtLineStyle ( this, CUI_RES( FT_LINE_STYLE ) ),
+ aLbLineStyle ( this, CUI_RES( LB_LINE_STYLE ) ),
+ aFtColor ( this, CUI_RES( FT_COLOR ) ),
+ aLbColor ( this, CUI_RES( LB_COLOR ) ),
+ aFtLineWidth ( this, CUI_RES( FT_LINE_WIDTH ) ),
+ aMtrLineWidth ( this, CUI_RES( MTR_FLD_LINE_WIDTH ) ),
+ aFtTransparent ( this, CUI_RES( FT_TRANSPARENT ) ),
+ aMtrTransparent ( this, CUI_RES( MTR_LINE_TRANSPARENT ) ),
+ aFlLine ( this, CUI_RES( FL_LINE ) ),
+ aFtLineEndsStyle ( this, CUI_RES( FT_LINE_ENDS_STYLE ) ),
+ aLbStartStyle ( this, CUI_RES( LB_START_STYLE ) ),
+ aFtLineEndsWidth ( this, CUI_RES( FT_LINE_ENDS_WIDTH ) ),
+ aMtrStartWidth ( this, CUI_RES( MTR_FLD_START_WIDTH ) ),
+ aTsbCenterStart ( this, CUI_RES( TSB_CENTER_START ) ),
+ aLbEndStyle ( this, CUI_RES( LB_END_STYLE ) ),
+ aMtrEndWidth ( this, CUI_RES( MTR_FLD_END_WIDTH ) ),
+ aTsbCenterEnd ( this, CUI_RES( TSB_CENTER_END ) ),
+ aCbxSynchronize ( this, CUI_RES( CBX_SYNCHRONIZE ) ),
+ aFlLineEnds ( this, CUI_RES( FL_LINE_ENDS ) ),
+ aCtlPreview ( this, CUI_RES( CTL_PREVIEW ) ),
+ aFLSeparator ( this, CUI_RES( FL_SEPARATOR ) ),
// #116827#
- maFLEdgeStyle ( this, SVX_RES( FL_EDGE_STYLE ) ),
- maFTEdgeStyle ( this, SVX_RES( FT_EDGE_STYLE ) ),
- maLBEdgeStyle ( this, SVX_RES( LB_EDGE_STYLE ) ),
+ maFLEdgeStyle ( this, CUI_RES( FL_EDGE_STYLE ) ),
+ maFTEdgeStyle ( this, CUI_RES( FT_EDGE_STYLE ) ),
+ maLBEdgeStyle ( this, CUI_RES( LB_EDGE_STYLE ) ),
pSymbolList(NULL),
bNewSize(false),
@@ -152,13 +141,13 @@ SvxLineTabPage::SvxLineTabPage
nSymbolType(SVX_SYMBOLTYPE_UNKNOWN), //unbekannt bzw. unchanged
pSymbolAttr(NULL),
//#58425# Symbole auf einer Linie (z.B. StarChart)
- aFlSymbol ( this, SVX_RES(FL_SYMBOL_FORMAT)),
- aSymbolMB ( this, SVX_RES(MB_SYMBOL_BITMAP)),
- aSymbolWidthFT ( this, SVX_RES(FT_SYMBOL_WIDTH)),
- aSymbolWidthMF ( this, SVX_RES(MF_SYMBOL_WIDTH)),
- aSymbolHeightFT ( this, SVX_RES(FT_SYMBOL_HEIGHT)),
- aSymbolHeightMF ( this, SVX_RES(MF_SYMBOL_HEIGHT)),
- aSymbolRatioCB ( this, SVX_RES(CB_SYMBOL_RATIO)),
+ aFlSymbol ( this, CUI_RES(FL_SYMBOL_FORMAT)),
+ aSymbolMB ( this, CUI_RES(MB_SYMBOL_BITMAP)),
+ aSymbolWidthFT ( this, CUI_RES(FT_SYMBOL_WIDTH)),
+ aSymbolWidthMF ( this, CUI_RES(MF_SYMBOL_WIDTH)),
+ aSymbolHeightFT ( this, CUI_RES(FT_SYMBOL_HEIGHT)),
+ aSymbolHeightMF ( this, CUI_RES(MF_SYMBOL_HEIGHT)),
+ aSymbolRatioCB ( this, CUI_RES(CB_SYMBOL_RATIO)),
bLastWidthModified(FALSE),
aSymbolLastSize(Size(0,0)),
@@ -299,34 +288,14 @@ void SvxLineTabPage::Construct()
void SvxLineTabPage::FillListboxes()
{
-// aCtlPreview.SetDrawMode( GetSettings().GetStyleSettings().GetHighContrastMode() ? OUTPUT_DRAWMODE_CONTRAST : OUTPUT_DRAWMODE_COLOR );
-
- ResMgr& rMgr = DIALOG_MGR();
-
// Linienstile
USHORT nOldSelect = aLbLineStyle.GetSelectEntryPos();
- aLbLineStyle.Clear();
- aLbLineStyle.InsertEntry( String( ResId( RID_SVXSTR_INVISIBLE, rMgr ) ) );
-
- const StyleSettings& rStyles = Application::GetSettings().GetStyleSettings();
- Bitmap aBitmap ( SVX_RES ( RID_SVXCTRL_LINECTRL ) );
- Color aSourceColors[2];
- Color aDestColors[2];
-
- aSourceColors[0] = Color( COL_WHITE );
- aSourceColors[1] = Color( COL_BLACK );
-
- aDestColors[0] = rStyles.GetFieldColor();
- aDestColors[1] = rStyles.GetFieldTextColor();
-
- aBitmap.Replace ( aSourceColors, aDestColors, 2 );
- Image aSolidLine ( aBitmap );
- aLbLineStyle.InsertEntry( String( ResId( RID_SVXSTR_SOLID, rMgr ) ), aSolidLine );
+ aLbLineStyle.FillStyles();
aLbLineStyle.Fill( pDashList );
aLbLineStyle.SelectEntryPos( nOldSelect );
// LinienEndenStile
- String sNone( ResId( RID_SVXSTR_NONE, rMgr ) );
+ String sNone( SVX_RES( RID_SVXSTR_NONE ) );
nOldSelect = aLbStartStyle.GetSelectEntryPos();
aLbStartStyle.Clear();
aLbStartStyle.InsertEntry( sNone );
@@ -348,7 +317,6 @@ void SvxLineTabPage::ActivatePage( const SfxItemSet& rSet )
SetPageType(pPageTypeItem->GetValue()); //add CHINA001 end
if( nDlgType == 0 && pDashList ) //CHINA001 if( *pDlgType == 0 && pDashList ) // Linien-Dialog
{
- ResMgr& rMgr = DIALOG_MGR();
USHORT nPos;
USHORT nCount;
@@ -366,9 +334,9 @@ void SvxLineTabPage::ActivatePage( const SfxItemSet& rSet )
aLbLineStyle.Clear();
aLbLineStyle.InsertEntry(
- String( ResId( RID_SVXSTR_INVISIBLE, rMgr ) ) );
+ SVX_RESSTR( RID_SVXSTR_INVISIBLE ) );
aLbLineStyle.InsertEntry(
- String( ResId( RID_SVXSTR_SOLID, rMgr ) ) );
+ SVX_RESSTR( RID_SVXSTR_SOLID ) );
aLbLineStyle.Fill( pDashList );
nCount = aLbLineStyle.GetEntryCount();
@@ -409,7 +377,7 @@ void SvxLineTabPage::ActivatePage( const SfxItemSet& rSet )
*pnLineEndListState = CT_NONE;
nPos = aLbLineStyle.GetSelectEntryPos();
- String sNone( ResId( RID_SVXSTR_NONE, rMgr ) );
+ String sNone( SVX_RES( RID_SVXSTR_NONE ) );
aLbStartStyle.Clear();
aLbStartStyle.InsertEntry( sNone );
@@ -1795,7 +1763,7 @@ IMPL_LINK( SvxLineTabPage, GraphicHdl_Impl, MenuButton *, pButton )
break;
default:
{
- SvxOpenGraphicDialog aGrfDlg(SVX_RES(RID_STR_EDIT_GRAPHIC));
+ SvxOpenGraphicDialog aGrfDlg(CUI_RES(RID_STR_EDIT_GRAPHIC));
aGrfDlg.EnableLink(sal_False);
aGrfDlg.AsLink(sal_False);
if( !aGrfDlg.Execute() )
diff --git a/svx/source/cui/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx
index 7b22fe175d16..f3d92be73278 100644
--- a/svx/source/cui/tplnedef.cxx
+++ b/cui/source/tabpages/tplnedef.cxx
@@ -29,17 +29,13 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
// include ---------------------------------------------------------------
#include <tools/shl.hxx>
#include <tools/urlobj.hxx>
#include <vcl/msgbox.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
#include <sfx2/app.hxx>
#include <sfx2/module.hxx>
#include <sfx2/filedlghelper.hxx>
@@ -47,24 +43,23 @@
#define _SVX_TPLNEDEF_CXX
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "tabline.hrc"
-#include "dlgname.hrc"
+//#include "dlgname.hrc"
#include "helpid.hrc"
-
-
-
-#include "xattr.hxx"
+#include "svx/xattr.hxx"
#include <svx/xpool.hxx>
#include <svx/xtable.hxx>
-#include "drawitem.hxx"
+#include "svx/drawitem.hxx"
#include "cuitabline.hxx"
#include "defdlgname.hxx" //CHINA001 #include "dlgname.hxx"
#include <svx/svxdlg.hxx> //CHINA001
+#include <dialmgr.hxx>
+#include "svx/dlgutil.hxx"
#include <svx/dialmgr.hxx>
-#include "dlgutil.hxx"
+#include <svx/dialogs.hrc>
#define DLGWIN this->GetParent()->GetParent()
@@ -84,29 +79,29 @@ SvxLineDefTabPage::SvxLineDefTabPage
const SfxItemSet& rInAttrs
) :
- SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_LINE_DEF ), rInAttrs ),
-
- aFlDefinition ( this, SVX_RES( FL_DEFINITION ) ),
- aFTLinestyle ( this, SVX_RES( FT_LINESTYLE ) ),
- aLbLineStyles ( this, SVX_RES( LB_LINESTYLES ) ),
- aFtType ( this, SVX_RES( FT_TYPE ) ),
- aLbType1 ( this, SVX_RES( LB_TYPE_1 ) ),
- aLbType2 ( this, SVX_RES( LB_TYPE_2 ) ),
- aFtNumber ( this, SVX_RES( FT_NUMBER ) ),
- aNumFldNumber1 ( this, SVX_RES( NUM_FLD_1 ) ),
- aNumFldNumber2 ( this, SVX_RES( NUM_FLD_2 ) ),
- aFtLength ( this, SVX_RES( FT_LENGTH ) ),
- aMtrLength1 ( this, SVX_RES( MTR_FLD_LENGTH_1 ) ),
- aMtrLength2 ( this, SVX_RES( MTR_FLD_LENGTH_2 ) ),
- aFtDistance ( this, SVX_RES( FT_DISTANCE ) ),
- aMtrDistance ( this, SVX_RES( MTR_FLD_DISTANCE ) ),
- aCbxSynchronize ( this, SVX_RES( CBX_SYNCHRONIZE ) ),
- aBtnAdd ( this, SVX_RES( BTN_ADD ) ),
- aBtnModify ( this, SVX_RES( BTN_MODIFY ) ),
- aBtnDelete ( this, SVX_RES( BTN_DELETE ) ),
- aBtnLoad ( this, SVX_RES( BTN_LOAD ) ),
- aBtnSave ( this, SVX_RES( BTN_SAVE ) ),
- aCtlPreview ( this, SVX_RES( CTL_PREVIEW ) ),
+ SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_LINE_DEF ), rInAttrs ),
+
+ aFlDefinition ( this, CUI_RES( FL_DEFINITION ) ),
+ aFTLinestyle ( this, CUI_RES( FT_LINESTYLE ) ),
+ aLbLineStyles ( this, CUI_RES( LB_LINESTYLES ) ),
+ aFtType ( this, CUI_RES( FT_TYPE ) ),
+ aLbType1 ( this, CUI_RES( LB_TYPE_1 ) ),
+ aLbType2 ( this, CUI_RES( LB_TYPE_2 ) ),
+ aFtNumber ( this, CUI_RES( FT_NUMBER ) ),
+ aNumFldNumber1 ( this, CUI_RES( NUM_FLD_1 ) ),
+ aNumFldNumber2 ( this, CUI_RES( NUM_FLD_2 ) ),
+ aFtLength ( this, CUI_RES( FT_LENGTH ) ),
+ aMtrLength1 ( this, CUI_RES( MTR_FLD_LENGTH_1 ) ),
+ aMtrLength2 ( this, CUI_RES( MTR_FLD_LENGTH_2 ) ),
+ aFtDistance ( this, CUI_RES( FT_DISTANCE ) ),
+ aMtrDistance ( this, CUI_RES( MTR_FLD_DISTANCE ) ),
+ aCbxSynchronize ( this, CUI_RES( CBX_SYNCHRONIZE ) ),
+ aBtnAdd ( this, CUI_RES( BTN_ADD ) ),
+ aBtnModify ( this, CUI_RES( BTN_MODIFY ) ),
+ aBtnDelete ( this, CUI_RES( BTN_DELETE ) ),
+ aBtnLoad ( this, CUI_RES( BTN_LOAD ) ),
+ aBtnSave ( this, CUI_RES( BTN_SAVE ) ),
+ aCtlPreview ( this, CUI_RES( CTL_PREVIEW ) ),
rOutAttrs ( rInAttrs ),
@@ -118,8 +113,8 @@ SvxLineDefTabPage::SvxLineDefTabPage
aXLineAttr ( pXPool ),
rXLSet ( aXLineAttr.GetItemSet() )
{
- aBtnLoad.SetModeImage( Image( SVX_RES( RID_SVXIMG_LOAD_H ) ), BMP_COLOR_HIGHCONTRAST );
- aBtnSave.SetModeImage( Image( SVX_RES( RID_SVXIMG_SAVE_H ) ), BMP_COLOR_HIGHCONTRAST );
+ aBtnLoad.SetModeImage( Image( CUI_RES( RID_SVXIMG_LOAD_H ) ), BMP_COLOR_HIGHCONTRAST );
+ aBtnSave.SetModeImage( Image( CUI_RES( RID_SVXIMG_SAVE_H ) ), BMP_COLOR_HIGHCONTRAST );
FreeResource();
@@ -213,7 +208,7 @@ void SvxLineDefTabPage::ActivatePage( const SfxItemSet& )
// Ermitteln (evtl. abschneiden) des Namens und in
// der GroupBox darstellen
- String aString( SVX_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
+ String aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
INetURLObject aURL( pDashList->GetPath() );
aURL.Append( pDashList->GetName() );
@@ -262,16 +257,12 @@ void SvxLineDefTabPage::CheckChanges_Impl()
aLbType2.GetSelectEntryPos() != aLbType2.GetSavedValue() ||
aMtrDistance.GetText() != aMtrDistance.GetSavedValue() )
{
- ResMgr& rMgr = DIALOG_MGR();
+ ResMgr& rMgr = CUI_MGR();
Image aWarningBoxImage = WarningBox::GetStandardImage();
- //CHINA001 SvxMessDialog aMessDlg( DLGWIN,
- //CHINA001 String( ResId( RID_SVXSTR_LINESTYLE, rMgr ) ),
- //CHINA001 String( ResId( RID_SVXSTR_ASK_CHANGE_LINESTYLE, rMgr ) ),
- //CHINA001 &aWarningBoxImage );
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
AbstractSvxMessDialog* aMessDlg = pFact->CreateSvxMessDialog( DLGWIN, RID_SVXDLG_MESSBOX,
- String( ResId( RID_SVXSTR_LINESTYLE, rMgr ) ),
+ SVX_RESSTR( RID_SVXSTR_LINESTYLE ),
String( ResId( RID_SVXSTR_ASK_CHANGE_LINESTYLE, rMgr ) ),
&aWarningBoxImage );
DBG_ASSERT(aMessDlg, "Dialogdiet fail!");//CHINA001
@@ -581,8 +572,8 @@ IMPL_LINK( SvxLineDefTabPage, SelectTypeHdl_Impl, void *, p )
IMPL_LINK( SvxLineDefTabPage, ClickAddHdl_Impl, void *, EMPTYARG )
{
- ResMgr& rMgr = DIALOG_MGR();
- String aNewName( ResId( RID_SVXSTR_LINESTYLE, rMgr ) );
+ ResMgr& rMgr = CUI_MGR();
+ String aNewName( SVX_RES( RID_SVXSTR_LINESTYLE ) );
String aDesc( ResId( RID_SVXSTR_DESC_LINESTYLE, rMgr ) );
String aName;
XDashEntry* pEntry;
@@ -603,10 +594,9 @@ IMPL_LINK( SvxLineDefTabPage, ClickAddHdl_Impl, void *, EMPTYARG )
bDifferent = FALSE;
}
- //CHINA001 SvxNameDialog* pDlg = new SvxNameDialog( DLGWIN, aName, aDesc );
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
- AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc, RID_SVXDLG_NAME );
+ AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc );
DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
BOOL bLoop = TRUE;
@@ -676,16 +666,15 @@ IMPL_LINK( SvxLineDefTabPage, ClickModifyHdl_Impl, void *, EMPTYARG )
if( nPos != LISTBOX_ENTRY_NOTFOUND )
{
- ResMgr& rMgr = DIALOG_MGR();
- String aNewName( ResId( RID_SVXSTR_LINESTYLE, rMgr ) );
+ ResMgr& rMgr = CUI_MGR();
+ String aNewName( SVX_RES( RID_SVXSTR_LINESTYLE ) );
String aDesc( ResId( RID_SVXSTR_DESC_LINESTYLE, rMgr ) );
String aName( pDashList->GetDash( nPos )->GetName() );
String aOldName = aName;
- //CHINA001 SvxNameDialog* pDlg = new SvxNameDialog( DLGWIN, aName, aDesc );
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
- AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc, RID_SVXDLG_NAME );
+ AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc );
DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
long nCount = pDashList->Count();
@@ -752,8 +741,7 @@ IMPL_LINK( SvxLineDefTabPage, ClickDeleteHdl_Impl, void *, EMPTYARG )
if ( nPos != LISTBOX_ENTRY_NOTFOUND )
{
QueryBox aQueryBox( DLGWIN, WinBits( WB_YES_NO | WB_DEF_NO ),
-//! SVX_RES( RID_SVXSTR_DEL_LINESTYLE ),
- String( SVX_RES( RID_SVXSTR_ASK_DEL_LINESTYLE ) ) );
+ String( CUI_RES( RID_SVXSTR_ASK_DEL_LINESTYLE ) ) );
if ( aQueryBox.Execute() == RET_YES )
{
@@ -785,7 +773,7 @@ IMPL_LINK( SvxLineDefTabPage, ClickDeleteHdl_Impl, void *, EMPTYARG )
IMPL_LINK( SvxLineDefTabPage, ClickLoadHdl_Impl, void *, EMPTYARG )
{
- ResMgr& rMgr = DIALOG_MGR();
+ ResMgr& rMgr = CUI_MGR();
USHORT nReturn = RET_YES;
if ( *pnDashListState & CT_MODIFIED )
@@ -916,7 +904,7 @@ IMPL_LINK( SvxLineDefTabPage, ClickSaveHdl_Impl, void *, EMPTYARG )
{
/* // Ermitteln (evtl. abschneiden) des Namens und in
// der GroupBox darstellen
- String aString( SVX_RES( RID_SVXSTR_TABLE ) );
+ String aString( CUI_RES( RID_SVXSTR_TABLE ) );
aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
if ( aURL.getBase().Len() > 18 )
@@ -937,7 +925,7 @@ IMPL_LINK( SvxLineDefTabPage, ClickSaveHdl_Impl, void *, EMPTYARG )
else
{
ErrorBox( DLGWIN, WinBits( WB_OK ),
- String( SVX_RES( RID_SVXSTR_WRITE_DATA_ERROR ) ) ).Execute();
+ String( CUI_RES( RID_SVXSTR_WRITE_DATA_ERROR ) ) ).Execute();
}
}
diff --git a/svx/source/cui/tplneend.cxx b/cui/source/tabpages/tplneend.cxx
index c83a88956273..08626f051f82 100644
--- a/svx/source/cui/tplneend.cxx
+++ b/cui/source/tabpages/tplneend.cxx
@@ -29,46 +29,39 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
// include ---------------------------------------------------------------
#include <tools/shl.hxx>
#include <tools/urlobj.hxx>
#include <vcl/msgbox.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
#include <sfx2/app.hxx>
#include <sfx2/filedlghelper.hxx>
#include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
#define _SVX_TPLNEEND_CXX
-#include <svx/dialogs.hrc>
-#include "dlgname.hrc"
+#include <cuires.hrc>
#include "tabline.hrc"
#include "helpid.hrc"
-
-
-
+#include <svx/dialmgr.hxx>
#include <svx/svdobj.hxx>
#include <svx/svdopath.hxx>
-#include "drawitem.hxx"
+#include "svx/drawitem.hxx"
#include <svx/xpool.hxx>
#include <svx/xtable.hxx>
#include "cuitabline.hxx"
-//CHINA001 #include "dlgname.hxx"
#include <svx/svxdlg.hxx> //CHINA001
-#include <svx/dialmgr.hxx>
-#include "dlgutil.hxx"
+#include <dialmgr.hxx>
+#include "svx/dlgutil.hxx"
#include <basegfx/range/b2drange.hxx>
#include <basegfx/polygon/b2dpolygontools.hxx>
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <basegfx/polygon/b2dpolygon.hxx>
#include <basegfx/polygon/b2dpolypolygontools.hxx>
+#include <svx/dialogs.hrc>
#define DLGWIN this->GetParent()->GetParent()
@@ -88,20 +81,20 @@ SvxLineEndDefTabPage::SvxLineEndDefTabPage
const SfxItemSet& rInAttrs
) :
- SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_LINEEND_DEF ), rInAttrs ),
-
- aFlTip ( this, SVX_RES( FL_TIP ) ),
- aFTTitle ( this, SVX_RES( FT_TITLE ) ),
- aEdtName ( this, SVX_RES( EDT_NAME ) ),
- aFTLineEndStyle ( this, SVX_RES( FT_LINE_END_STYLE ) ),
- aLbLineEnds ( this, SVX_RES( LB_LINEENDS ) ),
- aBtnAdd ( this, SVX_RES( BTN_ADD ) ),
- aBtnModify ( this, SVX_RES( BTN_MODIFY ) ),
- aBtnDelete ( this, SVX_RES( BTN_DELETE ) ),
- aBtnLoad ( this, SVX_RES( BTN_LOAD ) ),
- aBtnSave ( this, SVX_RES( BTN_SAVE ) ),
- aFiTip ( this, SVX_RES( FI_TIP ) ),
- aCtlPreview ( this, SVX_RES( CTL_PREVIEW ) ),
+ SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_LINEEND_DEF ), rInAttrs ),
+
+ aFlTip ( this, CUI_RES( FL_TIP ) ),
+ aFTTitle ( this, CUI_RES( FT_TITLE ) ),
+ aEdtName ( this, CUI_RES( EDT_NAME ) ),
+ aFTLineEndStyle ( this, CUI_RES( FT_LINE_END_STYLE ) ),
+ aLbLineEnds ( this, CUI_RES( LB_LINEENDS ) ),
+ aBtnAdd ( this, CUI_RES( BTN_ADD ) ),
+ aBtnModify ( this, CUI_RES( BTN_MODIFY ) ),
+ aBtnDelete ( this, CUI_RES( BTN_DELETE ) ),
+ aBtnLoad ( this, CUI_RES( BTN_LOAD ) ),
+ aBtnSave ( this, CUI_RES( BTN_SAVE ) ),
+ aFiTip ( this, CUI_RES( FI_TIP ) ),
+ aCtlPreview ( this, CUI_RES( CTL_PREVIEW ) ),
rOutAttrs ( rInAttrs ),
pPolyObj( NULL ),
@@ -114,8 +107,8 @@ SvxLineEndDefTabPage::SvxLineEndDefTabPage
rXLSet ( aXLineAttr.GetItemSet() ),
pLineEndList( NULL )
{
- aBtnLoad.SetModeImage( Image( SVX_RES( RID_SVXIMG_LOAD_H ) ), BMP_COLOR_HIGHCONTRAST );
- aBtnSave.SetModeImage( Image( SVX_RES( RID_SVXIMG_SAVE_H ) ), BMP_COLOR_HIGHCONTRAST );
+ aBtnLoad.SetModeImage( Image( CUI_RES( RID_SVXIMG_LOAD_H ) ), BMP_COLOR_HIGHCONTRAST );
+ aBtnSave.SetModeImage( Image( CUI_RES( RID_SVXIMG_SAVE_H ) ), BMP_COLOR_HIGHCONTRAST );
FreeResource();
@@ -201,7 +194,7 @@ void SvxLineEndDefTabPage::ActivatePage( const SfxItemSet& )
DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" );
/* // Ermitteln (evtl. abschneiden) des Namens und in
// der GroupBox darstellen
- String aString( SVX_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
+ String aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
if ( aURL.getBase().Len() > 18 )
{
@@ -244,8 +237,7 @@ void SvxLineEndDefTabPage::CheckChanges_Impl()
if( aString != aLbLineEnds.GetSelectEntry() )
{
QueryBox aQueryBox( DLGWIN, WinBits( WB_YES_NO | WB_DEF_NO ),
-//! SVX_RES( RID_SVXSTR_LINEEND ),
- String( SVX_RES( RID_SVXSTR_ASK_CHANGE_LINEEND ) ) );
+ CUI_RESSTR( RID_SVXSTR_ASK_CHANGE_LINEEND ) );
if ( aQueryBox.Execute() == RET_YES )
ClickModifyHdl_Impl( this );
@@ -367,7 +359,7 @@ IMPL_LINK( SvxLineEndDefTabPage, ClickModifyHdl_Impl, void *, EMPTYARG )
if( nPos != LISTBOX_ENTRY_NOTFOUND )
{
- ResMgr& rMgr = DIALOG_MGR();
+ ResMgr& rMgr = CUI_MGR();
String aDesc( ResId( RID_SVXSTR_DESC_LINEEND, rMgr ) );
String aName( aEdtName.GetText() );
long nCount = pLineEndList->Count();
@@ -386,10 +378,9 @@ IMPL_LINK( SvxLineEndDefTabPage, ClickModifyHdl_Impl, void *, EMPTYARG )
aWarningBox.SetHelpId( HID_WARN_NAME_DUPLICATE );
aWarningBox.Execute();
- //CHINA001 SvxNameDialog* pDlg = new SvxNameDialog( DLGWIN, aName, aDesc );
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
- AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc, RID_SVXDLG_NAME );
+ AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc );
DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
BOOL bLoop = TRUE;
@@ -474,8 +465,8 @@ IMPL_LINK( SvxLineEndDefTabPage, ClickAddHdl_Impl, void *, EMPTYARG )
XLineEndEntry* pEntry;
- ResMgr& rMgr = DIALOG_MGR();
- String aNewName( ResId( RID_SVXSTR_LINEEND, rMgr ) );
+ ResMgr& rMgr = CUI_MGR();
+ String aNewName( SVX_RES( RID_SVXSTR_LINEEND ) );
String aDesc( ResId( RID_SVXSTR_DESC_LINEEND, rMgr ) );
String aName;
@@ -495,10 +486,9 @@ IMPL_LINK( SvxLineEndDefTabPage, ClickAddHdl_Impl, void *, EMPTYARG )
bDifferent = FALSE;
}
- //CHINA001 SvxNameDialog* pDlg = new SvxNameDialog( DLGWIN, aName, aDesc );
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
- AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc, RID_SVXDLG_NAME );
+ AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc );
DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
BOOL bLoop = TRUE;
@@ -562,8 +552,7 @@ IMPL_LINK( SvxLineEndDefTabPage, ClickDeleteHdl_Impl, void *, EMPTYARG )
if( nPos != LISTBOX_ENTRY_NOTFOUND )
{
QueryBox aQueryBox( DLGWIN, WinBits( WB_YES_NO | WB_DEF_NO ),
-//! SVX_RES( RID_SVXSTR_DEL_LINEEND ),
- String( SVX_RES( RID_SVXSTR_ASK_DEL_LINEEND ) ) );
+ String( CUI_RES( RID_SVXSTR_ASK_DEL_LINEEND ) ) );
if ( aQueryBox.Execute() == RET_YES )
{
@@ -594,7 +583,7 @@ IMPL_LINK( SvxLineEndDefTabPage, ClickDeleteHdl_Impl, void *, EMPTYARG )
IMPL_LINK( SvxLineEndDefTabPage, ClickLoadHdl_Impl, void *, EMPTYARG )
{
- ResMgr& rMgr = DIALOG_MGR();
+ ResMgr& rMgr = CUI_MGR();
USHORT nReturn = RET_YES;
if ( *pnLineEndListState & CT_MODIFIED )
@@ -721,7 +710,7 @@ IMPL_LINK( SvxLineEndDefTabPage, ClickSaveHdl_Impl, void *, EMPTYARG )
{
/* // Ermitteln (evtl. abschneiden) des Namens und in
// der GroupBox darstellen
- String aString( SVX_RES( RID_SVXSTR_TABLE ) );
+ String aString( CUI_RES( RID_SVXSTR_TABLE ) );
aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
if ( aURL.getBase().Len() > 18 )
@@ -741,7 +730,7 @@ IMPL_LINK( SvxLineEndDefTabPage, ClickSaveHdl_Impl, void *, EMPTYARG )
else
{
ErrorBox( DLGWIN, WinBits( WB_OK ),
- String( SVX_RES( RID_SVXSTR_WRITE_DATA_ERROR ) ) ).Execute();
+ String( CUI_RES( RID_SVXSTR_WRITE_DATA_ERROR ) ) ).Execute();
}
}
return( 0L );
diff --git a/svx/source/cui/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx
index 4515f1f39a31..48d6d627230d 100644
--- a/svx/source/cui/tpshadow.cxx
+++ b/cui/source/tabpages/tpshadow.cxx
@@ -29,32 +29,25 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
// include ---------------------------------------------------------------
#include <tools/shl.hxx>
#include <sfx2/app.hxx>
#include <sfx2/module.hxx>
+#include <svx/dialogs.hrc>
#define _SVX_TPSHADOW_CXX
-#include "xattr.hxx"
+#include "svx/xattr.hxx"
#include <svx/xpool.hxx>
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "tabarea.hrc"
-
-
-
#include <svx/svdattr.hxx>
-
-#include "drawitem.hxx"
+#include "svx/drawitem.hxx"
#include "cuitabarea.hxx"
-#include <svx/dialmgr.hxx>
-#include "dlgutil.hxx"
+#include <dialmgr.hxx>
+#include "svx/dlgutil.hxx"
#include <cuitabline.hxx>
#include <svx/xlineit0.hxx>
@@ -81,19 +74,19 @@ static USHORT pShadowRanges[] =
SvxShadowTabPage::SvxShadowTabPage( Window* pParent, const SfxItemSet& rInAttrs ) :
- SvxTabPage ( pParent, SVX_RES( RID_SVXPAGE_SHADOW ), rInAttrs ),
-
- aFlProp ( this, SVX_RES( FL_PROP ) ),
- aTsbShowShadow ( this, SVX_RES( TSB_SHOW_SHADOW ) ),
- aFtPosition ( this, SVX_RES( FT_POSITION ) ),
- aCtlPosition ( this, SVX_RES( CTL_POSITION ) ),
- aFtDistance ( this, SVX_RES( FT_DISTANCE ) ),
- aMtrDistance ( this, SVX_RES( MTR_FLD_DISTANCE ) ),
- aFtShadowColor ( this, SVX_RES( FT_SHADOW_COLOR ) ),
- aLbShadowColor ( this, SVX_RES( LB_SHADOW_COLOR ) ),
- aFtTransparent ( this, SVX_RES( FT_TRANSPARENT ) ),
- aMtrTransparent ( this, SVX_RES( MTR_SHADOW_TRANSPARENT ) ),
- aCtlXRectPreview ( this, SVX_RES( CTL_COLOR_PREVIEW ) ),
+ SvxTabPage ( pParent, CUI_RES( RID_SVXPAGE_SHADOW ), rInAttrs ),
+
+ aFlProp ( this, CUI_RES( FL_PROP ) ),
+ aTsbShowShadow ( this, CUI_RES( TSB_SHOW_SHADOW ) ),
+ aFtPosition ( this, CUI_RES( FT_POSITION ) ),
+ aCtlPosition ( this, CUI_RES( CTL_POSITION ) ),
+ aFtDistance ( this, CUI_RES( FT_DISTANCE ) ),
+ aMtrDistance ( this, CUI_RES( MTR_FLD_DISTANCE ) ),
+ aFtShadowColor ( this, CUI_RES( FT_SHADOW_COLOR ) ),
+ aLbShadowColor ( this, CUI_RES( LB_SHADOW_COLOR ) ),
+ aFtTransparent ( this, CUI_RES( FT_TRANSPARENT ) ),
+ aMtrTransparent ( this, CUI_RES( MTR_SHADOW_TRANSPARENT ) ),
+ aCtlXRectPreview ( this, CUI_RES( CTL_COLOR_PREVIEW ) ),
rOutAttrs ( rInAttrs ),
pColorTab( NULL ),
bDisable ( FALSE ),
diff --git a/svx/source/cui/transfrm.cxx b/cui/source/tabpages/transfrm.cxx
index ba1bee46e1a1..57e82898a947 100644
--- a/svx/source/cui/transfrm.cxx
+++ b/cui/source/tabpages/transfrm.cxx
@@ -29,15 +29,10 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#ifdef SVX_DLLIMPLEMENTATION
-#undef SVX_DLLIMPLEMENTATION
-#endif
+#include "precompiled_cui.hxx"
// include ---------------------------------------------------------------
-
#include <tools/shl.hxx>
#include <sfx2/app.hxx>
#include <svx/svdview.hxx>
@@ -45,20 +40,19 @@
#include <svx/svdpagv.hxx>
#include <svx/svdotext.hxx>
#include <svx/sderitm.hxx>
-
-#include <svx/svxids.hrc>
#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "transfrm.hrc"
#include <svx/sizeitem.hxx>
#include "transfrm.hxx"
-#include <svx/dialmgr.hxx>
-#include "dlgutil.hxx"
+#include <dialmgr.hxx>
+#include "svx/dlgutil.hxx"
#include <svx/svxenum.hxx>
-#include "anchorid.hxx"
+#include "svx/anchorid.hxx"
#include <sfx2/module.hxx>
-#include <svtools/rectitem.hxx>
-#include <svtools/aeitem.hxx>
+#include <svl/rectitem.hxx>
+#include <svl/aeitem.hxx>
#include <swpossizetabpage.hxx>
// Toleranz fuer WorkingArea
@@ -131,7 +125,7 @@ void lcl_ScaleRect(basegfx::B2DRange& rRange, const Fraction aUIScale)
SvxTransformTabDialog::SvxTransformTabDialog( Window* pParent, const SfxItemSet* pAttr,
const SdrView* pSdrView, USHORT nAnchorTypes ) :
- SfxTabDialog( pParent, SVX_RES( RID_SVXDLG_TRANSFORM ), pAttr ),
+ SfxTabDialog( pParent, CUI_RES( RID_SVXDLG_TRANSFORM ), pAttr ),
pView ( pSdrView ),
nAnchorCtrls(nAnchorTypes)
{
@@ -233,20 +227,20 @@ void SvxTransformTabDialog::SetValidateFramePosLink(const Link& rLink)
\************************************************************************/
SvxAngleTabPage::SvxAngleTabPage( Window* pParent, const SfxItemSet& rInAttrs ) :
- SvxTabPage ( pParent, SVX_RES( RID_SVXPAGE_ANGLE ), rInAttrs ),
- aFlPosition ( this, SVX_RES( FL_POSITION ) ),
- aFtPosX ( this, SVX_RES( FT_POS_X ) ),
- aMtrPosX ( this, SVX_RES( MTR_FLD_POS_X ) ),
- aFtPosY ( this, SVX_RES( FT_POS_Y ) ),
- aMtrPosY ( this, SVX_RES( MTR_FLD_POS_Y ) ),
- aFtPosPresets ( this, SVX_RES(FT_POSPRESETS) ),
- aCtlRect ( this, SVX_RES( CTL_RECT ) ),
-
- aFlAngle ( this, SVX_RES( FL_ANGLE ) ),
- aFtAngle ( this, SVX_RES( FT_ANGLE ) ),
- aMtrAngle ( this, SVX_RES( MTR_FLD_ANGLE ) ),
- aFtAnglePresets ( this, SVX_RES(FT_ANGLEPRESETS) ),
- aCtlAngle ( this, SVX_RES( CTL_ANGLE ),
+ SvxTabPage ( pParent, CUI_RES( RID_SVXPAGE_ANGLE ), rInAttrs ),
+ aFlPosition ( this, CUI_RES( FL_POSITION ) ),
+ aFtPosX ( this, CUI_RES( FT_POS_X ) ),
+ aMtrPosX ( this, CUI_RES( MTR_FLD_POS_X ) ),
+ aFtPosY ( this, CUI_RES( FT_POS_Y ) ),
+ aMtrPosY ( this, CUI_RES( MTR_FLD_POS_Y ) ),
+ aFtPosPresets ( this, CUI_RES(FT_POSPRESETS) ),
+ aCtlRect ( this, CUI_RES( CTL_RECT ) ),
+
+ aFlAngle ( this, CUI_RES( FL_ANGLE ) ),
+ aFtAngle ( this, CUI_RES( FT_ANGLE ) ),
+ aMtrAngle ( this, CUI_RES( MTR_FLD_ANGLE ) ),
+ aFtAnglePresets ( this, CUI_RES(FT_ANGLEPRESETS) ),
+ aCtlAngle ( this, CUI_RES( CTL_ANGLE ),
RP_RB, 200, 80, CS_ANGLE ),
rOutAttrs ( rInAttrs )
{
@@ -524,14 +518,14 @@ IMPL_LINK( SvxAngleTabPage, ModifiedHdl, void *, EMPTYARG )
\************************************************************************/
SvxSlantTabPage::SvxSlantTabPage( Window* pParent, const SfxItemSet& rInAttrs ) :
- SvxTabPage ( pParent, SVX_RES( RID_SVXPAGE_SLANT ), rInAttrs ),
-
- aFlRadius ( this, SVX_RES( FL_RADIUS ) ),
- aFtRadius ( this, SVX_RES( FT_RADIUS ) ),
- aMtrRadius ( this, SVX_RES( MTR_FLD_RADIUS ) ),
- aFlAngle ( this, SVX_RES( FL_SLANT ) ),
- aFtAngle ( this, SVX_RES( FT_ANGLE ) ),
- aMtrAngle ( this, SVX_RES( MTR_FLD_ANGLE ) ),
+ SvxTabPage ( pParent, CUI_RES( RID_SVXPAGE_SLANT ), rInAttrs ),
+
+ aFlRadius ( this, CUI_RES( FL_RADIUS ) ),
+ aFtRadius ( this, CUI_RES( FT_RADIUS ) ),
+ aMtrRadius ( this, CUI_RES( MTR_FLD_RADIUS ) ),
+ aFlAngle ( this, CUI_RES( FL_SLANT ) ),
+ aFtAngle ( this, CUI_RES( FT_ANGLE ) ),
+ aMtrAngle ( this, CUI_RES( MTR_FLD_ANGLE ) ),
rOutAttrs ( rInAttrs )
{
FreeResource();
@@ -714,34 +708,34 @@ void SvxSlantTabPage::PointChanged( Window* , RECT_POINT )
\************************************************************************/
SvxPositionSizeTabPage::SvxPositionSizeTabPage( Window* pParent, const SfxItemSet& rInAttrs ) :
- SvxTabPage ( pParent, SVX_RES( RID_SVXPAGE_POSITION_SIZE ), rInAttrs ),
- maFlPosition ( this, SVX_RES( FL_POSITION ) ),
- maFtPosX ( this, SVX_RES( FT_POS_X ) ),
- maMtrPosX ( this, SVX_RES( MTR_FLD_POS_X ) ),
- maFtPosY ( this, SVX_RES( FT_POS_Y ) ),
- maMtrPosY ( this, SVX_RES( MTR_FLD_POS_Y ) ),
- maFtPosReference ( this, SVX_RES( FT_POSREFERENCE ) ),
- maCtlPos ( this, SVX_RES( CTL_POSRECT ), RP_LT ),
-
- maFlSize ( this, SVX_RES( FL_SIZE ) ),
- maFtWidth ( this, SVX_RES( FT_WIDTH ) ),
- maMtrWidth ( this, SVX_RES( MTR_FLD_WIDTH ) ),
- maFtHeight ( this, SVX_RES( FT_HEIGHT ) ),
- maMtrHeight ( this, SVX_RES( MTR_FLD_HEIGHT ) ),
- maCbxScale ( this, SVX_RES( CBX_SCALE ) ),
- maFtSizeReference ( this, SVX_RES( FT_SIZEREFERENCE) ),
- maCtlSize ( this, SVX_RES( CTL_SIZERECT ), RP_LT ),
-
- maFlProtect ( this, SVX_RES( FL_PROTECT) ),
- maTsbPosProtect ( this, SVX_RES( TSB_POSPROTECT ) ),
- maTsbSizeProtect ( this, SVX_RES( TSB_SIZEPROTECT ) ),
-
-
- maFlAdjust ( this, SVX_RES( FL_ADJUST ) ),
- maTsbAutoGrowWidth ( this, SVX_RES( TSB_AUTOGROW_WIDTH ) ),
- maTsbAutoGrowHeight ( this, SVX_RES( TSB_AUTOGROW_HEIGHT ) ),
-
- maFlDivider (this, SVX_RES( FL_DIVIDER ) ),
+ SvxTabPage ( pParent, CUI_RES( RID_SVXPAGE_POSITION_SIZE ), rInAttrs ),
+ maFlPosition ( this, CUI_RES( FL_POSITION ) ),
+ maFtPosX ( this, CUI_RES( FT_POS_X ) ),
+ maMtrPosX ( this, CUI_RES( MTR_FLD_POS_X ) ),
+ maFtPosY ( this, CUI_RES( FT_POS_Y ) ),
+ maMtrPosY ( this, CUI_RES( MTR_FLD_POS_Y ) ),
+ maFtPosReference ( this, CUI_RES( FT_POSREFERENCE ) ),
+ maCtlPos ( this, CUI_RES( CTL_POSRECT ), RP_LT ),
+
+ maFlSize ( this, CUI_RES( FL_SIZE ) ),
+ maFtWidth ( this, CUI_RES( FT_WIDTH ) ),
+ maMtrWidth ( this, CUI_RES( MTR_FLD_WIDTH ) ),
+ maFtHeight ( this, CUI_RES( FT_HEIGHT ) ),
+ maMtrHeight ( this, CUI_RES( MTR_FLD_HEIGHT ) ),
+ maCbxScale ( this, CUI_RES( CBX_SCALE ) ),
+ maFtSizeReference ( this, CUI_RES( FT_SIZEREFERENCE) ),
+ maCtlSize ( this, CUI_RES( CTL_SIZERECT ), RP_LT ),
+
+ maFlProtect ( this, CUI_RES( FL_PROTECT) ),
+ maTsbPosProtect ( this, CUI_RES( TSB_POSPROTECT ) ),
+ maTsbSizeProtect ( this, CUI_RES( TSB_SIZEPROTECT ) ),
+
+
+ maFlAdjust ( this, CUI_RES( FL_ADJUST ) ),
+ maTsbAutoGrowWidth ( this, CUI_RES( TSB_AUTOGROW_WIDTH ) ),
+ maTsbAutoGrowHeight ( this, CUI_RES( TSB_AUTOGROW_HEIGHT ) ),
+
+ maFlDivider (this, CUI_RES( FL_DIVIDER ) ),
mrOutAttrs ( rInAttrs ),
mnProtectSizeState( STATE_NOCHECK ),
diff --git a/svx/source/cui/transfrm.hrc b/cui/source/tabpages/transfrm.hrc
index a49a8c3f3985..a49a8c3f3985 100644
--- a/svx/source/cui/transfrm.hrc
+++ b/cui/source/tabpages/transfrm.hrc
diff --git a/svx/source/cui/transfrm.src b/cui/source/tabpages/transfrm.src
index 1a64d5962f85..8b7e754dda81 100644
--- a/svx/source/cui/transfrm.src
+++ b/cui/source/tabpages/transfrm.src
@@ -30,9 +30,9 @@
// include ------------------------------------------------------------------
#include <svtools/controldims.hrc>
#include "helpid.hrc"
-#include <svx/dialogs.hrc>
+#include <cuires.hrc>
#include "transfrm.hrc"
- // pragma -------------------------------------------------------------------
+#include <svx/dialogs.hrc>
#define MA_TABPAGE_HEIGHT 185
diff --git a/svx/util/cui.map b/cui/util/cui.map
index b43a11bd5096..b43a11bd5096 100644
--- a/svx/util/cui.map
+++ b/cui/util/cui.map
diff --git a/cui/util/hidother.src b/cui/util/hidother.src
new file mode 100644
index 000000000000..313161f7c3cd
--- /dev/null
+++ b/cui/util/hidother.src
@@ -0,0 +1,203 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: hidother.src,v $
+ * $Revision: 1.45 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include "../source/inc/helpid.hrc" // HID_XXX
+
+hidspecial HID_AUTOCORR_LANGUAGE { HelpId = HID_AUTOCORR_LANGUAGE; };
+hidspecial HID_CLB_EDIT_MODULES_DICS { HelpID = HID_CLB_EDIT_MODULES_DICS ;};
+hidspecial HID_CLB_EDIT_MODULES_MODULES { HelpID = HID_CLB_EDIT_MODULES_MODULES ;};
+hidspecial HID_CLB_LINGU_MODULES { HelpID = HID_CLB_LINGU_MODULES ;};
+hidspecial HID_CLB_LINGU_OPTIONS { HelpID = HID_CLB_LINGU_OPTIONS ;};
+hidspecial HID_COLORPAGE_ANCHOR_CB { HelpID = HID_COLORPAGE_ANCHOR_CB ; };
+hidspecial HID_COLORPAGE_ANCHOR_LB { HelpID = HID_COLORPAGE_ANCHOR_LB ; };
+hidspecial HID_COLORPAGE_APPBACKGROUND_CB { HelpID = HID_COLORPAGE_APPBACKGROUND_CB ; };
+hidspecial HID_COLORPAGE_APPBACKGROUND_LB { HelpID = HID_COLORPAGE_APPBACKGROUND_LB ; };
+hidspecial HID_COLORPAGE_BASICCOMMENT_CB { HelpID = HID_COLORPAGE_BASICCOMMENT_CB ; };
+hidspecial HID_COLORPAGE_BASICCOMMENT_LB { HelpID = HID_COLORPAGE_BASICCOMMENT_LB ; };
+hidspecial HID_COLORPAGE_BASICERROR_CB { HelpID = HID_COLORPAGE_BASICERROR_CB ; };
+hidspecial HID_COLORPAGE_BASICERROR_LB { HelpID = HID_COLORPAGE_BASICERROR_LB ; };
+hidspecial HID_COLORPAGE_BASICIDENTIFIER_CB { HelpID = HID_COLORPAGE_BASICIDENTIFIER_CB ; };
+hidspecial HID_COLORPAGE_BASICIDENTIFIER_LB { HelpID = HID_COLORPAGE_BASICIDENTIFIER_LB ; };
+hidspecial HID_COLORPAGE_BASICKEYWORD_CB { HelpID = HID_COLORPAGE_BASICKEYWORD_CB ; };
+hidspecial HID_COLORPAGE_BASICKEYWORD_LB { HelpID = HID_COLORPAGE_BASICKEYWORD_LB ; };
+hidspecial HID_COLORPAGE_BASICNUMBER_CB { HelpID = HID_COLORPAGE_BASICNUMBER_CB ; };
+hidspecial HID_COLORPAGE_BASICNUMBER_LB { HelpID = HID_COLORPAGE_BASICNUMBER_LB ; };
+hidspecial HID_COLORPAGE_BASICOPERATOR_CB { HelpID = HID_COLORPAGE_BASICOPERATOR_CB ; };
+hidspecial HID_COLORPAGE_BASICOPERATOR_LB { HelpID = HID_COLORPAGE_BASICOPERATOR_LB ; };
+hidspecial HID_COLORPAGE_BASICSTRING_CB { HelpID = HID_COLORPAGE_BASICSTRING_CB ; };
+hidspecial HID_COLORPAGE_BASICSTRING_LB { HelpID = HID_COLORPAGE_BASICSTRING_LB ; };
+hidspecial HID_COLORPAGE_CALCDETECTIVEERROR_CB { HelpID = HID_COLORPAGE_CALCDETECTIVEERROR_CB ; };
+hidspecial HID_COLORPAGE_CALCDETECTIVEERROR_LB { HelpID = HID_COLORPAGE_CALCDETECTIVEERROR_LB ; };
+hidspecial HID_COLORPAGE_CALCDETECTIVE_CB { HelpID = HID_COLORPAGE_CALCDETECTIVE_CB ; };
+hidspecial HID_COLORPAGE_CALCDETECTIVE_LB { HelpID = HID_COLORPAGE_CALCDETECTIVE_LB ; };
+hidspecial HID_COLORPAGE_CALCGRID_CB { HelpID = HID_COLORPAGE_CALCGRID_CB ; };
+hidspecial HID_COLORPAGE_CALCGRID_LB { HelpID = HID_COLORPAGE_CALCGRID_LB ; };
+hidspecial HID_COLORPAGE_CALCNOTESBACKGROUND_CB { HelpID = HID_COLORPAGE_CALCNOTESBACKGROUND_CB ; };
+hidspecial HID_COLORPAGE_CALCNOTESBACKGROUND_LB { HelpID = HID_COLORPAGE_CALCNOTESBACKGROUND_LB ; };
+hidspecial HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_CB { HelpID = HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_CB ; };
+hidspecial HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_LB { HelpID = HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_LB ; };
+hidspecial HID_COLORPAGE_CALCPAGEBREAKMANUAL_CB { HelpID = HID_COLORPAGE_CALCPAGEBREAKMANUAL_CB ; };
+hidspecial HID_COLORPAGE_CALCPAGEBREAKMANUAL_LB { HelpID = HID_COLORPAGE_CALCPAGEBREAKMANUAL_LB ; };
+hidspecial HID_COLORPAGE_CALCPAGEBREAK_CB { HelpID = HID_COLORPAGE_CALCPAGEBREAK_CB ; };
+hidspecial HID_COLORPAGE_CALCPAGEBREAK_LB { HelpID = HID_COLORPAGE_CALCPAGEBREAK_LB ; };
+hidspecial HID_COLORPAGE_CALCREFERENCE_CB { HelpID = HID_COLORPAGE_CALCREFERENCE_CB ; };
+hidspecial HID_COLORPAGE_CALCREFERENCE_LB { HelpID = HID_COLORPAGE_CALCREFERENCE_LB ; };
+hidspecial HID_COLORPAGE_DOCBOUNDARIES_CB { HelpID = HID_COLORPAGE_DOCBOUNDARIES_CB ; };
+hidspecial HID_COLORPAGE_DOCBOUNDARIES_LB { HelpID = HID_COLORPAGE_DOCBOUNDARIES_LB ; };
+hidspecial HID_COLORPAGE_DOCCOLOR_CB { HelpID = HID_COLORPAGE_DOCCOLOR_CB ; };
+hidspecial HID_COLORPAGE_DOCCOLOR_LB { HelpID = HID_COLORPAGE_DOCCOLOR_LB ; };
+hidspecial HID_COLORPAGE_DRAWDRAWING_CB { HelpID = HID_COLORPAGE_DRAWDRAWING_CB ; };
+hidspecial HID_COLORPAGE_DRAWDRAWING_LB { HelpID = HID_COLORPAGE_DRAWDRAWING_LB ; };
+hidspecial HID_COLORPAGE_DRAWFILL_CB { HelpID = HID_COLORPAGE_DRAWFILL_CB ; };
+hidspecial HID_COLORPAGE_DRAWFILL_LB { HelpID = HID_COLORPAGE_DRAWFILL_LB ; };
+hidspecial HID_COLORPAGE_DRAWGRID_CB { HelpID = HID_COLORPAGE_DRAWGRID_CB ; };
+hidspecial HID_COLORPAGE_DRAWGRID_LB { HelpID = HID_COLORPAGE_DRAWGRID_LB ; };
+hidspecial HID_COLORPAGE_FONTCOLOR_CB { HelpID = HID_COLORPAGE_FONTCOLOR_CB ; };
+hidspecial HID_COLORPAGE_FONTCOLOR_LB { HelpID = HID_COLORPAGE_FONTCOLOR_LB ; };
+hidspecial HID_COLORPAGE_HTMLCOMMENT_CB { HelpID = HID_COLORPAGE_HTMLCOMMENT_CB ; };
+hidspecial HID_COLORPAGE_HTMLCOMMENT_LB { HelpID = HID_COLORPAGE_HTMLCOMMENT_LB ; };
+hidspecial HID_COLORPAGE_HTMLKEYWORD_CB { HelpID = HID_COLORPAGE_HTMLKEYWORD_CB ; };
+hidspecial HID_COLORPAGE_HTMLKEYWORD_LB { HelpID = HID_COLORPAGE_HTMLKEYWORD_LB ; };
+hidspecial HID_COLORPAGE_HTMLSGML_CB { HelpID = HID_COLORPAGE_HTMLSGML_CB ; };
+hidspecial HID_COLORPAGE_HTMLSGML_LB { HelpID = HID_COLORPAGE_HTMLSGML_LB ; };
+hidspecial HID_COLORPAGE_HTMLUNKNOWN_CB { HelpID = HID_COLORPAGE_HTMLUNKNOWN_CB ; };
+hidspecial HID_COLORPAGE_HTMLUNKNOWN_LB { HelpID = HID_COLORPAGE_HTMLUNKNOWN_LB ; };
+hidspecial HID_COLORPAGE_LINKSVISITED_CB { HelpID = HID_COLORPAGE_LINKSVISITED_CB ; };
+hidspecial HID_COLORPAGE_LINKSVISITED_LB { HelpID = HID_COLORPAGE_LINKSVISITED_LB ; };
+hidspecial HID_COLORPAGE_LINKS_CB { HelpID = HID_COLORPAGE_LINKS_CB ; };
+hidspecial HID_COLORPAGE_LINKS_LB { HelpID = HID_COLORPAGE_LINKS_LB ; };
+hidspecial HID_COLORPAGE_OBJECTBOUNDARIES_CB { HelpID = HID_COLORPAGE_OBJECTBOUNDARIES_CB ; };
+hidspecial HID_COLORPAGE_OBJECTBOUNDARIES_LB { HelpID = HID_COLORPAGE_OBJECTBOUNDARIES_LB ; };
+hidspecial HID_COLORPAGE_SPELL_CB { HelpID = HID_COLORPAGE_SPELL_CB ; };
+hidspecial HID_COLORPAGE_SPELL_LB { HelpID = HID_COLORPAGE_SPELL_LB ; };
+hidspecial HID_COLORPAGE_TABLEBOUNDARIES_CB { HelpID = HID_COLORPAGE_TABLEBOUNDARIES_CB ; };
+hidspecial HID_COLORPAGE_TABLEBOUNDARIES_LB { HelpID = HID_COLORPAGE_TABLEBOUNDARIES_LB ; };
+hidspecial HID_COLORPAGE_WRITERDIRECTCURSOR_CB { HelpID = HID_COLORPAGE_WRITERDIRECTCURSOR_CB ; };
+hidspecial HID_COLORPAGE_WRITERDIRECTCURSOR_LB { HelpID = HID_COLORPAGE_WRITERDIRECTCURSOR_LB ; };
+hidspecial HID_COLORPAGE_WRITERFIELDSHADINGS_CB { HelpID = HID_COLORPAGE_WRITERFIELDSHADINGS_CB ; };
+hidspecial HID_COLORPAGE_WRITERFIELDSHADINGS_LB { HelpID = HID_COLORPAGE_WRITERFIELDSHADINGS_LB ; };
+hidspecial HID_COLORPAGE_WRITERIDXSHADINGS_CB { HelpID = HID_COLORPAGE_WRITERIDXSHADINGS_CB ; };
+hidspecial HID_COLORPAGE_WRITERIDXSHADINGS_LB { HelpID = HID_COLORPAGE_WRITERIDXSHADINGS_LB ; };
+hidspecial HID_COLORPAGE_WRITERNOTESINDICATOR_CB { HelpID = HID_COLORPAGE_WRITERNOTESINDICATOR_CB ; };
+hidspecial HID_COLORPAGE_WRITERNOTESINDICATOR_LB { HelpID = HID_COLORPAGE_WRITERNOTESINDICATOR_LB ; };
+hidspecial HID_COLORPAGE_WRITERPAGEBREAKS_CB { HelpID = HID_COLORPAGE_WRITERPAGEBREAKS_CB ; };
+hidspecial HID_COLORPAGE_WRITERPAGEBREAKS_LB { HelpID = HID_COLORPAGE_WRITERPAGEBREAKS_LB ; };
+hidspecial HID_COLORPAGE_WRITERSCRIPTINDICATOR_CB { HelpID = HID_COLORPAGE_WRITERSCRIPTINDICATOR_CB ; };
+hidspecial HID_COLORPAGE_WRITERSCRIPTINDICATOR_LB { HelpID = HID_COLORPAGE_WRITERSCRIPTINDICATOR_LB ; };
+hidspecial HID_COLORPAGE_WRITERSECTIONBOUNDARIES_CB { HelpID = HID_COLORPAGE_WRITERSECTIONBOUNDARIES_CB ; };
+hidspecial HID_COLORPAGE_WRITERSECTIONBOUNDARIES_LB { HelpID = HID_COLORPAGE_WRITERSECTIONBOUNDARIES_LB ; };
+hidspecial HID_COLORPAGE_WRITERTEXTGRID_CB { HelpID = HID_COLORPAGE_WRITERTEXTGRID_CB ; };
+hidspecial HID_COLORPAGE_WRITERTEXTGRID_LB { HelpID = HID_COLORPAGE_WRITERTEXTGRID_LB ; };
+hidspecial HID_DBPATH_CTL_PATH { HelpId = HID_DBPATH_CTL_PATH; };
+hidspecial HID_DBPATH_HEADERBAR { HelpId = HID_DBPATH_HEADERBAR; };
+hidspecial HID_GALLERY_EDIT_MSNAME { HelpID = HID_GALLERY_EDIT_MSNAME ; };
+hidspecial HID_GALLERY_NEWTHEME_ADDFILES { HelpID = HID_GALLERY_NEWTHEME_ADDFILES; };
+hidspecial HID_GALLERY_NEWTHEME_FINDFILES { HelpID = HID_GALLERY_NEWTHEME_FINDFILES; };
+hidspecial HID_HANGULDLG_BUTTON_CHANGE { HelpID = HID_HANGULDLG_BUTTON_CHANGE ; };
+hidspecial HID_HANGULDLG_BUTTON_CHANGEALL { HelpID = HID_HANGULDLG_BUTTON_CHANGEALL; };
+hidspecial HID_HANGULDLG_BUTTON_CLOSE { HelpID = HID_HANGULDLG_BUTTON_CLOSE ; };
+hidspecial HID_HANGULDLG_BUTTON_IGNORE { HelpID = HID_HANGULDLG_BUTTON_IGNORE ; };
+hidspecial HID_HANGULDLG_BUTTON_IGNOREALL { HelpID = HID_HANGULDLG_BUTTON_IGNOREALL; };
+hidspecial HID_HANGULDLG_BUTTON_OPTIONS { HelpId = HID_HANGULDLG_BUTTON_OPTIONS; };
+hidspecial HID_HANGULDLG_EDIT_NEWWORD { HelpID = HID_HANGULDLG_EDIT_NEWWORD ; };
+hidspecial HID_HANGULDLG_SUGGESTIONS { HelpId = HID_HANGULDLG_SUGGESTIONS; };
+hidspecial HID_HANGULDLG_SUGGESTIONS_GRID { HelpId = HID_HANGULDLG_SUGGESTIONS_GRID; };
+hidspecial HID_HANGULDLG_SUGGESTIONS_LIST { HelpId = HID_HANGULDLG_SUGGESTIONS_LIST; };
+hidspecial HID_HYPERDLG_DOC_PATH { HelpID = HID_HYPERDLG_DOC_PATH ;};
+hidspecial HID_HYPERDLG_INET_PATH { HelpID = HID_HYPERDLG_INET_PATH ;};
+hidspecial HID_HYPERDLG_MAIL_PATH { HelpID = HID_HYPERDLG_MAIL_PATH ;};
+hidspecial HID_ICCDIALOG_CANCEL_BTN { HelpID = HID_ICCDIALOG_CANCEL_BTN ;};
+hidspecial HID_ICCDIALOG_CHOICECTRL { HelpID = HID_ICCDIALOG_CHOICECTRL ;};
+hidspecial HID_ICCDIALOG_OK_BTN { HelpID = HID_ICCDIALOG_OK_BTN ;};
+hidspecial HID_ICCDIALOG_RESET_BTN { HelpID = HID_ICCDIALOG_RESET_BTN ;};
+hidspecial HID_LINKDLG_TABLB { HelpId = HID_LINKDLG_TABLB; };
+hidspecial HID_NUMBERINGOPT_SEL_GRF_FROM_FILE { HelpID = HID_NUMBERINGOPT_SEL_GRF_FROM_FILE; };
+hidspecial HID_OFADLG_TREELISTBOX { HelpId = HID_OFADLG_TREELISTBOX; };
+hidspecial HID_OFAPAGE_AUTOCORR_CLB { HelpId = HID_OFAPAGE_AUTOCORR_CLB; };
+hidspecial HID_OFAPAGE_AUTOFORMAT_CLB { HelpId = HID_OFAPAGE_AUTOFORMAT_CLB; };
+hidspecial HID_OFAPAGE_MSFLTR2_CLB { HelpId = HID_OFAPAGE_MSFLTR2_CLB ; };
+hidspecial HID_OFA_CONNPOOL_DRIVERLIST { HelpId = HID_OFA_CONNPOOL_DRIVERLIST; };
+hidspecial HID_OFA_FONT_SUBST_CLB { HelpId = HID_OFA_FONT_SUBST_CLB; };
+hidspecial HID_OPTIONS_COLORCONFIG_COLORLIST_WIN { HelpID = HID_OPTIONS_COLORCONFIG_COLORLIST_WIN ;};
+hidspecial HID_OPTIONS_COLORCONFIG_NAME_SCHEME { HelpID = HID_OPTIONS_COLORCONFIG_NAME_SCHEME ;};
+hidspecial HID_OPTIONS_COLORCONFIG_SAVE_SCHEME { HelpID = HID_OPTIONS_COLORCONFIG_SAVE_SCHEME ;};
+hidspecial HID_OPTIONS_JAVA_LIST { HelpId = HID_OPTIONS_JAVA_LIST; };
+hidspecial HID_OPTIONS_PATHS_SELECTFOLDER { HelpID = HID_OPTIONS_PATHS_SELECTFOLDER; };
+hidspecial HID_OPTPATH_CTL_PATH { HelpId = HID_OPTPATH_CTL_PATH ;};
+hidspecial HID_OPTPATH_HEADERBAR { HelpId = HID_OPTPATH_HEADERBAR ;};
+hidspecial HID_PASTE_DLG { HelpId = HID_PASTE_DLG; };
+hidspecial HID_REDLINING_DLG { HelpID = HID_REDLINING_DLG; };
+hidspecial HID_REDLINING_EDIT { HelpID = HID_REDLINING_EDIT; };
+hidspecial HID_REDLINING_NEXT { HelpID = HID_REDLINING_NEXT; };
+hidspecial HID_REDLINING_PREV { HelpID = HID_REDLINING_PREV; };
+hidspecial HID_SCRIPTSBOX { HelpId = HID_SCRIPTSBOX; };
+hidspecial HID_SELECTOR_CATEGORIES { HelpId = HID_SELECTOR_CATEGORIES; };
+hidspecial HID_SELECTOR_COMMANDS { HelpId = HID_SELECTOR_COMMANDS; };
+hidspecial HID_SELECTOR_DIALOG { HelpId = HID_SELECTOR_DIALOG; };
+hidspecial HID_SPLDLG_BUTTON_CHANGE { HelpID = HID_SPLDLG_BUTTON_CHANGE ; };
+hidspecial HID_SPLDLG_BUTTON_CHANGEALL { HelpID = HID_SPLDLG_BUTTON_CHANGEALL ; };
+hidspecial HID_SPLDLG_BUTTON_CLOSE { HelpID = HID_SPLDLG_BUTTON_CLOSE ; };
+hidspecial HID_SPLDLG_BUTTON_EXPLAIN { HelpID = HID_SPLDLG_BUTTON_EXPLAIN ; };
+hidspecial HID_SPLDLG_BUTTON_IGNORE { HelpID = HID_SPLDLG_BUTTON_IGNORE ; };
+hidspecial HID_SPLDLG_BUTTON_IGNOREALL { HelpID = HID_SPLDLG_BUTTON_IGNOREALL ; };
+hidspecial HID_SPLDLG_BUTTON_IGNORERULE { HelpID = HID_SPLDLG_BUTTON_IGNORERULE ; };
+hidspecial HID_SVX_CONFIG_EVENT { HelpId = HID_SVX_CONFIG_EVENT; };
+hidspecial HID_SVX_CONFIG_ICON_SELECTOR { HelpId = HID_SVX_CONFIG_ICON_SELECTOR; };
+hidspecial HID_SVX_CONFIG_MENU { HelpId = HID_SVX_CONFIG_MENU; };
+hidspecial HID_SVX_CONFIG_MENU_CONTENTS { HelpId = HID_SVX_CONFIG_MENU_CONTENTS; };
+hidspecial HID_SVX_CONFIG_MENU_ORGANIZER { HelpId = HID_SVX_CONFIG_MENU_ORGANIZER; };
+hidspecial HID_SVX_CONFIG_NAME_SUBMENU { HelpId = HID_SVX_CONFIG_NAME_SUBMENU; };
+hidspecial HID_SVX_CONFIG_RENAME_MENU { HelpId = HID_SVX_CONFIG_RENAME_MENU; };
+hidspecial HID_SVX_CONFIG_RENAME_MENU_ITEM { HelpId = HID_SVX_CONFIG_RENAME_MENU_ITEM; };
+hidspecial HID_SVX_CONFIG_RENAME_TOOLBAR { HelpId = HID_SVX_CONFIG_RENAME_TOOLBAR; };
+hidspecial HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM { HelpId = HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM; };
+hidspecial HID_SVX_CONFIG_TOOLBAR { HelpId = HID_SVX_CONFIG_TOOLBAR; };
+hidspecial HID_SVX_CONFIG_TOOLBAR_CONTENTS { HelpId = HID_SVX_CONFIG_TOOLBAR_CONTENTS; };
+hidspecial HID_SVX_MACRO_LB_EVENT { HelpId = HID_SVX_MACRO_LB_EVENT; };
+hidspecial HID_SVX_MODIFY_TOOLBAR { HelpId = HID_SVX_MODIFY_TOOLBAR; };
+hidspecial HID_SVX_MODIFY_TOOLBAR_ITEM { HelpId = HID_SVX_MODIFY_TOOLBAR_ITEM; };
+hidspecial HID_SVX_NEW_TOOLBAR { HelpId = HID_SVX_NEW_TOOLBAR; };
+hidspecial HID_SVX_NEW_TOOLBAR_ITEM { HelpId = HID_SVX_NEW_TOOLBAR_ITEM; };
+hidspecial HID_SVX_SAVE_IN { HelpId = HID_SVX_SAVE_IN; };
+hidspecial HID_TPCOLOR_CMYK_1 { HelpID = HID_TPCOLOR_CMYK_1; };
+hidspecial HID_TPCOLOR_CMYK_2 { HelpID = HID_TPCOLOR_CMYK_2; };
+hidspecial HID_TPCOLOR_CMYK_3 { HelpID = HID_TPCOLOR_CMYK_3; };
+hidspecial HID_TPCOLOR_RGB_1 { HelpID = HID_TPCOLOR_RGB_1; };
+hidspecial HID_TPCOLOR_RGB_2 { HelpID = HID_TPCOLOR_RGB_2; };
+hidspecial HID_TPCOLOR_RGB_3 { HelpID = HID_TPCOLOR_RGB_3; };
+hidspecial HID_VALUESET_BULLET { HelpID = HID_VALUESET_BULLET ;};
+hidspecial HID_VALUESET_NUM { HelpID = HID_VALUESET_NUM ;};
+hidspecial HID_VALUESET_NUMBMP { HelpID = HID_VALUESET_NUMBMP ;};
+hidspecial HID_VALUESET_SINGLENUM { HelpID = HID_VALUESET_SINGLENUM ;};
+hidspecial HID_WARN_NAME_DUPLICATE { HelpID = HID_WARN_NAME_DUPLICATE ;};
+hidspecial UID_OFA_CONNPOOL_DRIVERLIST_BACK { HelpId = UID_OFA_CONNPOOL_DRIVERLIST_BACK; };
+hidspecial UID_SEARCH_RECORDSTATUS { HelpID = UID_SEARCH_RECORDSTATUS ;};
+hidspecial HID_MACRO_HEADERTABLISTBOX { HelpID = HID_MACRO_HEADERTABLISTBOX ;};
+
diff --git a/cui/util/makefile.mk b/cui/util/makefile.mk
new file mode 100644
index 000000000000..bedd1cee6407
--- /dev/null
+++ b/cui/util/makefile.mk
@@ -0,0 +1,110 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2008 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile: makefile.mk,v $
+#
+# $Revision: 1.61 $
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..
+
+PRJNAME=cui
+TARGET=cui
+GEN_HID=TRUE
+GEN_HID_OTHER=TRUE
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE : settings.mk
+
+.IF "$(OS)"=="IRIX"
+LINKFLAGS+=-Wl,-LD_LAYOUT:lgot_buffer=30
+.ENDIF
+
+SHL1TARGET= cui$(DLLPOSTFIX)
+SHL1VERSIONMAP= cui.map
+SHL1IMPLIB=icui
+SHL1DEPN=
+SHL1DEF= $(MISC)$/$(SHL1TARGET).def
+DEF1NAME= $(SHL1TARGET)
+
+SHL1LIBS= \
+ $(SLB)$/options.lib \
+ $(SLB)$/customize.lib \
+ $(SLB)$/dialogs.lib \
+ $(SLB)$/tabpages.lib \
+ $(SLB)$/factory.lib
+
+
+SHL1STDLIBS= \
+ $(SVXCORELIB) \
+ $(SVXLIB) \
+ $(AVMEDIALIB) \
+ $(SFX2LIB) \
+ $(GOODIESLIB) \
+ $(BASEGFXLIB) \
+ $(BASICLIB) \
+ $(LNGLIB) \
+ $(SVTOOLLIB) \
+ $(TKLIB) \
+ $(VCLLIB) \
+ $(SVLLIB) \
+ $(UNOTOOLSLIB) \
+ $(TOOLSLIB) \
+ $(I18NISOLANGLIB) \
+ $(COMPHELPERLIB) \
+ $(UCBHELPERLIB) \
+ $(CPPUHELPERLIB) \
+ $(CPPULIB) \
+ $(VOSLIB) \
+ $(SALLIB) \
+ $(JVMFWKLIB) \
+ $(ICUUCLIB)
+
+.IF "$(GUI)"=="WNT"
+SHL1STDLIBS+= \
+ $(SHLWAPILIB) \
+ $(ADVAPI32LIB)
+.ENDIF # WNT
+
+# ------------------------------------------------------------------------------
+
+# Resource files
+SRSFILELIST=\
+ $(SRS)$/options.srs \
+ $(SRS)$/dialogs.srs \
+ $(SRS)$/tabpages.srs \
+ $(SRS)$/customize.srs \
+
+
+RESLIB1NAME=cui
+RESLIB1IMAGES=$(SOLARSRC)/$(RSCDEFIMG)/svx/res
+RESLIB1SRSFILES= $(SRSFILELIST)
+
+# --- Targets -------------------------------------------------------
+
+.INCLUDE : target.mk
+
diff --git a/cui/util/makefile.pmk b/cui/util/makefile.pmk
new file mode 100644
index 000000000000..b2aae3329111
--- /dev/null
+++ b/cui/util/makefile.pmk
@@ -0,0 +1,47 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2008 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile: makefile.pmk,v $
+#
+# $Revision: 1.6 $
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+# define SVX_DLLIMPLEMENTATION (see @ svxdllapi.h)
+CDEFS += -DSVX_DLLIMPLEMENTATION
+
+.IF "$(ENABLE_GTK)" != ""
+CFLAGS+=-DENABLE_GTK
+.ENDIF
+
+.IF "$(ENABLE_KDE)" != ""
+CFLAGS+=-DENABLE_KDE
+.ENDIF
+
+.IF "$(ENABLE_KDE4)" != ""
+CFLAGS+=-DENABLE_KDE4
+.ENDIF
+
+VISIBILITY_HIDDEN=TRUE
diff --git a/dbaccess/inc/dbaccess_helpid.hrc b/dbaccess/inc/dbaccess_helpid.hrc
index 28771fad05b1..8016124f894d 100644
--- a/dbaccess/inc/dbaccess_helpid.hrc
+++ b/dbaccess/inc/dbaccess_helpid.hrc
@@ -32,7 +32,7 @@
#define _DBA_DBACCESS_HELPID_HRC_
#ifndef _SOLAR_HRC
-#include <svtools/solar.hrc> // HID_DBACCESS_START
+#include <svl/solar.hrc> // HID_DBACCESS_START
#endif
#define HID_DSADMIN_CHARSET (HID_DBACCESS_START + 9)
diff --git a/dbaccess/inc/pch/precompiled_dbaccess.hxx b/dbaccess/inc/pch/precompiled_dbaccess.hxx
index e9e8edf46f80..28e749191284 100644
--- a/dbaccess/inc/pch/precompiled_dbaccess.hxx
+++ b/dbaccess/inc/pch/precompiled_dbaccess.hxx
@@ -458,19 +458,19 @@
#include "comphelper/classids.hxx"
-#include "svtools/cjkoptions.hxx"
-#include "svtools/filenotation.hxx"
-#include "svtools/historyoptions.hxx"
+#include "svl/cjkoptions.hxx"
+#include "svl/filenotation.hxx"
+#include "unotools/historyoptions.hxx"
#include "svtools/htmlkywd.hxx"
#include "svtools/imgdef.hxx"
-#include "svtools/internaloptions.hxx"
+#include "unotools/internaloptions.hxx"
#include "svtools/menuoptions.hxx"
#include "svtools/miscopt.hxx"
#include "svtools/rtfkeywd.hxx"
#include "svtools/rtftoken.h"
-#include "svtools/solar.hrc"
+#include "svl/solar.hrc"
#include "svtools/toolboxcontroller.hxx"
-#include "svtools/viewoptions.hxx"
+#include "unotools/viewoptions.hxx"
#include "svx/dataaccessdescriptor.hxx"
#include "svx/dbexch.hrc"
diff --git a/dbaccess/inc/singledoccontroller.hxx b/dbaccess/inc/singledoccontroller.hxx
index f63d1c02fdf2..1d6773961972 100644
--- a/dbaccess/inc/singledoccontroller.hxx
+++ b/dbaccess/inc/singledoccontroller.hxx
@@ -48,7 +48,7 @@
#include <comphelper/propertycontainer.hxx>
#include <connectivity/dbmetadata.hxx>
#include <cppuhelper/implbase1.hxx>
-#include <svtools/undo.hxx>
+#include <svl/undo.hxx>
#include <memory>
diff --git a/dbaccess/prj/build.lst b/dbaccess/prj/build.lst
index f9cc1523bf84..c52076ffa4a6 100644
--- a/dbaccess/prj/build.lst
+++ b/dbaccess/prj/build.lst
@@ -1,4 +1,4 @@
-ba dbaccess : l10n BOOST:boost connectivity svx stoc uui QADEVOOO:qadevOOo xmlscript NULL
+ba dbaccess : l10n BOOST:boost connectivity svx stoc QADEVOOO:qadevOOo xmlscript NULL
ba dbaccess usr1 - all ba_mkout NULL
ba dbaccess\inc nmake - all ba_inc NULL
ba dbaccess\source\ui\inc nmake - all ba_uiinc ba_inc NULL
diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx
index 9cc2c6172cf4..b3e815928bff 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -310,7 +310,10 @@ void OKeySet::construct(const Reference< XResultSet>& _xDriverSet)
const ::rtl::OUString sOldFilter = xAnalyzer->getFilter();
if ( sOldFilter.getLength() )
{
- aFilter = sOldFilter + aAnd + aFilter.makeStringAndClear();
+ FilterCreator aFilterCreator;
+ aFilterCreator.append( aFilter.makeStringAndClear() );
+ aFilterCreator.append( sOldFilter );
+ aFilter = aFilterCreator.getComposedAndClear();
}
xAnalyzer->setFilter(aFilter.makeStringAndClear());
m_xStatement = m_xConnection->prepareStatement(xAnalyzer->getQueryWithSubstitution());
diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx
index 52670f7a9776..d3df4552126c 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -81,7 +81,7 @@
#include <cppuhelper/interfacecontainer.h>
#include <cppuhelper/typeprovider.hxx>
#include <rtl/logfile.hxx>
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
#include <unotools/configmgr.hxx>
diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
index c8a8f9ba01d1..10878f599c4f 100644
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
@@ -58,7 +58,7 @@
#include <comphelper/types.hxx>
#include <cppuhelper/typeprovider.hxx>
#include <rtl/logfile.hxx>
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
#include <unotools/configmgr.hxx>
diff --git a/dbaccess/source/core/api/querycomposer.cxx b/dbaccess/source/core/api/querycomposer.cxx
index 2e30ceaa7fe8..6b17ad97e12a 100644
--- a/dbaccess/source/core/api/querycomposer.cxx
+++ b/dbaccess/source/core/api/querycomposer.cxx
@@ -86,7 +86,7 @@
#include <com/sun/star/i18n/XLocaleData.hpp>
#endif
#ifndef INCLUDED_SVTOOLS_SYSLOCALE_HXX
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
#endif
#ifndef _COM_SUN_STAR_CONTAINER_XCHILD_HPP_
#include <com/sun/star/container/XChild.hpp>
diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx b/dbaccess/source/core/dataaccess/databasecontext.cxx
index 70237b67e1b1..84dbdff17d13 100644
--- a/dbaccess/source/core/dataaccess/databasecontext.cxx
+++ b/dbaccess/source/core/dataaccess/databasecontext.cxx
@@ -69,8 +69,8 @@
#include <cppuhelper/implbase1.hxx>
#include <cppuhelper/typeprovider.hxx>
#include <cppuhelper/exc_hlp.hxx>
-#include <svtools/filenotation.hxx>
-#include <svtools/pathoptions.hxx>
+#include <svl/filenotation.hxx>
+#include <unotools/pathoptions.hxx>
#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
#include <tools/fsys.hxx>
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx
index 7f74aa3a5f34..5b3add2dcf82 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -73,7 +73,7 @@
#include <comphelper/storagehelper.hxx>
#include <cppuhelper/exc_hlp.hxx>
#include <framework/titlehelper.hxx>
-#include <svtools/saveopt.hxx>
+#include <unotools/saveopt.hxx>
#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
#include <tools/errcode.hxx>
diff --git a/dbaccess/source/core/inc/core_resource.hrc b/dbaccess/source/core/inc/core_resource.hrc
index 2f97249b5b0c..20e0eb280233 100644
--- a/dbaccess/source/core/inc/core_resource.hrc
+++ b/dbaccess/source/core/inc/core_resource.hrc
@@ -32,7 +32,7 @@
#define _DBA_CORE_RESOURCE_HRC_
#ifndef _SOLAR_HRC
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
#endif
//------------------------------------------------------------------------------
diff --git a/dbaccess/source/core/resource/core_resource.cxx b/dbaccess/source/core/resource/core_resource.cxx
index ba605eb8ddfe..d64671c9e2d1 100644
--- a/dbaccess/source/core/resource/core_resource.cxx
+++ b/dbaccess/source/core/resource/core_resource.cxx
@@ -42,7 +42,7 @@
//---------------------------------------------------
#ifndef _SOLAR_HRC
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
#endif
//.........................................................................
diff --git a/dbaccess/source/ext/adabas/Acomponentmodule.cxx b/dbaccess/source/ext/adabas/Acomponentmodule.cxx
index 963437d3b20a..9c8fbe7e09a8 100644
--- a/dbaccess/source/ext/adabas/Acomponentmodule.cxx
+++ b/dbaccess/source/ext/adabas/Acomponentmodule.cxx
@@ -37,7 +37,7 @@
#include <tools/resmgr.hxx>
#endif
#ifndef _SOLAR_HRC
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
#endif
#ifndef _COMPHELPER_SEQUENCE_HXX_
#include <comphelper/sequence.hxx>
diff --git a/dbaccess/source/ext/adabas/AdabasNewDb.cxx b/dbaccess/source/ext/adabas/AdabasNewDb.cxx
index 638de55757dd..f189dec2c46c 100644
--- a/dbaccess/source/ext/adabas/AdabasNewDb.cxx
+++ b/dbaccess/source/ext/adabas/AdabasNewDb.cxx
@@ -75,7 +75,7 @@
#include <vcl/waitobj.hxx>
#endif
#ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
#endif
#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
#include <toolkit/unohlp.hxx>
diff --git a/dbaccess/source/ext/adabas/adabasui_resource.hrc b/dbaccess/source/ext/adabas/adabasui_resource.hrc
index 70f2b7920c12..4bcc9f40274a 100644
--- a/dbaccess/source/ext/adabas/adabasui_resource.hrc
+++ b/dbaccess/source/ext/adabas/adabasui_resource.hrc
@@ -32,7 +32,7 @@
#define _ADABASUI_RESOURCE_HRC_
#ifndef _SOLAR_HRC
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
#endif
#define RID_DIALOG_START RID_DB_EXTENSIONS_START
diff --git a/dbaccess/source/ext/macromigration/dbmm_global.hrc b/dbaccess/source/ext/macromigration/dbmm_global.hrc
index 3ce7577426c7..8afb08b919e2 100644
--- a/dbaccess/source/ext/macromigration/dbmm_global.hrc
+++ b/dbaccess/source/ext/macromigration/dbmm_global.hrc
@@ -31,7 +31,7 @@
#ifndef DBACCESS_DBMM_GLOBAL_HRC
#define DBACCESS_DBMM_GLOBAL_HRC
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
//=====================================================================
//= bases
diff --git a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
index 36ddf714f9bc..a1320d3ca24b 100644
--- a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
+++ b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
@@ -56,7 +56,7 @@
#include <cppuhelper/exc_hlp.hxx>
#include <cppuhelper/implbase1.hxx>
#include <rtl/ref.hxx>
-#include <svtools/filenotation.hxx>
+#include <svl/filenotation.hxx>
#include <tools/diagnose_ex.h>
#include <ucbhelper/content.hxx>
#include <ucbhelper/contentbroker.hxx>
diff --git a/dbaccess/source/filter/migration/cfgimport.cxx b/dbaccess/source/filter/migration/cfgimport.cxx
index 182bd9acbed9..f9e281c74e49 100644
--- a/dbaccess/source/filter/migration/cfgimport.cxx
+++ b/dbaccess/source/filter/migration/cfgimport.cxx
@@ -79,7 +79,7 @@
#include <tools/urlobj.hxx>
#endif
#ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
#endif
#ifndef _COM_SUN_STAR_FRAME_XCOMPONENTLOADER_HPP_
#include <com/sun/star/frame/XComponentLoader.hpp>
diff --git a/dbaccess/source/filter/xml/dbloader2.cxx b/dbaccess/source/filter/xml/dbloader2.cxx
index 7310c2ca10ec..df10a98cc1a2 100644
--- a/dbaccess/source/filter/xml/dbloader2.cxx
+++ b/dbaccess/source/filter/xml/dbloader2.cxx
@@ -75,7 +75,7 @@
#include <cppuhelper/implbase2.hxx>
#include <osl/file.hxx>
#include <sfx2/docfile.hxx>
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
#include <toolkit/awt/vclxwindow.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <tools/diagnose_ex.h>
diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx
index 8008416956f4..489b0af7d718 100644
--- a/dbaccess/source/filter/xml/xmlExport.cxx
+++ b/dbaccess/source/filter/xml/xmlExport.cxx
@@ -103,8 +103,8 @@
#ifndef _COM_SUN_STAR_AWT_FONTDESCRIPTOR_HPP_
#include <com/sun/star/awt/FontDescriptor.hpp>
#endif
-#include <svtools/filenotation.hxx>
-#include <svtools/pathoptions.hxx>
+#include <svl/filenotation.hxx>
+#include <unotools/pathoptions.hxx>
#include <tools/diagnose_ex.h>
#include <connectivity/DriversConfig.hxx>
diff --git a/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx b/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx
index 4cc82ad5e772..35b4b84e8b90 100644
--- a/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx
+++ b/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx
@@ -58,8 +58,8 @@
#include <tools/diagnose_ex.h>
#endif
#include <comphelper/sequence.hxx>
-#include <svtools/filenotation.hxx>
-#include <svtools/pathoptions.hxx>
+#include <svl/filenotation.hxx>
+#include <unotools/pathoptions.hxx>
#include "dsntypes.hxx"
namespace dbaxml
{
diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx
index ed31ce7ef6c1..4fa30ee6885d 100644
--- a/dbaccess/source/filter/xml/xmlfilter.cxx
+++ b/dbaccess/source/filter/xml/xmlfilter.cxx
@@ -124,7 +124,7 @@
#include <vos/mutex.hxx>
#endif
#include <svtools/sfxecode.hxx>
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
#include <toolkit/helper/vclunohelper.hxx>
#endif
diff --git a/dbaccess/source/sdbtools/inc/sdbt_resource.hrc b/dbaccess/source/sdbtools/inc/sdbt_resource.hrc
index 6baefaad2942..b13a1ada7390 100644
--- a/dbaccess/source/sdbtools/inc/sdbt_resource.hrc
+++ b/dbaccess/source/sdbtools/inc/sdbt_resource.hrc
@@ -32,7 +32,7 @@
#define DBACCESS_SDBT_RESOURCE_HRC
#ifndef _SOLAR_HRC
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
#endif
//------------------------------------------------------------------------------
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index b87b7706d87f..57f38d324b5c 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -87,7 +87,7 @@
#include <tools/diagnose_ex.h>
#endif
#ifndef SVTOOLS_URIHELPER_HXX
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
#endif
#ifndef _COMPHELPER_TYPES_HXX_
#include <comphelper/types.hxx>
@@ -135,10 +135,10 @@
#include <vcl/menu.hxx>
#endif
#ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
#endif
#ifndef INCLUDED_SVTOOLS_INTERNALOPTIONS_HXX
-#include <svtools/internaloptions.hxx>
+#include <unotools/internaloptions.hxx>
#endif
#ifndef _COMPHELPER_UNO3_HXX_
#include <comphelper/uno3.hxx>
@@ -178,7 +178,7 @@
#include <sfx2/mailmodelapi.hxx>
#endif
#ifndef INCLUDED_SVTOOLS_MODULEOPTIONS_HXX
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
#endif
#ifndef _SVTREEBOX_HXX
#include <svtools/svtreebx.hxx>
@@ -219,10 +219,10 @@
#include <sfx2/QuerySaveDocument.hxx>
#endif
#ifndef INCLUDED_SVTOOLS_HISTORYOPTIONS_HXX
-#include <svtools/historyoptions.hxx>
+#include <unotools/historyoptions.hxx>
#endif
#ifndef SVTOOLS_FILENOTATION_HXX_
-#include <svtools/filenotation.hxx>
+#include <svl/filenotation.hxx>
#endif
#ifndef _COMPHELPER_SEQUENCE_HXX_
#include <comphelper/sequence.hxx>
diff --git a/dbaccess/source/ui/app/AppControllerDnD.cxx b/dbaccess/source/ui/app/AppControllerDnD.cxx
index 2d39783cdb87..ed8c5a15dd89 100644
--- a/dbaccess/source/ui/app/AppControllerDnD.cxx
+++ b/dbaccess/source/ui/app/AppControllerDnD.cxx
@@ -204,7 +204,7 @@
#include <sfx2/filedlghelper.hxx>
#endif
#ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
#endif
#ifndef _SFX_DOCFILT_HACK_HXX
#include <sfx2/docfilt.hxx>
diff --git a/dbaccess/source/ui/app/AppControllerGen.cxx b/dbaccess/source/ui/app/AppControllerGen.cxx
index 0b1be1189bd4..a0f61642dbf0 100644
--- a/dbaccess/source/ui/app/AppControllerGen.cxx
+++ b/dbaccess/source/ui/app/AppControllerGen.cxx
@@ -545,7 +545,7 @@ void OApplicationController::previewChanged( sal_Int32 _nMode )
//
// String sTitle = String(ModuleRes(STR_APP_TITLE));
// sName = sName + sTitle;
-//#ifndef PRODUCT
+//#ifdef DBG_UTIL
// ::rtl::OUString aDefault;
// sName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ["));
// sName += utl::Bootstrap::getBuildIdData( aDefault );
diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx
index 1f9288bf489a..e8076eba2907 100644
--- a/dbaccess/source/ui/app/AppView.cxx
+++ b/dbaccess/source/ui/app/AppView.cxx
@@ -70,7 +70,7 @@
#include <com/sun/star/sdb/XQueriesSupplier.hpp>
#endif
#ifndef INCLUDED_SVTOOLS_SYSLOCALE_HXX
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
#endif
#ifndef DBAUI_TOOLS_HXX
#include "UITools.hxx"
@@ -106,7 +106,7 @@
#include "browserids.hxx"
#endif
#ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
#endif
#include "IApplicationController.hxx"
diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx
index 9d81d9c47c86..dc2734a0414a 100644
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@ -105,13 +105,13 @@
#include <tools/urlobj.hxx>
#endif
#ifndef SVTOOLS_URIHELPER_HXX
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
#endif
#ifndef _DBAUI_DATASOURCECONNECTOR_HXX_
#include "datasourceconnector.hxx"
#endif
#ifndef INCLUDED_SVTOOLS_MODULEOPTIONS_HXX
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
#endif
#ifndef _COM_SUN_STAR_FRAME_FRAMESEARCHFLAG_HPP_
#include <com/sun/star/frame/FrameSearchFlag.hpp>
diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx
index 1ca1a737dfd2..5440be1b5046 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -121,7 +121,7 @@
#endif
#ifndef _SFXINTITEM_HXX
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
#endif
#ifndef _SVX_ALGITEM_HXX //autogen
@@ -137,19 +137,19 @@
#endif
#ifndef _NUMUNO_HXX
-#include <svtools/numuno.hxx>
+#include <svl/numuno.hxx>
#endif
#ifndef _SFXITEMPOOL_HXX //autogen wg. SfxItemInfo
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
#endif
#ifndef _SFXITEMSET_HXX //autogen wg. SfxItemSet
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
#endif
#ifndef _SFXRNGITEM_HXX
-#include <svtools/rngitem.hxx>
+#include <svl/rngitem.hxx>
#endif
#ifndef _SV_WAITOBJ_HXX
@@ -160,7 +160,7 @@
#endif
#ifndef _ZFORLIST_HXX
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
#endif
#ifndef _CPPUHELPER_QUERYINTERFACE_HXX_
#include <cppuhelper/queryinterface.hxx>
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index aad25f1cd7ab..3e37fe1fc75a 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -114,9 +114,9 @@
#include <sfx2/app.hxx>
#include <sfx2/dispatch.hxx>
#include <sot/storage.hxx>
-#include <svtools/filenotation.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/moduleoptions.hxx>
+#include <svl/filenotation.hxx>
+#include <svl/intitem.hxx>
+#include <unotools/moduleoptions.hxx>
#include <svtools/svlbitm.hxx>
#include <svtools/svtreebx.hxx>
#include <svx/algitem.hxx>
diff --git a/dbaccess/source/ui/control/ColumnControlWindow.cxx b/dbaccess/source/ui/control/ColumnControlWindow.cxx
index 0b9da9cfd69e..c1331a69c10e 100644
--- a/dbaccess/source/ui/control/ColumnControlWindow.cxx
+++ b/dbaccess/source/ui/control/ColumnControlWindow.cxx
@@ -37,7 +37,7 @@
#include "FieldControls.hxx"
#endif
#ifndef INCLUDED_SVTOOLS_SYSLOCALE_HXX
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
#endif
#ifndef _CONNECTIVITY_DBTOOLS_HXX_
#include <connectivity/dbtools.hxx>
diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx
index 4d9e81bc1f83..972d6c92c355 100644
--- a/dbaccess/source/ui/control/FieldDescControl.cxx
+++ b/dbaccess/source/ui/control/FieldDescControl.cxx
@@ -53,12 +53,12 @@
#include <svx/numfmtsh.hxx>
#include <svx/svxids.hrc>
#include <svx/algitem.hxx>
-#include <svtools/itempool.hxx>
-#define _ZFORLIST_DECLARE_TABLE // ohne das bekomme ich einen Compiler-Fehler in <svtools/zforlist.hxx>
-#include <svtools/zforlist.hxx>
-#include <svtools/rngitem.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/numuno.hxx>
+#include <svl/itempool.hxx>
+#define _ZFORLIST_DECLARE_TABLE // ohne das bekomme ich einen Compiler-Fehler in <svl/zforlist.hxx>
+#include <svl/zforlist.hxx>
+#include <svl/rngitem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/numuno.hxx>
#include <svtools/transfer.hxx>
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <com/sun/star/util/NumberFormat.hpp>
diff --git a/dbaccess/source/ui/control/charsetlistbox.cxx b/dbaccess/source/ui/control/charsetlistbox.cxx
index c2c893ec8d1a..05c19378d407 100644
--- a/dbaccess/source/ui/control/charsetlistbox.cxx
+++ b/dbaccess/source/ui/control/charsetlistbox.cxx
@@ -36,8 +36,8 @@
/** === begin UNO includes === **/
/** === end UNO includes === **/
-#include <svtools/itemset.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/itemset.hxx>
+#include <svl/stritem.hxx>
//........................................................................
namespace dbaui
diff --git a/dbaccess/source/ui/control/opendoccontrols.cxx b/dbaccess/source/ui/control/opendoccontrols.cxx
index 12c25ef58a87..136f51ffd76c 100644
--- a/dbaccess/source/ui/control/opendoccontrols.cxx
+++ b/dbaccess/source/ui/control/opendoccontrols.cxx
@@ -72,7 +72,7 @@
#include <vcl/help.hxx>
#endif
#ifndef INCLUDED_SVTOOLS_HISTORYOPTIONS_HXX
-#include <svtools/historyoptions.hxx>
+#include <unotools/historyoptions.hxx>
#endif
#ifndef _COMPHELPER_SEQUENCEASHASHMAP_HXX_
#include <comphelper/sequenceashashmap.hxx>
@@ -81,7 +81,7 @@
#include <tools/urlobj.hxx>
#endif
#ifndef SVTOOLS_FILENOTATION_HXX
-#include <svtools/filenotation.hxx>
+#include <svl/filenotation.hxx>
#endif
//........................................................................
diff --git a/dbaccess/source/ui/control/sqledit.cxx b/dbaccess/source/ui/control/sqledit.cxx
index 61bc0882570f..3889d091f737 100644
--- a/dbaccess/source/ui/control/sqledit.cxx
+++ b/dbaccess/source/ui/control/sqledit.cxx
@@ -40,7 +40,7 @@
#include "undosqledit.hxx"
#include "QueryDesignView.hxx"
-#include <svtools/smplhint.hxx>
+#include <svl/smplhint.hxx>
//////////////////////////////////////////////////////////////////////////
// OSqlEdit
@@ -67,8 +67,8 @@ OSqlEdit::OSqlEdit( OQueryTextView* pParent, WinBits nWinStyle ) :
ImplSetFont();
// listen for change of Font and Color Settings
- StartListening(m_SourceViewConfig);
- StartListening(m_ColorConfig);
+ m_SourceViewConfig.AddListener( this );
+ m_ColorConfig.AddListener(this);
//#i97044#
EnableFocusSelectionHide( FALSE );
@@ -80,8 +80,8 @@ OSqlEdit::~OSqlEdit()
DBG_DTOR(OSqlEdit,NULL);
if (m_timerUndoActionCreation.IsActive())
m_timerUndoActionCreation.Stop();
- EndListening(m_SourceViewConfig);
- EndListening(m_ColorConfig);
+ m_SourceViewConfig.RemoveListener(this);
+ m_ColorConfig.RemoveListener(this);
}
//------------------------------------------------------------------------------
void OSqlEdit::KeyInput( const KeyEvent& rKEvt )
@@ -196,11 +196,11 @@ void OSqlEdit::startTimer()
m_timerInvalidate.Start();
}
-void OSqlEdit::Notify( SfxBroadcaster& rBC, const SfxHint& /*rHint*/ )
+void OSqlEdit::ConfigurationChanged( utl::ConfigurationBroadcaster* pOption, sal_uInt32 )
{
- if (&rBC == &m_SourceViewConfig)
+ if ( pOption == &m_SourceViewConfig )
ImplSetFont();
- else if (&rBC == &m_ColorConfig)
+ else if ( pOption == &m_ColorConfig )
MultiLineEditSyntaxHighlight::UpdateData();
}
diff --git a/dbaccess/source/ui/control/toolboxcontroller.cxx b/dbaccess/source/ui/control/toolboxcontroller.cxx
index 86f5d02f5054..6a22d8303a29 100644
--- a/dbaccess/source/ui/control/toolboxcontroller.cxx
+++ b/dbaccess/source/ui/control/toolboxcontroller.cxx
@@ -73,7 +73,7 @@
#include <svtools/miscopt.hxx>
#endif
#ifndef INCLUDED_SVTOOLS_MODULEOPTIONS_HXX
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
#endif
#ifndef TOOLS_DIAGNOSE_EX_H
#include <tools/diagnose_ex.h>
diff --git a/dbaccess/source/ui/dlg/CollectionView.cxx b/dbaccess/source/ui/dlg/CollectionView.cxx
index 1f7d45706391..256016d77dea 100644
--- a/dbaccess/source/ui/dlg/CollectionView.cxx
+++ b/dbaccess/source/ui/dlg/CollectionView.cxx
@@ -106,7 +106,7 @@
#include <com/sun/star/awt/XWindow.hpp>
#endif
#ifndef INCLUDED_SVTOOLS_VIEWOPTIONS_HXX
-#include <svtools/viewoptions.hxx>
+#include <unotools/viewoptions.hxx>
#endif
#ifndef _OSL_THREAD_H_
#include <osl/thread.h>
diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
index ba0925d224ad..bae7abb63fc8 100644
--- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
@@ -45,25 +45,25 @@
#include "dbu_misc.hrc"
#endif
#ifndef _SFXITEMSET_HXX
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
#endif
#ifndef INCLUDED_SVTOOLS_MODULEOPTIONS_HXX
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
#endif
#ifndef _SFX_FCONTNR_HXX
#include <sfx2/fcontnr.hxx>
#endif
#ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
#endif
#ifndef _SFXSTRITEM_HXX
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
#endif
#ifndef _SFXENUMITEM_HXX
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
#endif
#ifndef _SFXINTITEM_HXX
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
#endif
#ifndef _DBAUI_DATASOURCEITEMS_HXX_
#include "dsitems.hxx"
@@ -102,7 +102,7 @@
#include "dsselect.hxx"
#endif
#ifndef SVTOOLS_FILENOTATION_HXX_
-#include <svtools/filenotation.hxx>
+#include <svl/filenotation.hxx>
#endif
#ifndef DBACCESS_SHARED_DBUSTRINGS_HRC
#include "dbustrings.hrc"
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx
index db21de4d9a76..4bd644cc835b 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx
@@ -44,22 +44,22 @@
#include "dsmeta.hxx"
#endif
#ifndef _SFXITEMSET_HXX
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
#endif
#ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
#endif
#ifndef _SFXSTRITEM_HXX
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
#endif
#ifndef _SFXENUMITEM_HXX
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
#endif
#ifndef _SFXINTITEM_HXX
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
#endif
#ifndef INCLUDED_SVTOOLS_MODULEOPTIONS_HXX
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
#endif
#ifndef _DBAUI_DATASOURCEITEMS_HXX_
#include "dsitems.hxx"
@@ -98,7 +98,7 @@
#include "dsselect.hxx"
#endif
#ifndef SVTOOLS_FILENOTATION_HXX_
-#include <svtools/filenotation.hxx>
+#include <svl/filenotation.hxx>
#endif
#ifndef DBACCESS_SHARED_DBUSTRINGS_HRC
#include "dbustrings.hrc"
diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
index 6b22d79e4b18..867d5a7fed50 100644
--- a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
@@ -44,19 +44,19 @@
#include "dbu_dlg.hrc"
#endif
#ifndef _SFXITEMSET_HXX
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
#endif
#ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
#endif
#ifndef _SFXSTRITEM_HXX
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
#endif
#ifndef _SFXENUMITEM_HXX
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
#endif
#ifndef _SFXINTITEM_HXX
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
#endif
#ifndef _DBAUI_DATASOURCEITEMS_HXX_
#include "dsitems.hxx"
@@ -98,7 +98,7 @@
#include "dsselect.hxx"
#endif
#ifndef SVTOOLS_FILENOTATION_HXX_
-#include <svtools/filenotation.hxx>
+#include <svl/filenotation.hxx>
#endif
#ifndef DBACCESS_SHARED_DBUSTRINGS_HRC
#include "dbustrings.hrc"
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
index 759054d4495e..bb9e85d3871d 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
@@ -46,16 +46,16 @@
#include "dbadminsetup.hrc"
#endif
#ifndef _SFXITEMSET_HXX
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
#endif
#ifndef _SFXSTRITEM_HXX
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
#endif
#ifndef _SFXENUMITEM_HXX
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
#endif
#ifndef _SFXINTITEM_HXX
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
#endif
#ifndef _DBAUI_DATASOURCEITEMS_HXX_
#include "dsitems.hxx"
@@ -74,7 +74,7 @@
#include <vcl/mnemonic.hxx>
#endif
#ifndef _SVTOOLS_CJKOPTIONS_HXX
-#include <svtools/cjkoptions.hxx>
+#include <svl/cjkoptions.hxx>
#endif
#include <jvmaccess/virtualmachine.hxx>
#ifndef _CONNECTIVITY_COMMONTOOLS_HXX_
@@ -100,7 +100,7 @@
#include <com/sun/star/sdbc/XDriverAccess.hpp>
#include "dbustrings.hrc"
#ifndef SVTOOLS_FILENOTATION_HXX_
-#include <svtools/filenotation.hxx>
+#include <svl/filenotation.hxx>
#endif
#include <unotools/localfilehelper.hxx>
@@ -109,7 +109,7 @@
#include "finteraction.hxx"
#include <connectivity/CommonTools.hxx>
#include "dbaccess_helpid.hrc"
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
#include <svtools/roadmapwizard.hxx>
#include "TextConnectionHelper.hxx"
diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
index 28a9b83fca35..30f67e7fb5b1 100644
--- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
@@ -35,19 +35,19 @@
#include "dsmeta.hxx"
#ifndef _SFXPOOLITEM_HXX
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
#endif
#ifndef _SFXITEMPOOL_HXX
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
#endif
#ifndef _SFXSTRITEM_HXX
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
#endif
#ifndef _SFXINTITEM_HXX
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
#endif
#ifndef _SFXENUMITEM_HXX
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
#endif
#ifndef _COMPHELPER_PROPERTY_HXX_
#include <comphelper/property.hxx>
diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.hxx b/dbaccess/source/ui/dlg/DbAdminImpl.hxx
index a194ebc7b23c..9794e6e21bfb 100644
--- a/dbaccess/source/ui/dlg/DbAdminImpl.hxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.hxx
@@ -59,12 +59,12 @@
#include "dsntypes.hxx"
#endif
#ifndef _SFXITEMSET_HXX
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
#endif
#ifndef _COM_SUN_STAR_FRAME_XMODEL_HPP_
#include <com/sun/star/frame/XModel.hpp>
#endif
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
class Window;
//.........................................................................
diff --git a/dbaccess/source/ui/dlg/DriverSettings.hxx b/dbaccess/source/ui/dlg/DriverSettings.hxx
index 154013a11bda..015ded56a042 100644
--- a/dbaccess/source/ui/dlg/DriverSettings.hxx
+++ b/dbaccess/source/ui/dlg/DriverSettings.hxx
@@ -33,7 +33,7 @@
#ifndef _DBAUI_DSNTYPES_HXX_
#include "dsntypes.hxx"
#endif
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
#include <vector>
class SfxTabPage;
diff --git a/dbaccess/source/ui/dlg/ExtensionNotPresent.cxx b/dbaccess/source/ui/dlg/ExtensionNotPresent.cxx
index f9bd1e007341..33f65f50cb39 100644
--- a/dbaccess/source/ui/dlg/ExtensionNotPresent.cxx
+++ b/dbaccess/source/ui/dlg/ExtensionNotPresent.cxx
@@ -44,7 +44,7 @@
/** === end UNO includes === **/
#include <connectivity/dbconversion.hxx>
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
#include <svx/globlmn.hrc>
#include <svx/svxids.hrc>
#include <tools/debug.hxx>
diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
index d183f97acba5..ca73fabfe8ac 100644
--- a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
@@ -51,16 +51,16 @@
#endif
#ifndef _SFXITEMSET_HXX
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
#endif
#ifndef _SFXSTRITEM_HXX
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
#endif
#ifndef _SFXENUMITEM_HXX
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
#endif
#ifndef _SFXINTITEM_HXX
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
#endif
#ifndef _DBAUI_DATASOURCEITEMS_HXX_
#include "dsitems.hxx"
@@ -81,7 +81,7 @@
#include <vcl/mnemonic.hxx>
#endif
#ifndef _SVTOOLS_CJKOPTIONS_HXX
-#include <svtools/cjkoptions.hxx>
+#include <svl/cjkoptions.hxx>
#endif
#include <jvmaccess/virtualmachine.hxx>
#ifndef _DBAUI_ADASTAT_HXX_
@@ -109,7 +109,7 @@
#endif
#ifndef SVTOOLS_FILENOTATION_HXX_
-#include <svtools/filenotation.hxx>
+#include <svl/filenotation.hxx>
#endif
#ifndef _UNOTOOLS_LOCALFILEHELPER_HXX
@@ -141,7 +141,7 @@
#endif
#ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
#endif
#ifndef SVTOOLS_INC_ROADMAPWIZARD_HXX
diff --git a/dbaccess/source/ui/dlg/UserAdminDlg.cxx b/dbaccess/source/ui/dlg/UserAdminDlg.cxx
index 204a57dc8758..0697124b69da 100644
--- a/dbaccess/source/ui/dlg/UserAdminDlg.cxx
+++ b/dbaccess/source/ui/dlg/UserAdminDlg.cxx
@@ -45,9 +45,9 @@
#include <comphelper/componentcontext.hxx>
#include <connectivity/dbmetadata.hxx>
#include <cppuhelper/exc_hlp.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/stritem.hxx>
#include <tools/diagnose_ex.h>
#include <vcl/msgbox.hxx>
#include <vcl/stdtext.hxx>
diff --git a/dbaccess/source/ui/dlg/admincontrols.cxx b/dbaccess/source/ui/dlg/admincontrols.cxx
index 8af119b127b0..5139b1e77895 100755..100644
--- a/dbaccess/source/ui/dlg/admincontrols.cxx
+++ b/dbaccess/source/ui/dlg/admincontrols.cxx
@@ -32,9 +32,9 @@
#include "dsitems.hxx"
#include "moduledbu.hxx"
-#include <svtools/eitem.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/stritem.hxx>
+#include <svl/intitem.hxx>
//........................................................................
namespace dbaui
diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx
index c67d34311147..b55e271a0988 100644
--- a/dbaccess/source/ui/dlg/adminpages.cxx
+++ b/dbaccess/source/ui/dlg/adminpages.cxx
@@ -41,13 +41,13 @@
#include "dbu_dlg.hrc"
#endif
#ifndef _SFXSTRITEM_HXX
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
#endif
#ifndef _SFXENUMITEM_HXX
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
#endif
#ifndef _SFXINTITEM_HXX
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
#endif
#ifndef _DBAUI_DATASOURCEITEMS_HXX_
#include "dsitems.hxx"
diff --git a/dbaccess/source/ui/dlg/advancedsettings.cxx b/dbaccess/source/ui/dlg/advancedsettings.cxx
index 7f0b5ee16515..1540b562f9af 100644
--- a/dbaccess/source/ui/dlg/advancedsettings.cxx
+++ b/dbaccess/source/ui/dlg/advancedsettings.cxx
@@ -47,9 +47,9 @@
/** === begin UNO includes === **/
/** === end UNO includes === **/
-#include <svtools/eitem.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/stritem.hxx>
#include <vcl/msgbox.hxx>
diff --git a/dbaccess/source/ui/dlg/dbadmin.cxx b/dbaccess/source/ui/dlg/dbadmin.cxx
index d535a0afab02..048635edd07f 100644
--- a/dbaccess/source/ui/dlg/dbadmin.cxx
+++ b/dbaccess/source/ui/dlg/dbadmin.cxx
@@ -45,13 +45,13 @@
#include "dsitems.hxx"
#endif
#ifndef _SFXSTRITEM_HXX
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
#endif
#ifndef _SFXENUMITEM_HXX
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
#endif
#ifndef _SFXINTITEM_HXX
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
#endif
#ifndef _SV_MSGBOX_HXX
#include <vcl/msgbox.hxx>
diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx
index 558c454b5d05..0dde529246bb 100644
--- a/dbaccess/source/ui/dlg/dbfindex.cxx
+++ b/dbaccess/source/ui/dlg/dbfindex.cxx
@@ -60,13 +60,13 @@
#include <tools/urlobj.hxx>
#endif
#ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
#endif
#ifndef _UCBHELPER_CONTENT_HXX
#include <ucbhelper/content.hxx>
#endif
#ifndef SVTOOLS_FILENOTATION_HXX_
-#include <svtools/filenotation.hxx>
+#include <svl/filenotation.hxx>
#endif
diff --git a/dbaccess/source/ui/dlg/dbwiz.cxx b/dbaccess/source/ui/dlg/dbwiz.cxx
index c0b460cbb329..8c84ba0a03d4 100644
--- a/dbaccess/source/ui/dlg/dbwiz.cxx
+++ b/dbaccess/source/ui/dlg/dbwiz.cxx
@@ -45,13 +45,13 @@
#endif
#include "dsnItem.hxx"
#ifndef _SFXSTRITEM_HXX
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
#endif
#ifndef _SFXENUMITEM_HXX
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
#endif
#ifndef _SFXINTITEM_HXX
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
#endif
#ifndef _SV_MSGBOX_HXX
#include <vcl/msgbox.hxx>
diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index bab1dcca3694..149d0c2d2f7a 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -40,16 +40,16 @@
#include "dsnItem.hxx"
#ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
#endif
#ifndef _SFXSTRITEM_HXX
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
#endif
#ifndef _SFXENUMITEM_HXX
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
#endif
#ifndef _SFXINTITEM_HXX
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
#endif
#ifndef _SV_MSGBOX_HXX
#include <vcl/msgbox.hxx>
@@ -169,7 +169,7 @@
/** === end UNO includes === **/
-#include <svtools/filenotation.hxx>
+#include <svl/filenotation.hxx>
#include <comphelper/interaction.hxx>
#include <comphelper/namedvaluecollection.hxx>
#include <comphelper/sequenceashashmap.hxx>
diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx
index 69b91b2456a9..c6af345de4f8 100644
--- a/dbaccess/source/ui/dlg/detailpages.cxx
+++ b/dbaccess/source/ui/dlg/detailpages.cxx
@@ -46,16 +46,16 @@
#include "dbadmin.hrc"
#ifndef _SFXITEMSET_HXX
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
#endif
#ifndef _SFXSTRITEM_HXX
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
#endif
#ifndef _SFXENUMITEM_HXX
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
#endif
#ifndef _SFXINTITEM_HXX
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
#endif
#ifndef _SV_MSGBOX_HXX
#include <vcl/msgbox.hxx>
@@ -64,7 +64,7 @@
#include <vcl/mnemonic.hxx>
#endif
#ifndef _SVTOOLS_CJKOPTIONS_HXX
-#include <svtools/cjkoptions.hxx>
+#include <svl/cjkoptions.hxx>
#endif
#include <jvmaccess/virtualmachine.hxx>
#ifndef DBAUI_ADABASPAGE_HRC
diff --git a/dbaccess/source/ui/dlg/dlgattr.cxx b/dbaccess/source/ui/dlg/dlgattr.cxx
index b6f18fc77c45..c24ca75efc4e 100644
--- a/dbaccess/source/ui/dlg/dlgattr.cxx
+++ b/dbaccess/source/ui/dlg/dlgattr.cxx
@@ -66,16 +66,16 @@
#include "dbu_dlg.hrc"
#endif
#ifndef _SFXITEMSET_HXX
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
#endif
#define _ZFORLIST_DECLARE_TABLE
#ifndef _ZFORLIST_HXX
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
#endif
#include <svx/svxids.hrc> //CHINA001
#include <svx/flagsdef.hxx> //CHINA001
#ifndef _SFXINTITEM_HXX //CHINA001
-#include <svtools/intitem.hxx> //CHINA001
+#include <svl/intitem.hxx> //CHINA001
#endif //CHINA001
#ifndef _DBAUI_MODULE_DBU_HXX_
#include "moduledbu.hxx"
diff --git a/dbaccess/source/ui/dlg/dsnItem.hxx b/dbaccess/source/ui/dlg/dsnItem.hxx
index fce1df04b3bc..a1b002190f2f 100644
--- a/dbaccess/source/ui/dlg/dsnItem.hxx
+++ b/dbaccess/source/ui/dlg/dsnItem.hxx
@@ -32,7 +32,7 @@
#ifndef _DBAUI_DSNITEM_HXX_
#define _DBAUI_DSNITEM_HXX_
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
//.........................................................................
namespace dbaccess
diff --git a/dbaccess/source/ui/dlg/dsselect.cxx b/dbaccess/source/ui/dlg/dsselect.cxx
index e21417ffdb0c..a15924e2fccd 100644
--- a/dbaccess/source/ui/dlg/dsselect.cxx
+++ b/dbaccess/source/ui/dlg/dsselect.cxx
@@ -84,16 +84,16 @@
#include "dsitems.hxx"
#endif
#ifndef _SFXSTRITEM_HXX
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
#endif
#ifndef _SFXINTITEM_HXX
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
#endif
#ifndef _SFXENUMITEM_HXX
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
#endif
#ifndef _SFXITEMSET_HXX
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
#endif
//.........................................................................
diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx
index c9f145f795f5..6bf7a877cf9e 100644
--- a/dbaccess/source/ui/dlg/generalpage.cxx
+++ b/dbaccess/source/ui/dlg/generalpage.cxx
@@ -44,7 +44,7 @@
#include <vcl/stdtext.hxx>
#include "localresaccess.hxx"
#include <vcl/msgbox.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
#include <vcl/waitobj.hxx>
#include <com/sun/star/sdbc/XDriverAccess.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
diff --git a/dbaccess/source/ui/dlg/paramdialog.cxx b/dbaccess/source/ui/dlg/paramdialog.cxx
index 9ebdb683e4a4..1b94bff730d5 100644
--- a/dbaccess/source/ui/dlg/paramdialog.cxx
+++ b/dbaccess/source/ui/dlg/paramdialog.cxx
@@ -72,7 +72,7 @@
#include "localresaccess.hxx"
#endif
#ifndef INCLUDED_SVTOOLS_SYSLOCALE_HXX
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
#endif
#define EF_VISITED 0x0001
diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx
index bbcd265c5f34..4625448be9fa 100644
--- a/dbaccess/source/ui/dlg/tablespage.cxx
+++ b/dbaccess/source/ui/dlg/tablespage.cxx
@@ -62,10 +62,10 @@
#include "stringlistitem.hxx"
#endif
#ifndef _SFXENUMITEM_HXX
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
#endif
#ifndef _SFXSTRITEM_HXX
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
#endif
#ifndef DBACCESS_SHARED_DBUSTRINGS_HRC
#include "dbustrings.hrc"
diff --git a/dbaccess/source/ui/inc/GeneralUndo.hxx b/dbaccess/source/ui/inc/GeneralUndo.hxx
index 956709c00a23..91e128342161 100644
--- a/dbaccess/source/ui/inc/GeneralUndo.hxx
+++ b/dbaccess/source/ui/inc/GeneralUndo.hxx
@@ -31,7 +31,7 @@
#define DBAUI_GENERALUNDO_HXX
#ifndef _UNDO_HXX
-#include <svtools/undo.hxx>
+#include <svl/undo.hxx>
#endif
#ifndef _DBAUI_MODULE_DBU_HXX_
#include "moduledbu.hxx"
diff --git a/dbaccess/source/ui/inc/brwctrlr.hxx b/dbaccess/source/ui/inc/brwctrlr.hxx
index 1e796fbed624..d94f76b8dcc9 100644
--- a/dbaccess/source/ui/inc/brwctrlr.hxx
+++ b/dbaccess/source/ui/inc/brwctrlr.hxx
@@ -56,7 +56,7 @@
#include <svtools/transfer.hxx>
#include <osl/mutex.hxx>
#include <vos/thread.hxx>
-#include <svtools/cancel.hxx>
+#include <svl/cancel.hxx>
#include <cppuhelper/implbase9.hxx>
#include <svtools/cliplistener.hxx>
diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc b/dbaccess/source/ui/inc/dbu_resource.hrc
index 4686b540e936..e537f51df6bb 100644
--- a/dbaccess/source/ui/inc/dbu_resource.hrc
+++ b/dbaccess/source/ui/inc/dbu_resource.hrc
@@ -32,7 +32,7 @@
#define _DBU_RESOURCE_HRC_
#ifndef _SOLAR_HRC
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
#endif
#define RID_DIALOG_START RID_DBACCESS_START
diff --git a/dbaccess/source/ui/inc/indexdialog.hxx b/dbaccess/source/ui/inc/indexdialog.hxx
index b8a89b0dbf8d..26ee146ca237 100644
--- a/dbaccess/source/ui/inc/indexdialog.hxx
+++ b/dbaccess/source/ui/inc/indexdialog.hxx
@@ -62,7 +62,7 @@
#include <svtools/svtreebx.hxx>
#endif
#ifndef INCLUDED_SVTOOLS_VIEWOPTIONS_HXX
-#include <svtools/viewoptions.hxx>
+#include <unotools/viewoptions.hxx>
#endif
#ifndef _DBAUI_INDEXES_HXX_
#include "indexes.hxx"
diff --git a/dbaccess/source/ui/inc/propertysetitem.hxx b/dbaccess/source/ui/inc/propertysetitem.hxx
index 7d104fcce714..70defabbb2e2 100644
--- a/dbaccess/source/ui/inc/propertysetitem.hxx
+++ b/dbaccess/source/ui/inc/propertysetitem.hxx
@@ -32,7 +32,7 @@
#define _DBAUI_PROPERTYSETITEM_HXX_
#ifndef _SFXPOOLITEM_HXX
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
#endif
#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_
#include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/dbaccess/source/ui/inc/querycontroller.hxx b/dbaccess/source/ui/inc/querycontroller.hxx
index 70be5b60407a..6db721095c15 100644
--- a/dbaccess/source/ui/inc/querycontroller.hxx
+++ b/dbaccess/source/ui/inc/querycontroller.hxx
@@ -54,7 +54,7 @@
#include <connectivity/sqliterator.hxx>
#include <connectivity/sqlnode.hxx>
#include <connectivity/sqlparse.hxx>
-#include <svtools/undo.hxx>
+#include <svl/undo.hxx>
class VCLXWindow;
namespace dbaui
diff --git a/dbaccess/source/ui/inc/sqledit.hxx b/dbaccess/source/ui/inc/sqledit.hxx
index 039ea9f8404b..57bb75a0b927 100644
--- a/dbaccess/source/ui/inc/sqledit.hxx
+++ b/dbaccess/source/ui/inc/sqledit.hxx
@@ -31,14 +31,14 @@
#define DBAUI_SQLEDIT_HXX
#include <svtools/editsyntaxhighlighter.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
#include <svtools/colorcfg.hxx>
-#include <svtools/sourceviewconfig.hxx>
+#include <unotools/sourceviewconfig.hxx>
namespace dbaui
{
class OQueryTextView;
- class OSqlEdit : public MultiLineEditSyntaxHighlight, SfxListener
+ class OSqlEdit : public MultiLineEditSyntaxHighlight, utl::ConfigurationListener
{
private:
Timer m_timerInvalidate;
@@ -48,7 +48,7 @@ namespace dbaui
OQueryTextView* m_pView;
BOOL m_bAccelAction; // Wird bei Cut, Copy, Paste gesetzt
BOOL m_bStopTimer;
- svt::SourceViewConfig m_SourceViewConfig;
+ utl::SourceViewConfig m_SourceViewConfig;
svtools::ColorConfig m_ColorConfig;
DECL_LINK(OnUndoActionTimer, void*);
@@ -82,7 +82,7 @@ namespace dbaui
void stopTimer();
void startTimer();
- virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
+ virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 );
using MultiLineEditSyntaxHighlight::Notify;
};
}
diff --git a/dbaccess/source/ui/inc/stringlistitem.hxx b/dbaccess/source/ui/inc/stringlistitem.hxx
index 09a4792ceb63..3f27dc797e15 100644
--- a/dbaccess/source/ui/inc/stringlistitem.hxx
+++ b/dbaccess/source/ui/inc/stringlistitem.hxx
@@ -32,7 +32,7 @@
#define _DBAUI_STRINGLISTITEM_HXX_
#ifndef _SFXPOOLITEM_HXX
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
#endif
#ifndef _COM_SUN_STAR_UNO_SEQUENCE_HXX_
diff --git a/dbaccess/source/ui/misc/DExport.cxx b/dbaccess/source/ui/misc/DExport.cxx
index f533c719160e..6c750f40ee61 100644
--- a/dbaccess/source/ui/misc/DExport.cxx
+++ b/dbaccess/source/ui/misc/DExport.cxx
@@ -50,7 +50,7 @@
#include "dbu_misc.hrc"
#include <connectivity/dbconversion.hxx>
#include <sfx2/sfxhtml.hxx>
-#include <svtools/numuno.hxx>
+#include <svl/numuno.hxx>
#include <connectivity/dbtools.hxx>
#include <comphelper/extract.hxx>
#include "TypeInfo.hxx"
@@ -65,8 +65,8 @@
#include "WCopyTable.hxx"
#include "WExtendPages.hxx"
#include "WCPage.hxx"
-#include <svtools/syslocale.hxx>
-#include <svtools/zforlist.hxx>
+#include <unotools/syslocale.hxx>
+#include <svl/zforlist.hxx>
#include <connectivity/dbexception.hxx>
#include <connectivity/FValue.hxx>
#include <com/sun/star/sdbc/SQLWarning.hpp>
diff --git a/dbaccess/source/ui/misc/HtmlReader.cxx b/dbaccess/source/ui/misc/HtmlReader.cxx
index b95423b77c24..4c9fb3ded1bb 100644
--- a/dbaccess/source/ui/misc/HtmlReader.cxx
+++ b/dbaccess/source/ui/misc/HtmlReader.cxx
@@ -63,7 +63,7 @@
#include "QEnumTypes.hxx"
#include "WCPage.hxx"
#include <tools/inetmime.hxx>
-#include <svtools/inettype.hxx>
+#include <svl/inettype.hxx>
#include <rtl/tencinfo.h>
#include "UITools.hxx"
#include <vcl/svapp.hxx>
diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx
index 02765c333c21..d872590b3763 100644
--- a/dbaccess/source/ui/misc/TokenWriter.cxx
+++ b/dbaccess/source/ui/misc/TokenWriter.cxx
@@ -55,7 +55,7 @@
#include <tools/color.hxx>
#include <svtools/htmlout.hxx>
#include <sfx2/frmhtmlw.hxx>
-#include <svtools/numuno.hxx>
+#include <svl/numuno.hxx>
#include <vcl/svapp.hxx>
#include "UITools.hxx"
#include <toolkit/helper/vclunohelper.hxx>
@@ -63,7 +63,7 @@
#include <svtools/rtfout.hxx>
#include <svx/htmlcfg.hxx>
#include <connectivity/formattedcolumnvalue.hxx>
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
#include <comphelper/componentcontext.hxx>
#include <rtl/logfile.hxx>
diff --git a/dbaccess/source/ui/misc/ToolBoxHelper.cxx b/dbaccess/source/ui/misc/ToolBoxHelper.cxx
index 8982ae4571da..a9029301741c 100644
--- a/dbaccess/source/ui/misc/ToolBoxHelper.cxx
+++ b/dbaccess/source/ui/misc/ToolBoxHelper.cxx
@@ -61,13 +61,13 @@ namespace dbaui
DBG_CTOR(OToolBoxHelper,NULL);
OSL_ENSURE(m_nSymbolsSize != SvtMiscOptions().GetCurrentSymbolsSize(),"SymbolsSize should not be identical");
- SvtMiscOptions().AddListener( LINK( this, OToolBoxHelper, ConfigOptionsChanged ) );
+ SvtMiscOptions().AddListenerLink( LINK( this, OToolBoxHelper, ConfigOptionsChanged ) );
Application::AddEventListener( LINK( this, OToolBoxHelper, SettingsChanged ) );
}
// -----------------------------------------------------------------------------
OToolBoxHelper::~OToolBoxHelper()
{
- SvtMiscOptions().RemoveListener( LINK( this, OToolBoxHelper, ConfigOptionsChanged ) );
+ SvtMiscOptions().RemoveListenerLink( LINK( this, OToolBoxHelper, ConfigOptionsChanged ) );
Application::RemoveEventListener( LINK( this, OToolBoxHelper, SettingsChanged ) );
DBG_DTOR(OToolBoxHelper,NULL);
}
diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx
index 20cb7cb9308e..55691d4164ff 100644
--- a/dbaccess/source/ui/misc/UITools.cxx
+++ b/dbaccess/source/ui/misc/UITools.cxx
@@ -198,7 +198,7 @@
#define ITEMID_NUMBERINFO SID_ATTR_NUMBERFORMAT_INFO
#ifndef _SFXITEMPOOL_HXX
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
#endif
#ifndef _STRING_HXX
#include <tools/string.hxx>
@@ -207,16 +207,16 @@
#include "dbaccess_helpid.hrc"
#endif
#ifndef _SFXITEMSET_HXX //autogen wg. SfxItemSet
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
#endif
#ifndef DBACCESS_SBA_GRID_HRC
#include "sbagrid.hrc"
#endif
#ifndef _SFXRNGITEM_HXX
-#include <svtools/rngitem.hxx>
+#include <svl/rngitem.hxx>
#endif
#ifndef _SFXINTITEM_HXX
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
#endif
#ifndef _SVX_ALGITEM_HXX
#include <svx/algitem.hxx>
@@ -229,7 +229,7 @@
#include <svx/numinf.hxx>
#endif
#ifndef _ZFORLIST_HXX
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
#endif
#ifndef DBAUI_SBATTRDLG_HXX
#include "dlgattr.hxx"
@@ -283,13 +283,13 @@
#include <tools/diagnose_ex.h>
#endif
#ifndef _NUMUNO_HXX
-#include <svtools/numuno.hxx>
+#include <svl/numuno.hxx>
#endif
#ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
#endif
#ifndef SVTOOLS_FILENOTATION_HXX_
-#include <svtools/filenotation.hxx>
+#include <svl/filenotation.hxx>
#endif
#ifndef _SVT_FILEVIEW_HXX
#include <svtools/fileview.hxx>
diff --git a/dbaccess/source/ui/misc/datasourceconnector.cxx b/dbaccess/source/ui/misc/datasourceconnector.cxx
index 470ab5f08ba3..409e86150843 100644
--- a/dbaccess/source/ui/misc/datasourceconnector.cxx
+++ b/dbaccess/source/ui/misc/datasourceconnector.cxx
@@ -86,7 +86,7 @@
#include <vcl/button.hxx>
#endif
#ifndef SVTOOLS_FILENOTATION_HXX
-#include <svtools/filenotation.hxx>
+#include <svl/filenotation.hxx>
#endif
#ifndef TOOLS_DIAGNOSE_EX_H
#include <tools/diagnose_ex.h>
diff --git a/dbaccess/source/ui/misc/linkeddocuments.cxx b/dbaccess/source/ui/misc/linkeddocuments.cxx
index 5869f6102eeb..a7be84b5e497 100644
--- a/dbaccess/source/ui/misc/linkeddocuments.cxx
+++ b/dbaccess/source/ui/misc/linkeddocuments.cxx
@@ -92,7 +92,7 @@
#include "dbu_misc.hrc"
#endif
#ifndef SVTOOLS_FILENOTATION_HXX_
-#include <svtools/filenotation.hxx>
+#include <svl/filenotation.hxx>
#endif
#ifndef DBACCESS_UI_BROWSER_ID_HXX
#include "browserids.hxx"
diff --git a/dbaccess/source/ui/misc/moduledbu.cxx b/dbaccess/source/ui/misc/moduledbu.cxx
index 69845372114f..6d3cae9fc6ed 100644
--- a/dbaccess/source/ui/misc/moduledbu.cxx
+++ b/dbaccess/source/ui/misc/moduledbu.cxx
@@ -39,7 +39,7 @@
#include <tools/resmgr.hxx>
#endif
#ifndef _SOLAR_HRC
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
#endif
#ifndef _TOOLS_DEBUG_HXX
#include <tools/debug.hxx>
diff --git a/dbaccess/source/ui/misc/propertystorage.cxx b/dbaccess/source/ui/misc/propertystorage.cxx
index 0ae5631b5803..26172eab9364 100644
--- a/dbaccess/source/ui/misc/propertystorage.cxx
+++ b/dbaccess/source/ui/misc/propertystorage.cxx
@@ -36,9 +36,9 @@
/** === begin UNO includes === **/
/** === end UNO includes === **/
-#include <svtools/itemset.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/itemset.hxx>
+#include <svl/stritem.hxx>
+#include <svl/eitem.hxx>
#include <memory>
diff --git a/dbaccess/source/ui/querydesign/JoinDesignView.cxx b/dbaccess/source/ui/querydesign/JoinDesignView.cxx
index bd0a593cfe89..11eb8e36f3ee 100644
--- a/dbaccess/source/ui/querydesign/JoinDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinDesignView.cxx
@@ -40,7 +40,7 @@
#include "JoinController.hxx"
#endif
#ifndef _UNDO_HXX
-#include <svtools/undo.hxx>
+#include <svl/undo.hxx>
#endif
#ifndef DBAUI_QYDLGTAB_HXX
#include "adtabdlg.hxx"
diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx
index 16f4990cb5b5..c240363c69e7 100644
--- a/dbaccess/source/ui/querydesign/JoinTableView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx
@@ -70,7 +70,7 @@
#include "browserids.hxx"
#endif
#ifndef _URLBMK_HXX
-#include <svtools/urlbmk.hxx>
+#include <svl/urlbmk.hxx>
#endif
#ifndef _COM_SUN_STAR_SDBC_XDATABASEMETADATA_HPP_
#include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index 6c94d9bc869c..b8fd1f5f972f 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -49,7 +49,7 @@
#include <vcl/split.hxx>
#endif
#ifndef _UNDO_HXX
-#include <svtools/undo.hxx>
+#include <svl/undo.hxx>
#endif
#ifndef TOOLS_DIAGNOSE_EX_H
#include <tools/diagnose_ex.h>
@@ -133,7 +133,7 @@
#include "sqlmessage.hxx"
#endif
#ifndef INCLUDED_SVTOOLS_SYSLOCALE_HXX
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
#endif
using namespace ::dbaui;
diff --git a/dbaccess/source/ui/relationdesign/RelationDesignView.cxx b/dbaccess/source/ui/relationdesign/RelationDesignView.cxx
index f95ee9561946..207513489d47 100644
--- a/dbaccess/source/ui/relationdesign/RelationDesignView.cxx