summaryrefslogtreecommitdiff
path: root/extensions/source
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@suse.cz>2011-03-18 15:35:18 +0100
committerJan Holesovsky <kendy@suse.cz>2011-03-18 15:35:18 +0100
commit6a75a47be7b3aafbb655ffa70609fd2ed7ca4b3e (patch)
treed00d2024213e09b8eba4704b8b6660eb42c3921c /extensions/source
parent7fb1e1ea8c9f8d3ef13524d1327272824df7110d (diff)
parenteee3dbc7af039669d447d2e55abd896ea3383df1 (diff)
Merge remote-tracking branch 'origin/integration/dev300_m101'
Conflicts: automation/source/communi/communi.cxx automation/source/server/recorder.cxx automation/source/server/server.cxx basctl/source/basicide/basobj2.cxx
Diffstat (limited to 'extensions/source')
-rw-r--r--extensions/source/abpilot/abp.component34
-rw-r--r--extensions/source/abpilot/abpfinalpage.cxx4
-rw-r--r--extensions/source/abpilot/abpresid.hrc1
-rw-r--r--extensions/source/abpilot/abpservices.cxx21
-rw-r--r--extensions/source/abpilot/abspilot.cxx4
-rw-r--r--extensions/source/abpilot/abspilot.hxx2
-rw-r--r--extensions/source/abpilot/abspilot.src23
-rw-r--r--extensions/source/abpilot/exports.dxp1
-rw-r--r--extensions/source/abpilot/makefile.mk8
-rw-r--r--extensions/source/bibliography/bib.component35
-rw-r--r--extensions/source/bibliography/bib.hrc2
-rw-r--r--extensions/source/bibliography/bibbeam.cxx2
-rw-r--r--extensions/source/bibliography/bibconfig.cxx2
-rw-r--r--extensions/source/bibliography/bibcont.cxx8
-rw-r--r--extensions/source/bibliography/bibcont.hxx2
-rw-r--r--extensions/source/bibliography/bibload.cxx29
-rw-r--r--extensions/source/bibliography/bibresid.hxx2
-rw-r--r--extensions/source/bibliography/bibshortcuthandler.hxx2
-rw-r--r--extensions/source/bibliography/bibtools.hxx6
-rw-r--r--extensions/source/bibliography/bibview.cxx4
-rw-r--r--extensions/source/bibliography/bibview.hxx2
-rw-r--r--extensions/source/bibliography/datman.cxx10
-rw-r--r--extensions/source/bibliography/datman.src31
-rw-r--r--extensions/source/bibliography/framectr.cxx4
-rw-r--r--extensions/source/bibliography/general.cxx44
-rw-r--r--extensions/source/bibliography/general.hxx6
-rw-r--r--extensions/source/bibliography/makefile.mk9
-rw-r--r--extensions/source/bibliography/menu.src6
-rw-r--r--extensions/source/bibliography/toolbar.cxx4
-rw-r--r--extensions/source/bibliography/toolbar.src77
-rw-r--r--extensions/source/config/ldap/componentdef.cxx7
-rw-r--r--extensions/source/config/ldap/exports.dxp1
-rw-r--r--extensions/source/config/ldap/ldapaccess.cxx2
-rw-r--r--extensions/source/config/ldap/ldapbe2.component34
-rw-r--r--extensions/source/config/ldap/makefile.mk8
-rw-r--r--extensions/source/dbpilots/commonpagesdbp.cxx2
-rw-r--r--extensions/source/dbpilots/commonpagesdbp.src9
-rw-r--r--extensions/source/dbpilots/dbp.component40
-rw-r--r--extensions/source/dbpilots/dbpilots.src3
-rw-r--r--extensions/source/dbpilots/dbpresid.hrc1
-rw-r--r--extensions/source/dbpilots/dbpservices.cxx21
-rw-r--r--extensions/source/dbpilots/gridpages.src7
-rw-r--r--extensions/source/dbpilots/gridwizard.cxx12
-rw-r--r--extensions/source/dbpilots/groupboxpages.src14
-rw-r--r--extensions/source/dbpilots/groupboxwiz.cxx8
-rw-r--r--extensions/source/dbpilots/listcombopages.src8
-rw-r--r--extensions/source/dbpilots/makefile.mk8
-rw-r--r--extensions/source/inc/componentmodule.cxx48
-rw-r--r--extensions/source/inc/componentmodule.hxx17
-rw-r--r--extensions/source/logging/log.component47
-rw-r--r--extensions/source/logging/makefile.mk8
-rw-r--r--extensions/source/macosx/spotlight/makefile.mk3
-rw-r--r--extensions/source/nsplugin/source/makefile.mk2
-rw-r--r--extensions/source/ole/makefile.mk7
-rw-r--r--extensions/source/ole/oleautobridge.component46
-rw-r--r--extensions/source/ole/oleautobridge.uno.dxp1
-rw-r--r--extensions/source/ole/oleobjw.cxx299
-rw-r--r--extensions/source/ole/oleobjw.hxx29
-rw-r--r--extensions/source/ole/servreg.cxx41
-rw-r--r--extensions/source/ole/unoobjw.cxx2
-rw-r--r--extensions/source/oooimprovecore/makefile.mk8
-rw-r--r--extensions/source/oooimprovecore/oooimprovecore.component34
-rw-r--r--extensions/source/oooimprovement/invite_job.cxx2
-rw-r--r--extensions/source/oooimprovement/makefile.mk8
-rw-r--r--extensions/source/oooimprovement/onlogrotate_job.cxx76
-rw-r--r--extensions/source/oooimprovement/oooimprovement.component38
-rw-r--r--extensions/source/oooimprovement/oooimprovement_exports.cxx22
-rw-r--r--extensions/source/plugin/aqua/macmgr.cxx4
-rw-r--r--extensions/source/plugin/aqua/sysplug.cxx12
-rw-r--r--extensions/source/plugin/base/manager.cxx6
-rw-r--r--extensions/source/plugin/base/service.cxx27
-rw-r--r--extensions/source/plugin/base/xplugin.cxx8
-rw-r--r--extensions/source/plugin/inc/plugin/aqua/sysplug.hxx2
-rw-r--r--extensions/source/plugin/inc/plugin/impl.hxx6
-rw-r--r--extensions/source/plugin/inc/plugin/unx/mediator.hxx30
-rw-r--r--extensions/source/plugin/inc/plugin/unx/plugcon.hxx28
-rw-r--r--extensions/source/plugin/unx/mediator.cxx70
-rw-r--r--extensions/source/plugin/unx/npnapi.cxx74
-rw-r--r--extensions/source/plugin/unx/nppapi.cxx68
-rw-r--r--extensions/source/plugin/unx/npwrap.cxx12
-rw-r--r--extensions/source/plugin/unx/plugcon.cxx66
-rw-r--r--extensions/source/plugin/unx/sysplug.cxx2
-rw-r--r--extensions/source/plugin/unx/unxmgr.cxx4
-rw-r--r--extensions/source/plugin/util/makefile.mk8
-rw-r--r--extensions/source/plugin/util/pl.component37
-rw-r--r--extensions/source/preload/makefile.mk8
-rw-r--r--extensions/source/preload/oemwiz.cxx32
-rw-r--r--extensions/source/preload/oemwiz.hxx10
-rw-r--r--extensions/source/preload/preload.component34
-rw-r--r--extensions/source/preload/preload.src8
-rw-r--r--extensions/source/preload/services.cxx21
-rw-r--r--extensions/source/propctrlr/browserline.cxx12
-rw-r--r--extensions/source/propctrlr/browserline.hxx2
-rw-r--r--extensions/source/propctrlr/browserlistbox.cxx8
-rw-r--r--extensions/source/propctrlr/browserpage.cxx2
-rw-r--r--extensions/source/propctrlr/defaultforminspection.cxx4
-rw-r--r--extensions/source/propctrlr/eformspropertyhandler.cxx12
-rw-r--r--extensions/source/propctrlr/eventhandler.cxx16
-rw-r--r--extensions/source/propctrlr/eventhandler.hxx12
-rw-r--r--extensions/source/propctrlr/fontdialog.cxx4
-rw-r--r--extensions/source/propctrlr/formcomponenthandler.cxx44
-rw-r--r--extensions/source/propctrlr/formcomponenthandler.hxx2
-rw-r--r--extensions/source/propctrlr/formlinkdialog.cxx4
-rw-r--r--extensions/source/propctrlr/formlinkdialog.src2
-rw-r--r--extensions/source/propctrlr/formmetadata.cxx16
-rw-r--r--extensions/source/propctrlr/formmetadata.hxx2
-rw-r--r--extensions/source/propctrlr/genericpropertyhandler.cxx2
-rw-r--r--extensions/source/propctrlr/inspectorhelpwindow.cxx4
-rw-r--r--extensions/source/propctrlr/listselectiondlg.src2
-rw-r--r--extensions/source/propctrlr/makefile.mk8
-rw-r--r--extensions/source/propctrlr/newdatatype.src2
-rw-r--r--extensions/source/propctrlr/pcr.component91
-rw-r--r--extensions/source/propctrlr/pcrcommon.cxx21
-rw-r--r--extensions/source/propctrlr/pcrcommon.hxx5
-rw-r--r--extensions/source/propctrlr/pcrservices.cxx21
-rw-r--r--extensions/source/propctrlr/propcontroller.cxx2
-rw-r--r--extensions/source/propctrlr/propertyeditor.cxx14
-rw-r--r--extensions/source/propctrlr/propertyeditor.hxx4
-rw-r--r--extensions/source/propctrlr/propertyinfo.hxx3
-rw-r--r--extensions/source/propctrlr/pushbuttonnavigation.cxx2
-rw-r--r--extensions/source/propctrlr/selectlabeldialog.cxx2
-rw-r--r--extensions/source/propctrlr/selectlabeldialog.src2
-rw-r--r--extensions/source/propctrlr/standardcontrol.cxx22
-rw-r--r--extensions/source/propctrlr/taborder.cxx14
-rw-r--r--extensions/source/propctrlr/taborder.src4
-rw-r--r--extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx4
-rw-r--r--extensions/source/resource/exports.dxp1
-rw-r--r--extensions/source/resource/makefile.mk8
-rw-r--r--extensions/source/resource/res.component38
-rw-r--r--extensions/source/resource/res_services.cxx42
-rw-r--r--extensions/source/resource/resource.cxx32
-rw-r--r--extensions/source/scanner/exports.dxp1
-rw-r--r--extensions/source/scanner/grid.cxx4
-rw-r--r--extensions/source/scanner/grid.hxx4
-rw-r--r--extensions/source/scanner/grid.src3
-rw-r--r--extensions/source/scanner/makefile.mk8
-rw-r--r--extensions/source/scanner/sane.cxx196
-rw-r--r--extensions/source/scanner/sane.hxx34
-rw-r--r--extensions/source/scanner/sanedlg.cxx169
-rw-r--r--extensions/source/scanner/sanedlg.hxx12
-rw-r--r--extensions/source/scanner/sanedlg.src17
-rw-r--r--extensions/source/scanner/scanner.hxx2
-rw-r--r--extensions/source/scanner/scanunx.cxx15
-rw-r--r--extensions/source/scanner/scanwin.cxx7
-rw-r--r--extensions/source/scanner/scn.component34
-rw-r--r--extensions/source/scanner/scnserv.cxx31
-rw-r--r--extensions/source/scanner/twain.cxx17
-rw-r--r--extensions/source/scanner/twain.hxx12
-rw-r--r--extensions/source/svg/svgaction.cxx50
-rw-r--r--extensions/source/svg/svgaction.hxx2
-rw-r--r--extensions/source/svg/svgprinter.cxx22
-rw-r--r--extensions/source/svg/svguno.cxx30
-rw-r--r--extensions/source/svg/svgwriter.cxx4
-rw-r--r--extensions/source/update/check/makefile.mk8
-rw-r--r--extensions/source/update/check/updatecheckconfig.cxx98
-rwxr-xr-x[-rw-r--r--]extensions/source/update/check/updatecheckconfig.hxx10
-rwxr-xr-x[-rw-r--r--]extensions/source/update/check/updatecheckjob.cxx19
-rw-r--r--extensions/source/update/check/updatehdl.cxx35
-rwxr-xr-x[-rw-r--r--]extensions/source/update/check/updateprotocol.cxx10
-rw-r--r--extensions/source/update/check/updchk.uno.component37
-rw-r--r--extensions/source/update/feed/makefile.mk8
-rw-r--r--extensions/source/update/feed/updatefeed.component34
-rw-r--r--extensions/source/update/feed/updatefeed.cxx12
-rw-r--r--extensions/source/update/ui/makefile.mk8
-rw-r--r--extensions/source/update/ui/updatecheckui.cxx40
-rw-r--r--extensions/source/update/ui/updchk.component34
-rw-r--r--extensions/source/xmlextract/makefile.mk8
-rw-r--r--extensions/source/xmlextract/xmx.component34
-rw-r--r--extensions/source/xmlextract/xmxtrct.cxx2
-rw-r--r--extensions/source/xmlextract/xmxuno.cxx21
170 files changed, 2138 insertions, 1331 deletions
diff --git a/extensions/source/abpilot/abp.component b/extensions/source/abpilot/abp.component
new file mode 100644
index 000000000000..a07cef986219
--- /dev/null
+++ b/extensions/source/abpilot/abp.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+ xmlns="http://openoffice.org/2010/uno-components">
+ <implementation name="org.openoffice.comp.abp.OAddressBookSourcePilot">
+ <service name="com.sun.star.ui.dialogs.AddressBookSourcePilot"/>
+ </implementation>
+</component>
diff --git a/extensions/source/abpilot/abpfinalpage.cxx b/extensions/source/abpilot/abpfinalpage.cxx
index dc4f026390d2..e9724ea1681c 100644
--- a/extensions/source/abpilot/abpfinalpage.cxx
+++ b/extensions/source/abpilot/abpfinalpage.cxx
@@ -77,7 +77,7 @@ namespace abp
m_aName.SetModifyHdl( LINK(this, FinalPage, OnNameModified) );
m_aLocation.SetModifyHdl( LINK(this, FinalPage, OnNameModified) );
m_aRegisterName.SetClickHdl( LINK( this, FinalPage, OnRegister ) );
- m_aRegisterName.Check(TRUE);
+ m_aRegisterName.Check(sal_True);
}
//---------------------------------------------------------------------
@@ -216,7 +216,7 @@ namespace abp
// -----------------------------------------------------------------------------
IMPL_LINK( FinalPage, OnRegister, CheckBox*, EMPTYARG )
{
- BOOL bEnable = m_aRegisterName.IsChecked();
+ sal_Bool bEnable = m_aRegisterName.IsChecked();
m_aNameLabel.Enable(bEnable);
m_aName.Enable(bEnable);
implCheckName();
diff --git a/extensions/source/abpilot/abpresid.hrc b/extensions/source/abpilot/abpresid.hrc
index 1afc6e88a2f0..e6a648a28423 100644
--- a/extensions/source/abpilot/abpresid.hrc
+++ b/extensions/source/abpilot/abpresid.hrc
@@ -29,6 +29,7 @@
#define EXTENSIONS_ABPRESID_HRC
#include "abpilot.hrc"
+#include "extensio.hrc"
//========================================================================
// basics
diff --git a/extensions/source/abpilot/abpservices.cxx b/extensions/source/abpilot/abpservices.cxx
index 1f52f1aeef24..f71e1f352c33 100644
--- a/extensions/source/abpilot/abpservices.cxx
+++ b/extensions/source/abpilot/abpservices.cxx
@@ -67,27 +67,6 @@ component_getImplementationEnvironment(
}
//---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
- void* pServiceManager,
- void* pRegistryKey
- )
-{
- if (pRegistryKey)
- try
- {
- return ::abp::OModule::writeComponentInfos(
- static_cast<XMultiServiceFactory*>(pServiceManager),
- static_cast<XRegistryKey*>(pRegistryKey));
- }
- catch (InvalidRegistryException& )
- {
- OSL_FAIL("abp::component_writeInfo: could not create a registry key (InvalidRegistryException) !");
- }
-
- return sal_False;
-}
-
-//---------------------------------------------------------------------------------------
extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
const sal_Char* pImplementationName,
void* pServiceManager,
diff --git a/extensions/source/abpilot/abspilot.cxx b/extensions/source/abpilot/abspilot.cxx
index 826657b2a283..005c736f9f7e 100644
--- a/extensions/source/abpilot/abspilot.cxx
+++ b/extensions/source/abpilot/abspilot.cxx
@@ -140,7 +140,7 @@ namespace abp
//---------------------------------------------------------------------
String OAddessBookSourcePilot::getStateDisplayName( WizardState _nState ) const
{
- USHORT nResId = 0;
+ sal_uInt16 nResId = 0;
switch ( _nState )
{
case STATE_SELECT_ABTYPE: nResId = STR_SELECT_ABTYPE; break;
@@ -205,7 +205,7 @@ namespace abp
}
//---------------------------------------------------------------------
- BOOL OAddessBookSourcePilot::Close()
+ sal_Bool OAddessBookSourcePilot::Close()
{
implCleanup();
diff --git a/extensions/source/abpilot/abspilot.hxx b/extensions/source/abpilot/abspilot.hxx
index 25795aa61def..a8136706d189 100644
--- a/extensions/source/abpilot/abspilot.hxx
+++ b/extensions/source/abpilot/abspilot.hxx
@@ -85,7 +85,7 @@ namespace abp
// RoadmapWizard
virtual String getStateDisplayName( WizardState _nState ) const;
- virtual BOOL Close();
+ virtual sal_Bool Close();
private:
DECL_LINK( OnCancelClicked, void* );
diff --git a/extensions/source/abpilot/abspilot.src b/extensions/source/abpilot/abspilot.src
index be177b5f6e19..a612a2051075 100644
--- a/extensions/source/abpilot/abspilot.src
+++ b/extensions/source/abpilot/abspilot.src
@@ -71,6 +71,7 @@ ModalDialog RID_DLG_ADDRESSBOOKSOURCEPILOT
//........................................................................
TabPage RID_PAGE_SELECTABTYPE
{
+ HelpID = "extensions:TabPage:RID_PAGE_SELECTABTYPE";
SVLook = TRUE ;
Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ;
@@ -93,56 +94,67 @@ TabPage RID_PAGE_SELECTABTYPE
RadioButton RB_EVOLUTION
{
+ HelpID = "extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_EVOLUTION";
Size = MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
Text [ en-US ] = "Evolution";
};
RadioButton RB_EVOLUTION_GROUPWISE
{
+ HelpID = "extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_EVOLUTION_GROUPWISE";
Size = MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
Text [ en-US ] = "Groupwise";
};
RadioButton RB_EVOLUTION_LDAP
{
+ HelpID = "extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_EVOLUTION_LDAP";
Size = MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
Text [ en-US ] = "Evolution LDAP";
};
RadioButton RB_MORK
{
+ HelpID = "extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_MORK";
Size = MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
Text [ en-US ] = "Mozilla / Netscape";
};
RadioButton RB_THUNDERBIRD
{
+ HelpID = "extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_THUNDERBIRD";
Size = MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
Text [ en-US ] = "Thunderbird";
};
RadioButton RB_KAB
{
+ HelpID = "extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_KAB";
Size = MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
Text [ en-US ] = "KDE address book";
};
RadioButton RB_MACAB
{
+ HelpID = "extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_MACAB";
Size = MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
Text [ en-US ] = "Mac OS X address book";
};
RadioButton RB_LDAP
{
+ HelpID = "extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_LDAP";
Size = MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
Text [ en-US ] = "LDAP address data";
};
RadioButton RB_OUTLOOK
{
+ HelpID = "extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_OUTLOOK";
Size = MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
Text [ en-US ] = "Outlook address book";
};
RadioButton RB_OUTLOOKEXPRESS
{
+ HelpID = "extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_OUTLOOKEXPRESS";
Size = MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
Text [ en-US ] = "Windows system address book";
};
RadioButton RB_OTHER
{
+ HelpID = "extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_OTHER";
Size = MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
Text [ en-US ] = "Other external data source";
};
@@ -151,6 +163,7 @@ TabPage RID_PAGE_SELECTABTYPE
//........................................................................
TabPage RID_PAGE_ADMININVOKATION
{
+ HelpID = "extensions:TabPage:RID_PAGE_ADMININVOKATION";
SVLook = TRUE ;
Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ;
@@ -165,6 +178,7 @@ TabPage RID_PAGE_ADMININVOKATION
PushButton PB_INVOKE_ADMIN_DIALOG
{
+ HelpID = "extensions:PushButton:RID_PAGE_ADMININVOKATION:PB_INVOKE_ADMIN_DIALOG";
Pos = MAP_APPFONT ( ( WINDOW_SIZE_X - BUTTON_SIZE_X ) / 2, 60 ) ;
Size = MAP_APPFONT ( BUTTON_SIZE_X, BUTTON_SIZE_Y ) ;
@@ -185,6 +199,7 @@ TabPage RID_PAGE_ADMININVOKATION
//........................................................................
TabPage RID_PAGE_TABLESELECTION_AB
{
+ HelpID = "extensions:TabPage:RID_PAGE_TABLESELECTION_AB";
SVLook = TRUE ;
Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ;
@@ -199,6 +214,7 @@ TabPage RID_PAGE_TABLESELECTION_AB
ListBox LB_TABLELIST
{
+ HelpID = "extensions:ListBox:RID_PAGE_TABLESELECTION_AB:LB_TABLELIST";
Pos = MAP_APPFONT ( BORDER_X, 36 ) ;
Size = MAP_APPFONT ( WINDOW_SIZE_X - 2 * BORDER_X, 50 ) ;
SVLook = TRUE;
@@ -212,6 +228,7 @@ TabPage RID_PAGE_TABLESELECTION_AB
//........................................................................
TabPage RID_PAGE_FIELDMAPPING
{
+ HelpID = "extensions:TabPage:RID_PAGE_FIELDMAPPING";
SVLook = TRUE ;
Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ;
@@ -226,6 +243,7 @@ TabPage RID_PAGE_FIELDMAPPING
PushButton PB_INVOKE_FIELDS_DIALOG
{
+ HelpID = "extensions:PushButton:RID_PAGE_FIELDMAPPING:PB_INVOKE_FIELDS_DIALOG";
Pos = MAP_APPFONT ( ( WINDOW_SIZE_X - BUTTON_SIZE_X ) / 2, 84 ) ;
Size = MAP_APPFONT ( BUTTON_SIZE_X, BUTTON_SIZE_Y ) ;
@@ -243,6 +261,7 @@ TabPage RID_PAGE_FIELDMAPPING
//........................................................................
TabPage RID_PAGE_FINAL
{
+ HelpID = "extensions:TabPage:RID_PAGE_FINAL";
SVLook = TRUE ;
Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ;
@@ -266,6 +285,7 @@ TabPage RID_PAGE_FINAL
ComboBox CBB_LOCATION
{
+ HelpID = "extensions:ComboBox:RID_PAGE_FINAL:CBB_LOCATION";
Pos = MAP_APPFONT ( BORDER_X , 64 ) ;
Size = MAP_APPFONT ( WINDOW_SIZE_X - 53 - BORDER_X - BORDER_X, 12) ;
SVLook = TRUE;
@@ -276,6 +296,7 @@ TabPage RID_PAGE_FINAL
PushButton PB_BROWSE
{
+ HelpID = "extensions:PushButton:RID_PAGE_FINAL:PB_BROWSE";
Pos = MAP_APPFONT ( WINDOW_SIZE_X - 50 - BORDER_X , 63 ) ;
Size = MAP_APPFONT ( 50, 14) ;
SVLook = TRUE;
@@ -286,6 +307,7 @@ TabPage RID_PAGE_FINAL
CheckBox CB_REGISTER_DS
{
+ HelpID = "extensions:CheckBox:RID_PAGE_FINAL:CB_REGISTER_DS";
Pos = MAP_APPFONT ( BORDER_X, 82 ) ;
Size = MAP_APPFONT ( WINDOW_SIZE_X - BORDER_X - BORDER_X, 8) ;
SVLook = TRUE;
@@ -303,6 +325,7 @@ TabPage RID_PAGE_FINAL
Edit ET_DATASOURCENAME
{
+ HelpID = "extensions:Edit:RID_PAGE_FINAL:ET_DATASOURCENAME";
Pos = MAP_APPFONT ( BORDER_X + 10, 104 ) ;
Size = MAP_APPFONT ( WINDOW_SIZE_X - 56 - BORDER_X - BORDER_X - 10, 12) ;
SVLook = TRUE;
diff --git a/extensions/source/abpilot/exports.dxp b/extensions/source/abpilot/exports.dxp
index 9630d7e06768..f0e1c69934bc 100644
--- a/extensions/source/abpilot/exports.dxp
+++ b/extensions/source/abpilot/exports.dxp
@@ -1,3 +1,2 @@
component_getImplementationEnvironment
-component_writeInfo
component_getFactory
diff --git a/extensions/source/abpilot/makefile.mk b/extensions/source/abpilot/makefile.mk
index 95c4208553f4..b205d9b3f2e9 100644
--- a/extensions/source/abpilot/makefile.mk
+++ b/extensions/source/abpilot/makefile.mk
@@ -104,3 +104,11 @@ DEF1EXPORTFILE= exports.dxp
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
+
+ALLTAR : $(MISC)/abp.component
+
+$(MISC)/abp.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+ abp.component
+ $(XSLTPROC) --nonet --stringparam uri \
+ '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+ $(SOLARENV)/bin/createcomponent.xslt abp.component
diff --git a/extensions/source/bibliography/bib.component b/extensions/source/bibliography/bib.component
new file mode 100644
index 000000000000..98627854dffa
--- /dev/null
+++ b/extensions/source/bibliography/bib.component
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+ xmlns="http://openoffice.org/2010/uno-components">
+ <implementation name="com.sun.star.extensions.Bibliography">
+ <service name="com.sun.star.frame.Bibliography"/>
+ <service name="com.sun.star.frame.FrameLoader"/>
+ </implementation>
+</component>
diff --git a/extensions/source/bibliography/bib.hrc b/extensions/source/bibliography/bib.hrc
index abcf68855263..480a82078eb9 100644
--- a/extensions/source/bibliography/bib.hrc
+++ b/extensions/source/bibliography/bib.hrc
@@ -28,7 +28,7 @@
#define BIB_HRC
#include "bibliography.hrc"
-
+#include <svl/solar.hrc>
#ifndef RID_BIB_START
#define RID_BIB_START RID_EXTENSIONS_START
#endif
diff --git a/extensions/source/bibliography/bibbeam.cxx b/extensions/source/bibliography/bibbeam.cxx
index a4dd71df31ba..cc3d26ac84e9 100644
--- a/extensions/source/bibliography/bibbeam.cxx
+++ b/extensions/source/bibliography/bibbeam.cxx
@@ -65,7 +65,7 @@ namespace bib
using namespace ::com::sun::star::uno;
- void HandleTaskPaneList( Window* pWindow, BOOL bAddToList )
+ void HandleTaskPaneList( Window* pWindow, sal_Bool bAddToList )
{
Window* pParent = pWindow->GetParent();
diff --git a/extensions/source/bibliography/bibconfig.cxx b/extensions/source/bibliography/bibconfig.cxx
index 7e317986e00f..a4558d35bd01 100644
--- a/extensions/source/bibliography/bibconfig.cxx
+++ b/extensions/source/bibliography/bibconfig.cxx
@@ -269,7 +269,7 @@ void BibConfig::Commit()
OUString sCommandType(C2U("CommandType"));
for(sal_Int32 i = 0; i < pMappingsArr->Count(); i++)
{
- const Mapping* pMapping = pMappingsArr->GetObject((USHORT)i);
+ const Mapping* pMapping = pMappingsArr->GetObject((sal_uInt16)i);
OUString sPrefix(C2U(cDataSourceHistory));
sPrefix += C2U("/_");
sPrefix += OUString::valueOf(i);
diff --git a/extensions/source/bibliography/bibcont.cxx b/extensions/source/bibliography/bibcont.cxx
index ac137f462d63..5f8158a3e760 100644
--- a/extensions/source/bibliography/bibcont.cxx
+++ b/extensions/source/bibliography/bibcont.cxx
@@ -234,8 +234,8 @@ long BibBookContainer::PreNotify( NotifyEvent& rNEvt )
{
const KeyEvent* pKEvt = rNEvt.GetKeyEvent();
const KeyCode aKeyCode = pKEvt->GetKeyCode();
- USHORT nKey = aKeyCode.GetCode();
- const USHORT nModifier = aKeyCode.GetModifier();
+ sal_uInt16 nKey = aKeyCode.GetCode();
+ const sal_uInt16 nModifier = aKeyCode.GetModifier();
if( KEY_MOD2 == nModifier )
{
@@ -243,8 +243,8 @@ long BibBookContainer::PreNotify( NotifyEvent& rNEvt )
{
if(pTopWin && pBottomWin)
{
- USHORT nFirstWinId = KEY_UP == nKey ? TOP_WINDOW : BOTTOM_WINDOW;
- USHORT nSecondWinId = KEY_UP == nKey ? BOTTOM_WINDOW : TOP_WINDOW;
+ sal_uInt16 nFirstWinId = KEY_UP == nKey ? TOP_WINDOW : BOTTOM_WINDOW;
+ sal_uInt16 nSecondWinId = KEY_UP == nKey ? BOTTOM_WINDOW : TOP_WINDOW;
long nHeight = GetItemSize( nFirstWinId );
nHeight -= WIN_STEP_SIZE;
if(nHeight < WIN_MIN_HEIGHT)
diff --git a/extensions/source/bibliography/bibcont.hxx b/extensions/source/bibliography/bibcont.hxx
index be725ac5f713..872734348436 100644
--- a/extensions/source/bibliography/bibcont.hxx
+++ b/extensions/source/bibliography/bibcont.hxx
@@ -58,7 +58,7 @@ class BibWindowContainer : public BibWindow //Window
virtual void GetFocus();
- virtual BOOL HandleShortCutKey( const KeyEvent& rKeyEvent ); // returns true, if key was handled
+ virtual sal_Bool HandleShortCutKey( const KeyEvent& rKeyEvent ); // returns true, if key was handled
using Window::GetChild;
};
diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx
index c4e8d93aa193..e0d419c40d80 100644
--- a/extensions/source/bibliography/bibload.cxx
+++ b/extensions/source/bibliography/bibload.cxx
@@ -222,35 +222,6 @@ extern "C"
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
- sal_Bool SAL_CALL component_writeInfo( void * //pServiceManager
- , registry::XRegistryKey * pRegistryKey )
- {
- try
- {
- rtl::OUString sKey(RTL_CONSTASCII_USTRINGPARAM("/"));
- sKey += BibliographyLoader::getImplementationName_Static();
- //creates the impl key: /com.sun.star.extensions.Bibliography
- Reference< registry::XRegistryKey > xImplKey = pRegistryKey->createKey(sKey);
-
-
- Reference< registry::XRegistryKey > xNewKey = xImplKey->createKey( C2U("/UNO/SERVICES") );
- Sequence< rtl::OUString > aServices = BibliographyLoader::getSupportedServiceNames_Static();
- for( INT32 i = 0; i < aServices.getLength(); i++ )
- xNewKey->createKey( aServices.getConstArray()[i]);
- xNewKey = xImplKey->createKey( C2U("/UNO/Loader"));
-
- Reference< registry::XRegistryKey > xPatternKey = xImplKey->createKey( C2U("/Loader/Pattern" ));
- xPatternKey->setAsciiValue( C2U( ".component:Bibliography/*" ) );
-
- return sal_True;
- }
- catch (Exception &)
- {
- return sal_False;
- }
- }
-
-
void * SAL_CALL component_getFactory(
const sal_Char * pImplName, XMultiServiceFactory * pServiceManager, void * /*pRegistryKey*/ )
{
diff --git a/extensions/source/bibliography/bibresid.hxx b/extensions/source/bibliography/bibresid.hxx
index de8c6c0a0769..7c4081225f7c 100644
--- a/extensions/source/bibliography/bibresid.hxx
+++ b/extensions/source/bibliography/bibresid.hxx
@@ -36,7 +36,7 @@
class BibResId : public ResId
{
public:
- BibResId( USHORT nId );
+ BibResId( sal_uInt16 nId );
};
diff --git a/extensions/source/bibliography/bibshortcuthandler.hxx b/extensions/source/bibliography/bibshortcuthandler.hxx
index f0bf5aa574b0..87258e38d049 100644
--- a/extensions/source/bibliography/bibshortcuthandler.hxx
+++ b/extensions/source/bibliography/bibshortcuthandler.hxx
@@ -47,7 +47,7 @@ protected:
public:
virtual ~BibShortCutHandler();
- virtual BOOL HandleShortCutKey( const KeyEvent& rKeyEvent ); // returns true, if key was handled
+ virtual sal_Bool HandleShortCutKey( const KeyEvent& rKeyEvent ); // returns true, if key was handled
inline Window* GetWindow( void );
};
diff --git a/extensions/source/bibliography/bibtools.hxx b/extensions/source/bibliography/bibtools.hxx
index 91dd5648ce63..f013e7514033 100644
--- a/extensions/source/bibliography/bibtools.hxx
+++ b/extensions/source/bibliography/bibtools.hxx
@@ -34,17 +34,17 @@ namespace bib
{
// source in bibbeam.cxx
- void HandleTaskPaneList( Window* pWindow, BOOL bAddToList );
+ void HandleTaskPaneList( Window* pWindow, sal_Bool bAddToList );
// pWindow: just an system window or something wich is child of a system window
inline void AddToTaskPaneList( Window* pWindowToBeHandled )
{
- HandleTaskPaneList( pWindowToBeHandled, TRUE );
+ HandleTaskPaneList( pWindowToBeHandled, sal_True );
}
inline void RemoveFromTaskPaneList( Window* pWindowToBeHandled )
{
- HandleTaskPaneList( pWindowToBeHandled, FALSE );
+ HandleTaskPaneList( pWindowToBeHandled, sal_False );
}
}
diff --git a/extensions/source/bibliography/bibview.cxx b/extensions/source/bibliography/bibview.cxx
index eab0e1439d3b..8c54464adfba 100644
--- a/extensions/source/bibliography/bibview.cxx
+++ b/extensions/source/bibliography/bibview.cxx
@@ -207,9 +207,9 @@ namespace bib
m_pGeneralPage->GrabFocus();
}
- BOOL BibView::HandleShortCutKey( const KeyEvent& rKeyEvent )
+ sal_Bool BibView::HandleShortCutKey( const KeyEvent& rKeyEvent )
{
- return m_pGeneralPage? m_pGeneralPage->HandleShortCutKey( rKeyEvent ) : FALSE;
+ return m_pGeneralPage? m_pGeneralPage->HandleShortCutKey( rKeyEvent ) : sal_False;
}
//.........................................................................
diff --git a/extensions/source/bibliography/bibview.hxx b/extensions/source/bibliography/bibview.hxx
index f4fa44ea7b17..af2899ad9954 100644
--- a/extensions/source/bibliography/bibview.hxx
+++ b/extensions/source/bibliography/bibview.hxx
@@ -75,7 +75,7 @@ namespace bib
virtual void GetFocus();
- virtual BOOL HandleShortCutKey( const KeyEvent& rKeyEvent ); // returns true, if key was handled
+ virtual sal_Bool HandleShortCutKey( const KeyEvent& rKeyEvent ); // returns true, if key was handled
};
//.........................................................................
diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx
index 384419da4fd5..b2698154fd03 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -307,7 +307,7 @@ public:
MappingDialog_Impl(Window* pParent, BibDataManager* pDatMan);
~MappingDialog_Impl();
- void SetModified() {bModified = TRUE;}
+ void SetModified() {bModified = sal_True;}
};
@@ -610,7 +610,7 @@ DBChangeDialog_Impl::DBChangeDialog_Impl(Window* pParent, BibDataManager* pMan )
aSelectionHB.Show();
aSelectionLB.SetTabs( &nTabs[0], MAP_PIXEL );
- aSelectionLB.SetWindowBits(WB_CLIPCHILDREN|WB_SORT);
+ aSelectionLB.SetStyle(aSelectionLB.GetStyle()|WB_CLIPCHILDREN|WB_SORT);
aSelectionLB.GetModel()->SetSortMode(SortAscending);
::rtl::OUString sActiveSource = pDatMan->getActiveDataSource();
@@ -1363,9 +1363,9 @@ Reference< awt::XControlModel > BibDataManager::createGridModel(const ::rtl::OUS
Reference< XPropertySetInfo > xPropInfo = xPropSet->getPropertySetInfo();
if (xPropInfo->hasPropertyByName(uProp))
{
- ::rtl::OUString sId(RTL_CONSTASCII_USTRINGPARAM( "HID:" ));
- sId += ::rtl::OUString::valueOf( (sal_Int32) HID_BIB_DB_GRIDCTRL );
- xPropSet->setPropertyValue( uProp, makeAny( ::rtl::OUString( sId ) ) );
+ ::rtl::OUString sId(RTL_CONSTASCII_USTRINGPARAM( INET_HID_SCHEME ));
+ sId += ::rtl::OUString::createFromAscii( HID_BIB_DB_GRIDCTRL );
+ xPropSet->setPropertyValue( uProp, makeAny( sId ) );
}
}
catch(Exception& e )
diff --git a/extensions/source/bibliography/datman.src b/extensions/source/bibliography/datman.src
index 0a0643b1b117..461404b2483a 100644
--- a/extensions/source/bibliography/datman.src
+++ b/extensions/source/bibliography/datman.src
@@ -62,6 +62,7 @@ ModalDialog RID_DLG_MAPPING
};
ListBox LB_IDENTIFIER
{
+ HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_IDENTIFIER";
Pos = MAP_APPFONT ( 65 , 13 ) ;
Size = MAP_APPFONT ( 50 , 60 ) ;
DropDown = TRUE;
@@ -73,6 +74,7 @@ ModalDialog RID_DLG_MAPPING
};
ListBox LB_AUTHORITYTYPE
{
+ HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_AUTHORITYTYPE";
Pos = MAP_APPFONT ( 171 , 13 ) ;
Size = MAP_APPFONT ( 50 , 60 ) ;
DropDown = TRUE;
@@ -84,6 +86,7 @@ ModalDialog RID_DLG_MAPPING
};
ListBox LB_YEAR
{
+ HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_YEAR";
Pos = MAP_APPFONT ( 282 , 13 ) ;
Size = MAP_APPFONT ( 50 , 60 ) ;
DropDown = TRUE;
@@ -95,6 +98,7 @@ ModalDialog RID_DLG_MAPPING
};
ListBox LB_AUTHOR
{
+ HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_AUTHOR";
Pos = MAP_APPFONT ( 65 , 28 ) ;
Size = MAP_APPFONT ( 50 , 60 ) ;
DropDown = TRUE;
@@ -106,6 +110,7 @@ ModalDialog RID_DLG_MAPPING
};
ListBox LB_TITLE
{
+ HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_TITLE";
Pos = MAP_APPFONT ( 171 , 28 ) ;
Size = MAP_APPFONT ( 50 , 60 ) ;
DropDown = TRUE;
@@ -117,6 +122,7 @@ ModalDialog RID_DLG_MAPPING
};
ListBox LB_PUBLISHER
{
+ HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_PUBLISHER";
Pos = MAP_APPFONT ( 65 , 43 ) ;
Size = MAP_APPFONT ( 50 , 60 ) ;
DropDown = TRUE;
@@ -128,6 +134,7 @@ ModalDialog RID_DLG_MAPPING
};
ListBox LB_ADDRESS
{
+ HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_ADDRESS";
Pos = MAP_APPFONT ( 171, 43 ) ;
Size = MAP_APPFONT ( 50 , 60 ) ;
DropDown = TRUE;
@@ -139,6 +146,7 @@ ModalDialog RID_DLG_MAPPING
};
ListBox LB_ISBN
{
+ HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_ISBN";
Pos = MAP_APPFONT ( 282 , 43 ) ;
Size = MAP_APPFONT ( 50 , 60 ) ;
DropDown = TRUE;
@@ -150,6 +158,7 @@ ModalDialog RID_DLG_MAPPING
};
ListBox LB_CHAPTER
{
+ HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_CHAPTER";
Pos = MAP_APPFONT ( 65 , 58 ) ;
Size = MAP_APPFONT ( 50 , 60 ) ;
DropDown = TRUE;
@@ -161,6 +170,7 @@ ModalDialog RID_DLG_MAPPING
};
ListBox LB_PAGES
{
+ HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_PAGES";
Pos = MAP_APPFONT ( 171, 58) ;
Size = MAP_APPFONT ( 50 , 60 ) ;
DropDown = TRUE;
@@ -172,6 +182,7 @@ ModalDialog RID_DLG_MAPPING
};
ListBox LB_EDITOR
{
+ HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_EDITOR";
Pos = MAP_APPFONT ( 65 , 73 ) ;
Size = MAP_APPFONT ( 50 , 60 ) ;
DropDown = TRUE;
@@ -183,6 +194,7 @@ ModalDialog RID_DLG_MAPPING
};
ListBox LB_EDITION
{
+ HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_EDITION";
Pos = MAP_APPFONT ( 171 , 73 ) ;
Size = MAP_APPFONT ( 50 , 60 ) ;
DropDown = TRUE;
@@ -194,6 +206,7 @@ ModalDialog RID_DLG_MAPPING
};
ListBox LB_BOOKTITLE
{
+ HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_BOOKTITLE";
Pos = MAP_APPFONT ( 65, 88 ) ;
Size = MAP_APPFONT ( 50 , 60 ) ;
DropDown = TRUE;
@@ -205,6 +218,7 @@ ModalDialog RID_DLG_MAPPING
};
ListBox LB_VOLUME
{
+ HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_VOLUME";
Pos = MAP_APPFONT ( 171 , 88 ) ;
Size = MAP_APPFONT ( 50 , 60 ) ;
DropDown = TRUE;
@@ -216,6 +230,7 @@ ModalDialog RID_DLG_MAPPING
};
ListBox LB_HOWPUBLISHED
{
+ HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_HOWPUBLISHED";
Pos = MAP_APPFONT ( 282, 88 ) ;
Size = MAP_APPFONT ( 50 , 60 ) ;
DropDown = TRUE;
@@ -227,6 +242,7 @@ ModalDialog RID_DLG_MAPPING
};
ListBox LB_ORGANIZATIONS
{
+ HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_ORGANIZATIONS";
Pos = MAP_APPFONT ( 65 , 103 ) ;
Size = MAP_APPFONT ( 50 , 60 ) ;
DropDown = TRUE;
@@ -238,6 +254,7 @@ ModalDialog RID_DLG_MAPPING
};
ListBox LB_INSTITUTION
{
+ HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_INSTITUTION";
Pos = MAP_APPFONT ( 171 , 103) ;
Size = MAP_APPFONT ( 50 , 60 ) ;
DropDown = TRUE;
@@ -249,6 +266,7 @@ ModalDialog RID_DLG_MAPPING
};
ListBox LB_SCHOOL
{
+ HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_SCHOOL";
Pos = MAP_APPFONT ( 282 , 103 ) ;
Size = MAP_APPFONT ( 50 , 60 ) ;
DropDown = TRUE;
@@ -260,6 +278,7 @@ ModalDialog RID_DLG_MAPPING
};
ListBox LB_REPORTTYPE
{
+ HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_REPORTTYPE";
Pos = MAP_APPFONT ( 65 , 118 ) ;
Size = MAP_APPFONT ( 50 , 60 ) ;
DropDown = TRUE;
@@ -271,6 +290,7 @@ ModalDialog RID_DLG_MAPPING
};
ListBox LB_MONTH
{
+ HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_MONTH";
Pos = MAP_APPFONT ( 171 , 118) ;
Size = MAP_APPFONT ( 50 , 60 ) ;
DropDown = TRUE;
@@ -282,6 +302,7 @@ ModalDialog RID_DLG_MAPPING
};
ListBox LB_JOURNAL
{
+ HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_JOURNAL";
Pos = MAP_APPFONT ( 65 , 133) ;
Size = MAP_APPFONT ( 50 , 60 ) ;
DropDown = TRUE;
@@ -293,6 +314,7 @@ ModalDialog RID_DLG_MAPPING
};
ListBox LB_NUMBER
{
+ HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_NUMBER";
Pos = MAP_APPFONT ( 171 , 133 ) ;
Size = MAP_APPFONT ( 50 , 60 ) ;
DropDown = TRUE;
@@ -304,6 +326,7 @@ ModalDialog RID_DLG_MAPPING
};
ListBox LB_SERIES
{
+ HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_SERIES";
Pos = MAP_APPFONT ( 282 , 133 ) ;
Size = MAP_APPFONT ( 50 , 60 ) ;
DropDown = TRUE;
@@ -315,6 +338,7 @@ ModalDialog RID_DLG_MAPPING
};
ListBox LB_ANNOTE
{
+ HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_ANNOTE";
Pos = MAP_APPFONT ( 65 , 148 ) ;
Size = MAP_APPFONT ( 50 , 60 ) ;
DropDown = TRUE;
@@ -326,6 +350,7 @@ ModalDialog RID_DLG_MAPPING
};
ListBox LB_NOTE
{
+ HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_NOTE";
Pos = MAP_APPFONT ( 171 , 148 ) ;
Size = MAP_APPFONT ( 50 , 60 ) ;
DropDown = TRUE;
@@ -337,6 +362,7 @@ ModalDialog RID_DLG_MAPPING
};
ListBox LB_URL
{
+ HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_URL";
Pos = MAP_APPFONT ( 282, 148 ) ;
Size = MAP_APPFONT ( 50 , 60 ) ;
DropDown = TRUE;
@@ -348,6 +374,7 @@ ModalDialog RID_DLG_MAPPING
};
ListBox LB_CUSTOM1
{
+ HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_CUSTOM1";
Pos = MAP_APPFONT ( 65 , 163 ) ;
Size = MAP_APPFONT ( 50 , 60 ) ;
DropDown = TRUE;
@@ -359,6 +386,7 @@ ModalDialog RID_DLG_MAPPING
};
ListBox LB_CUSTOM2
{
+ HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_CUSTOM2";
Pos = MAP_APPFONT ( 171 , 163 ) ;
Size = MAP_APPFONT ( 50 , 60 ) ;
DropDown = TRUE;
@@ -370,6 +398,7 @@ ModalDialog RID_DLG_MAPPING
};
ListBox LB_CUSTOM3
{
+ HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_CUSTOM3";
Pos = MAP_APPFONT ( 282 , 163 ) ;
Size = MAP_APPFONT ( 50 , 60 ) ;
DropDown = TRUE;
@@ -381,6 +410,7 @@ ModalDialog RID_DLG_MAPPING
};
ListBox LB_CUSTOM4
{
+ HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_CUSTOM4";
Pos = MAP_APPFONT ( 65 , 177 ) ;
Size = MAP_APPFONT ( 50 , 60 ) ;
DropDown = TRUE;
@@ -392,6 +422,7 @@ ModalDialog RID_DLG_MAPPING
};
ListBox LB_CUSTOM5
{
+ HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_CUSTOM5";
Pos = MAP_APPFONT ( 171 , 177 ) ;
Size = MAP_APPFONT ( 50 , 60 ) ;
DropDown = TRUE;
diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx
index 4655075e052c..d421ed31b7c7 100644
--- a/extensions/source/bibliography/framectr.cxx
+++ b/extensions/source/bibliography/framectr.cxx
@@ -418,8 +418,8 @@ sal_Bool BibFrameController_Impl::SaveModified(const Reference< form::runtime::X
Window* lcl_GetFocusChild( Window* pParent )
{
- USHORT nChildren = pParent->GetChildCount();
- for( USHORT nChild = 0; nChild < nChildren; ++nChild)
+ sal_uInt16 nChildren = pParent->GetChildCount();
+ for( sal_uInt16 nChild = 0; nChild < nChildren; ++nChild)
{
Window* pChild = pParent->GetChild( nChild );
if(pChild->HasFocus())
diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx
index 27adec5f5c80..f2931d7a68cb 100644
--- a/extensions/source/bibliography/general.cxx
+++ b/extensions/source/bibliography/general.cxx
@@ -57,6 +57,7 @@
#include <algorithm>
#include <functional>
#include <vector>
+#include <tools/urlobj.hxx>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -266,8 +267,8 @@ BibGeneralPage::BibGeneralPage(Window* pParent, BibDataManager* pMan):
aBasePos = aIdentifierFT.GetPosPixel();
- INT16* pMap = nFT2CtrlMap;
- for( USHORT i = 0 ; i < FIELD_COUNT ; ++i, ++pMap )
+ sal_Int16* pMap = nFT2CtrlMap;
+ for( sal_uInt16 i = 0 ; i < FIELD_COUNT ; ++i, ++pMap )
{
aControls[ i ] = 0;
*pMap = -1;
@@ -423,7 +424,7 @@ BibGeneralPage::~BibGeneralPage()
void BibGeneralPage::RemoveListeners()
{
- for(USHORT i = 0; i < FIELD_COUNT; i++)
+ for(sal_uInt16 i = 0; i < FIELD_COUNT; i++)
{
if(aControls[i].is())
{
@@ -448,12 +449,12 @@ void BibGeneralPage::CommitActiveControl()
}
//-----------------------------------------------------------------------------
void BibGeneralPage::AddControlWithError( const OUString& rColumnName, const ::Point& rPos, const ::Size& rSize,
- String& rErrorString, String aColumnUIName, sal_uInt16 nHelpId, sal_uInt16 nIndexInFTArray )
+ String& rErrorString, String aColumnUIName, const rtl::OString& sHelpId, sal_uInt16 nIndexInFTArray )
{
// adds also the XControl and creates a map entry in nFT2CtrlMap[] for mapping between control and FT
- INT16 nIndex = -1;
- uno::Reference< awt::XControlModel > xTmp = AddXControl(rColumnName, rPos, rSize, nHelpId, nIndex );
+ sal_Int16 nIndex = -1;
+ uno::Reference< awt::XControlModel > xTmp = AddXControl(rColumnName, rPos, rSize, sHelpId, nIndex );
if( xTmp.is() )
{
DBG_ASSERT( nIndexInFTArray < FIELD_COUNT, "*BibGeneralPage::AddControlWithError(): wrong array index!" );
@@ -472,7 +473,7 @@ void BibGeneralPage::AddControlWithError( const OUString& rColumnName, const ::P
//-----------------------------------------------------------------------------
uno::Reference< awt::XControlModel > BibGeneralPage::AddXControl(
const String& rName,
- ::Point rPos, ::Size rSize, sal_uInt16 nHelpId, INT16& rIndex )
+ ::Point rPos, ::Size rSize, const rtl::OString& sHelpId, sal_Int16& rIndex )
{
uno::Reference< awt::XControlModel > xCtrModel;
try
@@ -494,11 +495,10 @@ uno::Reference< awt::XControlModel > BibGeneralPage::AddXControl(
rtl::OUString uProp(C2U("HelpURL"));
if(xPropInfo->hasPropertyByName(uProp))
{
- String sId(C2S("HID:"));
- sId += String::CreateFromInt32(nHelpId);
- rtl::OUString uId(sId) ;
- uno::Any aVal; aVal <<= uId;
- xPropSet->setPropertyValue(uProp, aVal);
+ ::rtl::OUString sId = ::rtl::OUString::createFromAscii( INET_HID_SCHEME );
+ DBG_ASSERT( INetURLObject( rtl::OStringToOUString( sHelpId, RTL_TEXTENCODING_UTF8 ) ).GetProtocol() == INET_PROT_NOT_VALID, "Wrong HelpId!" );
+ sId += ::rtl::OUString( sHelpId, sHelpId.getLength(), RTL_TEXTENCODING_UTF8 );
+ xPropSet->setPropertyValue( uProp, makeAny( sId ) );
}
if(bTypeListBox)
@@ -530,7 +530,7 @@ uno::Reference< awt::XControlModel > BibGeneralPage::AddXControl(
xPropSet->setPropertyValue(C2U("StringItemList"), aAny);
- BOOL bTrue = sal_True;
+ sal_Bool bTrue = sal_True;
aAny.setValue( &bTrue, ::getBooleanCppuType() );
xPropSet->setPropertyValue( C2U("Dropdown"), aAny );
@@ -549,11 +549,11 @@ uno::Reference< awt::XControlModel > BibGeneralPage::AddXControl(
uno::Reference< awt::XWindow > xCtrWin(xControl, UNO_QUERY );
xCtrWin->addFocusListener( this );
rIndex = -1; // -> implies, that not found
- for(USHORT i = 0; i < FIELD_COUNT; i++)
+ for(sal_uInt16 i = 0; i < FIELD_COUNT; i++)
if(!aControls[i].is())
{
aControls[i] = xCtrWin;
- rIndex = INT16( i );
+ rIndex = sal_Int16( i );
break;
}
xCtrWin->setVisible( sal_True );
@@ -579,8 +579,8 @@ void BibGeneralPage::AdjustScrollbars()
long nVertScrollWidth = aVertScroll.GetSizePixel().Width();
long nHoriScrollHeight = aHoriScroll.GetSizePixel().Height();
::Size aOutSize(GetOutputSizePixel());
- BOOL bHoriVisible = aOutSize.Width() <= aStdSize.Width();
- BOOL bVertVisible = (aOutSize.Height()-(bHoriVisible ? nHoriScrollHeight : 0)) <= (aStdSize.Height());
+ sal_Bool bHoriVisible = aOutSize.Width() <= aStdSize.Width();
+ sal_Bool bVertVisible = (aOutSize.Height()-(bHoriVisible ? nHoriScrollHeight : 0)) <= (aStdSize.Height());
aHoriScroll.Show(bHoriVisible);
aVertScroll.Show(bVertVisible);
@@ -716,7 +716,7 @@ void BibGeneralPage::InitFixedTexts( void )
IMPL_LINK(BibGeneralPage, ScrollHdl, ScrollBar*, pScroll)
{
- BOOL bVertical = &aVertScroll == pScroll;
+ sal_Bool bVertical = &aVertScroll == pScroll;
long nOffset = 0;
long nCurrentOffset = 0;
if(bVertical)
@@ -725,7 +725,7 @@ IMPL_LINK(BibGeneralPage, ScrollHdl, ScrollBar*, pScroll)
nCurrentOffset = aFixedTexts[0]->GetPosPixel().X() - aBasePos.X();
nOffset = pScroll->IsVisible() ? pScroll->GetThumbPos() + nCurrentOffset : nCurrentOffset;;
- for(USHORT i = 0; i < FIELD_COUNT; i++)
+ for(sal_uInt16 i = 0; i < FIELD_COUNT; i++)
{
::Point aPos = aFixedTexts[i]->GetPosPixel();
if(bVertical)
@@ -810,13 +810,13 @@ void BibGeneralPage::GetFocus()
aControlParentWin.GrabFocus();
}
-BOOL BibGeneralPage::HandleShortCutKey( const KeyEvent& rKeyEvent )
+sal_Bool BibGeneralPage::HandleShortCutKey( const KeyEvent& rKeyEvent )
{
DBG_ASSERT( KEY_MOD2 == rKeyEvent.GetKeyCode().GetModifier(), "+BibGeneralPage::HandleShortCutKey(): this is not for me!" );
const vcl::I18nHelper& rI18nHelper = Application::GetSettings().GetUILocaleI18nHelper();
const xub_Unicode c = rKeyEvent.GetCharCode();
- BOOL bHandled = FALSE;
+ sal_Bool bHandled = sal_False;
sal_Int16 i;
@@ -831,7 +831,7 @@ BOOL BibGeneralPage::HandleShortCutKey( const KeyEvent& rKeyEvent )
{
if( rI18nHelper.MatchMnemonic( aFixedTexts[ i ]->GetText(), c ) )
{
- bHandled = TRUE;
+ bHandled = sal_True;
sal_Int16 nCtrlIndex = nFT2CtrlMap[ i ];
if( nCtrlIndex >= 0 )
diff --git a/extensions/source/bibliography/general.hxx b/extensions/source/bibliography/general.hxx
index 2db696bbe1f3..0095d18d3626 100644
--- a/extensions/source/bibliography/general.hxx
+++ b/extensions/source/bibliography/general.hxx
@@ -136,12 +136,12 @@ class BibGeneralPage: public BibGeneralPageBaseClass, public BibTabPage
BibDataManager* pDatMan;
::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >
- AddXControl( const String& rName, Point aPos, Size aSize, sal_uInt16 nHelpId,
+ AddXControl( const String& rName, Point aPos, Size aSize, const rtl::OString& sHelpId,
sal_Int16& rIndex );
void AddControlWithError( const rtl::OUString& rColumnName, const Point& rPos,
const Size& rSize, String& rErrorString, String aColumnUIName,
- sal_uInt16 nHelpId, sal_uInt16 nIndexInFTArray );
+ const rtl::OString& sHelpId, sal_uInt16 nIndexInFTArray );
void AdjustScrollbars();
@@ -175,7 +175,7 @@ public:
virtual void GetFocus();
- virtual BOOL HandleShortCutKey( const KeyEvent& rKeyEvent ); // returns true, if key was handled
+ virtual sal_Bool HandleShortCutKey( const KeyEvent& rKeyEvent ); // returns true, if key was handled
};
diff --git a/extensions/source/bibliography/makefile.mk b/extensions/source/bibliography/makefile.mk
index f25dce11045b..b681c6c90b19 100644
--- a/extensions/source/bibliography/makefile.mk
+++ b/extensions/source/bibliography/makefile.mk
@@ -54,7 +54,6 @@ SRS1NAME=$(TARGET)
SRC1FILES= bib.src \
datman.src \
sections.src \
- menu.src \
toolbar.src
RESLIB1NAME=bib
@@ -89,3 +88,11 @@ DEF1NAME= $(SHL1TARGET)
.INCLUDE : target.mk
+
+ALLTAR : $(MISC)/bib.component
+
+$(MISC)/bib.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+ bib.component
+ $(XSLTPROC) --nonet --stringparam uri \
+ '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+ $(SOLARENV)/bin/createcomponent.xslt bib.component
diff --git a/extensions/source/bibliography/menu.src b/extensions/source/bibliography/menu.src
index 0ccc8a1c7f41..a2a41ed06def 100644
--- a/extensions/source/bibliography/menu.src
+++ b/extensions/source/bibliography/menu.src
@@ -27,14 +27,8 @@
#include <svl/solar.hrc>
#include <svx/svxids.hrc>
-#ifndef _GLOBLMN_HRC
#include <svx/globlmn.hrc>
-#endif
-#ifndef _GLOBALACC_SRC
-#include <svx/globlac.hrc>
-#endif
#include "bibliography.hrc"
-
#include "bib.hrc"
/*
diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx
index a63f95756928..f1434a0c32cd 100644
--- a/extensions/source/bibliography/toolbar.cxx
+++ b/extensions/source/bibliography/toolbar.cxx
@@ -377,7 +377,7 @@ void BibToolBar::Click()
{
if(pDatMan)
pDatMan->CreateMappingDialog(GetParent());
- CheckItem( nId, FALSE );
+ CheckItem( nId, sal_False );
}
else if(nId == TBC_BT_CHANGESOURCE)
{
@@ -387,7 +387,7 @@ void BibToolBar::Click()
if(sNew.getLength())
pDatMan->setActiveDataSource(sNew);
}
- CheckItem( nId, FALSE );
+ CheckItem( nId, sal_False );
}
}
diff --git a/extensions/source/bibliography/toolbar.src b/extensions/source/bibliography/toolbar.src
index e968a78151a7..a20075c8d36e 100644
--- a/extensions/source/bibliography/toolbar.src
+++ b/extensions/source/bibliography/toolbar.src
@@ -27,6 +27,7 @@
#include <svx/svxids.hrc>
#include "bibliography.hrc"
#include "toolbar.hrc"
+#include "svx/svxcommands.h"
#define MASKCOLOR MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; };
@@ -46,7 +47,6 @@ ToolBox RID_BIB_TOOLBAR
ToolBoxItem
{
Identifier = TBC_FT_SOURCE;
- //HelpID = SID_SBA_BRW_INSERT ;
Text [ en-US ] = "Table";
};
ToolBoxItem
@@ -63,7 +63,6 @@ ToolBox RID_BIB_TOOLBAR
ToolBoxItem
{
Identifier = TBC_FT_QUERY;
- //HelpID = SID_SBA_BRW_INSERT ;
Text [ en-US ] = "Search Key";
};
ToolBoxItem
@@ -90,7 +89,6 @@ ToolBox RID_BIB_TOOLBAR
ToolBoxItem
{
Identifier = TBC_BT_FILTERCRIT ;
- HelpID = SID_FM_FILTERCRIT ;
// ItemBitmap = Bitmap { File = "sc10715.bmp" ; };
// Text [ de ] = "Standard Filter" ;
Command = ".uno:Bib/standardFilter" ;
@@ -100,7 +98,6 @@ ToolBox RID_BIB_TOOLBAR
ToolBoxItem
{
Identifier = TBC_BT_REMOVEFILTER ;
- HelpID = SID_FM_REMOVE_FILTER_SORT ;
// ItemBitmap = Bitmap { File = "sc10711.bmp" ; };
Command = ".uno:Bib/removeFilter" ;
Text [ en-US ] = "Remove Filter";
@@ -122,78 +119,6 @@ ToolBox RID_BIB_TOOLBAR
Checkable=TRUE;
Text [ en-US ] = "Data Source";
};
-/*
- ToolBoxItem
- {
- Type = TOOLBOXITEM_SEPARATOR ;
- };
-
- ToolBoxItem
- {
- Identifier = TBC_BT_NEWCARD ;
- //HelpID = SID_FM_REMOVE_FILTER_SORT ;
- Command = ".uno:Bib/newEntry" ;
- ItemBitmap = Bitmap { File = "newcard.bmp" ; };
- Text [ en-US ] = "New Address";
- };
-
- ToolBoxItem
- {
- Identifier = TBC_BT_EDITCARD ;
- //HelpID = SID_FM_REMOVE_FILTER_SORT ;
- Command = ".uno:Bib/changeEntry" ;
- ItemBitmap = Bitmap { File = "modcard.bmp" ; };
- Text [ en-US ] = "Edit Address";
- };
-
- ToolBoxItem
- {
- Identifier = TBC_BT_REMOVECARD ;
- //HelpID = SID_FM_REMOVE_FILTER_SORT ;
- Command = ".uno:Bib/removeEntry" ;
- ItemBitmap = Bitmap { File = "remcard.bmp" ; };
- Text [ en-US ] = "Remove Address";
- };
-
- ToolBoxItem
- {
- Type = TOOLBOXITEM_SEPARATOR ;
- };
-
- ToolBoxItem
- {
- Identifier = TBC_BT_INSERT ;
- HelpID = SID_SBA_BRW_INSERT ;
- ItemBitmap = Bitmap { File = "sc12202.bmp" ; };
- Text [ en-US ] = "Data into Text";
- };
- ToolBoxItem
- {
- Identifier = TBC_BT_UPDATE ;
- HelpID = SID_SBA_BRW_UPDATE ;
- ItemBitmap = Bitmap { File = "sc12201.bmp" ; };
- Text = "Daten in Felder" ;
- };
-
- ToolBoxItem
- {
- Type = TOOLBOXITEM_SEPARATOR ;
- };
-
- ToolBoxItem
- {
- Identifier = TBC_BT_MAIL ;
- //HelpID = HID_ADDRPI_AUTOMAIL ;
- ItemBitmap = Bitmap { File = "sc06305.bmp" ; };
- Text [ en-US ] = "AutoMail";
- };
- ToolBoxItem
- {
- Identifier = TBC_BT_URL ;
- //HelpID = HID_ADDRPI_AUTOBROWSE ;
- ItemBitmap = Bitmap { File = "sc06304.bmp" ; };
- Text [ en-US ] = "AutoBrowse";
- };*/
};
Scroll = TRUE ;
};
diff --git a/extensions/source/config/ldap/componentdef.cxx b/extensions/source/config/ldap/componentdef.cxx
index 0943f6e0cb84..5feeda7bec1f 100644
--- a/extensions/source/config/ldap/componentdef.cxx
+++ b/extensions/source/config/ldap/componentdef.cxx
@@ -63,13 +63,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment(
}
//------------------------------------------------------------------------------
-extern "C" sal_Bool SAL_CALL component_writeInfo(void *aServiceManager,
- void *aRegistryKey) {
- return cppu::component_writeInfoHelper(
- aServiceManager, aRegistryKey, kImplementations_entries);
-}
-//------------------------------------------------------------------------------
-
extern "C" void *component_getFactory(const sal_Char *aImplementationName,
void *aServiceManager,
void *aRegistryKey) {
diff --git a/extensions/source/config/ldap/exports.dxp b/extensions/source/config/ldap/exports.dxp
index 9630d7e06768..f0e1c69934bc 100644
--- a/extensions/source/config/ldap/exports.dxp
+++ b/extensions/source/config/ldap/exports.dxp
@@ -1,3 +1,2 @@
component_getImplementationEnvironment
-component_writeInfo
component_getFactory
diff --git a/extensions/source/config/ldap/ldapaccess.cxx b/extensions/source/config/ldap/ldapaccess.cxx
index a99ac7e18f6c..976b4a4bbbe6 100644
--- a/extensions/source/config/ldap/ldapaccess.cxx
+++ b/extensions/source/config/ldap/ldapaccess.cxx
@@ -280,7 +280,7 @@ void LdapConnection::loadModule()
{
if ( !s_Ldap_Module )
{
-#if defined(WIN) || defined(WNT)
+#if defined(WNT)
# define LIBLDAP "nsldap32v50.dll"
#else
# ifdef WITH_OPENLDAP
diff --git a/extensions/source/config/ldap/ldapbe2.component b/extensions/source/config/ldap/ldapbe2.component
new file mode 100644
index 000000000000..071064d1c823
--- /dev/null
+++ b/extensions/source/config/ldap/ldapbe2.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+ xmlns="http://openoffice.org/2010/uno-components">
+ <implementation name="com.sun.star.comp.configuration.backend.LdapUserProfileBe">
+ <service name="com.sun.star.configuration.backend.LdapUserProfileBe"/>
+ </implementation>
+</component>
diff --git a/extensions/source/config/ldap/makefile.mk b/extensions/source/config/ldap/makefile.mk
index a27cb39b6225..d35e2428ca31 100644
--- a/extensions/source/config/ldap/makefile.mk
+++ b/extensions/source/config/ldap/makefile.mk
@@ -95,3 +95,11 @@ DEF1DES=Configuration: LDAP User Profile Backend
.INCLUDE : target.mk
.INCLUDE : $(PRJ)$/util$/target.pmk
+
+ALLTAR : $(MISC)/ldapbe2.component
+
+$(MISC)/ldapbe2.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+ ldapbe2.component
+ $(XSLTPROC) --nonet --stringparam uri \
+ '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+ $(SOLARENV)/bin/createcomponent.xslt ldapbe2.component
diff --git a/extensions/source/dbpilots/commonpagesdbp.cxx b/extensions/source/dbpilots/commonpagesdbp.cxx
index c8b175839435..692f5e96cc09 100644
--- a/extensions/source/dbpilots/commonpagesdbp.cxx
+++ b/extensions/source/dbpilots/commonpagesdbp.cxx
@@ -144,7 +144,7 @@ namespace dbp
// search the entry of the given type with the given name
XubString sLookup( sCommand );
- for ( USHORT nLookup = 0; nLookup < m_aTable.GetEntryCount(); ++nLookup )
+ for ( sal_uInt16 nLookup = 0; nLookup < m_aTable.GetEntryCount(); ++nLookup )
{
if ( m_aTable.GetEntry( nLookup ) == sLookup )
if ( reinterpret_cast< sal_IntPtr >( m_aTable.GetEntryData( nLookup ) ) == nCommandType )
diff --git a/extensions/source/dbpilots/commonpagesdbp.src b/extensions/source/dbpilots/commonpagesdbp.src
index 4e6969b57619..f900325ec0f1 100644
--- a/extensions/source/dbpilots/commonpagesdbp.src
+++ b/extensions/source/dbpilots/commonpagesdbp.src
@@ -31,6 +31,7 @@
TabPage RID_PAGE_TABLESELECTION
{
+ HelpID = "extensions:TabPage:RID_PAGE_TABLESELECTION";
SVLook = TRUE ;
Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ;
Text [ en-US ] = "Data";
@@ -58,6 +59,7 @@ TabPage RID_PAGE_TABLESELECTION
};
ListBox LB_DATASOURCE
{
+ HelpID = "extensions:ListBox:RID_PAGE_TABLESELECTION:LB_DATASOURCE";
Pos = MAP_APPFONT ( WINDOW_HALF_SIZE_X + 3 , 26 ) ;
Size = MAP_APPFONT ( WINDOW_HALF_SIZE_X - 27 , 14 ) ;
SVLook = TRUE ;
@@ -68,6 +70,7 @@ TabPage RID_PAGE_TABLESELECTION
PushButton PB_FORMDATASOURCE
{
+ HelpID = "extensions:PushButton:RID_PAGE_TABLESELECTION:PB_FORMDATASOURCE";
Pos = MAP_APPFONT ( WINDOW_HALF_SIZE_X + 3 + WINDOW_HALF_SIZE_X - 24 , 25 ) ;
Size = MAP_APPFONT ( 14 , 14 ) ;
Text [ en-US ] = "~...";
@@ -82,6 +85,7 @@ TabPage RID_PAGE_TABLESELECTION
};
ListBox LB_TABLE
{
+ HelpID = "extensions:ListBox:RID_PAGE_TABLESELECTION:LB_TABLE";
Pos = MAP_APPFONT ( WINDOW_HALF_SIZE_X + 3, 57 ) ;
Size = MAP_APPFONT ( WINDOW_HALF_SIZE_X - 10 , WINDOW_SIZE_Y - 6 - 57 ) ;
SVLook = TRUE ;
@@ -105,6 +109,7 @@ TabPage RID_PAGE_TABLESELECTION
TabPage RID_PAGE_OPTION_DBFIELD
{
+ HelpID = "extensions:TabPage:RID_PAGE_OPTION_DBFIELD";
SVLook = TRUE ;
Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ;
Text [ en-US ] = "Database Field";
@@ -129,6 +134,7 @@ TabPage RID_PAGE_OPTION_DBFIELD
};
RadioButton RB_STOREINFIELD_YES
{
+ HelpID = "extensions:RadioButton:RID_PAGE_OPTION_DBFIELD:RB_STOREINFIELD_YES";
Pos = MAP_APPFONT ( 7 , 53 ) ;
Size = MAP_APPFONT ( WINDOW_HALF_SIZE_X + 20, 10 ) ;
Group = TRUE;
@@ -137,6 +143,7 @@ TabPage RID_PAGE_OPTION_DBFIELD
};
ListBox LB_STOREINFIELD
{
+ HelpID = "extensions:ListBox:RID_PAGE_OPTION_DBFIELD:LB_STOREINFIELD";
Pos = MAP_APPFONT ( WINDOW_HALF_SIZE_X + 23, 51 ) ;
Size = MAP_APPFONT ( WINDOW_HALF_SIZE_X - 30, 14 ) ;
TabStop = TRUE;
@@ -147,6 +154,7 @@ TabPage RID_PAGE_OPTION_DBFIELD
};
RadioButton RB_STOREINFIELD_NO
{
+ HelpID = "extensions:RadioButton:RID_PAGE_OPTION_DBFIELD:RB_STOREINFIELD_NO";
Pos = MAP_APPFONT ( 7 , 68 ) ;
Size = MAP_APPFONT ( WINDOW_SIZE_X - 14, 10 ) ;
TabStop = FALSE;
@@ -156,6 +164,7 @@ TabPage RID_PAGE_OPTION_DBFIELD
TabPage RID_PAGE_FORM_DATASOURCE_STATUS
{
+ HelpID = "extensions:TabPage:RID_PAGE_FORM_DATASOURCE_STATUS";
FixedLine FL_FORMSETINGS
{
Pos = MAP_APPFONT ( 4 , 3 ) ;
diff --git a/extensions/source/dbpilots/dbp.component b/extensions/source/dbpilots/dbp.component
new file mode 100644
index 000000000000..84ec98713b2a
--- /dev/null
+++ b/extensions/source/dbpilots/dbp.component
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+ xmlns="http://openoffice.org/2010/uno-components">
+ <implementation name="org.openoffice.comp.dbp.OGridWizard">
+ <service name="com.sun.star.sdb.GridControlAutoPilot"/>
+ </implementation>
+ <implementation name="org.openoffice.comp.dbp.OGroupBoxWizard">
+ <service name="com.sun.star.sdb.GroupBoxAutoPilot"/>
+ </implementation>
+ <implementation name="org.openoffice.comp.dbp.OListComboWizard">
+ <service name="com.sun.star.sdb.ListComboBoxAutoPilot"/>
+ </implementation>
+</component>
diff --git a/extensions/source/dbpilots/dbpilots.src b/extensions/source/dbpilots/dbpilots.src
index fa96cbead1eb..1cf4bc72d427 100644
--- a/extensions/source/dbpilots/dbpilots.src
+++ b/extensions/source/dbpilots/dbpilots.src
@@ -31,6 +31,7 @@
ModalDialog RID_DLG_GROUPBOXWIZARD
{
+ HelpID = "extensions:ModalDialog:RID_DLG_GROUPBOXWIZARD";
Text [ en-US ] = "Group Element Wizard";
OutputSize = TRUE ;
@@ -42,6 +43,7 @@ ModalDialog RID_DLG_GROUPBOXWIZARD
ModalDialog RID_DLG_LISTCOMBOWIZARD
{
+ HelpID = "extensions:ModalDialog:RID_DLG_LISTCOMBOWIZARD";
OutputSize = TRUE ;
SVLook = TRUE ;
Moveable = TRUE ;
@@ -51,6 +53,7 @@ ModalDialog RID_DLG_LISTCOMBOWIZARD
ModalDialog RID_DLG_GRIDWIZARD
{
+ HelpID = "extensions:ModalDialog:RID_DLG_GRIDWIZARD";
OutputSize = TRUE ;
SVLook = TRUE ;
Moveable = TRUE ;
diff --git a/extensions/source/dbpilots/dbpresid.hrc b/extensions/source/dbpilots/dbpresid.hrc
index 4b5c1ec92d6d..b285a6c92a93 100644
--- a/extensions/source/dbpilots/dbpresid.hrc
+++ b/extensions/source/dbpilots/dbpresid.hrc
@@ -29,6 +29,7 @@
#define _EXTENSIONS_DBP_DBPRESID_HRC_
#include "dbpilots.hrc"
+#include "extensio.hrc"
//========================================================================
// basics
diff --git a/extensions/source/dbpilots/dbpservices.cxx b/extensions/source/dbpilots/dbpservices.cxx
index 78bc4a45eb79..0321df3984eb 100644
--- a/extensions/source/dbpilots/dbpservices.cxx
+++ b/extensions/source/dbpilots/dbpservices.cxx
@@ -71,27 +71,6 @@ component_getImplementationEnvironment(
}
//---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
- void* pServiceManager,
- void* pRegistryKey
- )
-{
- if (pRegistryKey)
- try
- {
- return ::dbp::OModule::writeComponentInfos(
- static_cast<XMultiServiceFactory*>(pServiceManager),
- static_cast<XRegistryKey*>(pRegistryKey));
- }
- catch (InvalidRegistryException& )
- {
- OSL_FAIL("dbp::component_writeInfo: could not create a registry key (InvalidRegistryException) !");
- }
-
- return sal_False;
-}
-
-//---------------------------------------------------------------------------------------
extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
const sal_Char* pImplementationName,
void* pServiceManager,
diff --git a/extensions/source/dbpilots/gridpages.src b/extensions/source/dbpilots/gridpages.src
index 5aca75b77d55..fac3a00dda23 100644
--- a/extensions/source/dbpilots/gridpages.src
+++ b/extensions/source/dbpilots/gridpages.src
@@ -31,6 +31,7 @@
TabPage RID_PAGE_GW_FIELDSELECTION
{
+ HelpID = "extensions:TabPage:RID_PAGE_GW_FIELDSELECTION";
SVLook = TRUE ;
Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ;
@@ -51,6 +52,7 @@ TabPage RID_PAGE_GW_FIELDSELECTION
};
ListBox LB_EXISTING_FIELDS
{
+ HelpID = "extensions:ListBox:RID_PAGE_GW_FIELDSELECTION:LB_EXISTING_FIELDS";
Pos = MAP_APPFONT ( 7 , 63 ) ;
Size = MAP_APPFONT ( WINDOW_HALF_SIZE_X - ITEM_BUTTON_SIZE_X / 2 - 13, WINDOW_SIZE_Y - 63 - 6 ) ;
SVLook = TRUE ;
@@ -61,24 +63,28 @@ TabPage RID_PAGE_GW_FIELDSELECTION
};
PushButton PB_FIELDRIGHT
{
+ HelpID = "extensions:PushButton:RID_PAGE_GW_FIELDSELECTION:PB_FIELDRIGHT";
Pos = MAP_APPFONT ( WINDOW_HALF_SIZE_X - ITEM_BUTTON_SIZE_X / 2, 63 );
Size = MAP_APPFONT ( ITEM_BUTTON_SIZE_X, ITEM_BUTTON_SIZE_Y );
Text = "->";
};
PushButton PB_ALLFIELDSRIGHT
{
+ HelpID = "extensions:PushButton:RID_PAGE_GW_FIELDSELECTION:PB_ALLFIELDSRIGHT";
Pos = MAP_APPFONT ( WINDOW_HALF_SIZE_X - ITEM_BUTTON_SIZE_X / 2, 63 + ITEM_BUTTON_SIZE_Y + 3 );
Size = MAP_APPFONT ( ITEM_BUTTON_SIZE_X, ITEM_BUTTON_SIZE_Y );
Text = "=>>";
};
PushButton PB_FIELDLEFT
{
+ HelpID = "extensions:PushButton:RID_PAGE_GW_FIELDSELECTION:PB_FIELDLEFT";
Pos = MAP_APPFONT ( WINDOW_HALF_SIZE_X - ITEM_BUTTON_SIZE_X / 2, 63 + ITEM_BUTTON_SIZE_Y + 3 + ITEM_BUTTON_SIZE_Y + 12 );
Size = MAP_APPFONT ( ITEM_BUTTON_SIZE_X, ITEM_BUTTON_SIZE_Y );
Text = "<-";
};
PushButton PB_ALLFIELDSLEFT
{
+ HelpID = "extensions:PushButton:RID_PAGE_GW_FIELDSELECTION:PB_ALLFIELDSLEFT";
Pos = MAP_APPFONT ( WINDOW_HALF_SIZE_X - ITEM_BUTTON_SIZE_X / 2, 63 + ITEM_BUTTON_SIZE_Y + 3 + ITEM_BUTTON_SIZE_Y + 12 + ITEM_BUTTON_SIZE_Y + 3 );
Size = MAP_APPFONT ( ITEM_BUTTON_SIZE_X, ITEM_BUTTON_SIZE_Y );
Text = "<<=";
@@ -91,6 +97,7 @@ TabPage RID_PAGE_GW_FIELDSELECTION
};
ListBox LB_SELECTED_FIELDS
{
+ HelpID = "extensions:ListBox:RID_PAGE_GW_FIELDSELECTION:LB_SELECTED_FIELDS";
Pos = MAP_APPFONT ( WINDOW_HALF_SIZE_X + ITEM_BUTTON_SIZE_X / 2 + 6 , 63 ) ;
Size = MAP_APPFONT ( WINDOW_HALF_SIZE_X - ITEM_BUTTON_SIZE_X / 2 - 13, WINDOW_SIZE_Y - 63 - 6 ) ;
SVLook = TRUE ;
diff --git a/extensions/source/dbpilots/gridwizard.cxx b/extensions/source/dbpilots/gridwizard.cxx
index bd3efcdcbf45..9fddfd0635e0 100644
--- a/extensions/source/dbpilots/gridwizard.cxx
+++ b/extensions/source/dbpilots/gridwizard.cxx
@@ -373,12 +373,12 @@ namespace dbp
return sal_False;
OGridSettings& rSettings = getSettings();
- USHORT nSelected = m_aSelFields.GetEntryCount();
+ sal_uInt16 nSelected = m_aSelFields.GetEntryCount();
rSettings.aSelectedFields.realloc(nSelected);
::rtl::OUString* pSelected = rSettings.aSelectedFields.getArray();
- for (USHORT i=0; i<nSelected; ++i, ++pSelected)
+ for (sal_uInt16 i=0; i<nSelected; ++i, ++pSelected)
*pSelected = m_aSelFields.GetEntry(i);
return sal_True;
@@ -420,11 +420,11 @@ namespace dbp
ListBox& rMoveTo = bMoveRight ? m_aSelFields : m_aExistFields;
// the index of the selected entry
- USHORT nSelected = bMoveRight ? m_aExistFields.GetSelectEntryPos() : m_aSelFields.GetSelectEntryPos();
+ sal_uInt16 nSelected = bMoveRight ? m_aExistFields.GetSelectEntryPos() : m_aSelFields.GetSelectEntryPos();
// the (original) relative position of the entry
sal_IntPtr nRelativeIndex = reinterpret_cast<sal_IntPtr>(bMoveRight ? m_aExistFields.GetEntryData(nSelected) : m_aSelFields.GetEntryData(nSelected));
- USHORT nInsertPos = LISTBOX_APPEND;
+ sal_uInt16 nInsertPos = LISTBOX_APPEND;
if (!bMoveRight)
{ // need to determine an insert pos which reflects the original
nInsertPos = 0;
@@ -447,7 +447,7 @@ namespace dbp
// remove the entry from it's old list
if (bMoveRight)
{
- USHORT nSelectPos = m_aExistFields.GetSelectEntryPos();
+ sal_uInt16 nSelectPos = m_aExistFields.GetSelectEntryPos();
m_aExistFields.RemoveEntry(nSelected);
if ((LISTBOX_ENTRY_NOTFOUND != nSelectPos) && (nSelectPos < m_aExistFields.GetEntryCount()))
m_aExistFields.SelectEntryPos(nSelectPos);
@@ -456,7 +456,7 @@ namespace dbp
}
else
{
- USHORT nSelectPos = m_aSelFields.GetSelectEntryPos();
+ sal_uInt16 nSelectPos = m_aSelFields.GetSelectEntryPos();
m_aSelFields.RemoveEntry(nSelected);
if ((LISTBOX_ENTRY_NOTFOUND != nSelectPos) && (nSelectPos < m_aSelFields.GetEntryCount()))
m_aSelFields.SelectEntryPos(nSelectPos);
diff --git a/extensions/source/dbpilots/groupboxpages.src b/extensions/source/dbpilots/groupboxpages.src
index 6b651e848010..b98f6a70f843 100644
--- a/extensions/source/dbpilots/groupboxpages.src
+++ b/extensions/source/dbpilots/groupboxpages.src
@@ -31,6 +31,7 @@
TabPage RID_PAGE_GROUPRADIOSELECTION
{
+ HelpID = "extensions:TabPage:RID_PAGE_GROUPRADIOSELECTION";
SVLook = TRUE ;
Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ;
Text [ en-US ] = "Data";
@@ -50,6 +51,7 @@ TabPage RID_PAGE_GROUPRADIOSELECTION
};
Edit ET_RADIOLABELS
{
+ HelpID = "extensions:Edit:RID_PAGE_GROUPRADIOSELECTION:ET_RADIOLABELS";
Pos = MAP_APPFONT ( 7 , 79 ) ;
Size = MAP_APPFONT ( WINDOW_HALF_SIZE_X - ITEM_BUTTON_SIZE_X / 2 - 13, 12 ) ;
SVLook = TRUE ;
@@ -57,12 +59,14 @@ TabPage RID_PAGE_GROUPRADIOSELECTION
};
PushButton PB_MOVETORIGHT
{
+ HelpID = "extensions:PushButton:RID_PAGE_GROUPRADIOSELECTION:PB_MOVETORIGHT";
Pos = MAP_APPFONT ( WINDOW_HALF_SIZE_X - ITEM_BUTTON_SIZE_X / 2 , 79 ) ;
Size = MAP_APPFONT ( ITEM_BUTTON_SIZE_X , ITEM_BUTTON_SIZE_Y ) ;
Text = "~>>";
};
PushButton PB_MOVETOLEFT
{
+ HelpID = "extensions:PushButton:RID_PAGE_GROUPRADIOSELECTION:PB_MOVETOLEFT";
Pos = MAP_APPFONT ( WINDOW_HALF_SIZE_X - ITEM_BUTTON_SIZE_X / 2 , 79 + ITEM_BUTTON_SIZE_Y + 3 ) ;
Size = MAP_APPFONT ( ITEM_BUTTON_SIZE_X , ITEM_BUTTON_SIZE_Y ) ;
Text = "~<<";
@@ -76,6 +80,7 @@ TabPage RID_PAGE_GROUPRADIOSELECTION
};
ListBox LB_RADIOBUTTONS
{
+ HelpID = "extensions:ListBox:RID_PAGE_GROUPRADIOSELECTION:LB_RADIOBUTTONS";
Pos = MAP_APPFONT ( WINDOW_HALF_SIZE_X + ITEM_BUTTON_SIZE_X / 2 + 6 , 79 ) ;
Size = MAP_APPFONT ( WINDOW_SIZE_X - WINDOW_HALF_SIZE_X - ITEM_BUTTON_SIZE_X / 2 - 6 - 7, WINDOW_SIZE_Y - 79 - 6 ) ;
SVLook = TRUE ;
@@ -87,6 +92,7 @@ TabPage RID_PAGE_GROUPRADIOSELECTION
TabPage RID_PAGE_DEFAULTFIELDSELECTION
{
+ HelpID = "extensions:TabPage:RID_PAGE_DEFAULTFIELDSELECTION";
SVLook = TRUE ;
Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ;
Text [ en-US ] = "Default Field Selection";
@@ -106,6 +112,7 @@ TabPage RID_PAGE_DEFAULTFIELDSELECTION
};
RadioButton RB_DEFSELECTION_YES
{
+ HelpID = "extensions:RadioButton:RID_PAGE_DEFAULTFIELDSELECTION:RB_DEFSELECTION_YES";
Pos = MAP_APPFONT ( 7 , 44 ) ;
Size = MAP_APPFONT ( WINDOW_HALF_SIZE_X - 10, 10 ) ;
Group = TRUE;
@@ -114,6 +121,7 @@ TabPage RID_PAGE_DEFAULTFIELDSELECTION
};
ListBox LB_DEFSELECTIONFIELD
{
+ HelpID = "extensions:ListBox:RID_PAGE_DEFAULTFIELDSELECTION:LB_DEFSELECTIONFIELD";
Pos = MAP_APPFONT ( WINDOW_HALF_SIZE_X + 3 , 42 ) ;
Size = MAP_APPFONT ( WINDOW_HALF_SIZE_X - 10, 14 ) ;
TabStop = TRUE;
@@ -125,6 +133,7 @@ TabPage RID_PAGE_DEFAULTFIELDSELECTION
};
RadioButton RB_DEFSELECTION_NO
{
+ HelpID = "extensions:RadioButton:RID_PAGE_DEFAULTFIELDSELECTION:RB_DEFSELECTION_NO";
Pos = MAP_APPFONT ( 7 , 59 ) ;
Size = MAP_APPFONT ( WINDOW_SIZE_X - 14, 10 ) ;
TabStop = FALSE;
@@ -134,6 +143,7 @@ TabPage RID_PAGE_DEFAULTFIELDSELECTION
TabPage RID_PAGE_OPTIONVALUES
{
+ HelpID = "extensions:TabPage:RID_PAGE_OPTIONVALUES";
SVLook = TRUE ;
Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ;
Text [ en-US ] = "Field Values";
@@ -160,6 +170,7 @@ TabPage RID_PAGE_OPTIONVALUES
};
Edit ET_OPTIONVALUE
{
+ HelpID = "extensions:Edit:RID_PAGE_OPTIONVALUES:ET_OPTIONVALUE";
Pos = MAP_APPFONT ( 7 , 61 ) ;
Size = MAP_APPFONT ( WINDOW_HALF_SIZE_X - 10, 12 ) ;
SVLook = TRUE ;
@@ -174,6 +185,7 @@ TabPage RID_PAGE_OPTIONVALUES
};
ListBox LB_RADIOBUTTONS
{
+ HelpID = "extensions:ListBox:RID_PAGE_OPTIONVALUES:LB_RADIOBUTTONS";
Pos = MAP_APPFONT ( WINDOW_HALF_SIZE_X + 3 , 26 ) ;
Size = MAP_APPFONT ( WINDOW_HALF_SIZE_X - 10 , WINDOW_SIZE_Y - 32 ) ;
SVLook = TRUE ;
@@ -185,6 +197,7 @@ TabPage RID_PAGE_OPTIONVALUES
TabPage RID_PAGE_OPTIONS_FINAL
{
+ HelpID = "extensions:TabPage:RID_PAGE_OPTIONS_FINAL";
SVLook = TRUE ;
Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ;
Text [ en-US ] = "Create Option Group";
@@ -203,6 +216,7 @@ TabPage RID_PAGE_OPTIONS_FINAL
};
Edit ET_NAMEIT
{
+ HelpID = "extensions:Edit:RID_PAGE_OPTIONS_FINAL:ET_NAMEIT";
Pos = MAP_APPFONT ( 7 , 34 ) ;
Size = MAP_APPFONT ( WINDOW_SIZE_X - 14, 12 ) ;
SVLook = TRUE ;
diff --git a/extensions/source/dbpilots/groupboxwiz.cxx b/extensions/source/dbpilots/groupboxwiz.cxx
index acda08475eed..c171ed581ef3 100644
--- a/extensions/source/dbpilots/groupboxwiz.cxx
+++ b/extensions/source/dbpilots/groupboxwiz.cxx
@@ -233,6 +233,9 @@ namespace dbp
m_aExistingRadios.EnableMultiSelection(sal_True);
getDialog()->defaultButton(&m_aMoveRight);
+
+ m_aExistingRadios.SetAccessibleRelationMemberOf(&m_aExistingRadios);
+ m_aExistingRadios.SetAccessibleRelationLabeledBy(&m_aExistingRadiosLabel);
}
//---------------------------------------------------------------------
@@ -363,6 +366,8 @@ namespace dbp
announceControls(m_aDefSelYes, m_aDefSelNo, m_aDefSelection);
m_aDefSelection.SetDropDownLineCount(10);
+ m_aDefSelection.SetAccessibleRelationLabeledBy( &m_aDefSelYes );
+ m_aDefSelection.SetAccessibleRelationMemberOf(&m_aDefaultSelectionLabel);
}
//---------------------------------------------------------------------
@@ -413,6 +418,9 @@ namespace dbp
FreeResource();
m_aOptions.SetSelectHdl(LINK(this, OOptionValuesPage, OnOptionSelected));
+
+ m_aOptions.SetAccessibleRelationMemberOf(&m_aOptions);
+ m_aOptions.SetAccessibleRelationLabeledBy(&m_aOptionsLabel);
}
//---------------------------------------------------------------------
diff --git a/extensions/source/dbpilots/listcombopages.src b/extensions/source/dbpilots/listcombopages.src
index eb83140de316..7a24abaef60c 100644
--- a/extensions/source/dbpilots/listcombopages.src
+++ b/extensions/source/dbpilots/listcombopages.src
@@ -31,6 +31,7 @@
TabPage RID_PAGE_LCW_CONTENTSELECTION_TABLE
{
+ HelpID = "extensions:TabPage:RID_PAGE_LCW_CONTENTSELECTION_TABLE";
SVLook = TRUE ;
Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ;
@@ -53,6 +54,7 @@ TabPage RID_PAGE_LCW_CONTENTSELECTION_TABLE
};
ListBox LB_SELECTTABLE
{
+ HelpID = "extensions:ListBox:RID_PAGE_LCW_CONTENTSELECTION_TABLE:LB_SELECTTABLE";
Pos = MAP_APPFONT ( 130 , 52 ) ;
Size = MAP_APPFONT ( WINDOW_SIZE_X - 130 - 7, WINDOW_SIZE_Y - 52 - 6 ) ;
SVLook = TRUE ;
@@ -65,6 +67,7 @@ TabPage RID_PAGE_LCW_CONTENTSELECTION_TABLE
TabPage RID_PAGE_LCW_CONTENTSELECTION_FIELD
{
+ HelpID = "extensions:TabPage:RID_PAGE_LCW_CONTENTSELECTION_FIELD";
SVLook = TRUE ;
Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ;
@@ -86,6 +89,7 @@ TabPage RID_PAGE_LCW_CONTENTSELECTION_FIELD
};
ListBox LB_SELECTFIELD
{
+ HelpID = "extensions:ListBox:RID_PAGE_LCW_CONTENTSELECTION_FIELD:LB_SELECTFIELD";
Pos = MAP_APPFONT ( 7 , 26 ) ;
Size = MAP_APPFONT ( WINDOW_HALF_SIZE_X - 10, WINDOW_SIZE_Y - 32 ) ;
SVLook = TRUE ;
@@ -102,6 +106,7 @@ TabPage RID_PAGE_LCW_CONTENTSELECTION_FIELD
};
Edit ET_DISPLAYEDFIELD
{
+ HelpID = "extensions:Edit:RID_PAGE_LCW_CONTENTSELECTION_FIELD:ET_DISPLAYEDFIELD";
Pos = MAP_APPFONT ( WINDOW_HALF_SIZE_X + 3 , 26 ) ;
Size = MAP_APPFONT ( WINDOW_HALF_SIZE_X - 10, 12 ) ;
SVLook = TRUE ;
@@ -127,6 +132,7 @@ TabPage RID_PAGE_LCW_CONTENTSELECTION_FIELD
TabPage RID_PAGE_LCW_FIELDLINK
{
+ HelpID = "extensions:TabPage:RID_PAGE_LCW_FIELDLINK";
SVLook = TRUE ;
Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ;
@@ -153,6 +159,7 @@ TabPage RID_PAGE_LCW_FIELDLINK
};
ComboBox CMB_VALUELISTFIELD
{
+ HelpID = "extensions:ComboBox:RID_PAGE_LCW_FIELDLINK:CMB_VALUELISTFIELD";
Pos = MAP_APPFONT ( 7 , 48 ) ;
Size = MAP_APPFONT ( WINDOW_HALF_SIZE_X - 10, WINDOW_SIZE_Y - 54 ) ;
SVLook = TRUE ;
@@ -170,6 +177,7 @@ TabPage RID_PAGE_LCW_FIELDLINK
};
ComboBox CMB_TABLEFIELD
{
+ HelpID = "extensions:ComboBox:RID_PAGE_LCW_FIELDLINK:CMB_TABLEFIELD";
Pos = MAP_APPFONT ( WINDOW_HALF_SIZE_X + 3 , 48 ) ;
Size = MAP_APPFONT ( WINDOW_HALF_SIZE_X - 10, WINDOW_SIZE_Y - 54 ) ;
SVLook = TRUE ;
diff --git a/extensions/source/dbpilots/makefile.mk b/extensions/source/dbpilots/makefile.mk
index b5831e5fda0f..e37ab0a546ac 100644
--- a/extensions/source/dbpilots/makefile.mk
+++ b/extensions/source/dbpilots/makefile.mk
@@ -101,3 +101,11 @@ DEF1NAME= $(SHL1TARGET)
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
+
+ALLTAR : $(MISC)/dbp.component
+
+$(MISC)/dbp.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+ dbp.component
+ $(XSLTPROC) --nonet --stringparam uri \
+ '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+ $(SOLARENV)/bin/createcomponent.xslt dbp.component
diff --git a/extensions/source/inc/componentmodule.cxx b/extensions/source/inc/componentmodule.cxx
index 46580ce3e96b..407d2a257966 100644
--- a/extensions/source/inc/componentmodule.cxx
+++ b/extensions/source/inc/componentmodule.cxx
@@ -237,54 +237,6 @@ namespace COMPMOD_NAMESPACE
}
//--------------------------------------------------------------------------
- sal_Bool OModule::writeComponentInfos(
- const Reference< XMultiServiceFactory >& /*_rxServiceManager*/,
- const Reference< XRegistryKey >& _rxRootKey)
- {
- OSL_ENSURE(_rxRootKey.is(), "OModule::writeComponentInfos : invalid argument !");
-
- if (!s_pImplementationNames)
- {
- OSL_FAIL("OModule::writeComponentInfos : have no class infos ! Are you sure called this method at the right time ?");
- return sal_True;
- }
- OSL_ENSURE(s_pImplementationNames && s_pSupportedServices && s_pCreationFunctionPointers && s_pFactoryFunctionPointers,
- "OModule::writeComponentInfos : inconsistent state (the pointers) !");
- OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength())
- && (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength())
- && (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()),
- "OModule::writeComponentInfos : inconsistent state !");
-
- sal_Int32 nLen = s_pImplementationNames->getLength();
- const ::rtl::OUString* pImplName = s_pImplementationNames->getConstArray();
- const Sequence< ::rtl::OUString >* pServices = s_pSupportedServices->getConstArray();
-
- ::rtl::OUString sRootKey("/", 1, RTL_TEXTENCODING_ASCII_US);
- for (sal_Int32 i=0; i<nLen; ++i, ++pImplName, ++pServices)
- {
- ::rtl::OUString aMainKeyName(sRootKey);
- aMainKeyName += *pImplName;
- aMainKeyName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-
- try
- {
- Reference< XRegistryKey > xNewKey( _rxRootKey->createKey(aMainKeyName) );
-
- const ::rtl::OUString* pService = pServices->getConstArray();
- for (sal_Int32 j=0; j<pServices->getLength(); ++j, ++pService)
- xNewKey->createKey(*pService);
- }
- catch(Exception&)
- {
- OSL_FAIL("OModule::writeComponentInfos : something went wrong while creating the keys !");
- return sal_False;
- }
- }
-
- return sal_True;
- }
-
- //--------------------------------------------------------------------------
Reference< XInterface > OModule::getComponentFactory(
const ::rtl::OUString& _rImplementationName,
const Reference< XMultiServiceFactory >& _rxServiceManager)
diff --git a/extensions/source/inc/componentmodule.hxx b/extensions/source/inc/componentmodule.hxx
index 8ac75326a56e..7625ca26e810 100644
--- a/extensions/source/inc/componentmodule.hxx
+++ b/extensions/source/inc/componentmodule.hxx
@@ -122,21 +122,6 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService
static void revokeComponent(
const ::rtl::OUString& _rImplementationName);
- /** write the registration information of all known components
- <p>writes the registration information of all components which are currently registered into the
- specified registry.<p/>
- <p>Usually used from within component_writeInfo.<p/>
- @param _rxServiceManager
- the service manager
- @param _rRootKey
- the registry key under which the information will be stored
- @return
- sal_True if the registration of all implementations was successfull, sal_False otherwise
- */
- static sal_Bool writeComponentInfos(
- const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxServiceManager,
- const ::com::sun::star::uno::Reference< ::com::sun::star::registry::XRegistryKey >& _rRootKey);
-
/** creates a Factory for the component with the given implementation name.
<p>Usually used from within component_getFactory.<p/>
@param _rxServiceManager
@@ -184,7 +169,7 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService
class ModuleRes : public ::ResId
{
public:
- ModuleRes(USHORT _nId) : ResId(_nId, *OModule::getResManager()) { }
+ ModuleRes(sal_uInt16 _nId) : ResId(_nId, *OModule::getResManager()) { }
};
//==========================================================================
diff --git a/extensions/source/logging/log.component b/extensions/source/logging/log.component
new file mode 100644
index 000000000000..4dd2db56c3cc
--- /dev/null
+++ b/extensions/source/logging/log.component
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+ xmlns="http://openoffice.org/2010/uno-components">
+ <implementation name="com.sun.star.comp.extensions.ConsoleHandler">
+ <service name="com.sun.star.logging.ConsoleHandler"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.extensions.CsvFormatter">
+ <service name="com.sun.star.logging.CsvFormatter"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.extensions.FileHandler">
+ <service name="com.sun.star.logging.FileHandler"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.extensions.LoggerPool">
+ <service name="com.sun.star.logging.LoggerPool"/>
+ <singleton name="com.sun.star.logging.LoggerPool"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.extensions.PlainTextFormatter">
+ <service name="com.sun.star.logging.PlainTextFormatter"/>
+ </implementation>
+</component>
diff --git a/extensions/source/logging/makefile.mk b/extensions/source/logging/makefile.mk
index 4a1fa9813cb0..1436576e89ba 100644
--- a/extensions/source/logging/makefile.mk
+++ b/extensions/source/logging/makefile.mk
@@ -74,3 +74,11 @@ SHL1VERSIONMAP=$(SOLARENV)/src/component.map
.INCLUDE : target.mk
+
+ALLTAR : $(MISC)/log.component
+
+$(MISC)/log.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+ log.component
+ $(XSLTPROC) --nonet --stringparam uri \
+ '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+ $(SOLARENV)/bin/createcomponent.xslt log.component
diff --git a/extensions/source/macosx/spotlight/makefile.mk b/extensions/source/macosx/spotlight/makefile.mk
index 3d1cb12d1dab..e7b15150bd03 100644
--- a/extensions/source/macosx/spotlight/makefile.mk
+++ b/extensions/source/macosx/spotlight/makefile.mk
@@ -74,8 +74,11 @@ ZIP1LIST = *
.INCLUDE : target.mk
+.IF "$(ZIP1TARGETN)"!=""
$(ZIP1TARGETN) : $(plistfiles) $(binaries) $(resources)
+.ENDIF # "$(ZIP1TARGETN)"!=""
+
# Info.plist is just versioned and copied into the bundle
$(CONTENTS)$/%.plist : mdimporter/%.plist
$(MKDIRHIER) $(@:d)
diff --git a/extensions/source/nsplugin/source/makefile.mk b/extensions/source/nsplugin/source/makefile.mk
index 793e4bd67d95..aac2a4838e5f 100644
--- a/extensions/source/nsplugin/source/makefile.mk
+++ b/extensions/source/nsplugin/source/makefile.mk
@@ -75,7 +75,7 @@ STDLIBS+=$(SOLARLIBDIR)$/npunix.o
SHL1STDLIBS+=$(SOLARLIBDIR)$/npunix.o
.ENDIF #UNX
.IF "$(GUI)"=="WNT"
-SHL1OBJS+=$(SOLARLIBDIR)$/pathutils-slo.obj
+SHL1OBJS+=$(SOLARLIBDIR)$/pathutils-obj.obj
STDLIBS+=$(SOLARLIBDIR)$/npwin.obj
SHL1STDLIBS+= $(SHELL32LIB) $(SOLARLIBDIR)$/npwin.obj
diff --git a/extensions/source/ole/makefile.mk b/extensions/source/ole/makefile.mk
index 783614590838..58a2cc7f0453 100644
--- a/extensions/source/ole/makefile.mk
+++ b/extensions/source/ole/makefile.mk
@@ -127,3 +127,10 @@ DEF2EXPORTFILE=$(TARGET).dxp
.INCLUDE : target.mk
+ALLTAR : $(MISC)/oleautobridge.component
+
+$(MISC)/oleautobridge.component .ERRREMOVE : \
+ $(SOLARENV)/bin/createcomponent.xslt oleautobridge.component
+ $(XSLTPROC) --nonet --stringparam uri \
+ '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+ $(SOLARENV)/bin/createcomponent.xslt oleautobridge.component
diff --git a/extensions/source/ole/oleautobridge.component b/extensions/source/ole/oleautobridge.component
new file mode 100644
index 000000000000..6f5309e42ad9
--- /dev/null
+++ b/extensions/source/ole/oleautobridge.component
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+ xmlns="http://openoffice.org/2010/uno-components">
+ <implementation name="com.sun.star.comp.ole.OleClient">
+ <service name="com.sun.star.bridge.OleObjectFactory"/>
+ <service name="com.sun.star.bridge.oleautomation.Factory"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.ole.OleConverter2">
+ <service name="com.sun.star.bridge.OleBridgeSupplier2"/>
+ <service name="com.sun.star.bridge.oleautomation.BridgeSupplier"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.ole.OleConverterVar1">
+ <service name="com.sun.star.bridge.OleBridgeSupplierVar1"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.ole.OleServer">
+ <service name="com.sun.star.bridge.OleApplicationRegistration"/>
+ <service name="com.sun.star.bridge.oleautomation.ApplicationRegistration"/>
+ </implementation>
+</component>
diff --git a/extensions/source/ole/oleautobridge.uno.dxp b/extensions/source/ole/oleautobridge.uno.dxp
index e7947188aa92..1f26fd019c1c 100644
--- a/extensions/source/ole/oleautobridge.uno.dxp
+++ b/extensions/source/ole/oleautobridge.uno.dxp
@@ -1,4 +1,3 @@
-component_writeInfo @100
component_getFactory @101
component_getImplementationEnvironment @102
component_canUnload @103
diff --git a/extensions/source/ole/oleobjw.cxx b/extensions/source/ole/oleobjw.cxx
index a8f0f5b45092..6648d1773560 100644
--- a/extensions/source/ole/oleobjw.cxx
+++ b/extensions/source/ole/oleobjw.cxx
@@ -75,6 +75,7 @@ using namespace com::sun::star::lang;
using namespace com::sun::star::bridge;
using namespace com::sun::star::bridge::oleautomation;
using namespace com::sun::star::bridge::ModelDependent;
+using namespace ::com::sun::star;
using ::rtl::OUString;
using ::rtl::OString;
@@ -160,8 +161,8 @@ Any IUnknownWrapper_Impl::queryInterface(const Type& t)
if ( ( t == getCppuType(static_cast<Reference<XInvocation>*>( 0)) || t == getCppuType(static_cast<Reference<XAutomationInvocation>*>( 0)) ) && !m_spDispatch)
return Any();
- return WeakImplHelper6<XAutomationInvocation, XBridgeSupplier2,
- XInitialization, XAutomationObject, XDefaultProperty, XDefaultMethod>::queryInterface(t);
+ return WeakImplHelper7<XInvocation, XBridgeSupplier2,
+ XInitialization, XAutomationObject, XDefaultProperty, XDefaultMethod, XDirectInvocation>::queryInterface(t);
}
Reference<XIntrospectionAccess> SAL_CALL IUnknownWrapper_Impl::getIntrospection(void)
@@ -1242,7 +1243,7 @@ Any IUnknownWrapper_Impl::invokeWithDispIdUnoTlb(const OUString& sFunctionName,
- // --------------------------
+// --------------------------
// XInitialization
void SAL_CALL IUnknownWrapper_Impl::initialize( const Sequence< Any >& aArguments ) throw(Exception, RuntimeException)
{
@@ -1325,6 +1326,274 @@ void SAL_CALL IUnknownWrapper_Impl::initialize( const Sequence< Any >& aArgument
}
}
+// --------------------------
+// XDirectInvocation
+uno::Any SAL_CALL IUnknownWrapper_Impl::directInvoke( const ::rtl::OUString& aName, const uno::Sequence< uno::Any >& aParams )
+ throw (lang::IllegalArgumentException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException)
+{
+ Any aResult;
+
+ if ( !m_spDispatch )
+ {
+ throw RuntimeException(
+ OUSTR("[automation bridge] The object does not have an IDispatch interface"),
+ Reference<XInterface>());
+ }
+
+ o2u_attachCurrentThread();
+ DISPID dispid;
+ if ( !getDispid( aName, &dispid ) )
+ throw IllegalArgumentException(
+ OUSTR( "[automation bridge] The object does not have a function or property " )
+ + aName, Reference<XInterface>(), 0);
+
+ CComVariant varResult;
+ ExcepInfo excepinfo;
+ unsigned int uArgErr = 0;
+ INVOKEKIND pInvkinds[2];
+ pInvkinds[0] = INVOKE_FUNC;
+ pInvkinds[1] = aParams.getLength() ? INVOKE_PROPERTYPUT : INVOKE_PROPERTYGET;
+ HRESULT hInvRes = E_FAIL;
+
+ // try Invoke first, if it does not work, try put/get property
+ for ( sal_Int32 nStep = 0; FAILED( hInvRes ) && nStep < 2; nStep++ )
+ {
+ DISPPARAMS dispparams = {NULL, NULL, 0, 0};
+
+ DISPID idPropertyPut = DISPID_PROPERTYPUT;
+ scoped_array<DISPID> arDispidNamedArgs;
+ scoped_array<CComVariant> ptrArgs;
+ scoped_array<CComVariant> ptrRefArgs; // referenced arguments
+ CComVariant * arArgs = NULL;
+ CComVariant * arRefArgs = NULL;
+ bool bVarargParam = false;
+
+ dispparams.cArgs = aParams.getLength();
+
+ // Determine the number of named arguments
+ for ( sal_Int32 nInd = 0; nInd < aParams.getLength(); nInd++ )
+ if ( aParams[nInd].getValueType() == getCppuType((NamedArgument*) 0) )
+ dispparams.cNamedArgs ++;
+
+ // fill the named arguments
+ if ( dispparams.cNamedArgs > 0
+ && !( dispparams.cNamedArgs == 1 && pInvkinds[nStep] == INVOKE_PROPERTYPUT ) )
+ {
+ int nSizeAr = dispparams.cNamedArgs + 1;
+ if ( pInvkinds[nStep] == INVOKE_PROPERTYPUT )
+ nSizeAr = dispparams.cNamedArgs;
+
+ scoped_array<OLECHAR*> saNames(new OLECHAR*[nSizeAr]);
+ OLECHAR ** pNames = saNames.get();
+ pNames[0] = const_cast<OLECHAR*>(reinterpret_cast<LPCOLESTR>(aName.getStr()));
+
+ int cNamedArg = 0;
+ for ( size_t nInd = 0; nInd < dispparams.cArgs; nInd++ )
+ {
+ if ( aParams[nInd].getValueType() == getCppuType((NamedArgument*) 0))
+ {
+ const NamedArgument& arg = *(NamedArgument const*)aParams[nInd].getValue();
+
+ //We put the parameter names in reverse order into the array,
+ //so we can use the DISPID array for DISPPARAMS::rgdispidNamedArgs
+ //The first name in the array is the method name
+ pNames[nSizeAr - 1 - cNamedArg++] = const_cast<OLECHAR*>(reinterpret_cast<LPCOLESTR>(arg.Name.getStr()));
+ }
+ }
+
+ arDispidNamedArgs.reset( new DISPID[nSizeAr] );
+ HRESULT hr = getTypeInfo()->GetIDsOfNames( pNames, nSizeAr, arDispidNamedArgs.get() );
+ if ( hr == E_NOTIMPL )
+ hr = m_spDispatch->GetIDsOfNames(IID_NULL, pNames, nSizeAr, LOCALE_USER_DEFAULT, arDispidNamedArgs.get() );
+
+ if ( SUCCEEDED( hr ) )
+ {
+ if ( pInvkinds[nStep] == DISPATCH_PROPERTYPUT )
+ {
+ DISPID* arIDs = arDispidNamedArgs.get();
+ arIDs[0] = DISPID_PROPERTYPUT;
+ dispparams.rgdispidNamedArgs = arIDs;
+ }
+ else
+ {
+ DISPID* arIDs = arDispidNamedArgs.get();
+ dispparams.rgdispidNamedArgs = & arIDs[1];
+ }
+ }
+ else if (hr == DISP_E_UNKNOWNNAME)
+ {
+ throw IllegalArgumentException(
+ OUSTR("[automation bridge]One of the named arguments is wrong!"),
+ Reference<XInterface>(), 0);
+ }
+ else
+ {
+ throw InvocationTargetException(
+ OUSTR("[automation bridge] ITypeInfo::GetIDsOfNames returned error ")
+ + OUString::valueOf((sal_Int32) hr, 16), Reference<XInterface>(), Any());
+ }
+ }
+
+ //Convert arguments
+ ptrArgs.reset(new CComVariant[dispparams.cArgs]);
+ ptrRefArgs.reset(new CComVariant[dispparams.cArgs]);
+ arArgs = ptrArgs.get();
+ arRefArgs = ptrRefArgs.get();
+
+ sal_Int32 nInd = 0;
+ try
+ {
+ sal_Int32 revIndex = 0;
+ for ( nInd = 0; nInd < sal_Int32(dispparams.cArgs); nInd++)
+ {
+ revIndex = dispparams.cArgs - nInd - 1;
+ arRefArgs[revIndex].byref = 0;
+ Any anyArg;
+ if ( nInd < aParams.getLength() )
+ anyArg = aParams.getConstArray()[nInd];
+
+ // Property Put arguments
+ if ( anyArg.getValueType() == getCppuType((PropertyPutArgument*)0) )
+ {
+ PropertyPutArgument arg;
+ anyArg >>= arg;
+ anyArg <<= arg.Value;
+ }
+ // named argument
+ if (anyArg.getValueType() == getCppuType((NamedArgument*) 0))
+ {
+ NamedArgument aNamedArgument;
+ anyArg >>= aNamedArgument;
+ anyArg <<= aNamedArgument.Value;
+ }
+
+ if ( nInd < aParams.getLength() && anyArg.getValueTypeClass() != TypeClass_VOID )
+ {
+ anyToVariant( &arArgs[revIndex], anyArg, VT_VARIANT );
+ }
+ else
+ {
+ arArgs[revIndex].vt = VT_ERROR;
+ arArgs[revIndex].scode = DISP_E_PARAMNOTFOUND;
+ }
+ }
+ }
+ catch (IllegalArgumentException & e)
+ {
+ e.ArgumentPosition = ::sal::static_int_cast< sal_Int16, sal_Int32 >( nInd );
+ throw;
+ }
+ catch (CannotConvertException & e)
+ {
+ e.ArgumentIndex = nInd;
+ throw;
+ }
+
+ dispparams.rgvarg = arArgs;
+ // invoking OLE method
+ DWORD localeId = LOCALE_USER_DEFAULT;
+ hInvRes = m_spDispatch->Invoke( dispid,
+ IID_NULL,
+ localeId,
+ ::sal::static_int_cast< WORD, INVOKEKIND >( pInvkinds[nStep] ),
+ &dispparams,
+ &varResult,
+ &excepinfo,
+ &uArgErr);
+ }
+
+ // converting return value and out parameter back to UNO
+ if ( SUCCEEDED( hInvRes ) )
+ variantToAny( &varResult, aResult, sal_False );
+ else
+ {
+ // map error codes to exceptions
+ OUString message;
+ switch ( hInvRes )
+ {
+ case S_OK:
+ break;
+ case DISP_E_BADPARAMCOUNT:
+ throw IllegalArgumentException(OUSTR("[automation bridge] Wrong "
+ "number of arguments. Object returned DISP_E_BADPARAMCOUNT."),
+ 0, 0);
+ break;
+ case DISP_E_BADVARTYPE:
+ throw RuntimeException(OUSTR("[automation bridge] One or more "
+ "arguments have the wrong type. Object returned "
+ "DISP_E_BADVARTYPE."), 0);
+ break;
+ case DISP_E_EXCEPTION:
+ message = OUSTR("[automation bridge]: ");
+ message += OUString(reinterpret_cast<const sal_Unicode*>(excepinfo.bstrDescription),
+ ::SysStringLen(excepinfo.bstrDescription));
+ throw InvocationTargetException(message, Reference<XInterface>(), Any());
+ break;
+ case DISP_E_MEMBERNOTFOUND:
+ message = OUSTR("[automation bridge]: A function with the name \"")
+ + aName + OUSTR("\" is not supported. Object returned "
+ "DISP_E_MEMBERNOTFOUND.");
+ throw IllegalArgumentException(message, 0, 0);
+ break;
+ case DISP_E_NONAMEDARGS:
+ throw IllegalArgumentException(OUSTR("[automation bridge] Object "
+ "returned DISP_E_NONAMEDARGS"),0, ::sal::static_int_cast< sal_Int16, unsigned int >( uArgErr ));
+ break;
+ case DISP_E_OVERFLOW:
+ throw CannotConvertException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("[automation bridge] Call failed.")),
+ static_cast<XInterface*>(
+ static_cast<XWeak*>(this)), TypeClass_UNKNOWN, FailReason::OUT_OF_RANGE, uArgErr);
+ break;
+ case DISP_E_PARAMNOTFOUND:
+ throw IllegalArgumentException(OUSTR("[automation bridge]Call failed."
+ "Object returned DISP_E_PARAMNOTFOUND."),
+ 0, ::sal::static_int_cast< sal_Int16, unsigned int >( uArgErr ));
+ break;
+ case DISP_E_TYPEMISMATCH:
+ throw CannotConvertException(OUSTR("[automation bridge] Call failed. "
+ "Object returned DISP_E_TYPEMISMATCH"),
+ static_cast<XInterface*>(
+ static_cast<XWeak*>(this)) , TypeClass_UNKNOWN, FailReason::UNKNOWN, uArgErr);
+ break;
+ case DISP_E_UNKNOWNINTERFACE:
+ throw RuntimeException(OUSTR("[automation bridge] Call failed. "
+ "Object returned DISP_E_UNKNOWNINTERFACE."),0);
+ break;
+ case DISP_E_UNKNOWNLCID:
+ throw RuntimeException(OUSTR("[automation bridge] Call failed. "
+ "Object returned DISP_E_UNKNOWNLCID."),0);
+ break;
+ case DISP_E_PARAMNOTOPTIONAL:
+ throw CannotConvertException(OUSTR("[automation bridge] Call failed."
+ "Object returned DISP_E_PARAMNOTOPTIONAL"),
+ static_cast<XInterface*>(static_cast<XWeak*>(this)),
+ TypeClass_UNKNOWN, FailReason::NO_DEFAULT_AVAILABLE, uArgErr);
+ break;
+ default:
+ throw RuntimeException();
+ break;
+ }
+ }
+
+ return aResult;
+}
+
+::sal_Bool SAL_CALL IUnknownWrapper_Impl::hasMember( const ::rtl::OUString& aName )
+ throw (uno::RuntimeException)
+{
+ if ( ! m_spDispatch )
+ {
+ throw RuntimeException(
+ OUSTR("[automation bridge] The object does not have an IDispatch interface"),
+ Reference<XInterface>());
+ }
+
+ o2u_attachCurrentThread();
+ DISPID dispid;
+ return getDispid( aName, &dispid );
+}
+
+
// UnoConversionUtilities --------------------------------------------------------------------------------
Reference< XInterface > IUnknownWrapper_Impl::createUnoWrapperInstance()
{
@@ -1668,22 +1937,6 @@ Any IUnknownWrapper_Impl::invokeWithDispIdComTlb(FuncDesc& aFuncDesc,
throw IllegalArgumentException( buf.makeStringAndClear(),
Reference<XInterface>(), (sal_Int16) i);
}
- //make sure we get no void any for an in parameter. In StarBasic
- //this may be caused by
- // Dim arg
- // obj.func(arg)
- //A void any is allowed if the parameter is optional
- if ( ! (aFuncDesc->lprgelemdescParam[i].paramdesc.wParamFlags & PARAMFLAG_FOPT)
- && (i < nUnoArgs) && (paramFlags & PARAMFLAG_FIN) &&
- Params.getConstArray()[i].getValueTypeClass() == TypeClass_VOID)
- {
- OUStringBuffer buf(256);
- buf.appendAscii("ole automation bridge: The argument at position: ");
- buf.append(OUString::valueOf((sal_Int32) i));
- buf.appendAscii(" (index starts with 0) is uninitialized.");
- throw IllegalArgumentException( buf.makeStringAndClear(),
- Reference<XInterface>(), (sal_Int16) i);
- }
// Property Put arguments
if (anyArg.getValueType() == getCppuType((PropertyPutArgument*)0))
@@ -1796,12 +2049,16 @@ Any IUnknownWrapper_Impl::invokeWithDispIdComTlb(FuncDesc& aFuncDesc,
& aFuncDesc->lprgelemdescParam[i].paramdesc.
pparamdescex->varDefaultValue);
}
- else
+ else if (paramFlags & PARAMFLAG_FOPT)
{
- OSL_ASSERT(paramFlags & PARAMFLAG_FOPT);
arArgs[revIndex].vt = VT_ERROR;
arArgs[revIndex].scode = DISP_E_PARAMNOTFOUND;
}
+ else
+ {
+ arArgs[revIndex].vt = VT_EMPTY;
+ arArgs[revIndex].lVal = 0;
+ }
}
}
}
diff --git a/extensions/source/ole/oleobjw.hxx b/extensions/source/ole/oleobjw.hxx
index b9e0ca21cd56..0be19ddc6cff 100644
--- a/extensions/source/ole/oleobjw.hxx
+++ b/extensions/source/ole/oleobjw.hxx
@@ -51,7 +51,7 @@
#endif
#include <cppuhelper/implbase3.hxx>
#include <cppuhelper/implbase4.hxx>
-#include <cppuhelper/implbase6.hxx>
+#include <cppuhelper/implbase7.hxx>
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/bridge/oleautomation/XAutomationObject.hpp>
@@ -60,6 +60,7 @@
#include <com/sun/star/script/XDefaultProperty.hpp>
#include <com/sun/star/script/XDefaultMethod.hpp>
+#include <com/sun/star/script/XDirectInvocation.hpp>
#include <typelib/typedescription.hxx>
#include "unoconversionutilities.hxx"
@@ -83,7 +84,7 @@ typedef boost::unordered_multimap<OUString, unsigned int, hashOUString_Impl, equ
// This class wraps an IDispatch and maps XInvocation calls to IDispatch calls on the wrapped object.
// If m_TypeDescription is set then this class represents an UNO interface implemented in a COM component.
// The interface is not a real interface in terms of an abstract class but is realized through IDispatch.
-class IUnknownWrapper_Impl : public WeakImplHelper6<XAutomationInvocation, XBridgeSupplier2, XInitialization, XAutomationObject, XDefaultProperty, XDefaultMethod>,
+class IUnknownWrapper_Impl : public WeakImplHelper7< XInvocation, XBridgeSupplier2, XInitialization, XAutomationObject, XDefaultProperty, XDefaultMethod, XDirectInvocation >,
public UnoConversionUtilities<IUnknownWrapper_Impl>
@@ -132,13 +133,29 @@ public:
// XInitialization
virtual void SAL_CALL initialize( const Sequence< Any >& aArguments )
throw(Exception, RuntimeException);
+
+ // XDefaultProperty
virtual ::rtl::OUString SAL_CALL getDefaultPropertyName( ) throw (::com::sun::star::uno::RuntimeException) { return m_sDefaultMember; }
-protected:
+
+ // XDefaultMethod
virtual ::rtl::OUString SAL_CALL getDefaultMethodName( ) throw (::com::sun::star::uno::RuntimeException) { return m_sDefaultMember; }
virtual ::com::sun::star::uno::Any SAL_CALL invokeGetProperty( const ::rtl::OUString& aFunctionName, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aParams, ::com::sun::star::uno::Sequence< ::sal_Int16 >& aOutParamIndex, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aOutParam ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::script::CannotConvertException, ::com::sun::star::reflection::InvocationTargetException, ::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Any SAL_CALL invokePutProperty( const ::rtl::OUString& aFunctionName, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aParams, ::com::sun::star::uno::Sequence< ::sal_Int16 >& aOutParamIndex, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aOutParam ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::script::CannotConvertException, ::com::sun::star::reflection::InvocationTargetException, ::com::sun::star::uno::RuntimeException);
+ // XDirectInvocation
+ virtual ::com::sun::star::uno::Any SAL_CALL directInvoke( const ::rtl::OUString& aName, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aParams ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::script::CannotConvertException, ::com::sun::star::reflection::InvocationTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual ::sal_Bool SAL_CALL hasMember( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException);
+
+
+ Any IUnknownWrapper_Impl::invokeWithDispIdComTlb(FuncDesc& aFuncDesc,
+ const OUString& sFuncName,
+ const Sequence< Any >& Params,
+ Sequence< sal_Int16 >& OutParamIndex,
+ Sequence< Any >& OutParam);
+
+
+protected:
// ----------------------------------------------------------------------------
virtual Any invokeWithDispIdUnoTlb(const OUString& sFunctionName,
const Sequence< Any >& Params,
@@ -150,12 +167,6 @@ protected:
Sequence< sal_Int16 >& OutParamIndex,
Sequence< Any >& OutParam);
- Any IUnknownWrapper_Impl::invokeWithDispIdComTlb(FuncDesc& aFuncDesc,
- const OUString& sFuncName,
- const Sequence< Any >& Params,
- Sequence< sal_Int16 >& OutParamIndex,
- Sequence< Any >& OutParam);
-
// virtual void setValueWithDispId(DISPID dispID, const Any& Value);
// virtual Any getValueWithDispId(const OUString& sName, DISPID dispID);
diff --git a/extensions/source/ole/servreg.cxx b/extensions/source/ole/servreg.cxx
index 6284bc1f8246..d69d4dab6205 100644
--- a/extensions/source/ole/servreg.cxx
+++ b/extensions/source/ole/servreg.cxx
@@ -121,47 +121,6 @@ extern "C" void * SAL_CALL component_getFactory(
}
-extern "C" sal_Bool SAL_CALL component_writeInfo( void * /*pServiceManager*/, void * pRegistryKey )
-{
- if (pRegistryKey)
- {
- try
- {
- //deprecated
- Reference<XRegistryKey> xNewKey =
- reinterpret_cast<XRegistryKey*>( pRegistryKey)->createKey(reinterpret_cast<const sal_Unicode*>(L"/com.sun.star.comp.ole.OleConverter2/UNO/SERVICES"));
- xNewKey->createKey(reinterpret_cast<const sal_Unicode*>(L"com.sun.star.bridge.OleBridgeSupplier2"));
-
- xNewKey->createKey(reinterpret_cast<const sal_Unicode*>(L"com.sun.star.bridge.oleautomation.BridgeSupplier"));
-
- //deprecated
- xNewKey =
- reinterpret_cast<XRegistryKey*>( pRegistryKey)->createKey(reinterpret_cast<const sal_Unicode*>(L"/com.sun.star.comp.ole.OleConverterVar1/UNO/SERVICES"));
- xNewKey->createKey(reinterpret_cast<const sal_Unicode*>(L"com.sun.star.bridge.OleBridgeSupplierVar1"));
-
- //deprecated
- xNewKey =
- reinterpret_cast<XRegistryKey*>( pRegistryKey)->createKey(reinterpret_cast<const sal_Unicode*>(L"/com.sun.star.comp.ole.OleClient/UNO/SERVICES"));
- xNewKey->createKey(reinterpret_cast<const sal_Unicode*>(L"com.sun.star.bridge.OleObjectFactory"));
-
- xNewKey->createKey(reinterpret_cast<const sal_Unicode*>(L"com.sun.star.bridge.oleautomation.Factory"));
- //deprecated
- xNewKey =
- reinterpret_cast<XRegistryKey*>( pRegistryKey)->createKey(reinterpret_cast<const sal_Unicode*>(L"/com.sun.star.comp.ole.OleServer/UNO/SERVICES"));
- xNewKey->createKey(reinterpret_cast<const sal_Unicode*>(L"com.sun.star.bridge.OleApplicationRegistration"));
-
- xNewKey->createKey(reinterpret_cast<const sal_Unicode*>(L"com.sun.star.bridge.oleautomation.ApplicationRegistration"));
-
- return sal_True;
- }
- catch (InvalidRegistryException &)
- {
- OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
- }
- }
- return sal_False;
-}
-
extern "C" void SAL_CALL component_getImplementationEnvironment(
const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
{
diff --git a/extensions/source/ole/unoobjw.cxx b/extensions/source/ole/unoobjw.cxx
index 96cc39625512..c704382bc962 100644
--- a/extensions/source/ole/unoobjw.cxx
+++ b/extensions/source/ole/unoobjw.cxx
@@ -913,7 +913,7 @@ HRESULT InterfaceOleWrapper_Impl::doInvoke( DISPPARAMS * pdispparams, VARIANT *
HRESULT ret= S_OK;
try
{
- Sequence<INT16> outIndex;
+ Sequence<sal_Int16> outIndex;
Sequence<Any> outParams;
Any returnValue;
diff --git a/extensions/source/oooimprovecore/makefile.mk b/extensions/source/oooimprovecore/makefile.mk
index 97e130c3a644..f92804dbf261 100644
--- a/extensions/source/oooimprovecore/makefile.mk
+++ b/extensions/source/oooimprovecore/makefile.mk
@@ -75,3 +75,11 @@ SHL1VERSIONMAP=$(SOLARENV)/src/component.map
.INCLUDE : target.mk
+
+ALLTAR : $(MISC)/oooimprovecore.component
+
+$(MISC)/oooimprovecore.component .ERRREMOVE : \
+ $(SOLARENV)/bin/createcomponent.xslt oooimprovecore.component
+ $(XSLTPROC) --nonet --stringparam uri \
+ '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+ $(SOLARENV)/bin/createcomponent.xslt oooimprovecore.component
diff --git a/extensions/source/oooimprovecore/oooimprovecore.component b/extensions/source/oooimprovecore/oooimprovecore.component
new file mode 100644
index 000000000000..58bdaf37c2c5
--- /dev/null
+++ b/extensions/source/oooimprovecore/oooimprovecore.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+ xmlns="http://openoffice.org/2010/uno-components">
+ <implementation name="com.sun.star.comp.extensions.oooimprovecore.Core">
+ <service name="com.sun.star.oooimprovement.Core"/>
+ </implementation>
+</component>
diff --git a/extensions/source/oooimprovement/invite_job.cxx b/extensions/source/oooimprovement/invite_job.cxx
index c62ab07671c0..7a5dc34b6e8d 100644
--- a/extensions/source/oooimprovement/invite_job.cxx
+++ b/extensions/source/oooimprovement/invite_job.cxx
@@ -116,7 +116,7 @@ namespace oooimprovement
Sequence<OUString> SAL_CALL InviteJob::getSupportedServiceNames_static()
{
Sequence<OUString> aServiceNames(1);
- aServiceNames[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.task.XAsyncJob"));
+ aServiceNames[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.task.AsyncJob"));
return aServiceNames;
}
diff --git a/extensions/source/oooimprovement/makefile.mk b/extensions/source/oooimprovement/makefile.mk
index 6e5d7ab0d6a2..16e3f12f126c 100644
--- a/extensions/source/oooimprovement/makefile.mk
+++ b/extensions/source/oooimprovement/makefile.mk
@@ -102,3 +102,11 @@ $(SPOOLDIR)$/$(PACKAGEDIR)$/Jobs$/Jobs-oooimprovement.xcu : $(XCU_SOURCEDIR)$/Jo
$(SPOOLDIR)$/$(PACKAGEDIR)$/Logging$/Logging-oooimprovement.xcu : $(XCU_SOURCEDIR)$/Logging.xcu
@-$(MKDIRHIER) $(@:d)
@$(COPY) $< $@
+
+ALLTAR : $(MISC)/oooimprovement.component
+
+$(MISC)/oooimprovement.component .ERRREMOVE : \
+ $(SOLARENV)/bin/createcomponent.xslt oooimprovement.component
+ $(XSLTPROC) --nonet --stringparam uri \
+ '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+ $(SOLARENV)/bin/createcomponent.xslt oooimprovement.component
diff --git a/extensions/source/oooimprovement/onlogrotate_job.cxx b/extensions/source/oooimprovement/onlogrotate_job.cxx
index 5407c4b6edf0..255a324702f6 100644
--- a/extensions/source/oooimprovement/onlogrotate_job.cxx
+++ b/extensions/source/oooimprovement/onlogrotate_job.cxx
@@ -36,15 +36,21 @@
#include "soapsender.hxx"
#include <com/sun/star/ucb/XSimpleFileAccess.hpp>
-#include <osl/mutex.hxx>
+#include <com/sun/star/frame/XDesktop.hpp>
+#include <com/sun/star/frame/XTerminateListener.hpp>
+#include <osl/conditn.hxx>
#include <osl/thread.hxx>
#include <osl/time.h>
+#include <cppuhelper/implbase1.hxx>
+#include <memory>
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::task;
using namespace ::com::sun::star::uno;
+using ::com::sun::star::frame::XTerminateListener;
+using ::com::sun::star::frame::XDesktop;
using ::com::sun::star::ucb::XSimpleFileAccess;
using ::rtl::OUString;
using ::std::vector;
@@ -103,26 +109,25 @@ namespace
public:
OnLogRotateThread(Reference<XMultiServiceFactory> sf);
virtual void SAL_CALL run();
- void disposing();
+ void stop();
+
private:
Reference<XMultiServiceFactory> m_ServiceFactory;
- ::osl::Mutex m_ServiceFactoryMutex;
+ ::osl::Condition m_Stop;
};
OnLogRotateThread::OnLogRotateThread(Reference<XMultiServiceFactory> sf)
: m_ServiceFactory(sf)
- { }
+ {
+ OSL_ASSERT(sf.is());
+ }
void SAL_CALL OnLogRotateThread::run()
{
+ TimeValue wait_intervall = {30,0};
+ if (m_Stop.wait(&wait_intervall) == ::osl::Condition::result_timeout)
{
- ::osl::Thread::yield();
- TimeValue wait_intervall = {30,0};
- osl_waitThread(&wait_intervall);
- }
- {
- ::osl::Guard< ::osl::Mutex> service_factory_guard(m_ServiceFactoryMutex);
- if(m_ServiceFactory.is())
+ try
{
if(Config(m_ServiceFactory).getInvitationAccepted())
{
@@ -132,15 +137,46 @@ namespace
else
LogStorage(m_ServiceFactory).clear();
}
- m_ServiceFactory.clear();
+ catch(...) {}
}
}
- void OnLogRotateThread::disposing()
+ void OnLogRotateThread::stop()
{
- ::osl::Guard< ::osl::Mutex> service_factory_guard(m_ServiceFactoryMutex);
- m_ServiceFactory.clear();
+ m_Stop.set();
}
+
+ class OnLogRotateThreadWatcher : public ::cppu::WeakImplHelper1<XTerminateListener>
+ {
+ public:
+ OnLogRotateThreadWatcher(Reference<XMultiServiceFactory> sf)
+ : m_Thread(new OnLogRotateThread(sf))
+ {
+ m_Thread->create();
+ }
+ virtual ~OnLogRotateThreadWatcher()
+ {
+ m_Thread->stop();
+ m_Thread->join();
+ };
+
+ // XTerminateListener
+ virtual void SAL_CALL queryTermination(const EventObject&) throw(RuntimeException)
+ { };
+ virtual void SAL_CALL notifyTermination(const EventObject&) throw(RuntimeException)
+ {
+ m_Thread->stop();
+ m_Thread->join();
+ };
+ // XEventListener
+ virtual void SAL_CALL disposing(const EventObject&) throw(RuntimeException)
+ {
+ m_Thread->stop();
+ m_Thread->join();
+ };
+ private:
+ ::std::auto_ptr<OnLogRotateThread> m_Thread;
+ };
}
namespace oooimprovement
@@ -164,9 +200,11 @@ namespace oooimprovement
const Reference<XJobListener>& listener)
throw(RuntimeException)
{
- OnLogRotateThread* thread = new OnLogRotateThread(m_ServiceFactory);
- thread->create();
-
+ Reference<XDesktop> xDesktop(
+ m_ServiceFactory->createInstance(OUString::createFromAscii("com.sun.star.frame.Desktop")),
+ UNO_QUERY);
+ if(xDesktop.is())
+ xDesktop->addTerminateListener(Reference<XTerminateListener>(new OnLogRotateThreadWatcher(m_ServiceFactory)));
Any result;
listener->jobFinished(Reference<XAsyncJob>(this), result);
}
@@ -191,7 +229,7 @@ namespace oooimprovement
Sequence<OUString> SAL_CALL OnLogRotateJob::getSupportedServiceNames_static()
{
Sequence<OUString> aServiceNames(1);
- aServiceNames[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.task.XAsyncJob"));
+ aServiceNames[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.task.AsyncJob"));
return aServiceNames;
}
diff --git a/extensions/source/oooimprovement/oooimprovement.component b/extensions/source/oooimprovement/oooimprovement.component
new file mode 100644
index 000000000000..e133f932c199
--- /dev/null
+++ b/extensions/source/oooimprovement/oooimprovement.component
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+ xmlns="http://openoffice.org/2010/uno-components">
+ <implementation
+ name="com.sun.star.comp.extensions.oooimprovement.CoreController">
+ <service name="com.sun.star.oooimprovement.CoreController"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.extensions.oooimprovement.InviteJob"/>
+ <implementation
+ name="com.sun.star.comp.extensions.oooimprovement.OnLogRotateJob"/>
+</component>
diff --git a/extensions/source/oooimprovement/oooimprovement_exports.cxx b/extensions/source/oooimprovement/oooimprovement_exports.cxx
index fff1610fcb3a..cba715bc192d 100644
--- a/extensions/source/oooimprovement/oooimprovement_exports.cxx
+++ b/extensions/source/oooimprovement/oooimprovement_exports.cxx
@@ -66,28 +66,6 @@ extern "C"
void SAL_CALL component_getImplementationEnvironment(const sal_Char** env_type_name, uno_Environment**)
{ *env_type_name = CPPU_CURRENT_LANGUAGE_BINDING_NAME; }
- sal_Bool SAL_CALL component_writeInfo(void*, void* p_reg_key)
- {
- if (!p_reg_key) return sal_False;
- try
- {
- Reference<XRegistryKey> reg_key(reinterpret_cast<XRegistryKey*>(p_reg_key), UNO_QUERY);
- writeInfo(reg_key,
- CoreController::getImplementationName_static(),
- CoreController::getSupportedServiceNames_static()[0]);
- writeInfo(reg_key,
- OnLogRotateJob::getImplementationName_static(),
- OnLogRotateJob::getSupportedServiceNames_static()[0]);
- writeInfo(reg_key,
- InviteJob::getImplementationName_static(),
- InviteJob::getSupportedServiceNames_static()[0]);
- return sal_True;
- }
- catch(const InvalidRegistryException&)
- { OSL_ENSURE( sal_False, "### InvalidRegistryException!" ); }
- return sal_False;
- }
-
void* SAL_CALL component_getFactory(const sal_Char* pImplName, void* pServiceManager, void*)
{
if ( !pServiceManager || !pImplName ) return 0;
diff --git a/extensions/source/plugin/aqua/macmgr.cxx b/extensions/source/plugin/aqua/macmgr.cxx
index 2a67cc994b8e..3b6984502a5e 100644
--- a/extensions/source/plugin/aqua/macmgr.cxx
+++ b/extensions/source/plugin/aqua/macmgr.cxx
@@ -587,7 +587,7 @@ static rtl::OUString FindFolderURL( FSVolumeRefNum vRefNum, OSType folderType )
Sequence<PluginDescription> XPluginManager_Impl::impl_getPluginDescriptions() throw()
{
static Sequence<PluginDescription> aDescriptions;
- static BOOL bHavePlugins = FALSE;
+ static sal_Bool bHavePlugins = sal_False;
if( ! bHavePlugins )
{
std::list<PluginDescription*> aPlugins;
@@ -646,7 +646,7 @@ Sequence<PluginDescription> XPluginManager_Impl::impl_getPluginDescriptions() th
delete *iter;
}
aPlugins.clear();
- bHavePlugins = TRUE;
+ bHavePlugins = sal_True;
}
return aDescriptions;
}
diff --git a/extensions/source/plugin/aqua/sysplug.cxx b/extensions/source/plugin/aqua/sysplug.cxx
index 4d9bf9fa32ce..01e10ddc1f14 100644
--- a/extensions/source/plugin/aqua/sysplug.cxx
+++ b/extensions/source/plugin/aqua/sysplug.cxx
@@ -70,8 +70,8 @@ struct FakeEventRecord : public EventRecord
}
-(id)initWithInstance: (XPlugin_Impl*)i_pImpl pluginComm: (MacPluginComm*)i_pCom frame: (NSRect)i_aRect;
-(void)drawRect: (NSRect)i_aRect;
--(MacOSBOOL)isOpaque;
--(MacOSBOOL)isFlipped;
+-(BOOL)isOpaque;
+-(BOOL)isFlipped;
// NSResponder
-(void)mouseMoved: (NSEvent*)i_pEvent;
@@ -104,12 +104,12 @@ struct FakeEventRecord : public EventRecord
m_pCom->drawView( m_pImpl );
}
--(MacOSBOOL)isOpaque
+-(BOOL)isOpaque
{
return NO;
}
--(MacOSBOOL)isFlipped
+-(BOOL)isFlipped
{
return YES;
}
@@ -273,10 +273,10 @@ MacPluginComm::~MacPluginComm()
}
//--------------------------------------------------------------------------------------------------
-BOOL MacPluginComm::retrieveFunction( const char* i_pName, void** o_ppFunc ) const
+sal_Bool MacPluginComm::retrieveFunction( const char* i_pName, void** o_ppFunc ) const
{
if( ! m_hPlugLib || ! o_ppFunc )
- return FALSE;
+ return sal_False;
*o_ppFunc = (void*)osl_getAsciiFunctionSymbol( m_hPlugLib, i_pName );
diff --git a/extensions/source/plugin/base/manager.cxx b/extensions/source/plugin/base/manager.cxx
index 338eb1940df9..a261177aafaa 100644
--- a/extensions/source/plugin/base/manager.cxx
+++ b/extensions/source/plugin/base/manager.cxx
@@ -81,9 +81,9 @@ const Sequence< ::rtl::OUString >& PluginManager::getAdditionalSearchPaths()
String aPluginPath( aOptions.GetPluginPath() );
if( aPluginPath.Len() )
{
- USHORT nPaths = aPluginPath.GetTokenCount( ';' );
+ sal_uInt16 nPaths = aPluginPath.GetTokenCount( ';' );
aPaths.realloc( nPaths );
- for( USHORT i = 0; i < nPaths; i++ )
+ for( sal_uInt16 i = 0; i < nPaths; i++ )
aPaths.getArray()[i] = aPluginPath.GetToken( i, ';' );
}
}
@@ -181,7 +181,7 @@ Sequence<com::sun::star::plugin::PluginDescription> XPluginManager_Impl::getPlug
return aRet;
}
-Reference< ::com::sun::star::plugin::XPlugin > XPluginManager_Impl::createPlugin( const Reference< ::com::sun::star::plugin::XPluginContext >& acontext, INT16 mode, const Sequence< ::rtl::OUString >& argn, const Sequence< ::rtl::OUString >& argv, const ::com::sun::star::plugin::PluginDescription& plugintype)
+Reference< ::com::sun::star::plugin::XPlugin > XPluginManager_Impl::createPlugin( const Reference< ::com::sun::star::plugin::XPluginContext >& acontext, sal_Int16 mode, const Sequence< ::rtl::OUString >& argn, const Sequence< ::rtl::OUString >& argv, const ::com::sun::star::plugin::PluginDescription& plugintype)
throw( RuntimeException,::com::sun::star::plugin::PluginException )
{
XPlugin_Impl* pImpl = new XPlugin_Impl( m_xSMgr );
diff --git a/extensions/source/plugin/base/service.cxx b/extensions/source/plugin/base/service.cxx
index bef0be999906..ac32608be0b9 100644
--- a/extensions/source/plugin/base/service.cxx
+++ b/extensions/source/plugin/base/service.cxx
@@ -59,33 +59,6 @@ extern "C" {
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
- sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pXUnoKey )
- {
- if( pXUnoKey )
- {
- try
- {
- Reference< ::com::sun::star::registry::XRegistryKey > xKey( reinterpret_cast< ::com::sun::star::registry::XRegistryKey* >( pXUnoKey ) );
-
- ::rtl::OUString aImplName (RTL_CONSTASCII_USTRINGPARAM("/"));
- aImplName += XPluginManager_Impl::getImplementationName_Static();
- aImplName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES/com.sun.star.plugin.PluginManager"));
- xKey->createKey( aImplName );
-
- aImplName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
- aImplName += PluginModel::getImplementationName_Static();
- aImplName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES/com.sun.star.plugin.PluginModel"));
- xKey->createKey( aImplName );
-
- return sal_True;
- }
- catch( ::com::sun::star::registry::InvalidRegistryException& )
- {
- }
- }
- return sal_False;
- }
-
void* SAL_CALL component_getFactory(
const sal_Char* pImplementationName,
void* pXUnoSMgr,
diff --git a/extensions/source/plugin/base/xplugin.cxx b/extensions/source/plugin/base/xplugin.cxx
index 1eac4dd9c983..38039f4fa7f9 100644
--- a/extensions/source/plugin/base/xplugin.cxx
+++ b/extensions/source/plugin/base/xplugin.cxx
@@ -86,7 +86,7 @@ void PluginDisposer::onShot()
{
if( m_pPlugin->isDisposable() )
{
- ULONG nEvent;
+ sal_uLong nEvent;
Application::PostUserEvent( nEvent, LINK( m_pPlugin, XPlugin_Impl, secondLevelDispose ), (void*)m_pPlugin );
}
}
@@ -1020,7 +1020,7 @@ void PluginInputStream::load()
aUrl.SetSmartProtocol( INET_PROT_FILE );
aUrl.SetSmartURL(
String( getStream()->url,
- ::sal::static_int_cast< USHORT, size_t >( strlen( getStream()->url ) ),
+ ::sal::static_int_cast< sal_uInt16, size_t >( strlen( getStream()->url ) ),
RTL_TEXTENCODING_MS_1252
) );
try
@@ -1065,8 +1065,8 @@ void PluginInputStream::writeBytes( const Sequence<sal_Int8>& Buffer ) throw()
if( m_nMode == -1 || !m_pPlugin->getPluginComm() )
return;
- UINT32 nPos = m_aFileStream.Tell();
- UINT32 nBytes = 0;
+ sal_uInt32 nPos = m_aFileStream.Tell();
+ sal_uInt32 nBytes = 0;
while( m_nMode != NP_ASFILEONLY &&
m_nWritePos < nPos &&
(nBytes = m_pPlugin->getPluginComm()-> NPP_WriteReady(
diff --git a/extensions/source/plugin/inc/plugin/aqua/sysplug.hxx b/extensions/source/plugin/inc/plugin/aqua/sysplug.hxx
index 01b8dafa0f2c..53f137e0c236 100644
--- a/extensions/source/plugin/inc/plugin/aqua/sysplug.hxx
+++ b/extensions/source/plugin/inc/plugin/aqua/sysplug.hxx
@@ -137,7 +137,7 @@ public:
void drawView( XPlugin_Impl* );
private:
- BOOL retrieveFunction( const char* i_pName, void** i_ppFunc ) const;
+ sal_Bool retrieveFunction( const char* i_pName, void** i_ppFunc ) const;
DECL_LINK( NullTimerHdl, void* );
private:
diff --git a/extensions/source/plugin/inc/plugin/impl.hxx b/extensions/source/plugin/inc/plugin/impl.hxx
index cad61129d875..75c8cd55922e 100644
--- a/extensions/source/plugin/inc/plugin/impl.hxx
+++ b/extensions/source/plugin/inc/plugin/impl.hxx
@@ -341,7 +341,7 @@ class PluginInputStream :
private:
::ucbhelper::Content* m_pContent;
sal_Int32 m_nMode;
- UINT32 m_nWritePos;
+ sal_uInt32 m_nWritePos;
Reference< com::sun::star::io::XActiveDataSource > m_xSource;
// hold a reference on input until closeOutput is called
@@ -355,7 +355,7 @@ private:
SvFileStream m_aFileStream;
public:
PluginInputStream( XPlugin_Impl* pPlugin,
- const char* url, UINT32 len, UINT32 lastmod );
+ const char* url, sal_uInt32 len, sal_uInt32 lastmod );
PluginInputStream() : PluginStream( NULL, NULL, 0, 0 ) {}
@@ -364,7 +364,7 @@ public:
virtual PluginStreamType getStreamType();
void setMode( sal_Int32 nMode );
- UINT32 read( UINT32 offset, sal_Int8* buffer, UINT32 size );
+ sal_uInt32 read( sal_uInt32 offset, sal_Int8* buffer, sal_uInt32 size );
void setSource( const Reference< com::sun::star::io::XActiveDataSource >& xSource ) { m_xSource = xSource; }
// get contents ot url via ucbhelper::Content
void load();
diff --git a/extensions/source/plugin/inc/plugin/unx/mediator.hxx b/extensions/source/plugin/inc/plugin/unx/mediator.hxx
index acf73c498a6c..72c0e3e82d3d 100644
--- a/extensions/source/plugin/inc/plugin/unx/mediator.hxx
+++ b/extensions/source/plugin/inc/plugin/unx/mediator.hxx
@@ -44,14 +44,14 @@
struct MediatorMessage
{
- ULONG m_nID;
- ULONG m_nBytes;
+ sal_uLong m_nID;
+ sal_uLong m_nBytes;
char* m_pBytes;
char* m_pRun;
MediatorMessage() : m_nID( 0 ), m_nBytes( 0 ),
m_pBytes( NULL ), m_pRun( NULL ) {}
- MediatorMessage( ULONG nID, ULONG nBytes, char* pBytes ) :
+ MediatorMessage( sal_uLong nID, sal_uLong nBytes, char* pBytes ) :
m_nID( nID ),m_nBytes( nBytes ), m_pRun( NULL )
{
m_pBytes = new char[ m_nBytes ];
@@ -64,7 +64,7 @@ struct MediatorMessage
delete [] m_pBytes;
}
- void Set( ULONG nBytes, char* pBytes )
+ void Set( sal_uLong nBytes, char* pBytes )
{
if( m_pBytes )
delete [] m_pBytes;
@@ -73,11 +73,11 @@ struct MediatorMessage
memcpy( m_pBytes, pBytes, (size_t)m_nBytes );
}
- ULONG ExtractULONG();
+ sal_uLong ExtractULONG();
char* GetString();
- UINT32 GetUINT32();
- void* GetBytes( ULONG& );
- void* GetBytes() { ULONG nBytes; return GetBytes( nBytes ); }
+ sal_uInt32 GetUINT32();
+ void* GetBytes( sal_uLong& );
+ void* GetBytes() { sal_uLong nBytes; return GetBytes( nBytes ); }
void Rewind() { m_pRun = NULL; }
};
@@ -98,7 +98,7 @@ protected:
MediatorListener* m_pListener;
// thread to fill the queue
- ULONG m_nCurrentID;
+ sal_uLong m_nCurrentID;
// will be constantly increased with each message sent
bool m_bValid;
@@ -113,27 +113,27 @@ public:
// with error
void invalidate() { m_bValid = false; }
- ULONG SendMessage( ULONG nBytes, const char* pBytes, ULONG nMessageID = 0 );
- ULONG SendMessage( const ByteString& rMessage, ULONG nMessageID = 0 )
+ sal_uLong SendMessage( sal_uLong nBytes, const char* pBytes, sal_uLong nMessageID = 0 );
+ sal_uLong SendMessage( const ByteString& rMessage, sal_uLong nMessageID = 0 )
{
return SendMessage( rMessage.Len(), rMessage.GetBuffer(), nMessageID );
}
- BOOL WaitForMessage( ULONG nTimeOut = 5000 );
+ sal_Bool WaitForMessage( sal_uLong nTimeOut = 5000 );
// timeout in ms
// TRUE: Message came in
// FALSE: timed out
// if timeout is set, WaitForMessage will wait even if there are messages
// in the queue
- virtual MediatorMessage* WaitForAnswer( ULONG nMessageID );
+ virtual MediatorMessage* WaitForAnswer( sal_uLong nMessageID );
// wait for an answer message ( ID >= 1 << 24 )
// the message will be removed from the queue and returned
- MediatorMessage* TransactMessage( ULONG nBytes, char* pBytes );
+ MediatorMessage* TransactMessage( sal_uLong nBytes, char* pBytes );
// sends a message and waits for an answer
- MediatorMessage* GetNextMessage( BOOL bWait = FALSE );
+ MediatorMessage* GetNextMessage( sal_Bool bWait = sal_False );
Link SetConnectionLostHdl( const Link& rLink )
diff --git a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
index 7db023161249..2b8bf4f7a89d 100644
--- a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
+++ b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
@@ -158,9 +158,9 @@ public:
NPSavedData aData;
ConnectorInstance( NPP inst, char* type,
- int args, char* pargnbuf, ULONG nargnbytes,
- char* pargvbuf, ULONG nargvbytes,
- char* savedata, ULONG savebytes );
+ int args, char* pargnbuf, sal_uLong nargnbytes,
+ char* pargvbuf, sal_uLong nargvbytes,
+ char* savedata, sal_uLong savebytes );
~ConnectorInstance();
};
@@ -177,22 +177,22 @@ protected:
std::vector<NPStream*> m_aNPWrapStreams;
std::vector<ConnectorInstance*> m_aInstances;
- ULONG FillBuffer( char*&, const char*, ULONG, va_list );
+ sal_uLong FillBuffer( char*&, const char*, sal_uLong, va_list );
public:
PluginConnector( int nSocket );
~PluginConnector();
- virtual MediatorMessage* WaitForAnswer( ULONG nMessageID );
- MediatorMessage* Transact( const char*, ULONG, ... );
- MediatorMessage* Transact( UINT32, ... );
- void Respond( ULONG nID, char*, ULONG, ... );
- ULONG Send( UINT32, ... );
+ virtual MediatorMessage* WaitForAnswer( sal_uLong nMessageID );
+ MediatorMessage* Transact( const char*, sal_uLong, ... );
+ MediatorMessage* Transact( sal_uInt32, ... );
+ void Respond( sal_uLong nID, char*, sal_uLong, ... );
+ sal_uLong Send( sal_uInt32, ... );
- static const UINT32 UnknownStreamID = 0xffffffff;
- static const UINT32 UnknownNPPID = 0xffffffff;
+ static const sal_uInt32 UnknownStreamID = 0xffffffff;
+ static const sal_uInt32 UnknownNPPID = 0xffffffff;
- UINT32 GetStreamID( NPStream* pStream );
- UINT32 GetNPPID( NPP );
+ sal_uInt32 GetStreamID( NPStream* pStream );
+ sal_uInt32 GetNPPID( NPP );
std::vector<NPStream*>& getStreamList() { return m_aNPWrapStreams; }
@@ -211,7 +211,7 @@ public:
}
ConnectorInstance* getInstance( NPP );
- ConnectorInstance* getInstanceById( UINT32 );
+ ConnectorInstance* getInstanceById( sal_uInt32 );
};
enum CommandAtoms
diff --git a/extensions/source/plugin/unx/mediator.cxx b/extensions/source/plugin/unx/mediator.cxx
index 4cbab9e0c9a2..df73c01f7e5e 100644
--- a/extensions/source/plugin/unx/mediator.cxx
+++ b/extensions/source/plugin/unx/mediator.cxx
@@ -57,7 +57,7 @@ Mediator::~Mediator()
m_pListener = NULL;
if( m_bValid )
{
- ULONG aHeader[3];
+ sal_uLong aHeader[3];
aHeader[0] = 0;
aHeader[1] = 0;
aHeader[2] = MEDIATOR_MAGIC;
@@ -76,7 +76,7 @@ Mediator::~Mediator()
}
-ULONG Mediator::SendMessage( ULONG nBytes, const char* pBytes, ULONG nMessageID )
+sal_uLong Mediator::SendMessage( sal_uLong nBytes, const char* pBytes, sal_uLong nMessageID )
{
if( ! m_pListener )
return 0;
@@ -92,26 +92,26 @@ ULONG Mediator::SendMessage( ULONG nBytes, const char* pBytes, ULONG nMessageID
if( ! m_bValid )
return nMessageID;
- ULONG* pBuffer = new ULONG[ (nBytes/sizeof(ULONG)) + 4 ];
+ sal_uLong* pBuffer = new sal_uLong[ (nBytes/sizeof(sal_uLong)) + 4 ];
pBuffer[ 0 ] = nMessageID;
pBuffer[ 1 ] = nBytes;
pBuffer[ 2 ] = MEDIATOR_MAGIC;
memcpy( &pBuffer[3], pBytes, (size_t)nBytes );
- write( m_nSocket, pBuffer, nBytes + 3*sizeof( ULONG ) );
+ write( m_nSocket, pBuffer, nBytes + 3*sizeof( sal_uLong ) );
delete [] pBuffer;
return nMessageID;
}
-BOOL Mediator::WaitForMessage( ULONG nTimeOut )
+sal_Bool Mediator::WaitForMessage( sal_uLong nTimeOut )
{
if( ! m_pListener )
- return FALSE;
+ return sal_False;
size_t nItems = m_aMessageQueue.size();
if( ! nTimeOut && nItems > 0 )
- return TRUE;
+ return sal_True;
TimeValue aValue;
aValue.Seconds = nTimeOut/1000;
@@ -122,12 +122,12 @@ BOOL Mediator::WaitForMessage( ULONG nTimeOut )
m_aNewMessageCdtn.wait( & aValue );
m_aNewMessageCdtn.reset();
if( nTimeOut && m_aMessageQueue.size() == nItems )
- return FALSE;
+ return sal_False;
}
- return TRUE;
+ return sal_True;
}
-MediatorMessage* Mediator::WaitForAnswer( ULONG nMessageID )
+MediatorMessage* Mediator::WaitForAnswer( sal_uLong nMessageID )
{
nMessageID &= 0x00ffffff;
while( m_pListener )
@@ -137,7 +137,7 @@ MediatorMessage* Mediator::WaitForAnswer( ULONG nMessageID )
for( size_t i = 0; i < m_aMessageQueue.size(); i++ )
{
MediatorMessage* pMessage = m_aMessageQueue[ i ];
- ULONG nID = pMessage->m_nID;
+ sal_uLong nID = pMessage->m_nID;
if( ( nID & 0xff000000 ) &&
( ( nID & 0x00ffffff ) == nMessageID ) )
{
@@ -151,7 +151,7 @@ MediatorMessage* Mediator::WaitForAnswer( ULONG nMessageID )
return NULL;
}
-MediatorMessage* Mediator::GetNextMessage( BOOL bWait )
+MediatorMessage* Mediator::GetNextMessage( sal_Bool bWait )
{
while( m_pListener )
{
@@ -176,9 +176,9 @@ MediatorMessage* Mediator::GetNextMessage( BOOL bWait )
return NULL;
}
-MediatorMessage* Mediator::TransactMessage( ULONG nBytes, char* pBytes )
+MediatorMessage* Mediator::TransactMessage( sal_uLong nBytes, char* pBytes )
{
- ULONG nID = SendMessage( nBytes, pBytes );
+ sal_uLong nID = SendMessage( nBytes, pBytes );
return WaitForAnswer( nID );
}
@@ -196,7 +196,7 @@ void MediatorListener::run()
bool bRun = true;
while( schedule() && m_pMediator && bRun )
{
- ULONG nHeader[ 3 ];
+ sal_uLong nHeader[ 3 ];
int nBytes;
if( m_pMediator && ( nBytes = read( m_pMediator->m_nSocket, nHeader, sizeof( nHeader ) ) ) == sizeof( nHeader ) && nHeader[2] == MEDIATOR_MAGIC)
@@ -204,7 +204,7 @@ void MediatorListener::run()
if( nHeader[ 0 ] == 0 && nHeader[ 1 ] == 0 )
return;
char* pBuffer = new char[ nHeader[ 1 ] ];
- if( m_pMediator && (ULONG)read( m_pMediator->m_nSocket, pBuffer, nHeader[ 1 ] ) == nHeader[ 1 ] )
+ if( m_pMediator && (sal_uLong)read( m_pMediator->m_nSocket, pBuffer, nHeader[ 1 ] ) == nHeader[ 1 ] )
{
::osl::MutexGuard aMyGuard( m_aMutex );
{
@@ -244,30 +244,30 @@ void MediatorListener::onTerminated()
delete this;
}
-ULONG MediatorMessage::ExtractULONG()
+sal_uLong MediatorMessage::ExtractULONG()
{
if( ! m_pRun )
m_pRun = m_pBytes;
- medDebug( (ULONG)(m_pRun - m_pBytes) >= m_nBytes, "Overflow in MediatorMessage::ExtractULONG\n" );
- ULONG nCount;
- memcpy( &nCount, m_pRun, sizeof( ULONG ) );
- m_pRun += sizeof( ULONG );
+ medDebug( (sal_uLong)(m_pRun - m_pBytes) >= m_nBytes, "Overflow in MediatorMessage::ExtractULONG\n" );
+ sal_uLong nCount;
+ memcpy( &nCount, m_pRun, sizeof( sal_uLong ) );
+ m_pRun += sizeof( sal_uLong );
return nCount;
}
-void* MediatorMessage::GetBytes( ULONG& rBytes )
+void* MediatorMessage::GetBytes( sal_uLong& rBytes )
{
if( ! m_pRun )
m_pRun = m_pBytes;
- medDebug( (ULONG)(m_pRun - m_pBytes) >= m_nBytes, "Overflow in MediatorMessage::GetBytes\n" );
- ULONG nBytes = ExtractULONG();
+ medDebug( (sal_uLong)(m_pRun - m_pBytes) >= m_nBytes, "Overflow in MediatorMessage::GetBytes\n" );
+ sal_uLong nBytes = ExtractULONG();
if( nBytes == 0 )
return NULL;
- medDebug( (ULONG)(m_pRun - m_pBytes) >= m_nBytes, "Overflow in MediatorMessage::GetBytes\n" );
+ medDebug( (sal_uLong)(m_pRun - m_pBytes) >= m_nBytes, "Overflow in MediatorMessage::GetBytes\n" );
char* pBuffer = new char[ nBytes ];
memcpy( pBuffer, m_pRun, nBytes );
m_pRun += nBytes;
@@ -280,13 +280,13 @@ char* MediatorMessage::GetString()
if( ! m_pRun )
m_pRun = m_pBytes;
- medDebug( (ULONG)(m_pRun - m_pBytes) >= m_nBytes, "Overflow in MediatorMessage::GetString\n" );
- ULONG nBytes = ExtractULONG();
+ medDebug( (sal_uLong)(m_pRun - m_pBytes) >= m_nBytes, "Overflow in MediatorMessage::GetString\n" );
+ sal_uLong nBytes = ExtractULONG();
if( nBytes == 0 )
return NULL;
- medDebug( (ULONG)(m_pRun - m_pBytes) >= m_nBytes, "Overflow in MediatorMessage::GetString\n" );
+ medDebug( (sal_uLong)(m_pRun - m_pBytes) >= m_nBytes, "Overflow in MediatorMessage::GetString\n" );
char* pBuffer = new char[ nBytes+1 ];
memcpy( pBuffer, m_pRun, nBytes );
pBuffer[ nBytes ] = 0;
@@ -294,18 +294,18 @@ char* MediatorMessage::GetString()
return pBuffer;
}
-UINT32 MediatorMessage::GetUINT32()
+sal_uInt32 MediatorMessage::GetUINT32()
{
if( ! m_pRun )
m_pRun = m_pBytes;
- medDebug( (ULONG)(m_pRun - m_pBytes) >= m_nBytes, "Overflow in MediatorMessage::GetUINT32\n" );
- ULONG nBytes = ExtractULONG();
- medDebug( nBytes != sizeof( UINT32 ), "No UINT32 in MediatorMessage::GetUINT32\n" );
- medDebug( (ULONG)(m_pRun - m_pBytes) >= m_nBytes, "Overflow in MediatorMessage::GetUINT32\n" );
- UINT32 nRet;
+ medDebug( (sal_uLong)(m_pRun - m_pBytes) >= m_nBytes, "Overflow in MediatorMessage::GetUINT32\n" );
+ sal_uLong nBytes = ExtractULONG();
+ medDebug( nBytes != sizeof( sal_uInt32 ), "No sal_uInt32 in MediatorMessage::GetUINT32\n" );
+ medDebug( (sal_uLong)(m_pRun - m_pBytes) >= m_nBytes, "Overflow in MediatorMessage::GetUINT32\n" );
+ sal_uInt32 nRet;
memcpy( &nRet, m_pRun, sizeof( nRet ) );
- m_pRun += sizeof( UINT32 );
+ m_pRun += sizeof( sal_uInt32 );
return nRet;
}
diff --git a/extensions/source/plugin/unx/npnapi.cxx b/extensions/source/plugin/unx/npnapi.cxx
index f50af7c1d5d3..c0cefa35a556 100644
--- a/extensions/source/plugin/unx/npnapi.cxx
+++ b/extensions/source/plugin/unx/npnapi.cxx
@@ -74,11 +74,11 @@ static uint32 l_NPN_MemFlush( uint32 /*nSize*/ )
static NPError l_NPN_DestroyStream( NPP instance, NPStream* stream, NPError reason )
{
- UINT32 nInstance = pConnector->GetNPPID( instance );
+ sal_uInt32 nInstance = pConnector->GetNPPID( instance );
if( nInstance == PluginConnector::UnknownNPPID )
return NPERR_GENERIC_ERROR;
- UINT32 nFileID = pConnector->GetStreamID( stream );
+ sal_uInt32 nFileID = pConnector->GetStreamID( stream );
MediatorMessage* pMes=
pConnector->
Transact( eNPN_DestroyStream,
@@ -125,7 +125,7 @@ static jref l_NPN_GetJavaPeer( NPP /*instance*/ )
static NPError l_NPN_GetURL( NPP instance, const char* url, const char* window )
{
- UINT32 nInstance = pConnector->GetNPPID( instance );
+ sal_uInt32 nInstance = pConnector->GetNPPID( instance );
if( nInstance == PluginConnector::UnknownNPPID )
return NPERR_GENERIC_ERROR;
@@ -150,7 +150,7 @@ static NPError l_NPN_GetURL( NPP instance, const char* url, const char* window )
static NPError l_NPN_GetURLNotify( NPP instance, const char* url, const char* target,
void* notifyData )
{
- UINT32 nInstance = pConnector->GetNPPID( instance );
+ sal_uInt32 nInstance = pConnector->GetNPPID( instance );
if( nInstance == PluginConnector::UnknownNPPID )
return NPERR_GENERIC_ERROR;
@@ -177,7 +177,7 @@ static NPError l_NPN_NewStream( NPP instance, NPMIMEType type, const char* targe
NPStream** stream )
// stream is a return value
{
- UINT32 nInstance = pConnector->GetNPPID( instance );
+ sal_uInt32 nInstance = pConnector->GetNPPID( instance );
if( nInstance == PluginConnector::UnknownNPPID )
return NPERR_GENERIC_ERROR;
@@ -211,7 +211,7 @@ static NPError l_NPN_NewStream( NPP instance, NPMIMEType type, const char* targe
static NPError l_NPN_PostURLNotify( NPP instance, const char* url, const char* target, uint32 len, const char* buf, NPBool file, void* notifyData )
{
- UINT32 nInstance = pConnector->GetNPPID( instance );
+ sal_uInt32 nInstance = pConnector->GetNPPID( instance );
if( nInstance == PluginConnector::UnknownNPPID )
return NPERR_GENERIC_ERROR;
@@ -236,7 +236,7 @@ static NPError l_NPN_PostURLNotify( NPP instance, const char* url, const char* t
static NPError l_NPN_PostURL( NPP instance, const char* url, const char* window, uint32 len, const char* buf, NPBool file )
{
- UINT32 nInstance = pConnector->GetNPPID( instance );
+ sal_uInt32 nInstance = pConnector->GetNPPID( instance );
if( nInstance == PluginConnector::UnknownNPPID )
return NPERR_GENERIC_ERROR;
@@ -262,29 +262,29 @@ static NPError l_NPN_RequestRead( NPStream* stream, NPByteRange* rangeList )
medDebug( 1, "pluginapp: NPN_RequestRead\n" );
NPByteRange* pRange = rangeList;
- UINT32 nRanges = 0;
+ sal_uInt32 nRanges = 0;
while( pRange )
{
nRanges++;
pRange = pRange->next;
}
- UINT32* pArray = new UINT32[ 2 * nRanges ];
+ sal_uInt32* pArray = new sal_uInt32[ 2 * nRanges ];
pRange = rangeList;
- UINT32 n = 0;
+ sal_uInt32 n = 0;
while( pRange )
{
- pArray[ 2*n ] = (UINT32)pRange->offset;
- pArray[ 2*n + 1] = (UINT32)pRange->length;
+ pArray[ 2*n ] = (sal_uInt32)pRange->offset;
+ pArray[ 2*n + 1] = (sal_uInt32)pRange->length;
n++;
pRange = pRange->next;
}
- UINT32 nFileID = pConnector->GetStreamID( stream );
+ sal_uInt32 nFileID = pConnector->GetStreamID( stream );
MediatorMessage* pMes = pConnector->
Transact( eNPN_RequestRead,
&nFileID, sizeof( nFileID ),
&nRanges, sizeof( nRanges ),
- pArray, sizeof( UINT32 ) * 2 * nRanges,
+ pArray, sizeof( sal_uInt32 ) * 2 * nRanges,
NULL );
if( ! pMes )
@@ -298,7 +298,7 @@ static NPError l_NPN_RequestRead( NPStream* stream, NPByteRange* rangeList )
static void l_NPN_Status( NPP instance, const char* message )
{
- UINT32 nInstance = pConnector->GetNPPID( instance );
+ sal_uInt32 nInstance = pConnector->GetNPPID( instance );
if( nInstance == PluginConnector::UnknownNPPID )
return;
@@ -312,7 +312,7 @@ static const char* l_NPN_UserAgent( NPP instance )
{
static char* pAgent = NULL;
- UINT32 nInstance = pConnector->GetNPPID( instance );
+ sal_uInt32 nInstance = pConnector->GetNPPID( instance );
if( nInstance == PluginConnector::UnknownNPPID )
{
if( instance )
@@ -342,10 +342,10 @@ static const char* l_NPN_UserAgent( NPP instance )
static int32 l_NPN_Write( NPP instance, NPStream* stream, int32 len, void* buffer )
{
- UINT32 nFileID = pConnector->GetStreamID( stream );
+ sal_uInt32 nFileID = pConnector->GetStreamID( stream );
if( nFileID == PluginConnector::UnknownStreamID )
return NPERR_GENERIC_ERROR;
- UINT32 nInstance = pConnector->GetNPPID( instance );
+ sal_uInt32 nInstance = pConnector->GetNPPID( instance );
if( nInstance == PluginConnector::UnknownNPPID )
return NPERR_GENERIC_ERROR;
@@ -360,7 +360,7 @@ static int32 l_NPN_Write( NPP instance, NPStream* stream, int32 len, void* buffe
if( ! pMes )
return 0;
- INT32 nRet = pMes->GetUINT32();
+ sal_Int32 nRet = pMes->GetUINT32();
return nRet;
}
@@ -518,7 +518,7 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
{
MediatorMessage* pMessage;
CommandAtoms nCommand;
- while( (pMessage = GetNextMessage( FALSE )) )
+ while( (pMessage = GetNextMessage( sal_False )) )
{
nCommand = (CommandAtoms)pMessage->GetUINT32();
medDebug( 1, "pluginapp: %s\n", GetCommandName( nCommand ) );
@@ -526,9 +526,9 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
{
case eNPP_DestroyStream:
{
- UINT32 nInstance = pMessage->GetUINT32();
+ sal_uInt32 nInstance = pMessage->GetUINT32();
NPP instance = m_aInstances[ nInstance ]->instance;
- UINT32 nFileID = pMessage->GetUINT32();
+ sal_uInt32 nFileID = pMessage->GetUINT32();
NPStream* pStream = m_aNPWrapStreams[ nFileID ];
NPError aReason = GetNPError( pMessage );
m_aNPWrapStreams.erase( m_aNPWrapStreams.begin() + nFileID );
@@ -544,7 +544,7 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
break;
case eNPP_Destroy:
{
- UINT32 nInstance = pMessage->GetUINT32();
+ sal_uInt32 nInstance = pMessage->GetUINT32();
ConnectorInstance* pInst= m_aInstances[ nInstance ];
// some plugin rely on old netscapes behaviour
@@ -563,7 +563,7 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
case eNPP_DestroyPhase2:
{
// now really destroy the instance
- UINT32 nInstance = pMessage->GetUINT32();
+ sal_uInt32 nInstance = pMessage->GetUINT32();
ConnectorInstance* pInst= m_aInstances[ nInstance ];
NPP instance = pInst->instance;
NPSavedData* pSave = NULL;
@@ -598,7 +598,7 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
break;
case eNPP_NewStream:
{
- UINT32 nInstance = pMessage->GetUINT32();
+ sal_uInt32 nInstance = pMessage->GetUINT32();
NPP instance = m_aInstances[ nInstance ]->instance;
char* pType = pMessage->GetString();
NPStream* pStream = new NPStream;
@@ -630,10 +630,10 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
int16* pArgc = (int16*)pMessage->GetBytes();
NPP instance = new NPP_t;
instance->pdata = instance->ndata = NULL;
- ULONG nArgnBytes, nArgvBytes;
+ sal_uLong nArgnBytes, nArgvBytes;
char* pArgn = (char*)pMessage->GetBytes( nArgnBytes );
char* pArgv = (char*)pMessage->GetBytes( nArgvBytes );
- ULONG nSaveBytes;
+ sal_uLong nSaveBytes;
char* pSavedData = (char*)pMessage->GetBytes( nSaveBytes );
ConnectorInstance* pInst =
new ConnectorInstance( instance, pType,
@@ -646,7 +646,7 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
aRet = aPluginFuncs.newp( pInst->pMimeType, instance, *pMode, *pArgc,
pInst->nArg ? pInst->argn : NULL,
pInst->nArg ? pInst->argv : NULL,
- ( nSaveBytes == 4 && *(UINT32*)pSavedData == 0 ) ?
+ ( nSaveBytes == 4 && *(sal_uInt32*)pSavedData == 0 ) ?
&(pInst->aData) : NULL );
medDebug( 1, "pluginapp: NPP_New( %s, %p, %d, %d, %p, %p, %p ) returns %d\n",
pInst->pMimeType,
@@ -682,7 +682,7 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
break;
case eNPP_SetWindow:
{
- UINT32 nInstance = pMessage->GetUINT32();
+ sal_uInt32 nInstance = pMessage->GetUINT32();
ConnectorInstance* pInst= m_aInstances[ nInstance ];
NPWindow* pWindow = (NPWindow*)pMessage->GetBytes();
@@ -782,9 +782,9 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
break;
case eNPP_StreamAsFile:
{
- UINT32 nInstance = pMessage->GetUINT32();
+ sal_uInt32 nInstance = pMessage->GetUINT32();
NPP instance = m_aInstances[ nInstance ]->instance;
- UINT32 nFileID = pMessage->GetUINT32();
+ sal_uInt32 nFileID = pMessage->GetUINT32();
NPStream* pStream = m_aNPWrapStreams[ nFileID ];
char* fname = pMessage->GetString();
medDebug( 1, "pluginapp: NPP_StreamAsFile %s\n", fname );
@@ -794,7 +794,7 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
break;
case eNPP_URLNotify:
{
- UINT32 nInstance = pMessage->GetUINT32();
+ sal_uInt32 nInstance = pMessage->GetUINT32();
NPP instance = m_aInstances[ nInstance ]->instance;
char* url = pMessage->GetString();
NPReason* pReason = (NPReason*)pMessage->GetBytes();
@@ -807,9 +807,9 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
break;
case eNPP_WriteReady:
{
- UINT32 nInstance = pMessage->GetUINT32();
+ sal_uInt32 nInstance = pMessage->GetUINT32();
NPP instance = m_aInstances[ nInstance ]->instance;
- UINT32 nFileID = pMessage->GetUINT32();
+ sal_uInt32 nFileID = pMessage->GetUINT32();
NPStream* pStream = m_aNPWrapStreams[ nFileID ];
int32 nRet = aPluginFuncs.writeready( instance, pStream );
@@ -823,12 +823,12 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
break;
case eNPP_Write:
{
- UINT32 nInstance = pMessage->GetUINT32();
+ sal_uInt32 nInstance = pMessage->GetUINT32();
NPP instance = m_aInstances[ nInstance ]->instance;
- UINT32 nFileID = pMessage->GetUINT32();
+ sal_uInt32 nFileID = pMessage->GetUINT32();
NPStream* pStream = m_aNPWrapStreams[ nFileID ];
int32 offset = pMessage->GetUINT32();
- ULONG len;
+ sal_uLong len;
char* buffer = (char*)pMessage->GetBytes( len );
int32 nRet = aPluginFuncs.write( instance, pStream, offset, len, buffer );
diff --git a/extensions/source/plugin/unx/nppapi.cxx b/extensions/source/plugin/unx/nppapi.cxx
index 1353722fdf91..add518cd54fc 100644
--- a/extensions/source/plugin/unx/nppapi.cxx
+++ b/extensions/source/plugin/unx/nppapi.cxx
@@ -99,7 +99,7 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
MediatorMessage* pMessage;
CommandAtoms nCommand;
- while( (pMessage = GetNextMessage( FALSE )) )
+ while( (pMessage = GetNextMessage( sal_False )) )
{
nCommand = (CommandAtoms)pMessage->GetUINT32();
medDebug( 1, "%s\n", GetCommandName( nCommand ) );
@@ -107,7 +107,7 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
{
case eNPN_GetURL:
{
- UINT32 nInstance = pMessage->GetUINT32();
+ sal_uInt32 nInstance = pMessage->GetUINT32();
NPP instance = m_aInstances[ nInstance ]->instance;
char* pUrl = pMessage->GetString();
char* pWindow = pMessage->GetString();
@@ -120,7 +120,7 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
break;
case eNPN_GetURLNotify:
{
- UINT32 nInstance = pMessage->GetUINT32();
+ sal_uInt32 nInstance = pMessage->GetUINT32();
NPP instance = m_aInstances[ nInstance ]->instance;
char* pUrl = pMessage->GetString();
char* pWindow = pMessage->GetString();
@@ -136,13 +136,13 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
break;
case eNPN_DestroyStream:
{
- UINT32 nInstance = pMessage->GetUINT32();
+ sal_uInt32 nInstance = pMessage->GetUINT32();
NPP instance = m_aInstances[ nInstance ]->instance;
- UINT32 nFileID = pMessage->GetUINT32();
+ sal_uInt32 nFileID = pMessage->GetUINT32();
char* pUrl = pMessage->GetString();
NPError* pReason = (NPError*)pMessage->GetBytes();
NPError aRet = NPERR_FILE_NOT_FOUND;
- if( nFileID < static_cast<UINT32>(m_aNPWrapStreams.size()) )
+ if( nFileID < static_cast<sal_uInt32>(m_aNPWrapStreams.size()) )
{
if( ! strcmp( m_aNPWrapStreams[ nFileID ]->url, pUrl ) )
{
@@ -167,7 +167,7 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
break;
case eNPN_NewStream:
{
- UINT32 nInstance = pMessage->GetUINT32();
+ sal_uInt32 nInstance = pMessage->GetUINT32();
NPP instance = m_aInstances[ nInstance ]->instance;
NPMIMEType pType = pMessage->GetString();
char* pTarget = pMessage->GetString();
@@ -178,24 +178,24 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
if( aRet != NPERR_NO_ERROR )
{
- UINT32 nDummy = 0;
+ sal_uInt32 nDummy = 0;
Respond( pMessage->m_nID,
(char*)&aRet, sizeof( aRet ),
"", 0,
- &nDummy, sizeof(UINT32),
- &nDummy, sizeof(UINT32),
+ &nDummy, sizeof(sal_uInt32),
+ &nDummy, sizeof(sal_uInt32),
NULL );
}
else
{
m_aNPWrapStreams.push_back( pStream );
- ULONG nLen = strlen( pStream->url );
+ sal_uLong nLen = strlen( pStream->url );
Respond( pMessage->m_nID,
(char*)&aRet, sizeof( aRet ),
pStream->url, nLen,
- &pStream->end, sizeof(UINT32),
- &pStream->lastmodified, sizeof(UINT32),
+ &pStream->end, sizeof(sal_uInt32),
+ &pStream->lastmodified, sizeof(sal_uInt32),
NULL );
}
@@ -205,11 +205,11 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
break;
case eNPN_PostURLNotify:
{
- UINT32 nInstance = pMessage->GetUINT32();
+ sal_uInt32 nInstance = pMessage->GetUINT32();
NPP instance = m_aInstances[ nInstance ]->instance;
char* pUrl = pMessage->GetString();
char* pTarget = pMessage->GetString();
- UINT32 nLen = pMessage->GetUINT32();
+ sal_uInt32 nLen = pMessage->GetUINT32();
char* pBuf = (char*)pMessage->GetBytes();
NPBool* pFile = (NPBool*)pMessage->GetBytes();
void** pNData = (void**)pMessage->GetBytes();
@@ -225,11 +225,11 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
break;
case eNPN_PostURL:
{
- UINT32 nInstance = pMessage->GetUINT32();
+ sal_uInt32 nInstance = pMessage->GetUINT32();
NPP instance = m_aInstances[ nInstance ]->instance;
char* pUrl = pMessage->GetString();
char* pWindow = pMessage->GetString();
- UINT32 nLen = pMessage->GetUINT32();
+ sal_uInt32 nLen = pMessage->GetUINT32();
char* pBuf = (char*)pMessage->GetBytes();
NPBool* pFile = (NPBool*)pMessage->GetBytes();
NPError aRet =
@@ -243,14 +243,14 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
break;
case eNPN_RequestRead:
{
- UINT32 nFileID = pMessage->GetUINT32();
+ sal_uInt32 nFileID = pMessage->GetUINT32();
NPStream* pStream = m_aNPWrapStreams[ nFileID ];
- UINT32 nRanges = pMessage->GetUINT32();
- UINT32* pArray = (UINT32*)pMessage->GetBytes();
+ sal_uInt32 nRanges = pMessage->GetUINT32();
+ sal_uInt32* pArray = (sal_uInt32*)pMessage->GetBytes();
// build ranges table
NPByteRange* pFirst = new NPByteRange;
NPByteRange* pRun = pFirst;
- for( UINT32 n = 0; n < nRanges; n++ )
+ for( sal_uInt32 n = 0; n < nRanges; n++ )
{
pRun->offset = pArray[ 2*n ];
pRun->length = pArray[ 2*n+1 ];
@@ -270,7 +270,7 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
break;
case eNPN_Status:
{
- UINT32 nInstance = pMessage->GetUINT32();
+ sal_uInt32 nInstance = pMessage->GetUINT32();
NPP instance = m_aInstances[ nInstance ]->instance;
char* pString = pMessage->GetString();
NPN_Status( instance, pString );
@@ -291,13 +291,13 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
break;
case eNPN_Write:
{
- UINT32 nInstance = pMessage->GetUINT32();
+ sal_uInt32 nInstance = pMessage->GetUINT32();
NPP instance = m_aInstances[ nInstance ]->instance;
- UINT32 nFileID = pMessage->GetUINT32();
+ sal_uInt32 nFileID = pMessage->GetUINT32();
NPStream* pStream = m_aNPWrapStreams[ nFileID ];
- INT32 nLen = pMessage->GetUINT32();
+ sal_Int32 nLen = pMessage->GetUINT32();
void* pBuffer = pMessage->GetBytes();
- INT32 nRet = NPN_Write( instance, pStream, nLen, pBuffer );
+ sal_Int32 nRet = NPN_Write( instance, pStream, nLen, pBuffer );
Respond( pMessage->m_nID,
(char*)&nRet, sizeof( nRet ),
NULL );
@@ -307,7 +307,7 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
break;
case eNPN_UserAgent:
{
- UINT32 nInstance = pMessage->GetUINT32();
+ sal_uInt32 nInstance = pMessage->GetUINT32();
NPP instance = m_aInstances[ nInstance ]->instance;
const char* pAnswer = NPN_UserAgent( instance );
Respond( pMessage->m_nID,
@@ -325,7 +325,7 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
}
#define GET_INSTANCE() \
- UINT32 nInstance; \
+ sal_uInt32 nInstance; \
nInstance = GetNPPID( instance );
#define GET_INSTANCE_RET( err ) \
@@ -355,9 +355,9 @@ NPError UnxPluginComm::NPP_Destroy( NPP instance, NPSavedData** save )
return NPERR_GENERIC_ERROR;
aRet = GetNPError( pMes );
- ULONG nSaveBytes;
+ sal_uLong nSaveBytes;
void* pSaveData = pMes->GetBytes( nSaveBytes );
- if( nSaveBytes == 4 && *(UINT32*)pSaveData == 0 )
+ if( nSaveBytes == 4 && *(sal_uInt32*)pSaveData == 0 )
*save = NULL;
else
{
@@ -374,7 +374,7 @@ NPError UnxPluginComm::NPP_DestroyStream( NPP instance, NPStream* stream, NPErro
{
NPError aRet = NPERR_GENERIC_ERROR;
GET_INSTANCE_RET( aRet );
- UINT32 nFileID = GetStreamID( stream );
+ sal_uInt32 nFileID = GetStreamID( stream );
if( nFileID == PluginConnector::UnknownStreamID )
return NPERR_GENERIC_ERROR;
@@ -531,7 +531,7 @@ void UnxPluginComm::NPP_Shutdown()
void UnxPluginComm::NPP_StreamAsFile( NPP instance, NPStream* stream, const char* fname )
{
GET_INSTANCE();
- UINT32 nFileID = GetStreamID( stream );
+ sal_uInt32 nFileID = GetStreamID( stream );
if( nFileID == PluginConnector::UnknownStreamID )
return;
@@ -557,7 +557,7 @@ void UnxPluginComm::NPP_URLNotify( NPP instance, const char* url, NPReason reaso
int32 UnxPluginComm::NPP_Write( NPP instance, NPStream* stream, int32 offset, int32 len, void* buffer )
{
GET_INSTANCE_RET( -1 );
- UINT32 nFileID = GetStreamID( stream );
+ sal_uInt32 nFileID = GetStreamID( stream );
if( nFileID == PluginConnector::UnknownStreamID )
return -1;
@@ -580,7 +580,7 @@ int32 UnxPluginComm::NPP_Write( NPP instance, NPStream* stream, int32 offset, in
int32 UnxPluginComm::NPP_WriteReady( NPP instance, NPStream* stream )
{
GET_INSTANCE_RET( -1 );
- UINT32 nFileID = GetStreamID( stream );
+ sal_uInt32 nFileID = GetStreamID( stream );
if( nFileID == PluginConnector::UnknownStreamID )
return -1;
diff --git a/extensions/source/plugin/unx/npwrap.cxx b/extensions/source/plugin/unx/npwrap.cxx
index 7124972d8578..32daa95d512e 100644
--- a/extensions/source/plugin/unx/npwrap.cxx
+++ b/extensions/source/plugin/unx/npwrap.cxx
@@ -233,7 +233,7 @@ static void signal_handler( int nSig )
static gboolean noClosure( gpointer )
{
- return TRUE;
+ return sal_True;
}
// Xt events
@@ -252,7 +252,7 @@ static gboolean checkXtEvent( GSource* )
static gboolean dispatchXtEvent( GSource*, GSourceFunc, gpointer )
{
XtAppProcessEvent( app_context, XtIMAll );
- return TRUE;
+ return sal_True;
}
static GSourceFuncs aXtEventFuncs =
@@ -273,7 +273,7 @@ static gboolean pollXtTimerCallback(gpointer)
break;
XtAppProcessEvent(app_context, XtIMAll & ~XtIMXEvent);
}
- return TRUE;
+ return sal_True;
}
static gboolean prepareWakeupEvent( GSource*, gint* )
@@ -308,7 +308,7 @@ static gboolean dispatchWakeupEvent( GSource*, GSourceFunc, gpointer )
pConnector = NULL;
}
- return TRUE;
+ return sal_True;
}
static GSourceFuncs aWakeupEventFuncs = {
@@ -418,7 +418,7 @@ int main( int argc, char **argv)
}
g_source_set_priority( pXTSource, GDK_PRIORITY_EVENTS );
- g_source_set_can_recurse( pXTSource, TRUE );
+ g_source_set_can_recurse( pXTSource, sal_True );
g_source_attach( pXTSource, NULL );
aXtPollDesc.fd = ConnectionNumber( pXtAppDisplay );
aXtPollDesc.events = G_IO_IN;
@@ -480,7 +480,7 @@ int main( int argc, char **argv)
do
{
#ifdef ENABLE_GTK
- g_main_context_iteration( NULL, TRUE );
+ g_main_context_iteration( NULL, sal_True );
#else
XtAppProcessEvent( app_context, XtIMAll );
#endif
diff --git a/extensions/source/plugin/unx/plugcon.cxx b/extensions/source/plugin/unx/plugcon.cxx
index 607ae05d9877..713154d87300 100644
--- a/extensions/source/plugin/unx/plugcon.cxx
+++ b/extensions/source/plugin/unx/plugcon.cxx
@@ -40,22 +40,22 @@
#include <cstdarg>
#include <vector>
-UINT32 PluginConnector::GetStreamID( NPStream* pStream )
+sal_uInt32 PluginConnector::GetStreamID( NPStream* pStream )
{
size_t nLen = m_aNPWrapStreams.size();
for( size_t i = 0; i < nLen; i++ )
if( m_aNPWrapStreams[ i ] == pStream )
- return static_cast<UINT32>(i);
+ return static_cast<sal_uInt32>(i);
medDebug( 1, "Error: NPStream has no ID\n" );
return UnknownStreamID;
}
-UINT32 PluginConnector::GetNPPID( NPP instance )
+sal_uInt32 PluginConnector::GetNPPID( NPP instance )
{
size_t nLen = m_aInstances.size();
for( size_t i=0; i <nLen; i++ )
if( m_aInstances[ i ]->instance == instance )
- return static_cast<UINT32>(i);
+ return static_cast<sal_uInt32>(i);
medDebug( 1, "Error: NPP has no ID\n" );
return UnknownNPPID;
@@ -73,37 +73,37 @@ ConnectorInstance* PluginConnector::getInstance( NPP instance )
return NULL;
}
-ConnectorInstance* PluginConnector::getInstanceById( UINT32 nInstanceID )
+ConnectorInstance* PluginConnector::getInstanceById( sal_uInt32 nInstanceID )
{
- return nInstanceID < static_cast<UINT32>(m_aInstances.size()) ? m_aInstances[ nInstanceID ] : NULL;
+ return nInstanceID < static_cast<sal_uInt32>(m_aInstances.size()) ? m_aInstances[ nInstanceID ] : NULL;
}
struct PtrStruct
{
char* pData;
- ULONG nBytes;
+ sal_uLong nBytes;
- PtrStruct( char* i_pData, ULONG i_nBytes )
+ PtrStruct( char* i_pData, sal_uLong i_nBytes )
: pData( i_pData ), nBytes( i_nBytes ) {}
};
-ULONG PluginConnector::FillBuffer( char*& rpBuffer,
+sal_uLong PluginConnector::FillBuffer( char*& rpBuffer,
const char* pFunction,
- ULONG nFunctionLen,
+ sal_uLong nFunctionLen,
va_list ap )
{
std::vector< PtrStruct > aList;
aList.reserve( 5 );
- ULONG nDataSize = nFunctionLen + sizeof( ULONG );
+ sal_uLong nDataSize = nFunctionLen + sizeof( sal_uLong );
char* pNext;
do {
pNext = va_arg( ap, char* );
if( pNext )
{
- aList.push_back( PtrStruct( pNext, va_arg( ap, ULONG ) ) );
- nDataSize += aList.back().nBytes + sizeof(ULONG);
+ aList.push_back( PtrStruct( pNext, va_arg( ap, sal_uLong ) ) );
+ nDataSize += aList.back().nBytes + sizeof(sal_uLong);
}
} while( pNext );
@@ -116,8 +116,8 @@ ULONG PluginConnector::FillBuffer( char*& rpBuffer,
for( std::vector<PtrStruct>::const_iterator it = aList.begin(); it != aList.end(); ++it )
{
- memcpy( pRun, &it->nBytes, sizeof( ULONG ) );
- pRun += sizeof( ULONG );
+ memcpy( pRun, &it->nBytes, sizeof( sal_uLong ) );
+ pRun += sizeof( sal_uLong );
memcpy( pRun, it->pData, it->nBytes );
pRun += it->nBytes;
}
@@ -125,53 +125,53 @@ ULONG PluginConnector::FillBuffer( char*& rpBuffer,
}
MediatorMessage* PluginConnector::Transact( const char* pFunction,
- ULONG nFunctionLen, ... )
+ sal_uLong nFunctionLen, ... )
{
va_list ap;
char* pBuffer;
va_start( ap, nFunctionLen );
- ULONG nSize = FillBuffer( pBuffer, pFunction, nFunctionLen, ap );
+ sal_uLong nSize = FillBuffer( pBuffer, pFunction, nFunctionLen, ap );
va_end( ap );
return TransactMessage( nSize, pBuffer );
}
-MediatorMessage* PluginConnector::Transact( UINT32 nFunction, ... )
+MediatorMessage* PluginConnector::Transact( sal_uInt32 nFunction, ... )
{
va_list ap;
char* pBuffer;
va_start( ap, nFunction );
- ULONG nSize = FillBuffer( pBuffer, (char*)&nFunction, sizeof( nFunction ), ap );
+ sal_uLong nSize = FillBuffer( pBuffer, (char*)&nFunction, sizeof( nFunction ), ap );
va_end( ap );
return TransactMessage( nSize, pBuffer );
}
-ULONG PluginConnector::Send( UINT32 nFunction, ... )
+sal_uLong PluginConnector::Send( sal_uInt32 nFunction, ... )
{
va_list ap;
char* pBuffer;
va_start( ap, nFunction );
- ULONG nSize = FillBuffer( pBuffer, (char*)&nFunction, sizeof( nFunction ), ap );
+ sal_uLong nSize = FillBuffer( pBuffer, (char*)&nFunction, sizeof( nFunction ), ap );
va_end( ap );
return SendMessage( nSize, pBuffer );
}
-void PluginConnector::Respond( ULONG nID,
+void PluginConnector::Respond( sal_uLong nID,
char* pFunction,
- ULONG nFunctionLen, ... )
+ sal_uLong nFunctionLen, ... )
{
va_list ap;
char* pBuffer;
va_start( ap, nFunctionLen );
- ULONG nSize = FillBuffer( pBuffer, pFunction, nFunctionLen, ap );
+ sal_uLong nSize = FillBuffer( pBuffer, pFunction, nFunctionLen, ap );
va_end( ap );
SendMessage( nSize, pBuffer, nID | ( 1 << 24 ) );
}
-MediatorMessage* PluginConnector::WaitForAnswer( ULONG nMessageID )
+MediatorMessage* PluginConnector::WaitForAnswer( sal_uLong nMessageID )
{
if( ! m_bValid )
return NULL;
@@ -184,7 +184,7 @@ MediatorMessage* PluginConnector::WaitForAnswer( ULONG nMessageID )
for( size_t i = 0; i < m_aMessageQueue.size(); i++ )
{
MediatorMessage* pMessage = m_aMessageQueue[ i ];
- ULONG nID = pMessage->m_nID;
+ sal_uLong nID = pMessage->m_nID;
if( ( nID & 0xff000000 ) &&
( ( nID & 0x00ffffff ) == nMessageID ) )
{
@@ -201,9 +201,9 @@ MediatorMessage* PluginConnector::WaitForAnswer( ULONG nMessageID )
}
ConnectorInstance::ConnectorInstance( NPP inst, char* type,
- int args, char* pargnbuf, ULONG nargnbytes,
- char* pargvbuf, ULONG nargvbytes,
- char* savedata, ULONG savebytes ) :
+ int args, char* pargnbuf, sal_uLong nargnbytes,
+ char* pargvbuf, sal_uLong nargvbytes,
+ char* savedata, sal_uLong savebytes ) :
instance( inst ),
pShell( NULL ),
pWidget( NULL ),
@@ -227,18 +227,18 @@ ConnectorInstance::ConnectorInstance( NPP inst, char* type,
for( i = 0; i < nArg; i++ )
{
argn[i] = pRun;
- while( *pRun != 0 && (ULONG)(pRun - pArgnBuf) < nargnbytes )
+ while( *pRun != 0 && (sal_uLong)(pRun - pArgnBuf) < nargnbytes )
pRun++;
- if( (ULONG)(pRun - pArgnBuf) < nargnbytes )
+ if( (sal_uLong)(pRun - pArgnBuf) < nargnbytes )
pRun++;
}
pRun = pArgvBuf;
for( i = 0; i < nArg; i++ )
{
argv[i] = pRun;
- while( *pRun != 0 && (ULONG)(pRun - pArgvBuf) < nargvbytes )
+ while( *pRun != 0 && (sal_uLong)(pRun - pArgvBuf) < nargvbytes )
pRun++;
- if( (ULONG)(pRun - pArgvBuf) < nargvbytes )
+ if( (sal_uLong)(pRun - pArgvBuf) < nargvbytes )
pRun++;
}
}
diff --git a/extensions/source/plugin/unx/sysplug.cxx b/extensions/source/plugin/unx/sysplug.cxx
index dc7be6799ae3..dac8a24a52c3 100644
--- a/extensions/source/plugin/unx/sysplug.cxx
+++ b/extensions/source/plugin/unx/sysplug.cxx
@@ -99,7 +99,7 @@ UnxPluginComm::UnxPluginComm(
}
else
{
- MediatorMessage* pMessage = GetNextMessage( TRUE );
+ MediatorMessage* pMessage = GetNextMessage( sal_True );
Respond( pMessage->m_nID,
const_cast<char*>("init ack"),8,
NULL );
diff --git a/extensions/source/plugin/unx/unxmgr.cxx b/extensions/source/plugin/unx/unxmgr.cxx
index 3ec32edd795b..742cb26f3498 100644
--- a/extensions/source/plugin/unx/unxmgr.cxx
+++ b/extensions/source/plugin/unx/unxmgr.cxx
@@ -243,7 +243,7 @@ static void CheckPluginRegistryFiles( const rtl::OString& rPath, list< PluginDes
Sequence<PluginDescription> XPluginManager_Impl::impl_getPluginDescriptions() throw()
{
static Sequence<PluginDescription> aDescriptions;
- static BOOL bHavePlugins = FALSE;
+ static sal_Bool bHavePlugins = sal_False;
if( ! bHavePlugins )
{
rtl_TextEncoding aEncoding = osl_getThreadTextEncoding();
@@ -321,7 +321,7 @@ Sequence<PluginDescription> XPluginManager_Impl::impl_getPluginDescriptions() th
delete *iter;
}
aPlugins.clear();
- bHavePlugins = TRUE;
+ bHavePlugins = sal_True;
}
return aDescriptions;
}
diff --git a/extensions/source/plugin/util/makefile.mk b/extensions/source/plugin/util/makefile.mk
index cb5b751c7404..7b7d047a1779 100644
--- a/extensions/source/plugin/util/makefile.mk
+++ b/extensions/source/plugin/util/makefile.mk
@@ -99,3 +99,11 @@ SHL1STDLIBS+=$(SHL1OWNLIBS)
+
+ALLTAR : $(MISC)/pl.component
+
+$(MISC)/pl.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+ pl.component
+ $(XSLTPROC) --nonet --stringparam uri \
+ '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+ $(SOLARENV)/bin/createcomponent.xslt pl.component
diff --git a/extensions/source/plugin/util/pl.component b/extensions/source/plugin/util/pl.component
new file mode 100644
index 000000000000..4a9d98f7dc7b
--- /dev/null
+++ b/extensions/source/plugin/util/pl.component
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+ xmlns="http://openoffice.org/2010/uno-components">
+ <implementation name="com.sun.star.extensions.PluginManager">
+ <service name="com.sun.star.plugin.PluginManager"/>
+ </implementation>
+ <implementation name="com.sun.star.extensions.PluginModel">
+ <service name="com.sun.star.plugin.PluginModel"/>
+ </implementation>
+</component>
diff --git a/extensions/source/preload/makefile.mk b/extensions/source/preload/makefile.mk
index fb11a2bfd32c..8bd6226619bc 100644
--- a/extensions/source/preload/makefile.mk
+++ b/extensions/source/preload/makefile.mk
@@ -83,3 +83,11 @@ DEF1NAME= $(SHL1TARGET)
.INCLUDE : target.mk
+
+ALLTAR : $(MISC)/preload.component
+
+$(MISC)/preload.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+ preload.component
+ $(XSLTPROC) --nonet --stringparam uri \
+ '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+ $(SOLARENV)/bin/createcomponent.xslt preload.component
diff --git a/extensions/source/preload/oemwiz.cxx b/extensions/source/preload/oemwiz.cxx
index e50a7426918f..fe5704934df4 100644
--- a/extensions/source/preload/oemwiz.cxx
+++ b/extensions/source/preload/oemwiz.cxx
@@ -116,7 +116,7 @@ namespace preload
{
FreeResource();
aDlgTitle = GetText();
- aPrevPB.Enable(FALSE);
+ aPrevPB.Enable(sal_False);
aNextST = aNextPB.GetText();
aPrevPB.SetClickHdl(LINK(this, OEMPreloadDialog, NextPrevPageHdl));
aNextPB.SetClickHdl(LINK(this, OEMPreloadDialog, NextPrevPageHdl));
@@ -164,7 +164,7 @@ namespace preload
{
case OEM_WELCOME:
aNextPB.SetText(aNextST);
- aNextPB.Enable(TRUE);
+ aNextPB.Enable(sal_True);
break;
case OEM_LICENSE:
sTitle += aLicense;
@@ -192,7 +192,7 @@ namespace preload
sFileName = aURLObject.GetMainURL(INetURLObject::DECODE_TO_IURI);
sFileName += rFileName;
- SfxMedium aMedium( sFileName,STREAM_READ, TRUE );
+ SfxMedium aMedium( sFileName,STREAM_READ, sal_True );
SvStream* pInStream = aMedium.GetInStream();
if( !pInStream )
return sal_False;
@@ -235,7 +235,7 @@ namespace preload
aArrow(this, ModuleRes(IMG_ARROW)),
aStrAccept( ModuleRes(LICENCE_ACCEPT) ),
aStrNotAccept( ModuleRes(LICENCE_NOTACCEPT) ),
- bEndReached(FALSE),
+ bEndReached(sal_False),
pPreloadDialog(pParent)
{
FreeResource();
@@ -297,7 +297,7 @@ namespace preload
//------------------------------------------------------------------------
IMPL_LINK( OEMLicenseTabPage, EndReachedHdl, LicenceView *, EMPTYARG )
{
- bEndReached = TRUE;
+ bEndReached = sal_True;
EnableControls();
aCBAccept.GrabFocus();
@@ -318,7 +318,7 @@ namespace preload
{
if( !bEndReached &&
( aLicenseML.IsEndReached() || !aLicenseML.GetText().Len() ) )
- bEndReached = TRUE;
+ bEndReached = sal_True;
if ( bEndReached )
{
@@ -344,7 +344,7 @@ namespace preload
if ( ! pNext->IsEnabled() )
{
pPreloadDialog->SetCancelString( aOldCancelText );
- pNext->Enable(TRUE);
+ pNext->Enable(sal_True);
}
}
else
@@ -353,7 +353,7 @@ namespace preload
if ( pNext->IsEnabled() )
{
pPreloadDialog->SetCancelString( aStrNotAccept );
- pNext->Enable(FALSE);
+ pNext->Enable(sal_False);
}
}
}
@@ -390,20 +390,20 @@ namespace preload
}
//------------------------------------------------------------------------
- BOOL LicenceView::IsEndReached() const
+ sal_Bool LicenceView::IsEndReached() const
{
- BOOL bEndReached;
+ sal_Bool bEndReached;
ExtTextView* pView = GetTextView();
ExtTextEngine* pEdit = GetTextEngine();
- ULONG nHeight = pEdit->GetTextHeight();
+ sal_uLong nHeight = pEdit->GetTextHeight();
Size aOutSize = pView->GetWindow()->GetOutputSizePixel();
Point aBottom( 0, aOutSize.Height() );
- if ( (ULONG) pView->GetDocPos( aBottom ).Y() >= nHeight - 1 )
- bEndReached = TRUE;
+ if ( (sal_uLong) pView->GetDocPos( aBottom ).Y() >= nHeight - 1 )
+ bEndReached = sal_True;
else
- bEndReached = FALSE;
+ bEndReached = sal_False;
return bEndReached;
}
@@ -413,8 +413,8 @@ namespace preload
{
if ( rHint.IsA( TYPE(TextHint) ) )
{
- BOOL bLastVal = EndReached();
- ULONG nId = ((const TextHint&)rHint).GetId();
+ sal_Bool bLastVal = EndReached();
+ sal_uLong nId = ((const TextHint&)rHint).GetId();
if ( nId == TEXT_HINT_PARAINSERTED )
{
diff --git a/extensions/source/preload/oemwiz.hxx b/extensions/source/preload/oemwiz.hxx
index e7b0c36db46b..b051eab9614f 100644
--- a/extensions/source/preload/oemwiz.hxx
+++ b/extensions/source/preload/oemwiz.hxx
@@ -91,7 +91,7 @@ namespace preload
};
class LicenceView : public MultiLineEdit, public SfxListener
{
- BOOL mbEndReached;
+ sal_Bool mbEndReached;
Link maEndReachedHdl;
Link maScrolledHdl;
@@ -101,9 +101,9 @@ namespace preload
void ScrollDown( ScrollType eScroll );
- BOOL IsEndReached() const;
- BOOL EndReached() const { return mbEndReached; }
- void SetEndReached( BOOL bEnd ) { mbEndReached = bEnd; }
+ sal_Bool IsEndReached() const;
+ sal_Bool EndReached() const { return mbEndReached; }
+ void SetEndReached( sal_Bool bEnd ) { mbEndReached = bEnd; }
void SetEndReachedHdl( const Link& rHdl ) { maEndReachedHdl = rHdl; }
const Link& GetAutocompleteHdl() const { return maEndReachedHdl; }
@@ -129,7 +129,7 @@ namespace preload
String aStrAccept;
String aStrNotAccept;
String aOldCancelText;
- BOOL bEndReached;
+ sal_Bool bEndReached;
OEMPreloadDialog* pPreloadDialog;
diff --git a/extensions/source/preload/preload.component b/extensions/source/preload/preload.component
new file mode 100644
index 000000000000..56a8a0d7a0cf
--- /dev/null
+++ b/extensions/source/preload/preload.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+ xmlns="http://openoffice.org/2010/uno-components">
+ <implementation name="org.openoffice.comp.preload.OEMPreloadWizard">
+ <service name="org.openoffice.comp.preload.OEMPreloadWizard"/>
+ </implementation>
+</component>
diff --git a/extensions/source/preload/preload.src b/extensions/source/preload/preload.src
index 59805b768adf..2570d5ee81f0 100644
--- a/extensions/source/preload/preload.src
+++ b/extensions/source/preload/preload.src
@@ -31,6 +31,7 @@
ModalDialog RID_DLG_OEMWIZARD
{
+ HelpID = "extensions:ModalDialog:RID_DLG_OEMWIZARD";
Text = "%PRODUCTNAME %PRODUCTVERSION";
OutputSize = TRUE ;
@@ -40,11 +41,13 @@ ModalDialog RID_DLG_OEMWIZARD
Hide = TRUE;
PushButton PB_PREV
{
+ HelpID = "extensions:PushButton:RID_DLG_OEMWIZARD:PB_PREV";
Size = MAP_APPFONT ( 50 , 14 ) ;
Text [ en-US ] = "<< Back" ;
};
PushButton PB_NEXT
{
+ HelpID = "extensions:PushButton:RID_DLG_OEMWIZARD:PB_NEXT";
Size = MAP_APPFONT ( 50 , 14 ) ;
Text [ en-US ] = "Next >>" ;
};
@@ -72,6 +75,7 @@ ModalDialog RID_DLG_OEMWIZARD
};
TabPage RID_TP_WELCOME
{
+ HelpID = "extensions:TabPage:RID_TP_WELCOME";
// HelpId = ;
OutputSize = TRUE ;
SVLook = TRUE ;
@@ -130,6 +134,7 @@ TabPage RID_TP_WELCOME
TabPage RID_TP_LICENSE
{
+ HelpID = "extensions:TabPage:RID_TP_LICENSE";
OutputSize = TRUE ;
SVLook = TRUE ;
Hide = TRUE ;
@@ -138,6 +143,7 @@ TabPage RID_TP_LICENSE
MultiLineEdit ML_LICENSE
{
+ HelpID = "extensions:MultiLineEdit:RID_TP_LICENSE:ML_LICENSE";
PosSize = MAP_APPFONT ( LICENSE_COL_1 , LICENSE_ROW_1 , LICENSE_WIDTH , LICENCE_HEIGHT ) ;
Border = TRUE ;
VScroll = TRUE ;
@@ -185,6 +191,7 @@ TabPage RID_TP_LICENSE
PushButton PB_PAGEDOWN
{
+ HelpID = "extensions:PushButton:RID_TP_LICENSE:PB_PAGEDOWN";
TabStop = TRUE ;
Pos = MAP_APPFONT ( LICENSE_COL_4 , LICENSE_ROW_3 ) ;
Size = MAP_APPFONT ( PD_WIDTH , PB_HEIGHT ) ;
@@ -209,6 +216,7 @@ TabPage RID_TP_LICENSE
CheckBox CB_ACCEPT
{
+ HelpID = "extensions:CheckBox:RID_TP_LICENSE:CB_ACCEPT";
TabStop = TRUE ;
Pos = MAP_APPFONT ( LICENSE_COL_3, LICENSE_ROW_5 ) ;
Size = MAP_APPFONT ( COL3_WIDTH, FT_HEIGHT ) ;
diff --git a/extensions/source/preload/services.cxx b/extensions/source/preload/services.cxx
index 96305c2f8ef5..5550786b6493 100644
--- a/extensions/source/preload/services.cxx
+++ b/extensions/source/preload/services.cxx
@@ -67,27 +67,6 @@ component_getImplementationEnvironment(
}
//---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
- void* pServiceManager,
- void* pRegistryKey
- )
-{
- if (pRegistryKey)
- try
- {
- return ::preload::OModule::writeComponentInfos(
- static_cast<XMultiServiceFactory*>(pServiceManager),
- static_cast<XRegistryKey*>(pRegistryKey));
- }
- catch (InvalidRegistryException& )
- {
- OSL_FAIL("preload::component_writeInfo: could not create a registry key (InvalidRegistryException) !");
- }
-
- return sal_False;
-}
-
-//---------------------------------------------------------------------------------------
extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
const sal_Char* pImplementationName,
void* pServiceManager,
diff --git a/extensions/source/propctrlr/browserline.cxx b/extensions/source/propctrlr/browserline.cxx
index 2a9ea8c493e8..e337bc6fe146 100644
--- a/extensions/source/propctrlr/browserline.cxx
+++ b/extensions/source/propctrlr/browserline.cxx
@@ -106,20 +106,20 @@ namespace pcr
}
//------------------------------------------------------------------
- void OBrowserLine::SetComponentHelpIds( const SmartId& _rHelpId, sal_uInt32 _bPrimaryButtonId, sal_uInt32 _nSecondaryButtonId )
+ void OBrowserLine::SetComponentHelpIds( const rtl::OString& _rHelpId, const rtl::OString& _sPrimaryButtonId, const rtl::OString& _sSecondaryButtonId )
{
if ( m_pControlWindow )
- m_pControlWindow->SetSmartHelpId( _rHelpId );
+ m_pControlWindow->SetHelpId( _rHelpId );
if ( m_pBrowseButton )
{
- m_pBrowseButton->SetSmartHelpId( _rHelpId );
- m_pBrowseButton->SetUniqueId( _bPrimaryButtonId );
+ m_pBrowseButton->SetHelpId( _rHelpId );
+ m_pBrowseButton->SetUniqueId( _sPrimaryButtonId );
if ( m_pAdditionalBrowseButton )
{
- m_pAdditionalBrowseButton->SetSmartHelpId( _rHelpId );
- m_pAdditionalBrowseButton->SetUniqueId( _nSecondaryButtonId );
+ m_pAdditionalBrowseButton->SetHelpId( _rHelpId );
+ m_pAdditionalBrowseButton->SetUniqueId( _sSecondaryButtonId );
}
}
}
diff --git a/extensions/source/propctrlr/browserline.hxx b/extensions/source/propctrlr/browserline.hxx
index 37a6a1f6a389..0f0b2f30a81a 100644
--- a/extensions/source/propctrlr/browserline.hxx
+++ b/extensions/source/propctrlr/browserline.hxx
@@ -91,7 +91,7 @@ namespace pcr
const ::rtl::OUString&
GetEntryName() const { return m_sEntryName; }
- void SetComponentHelpIds( const SmartId& _rHelpId, sal_uInt32 _bPrimaryButtonId, sal_uInt32 _nSecondaryButtonId );
+ void SetComponentHelpIds( const rtl::OString& _rHelpId, const rtl::OString& _sPrimaryButtonId, const rtl::OString& _sSecondaryButtonId );
void SetTitle(const String& rString );
void FullFillTitleString();
diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx
index 97af90f577a7..ce558559b21f 100644
--- a/extensions/source/propctrlr/browserlistbox.cxx
+++ b/extensions/source/propctrlr/browserlistbox.cxx
@@ -1194,8 +1194,8 @@ namespace pcr
m_aOutOfDateLines.insert( nPos );
rLine.pLine->SetComponentHelpIds(
HelpIdUrl::getHelpId( _rPropertyData.HelpURL ),
- _rPropertyData.PrimaryButtonId,
- _rPropertyData.SecondaryButtonId
+ rtl::OUStringToOString( _rPropertyData.PrimaryButtonId, RTL_TEXTENCODING_UTF8 ),
+ rtl::OUStringToOString( _rPropertyData.SecondaryButtonId, RTL_TEXTENCODING_UTF8 )
);
if ( _rPropertyData.bReadOnly )
@@ -1211,9 +1211,9 @@ namespace pcr
{
Edit* pControlWindowAsEdit = dynamic_cast< Edit* >( rLine.pLine->getControlWindow() );
if ( pControlWindowAsEdit )
- pControlWindowAsEdit->SetReadOnly( TRUE );
+ pControlWindowAsEdit->SetReadOnly( sal_True );
else
- pControlWindowAsEdit->Enable( FALSE );
+ pControlWindowAsEdit->Enable( sal_False );
}
}
}
diff --git a/extensions/source/propctrlr/browserpage.cxx b/extensions/source/propctrlr/browserpage.cxx
index 1c3de21b9da8..c65e3e3936db 100644
--- a/extensions/source/propctrlr/browserpage.cxx
+++ b/extensions/source/propctrlr/browserpage.cxx
@@ -49,7 +49,7 @@ namespace pcr
,m_aListBox(this)
{
m_aListBox.SetBackground(GetBackground());
- m_aListBox.SetPaintTransparent( TRUE );
+ m_aListBox.SetPaintTransparent( sal_True );
m_aListBox.Show();
}
diff --git a/extensions/source/propctrlr/defaultforminspection.cxx b/extensions/source/propctrlr/defaultforminspection.cxx
index 1cf3c9dc86e2..c958e0175647 100644
--- a/extensions/source/propctrlr/defaultforminspection.cxx
+++ b/extensions/source/propctrlr/defaultforminspection.cxx
@@ -182,8 +182,8 @@ namespace pcr
struct
{
const sal_Char* programmaticName;
- USHORT uiNameResId;
- sal_uInt32 helpId;
+ sal_uInt16 uiNameResId;
+ const sal_Char* helpId;
} aCategories[] = {
{ "General", RID_STR_PROPPAGE_DEFAULT, HID_FM_PROPDLG_TAB_GENERAL },
{ "Data", RID_STR_PROPPAGE_DATA, HID_FM_PROPDLG_TAB_DATA },
diff --git a/extensions/source/propctrlr/eformspropertyhandler.cxx b/extensions/source/propctrlr/eformspropertyhandler.cxx
index 338eccc3262d..72fdca1ab2e0 100644
--- a/extensions/source/propctrlr/eformspropertyhandler.cxx
+++ b/extensions/source/propctrlr/eformspropertyhandler.cxx
@@ -455,12 +455,12 @@ namespace pcr
}
break;
- case PROPERTY_ID_BIND_EXPRESSION: aDescriptor.PrimaryButtonId = UID_PROP_DLG_BIND_EXPRESSION; break;
- case PROPERTY_ID_XSD_REQUIRED: aDescriptor.PrimaryButtonId = UID_PROP_DLG_XSD_REQUIRED; break;
- case PROPERTY_ID_XSD_RELEVANT: aDescriptor.PrimaryButtonId = UID_PROP_DLG_XSD_RELEVANT; break;
- case PROPERTY_ID_XSD_READONLY: aDescriptor.PrimaryButtonId = UID_PROP_DLG_XSD_READONLY; break;
- case PROPERTY_ID_XSD_CONSTRAINT: aDescriptor.PrimaryButtonId = UID_PROP_DLG_XSD_CONSTRAINT; break;
- case PROPERTY_ID_XSD_CALCULATION: aDescriptor.PrimaryButtonId = UID_PROP_DLG_XSD_CALCULATION; break;
+ case PROPERTY_ID_BIND_EXPRESSION: aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_BIND_EXPRESSION); break;
+ case PROPERTY_ID_XSD_REQUIRED: aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_XSD_REQUIRED); break;
+ case PROPERTY_ID_XSD_RELEVANT: aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_XSD_RELEVANT); break;
+ case PROPERTY_ID_XSD_READONLY: aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_XSD_READONLY); break;
+ case PROPERTY_ID_XSD_CONSTRAINT: aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_XSD_CONSTRAINT); break;
+ case PROPERTY_ID_XSD_CALCULATION: aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_XSD_CALCULATION); break;
default:
OSL_FAIL( "EFormsPropertyHandler::describePropertyLine: cannot handle this property!" );
diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx
index e4716eda777e..ca4baaca2afb 100644
--- a/extensions/source/propctrlr/eventhandler.cxx
+++ b/extensions/source/propctrlr/eventhandler.cxx
@@ -153,11 +153,11 @@ namespace pcr
//= EventDescription
//====================================================================
EventDescription::EventDescription( EventId _nId, const sal_Char* _pListenerNamespaceAscii, const sal_Char* _pListenerClassAsciiName,
- const sal_Char* _pListenerMethodAsciiName, sal_uInt16 _nDisplayNameResId, sal_Int32 _nHelpId, sal_Int32 _nUniqueBrowseId )
+ const sal_Char* _pListenerMethodAsciiName, sal_uInt16 _nDisplayNameResId, const rtl::OString& _sHelpId, const rtl::OString& _sUniqueBrowseId )
:sDisplayName( String( PcrRes( _nDisplayNameResId ) ) )
,sListenerMethodName( ::rtl::OUString::createFromAscii( _pListenerMethodAsciiName ) )
- ,nHelpId( _nHelpId )
- ,nUniqueBrowseId( _nUniqueBrowseId )
+ ,sHelpId( _sHelpId )
+ ,sUniqueBrowseId( _sUniqueBrowseId )
,nId( _nId )
{
::rtl::OUStringBuffer aQualifiedListenerClass;
@@ -881,8 +881,8 @@ namespace pcr
const EventDescription& rEvent = impl_getEventForName_throw( _rPropertyName );
aDescriptor.DisplayName = rEvent.sDisplayName;
- aDescriptor.HelpURL = HelpIdUrl::getHelpURL( rEvent.nHelpId );
- aDescriptor.PrimaryButtonId = rEvent.nUniqueBrowseId;
+ aDescriptor.HelpURL = HelpIdUrl::getHelpURL( rEvent.sHelpId );
+ aDescriptor.PrimaryButtonId = rtl::OStringToOUString(rEvent.sUniqueBrowseId, RTL_TEXTENCODING_UTF8);
aDescriptor.HasPrimaryButton = sal_True;
aDescriptor.Category = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Events" ) );
return aDescriptor;
@@ -1267,12 +1267,12 @@ namespace pcr
switch ( m_nGridColumnType )
{
case FormComponentType::COMBOBOX:
- if ( UID_BRWEVT_ACTIONPERFORMED == _rEvent.nUniqueBrowseId )
+ if ( UID_BRWEVT_ACTIONPERFORMED == _rEvent.sUniqueBrowseId )
return false;
break;
case FormComponentType::LISTBOX:
- if ( ( UID_BRWEVT_CHANGED == _rEvent.nUniqueBrowseId )
- || ( UID_BRWEVT_ACTIONPERFORMED == _rEvent.nUniqueBrowseId )
+ if ( ( UID_BRWEVT_CHANGED == _rEvent.sUniqueBrowseId )
+ || ( UID_BRWEVT_ACTIONPERFORMED == _rEvent.sUniqueBrowseId )
)
return false;
break;
diff --git a/extensions/source/propctrlr/eventhandler.hxx b/extensions/source/propctrlr/eventhandler.hxx
index 721ca8a0edac..228d3cf44634 100644
--- a/extensions/source/propctrlr/eventhandler.hxx
+++ b/extensions/source/propctrlr/eventhandler.hxx
@@ -58,14 +58,12 @@ namespace pcr
::rtl::OUString sDisplayName;
::rtl::OUString sListenerClassName;
::rtl::OUString sListenerMethodName;
- sal_Int32 nHelpId;
- sal_Int32 nUniqueBrowseId;
+ ::rtl::OString sHelpId;
+ ::rtl::OString sUniqueBrowseId;
EventId nId;
EventDescription()
- :nHelpId( 0 )
- ,nUniqueBrowseId( 0 )
- ,nId( 0 )
+ :nId( 0 )
{
}
@@ -75,8 +73,8 @@ namespace pcr
const sal_Char* _pListenerClassAsciiName,
const sal_Char* _pListenerMethodAsciiName,
sal_uInt16 _nDisplayNameResId,
- sal_Int32 _nHelpId,
- sal_Int32 _nUniqueBrowseId );
+ const rtl::OString& _sHelpId,
+ const rtl::OString& _sUniqueBrowseId );
};
typedef ::boost::unordered_map< ::rtl::OUString, EventDescription, ::rtl::OUStringHash > EventMap;
diff --git a/extensions/source/propctrlr/fontdialog.cxx b/extensions/source/propctrlr/fontdialog.cxx
index 0b2548a76bfe..e310fd77cb6b 100644
--- a/extensions/source/propctrlr/fontdialog.cxx
+++ b/extensions/source/propctrlr/fontdialog.cxx
@@ -384,7 +384,7 @@ namespace pcr
sal_Int32 nColor = rUnderlineItem.GetColor().GetColor();
Any aUnoColor;
- if (COL_AUTO != (UINT32)nColor)
+ if (COL_AUTO != (sal_uInt32)nColor)
aUnoColor <<= nColor;
lcl_pushBackPropertyValue( _out_properties, PROPERTY_TEXTLINECOLOR, aUnoColor );
@@ -429,7 +429,7 @@ namespace pcr
sal_Int32 nColor = rColorItem.GetValue().GetColor();
Any aUnoColor;
- if (COL_AUTO != (UINT32)nColor)
+ if (COL_AUTO != (sal_uInt32)nColor)
aUnoColor <<= nColor;
lcl_pushBackPropertyValue( _out_properties, PROPERTY_TEXTCOLOR, aUnoColor );
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index 9fa37ded4217..b676176bf375 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -781,7 +781,7 @@ namespace pcr
// font style
::FontWeight eWeight = VCLUnoHelper::ConvertFontWeight( aFont.Weight );
- USHORT nStyleResID = RID_STR_FONTSTYLE_REGULAR;
+ sal_uInt16 nStyleResID = RID_STR_FONTSTYLE_REGULAR;
if ( aFont.Slant == FontSlant_ITALIC )
{
if ( eWeight > WEIGHT_NORMAL )
@@ -1025,39 +1025,39 @@ namespace pcr
{
case PROPERTY_ID_DEFAULT_SELECT_SEQ:
case PROPERTY_ID_SELECTEDITEMS:
- aDescriptor.PrimaryButtonId = UID_PROP_DLG_SELECTION;
+ aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_SELECTION);
break;
case PROPERTY_ID_FILTER:
- aDescriptor.PrimaryButtonId = UID_PROP_DLG_FILTER;
+ aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_FILTER);
break;
case PROPERTY_ID_SORT:
- aDescriptor.PrimaryButtonId = UID_PROP_DLG_ORDER;
+ aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_ORDER);
break;
case PROPERTY_ID_MASTERFIELDS:
case PROPERTY_ID_DETAILFIELDS:
nControlType = PropertyControlType::StringListField;
- aDescriptor.PrimaryButtonId = UID_PROP_DLG_FORMLINKFIELDS;
+ aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_FORMLINKFIELDS);
break;
case PROPERTY_ID_COMMAND:
- aDescriptor.PrimaryButtonId = UID_PROP_DLG_SQLCOMMAND;
+ aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_SQLCOMMAND);
break;
case PROPERTY_ID_TABINDEX:
{
Reference< XControlContainer > xControlContext( impl_getContextControlContainer_nothrow() );
if ( xControlContext.is() )
- aDescriptor.PrimaryButtonId = UID_PROP_DLG_TABINDEX;
+ aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_TABINDEX);
nControlType = PropertyControlType::NumericField;
};
break;
case PROPERTY_ID_FONT:
bReadOnly = sal_True;
- aDescriptor.PrimaryButtonId = UID_PROP_DLG_FONT_TYPE;
+ aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_FONT_TYPE);
break;
case PROPERTY_ID_TARGET_URL:
@@ -1065,8 +1065,8 @@ namespace pcr
{
aDescriptor.Control = new OFileUrlControl( impl_getDefaultDialogParent_nothrow(), WB_TABSTOP | WB_BORDER );
- aDescriptor.PrimaryButtonId = ( PROPERTY_ID_TARGET_URL == nPropId )
- ? UID_PROP_DLG_ATTR_TARGET_URL : UID_PROP_DLG_IMAGE_URL;
+ aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(( PROPERTY_ID_TARGET_URL == nPropId )
+ ? UID_PROP_DLG_ATTR_TARGET_URL : UID_PROP_DLG_IMAGE_URL);
}
break;
@@ -1083,13 +1083,13 @@ namespace pcr
switch( nPropId )
{
case PROPERTY_ID_BACKGROUNDCOLOR:
- aDescriptor.PrimaryButtonId = UID_PROP_DLG_BACKGROUNDCOLOR; break;
+ aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_BACKGROUNDCOLOR); break;
case PROPERTY_ID_FILLCOLOR:
- aDescriptor.PrimaryButtonId = UID_PROP_DLG_FILLCOLOR; break;
+ aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_FILLCOLOR); break;
case PROPERTY_ID_SYMBOLCOLOR:
- aDescriptor.PrimaryButtonId = UID_PROP_DLG_SYMBOLCOLOR; break;
+ aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_SYMBOLCOLOR); break;
case PROPERTY_ID_BORDERCOLOR:
- aDescriptor.PrimaryButtonId = UID_PROP_DLG_BORDERCOLOR; break;
+ aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_BORDERCOLOR); break;
}
break;
@@ -1113,7 +1113,7 @@ namespace pcr
case PROPERTY_ID_CONTROLLABEL:
bReadOnly = sal_True;
- aDescriptor.PrimaryButtonId = UID_PROP_DLG_CONTROLLABEL;
+ aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_CONTROLLABEL);
break;
case PROPERTY_ID_FORMATKEY:
@@ -1143,7 +1143,7 @@ namespace pcr
aDescriptor.Control = pControl;
pControl->SetFormatSupplier( pSupplier );
- aDescriptor.PrimaryButtonId = UID_PROP_DLG_NUMBER_FORMAT;
+ aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_NUMBER_FORMAT);
}
else
{
@@ -1258,7 +1258,7 @@ namespace pcr
// boolean values
if ( eType == TypeClass_BOOLEAN )
{
- USHORT nResId = RID_RSC_ENUM_YESNO;
+ sal_uInt16 nResId = RID_RSC_ENUM_YESNO;
if ( ( nPropId == PROPERTY_ID_SHOW_POSITION )
|| ( nPropId == PROPERTY_ID_SHOW_NAVIGATION )
|| ( nPropId == PROPERTY_ID_SHOW_RECORDACTIONS )
@@ -1344,7 +1344,7 @@ namespace pcr
if ( nPropId == PROPERTY_ID_MAXTEXTLEN )
aMinValue.Value = -1;
- else if ( ( nPropId == PROPERTY_ID_BOUNDCOLUMN ) || ( nPropId == PROPERTY_ID_VISIBLESIZE ) )
+ else if ( nPropId == PROPERTY_ID_VISIBLESIZE )
aMinValue.Value = 1;
else
aMinValue.Value = 0;
@@ -1368,7 +1368,7 @@ namespace pcr
// DataSource
case PROPERTY_ID_DATASOURCE:
{
- aDescriptor.PrimaryButtonId = UID_PROP_DLG_ATTR_DATASOURCE;
+ aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_ATTR_DATASOURCE);
::std::vector< ::rtl::OUString > aListEntries;
@@ -1418,9 +1418,9 @@ namespace pcr
}
}
- if ( aDescriptor.PrimaryButtonId )
+ if ( aDescriptor.PrimaryButtonId.getLength() )
aDescriptor.HasPrimaryButton = sal_True;
- if ( aDescriptor.SecondaryButtonId )
+ if ( aDescriptor.SecondaryButtonId.getLength() )
aDescriptor.HasSecondaryButton = sal_True;
bool bIsDataProperty = ( nPropertyUIFlags & PROP_FLAG_DATA_PROPERTY ) != 0;
@@ -2473,7 +2473,7 @@ namespace pcr
_out_rProperty.DisplayName = m_pInfoService->getPropertyTranslation( PROPERTY_ID_COMMAND );
_out_rProperty.HelpURL = HelpIdUrl::getHelpURL( m_pInfoService->getPropertyHelpId( PROPERTY_ID_COMMAND ) );
- _out_rProperty.PrimaryButtonId = UID_PROP_DLG_SQLCOMMAND;
+ _out_rProperty.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_SQLCOMMAND);
////////////////////////////////////////////////////////////
sal_Int32 nCommandType = CommandType::COMMAND;
diff --git a/extensions/source/propctrlr/formcomponenthandler.hxx b/extensions/source/propctrlr/formcomponenthandler.hxx
index 1b250cef718a..54e3c75e2726 100644
--- a/extensions/source/propctrlr/formcomponenthandler.hxx
+++ b/extensions/source/propctrlr/formcomponenthandler.hxx
@@ -42,7 +42,7 @@
#include <com/sun/star/awt/XControlContainer.hpp>
#include <com/sun/star/form/XForm.hpp>
/** === end UNO includes === **/
-#include <vcl/fldunit.hxx>
+#include <tools/fldunit.hxx>
#include <vcl/waitobj.hxx>
#include <connectivity/dbtools.hxx>
diff --git a/extensions/source/propctrlr/formlinkdialog.cxx b/extensions/source/propctrlr/formlinkdialog.cxx
index 1f31a25fdd1c..725706febe98 100644
--- a/extensions/source/propctrlr/formlinkdialog.cxx
+++ b/extensions/source/propctrlr/formlinkdialog.cxx
@@ -353,7 +353,7 @@ namespace pcr
// in all rows, there must be either two valid selections, or none at all
// If there is at least one row with exactly one valid selection, then the
// OKButton needs to be disabled
- BOOL bEnable = TRUE;
+ sal_Bool bEnable = sal_True;
const FieldLinkRow* aRows[] = {
m_aRow1.get(), m_aRow2.get(), m_aRow3.get(), m_aRow4.get()
@@ -365,7 +365,7 @@ namespace pcr
if ( aRows[ i ]->GetFieldName( FieldLinkRow::eDetailField, sNotInterestedInRightNow )
!= aRows[ i ]->GetFieldName( FieldLinkRow::eMasterField, sNotInterestedInRightNow )
)
- bEnable = FALSE;
+ bEnable = sal_False;
}
m_aOK.Enable( bEnable );
diff --git a/extensions/source/propctrlr/formlinkdialog.src b/extensions/source/propctrlr/formlinkdialog.src
index f319675d7c42..2f993fc8efca 100644
--- a/extensions/source/propctrlr/formlinkdialog.src
+++ b/extensions/source/propctrlr/formlinkdialog.src
@@ -35,6 +35,7 @@
ModalDialog RID_DLG_FORMLINKS
{
+ HelpID = "extensions:ModalDialog:RID_DLG_FORMLINKS";
OutputSize = TRUE ;
Moveable = TRUE ;
Closeable = TRUE ;
@@ -133,6 +134,7 @@ ModalDialog RID_DLG_FORMLINKS
PushButton PB_SUGGEST
{
+ HelpID = "extensions:PushButton:RID_DLG_FORMLINKS:PB_SUGGEST";
Pos = MAP_APPFONT( 199, 90 );
Size = MAP_APPFONT( 50, 14 );
TabStop = TRUE;
diff --git a/extensions/source/propctrlr/formmetadata.cxx b/extensions/source/propctrlr/formmetadata.cxx
index 05791a48cc38..c13c7193d7d7 100644
--- a/extensions/source/propctrlr/formmetadata.cxx
+++ b/extensions/source/propctrlr/formmetadata.cxx
@@ -34,7 +34,7 @@
#include "propctrlr.hrc"
#include <svtools/localresaccess.hxx>
#include <tools/debug.hxx>
-#include <cppuhelper/extract.hxx>
+#include <comphelper/extract.hxx>
#include <sal/macros.h>
#include <algorithm>
#include <functional>
@@ -53,7 +53,7 @@ namespace pcr
{
String sName;
String sTranslation;
- sal_uInt32 nHelpId;
+ rtl::OString sHelpId;
sal_Int32 nId;
sal_uInt16 nPos;
sal_uInt32 nUIFlags;
@@ -63,16 +63,16 @@ namespace pcr
sal_Int32 _nId,
const String& aTranslation,
sal_uInt16 nPosId,
- sal_uInt32 nHelpId,
+ const rtl::OString&,
sal_uInt32 _nUIFlags);
};
//------------------------------------------------------------------------
OPropertyInfoImpl::OPropertyInfoImpl(const ::rtl::OUString& _rName, sal_Int32 _nId,
- const String& aString, sal_uInt16 nP, sal_uInt32 nHid, sal_uInt32 _nUIFlags)
+ const String& aString, sal_uInt16 nP, const rtl::OString& sHid, sal_uInt32 _nUIFlags)
:sName(_rName)
,sTranslation(aString)
- ,nHelpId(nHid)
+ ,sHelpId(sHid)
,nId(_nId)
,nPos(nP)
,nUIFlags(_nUIFlags)
@@ -396,10 +396,10 @@ namespace pcr
}
//------------------------------------------------------------------------
- sal_Int32 OPropertyInfoService::getPropertyHelpId(sal_Int32 _nId) const
+ rtl::OString OPropertyInfoService::getPropertyHelpId(sal_Int32 _nId) const
{
const OPropertyInfoImpl* pInfo = getPropertyInfo(_nId);
- return (pInfo) ? pInfo->nHelpId : 0;
+ return (pInfo) ? pInfo->sHelpId : rtl::OString();
}
//------------------------------------------------------------------------
@@ -557,7 +557,7 @@ namespace pcr
// intialisierung
if(!s_pPropertyInfos)
getPropertyInfo();
- OPropertyInfoImpl aSearch(_rName, 0L, String(), 0, 0, 0);
+ OPropertyInfoImpl aSearch(_rName, 0L, String(), 0, "", 0);
const OPropertyInfoImpl* pInfo = ::std::lower_bound(
s_pPropertyInfos, s_pPropertyInfos + s_nCount, aSearch, PropertyInfoLessByName() );
diff --git a/extensions/source/propctrlr/formmetadata.hxx b/extensions/source/propctrlr/formmetadata.hxx
index 24341b617d08..9c112e965538 100644
--- a/extensions/source/propctrlr/formmetadata.hxx
+++ b/extensions/source/propctrlr/formmetadata.hxx
@@ -58,7 +58,7 @@ namespace pcr
// IPropertyInfoService
virtual sal_Int32 getPropertyId(const String& _rName) const;
virtual String getPropertyTranslation(sal_Int32 _nId) const;
- virtual sal_Int32 getPropertyHelpId(sal_Int32 _nId) const;
+ virtual rtl::OString getPropertyHelpId(sal_Int32 _nId) const;
virtual sal_Int16 getPropertyPos(sal_Int32 _nId) const;
virtual sal_uInt32 getPropertyUIFlags(sal_Int32 _nId) const;
virtual ::std::vector< ::rtl::OUString > getPropertyEnumRepresentations(sal_Int32 _nId) const;
diff --git a/extensions/source/propctrlr/genericpropertyhandler.cxx b/extensions/source/propctrlr/genericpropertyhandler.cxx
index 2c684db31bcc..3802e68dd039 100644
--- a/extensions/source/propctrlr/genericpropertyhandler.cxx
+++ b/extensions/source/propctrlr/genericpropertyhandler.cxx
@@ -43,7 +43,7 @@
#include <com/sun/star/frame/XDispatchProvider.hpp>
/** === end UNO includes === **/
#include <tools/debug.hxx>
-#include <cppuhelper/extract.hxx>
+#include <comphelper/extract.hxx>
#include <algorithm>
#include <o3tl/compat_functional.hxx>
diff --git a/extensions/source/propctrlr/inspectorhelpwindow.cxx b/extensions/source/propctrlr/inspectorhelpwindow.cxx
index 6182efbb495a..29b192d52f0e 100644
--- a/extensions/source/propctrlr/inspectorhelpwindow.cxx
+++ b/extensions/source/propctrlr/inspectorhelpwindow.cxx
@@ -54,14 +54,14 @@ namespace pcr
,m_nMaxLines( 8 )
{
SetBackground();
- SetPaintTransparent(TRUE);
+ SetPaintTransparent(sal_True);
m_aSeparator.SetText( String( PcrRes( RID_STR_HELP_SECTION_LABEL ) ) );
m_aSeparator.SetBackground();
m_aSeparator.Show();
m_aHelpText.SetControlBackground( /*m_aSeparator.GetBackground().GetColor() */);
m_aHelpText.SetBackground();
- m_aHelpText.SetPaintTransparent(TRUE);
+ m_aHelpText.SetPaintTransparent(sal_True);
m_aHelpText.Show();
}
diff --git a/extensions/source/propctrlr/listselectiondlg.src b/extensions/source/propctrlr/listselectiondlg.src
index 24a1d7f0a815..84cad0d9c0a9 100644
--- a/extensions/source/propctrlr/listselectiondlg.src
+++ b/extensions/source/propctrlr/listselectiondlg.src
@@ -35,6 +35,7 @@
ModalDialog RID_DLG_SELECTION
{
+ HelpID = "extensions:ModalDialog:RID_DLG_SELECTION";
OutputSize = TRUE ;
Moveable = TRUE ;
Closeable = TRUE ;
@@ -49,6 +50,7 @@ ModalDialog RID_DLG_SELECTION
ListBox LB_ENTRIES
{
+ HelpID = "extensions:ListBox:RID_DLG_SELECTION:LB_ENTRIES";
Pos = MAP_APPFONT( 6, 17 );
Size = MAP_APPFONT( 85, 97 );
diff --git a/extensions/source/propctrlr/makefile.mk b/extensions/source/propctrlr/makefile.mk
index c69f47bcef1a..ebb629ae39c9 100644
--- a/extensions/source/propctrlr/makefile.mk
+++ b/extensions/source/propctrlr/makefile.mk
@@ -144,3 +144,11 @@ DEF1NAME= $(SHL1TARGET)
.INCLUDE : target.mk
+
+ALLTAR : $(MISC)/pcr.component
+
+$(MISC)/pcr.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+ pcr.component
+ $(XSLTPROC) --nonet --stringparam uri \
+ '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+ $(SOLARENV)/bin/createcomponent.xslt pcr.component
diff --git a/extensions/source/propctrlr/newdatatype.src b/extensions/source/propctrlr/newdatatype.src
index 50fbad0be2f1..c732013141e7 100644
--- a/extensions/source/propctrlr/newdatatype.src
+++ b/extensions/source/propctrlr/newdatatype.src
@@ -39,6 +39,7 @@
ModalDialog RID_DLG_NEW_DATA_TYPE
{
+ HelpID = "extensions:ModalDialog:RID_DLG_NEW_DATA_TYPE";
OutputSize = TRUE ;
Moveable = TRUE ;
Closeable = TRUE ;
@@ -57,6 +58,7 @@ ModalDialog RID_DLG_NEW_DATA_TYPE
Edit ED_NAME
{
+ HelpID = "extensions:Edit:RID_DLG_NEW_DATA_TYPE:ED_NAME";
Pos = MAP_APPFONT( 6, 17 );
Size = MAP_APPFONT( DIALOG_WIDTH - 2 * 6, 12 );
Border = TRUE;
diff --git a/extensions/source/propctrlr/pcr.component b/extensions/source/propctrlr/pcr.component
new file mode 100644
index 000000000000..2b606cc01c11
--- /dev/null
+++ b/extensions/source/propctrlr/pcr.component
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+ xmlns="http://openoffice.org/2010/uno-components">
+ <implementation name="StringRepresentation">
+ <service name="com.sun.star.inspection.StringRepresentation"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.extensions.ButtonNavigationHandler">
+ <service name="com.sun.star.form.inspection.ButtonNavigationHandler"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.extensions.CellBindingPropertyHandler">
+ <service name="com.sun.star.form.inspection.CellBindingPropertyHandler"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.extensions.EFormsPropertyHandler">
+ <service name="com.sun.star.form.inspection.XMLFormsPropertyHandler"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.extensions.EditPropertyHandler">
+ <service name="com.sun.star.form.inspection.EditPropertyHandler"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.extensions.EventHandler">
+ <service name="com.sun.star.form.inspection.EventHandler"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.extensions.FormComponentPropertyHandler">
+ <service name="com.sun.star.form.inspection.FormComponentPropertyHandler"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.extensions.FormGeometryHandler">
+ <service name="com.sun.star.form.inspection.FormGeometryHandler"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.extensions.GenericPropertyHandler">
+ <service name="com.sun.star.inspection.GenericPropertyHandler"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.extensions.SubmissionPropertyHandler">
+ <service name="com.sun.star.form.inspection.SubmissionPropertyHandler"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.extensions.XSDValidationPropertyHandler">
+ <service name="com.sun.star.form.inspection.XSDValidationPropertyHandler"/>
+ </implementation>
+ <implementation name="org.openoffice.comp.extensions.DefaultFormComponentInspectorModel">
+ <service name="com.sun.star.form.inspection.DefaultFormComponentInspectorModel"/>
+ </implementation>
+ <implementation name="org.openoffice.comp.extensions.DefaultHelpProvider">
+ <service name="com.sun.star.inspection.DefaultHelpProvider"/>
+ </implementation>
+ <implementation name="org.openoffice.comp.extensions.DialogController">
+ <service name="com.sun.star.awt.PropertyBrowserController"/>
+ </implementation>
+ <implementation name="org.openoffice.comp.extensions.FormController">
+ <service name="com.sun.star.form.PropertyBrowserController"/>
+ </implementation>
+ <implementation name="org.openoffice.comp.extensions.ObjectInspector">
+ <service name="com.sun.star.inspection.ObjectInspector"/>
+ </implementation>
+ <implementation name="org.openoffice.comp.extensions.ObjectInspectorModel">
+ <service name="com.sun.star.inspection.ObjectInspectorModel"/>
+ </implementation>
+ <implementation name="org.openoffice.comp.form.ui.MasterDetailLinkDialog">
+ <service name="com.sun.star.form.MasterDetailLinkDialog"/>
+ </implementation>
+ <implementation name="org.openoffice.comp.form.ui.OControlFontDialog">
+ <service name="com.sun.star.form.ControlFontDialog"/>
+ </implementation>
+ <implementation name="org.openoffice.comp.form.ui.OTabOrderDialog">
+ <service name="com.sun.star.form.ui.TabOrderDialog"/>
+ </implementation>
+</component>
diff --git a/extensions/source/propctrlr/pcrcommon.cxx b/extensions/source/propctrlr/pcrcommon.cxx
index 55a9f8d4ae2b..d05808db2d91 100644
--- a/extensions/source/propctrlr/pcrcommon.cxx
+++ b/extensions/source/propctrlr/pcrcommon.cxx
@@ -36,6 +36,7 @@
#include <com/sun/star/util/MeasureUnit.hpp>
/** === end UNO includes === **/
#include <rtl/ustrbuf.hxx>
+#include <tools/urlobj.hxx>
//............................................................................
namespace pcr
@@ -48,20 +49,24 @@ namespace pcr
//= HelpIdUrl
//========================================================================
//------------------------------------------------------------------------
- SmartId HelpIdUrl::getHelpId( const ::rtl::OUString& _rHelpURL )
+ rtl::OString HelpIdUrl::getHelpId( const ::rtl::OUString& _rHelpURL )
{
- SmartId aSmartHelpId( _rHelpURL );
- if ( 0 == _rHelpURL.compareToAscii( RTL_CONSTASCII_STRINGPARAM( "HID:" ) ) )
- aSmartHelpId = SmartId( _rHelpURL.copy( sizeof( "HID:" ) - 1 ).toInt32() );
- return aSmartHelpId;
+ INetURLObject aHID( _rHelpURL );
+ if ( aHID.GetProtocol() == INET_PROT_HID )
+ return rtl::OUStringToOString( aHID.GetURLPath(), RTL_TEXTENCODING_UTF8 );
+ else
+ return rtl::OUStringToOString( _rHelpURL, RTL_TEXTENCODING_UTF8 );
}
//------------------------------------------------------------------------
- ::rtl::OUString HelpIdUrl::getHelpURL( sal_uInt32 _nHelpId )
+ ::rtl::OUString HelpIdUrl::getHelpURL( const rtl::OString& sHelpId )
{
::rtl::OUStringBuffer aBuffer;
- aBuffer.appendAscii( "HID:" );
- aBuffer.append( (sal_Int32)_nHelpId );
+ ::rtl::OUString aTmp( sHelpId, sHelpId.getLength(), RTL_TEXTENCODING_UTF8 );
+ INetURLObject aHID( aTmp );
+ if ( aHID.GetProtocol() == INET_PROT_NOT_VALID )
+ aBuffer.appendAscii( INET_HID_SCHEME );
+ aBuffer.append( aTmp.getStr() );
return aBuffer.makeStringAndClear();
}
//............................................................................
diff --git a/extensions/source/propctrlr/pcrcommon.hxx b/extensions/source/propctrlr/pcrcommon.hxx
index f6a601528160..528c88d730c9 100644
--- a/extensions/source/propctrlr/pcrcommon.hxx
+++ b/extensions/source/propctrlr/pcrcommon.hxx
@@ -38,7 +38,6 @@
#include <com/sun/star/beans/PropertyChangeEvent.hpp>
/** === end UNO includes === **/
-#include <vcl/smartid.hxx>
#include <tools/string.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <comphelper/listenernotification.hxx>
@@ -79,8 +78,8 @@ namespace pcr
class HelpIdUrl
{
public:
- static SmartId getHelpId( const ::rtl::OUString& _rHelpURL );
- static ::rtl::OUString getHelpURL( sal_uInt32 _nHelpId );
+ static rtl::OString getHelpId( const ::rtl::OUString& _rHelpURL );
+ static ::rtl::OUString getHelpURL( const rtl::OString& );
};
//====================================================================
diff --git a/extensions/source/propctrlr/pcrservices.cxx b/extensions/source/propctrlr/pcrservices.cxx
index 15ac891604cf..d0737e6a6753 100644
--- a/extensions/source/propctrlr/pcrservices.cxx
+++ b/extensions/source/propctrlr/pcrservices.cxx
@@ -103,27 +103,6 @@ component_getImplementationEnvironment(
}
//---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
- void* pServiceManager,
- void* pRegistryKey
- )
-{
- if (pRegistryKey)
- try
- {
- return ::pcr::PcrModule::getInstance().writeComponentInfos(
- static_cast<XMultiServiceFactory*>(pServiceManager),
- static_cast<XRegistryKey*>(pRegistryKey));
- }
- catch (InvalidRegistryException& )
- {
- OSL_FAIL("pcr::component_writeInfo: could not create a registry key (InvalidRegistryException) !");
- }
-
- return sal_False;
-}
-
-//---------------------------------------------------------------------------------------
extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
const sal_Char* pImplementationName,
void* pServiceManager,
diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx
index 13e50d559e49..3c1da2b3b53b 100644
--- a/extensions/source/propctrlr/propcontroller.cxx
+++ b/extensions/source/propctrlr/propcontroller.cxx
@@ -1267,7 +1267,7 @@ namespace pcr
// this category does not yet exist. This is allowed, as an inspector model might be lazy, and not provide
// any category information of its own. In this case, we have a fallback ...
m_aPageIds[ aDescriptor.Category ] =
- getPropertyBox().AppendPage( aDescriptor.Category, SmartId() );
+ getPropertyBox().AppendPage( aDescriptor.Category, rtl::OString() );
nTargetPageId = impl_getPageIdForCategory_nothrow( aDescriptor.Category );
}
diff --git a/extensions/source/propctrlr/propertyeditor.cxx b/extensions/source/propctrlr/propertyeditor.cxx
index 657c59961430..8a11e023df3d 100644
--- a/extensions/source/propctrlr/propertyeditor.cxx
+++ b/extensions/source/propctrlr/propertyeditor.cxx
@@ -221,7 +221,7 @@ namespace pcr
}
//------------------------------------------------------------------
- sal_uInt16 OPropertyEditor::AppendPage( const String & _rText, const SmartId& _rHelpId )
+ sal_uInt16 OPropertyEditor::AppendPage( const String & _rText, const rtl::OString& _rHelpId )
{
// obtain a new id
sal_uInt16 nId = m_nNextId++;
@@ -237,7 +237,7 @@ namespace pcr
pPage->getListBox().SetObserver(m_pObserver);
pPage->getListBox().EnableHelpSection( m_bHasHelpSection );
pPage->getListBox().SetHelpLineLimites( m_nMinHelpLines, m_nMaxHelpLines );
- pPage->SetSmartHelpId( _rHelpId );
+ pPage->SetHelpId( _rHelpId );
// immediately activate the page
m_aTabControl.SetTabPage(nId, pPage);
@@ -247,10 +247,10 @@ namespace pcr
}
//------------------------------------------------------------------
- void OPropertyEditor::SetHelpId( sal_uInt32 nHelpId )
+ void OPropertyEditor::SetHelpId( const rtl::OString& rHelpId )
{
- Control::SetHelpId(0);
- m_aTabControl.SetHelpId(nHelpId);
+ Control::SetHelpId("");
+ m_aTabControl.SetHelpId(rHelpId);
}
//------------------------------------------------------------------
@@ -482,7 +482,7 @@ namespace pcr
//------------------------------------------------------------------
void OPropertyEditor::EnablePropertyControls( const ::rtl::OUString& _rEntryName, sal_Int16 _nControls, bool _bEnable )
{
- for ( USHORT i = 0; i < m_aTabControl.GetPageCount(); ++i )
+ for ( sal_uInt16 i = 0; i < m_aTabControl.GetPageCount(); ++i )
{
OBrowserPage* pPage = static_cast< OBrowserPage* >( m_aTabControl.GetTabPage( m_aTabControl.GetPageId( i ) ) );
if ( pPage )
@@ -493,7 +493,7 @@ namespace pcr
//------------------------------------------------------------------
void OPropertyEditor::EnablePropertyLine( const ::rtl::OUString& _rEntryName, bool _bEnable )
{
- for ( USHORT i = 0; i < m_aTabControl.GetPageCount(); ++i )
+ for ( sal_uInt16 i = 0; i < m_aTabControl.GetPageCount(); ++i )
{
OBrowserPage* pPage = static_cast< OBrowserPage* >( m_aTabControl.GetTabPage( m_aTabControl.GetPageId( i ) ) );
if ( pPage )
diff --git a/extensions/source/propctrlr/propertyeditor.hxx b/extensions/source/propctrlr/propertyeditor.hxx
index c4c2fd305662..6f9217f7329c 100644
--- a/extensions/source/propctrlr/propertyeditor.hxx
+++ b/extensions/source/propctrlr/propertyeditor.hxx
@@ -98,8 +98,8 @@ namespace pcr
void SetHelpText( const ::rtl::OUString& _rHelpText );
void SetHelpLineLimites( sal_Int32 _nMinLines, sal_Int32 _nMaxLines );
- void SetHelpId( sal_uInt32 nHelpId );
- sal_uInt16 AppendPage( const String& r, const SmartId& _rHelpId );
+ void SetHelpId( const rtl::OString& sHelpId );
+ sal_uInt16 AppendPage( const String& r, const rtl::OString& _rHelpId );
void SetPage( sal_uInt16 );
void RemovePage(sal_uInt16 nID);
sal_uInt16 GetCurPage();
diff --git a/extensions/source/propctrlr/propertyinfo.hxx b/extensions/source/propctrlr/propertyinfo.hxx
index 6e71ef58c7a1..64e9b3f8ffed 100644
--- a/extensions/source/propctrlr/propertyinfo.hxx
+++ b/extensions/source/propctrlr/propertyinfo.hxx
@@ -32,6 +32,7 @@
#include <sal/types.h>
#include <tools/string.hxx>
#include <rtl/ustring.hxx>
+#include <rtl/string.hxx>
#include <vector>
//............................................................................
@@ -47,7 +48,7 @@ namespace pcr
public:
virtual sal_Int32 getPropertyId(const String& _rName) const = 0;
virtual String getPropertyTranslation(sal_Int32 _nId) const = 0;
- virtual sal_Int32 getPropertyHelpId(sal_Int32 _nId) const = 0;
+ virtual rtl::OString getPropertyHelpId(sal_Int32 _nId) const = 0;
virtual sal_Int16 getPropertyPos(sal_Int32 _nId) const = 0;
virtual sal_uInt32 getPropertyUIFlags(sal_Int32 _nId) const = 0;
virtual ::std::vector< ::rtl::OUString > getPropertyEnumRepresentations(sal_Int32 _nId) const = 0;
diff --git a/extensions/source/propctrlr/pushbuttonnavigation.cxx b/extensions/source/propctrlr/pushbuttonnavigation.cxx
index 6b96f6f0867f..721d7d95c22d 100644
--- a/extensions/source/propctrlr/pushbuttonnavigation.cxx
+++ b/extensions/source/propctrlr/pushbuttonnavigation.cxx
@@ -32,7 +32,7 @@
#include <com/sun/star/form/FormButtonType.hpp>
#include <com/sun/star/beans/XPropertyState.hpp>
#include "formstrings.hxx"
-#include <cppuhelper/extract.hxx>
+#include <comphelper/extract.hxx>
#include <comphelper/property.hxx>
#include <osl/diagnose.h>
#include <tools/diagnose_ex.h>
diff --git a/extensions/source/propctrlr/selectlabeldialog.cxx b/extensions/source/propctrlr/selectlabeldialog.cxx
index 7bba7ee4510a..d09cc94b050a 100644
--- a/extensions/source/propctrlr/selectlabeldialog.cxx
+++ b/extensions/source/propctrlr/selectlabeldialog.cxx
@@ -78,7 +78,7 @@ namespace pcr
m_aControlTree.SetSelectionMode( SINGLE_SELECTION );
m_aControlTree.SetDragDropMode( 0 );
m_aControlTree.EnableInplaceEditing( sal_False );
- m_aControlTree.SetWindowBits(WB_BORDER | WB_HASLINES | WB_HASLINESATROOT | WB_HASBUTTONS | WB_HASBUTTONSATROOT | WB_HSCROLL);
+ m_aControlTree.SetStyle(m_aControlTree.GetStyle() | WB_BORDER | WB_HASLINES | WB_HASLINESATROOT | WB_HASBUTTONS | WB_HASBUTTONSATROOT | WB_HSCROLL);
m_aControlTree.SetNodeBitmaps( m_aModelImages.GetImage( RID_SVXIMG_COLLAPSEDNODE ), m_aModelImages.GetImage( RID_SVXIMG_EXPANDEDNODE ) );
m_aControlTree.SetSelectHdl(LINK(this, OSelectLabelDialog, OnEntrySelected));
diff --git a/extensions/source/propctrlr/selectlabeldialog.src b/extensions/source/propctrlr/selectlabeldialog.src
index af536befb3bf..357a223bf2b8 100644
--- a/extensions/source/propctrlr/selectlabeldialog.src
+++ b/extensions/source/propctrlr/selectlabeldialog.src
@@ -31,6 +31,7 @@
ModalDialog RID_DLG_SELECTLABELCONTROL
{
+ HelpID = "extensions:ModalDialog:RID_DLG_SELECTLABELCONTROL";
OutputSize = TRUE;
Size = MAP_APPFONT( 200, 151 );
Moveable = TRUE;
@@ -51,6 +52,7 @@ ModalDialog RID_DLG_SELECTLABELCONTROL
};
CheckBox 1
{
+ HelpID = "extensions:CheckBox:RID_DLG_SELECTLABELCONTROL:1";
Pos = MAP_APPFONT( 6, 115 );
Size = MAP_APPFONT( 188, 8 );
Text [ en-US ] = "~No assignment";
diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx
index 5dea67099f86..c8217a734fae 100644
--- a/extensions/source/propctrlr/standardcontrol.cxx
+++ b/extensions/source/propctrlr/standardcontrol.cxx
@@ -46,7 +46,7 @@
// ugly dependencies for the OColorControl
#include <svx/svxids.hrc>
#include <svx/drawitem.hxx>
-#include <xtable.hxx>
+#include <svx/xtable.hxx>
//==================================================================
#include <vcl/floatwin.hxx>
#include <svtools/svmedit.hxx>
@@ -278,7 +278,7 @@ namespace pcr
getTypedControlWindow()->SetFormatter( getTypedControlWindow()->StandardFormatter() );
SvNumberFormatter* pFormatter = getTypedControlWindow()->GetFormatter();
- ULONG nStandardDateTimeFormat = pFormatter->GetStandardFormat( NUMBERFORMAT_DATETIME, eSysLanguage );
+ sal_uLong nStandardDateTimeFormat = pFormatter->GetStandardFormat( NUMBERFORMAT_DATETIME, eSysLanguage );
getTypedControlWindow()->SetFormatKey( nStandardDateTimeFormat );
}
@@ -712,8 +712,8 @@ namespace pcr
getTypedControlWindow()->SetDropDownLineCount( LB_DEFAULT_COUNT );
if ( ( nWinStyle & WB_READONLY ) != 0 )
{
- getTypedControlWindow()->SetReadOnly( TRUE );
- getTypedControlWindow()->Enable( TRUE );
+ getTypedControlWindow()->SetReadOnly( sal_True );
+ getTypedControlWindow()->Enable( sal_True );
}
}
@@ -821,8 +821,8 @@ namespace pcr
getTypedControlWindow()->SetDropDownLineCount( LB_DEFAULT_COUNT );
if ( ( nWinStyle & WB_READONLY ) != 0 )
{
- getTypedControlWindow()->SetReadOnly( TRUE );
- getTypedControlWindow()->Enable( TRUE );
+ getTypedControlWindow()->SetReadOnly( sal_True );
+ getTypedControlWindow()->Enable( sal_True );
}
}
@@ -884,10 +884,10 @@ namespace pcr
//------------------------------------------------------------------
Sequence< ::rtl::OUString > SAL_CALL OListboxControl::getListEntries( ) throw (RuntimeException)
{
- const USHORT nCount = getTypedControlWindow()->GetEntryCount();
+ const sal_uInt16 nCount = getTypedControlWindow()->GetEntryCount();
Sequence< ::rtl::OUString > aRet(nCount);
::rtl::OUString* pIter = aRet.getArray();
- for (USHORT i = 0; i < nCount ; ++i,++pIter)
+ for (sal_uInt16 i = 0; i < nCount ; ++i,++pIter)
*pIter = getTypedControlWindow()->GetEntry(i);
return aRet;
@@ -954,10 +954,10 @@ namespace pcr
//------------------------------------------------------------------
Sequence< ::rtl::OUString > SAL_CALL OComboboxControl::getListEntries( ) throw (RuntimeException)
{
- const USHORT nCount = getTypedControlWindow()->GetEntryCount();
+ const sal_uInt16 nCount = getTypedControlWindow()->GetEntryCount();
Sequence< ::rtl::OUString > aRet(nCount);
::rtl::OUString* pIter = aRet.getArray();
- for (USHORT i = 0; i < nCount ; ++i,++pIter)
+ for (sal_uInt16 i = 0; i < nCount ; ++i,++pIter)
*pIter = getTypedControlWindow()->GetEntry(i);
return aRet;
@@ -1047,7 +1047,7 @@ namespace pcr
,m_nOperationMode( eStringList )
,m_bDropdown( sal_False )
{
- SetCompoundControl( TRUE );
+ SetCompoundControl( sal_True );
m_pImplEdit = new MultiLineEdit( this, WB_TABSTOP | WB_IGNORETAB | WB_NOBORDER | (_nStyle & WB_READONLY) );
SetSubEdit( m_pImplEdit );
diff --git a/extensions/source/propctrlr/taborder.cxx b/extensions/source/propctrlr/taborder.cxx
index c403f2d709e7..6900e5c6d756 100644
--- a/extensions/source/propctrlr/taborder.cxx
+++ b/extensions/source/propctrlr/taborder.cxx
@@ -278,13 +278,13 @@ namespace pcr
//------------------------------------------------------------------------
IMPL_LINK( TabOrderDialog, OKClickHdl, Button*, /*pButton*/ )
{
- ULONG nEntryCount = aLB_Controls.GetEntryCount();
+ sal_uLong nEntryCount = aLB_Controls.GetEntryCount();
Sequence< Reference< XControlModel > > aSortedControlModelSeq( nEntryCount );
Sequence< Reference< XControlModel > > aControlModels( m_xTempModel->getControlModels());
Reference< XControlModel > * pSortedControlModels = aSortedControlModelSeq.getArray();
const Reference< XControlModel > * pControlModels = aControlModels.getConstArray();
- for (ULONG i=0; i < nEntryCount; i++)
+ for (sal_uLong i=0; i < nEntryCount; i++)
{
SvLBoxEntry* pEntry = aLB_Controls.GetEntry(i);
@@ -350,13 +350,13 @@ namespace pcr
{
SvLBoxEntry* pFirstSelected = FirstSelected();
if( !pFirstSelected ) return;
- ULONG nFirstSelPos = GetModel()->GetAbsPos( pFirstSelected );
+ sal_uLong nFirstSelPos = GetModel()->GetAbsPos( pFirstSelected );
if( nFirstSelPos == 0 ) return;
SvLBoxEntry* pSelEntry = pFirstSelected;
while( pSelEntry )
{
- ULONG nSelEntryPos = GetModel()->GetAbsPos( pSelEntry );
+ sal_uLong nSelEntryPos = GetModel()->GetAbsPos( pSelEntry );
SvLBoxEntry* pSelEntryPrev = GetEntry( nSelEntryPos-1 );
aSelEntryPrevText = GetEntryText( pSelEntryPrev );
aImage = GetExpandedEntryBmp(pSelEntryPrev);
@@ -373,12 +373,12 @@ namespace pcr
{
SvLBoxEntry* pLastSelected = LastSelected();
if( !pLastSelected ) return;
- ULONG nLastSelPos = GetModel()->GetAbsPos( pLastSelected );
+ sal_uLong nLastSelPos = GetModel()->GetAbsPos( pLastSelected );
if( (nLastSelPos + nRelPos - i) > (GetEntryCount()-1) ) return;
#if OSL_DEBUG_LEVEL > 0
- ULONG nSelCount = GetSelectionCount();
+ sal_uLong nSelCount = GetSelectionCount();
(void)nSelCount;
#endif
@@ -386,7 +386,7 @@ namespace pcr
SvLBoxEntry* pSelEntry = pLastSelected;
while( pSelEntry )
{
- ULONG nSelEntryPos = GetModel()->GetAbsPos( pSelEntry );
+ sal_uLong nSelEntryPos = GetModel()->GetAbsPos( pSelEntry );
SvLBoxEntry* pSelEntryNext = GetEntry( nSelEntryPos+1 );
void* pData = pSelEntryNext->GetUserData();
diff --git a/extensions/source/propctrlr/taborder.src b/extensions/source/propctrlr/taborder.src
index 73f12ff3ff89..a1458f4d4016 100644
--- a/extensions/source/propctrlr/taborder.src
+++ b/extensions/source/propctrlr/taborder.src
@@ -35,6 +35,7 @@
ModalDialog RID_DLG_TABORDER
{
+ HelpID = "extensions:ModalDialog:RID_DLG_TABORDER";
OutputSize = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT ( 168 , 158 ) ;
@@ -60,6 +61,7 @@ ModalDialog RID_DLG_TABORDER
PushButton PB_MOVE_UP
{
+ HelpID = "extensions:PushButton:RID_DLG_TABORDER:PB_MOVE_UP";
Pos = MAP_APPFONT ( 102 , 14 ) ;
Size = MAP_APPFONT ( 60 , 14 ) ;
Text [ en-US ] = "Move Up" ;
@@ -67,6 +69,7 @@ ModalDialog RID_DLG_TABORDER
PushButton PB_MOVE_DOWN
{
+ HelpID = "extensions:PushButton:RID_DLG_TABORDER:PB_MOVE_DOWN";
Pos = MAP_APPFONT ( 102 , 32 ) ;
Size = MAP_APPFONT ( 60 , 14 ) ;
Text [ en-US ] = "Move Down" ;
@@ -74,6 +77,7 @@ ModalDialog RID_DLG_TABORDER
PushButton PB_AUTO_ORDER
{
+ HelpID = "extensions:PushButton:RID_DLG_TABORDER:PB_AUTO_ORDER";
Pos = MAP_APPFONT ( 102 , 50 ) ;
Size = MAP_APPFONT ( 60 , 14 ) ;
Text [ en-US ] = "Automatic Sort" ;
diff --git a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
index ac69955ac444..21ef4cc600fa 100644
--- a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
+++ b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
@@ -333,8 +333,8 @@ namespace pcr
implGetAvailableDataTypeNames( aListEntries );
- aDescriptor.PrimaryButtonId = UID_PROP_ADD_DATA_TYPE;
- aDescriptor.SecondaryButtonId = UID_PROP_REMOVE_DATA_TYPE;
+ aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_ADD_DATA_TYPE);
+ aDescriptor.SecondaryButtonId = rtl::OUString::createFromAscii(UID_PROP_REMOVE_DATA_TYPE);;
aDescriptor.HasPrimaryButton = aDescriptor.HasSecondaryButton = sal_True;
aDescriptor.PrimaryButtonImageURL = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "private:graphicrepository/extensions/res/buttonplus.png" ) );
aDescriptor.SecondaryButtonImageURL = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "private:graphicrepository/extensions/res/buttonminus.png" ) );
diff --git a/extensions/source/resource/exports.dxp b/extensions/source/resource/exports.dxp
index 9e59e94034a6..f0e1c69934bc 100644
--- a/extensions/source/resource/exports.dxp
+++ b/extensions/source/resource/exports.dxp
@@ -1,3 +1,2 @@
-component_writeInfo
component_getImplementationEnvironment
component_getFactory
diff --git a/extensions/source/resource/makefile.mk b/extensions/source/resource/makefile.mk
index a89d690b7393..adeec5fd09dc 100644
--- a/extensions/source/resource/makefile.mk
+++ b/extensions/source/resource/makefile.mk
@@ -74,3 +74,11 @@ DEF1EXPORTFILE= exports.dxp
.INCLUDE : target.mk
.INCLUDE : $(PRJ)$/util$/target.pmk
+
+ALLTAR : $(MISC)/res.component
+
+$(MISC)/res.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+ res.component
+ $(XSLTPROC) --nonet --stringparam uri \
+ '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+ $(SOLARENV)/bin/createcomponent.xslt res.component
diff --git a/extensions/source/resource/res.component b/extensions/source/resource/res.component
new file mode 100644
index 000000000000..57f96609d5df
--- /dev/null
+++ b/extensions/source/resource/res.component
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+ xmlns="http://openoffice.org/2010/uno-components">
+ <implementation name="com.sun.star.comp.extensions.ResourceService">
+ <service name="com.sun.star.resource.VclStringResourceLoader"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.resource.OpenOfficeResourceLoader">
+ <service name="com.sun.star.resource.OfficeResourceLoader"/>
+ <singleton name="com.sun.star.resource.OfficeResourceLoader"/>
+ </implementation>
+</component>
diff --git a/extensions/source/resource/res_services.cxx b/extensions/source/resource/res_services.cxx
index 2239ef361cc7..6e88dafc8b9d 100644
--- a/extensions/source/resource/res_services.cxx
+++ b/extensions/source/resource/res_services.cxx
@@ -30,12 +30,7 @@
#include "precompiled_extensions.hxx"
#include "res_services.hxx"
-/** === begin UNO includes === **/
-#include <com/sun/star/registry/XRegistryKey.hpp>
-/** === end UNO includes === **/
-
/** === begin UNO using === **/
-using ::com::sun::star::registry::XRegistryKey;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::uno::Exception;
@@ -65,43 +60,6 @@ void SAL_CALL component_getImplementationEnvironment(
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
-sal_Bool SAL_CALL component_writeInfo( void * /*pServiceManager*/, XRegistryKey * pRegistryKey )
-{
- try
- {
- ::std::vector< ::res::ComponentInfo > aComponentInfos( ::res::getComponentInfos() );
- for ( ::std::vector< ::res::ComponentInfo >::const_iterator loop = aComponentInfos.begin();
- loop != aComponentInfos.end();
- ++loop
- )
- {
- Reference< XRegistryKey > xNewKey =
- pRegistryKey->createKey( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") )
- + loop->sImplementationName + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES" ) ) );
-
- for( sal_Int32 i = 0; i < loop->aSupportedServices.getLength(); ++i )
- xNewKey->createKey( loop->aSupportedServices.getConstArray()[i]);
-
- if ( loop->sSingletonName.getLength() )
- {
- OSL_ENSURE( loop->aSupportedServices.getLength() == 1, "singletons must support exactly one service!" );
- xNewKey = pRegistryKey->createKey( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") )
- + loop->sImplementationName + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/UNO/SINGLETONS/" ) )
- + loop->sSingletonName );
- xNewKey->setStringValue( loop->aSupportedServices[ 0 ] );
- }
- }
-
- return sal_True;
- }
- catch (Exception &)
- {
- // not allowed to throw an exception over the c function.
- //OSL_ENSURE( sal_False, "Exception cannot register component!" );
- return sal_False;
- }
-}
-
void * SAL_CALL component_getFactory(
const sal_Char * pImplName, XMultiServiceFactory * /*pServiceManager*/, void * /*pRegistryKey*/ )
{
diff --git a/extensions/source/resource/resource.cxx b/extensions/source/resource/resource.cxx
index 55fd5944bbbd..01943a68fceb 100644
--- a/extensions/source/resource/resource.cxx
+++ b/extensions/source/resource/resource.cxx
@@ -74,7 +74,7 @@ public:
// XServiceInfo
OUString SAL_CALL getImplementationName() throw();
- BOOL SAL_CALL supportsService(const OUString& ServiceName) throw();
+ sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw();
Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw();
static Sequence< OUString > getSupportedServiceNames_Static(void) throw();
@@ -92,8 +92,8 @@ public:
Any SAL_CALL invoke(const OUString& FunctionName, const Sequence< Any >& Params, Sequence< sal_Int16 >& OutParamIndex, Sequence< Any >& OutParam) throw(IllegalArgumentException, CannotConvertException, InvocationTargetException, RuntimeException);
void SAL_CALL setValue(const OUString& PropertyName, const Any& Value) throw(UnknownPropertyException, CannotConvertException, InvocationTargetException, RuntimeException);
Any SAL_CALL getValue(const OUString& PropertyName) throw(UnknownPropertyException, RuntimeException);
- BOOL SAL_CALL hasMethod(const OUString& Name) throw(RuntimeException);
- BOOL SAL_CALL hasProperty(const OUString& Name) throw(RuntimeException);
+ sal_Bool SAL_CALL hasMethod(const OUString& Name) throw(RuntimeException);
+ sal_Bool SAL_CALL hasProperty(const OUString& Name) throw(RuntimeException);
private:
Reference< XTypeConverter > getTypeConverter() const;
Reference< XInvocation > getDefaultInvocation() const;
@@ -133,14 +133,14 @@ OUString ResourceService::getImplementationName() throw()
}
// XServiceInfo
-BOOL SAL_CALL ResourceService::supportsService(const OUString& ServiceName) throw()
+sal_Bool SAL_CALL ResourceService::supportsService(const OUString& ServiceName) throw()
{
Sequence< OUString > aSNL = getSupportedServiceNames();
const OUString * pArray = aSNL.getConstArray();
for( sal_Int32 i = 0; i < aSNL.getLength(); i++ )
if( pArray[i] == ServiceName )
- return TRUE;
- return FALSE;
+ return sal_True;
+ return sal_False;
}
// XServiceInfo
@@ -277,7 +277,7 @@ Any SAL_CALL ResourceService::invoke
if( bGetBranch )
{
- ResId aId( (USHORT)nId, *pResMgr );
+ ResId aId( (sal_uInt16)nId, *pResMgr );
aId.SetRT( RSC_STRING );
if( pResMgr->IsAvailable( aId ) )
{
@@ -292,7 +292,7 @@ Any SAL_CALL ResourceService::invoke
sal_Bool bRet = sal_False;
if( pResMgr )
{
- ResId aId( (USHORT)nId, *pResMgr );
+ ResId aId( (sal_uInt16)nId, *pResMgr );
aId.SetRT( RSC_STRING );
bRet = pResMgr->IsAvailable( aId );
}
@@ -328,7 +328,7 @@ Any SAL_CALL ResourceService::invoke
if( FunctionName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("getStringList")) )
{
- ResId aId( (USHORT)nId, *pResMgr );
+ ResId aId( (sal_uInt16)nId, *pResMgr );
aId.SetRT( RSC_STRINGARRAY );
if( pResMgr->IsAvailable( aId ) )
{
@@ -353,7 +353,7 @@ Any SAL_CALL ResourceService::invoke
sal_Bool bRet = sal_False;
if( pResMgr )
{
- ResId aId( (USHORT)nId, *pResMgr );
+ ResId aId( (sal_uInt16)nId, *pResMgr );
aId.SetRT( RSC_STRINGARRAY );
bRet = pResMgr->IsAvailable( aId );
}
@@ -424,7 +424,7 @@ Any SAL_CALL ResourceService::getValue(const OUString& PropertyName)
}
// XInvokation
-BOOL SAL_CALL ResourceService::hasMethod(const OUString& Name)
+sal_Bool SAL_CALL ResourceService::hasMethod(const OUString& Name)
throw(RuntimeException)
{
if( Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("getString")) ||
@@ -434,30 +434,30 @@ BOOL SAL_CALL ResourceService::hasMethod(const OUString& Name)
Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("getStringList")) ||
Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("hasStringList"))
)
- return TRUE;
+ return sal_True;
else
{
Reference< XInvocation > xI = getDefaultInvocation();
if( xI.is() )
return xI->hasMethod( Name );
else
- return FALSE;
+ return sal_False;
}
}
// XInvokation
-BOOL SAL_CALL ResourceService::hasProperty(const OUString& Name)
+sal_Bool SAL_CALL ResourceService::hasProperty(const OUString& Name)
throw(RuntimeException)
{
if( Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FileName")) )
- return TRUE;
+ return sal_True;
else
{
Reference< XInvocation > xI = getDefaultInvocation();
if( xI.is() )
return xI->hasProperty( Name );
else
- return FALSE;
+ return sal_False;
}
}
diff --git a/extensions/source/scanner/exports.dxp b/extensions/source/scanner/exports.dxp
index 9630d7e06768..f0e1c69934bc 100644
--- a/extensions/source/scanner/exports.dxp
+++ b/extensions/source/scanner/exports.dxp
@@ -1,3 +1,2 @@
component_getImplementationEnvironment
-component_writeInfo
component_getFactory
diff --git a/extensions/source/scanner/grid.cxx b/extensions/source/scanner/grid.cxx
index 61f52b916e5d..d0b76ce4c0e6 100644
--- a/extensions/source/scanner/grid.cxx
+++ b/extensions/source/scanner/grid.cxx
@@ -51,7 +51,7 @@ ResId SaneResId( sal_uInt32 );
// ---------------------------------------------------------------------
-GridWindow::GridWindow(double* pXValues, double* pYValues, int nValues, Window* pParent, BOOL bCutValues )
+GridWindow::GridWindow(double* pXValues, double* pYValues, int nValues, Window* pParent, sal_Bool bCutValues )
: ModalDialog( pParent, SaneResId( GRID_DIALOG ) ),
m_aGridArea( 50, 15, 100, 100 ),
m_pXValues( pXValues ),
@@ -67,7 +67,7 @@ GridWindow::GridWindow(double* pXValues, double* pYValues, int nValues, Window*
m_aResetTypeBox( this, SaneResId( GRID_DIALOG_TYPE_BOX ) ),
m_aResetButton( this, SaneResId( GRID_DIALOG_RESET_BTN ) )
{
- USHORT nPos = m_aResetTypeBox.InsertEntry( String( SaneResId( RESET_TYPE_LINEAR_ASCENDING ) ) );
+ sal_uInt16 nPos = m_aResetTypeBox.InsertEntry( String( SaneResId( RESET_TYPE_LINEAR_ASCENDING ) ) );
m_aResetTypeBox.SetEntryData( nPos, (void *)RESET_TYPE_LINEAR_ASCENDING );
nPos = m_aResetTypeBox.InsertEntry( String( SaneResId( RESET_TYPE_LINEAR_DESCENDING ) ) );
diff --git a/extensions/source/scanner/grid.hxx b/extensions/source/scanner/grid.hxx
index 585f7913fbf4..15ce28430cdc 100644
--- a/extensions/source/scanner/grid.hxx
+++ b/extensions/source/scanner/grid.hxx
@@ -86,7 +86,7 @@ class GridWindow : public ModalDialog
sal_uInt16 m_BmOffX;
sal_uInt16 m_BmOffY;
- BOOL m_bCutValues;
+ sal_Bool m_bCutValues;
// stuff for handles
std::vector< impHandle > m_aHandles;
@@ -126,7 +126,7 @@ class GridWindow : public ModalDialog
virtual void MouseButtonUp( const MouseEvent& );
public:
GridWindow( double* pXValues, double* pYValues, int nValues,
- Window* pParent, BOOL bCutValues = TRUE );
+ Window* pParent, sal_Bool bCutValues = sal_True );
~GridWindow();
void setBoundings( double fMinX, double fMinY, double fMaxX, double fMaxY );
diff --git a/extensions/source/scanner/grid.src b/extensions/source/scanner/grid.src
index e7e8128cbc84..97e438253b42 100644
--- a/extensions/source/scanner/grid.src
+++ b/extensions/source/scanner/grid.src
@@ -28,6 +28,7 @@
ModalDialog GRID_DIALOG
{
+ HelpID = "extensions:ModalDialog:GRID_DIALOG";
OutputSize = TRUE ;
SVLook = TRUE ;
Pos = MAP_APPFONT ( 10 , 10 ) ;
@@ -48,6 +49,7 @@ ModalDialog GRID_DIALOG
};
ListBox GRID_DIALOG_TYPE_BOX
{
+ HelpID = "extensions:ListBox:GRID_DIALOG:GRID_DIALOG_TYPE_BOX";
Border = TRUE ;
Dropdown = TRUE ;
Pos = MAP_APPFONT( 245, 45 );
@@ -55,6 +57,7 @@ ModalDialog GRID_DIALOG
};
PushButton GRID_DIALOG_RESET_BTN
{
+ HelpID = "extensions:PushButton:GRID_DIALOG:GRID_DIALOG_RESET_BTN";
Pos = MAP_APPFONT( 245, 65 );
Size = MAP_APPFONT( 50, 15 );
Text [ en-US ] = "Set";
diff --git a/extensions/source/scanner/makefile.mk b/extensions/source/scanner/makefile.mk
index 99c1e43e547d..32112ddc8919 100644
--- a/extensions/source/scanner/makefile.mk
+++ b/extensions/source/scanner/makefile.mk
@@ -94,3 +94,11 @@ DEF1EXPORTFILE=exports.dxp
.INCLUDE : target.mk
+
+ALLTAR : $(MISC)/scn.component
+
+$(MISC)/scn.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+ scn.component
+ $(XSLTPROC) --nonet --stringparam uri \
+ '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+ $(SOLARENV)/bin/createcomponent.xslt scn.component
diff --git a/extensions/source/scanner/sane.cxx b/extensions/source/scanner/sane.cxx
index 9c2bf4a4ac45..8f0be90e00c8 100644
--- a/extensions/source/scanner/sane.cxx
+++ b/extensions/source/scanner/sane.cxx
@@ -119,7 +119,7 @@ SANE_Status (*Sane::p_set_io_mode)( SANE_Handle, SANE_Bool ) = 0;
SANE_Status (*Sane::p_get_select_fd)( SANE_Handle, SANE_Int* ) = 0;
SANE_String_Const (*Sane::p_strstatus)( SANE_Status ) = 0;
-static BOOL bSaneSymbolLoadFailed = FALSE;
+static sal_Bool bSaneSymbolLoadFailed = sal_False;
inline oslGenericFunction Sane::LoadSymbol( const char* pSymbolname )
{
@@ -128,7 +128,7 @@ inline oslGenericFunction Sane::LoadSymbol( const char* pSymbolname )
{
fprintf( stderr, "Could not load symbol %s\n",
pSymbolname );
- bSaneSymbolLoadFailed = TRUE;
+ bSaneSymbolLoadFailed = sal_True;
}
return pFunction;
}
@@ -204,7 +204,7 @@ void Sane::Init()
if( pSaneLib )
{
- bSaneSymbolLoadFailed = FALSE;
+ bSaneSymbolLoadFailed = sal_False;
p_init = (SANE_Status(*)(SANE_Int*, SANE_Auth_Callback ))
LoadSymbol( "sane_init" );
p_exit = (void(*)())
@@ -298,17 +298,17 @@ void Sane::ReloadOptions()
mppOptions[ i ] = (SANE_Option_Descriptor*)
p_get_option_descriptor( maHandle, i );
- CheckConsistency( NULL, TRUE );
+ CheckConsistency( NULL, sal_True );
maReloadOptionsLink.Call( this );
}
-BOOL Sane::Open( const char* name )
+sal_Bool Sane::Open( const char* name )
{
int i;
SANE_Status nStatus = p_open( (SANE_String_Const)name, &maHandle );
- FAIL_STATE( nStatus, "sane_open", FALSE );
+ FAIL_STATE( nStatus, "sane_open", sal_False );
ReloadOptions();
@@ -325,17 +325,17 @@ BOOL Sane::Open( const char* name )
}
}
- return TRUE;
+ return sal_True;
}
-BOOL Sane::Open( int n )
+sal_Bool Sane::Open( int n )
{
if( n >= 0 && n < nDevices )
{
mnDevice = n;
return Open( (char*)ppDevices[n]->name );
}
- return FALSE;
+ return sal_False;
}
void Sane::Close()
@@ -362,48 +362,48 @@ int Sane::GetOptionByName( const char* rName )
return -1;
}
-BOOL Sane::GetOptionValue( int n, BOOL& rRet )
+sal_Bool Sane::GetOptionValue( int n, sal_Bool& rRet )
{
if( ! maHandle || mppOptions[n]->type != SANE_TYPE_BOOL )
- return FALSE;
+ return sal_False;
SANE_Word nRet;
SANE_Status nStatus = ControlOption( n, SANE_ACTION_GET_VALUE, &nRet );
if( nStatus != SANE_STATUS_GOOD )
- return FALSE;
+ return sal_False;
rRet = nRet;
- return TRUE;
+ return sal_True;
}
-BOOL Sane::GetOptionValue( int n, ByteString& rRet )
+sal_Bool Sane::GetOptionValue( int n, ByteString& rRet )
{
- BOOL bSuccess = FALSE;
+ sal_Bool bSuccess = sal_False;
if( ! maHandle || mppOptions[n]->type != SANE_TYPE_STRING )
- return FALSE;
+ return sal_False;
char* pRet = new char[mppOptions[n]->size+1];
SANE_Status nStatus = ControlOption( n, SANE_ACTION_GET_VALUE, pRet );
if( nStatus == SANE_STATUS_GOOD )
{
- bSuccess = TRUE;
+ bSuccess = sal_True;
rRet = pRet;
}
delete [] pRet;
return bSuccess;
}
-BOOL Sane::GetOptionValue( int n, double& rRet, int nElement )
+sal_Bool Sane::GetOptionValue( int n, double& rRet, int nElement )
{
- BOOL bSuccess = FALSE;
+ sal_Bool bSuccess = sal_False;
if( ! maHandle || ( mppOptions[n]->type != SANE_TYPE_INT &&
mppOptions[n]->type != SANE_TYPE_FIXED ) )
- return FALSE;
+ return sal_False;
SANE_Word* pRet = new SANE_Word[mppOptions[n]->size/sizeof(SANE_Word)];
SANE_Status nStatus = ControlOption( n, SANE_ACTION_GET_VALUE, pRet );
if( nStatus == SANE_STATUS_GOOD )
{
- bSuccess = TRUE;
+ bSuccess = sal_True;
if( mppOptions[n]->type == SANE_TYPE_INT )
rRet = (double)pRet[ nElement ];
else
@@ -413,18 +413,18 @@ BOOL Sane::GetOptionValue( int n, double& rRet, int nElement )
return bSuccess;
}
-BOOL Sane::GetOptionValue( int n, double* pSet )
+sal_Bool Sane::GetOptionValue( int n, double* pSet )
{
if( ! maHandle || ! ( mppOptions[n]->type == SANE_TYPE_FIXED ||
mppOptions[n]->type == SANE_TYPE_INT ) )
- return FALSE;
+ return sal_False;
SANE_Word* pFixedSet = new SANE_Word[mppOptions[n]->size/sizeof(SANE_Word)];
SANE_Status nStatus = ControlOption( n, SANE_ACTION_GET_VALUE, pFixedSet );
if( nStatus != SANE_STATUS_GOOD )
{
delete [] pFixedSet;
- return FALSE;
+ return sal_False;
}
for( size_t i = 0; i <mppOptions[n]->size/sizeof(SANE_Word); i++ )
{
@@ -434,38 +434,38 @@ BOOL Sane::GetOptionValue( int n, double* pSet )
pSet[i] = (double) pFixedSet[i];
}
delete [] pFixedSet;
- return TRUE;
+ return sal_True;
}
-BOOL Sane::SetOptionValue( int n, BOOL bSet )
+sal_Bool Sane::SetOptionValue( int n, sal_Bool bSet )
{
if( ! maHandle || mppOptions[n]->type != SANE_TYPE_BOOL )
- return FALSE;
+ return sal_False;
SANE_Word nRet = bSet ? SANE_TRUE : SANE_FALSE;
SANE_Status nStatus = ControlOption( n, SANE_ACTION_SET_VALUE, &nRet );
if( nStatus != SANE_STATUS_GOOD )
- return FALSE;
- return TRUE;
+ return sal_False;
+ return sal_True;
}
-BOOL Sane::SetOptionValue( int n, const String& rSet )
+sal_Bool Sane::SetOptionValue( int n, const String& rSet )
{
if( ! maHandle || mppOptions[n]->type != SANE_TYPE_STRING )
- return FALSE;
+ return sal_False;
ByteString aSet( rSet, gsl_getSystemTextEncoding() );
SANE_Status nStatus = ControlOption( n, SANE_ACTION_SET_VALUE, (void*)aSet.GetBuffer() );
if( nStatus != SANE_STATUS_GOOD )
- return FALSE;
- return TRUE;
+ return sal_False;
+ return sal_True;
}
-BOOL Sane::SetOptionValue( int n, double fSet, int nElement )
+sal_Bool Sane::SetOptionValue( int n, double fSet, int nElement )
{
- BOOL bSuccess = FALSE;
+ sal_Bool bSuccess = sal_False;
if( ! maHandle || ( mppOptions[n]->type != SANE_TYPE_INT &&
mppOptions[n]->type != SANE_TYPE_FIXED ) )
- return FALSE;
+ return sal_False;
SANE_Status nStatus;
if( mppOptions[n]->size/sizeof(SANE_Word) > 1 )
@@ -488,16 +488,16 @@ BOOL Sane::SetOptionValue( int n, double fSet, int nElement )
nStatus = ControlOption( n, SANE_ACTION_SET_VALUE, &nSetTo );
if( nStatus == SANE_STATUS_GOOD )
- bSuccess = TRUE;
+ bSuccess = sal_True;
}
return bSuccess;
}
-BOOL Sane::SetOptionValue( int n, double* pSet )
+sal_Bool Sane::SetOptionValue( int n, double* pSet )
{
if( ! maHandle || ( mppOptions[n]->type != SANE_TYPE_INT &&
mppOptions[n]->type != SANE_TYPE_FIXED ) )
- return FALSE;
+ return sal_False;
SANE_Word* pFixedSet = new SANE_Word[mppOptions[n]->size/sizeof(SANE_Word)];
for( size_t i = 0; i < mppOptions[n]->size/sizeof(SANE_Word); i++ )
{
@@ -509,8 +509,8 @@ BOOL Sane::SetOptionValue( int n, double* pSet )
SANE_Status nStatus = ControlOption( n, SANE_ACTION_SET_VALUE, pFixedSet );
delete [] pFixedSet;
if( nStatus != SANE_STATUS_GOOD )
- return FALSE;
- return TRUE;
+ return sal_False;
+ return sal_True;
}
enum FrameStyleType {
@@ -519,25 +519,25 @@ enum FrameStyleType {
#define BYTE_BUFFER_SIZE 32768
-static inline UINT8 _ReadValue( FILE* fp, int depth )
+static inline sal_uInt8 _ReadValue( FILE* fp, int depth )
{
if( depth == 16 )
{
- UINT16 nWord;
+ sal_uInt16 nWord;
// data always come in native byte order !
// 16 bits is not really supported by backends as of now
// e.g. UMAX Astra 1200S delivers 16 bit but in BIGENDIAN
// against SANE documentation (xscanimage gets the same result
// as we do
fread( &nWord, 1, 2, fp );
- return (UINT8)( nWord / 256 );
+ return (sal_uInt8)( nWord / 256 );
}
- UINT8 nByte;
+ sal_uInt8 nByte;
fread( &nByte, 1, 1, fp );
return nByte;
}
-BOOL Sane::CheckConsistency( const char* pMes, BOOL bInit )
+sal_Bool Sane::CheckConsistency( const char* pMes, sal_Bool bInit )
{
static SANE_Option_Descriptor** pDescArray = NULL;
static SANE_Option_Descriptor* pZero = NULL;
@@ -547,15 +547,15 @@ BOOL Sane::CheckConsistency( const char* pMes, BOOL bInit )
pDescArray = (SANE_Option_Descriptor**)mppOptions;
if( mppOptions )
pZero = (SANE_Option_Descriptor*)mppOptions[0];
- return TRUE;
+ return sal_True;
}
- BOOL bConsistent = TRUE;
+ sal_Bool bConsistent = sal_True;
if( pDescArray != mppOptions )
- bConsistent = FALSE;
+ bConsistent = sal_False;
if( pZero != mppOptions[0] )
- bConsistent = FALSE;
+ bConsistent = sal_False;
if( ! bConsistent )
dbg_msg( "Sane is not consistent. (%s)\n", pMes );
@@ -563,16 +563,16 @@ BOOL Sane::CheckConsistency( const char* pMes, BOOL bInit )
return bConsistent;
}
-BOOL Sane::Start( BitmapTransporter& rBitmap )
+sal_Bool Sane::Start( BitmapTransporter& rBitmap )
{
int nStream = 0, nLine = 0, i = 0;
SANE_Parameters aParams;
FrameStyleType eType = FrameStyle_Gray;
- BOOL bSuccess = TRUE;
- BOOL bWidthSet = FALSE;
+ sal_Bool bSuccess = sal_True;
+ sal_Bool bWidthSet = sal_False;
if( ! maHandle )
- return FALSE;
+ return sal_False;
int nWidthMM = 0;
int nHeightMM = 0;
@@ -603,7 +603,7 @@ BOOL Sane::Start( BitmapTransporter& rBitmap )
if( ( nOption = GetOptionByName( "resolution" ) ) != -1 )
GetOptionValue( nOption, fResl );
- BYTE* pBuffer = NULL;
+ sal_uInt8* pBuffer = NULL;
SANE_Status nStatus = SANE_STATUS_GOOD;
@@ -619,19 +619,19 @@ BOOL Sane::Start( BitmapTransporter& rBitmap )
aConverter << (sal_uInt32) 60;
// write BITMAPINFOHEADER
- aConverter << (UINT32)40;
- aConverter << (UINT32)0; // fill in width later
- aConverter << (UINT32)0; // fill in height later
- aConverter << (UINT16)1;
+ aConverter << (sal_uInt32)40;
+ aConverter << (sal_uInt32)0; // fill in width later
+ aConverter << (sal_uInt32)0; // fill in height later
+ aConverter << (sal_uInt16)1;
// create header for 24 bits
// correct later if necessary
- aConverter << (UINT16)24;
- aConverter << (UINT32)0;
- aConverter << (UINT32)0;
- aConverter << (UINT32)0;
- aConverter << (UINT32)0;
- aConverter << (UINT32)0;
- aConverter << (UINT32)0;
+ aConverter << (sal_uInt16)24;
+ aConverter << (sal_uInt32)0;
+ aConverter << (sal_uInt32)0;
+ aConverter << (sal_uInt32)0;
+ aConverter << (sal_uInt32)0;
+ aConverter << (sal_uInt32)0;
+ aConverter << (sal_uInt32)0;
for( nStream=0; nStream < 3 && bSuccess ; nStream++ )
{
@@ -645,7 +645,7 @@ BOOL Sane::Start( BitmapTransporter& rBitmap )
CheckConsistency( "sane_get_parameters" );
if (nStatus != SANE_STATUS_GOOD || aParams.bytes_per_line == 0)
{
- bSuccess = FALSE;
+ bSuccess = sal_False;
break;
}
#if (OSL_DEBUG_LEVEL > 1) || defined DBG_UTIL
@@ -663,7 +663,7 @@ BOOL Sane::Start( BitmapTransporter& rBitmap )
#endif
if( ! pBuffer )
{
- pBuffer = new BYTE[ BYTE_BUFFER_SIZE < 4*aParams.bytes_per_line ? 4*aParams.bytes_per_line : BYTE_BUFFER_SIZE ];
+ pBuffer = new sal_uInt8[ BYTE_BUFFER_SIZE < 4*aParams.bytes_per_line ? 4*aParams.bytes_per_line : BYTE_BUFFER_SIZE ];
}
if( aParams.last_frame )
@@ -688,14 +688,14 @@ BOOL Sane::Start( BitmapTransporter& rBitmap )
fprintf( stderr, "Warning: unknown frame style !!!\n" );
}
- BOOL bSynchronousRead = TRUE;
+ sal_Bool bSynchronousRead = sal_True;
// should be fail safe, but ... ??
nStatus = p_set_io_mode( maHandle, SANE_FALSE );
CheckConsistency( "sane_set_io_mode" );
if( nStatus != SANE_STATUS_GOOD )
{
- bSynchronousRead = FALSE;
+ bSynchronousRead = sal_False;
nStatus = p_set_io_mode( maHandle, SANE_TRUE );
CheckConsistency( "sane_set_io_mode" );
#if (OSL_DEBUG_LEVEL > 1) || defined DBG_UTIL
@@ -714,12 +714,12 @@ BOOL Sane::Start( BitmapTransporter& rBitmap )
DUMP_STATE( nStatus, "sane_get_select_fd" );
CheckConsistency( "sane_get_select_fd" );
if( nStatus != SANE_STATUS_GOOD )
- bSynchronousRead = TRUE;
+ bSynchronousRead = sal_True;
}
FILE* pFrame = tmpfile();
if( ! pFrame )
{
- bSuccess = FALSE;
+ bSuccess = sal_False;
break;
}
do {
@@ -749,14 +749,14 @@ BOOL Sane::Start( BitmapTransporter& rBitmap )
if( nStatus != SANE_STATUS_EOF )
{
fclose( pFrame );
- bSuccess = FALSE;
+ bSuccess = sal_False;
break;
}
int nFrameLength = ftell( pFrame );
fseek( pFrame, 0, SEEK_SET );
- UINT32 nWidth = (UINT32) aParams.pixels_per_line;
- UINT32 nHeight = (UINT32) (nFrameLength / aParams.bytes_per_line);
+ sal_uInt32 nWidth = (sal_uInt32) aParams.pixels_per_line;
+ sal_uInt32 nHeight = (sal_uInt32) (nFrameLength / aParams.bytes_per_line);
if( ! bWidthSet )
{
if( ! fResl )
@@ -770,12 +770,12 @@ BOOL Sane::Start( BitmapTransporter& rBitmap )
#endif
aConverter.Seek( 18 );
- aConverter << (UINT32)nWidth;
- aConverter << (UINT32)nHeight;
+ aConverter << (sal_uInt32)nWidth;
+ aConverter << (sal_uInt32)nHeight;
aConverter.Seek( 38 );
- aConverter << (UINT32)(1000*nWidth/nWidthMM);
- aConverter << (UINT32)(1000*nHeight/nHeightMM);
- bWidthSet = TRUE;
+ aConverter << (sal_uInt32)(1000*nWidth/nWidthMM);
+ aConverter << (sal_uInt32)(1000*nHeight/nHeightMM);
+ bWidthSet = sal_True;
}
aConverter.Seek(60);
@@ -784,13 +784,13 @@ BOOL Sane::Start( BitmapTransporter& rBitmap )
aConverter.Seek( 10 );
aConverter << (sal_uInt32)64;
aConverter.Seek( 28 );
- aConverter << (UINT16) 1;
+ aConverter << (sal_uInt16) 1;
aConverter.Seek( 54 );
// write color table
- aConverter << (UINT16)0xffff;
- aConverter << (UINT8)0xff;
- aConverter << (UINT8)0;
- aConverter << (UINT32)0;
+ aConverter << (sal_uInt16)0xffff;
+ aConverter << (sal_uInt8)0xff;
+ aConverter << (sal_uInt8)0;
+ aConverter << (sal_uInt32)0;
aConverter.Seek( 64 );
}
else if( eType == FrameStyle_Gray )
@@ -798,15 +798,15 @@ BOOL Sane::Start( BitmapTransporter& rBitmap )
aConverter.Seek( 10 );
aConverter << (sal_uInt32)1084;
aConverter.Seek( 28 );
- aConverter << (UINT16) 8;
+ aConverter << (sal_uInt16) 8;
aConverter.Seek( 54 );
// write color table
for( nLine = 0; nLine < 256; nLine++ )
{
- aConverter << (UINT8)nLine;
- aConverter << (UINT8)nLine;
- aConverter << (UINT8)nLine;
- aConverter << (UINT8)0;
+ aConverter << (sal_uInt8)nLine;
+ aConverter << (sal_uInt8)nLine;
+ aConverter << (sal_uInt8)nLine;
+ aConverter << (sal_uInt8)0;
}
aConverter.Seek( 1084 );
}
@@ -826,7 +826,7 @@ BOOL Sane::Start( BitmapTransporter& rBitmap )
{
for( i = 0; i < (aParams.pixels_per_line); i++ )
{
- UINT8 nGray = _ReadValue( pFrame, aParams.depth );
+ sal_uInt8 nGray = _ReadValue( pFrame, aParams.depth );
aConverter << nGray;
}
}
@@ -834,7 +834,7 @@ BOOL Sane::Start( BitmapTransporter& rBitmap )
{
for( i = 0; i < (aParams.pixels_per_line); i++ )
{
- UINT8 nRed, nGreen, nBlue;
+ sal_uInt8 nRed, nGreen, nBlue;
nRed = _ReadValue( pFrame, aParams.depth );
nGreen = _ReadValue( pFrame, aParams.depth );
nBlue = _ReadValue( pFrame, aParams.depth );
@@ -847,7 +847,7 @@ BOOL Sane::Start( BitmapTransporter& rBitmap )
{
for( i = 0; i < (aParams.pixels_per_line); i++ )
{
- UINT8 nValue = _ReadValue( pFrame, aParams.depth );
+ sal_uInt8 nValue = _ReadValue( pFrame, aParams.depth );
switch( aParams.format )
{
case SANE_FRAME_RED:
@@ -878,7 +878,7 @@ BOOL Sane::Start( BitmapTransporter& rBitmap )
break;
}
else
- bSuccess = FALSE;
+ bSuccess = sal_False;
}
// get stream length
aConverter.Seek( STREAM_SEEK_TO_END );
@@ -918,7 +918,7 @@ int Sane::GetRange( int n, double*& rpDouble )
rpDouble = 0;
int nItems, i;
- BOOL bIsFixed = mppOptions[n]->type == SANE_TYPE_FIXED ? TRUE : FALSE;
+ sal_Bool bIsFixed = mppOptions[n]->type == SANE_TYPE_FIXED ? sal_True : sal_False;
dbg_msg( "Sane::GetRange of option %s ", mppOptions[n]->name );
if(mppOptions[n]->constraint_type == SANE_CONSTRAINT_RANGE )
@@ -996,12 +996,12 @@ String Sane::GetOptionUnitName( int n )
return aText;
}
-BOOL Sane::ActivateButtonOption( int n )
+sal_Bool Sane::ActivateButtonOption( int n )
{
SANE_Status nStatus = ControlOption( n, SANE_ACTION_SET_VALUE, NULL );
if( nStatus != SANE_STATUS_GOOD )
- return FALSE;
- return TRUE;
+ return sal_False;
+ return sal_True;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/scanner/sane.hxx b/extensions/source/scanner/sane.hxx
index fdc5e5011534..fe5a63477cf2 100644
--- a/extensions/source/scanner/sane.hxx
+++ b/extensions/source/scanner/sane.hxx
@@ -115,16 +115,16 @@ private:
SANE_Status ControlOption( int, SANE_Action, void* );
- BOOL CheckConsistency( const char*, BOOL bInit = FALSE );
+ sal_Bool CheckConsistency( const char*, sal_Bool bInit = sal_False );
public:
Sane();
~Sane();
- static BOOL IsSane()
- { return pSaneLib ? TRUE : FALSE; }
- BOOL IsOpen()
- { return maHandle ? TRUE : FALSE; }
+ static sal_Bool IsSane()
+ { return pSaneLib ? sal_True : sal_False; }
+ sal_Bool IsOpen()
+ { return maHandle ? sal_True : sal_False; }
static int CountDevices()
{ return nDevices; }
static String GetName( int n )
@@ -155,28 +155,28 @@ public:
inline int GetOptionElements( int n );
int GetOptionByName( const char* );
- BOOL GetOptionValue( int, BOOL& );
- BOOL GetOptionValue( int, ByteString& );
- BOOL GetOptionValue( int, double&, int nElement = 0 );
- BOOL GetOptionValue( int, double* );
+ sal_Bool GetOptionValue( int, sal_Bool& );
+ sal_Bool GetOptionValue( int, ByteString& );
+ sal_Bool GetOptionValue( int, double&, int nElement = 0 );
+ sal_Bool GetOptionValue( int, double* );
- BOOL SetOptionValue( int, BOOL );
- BOOL SetOptionValue( int, const String& );
- BOOL SetOptionValue( int, double, int nElement = 0 );
- BOOL SetOptionValue( int, double* );
+ sal_Bool SetOptionValue( int, sal_Bool );
+ sal_Bool SetOptionValue( int, const String& );
+ sal_Bool SetOptionValue( int, double, int nElement = 0 );
+ sal_Bool SetOptionValue( int, double* );
- BOOL ActivateButtonOption( int );
+ sal_Bool ActivateButtonOption( int );
int CountOptions() { return mnOptions; }
int GetDeviceNumber() { return mnDevice; }
- BOOL Open( const char* );
- BOOL Open( int );
+ sal_Bool Open( const char* );
+ sal_Bool Open( int );
void Close();
void ReloadDevices();
void ReloadOptions();
- BOOL Start( BitmapTransporter& );
+ sal_Bool Start( BitmapTransporter& );
inline Link SetReloadOptionsHdl( const Link& rLink );
};
diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx
index 2145a6c371ea..f90bb6c20492 100644
--- a/extensions/source/scanner/sanedlg.cxx
+++ b/extensions/source/scanner/sanedlg.cxx
@@ -49,8 +49,8 @@ ResId SaneResId( sal_uInt32 nID )
SaneDlg::SaneDlg( Window* pParent, Sane& rSane ) :
ModalDialog( pParent, SaneResId( RID_SANE_DIALOG ) ),
mrSane( rSane ),
- mbIsDragging( FALSE ),
- mbDragDrawn( FALSE ),
+ mbIsDragging( sal_False ),
+ mbDragDrawn( sal_False ),
maMapMode( MAP_APPFONT ),
maOKButton( this, SaneResId( RID_SCAN_OK ) ),
maCancelButton( this, SaneResId( RID_SCAN_CANCEL ) ),
@@ -119,12 +119,13 @@ SaneDlg::SaneDlg( Window* pParent, Sane& rSane ) :
Bitmap( SaneResId( RID_SCAN_BITMAP_PLUS ) ),
Bitmap( SaneResId( RID_SCAN_BITMAP_MINUS ) )
);
- maOptionBox.SetWindowBits( WB_HASLINES |
- WB_HASBUTTONS |
- WB_NOINITIALSELECTION |
- WB_HASBUTTONSATROOT |
- WB_HASLINESATROOT
- );
+ maOptionBox.SetStyle( maOptionBox.GetStyle()|
+ WB_HASLINES |
+ WB_HASBUTTONS |
+ WB_NOINITIALSELECTION |
+ WB_HASBUTTONSATROOT |
+ WB_HASLINESATROOT
+ );
FreeResource();
}
@@ -140,7 +141,7 @@ short SaneDlg::Execute()
ErrorBox aErrorBox( NULL, WB_OK | WB_DEF_OK,
String( SaneResId( RID_SANE_NOSANELIB_TXT ) ) );
aErrorBox.Execute();
- return FALSE;
+ return sal_False;
}
LoadState();
return ModalDialog::Execute();
@@ -172,7 +173,7 @@ void SaneDlg::InitFields()
int nOption, i, nValue;
double fValue;
- BOOL bSuccess = FALSE;
+ sal_Bool bSuccess = sal_False;
const char *ppSpecialOptions[] = {
"resolution",
"tl-x",
@@ -182,7 +183,7 @@ void SaneDlg::InitFields()
"preview"
};
- mbDragEnable = TRUE;
+ mbDragEnable = sal_True;
maReslBox.Clear();
maMinTopLeft = Point( 0, 0 );
maMaxBottomRight = Point( PREVIEW_WIDTH, PREVIEW_HEIGHT );
@@ -199,7 +200,7 @@ void SaneDlg::InitFields()
bSuccess = mrSane.GetOptionValue( nOption, fRes );
if( bSuccess )
{
- maReslBox.Enable( TRUE );
+ maReslBox.Enable( sal_True );
maReslBox.SetValue( (long)fRes );
double *pDouble = NULL;
@@ -240,11 +241,11 @@ void SaneDlg::InitFields()
delete [] pDouble;
}
else
- maReslBox.Enable( FALSE );
+ maReslBox.Enable( sal_False );
}
}
else
- maReslBox.Enable( FALSE );
+ maReslBox.Enable( sal_False );
// set scan area
for( i = 0; i < 4; i++ )
@@ -270,7 +271,7 @@ void SaneDlg::InitFields()
pField = &maBottomField;
}
nOption = pOptionName ? mrSane.GetOptionByName( pOptionName ) : -1;
- bSuccess = FALSE;
+ bSuccess = sal_False;
if( nOption != -1 )
{
bSuccess = mrSane.GetOptionValue( nOption, fValue, 0 );
@@ -322,11 +323,11 @@ void SaneDlg::InitFields()
case 3: maMaxBottomRight.Y() = (int)fValue;break;
}
}
- pField->Enable( TRUE );
+ pField->Enable( sal_True );
}
else
{
- mbDragEnable = FALSE;
+ mbDragEnable = sal_False;
pField->SetMin( 0 );
switch( i ) {
case 0:
@@ -354,7 +355,7 @@ void SaneDlg::InitFields()
pField->SetValue( PREVIEW_HEIGHT );
break;
}
- pField->Enable( FALSE );
+ pField->Enable( sal_False );
}
}
maTopLeft = GetPixelPos( maTopLeft );
@@ -366,23 +367,23 @@ void SaneDlg::InitFields()
// fill OptionBox
maOptionBox.Clear();
SvLBoxEntry* pParentEntry = 0;
- BOOL bGroupRejected = FALSE;
+ sal_Bool bGroupRejected = sal_False;
for( i = 1; i < mrSane.CountOptions(); i++ )
{
String aOption=mrSane.GetOptionName( i );
- BOOL bInsertAdvanced =
+ sal_Bool bInsertAdvanced =
mrSane.GetOptionCap( i ) & SANE_CAP_ADVANCED &&
- ! maAdvancedBox.IsChecked() ? FALSE : TRUE;
+ ! maAdvancedBox.IsChecked() ? sal_False : sal_True;
if( mrSane.GetOptionType( i ) == SANE_TYPE_GROUP )
{
if( bInsertAdvanced )
{
aOption = mrSane.GetOptionTitle( i );
pParentEntry = maOptionBox.InsertEntry( aOption );
- bGroupRejected = FALSE;
+ bGroupRejected = sal_False;
}
else
- bGroupRejected = TRUE;
+ bGroupRejected = sal_True;
}
else if( aOption.Len() &&
! ( mrSane.GetOptionCap( i ) &
@@ -392,12 +393,12 @@ void SaneDlg::InitFields()
) ) &&
bInsertAdvanced && ! bGroupRejected )
{
- BOOL bIsSpecial = FALSE;
+ sal_Bool bIsSpecial = sal_False;
for( size_t n = 0; !bIsSpecial &&
n < SAL_N_ELEMENTS(ppSpecialOptions); n++ )
{
if( aOption.EqualsAscii( ppSpecialOptions[n] ) )
- bIsSpecial=TRUE;
+ bIsSpecial=sal_True;
}
if( ! bIsSpecial )
{
@@ -431,7 +432,7 @@ IMPL_LINK( SaneDlg, ClickBtnHdl, Button*, pButton )
{
mrSane.SetOptionValue( mnCurrentOption,
maBoolCheckBox.IsChecked() ?
- (BOOL)TRUE : (BOOL)FALSE );
+ (sal_Bool)sal_True : (sal_Bool)sal_False );
}
else if( pButton == &maButtonOption )
{
@@ -477,7 +478,7 @@ IMPL_LINK( SaneDlg, ClickBtnHdl, Button*, pButton )
{
double fRes = (double)maReslBox.GetValue();
SetAdjustedNumericalValue( "resolution", fRes );
- UpdateScanArea( TRUE );
+ UpdateScanArea( sal_True );
SaveState();
EndDialog( mrSane.IsOpen() ? 1 : 0 );
}
@@ -564,8 +565,8 @@ IMPL_LINK( SaneDlg, OptionsBoxSelectHdl, SvTreeListBox*, pBox )
maVectorBox.SetMin( 1 );
maVectorBox.SetMax(
mrSane.GetOptionElements( mnCurrentOption ) );
- maVectorBox.Show( TRUE );
- maVectorTxt.Show( TRUE );
+ maVectorBox.Show( sal_True );
+ maVectorTxt.Show( sal_True );
}
else
{
@@ -620,7 +621,7 @@ IMPL_LINK( SaneDlg, ModifyHdl, Edit*, pEdit )
if( fRes > pDouble[ 1 ] )
fRes = pDouble[ 1 ];
}
- maReslBox.SetValue( (ULONG)fRes );
+ maReslBox.SetValue( (sal_uLong)fRes );
}
}
else if( pEdit == &maNumericEdit )
@@ -703,7 +704,7 @@ void SaneDlg::AcquirePreview()
if( ! mrSane.IsOpen() )
return;
- UpdateScanArea( TRUE );
+ UpdateScanArea( sal_True );
// set small resolution for preview
double fResl = (double)maReslBox.GetValue();
SetAdjustedNumericalValue( "resolution", 30.0 );
@@ -717,7 +718,7 @@ void SaneDlg::AcquirePreview()
return;
}
else
- mrSane.SetOptionValue( nOption, (BOOL)TRUE );
+ mrSane.SetOptionValue( nOption, (sal_Bool)sal_True );
BitmapTransporter aTransporter;
if( ! mrSane.Start( aTransporter ) )
@@ -733,11 +734,11 @@ void SaneDlg::AcquirePreview()
fprintf( stderr, "Previewbitmapstream contains %d bytes\n", (int)aTransporter.getStream().Tell() );
#endif
aTransporter.getStream().Seek( STREAM_SEEK_TO_BEGIN );
- maPreviewBitmap.Read( aTransporter.getStream(), TRUE );
+ maPreviewBitmap.Read( aTransporter.getStream(), sal_True );
}
SetAdjustedNumericalValue( "resolution", fResl );
- maReslBox.SetValue( (ULONG)fResl );
+ maReslBox.SetValue( (sal_uLong)fResl );
if( mbDragEnable )
{
@@ -780,7 +781,7 @@ void SaneDlg::Paint( const Rectangle& rRect )
DrawBitmap( maPreviewRect.TopLeft(), maPreviewRect.GetSize(),
maPreviewBitmap );
- mbDragDrawn = FALSE;
+ mbDragDrawn = sal_False;
DrawDrag();
ModalDialog::Paint( rRect );
@@ -788,43 +789,43 @@ void SaneDlg::Paint( const Rectangle& rRect )
void SaneDlg::DisableOption()
{
- maBoolCheckBox.Show( FALSE );
- maStringEdit.Show( FALSE );
- maNumericEdit.Show( FALSE );
- maQuantumRangeBox.Show( FALSE );
- maStringRangeBox.Show( FALSE );
- maButtonOption.Show( FALSE );
- maVectorBox.Show( FALSE );
- maVectorTxt.Show( FALSE );
- maOptionDescTxt.Show( FALSE );
+ maBoolCheckBox.Show( sal_False );
+ maStringEdit.Show( sal_False );
+ maNumericEdit.Show( sal_False );
+ maQuantumRangeBox.Show( sal_False );
+ maStringRangeBox.Show( sal_False );
+ maButtonOption.Show( sal_False );
+ maVectorBox.Show( sal_False );
+ maVectorTxt.Show( sal_False );
+ maOptionDescTxt.Show( sal_False );
}
void SaneDlg::EstablishBoolOption()
{
- BOOL bSuccess, bValue;
+ sal_Bool bSuccess, bValue;
bSuccess = mrSane.GetOptionValue( mnCurrentOption, bValue );
if( bSuccess )
{
maOptionDescTxt.SetText( mrSane.GetOptionName( mnCurrentOption ) );
- maOptionDescTxt.Show( TRUE );
+ maOptionDescTxt.Show( sal_True );
maBoolCheckBox.Check( bValue );
- maBoolCheckBox.Show( TRUE );
+ maBoolCheckBox.Show( sal_True );
}
}
void SaneDlg::EstablishStringOption()
{
- BOOL bSuccess;
+ sal_Bool bSuccess;
ByteString aValue;
bSuccess = mrSane.GetOptionValue( mnCurrentOption, aValue );
if( bSuccess )
{
maOptionDescTxt.SetText( mrSane.GetOptionName( mnCurrentOption ) );
- maOptionDescTxt.Show( TRUE );
+ maOptionDescTxt.Show( sal_True );
maStringEdit.SetText( String( aValue, osl_getThreadTextEncoding() ) );
- maStringEdit.Show( TRUE );
+ maStringEdit.Show( sal_True );
}
}
@@ -837,9 +838,9 @@ void SaneDlg::EstablishStringRange()
ByteString aValue;
mrSane.GetOptionValue( mnCurrentOption, aValue );
maStringRangeBox.SelectEntry( String( aValue, osl_getThreadTextEncoding() ) );
- maStringRangeBox.Show( TRUE );
+ maStringRangeBox.Show( sal_True );
maOptionDescTxt.SetText( mrSane.GetOptionName( mnCurrentOption ) );
- maOptionDescTxt.Show( TRUE );
+ maOptionDescTxt.Show( sal_True );
}
void SaneDlg::EstablishQuantumRange()
@@ -875,18 +876,18 @@ void SaneDlg::EstablishQuantumRange()
sprintf( pBuf, "%g", fValue );
maQuantumRangeBox.SelectEntry( String( pBuf, osl_getThreadTextEncoding() ) );
}
- maQuantumRangeBox.Show( TRUE );
+ maQuantumRangeBox.Show( sal_True );
String aText( mrSane.GetOptionName( mnCurrentOption ) );
aText += ' ';
aText += mrSane.GetOptionUnitName( mnCurrentOption );
maOptionDescTxt.SetText( aText );
- maOptionDescTxt.Show( TRUE );
+ maOptionDescTxt.Show( sal_True );
}
}
void SaneDlg::EstablishNumericOption()
{
- BOOL bSuccess;
+ sal_Bool bSuccess;
double fValue;
bSuccess = mrSane.GetOptionValue( mnCurrentOption, fValue );
@@ -903,17 +904,17 @@ void SaneDlg::EstablishNumericOption()
aText += String( pBuf, osl_getThreadTextEncoding() );
}
maOptionDescTxt.SetText( aText );
- maOptionDescTxt.Show( TRUE );
+ maOptionDescTxt.Show( sal_True );
sprintf( pBuf, "%g", fValue );
maNumericEdit.SetText( String( pBuf, osl_getThreadTextEncoding() ) );
- maNumericEdit.Show( TRUE );
+ maNumericEdit.Show( sal_True );
}
void SaneDlg::EstablishButtonOption()
{
maOptionDescTxt.SetText( mrSane.GetOptionName( mnCurrentOption ) );
- maOptionDescTxt.Show( TRUE );
- maButtonOption.Show( TRUE );
+ maOptionDescTxt.Show( sal_True );
+ maButtonOption.Show( sal_True );
}
#define RECT_SIZE_PIX 7
@@ -958,7 +959,7 @@ void SaneDlg::MouseMove( const MouseEvent& rMEvt )
maBottomRight.Y() = nSwap;
}
DrawDrag();
- UpdateScanArea( FALSE );
+ UpdateScanArea( sal_False );
}
ModalDialog::MouseMove( rMEvt );
}
@@ -979,21 +980,21 @@ void SaneDlg::MouseButtonDown( const MouseEvent& rMEvt )
{
meDragDirection = TopLeft;
aMousePixel = maTopLeft;
- mbIsDragging = TRUE;
+ mbIsDragging = sal_True;
}
else if( aMousePixel.X() >= nMiddleX &&
aMousePixel.X() < nMiddleX + RECT_SIZE_PIX )
{
meDragDirection = Top;
aMousePixel.Y() = maTopLeft.Y();
- mbIsDragging = TRUE;
+ mbIsDragging = sal_True;
}
else if( aMousePixel.X() > maBottomRight.X() - RECT_SIZE_PIX &&
aMousePixel.X() <= maBottomRight.X() )
{
meDragDirection = TopRight;
aMousePixel = Point( maBottomRight.X(), maTopLeft.Y() );
- mbIsDragging = TRUE;
+ mbIsDragging = sal_True;
}
}
else if( aMousePixel.Y() >= nMiddleY &&
@@ -1004,14 +1005,14 @@ void SaneDlg::MouseButtonDown( const MouseEvent& rMEvt )
{
meDragDirection = Left;
aMousePixel.X() = maTopLeft.X();
- mbIsDragging = TRUE;
+ mbIsDragging = sal_True;
}
else if( aMousePixel.X() > maBottomRight.X() - RECT_SIZE_PIX &&
aMousePixel.X() <= maBottomRight.X() )
{
meDragDirection = Right;
aMousePixel.X() = maBottomRight.X();
- mbIsDragging = TRUE;
+ mbIsDragging = sal_True;
}
}
else if( aMousePixel.Y() <= maBottomRight.Y() &&
@@ -1022,21 +1023,21 @@ void SaneDlg::MouseButtonDown( const MouseEvent& rMEvt )
{
meDragDirection = BottomLeft;
aMousePixel = Point( maTopLeft.X(), maBottomRight.Y() );
- mbIsDragging = TRUE;
+ mbIsDragging = sal_True;
}
else if( aMousePixel.X() >= nMiddleX &&
aMousePixel.X() < nMiddleX + RECT_SIZE_PIX )
{
meDragDirection = Bottom;
aMousePixel.Y() = maBottomRight.Y();
- mbIsDragging = TRUE;
+ mbIsDragging = sal_True;
}
else if( aMousePixel.X() > maBottomRight.X() - RECT_SIZE_PIX &&
aMousePixel.X() <= maBottomRight.X() )
{
meDragDirection = BottomRight;
aMousePixel = maBottomRight;
- mbIsDragging = TRUE;
+ mbIsDragging = sal_True;
}
}
}
@@ -1052,9 +1053,9 @@ void SaneDlg::MouseButtonUp( const MouseEvent& rMEvt )
{
if( mbIsDragging )
{
- UpdateScanArea( TRUE );
+ UpdateScanArea( sal_True );
}
- mbIsDragging = FALSE;
+ mbIsDragging = sal_False;
ModalDialog::MouseButtonUp( rMEvt );
}
@@ -1101,7 +1102,7 @@ void SaneDlg::DrawDrag()
aLastBR = maBottomRight;
DrawRectangles( maTopLeft, maBottomRight );
- mbDragDrawn = TRUE;
+ mbDragDrawn = sal_True;
SetRasterOp( eROP );
SetMapMode( maMapMode );
}
@@ -1140,7 +1141,7 @@ Point SaneDlg::GetLogicPos( const Point& rIn )
return aConvert;
}
-void SaneDlg::UpdateScanArea( BOOL bSend )
+void SaneDlg::UpdateScanArea( sal_Bool bSend )
{
if( ! mbDragEnable )
return;
@@ -1165,25 +1166,25 @@ void SaneDlg::UpdateScanArea( BOOL bSend )
}
}
-BOOL SaneDlg::LoadState()
+sal_Bool SaneDlg::LoadState()
{
int i;
if( ! Sane::IsSane() )
- return FALSE;
+ return sal_False;
const char* pEnv = getenv("HOME");
String aFileName( pEnv ? pEnv : "", osl_getThreadTextEncoding() );
aFileName += String( RTL_CONSTASCII_USTRINGPARAM( "/.so_sane_state" ) );
Config aConfig( aFileName );
if( ! aConfig.HasGroup( "SANE" ) )
- return FALSE;
+ return sal_False;
aConfig.SetGroup( "SANE" );
ByteString aString = aConfig.ReadKey( "SO_LastSaneDevice" );
for( i = 0; i < Sane::CountDevices() && ! aString.Equals( ByteString( Sane::GetName( i ), osl_getThreadTextEncoding() ) ); i++ ) ;
if( i == Sane::CountDevices() )
- return FALSE;
+ return sal_False;
mrSane.Close();
mrSane.Open( aString.GetBuffer() );
@@ -1204,7 +1205,7 @@ BOOL SaneDlg::LoadState()
if( aValue.CompareTo( "BOOL=", 5 ) == COMPARE_EQUAL )
{
aValue.Erase( 0, 5 );
- BOOL aBOOL = (BOOL)aValue.ToInt32();
+ sal_Bool aBOOL = (sal_Bool)aValue.ToInt32();
mrSane.SetOptionValue( nOption, aBOOL );
}
else if( aValue.CompareTo( "STRING=", 7 ) == COMPARE_EQUAL )
@@ -1231,7 +1232,7 @@ BOOL SaneDlg::LoadState()
DisableOption();
InitFields();
- return TRUE;
+ return sal_True;
}
void SaneDlg::SaveState()
@@ -1266,7 +1267,7 @@ void SaneDlg::SaveState()
{
case SANE_TYPE_BOOL:
{
- BOOL bValue;
+ sal_Bool bValue;
if( mrSane.GetOptionValue( nOption, bValue ) )
{
ByteString aString( "BOOL=" );
@@ -1314,22 +1315,22 @@ void SaneDlg::SaveState()
}
}
-BOOL SaneDlg::SetAdjustedNumericalValue(
+sal_Bool SaneDlg::SetAdjustedNumericalValue(
const char* pOption,
double fValue,
int nElement )
{
int nOption;
if( ! Sane::IsSane() || ! mrSane.IsOpen() || ( nOption = mrSane.GetOptionByName( pOption ) ) == -1 )
- return FALSE;
+ return sal_False;
if( nElement < 0 || nElement >= mrSane.GetOptionElements( nOption ) )
- return FALSE;
+ return sal_False;
double* pValues = NULL;
int nValues;
if( ( nValues = mrSane.GetRange( nOption, pValues ) ) < 0 )
- return FALSE;
+ return sal_False;
#if OSL_DEBUG_LEVEL > 1
fprintf( stderr, "SaneDlg::SetAdjustedNumericalValue( \"%s\", %lg ) ",
@@ -1364,7 +1365,7 @@ BOOL SaneDlg::SetAdjustedNumericalValue(
#endif
- return TRUE;
+ return sal_True;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/scanner/sanedlg.hxx b/extensions/source/scanner/sanedlg.hxx
index 8019f5b38d5c..c3f72eafaebe 100644
--- a/extensions/source/scanner/sanedlg.hxx
+++ b/extensions/source/scanner/sanedlg.hxx
@@ -51,10 +51,10 @@ private:
Rectangle maPreviewRect;
Point maTopLeft, maBottomRight;
Point maMinTopLeft, maMaxBottomRight;
- BOOL mbDragEnable;
- BOOL mbIsDragging;
+ sal_Bool mbDragEnable;
+ sal_Bool mbIsDragging;
int mnDragMode;
- BOOL mbDragDrawn;
+ sal_Bool mbDragDrawn;
DragDirection meDragDirection;
MapMode maMapMode;
@@ -114,7 +114,7 @@ private:
DECL_LINK( OptionsBoxSelectHdl, SvTreeListBox* );
void SaveState();
- BOOL LoadState();
+ sal_Bool LoadState();
void InitDevices();
void InitFields();
@@ -131,10 +131,10 @@ private:
void DrawDrag();
Point GetPixelPos( const Point& );
Point GetLogicPos( const Point& );
- void UpdateScanArea( BOOL );
+ void UpdateScanArea( sal_Bool );
// helper
- BOOL SetAdjustedNumericalValue( const char* pOption, double fValue, int nElement = 0 );
+ sal_Bool SetAdjustedNumericalValue( const char* pOption, double fValue, int nElement = 0 );
virtual void Paint( const Rectangle& );
virtual void MouseMove( const MouseEvent& rMEvt );
diff --git a/extensions/source/scanner/sanedlg.src b/extensions/source/scanner/sanedlg.src
index 2c4cc338ab8a..961f0ed39cf1 100644
--- a/extensions/source/scanner/sanedlg.src
+++ b/extensions/source/scanner/sanedlg.src
@@ -27,6 +27,7 @@
#include <sanedlg.hrc>
ModalDialog RID_SANE_DIALOG
{
+ HelpID = "extensions:ModalDialog:RID_SANE_DIALOG";
OutputSize = TRUE ;
SVLook = TRUE ;
Pos = MAP_APPFONT ( 10 , 10 ) ;
@@ -46,12 +47,14 @@ ModalDialog RID_SANE_DIALOG
};
PushButton RID_DEVICEINFO_BTN
{
+ HelpID = "extensions:PushButton:RID_SANE_DIALOG:RID_DEVICEINFO_BTN";
Pos = MAP_APPFONT ( THIRD_COLUMN , 44 ) ;
Size = MAP_APPFONT ( 55 , 22 ) ;
Text [ en-US ] = "About\n Dev~ice" ;
};
PushButton RID_PREVIEW_BTN
{
+ HelpID = "extensions:PushButton:RID_SANE_DIALOG:RID_PREVIEW_BTN";
Pos = MAP_APPFONT ( THIRD_COLUMN , 71 ) ;
Size = MAP_APPFONT ( 55 , 22 ) ;
Text [ en-US ] = "Create\nPreview" ;
@@ -76,6 +79,7 @@ ModalDialog RID_SANE_DIALOG
};
MetricField RID_SCAN_LEFT_BOX
{
+ HelpID = "extensions:MetricField:RID_SANE_DIALOG:RID_SCAN_LEFT_BOX";
Spin = TRUE ;
Repeat = TRUE ;
Border = TRUE ;
@@ -90,6 +94,7 @@ ModalDialog RID_SANE_DIALOG
};
MetricField RID_SCAN_TOP_BOX
{
+ HelpID = "extensions:MetricField:RID_SANE_DIALOG:RID_SCAN_TOP_BOX";
Spin = TRUE ;
Repeat = TRUE ;
Border = TRUE ;
@@ -104,6 +109,7 @@ ModalDialog RID_SANE_DIALOG
};
MetricField RID_SCAN_RIGHT_BOX
{
+ HelpID = "extensions:MetricField:RID_SANE_DIALOG:RID_SCAN_RIGHT_BOX";
Spin = TRUE ;
Repeat = TRUE ;
Border = TRUE ;
@@ -118,6 +124,7 @@ ModalDialog RID_SANE_DIALOG
};
MetricField RID_SCAN_BOTTOM_BOX
{
+ HelpID = "extensions:MetricField:RID_SANE_DIALOG:RID_SCAN_BOTTOM_BOX";
Spin = TRUE ;
Repeat = TRUE ;
Border = TRUE ;
@@ -132,6 +139,7 @@ ModalDialog RID_SANE_DIALOG
};
ListBox RID_DEVICE_BOX
{
+ HelpID = "extensions:ListBox:RID_SANE_DIALOG:RID_DEVICE_BOX";
Border = TRUE ;
Dropdown = TRUE ;
Sort = TRUE ;
@@ -146,6 +154,7 @@ ModalDialog RID_SANE_DIALOG
};
NumericBox RID_SCAN_RESOLUTION_BOX
{
+ HelpID = "extensions:NumericBox:RID_SANE_DIALOG:RID_SCAN_RESOLUTION_BOX";
Dropdown = TRUE ;
Pos = MAP_APPFONT ( SECOND_COLUMN + 70 , 23 ) ;
Size = MAP_APPFONT ( 60 , 80 ) ;
@@ -158,6 +167,7 @@ ModalDialog RID_SANE_DIALOG
};
CheckBox RID_SCAN_ADVANCED_BOX
{
+ HelpID = "extensions:CheckBox:RID_SANE_DIALOG:RID_SCAN_ADVANCED_BOX";
Check = FALSE ;
Pos = MAP_APPFONT ( SECOND_COLUMN + 120 , 40 ) ;
Size = MAP_APPFONT ( 8 , 8 ) ;
@@ -188,17 +198,20 @@ ModalDialog RID_SANE_DIALOG
};
CheckBox RID_SCAN_BOOL_OPTION_BOX
{
+ HelpID = "extensions:CheckBox:RID_SANE_DIALOG:RID_SCAN_BOOL_OPTION_BOX";
Pos = MAP_APPFONT ( SECOND_COLUMN + 120 , 225 ) ;
Size = MAP_APPFONT ( 8 , 8 ) ;
};
Edit RID_SCAN_STRING_OPTION_EDT
{
+ HelpID = "extensions:Edit:RID_SANE_DIALOG:RID_SCAN_STRING_OPTION_EDT";
Border = TRUE ;
Pos = MAP_APPFONT ( SECOND_COLUMN , 234 ) ;
Size = MAP_APPFONT ( 130 , 12 ) ;
};
ListBox RID_SCAN_QUANTUM_RANGE_BOX
{
+ HelpID = "extensions:ListBox:RID_SANE_DIALOG:RID_SCAN_QUANTUM_RANGE_BOX";
Border = TRUE ;
Dropdown = TRUE ;
Pos = MAP_APPFONT ( SECOND_COLUMN , 234 ) ;
@@ -206,6 +219,7 @@ ModalDialog RID_SANE_DIALOG
};
ListBox RID_SCAN_STRING_RANGE_BOX
{
+ HelpID = "extensions:ListBox:RID_SANE_DIALOG:RID_SCAN_STRING_RANGE_BOX";
Border = TRUE ;
Dropdown = TRUE ;
Pos = MAP_APPFONT ( SECOND_COLUMN , 234 ) ;
@@ -213,6 +227,7 @@ ModalDialog RID_SANE_DIALOG
};
Edit RID_SCAN_NUMERIC_OPTION_EDT
{
+ HelpID = "extensions:Edit:RID_SANE_DIALOG:RID_SCAN_NUMERIC_OPTION_EDT";
Border = TRUE ;
Pos = MAP_APPFONT ( SECOND_COLUMN , 234 ) ;
Size = MAP_APPFONT ( 130 , 12 ) ;
@@ -225,6 +240,7 @@ ModalDialog RID_SANE_DIALOG
};
NumericField RID_SCAN_NUMERIC_VECTOR_BOX
{
+ HelpID = "extensions:NumericField:RID_SANE_DIALOG:RID_SCAN_NUMERIC_VECTOR_BOX";
Border = TRUE ;
Spin = TRUE ;
Repeat = TRUE ;
@@ -233,6 +249,7 @@ ModalDialog RID_SANE_DIALOG
};
PushButton RID_SCAN_BUTTON_OPTION_BTN
{
+ HelpID = "extensions:PushButton:RID_SANE_DIALOG:RID_SCAN_BUTTON_OPTION_BTN";
Pos = MAP_APPFONT ( SECOND_COLUMN , 234 ) ;
Size = MAP_APPFONT ( 130 , 14 ) ;
Text [ en-US ] = "Set" ;
diff --git a/extensions/source/scanner/scanner.hxx b/extensions/source/scanner/scanner.hxx
index 15af9d83f144..abe2ae3694c8 100644
--- a/extensions/source/scanner/scanner.hxx
+++ b/extensions/source/scanner/scanner.hxx
@@ -83,7 +83,7 @@ public:
// XScannerManager
virtual SEQ( ScannerContext ) SAL_CALL getAvailableScanners() throw();
- virtual BOOL SAL_CALL configureScanner( ScannerContext& scanner_context ) throw( ScannerException );
+ virtual sal_Bool SAL_CALL configureScanner( ScannerContext& scanner_context ) throw( ScannerException );
virtual void SAL_CALL startScan( const ScannerContext& scanner_context, const REF( com::sun::star::lang::XEventListener )& rxListener ) throw( ScannerException );
virtual ScanError SAL_CALL getError( const ScannerContext& scanner_context ) throw( ScannerException );
virtual REF( AWT::XBitmap ) SAL_CALL getBitmap( const ScannerContext& scanner_context ) throw( ScannerException );
diff --git a/extensions/source/scanner/scanunx.cxx b/extensions/source/scanner/scanunx.cxx
index a94a97982c28..1f481f668a7e 100644
--- a/extensions/source/scanner/scanunx.cxx
+++ b/extensions/source/scanner/scanunx.cxx
@@ -32,6 +32,7 @@
#include <sanedlg.hxx>
#include <osl/thread.hxx>
#include <boost/shared_ptr.hpp>
+#include <boost/shared_ptr.hpp>
#if OSL_DEBUG_LEVEL > 1
#include <stdio.h>
@@ -203,7 +204,7 @@ void ScannerThread::run()
{
int nOption = m_pHolder->m_aSane.GetOptionByName( "preview" );
if( nOption != -1 )
- m_pHolder->m_aSane.SetOptionValue( nOption, (BOOL)FALSE );
+ m_pHolder->m_aSane.SetOptionValue( nOption, (sal_Bool)sal_False );
m_pHolder->m_nError =
m_pHolder->m_aSane.Start( *pTransporter ) ?
@@ -277,7 +278,7 @@ SEQ( ScannerContext ) ScannerManager::getAvailableScanners() throw()
// -----------------------------------------------------------------------------
-BOOL ScannerManager::configureScanner( ScannerContext& scanner_context ) throw( ScannerException )
+sal_Bool ScannerManager::configureScanner( ScannerContext& scanner_context ) throw( ScannerException )
{
osl::MutexGuard aGuard( theSaneProtector::get() );
sanevec &rSanes = theSanes::get().m_aSanes;
@@ -286,7 +287,7 @@ BOOL ScannerManager::configureScanner( ScannerContext& scanner_context ) throw(
fprintf( stderr, "ScannerManager::configureScanner\n" );
#endif
- if( scanner_context.InternalData < 0 || (ULONG)scanner_context.InternalData >= rSanes.size() )
+ if( scanner_context.InternalData < 0 || (sal_uLong)scanner_context.InternalData >= rSanes.size() )
throw ScannerException(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Scanner does not exist")),
REF( XScannerManager )( this ),
@@ -303,7 +304,7 @@ BOOL ScannerManager::configureScanner( ScannerContext& scanner_context ) throw(
pHolder->m_bBusy = true;
SaneDlg aDlg( NULL, pHolder->m_aSane );
- BOOL bRet = (BOOL)aDlg.Execute();
+ sal_Bool bRet = (sal_Bool)aDlg.Execute();
pHolder->m_bBusy = false;
return bRet;
@@ -321,7 +322,7 @@ void ScannerManager::startScan( const ScannerContext& scanner_context,
fprintf( stderr, "ScannerManager::startScan\n" );
#endif
- if( scanner_context.InternalData < 0 || (ULONG)scanner_context.InternalData >= rSanes.size() )
+ if( scanner_context.InternalData < 0 || (sal_uLong)scanner_context.InternalData >= rSanes.size() )
throw ScannerException(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Scanner does not exist")),
REF( XScannerManager )( this ),
@@ -347,7 +348,7 @@ ScanError ScannerManager::getError( const ScannerContext& scanner_context ) thro
osl::MutexGuard aGuard( theSaneProtector::get() );
sanevec &rSanes = theSanes::get().m_aSanes;
- if( scanner_context.InternalData < 0 || (ULONG)scanner_context.InternalData >= rSanes.size() )
+ if( scanner_context.InternalData < 0 || (sal_uLong)scanner_context.InternalData >= rSanes.size() )
throw ScannerException(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Scanner does not exist")),
REF( XScannerManager )( this ),
@@ -366,7 +367,7 @@ REF( AWT::XBitmap ) ScannerManager::getBitmap( const ScannerContext& scanner_con
osl::MutexGuard aGuard( theSaneProtector::get() );
sanevec &rSanes = theSanes::get().m_aSanes;
- if( scanner_context.InternalData < 0 || (ULONG)scanner_context.InternalData >= rSanes.size() )
+ if( scanner_context.InternalData < 0 || (sal_uLong)scanner_context.InternalData >= rSanes.size() )
throw ScannerException(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Scanner does not exist")),
REF( XScannerManager )( this ),
diff --git a/extensions/source/scanner/scanwin.cxx b/extensions/source/scanner/scanwin.cxx
index b292833cf375..963d89287e2d 100644
--- a/extensions/source/scanner/scanwin.cxx
+++ b/extensions/source/scanner/scanwin.cxx
@@ -75,10 +75,7 @@ using namespace ::com::sun::star;
#define FIXTODOUBLE( nFix ) ((double)nFix.Whole+(double)nFix.Frac/65536.)
#define FIXTOLONG( nFix ) ((long)floor(FIXTODOUBLE(nFix)+0.5))
-#if defined WIN
-#define TWAIN_LIBNAME "TWAIN.DLL"
-#define TWAIN_FUNCNAME "DSM_Entry"
-#elif defined WNT
+#if defined WNT
#define TWAIN_LIBNAME "TWAIN_32.DLL"
#define TWAIN_FUNCNAME "DSM_Entry"
#endif
@@ -1005,7 +1002,7 @@ SEQ( ScannerContext ) SAL_CALL ScannerManager::getAvailableScanners() throw()
// -----------------------------------------------------------------------------
-BOOL SAL_CALL ScannerManager::configureScanner( ScannerContext& rContext )
+sal_Bool SAL_CALL ScannerManager::configureScanner( ScannerContext& rContext )
throw( ScannerException )
{
osl::MutexGuard aGuard( maProtector );
diff --git a/extensions/source/scanner/scn.component b/extensions/source/scanner/scn.component
new file mode 100644
index 000000000000..d7daf3ae36d4
--- /dev/null
+++ b/extensions/source/scanner/scn.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+ xmlns="http://openoffice.org/2010/uno-components">
+ <implementation name="com.sun.star.scanner.ScannerManager">
+ <service name="com.sun.star.scanner.ScannerManager"/>
+ </implementation>
+</component>
diff --git a/extensions/source/scanner/scnserv.cxx b/extensions/source/scanner/scnserv.cxx
index 9e58a0ece115..6f18a8ed607e 100644
--- a/extensions/source/scanner/scnserv.cxx
+++ b/extensions/source/scanner/scnserv.cxx
@@ -46,37 +46,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char*
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
-// -----------------------
-// - component_writeInfo -
-// -----------------------
-
-extern "C" sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistryKey )
-{
- sal_Bool bRet = sal_False;
-
- if( pRegistryKey )
- {
- try
- {
- ::rtl::OUString aImplName( '/' );
-
- aImplName += ScannerManager::getImplementationName_Static();
- aImplName += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES/" ) );
- aImplName += ScannerManager::getImplementationName_Static();
-
- REF( XRegistryKey ) xNewKey1( static_cast< XRegistryKey* >( pRegistryKey )->createKey( aImplName ) );
-
- bRet = sal_True;
- }
- catch( InvalidRegistryException& )
- {
- OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
- }
- }
-
- return bRet;
-}
-
// ------------------------
// - component_getFactory -
// ------------------------
diff --git a/extensions/source/scanner/twain.cxx b/extensions/source/scanner/twain.cxx
index 2b6647e4e7d6..1bbc9128af3d 100644
--- a/extensions/source/scanner/twain.cxx
+++ b/extensions/source/scanner/twain.cxx
@@ -32,7 +32,7 @@
#include <string.h>
#include <math.h>
-#if defined( WNT ) || defined (WIN)
+#if defined( WNT )
#include <tools/svwin.h>
#endif
#ifdef OS2
@@ -53,10 +53,7 @@
#define FIXTODOUBLE( nFix ) ((double)nFix.Whole+(double)nFix.Frac/65536.)
#define FIXTOLONG( nFix ) ((long)floor(FIXTODOUBLE(nFix)+0.5))
-#if defined WIN
-#define TWAIN_LIBNAME "TWAIN.DLL"
-#define TWAIN_FUNCNAME "DSM_Entry"
-#elif defined WNT
+#if defined WNT
#define TWAIN_LIBNAME "TWAIN_32.DLL"
#define TWAIN_FUNCNAME "DSM_Entry"
#elif defined OS2
@@ -180,7 +177,7 @@ void ImpTwain::Destroy()
// -----------------------------------------------------------------------------
-BOOL ImpTwain::SelectSource()
+sal_Bool ImpTwain::SelectSource()
{
TW_UINT16 nRet = TWRC_FAILURE;
@@ -205,9 +202,9 @@ BOOL ImpTwain::SelectSource()
// -----------------------------------------------------------------------------
-BOOL ImpTwain::InitXfer()
+sal_Bool ImpTwain::InitXfer()
{
- BOOL bRet = FALSE;
+ sal_Bool bRet = sal_False;
if( !!aBitmap )
aBitmap = Bitmap();
@@ -439,7 +436,7 @@ void ImpTwain::ImplFallback( ULONG nEvent )
IMPL_LINK( ImpTwain, ImplFallbackHdl, void*, pData )
{
const ULONG nEvent = (ULONG) pData;
- BOOL bFallback = TRUE;
+ sal_Bool bFallback = sal_True;
switch( nCurState )
{
@@ -494,7 +491,7 @@ IMPL_LINK( ImpTwain, ImplFallbackHdl, void*, pData )
if( nEvent != TWAIN_EVENT_NONE )
aNotifyLink.Call( (void*) nEvent );
- bFallback = FALSE;
+ bFallback = sal_False;
}
break;
}
diff --git a/extensions/source/scanner/twain.hxx b/extensions/source/scanner/twain.hxx
index 446748c920fb..95d6c5871bd9 100644
--- a/extensions/source/scanner/twain.hxx
+++ b/extensions/source/scanner/twain.hxx
@@ -59,21 +59,21 @@ class ImpTwain
Bitmap aBitmap;
DSMENTRYPROC pDSM;
osl::Module pMod;
- ULONG nCurState;
+ sal_uLong nCurState;
void ImplCreate();
void ImplOpenSourceManager();
void ImplOpenSource();
- BOOL ImplEnableSource();
+ sal_Bool ImplEnableSource();
void ImplXfer();
- void ImplFallback( ULONG nEvent );
+ void ImplFallback( sal_uLong nEvent );
DECL_LINK( ImplFallbackHdl, void* );
DECL_LINK( ImplDestroyHdl, void* );
public:
- BOOL ImplHandleMsg( void* pMsg );
+ sal_Bool ImplHandleMsg( void* pMsg );
#ifdef OS2
HAB hAB;
@@ -91,8 +91,8 @@ public:
void Destroy();
- BOOL SelectSource();
- BOOL InitXfer();
+ sal_Bool SelectSource();
+ sal_Bool InitXfer();
Bitmap GetXferBitmap();
};
diff --git a/extensions/source/svg/svgaction.cxx b/extensions/source/svg/svgaction.cxx
index 3936c4008957..324fefa16b6f 100644
--- a/extensions/source/svg/svgaction.cxx
+++ b/extensions/source/svg/svgaction.cxx
@@ -402,7 +402,7 @@ void SVGAttributeWriter::SetFontAttr( const Font& rFont )
delete mpElemPaint, mpElemPaint = NULL;
delete mpElemFont;
mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrStyle, GetFontStyle( maCurFont = rFont ) );
- mpElemFont = new SvXMLElementExport( mrExport, XML_NAMESPACE_NONE, aXMLElemG, TRUE, TRUE );
+ mpElemFont = new SvXMLElementExport( mrExport, XML_NAMESPACE_NONE, aXMLElemG, sal_True, sal_True );
}
}
@@ -414,7 +414,7 @@ void SVGAttributeWriter::SetPaintAttr( const Color& rLineColor, const Color& rFi
{
delete mpElemPaint;
mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrStyle, GetPaintStyle( maCurLineColor = rLineColor, maCurFillColor = rFillColor ) );
- mpElemPaint = new SvXMLElementExport( mrExport, XML_NAMESPACE_NONE, aXMLElemG, TRUE, TRUE );
+ mpElemPaint = new SvXMLElementExport( mrExport, XML_NAMESPACE_NONE, aXMLElemG, sal_True, sal_True );
}
}
@@ -523,7 +523,7 @@ void SVGActionWriter::ImplWriteLine( const Point& rPt1, const Point& rPt2, const
}
{
- SvXMLElementExport aElem( mrExport, XML_NAMESPACE_NONE, aXMLElemLine, TRUE, TRUE );
+ SvXMLElementExport aElem( mrExport, XML_NAMESPACE_NONE, aXMLElemLine, sal_True, sal_True );
}
}
@@ -550,7 +550,7 @@ void SVGActionWriter::ImplWriteRect( const Rectangle& rRect, long nRadX, long nR
mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrStyle, *pStyle );
{
- SvXMLElementExport aElem( mrExport, XML_NAMESPACE_NONE, aXMLElemRect, TRUE, TRUE );
+ SvXMLElementExport aElem( mrExport, XML_NAMESPACE_NONE, aXMLElemRect, sal_True, sal_True );
}
}
@@ -571,7 +571,7 @@ void SVGActionWriter::ImplWriteEllipse( const Point& rCenter, long nRadX, long n
mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrStyle, *pStyle );
{
- SvXMLElementExport aElem( mrExport, XML_NAMESPACE_NONE, aXMLElemEllipse, TRUE, TRUE );
+ SvXMLElementExport aElem( mrExport, XML_NAMESPACE_NONE, aXMLElemEllipse, sal_True, sal_True );
}
}
@@ -588,7 +588,7 @@ void SVGActionWriter::ImplWritePolygon( const Polygon& rPoly, sal_Bool bLineOnly
{
FastString aStyle;
FastString aPoints;
- USHORT i = 0, nSize = rPoly.GetSize();
+ sal_uInt16 i = 0, nSize = rPoly.GetSize();
const NMSP_RTL::OUString aBlank( B2UCONST( " " ) );
// points
@@ -627,7 +627,7 @@ void SVGActionWriter::ImplWritePolygon( const Polygon& rPoly, sal_Bool bLineOnly
{
// write polyline/polygon element
- SvXMLElementExport aElem( mrExport, XML_NAMESPACE_NONE, bLineOnly ? aXMLElemPolyLine : aXMLElemPolygon, TRUE, TRUE );
+ SvXMLElementExport aElem( mrExport, XML_NAMESPACE_NONE, bLineOnly ? aXMLElemPolyLine : aXMLElemPolygon, sal_True, sal_True );
}
}
}
@@ -652,8 +652,8 @@ void SVGActionWriter::ImplWritePolyPolygon( const PolyPolygon& rPolyPoly, sal_Bo
for( long i = 0, nCount = rPolyPoly.Count(); i < nCount; i++ )
{
- const Polygon& rPoly = rPolyPoly[ (USHORT) i ];
- USHORT n = 1, nSize = rPoly.GetSize();
+ const Polygon& rPoly = rPolyPoly[ (sal_uInt16) i ];
+ sal_uInt16 n = 1, nSize = rPoly.GetSize();
if( nSize > 1 )
{
@@ -717,7 +717,7 @@ void SVGActionWriter::ImplWritePolyPolygon( const PolyPolygon& rPolyPoly, sal_Bo
mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrD, aPathData.GetString() );
{
// write polyline/polygon element
- SvXMLElementExport aElem( mrExport, XML_NAMESPACE_NONE, aXMLElemPath, TRUE, TRUE );
+ SvXMLElementExport aElem( mrExport, XML_NAMESPACE_NONE, aXMLElemPath, sal_True, sal_True );
}
}
}
@@ -730,7 +730,7 @@ void SVGActionWriter::ImplWriteGradientEx( const PolyPolygon& rPolyPoly, const G
{
if( rPolyPoly.Count() )
{
- SvXMLElementExport aElemG( mrExport, XML_NAMESPACE_NONE, aXMLElemG, TRUE, TRUE );
+ SvXMLElementExport aElemG( mrExport, XML_NAMESPACE_NONE, aXMLElemG, sal_True, sal_True );
FastString aClipId;
FastString aClipStyle;
@@ -738,12 +738,12 @@ void SVGActionWriter::ImplWriteGradientEx( const PolyPolygon& rPolyPoly, const G
aClipId += NMSP_RTL::OUString::valueOf( ImplGetNextClipId() );
{
- SvXMLElementExport aElemDefs( mrExport, XML_NAMESPACE_NONE, aXMLElemDefs, TRUE, TRUE );
+ SvXMLElementExport aElemDefs( mrExport, XML_NAMESPACE_NONE, aXMLElemDefs, sal_True, sal_True );
mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrId, aClipId.GetString() );
{
- SvXMLElementExport aElemClipPath( mrExport, XML_NAMESPACE_NONE, aXMLElemClipPath, TRUE, TRUE );
+ SvXMLElementExport aElemClipPath( mrExport, XML_NAMESPACE_NONE, aXMLElemClipPath, sal_True, sal_True );
ImplWritePolyPolygon( rPolyPoly, sal_False );
}
}
@@ -757,7 +757,7 @@ void SVGActionWriter::ImplWriteGradientEx( const PolyPolygon& rPolyPoly, const G
{
GDIMetaFile aTmpMtf;
- SvXMLElementExport aElemG2( mrExport, XML_NAMESPACE_NONE, aXMLElemG, TRUE, TRUE );
+ SvXMLElementExport aElemG2( mrExport, XML_NAMESPACE_NONE, aXMLElemG, sal_True, sal_True );
mpVDev->AddGradientActions( rPolyPoly.GetBoundRect(), rGradient, aTmpMtf );
ImplWriteActions( aTmpMtf, pStyle );
@@ -772,7 +772,7 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const String& rText,
const NMSP_RTL::OUString* pStyle )
{
String aText( rText ); aText.EraseLeadingChars( ' ' );
- UINT32 nLen = aText.Len(), i;
+ sal_uInt32 nLen = aText.Len(), i;
if( nLen )
{
@@ -796,7 +796,7 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const String& rText,
if( nLen > 1 )
{
- aNormSize.Width() = pDX[ nLen - 2 ] + mpVDev->GetTextWidth( aText.GetChar( (USHORT) nLen - 1 ) );
+ aNormSize.Width() = pDX[ nLen - 2 ] + mpVDev->GetTextWidth( aText.GetChar( (sal_uInt16) nLen - 1 ) );
if( nWidth && aNormSize.Width() && ( nWidth != aNormSize.Width() ) )
{
@@ -862,7 +862,7 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const String& rText,
aTransform += ')';
mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrTransform, aTransform );
- pTransform = new SvXMLElementExport( mrExport, XML_NAMESPACE_NONE, aXMLElemG, TRUE, TRUE );
+ pTransform = new SvXMLElementExport( mrExport, XML_NAMESPACE_NONE, aXMLElemG, sal_True, sal_True );
}
// add additional style if requested
@@ -873,7 +873,7 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const String& rText,
#ifdef _SVG_USE_TSPANS
if( pDXArray )
{
- SvXMLElementExport aElem( mrExport, XML_NAMESPACE_NONE, aXMLElemText, TRUE, TRUE );
+ SvXMLElementExport aElem( mrExport, XML_NAMESPACE_NONE, aXMLElemText, sal_True, sal_True );
FastString aTSpanX;
const NMSP_RTL::OUString aSpace( ' ' );
long i, nX, nCount;
@@ -895,7 +895,7 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const String& rText,
{
try
{
- SvXMLElementExport aElem( mrExport, XML_NAMESPACE_NONE, aXMLElemTSpan, TRUE, TRUE );
+ SvXMLElementExport aElem( mrExport, XML_NAMESPACE_NONE, aXMLElemTSpan, sal_True, sal_True );
mrExport.GetDocHandler()->characters( NMSP_RTL::OUString( UniString( aText ) ) );
}
catch( ::com::sun::star::xml::sax::SAXException& )
@@ -913,7 +913,7 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const String& rText,
try
{
- SvXMLElementExport aElem( mrExport, XML_NAMESPACE_NONE, aXMLElemText, TRUE, TRUE );
+ SvXMLElementExport aElem( mrExport, XML_NAMESPACE_NONE, aXMLElemText, sal_True, sal_True );
mrExport.GetDocHandler()->characters( NMSP_RTL::OUString( UniString( aText ) ) );
}
catch( ::com::sun::star::xml::sax::SAXException& )
@@ -939,7 +939,7 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const String& rText,
aPoly[ 2 ].X() = aPoly[ 1 ].X(); aPoly[ 2 ].Y() = aPoly[ 0 ].Y() + nLineHeight - 1;
aPoly[ 3 ].X() = aPoly[ 0 ].X(); aPoly[ 3 ].Y() = aPoly[ 2 ].Y();
- ImplWritePolygon( aPoly, FALSE );
+ ImplWritePolygon( aPoly, sal_False );
}
if( rFont.GetUnderline() )
@@ -951,7 +951,7 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const String& rText,
aPoly[ 2 ].X() = aPoly[ 1 ].X(); aPoly[ 2 ].Y() = aPoly[ 0 ].Y() + nLineHeight - 1;
aPoly[ 3 ].X() = aPoly[ 0 ].X(); aPoly[ 3 ].Y() = aPoly[ 2 ].Y();
- ImplWritePolygon( aPoly, FALSE );
+ ImplWritePolygon( aPoly, sal_False );
}
}
@@ -1050,10 +1050,10 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, const NMSP_RTL:
{
ImplAcquireContext();
- for( ULONG i = 0, nCount = rMtf.GetActionCount(); i < nCount; i++ )
+ for( sal_uLong i = 0, nCount = rMtf.GetActionCount(); i < nCount; i++ )
{
const MetaAction* pAction = rMtf.GetAction( i );
- const USHORT nType = pAction->GetType();
+ const sal_uInt16 nType = pAction->GetType();
switch( nType )
{
@@ -1254,7 +1254,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, const NMSP_RTL:
const GDIMetaFile aGDIMetaFile( pA->GetSubstitute() );
sal_Bool bFound = sal_False;
- for( ULONG j = 0, nCount2 = aGDIMetaFile.GetActionCount(); ( j < nCount2 ) && !bFound; j++ )
+ for( sal_uLong j = 0, nCount2 = aGDIMetaFile.GetActionCount(); ( j < nCount2 ) && !bFound; j++ )
{
const MetaAction* pSubstAct = aGDIMetaFile.GetAction( j );
diff --git a/extensions/source/svg/svgaction.hxx b/extensions/source/svg/svgaction.hxx
index b0ab5413ef17..309d20aec6b4 100644
--- a/extensions/source/svg/svgaction.hxx
+++ b/extensions/source/svg/svgaction.hxx
@@ -159,7 +159,7 @@ public:
virtual ~SVGActionWriter();
const VirtualDevice& GetVDev() const { return *mpVDev; }
- BOOL HasDoublePoints() const { return mbDoublePoints; }
+ sal_Bool HasDoublePoints() const { return mbDoublePoints; }
};
#endif
diff --git a/extensions/source/svg/svgprinter.cxx b/extensions/source/svg/svgprinter.cxx
index 15b42ce8841f..288f5bac5d22 100644
--- a/extensions/source/svg/svgprinter.cxx
+++ b/extensions/source/svg/svgprinter.cxx
@@ -72,7 +72,7 @@ private:
protected:
virtual void _ExportMeta() {}
- virtual void _ExportStyles( BOOL /*bUsed*/ ) {}
+ virtual void _ExportStyles( sal_Bool /*bUsed*/ ) {}
virtual void _ExportAutoStyles() {}
virtual void _ExportContent() {}
virtual void _ExportMasterStyles() {}
@@ -140,14 +140,14 @@ SVGPrinterExport::SVGPrinterExport(
mpOuterElement = ImplCreateSVGElement( rSetup, aOutputSize );
// write description
- SvXMLElementExport* pDescElem = new SvXMLElementExport( *this, XML_NAMESPACE_NONE, aXMLElemDesc, TRUE, TRUE );
+ SvXMLElementExport* pDescElem = new SvXMLElementExport( *this, XML_NAMESPACE_NONE, aXMLElemDesc, sal_True, sal_True );
NMSP_RTL::OUString aDesc( B2UCONST( "document name: " ) );
GetDocHandler()->characters( aDesc += rJobName );
delete pDescElem;
// write meta attributes
- ImplWriteMetaAttr( TRUE, FALSE );
+ ImplWriteMetaAttr( sal_True, sal_False );
}
// -----------------------------------------------------------------------------
@@ -167,7 +167,7 @@ SvXMLElementExport* SVGPrinterExport::ImplCreateSVGElement( const JobSetup& rSet
delete mpVDev;
mpVDev = new VirtualDevice;
- mpVDev->EnableOutput( FALSE );
+ mpVDev->EnableOutput( sal_False );
mpVDev->SetMapMode( MAP_100TH_MM );
maPrinter.SetJobSetup( rSetup );
@@ -185,14 +185,14 @@ SvXMLElementExport* SVGPrinterExport::ImplCreateSVGElement( const JobSetup& rSet
aAttr += SVGActionWriter::GetValueString( rOutputSize.Height(), sal_True );
AddAttribute( XML_NAMESPACE_NONE, aXMLAttrViewBox, aAttr );
- return( new SvXMLElementExport( *this, XML_NAMESPACE_NONE, aXMLElemSVG, TRUE, TRUE ) );
+ return( new SvXMLElementExport( *this, XML_NAMESPACE_NONE, aXMLElemSVG, sal_True, sal_True ) );
}
// -----------------------------------------------------------------------------
void SVGPrinterExport::ImplWriteMetaAttr( sal_Bool bOuter, sal_Bool bPage )
{
- SvXMLElementExport aMetaData( *this, XML_NAMESPACE_NONE, aXMLElemMeta, TRUE, TRUE );
+ SvXMLElementExport aMetaData( *this, XML_NAMESPACE_NONE, aXMLElemMeta, sal_True, sal_True );
NMSP_RTL::OUString aAttr;
aAttr = bOuter ? B2UCONST( "true" ) : B2UCONST( "false" );
@@ -202,7 +202,7 @@ void SVGPrinterExport::ImplWriteMetaAttr( sal_Bool bOuter, sal_Bool bPage )
AddAttribute( XML_NAMESPACE_NONE, aXMLAttrMetaSVGPage, aAttr );
{
- delete( new SvXMLElementExport( *this, XML_NAMESPACE_NONE, aXMLElemMetaSVG, TRUE, TRUE ) );
+ delete( new SvXMLElementExport( *this, XML_NAMESPACE_NONE, aXMLElemMetaSVG, sal_True, sal_True ) );
}
}
@@ -215,14 +215,14 @@ void SVGPrinterExport::writePage( const JobSetup& rSetup, const GDIMetaFile& rMt
SvXMLElementExport* pPageElem = ImplCreateSVGElement( rSetup, aOutputSize );
// write description
- SvXMLElementExport* pDescElem = new SvXMLElementExport( *this, XML_NAMESPACE_NONE, aXMLElemDesc, TRUE, TRUE );
+ SvXMLElementExport* pDescElem = new SvXMLElementExport( *this, XML_NAMESPACE_NONE, aXMLElemDesc, sal_True, sal_True );
NMSP_RTL::OUString aDesc( B2UCONST( "page: " ) );
GetDocHandler()->characters( aDesc += NMSP_RTL::OUString::valueOf( (sal_Int32) ++mnPage ) );
delete pDescElem;
// write meta attributes
- ImplWriteMetaAttr( FALSE, TRUE );
+ ImplWriteMetaAttr( sal_False, sal_True );
// write dummy rect element
aAttr = B2UCONST( "0.0" );
@@ -235,8 +235,8 @@ void SVGPrinterExport::writePage( const JobSetup& rSetup, const GDIMetaFile& rMt
aAttr = SVGActionWriter::GetValueString( aOutputSize.Height(), sal_True );
AddAttribute( XML_NAMESPACE_NONE, aXMLAttrHeight, aAttr );
- delete( new SvXMLElementExport( *this, XML_NAMESPACE_NONE, aXMLElemRect, TRUE, TRUE ) );
- delete( new SVGActionWriter( *this, rMtf, mpVDev, TRUE ) );
+ delete( new SvXMLElementExport( *this, XML_NAMESPACE_NONE, aXMLElemRect, sal_True, sal_True ) );
+ delete( new SVGActionWriter( *this, rMtf, mpVDev, sal_True ) );
delete pPageElem;
}
diff --git a/extensions/source/svg/svguno.cxx b/extensions/source/svg/svguno.cxx
index 6cd5c258e66a..7fb81d407452 100644
--- a/extensions/source/svg/svguno.cxx
+++ b/extensions/source/svg/svguno.cxx
@@ -61,36 +61,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
-// -----------------------
-// - component_writeInfo -
-// -----------------------
-
-extern "C" sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistryKey )
-{
- sal_Bool bRet = sal_False;
-
- if( pRegistryKey )
- {
- try
- {
- REF( NMSP_REGISTRY::XRegistryKey ) xNewKey1(
- static_cast< NMSP_REGISTRY::XRegistryKey* >( pRegistryKey )->createKey(
- B2UCONST( "/com.sun.star.comp.extensions.SVGWriter/UNO/SERVICES/com.sun.star.svg.SVGWriter" ) ) );
- REF( NMSP_REGISTRY::XRegistryKey ) xNewKey2(
- static_cast< NMSP_REGISTRY::XRegistryKey* >( pRegistryKey )->createKey(
- B2UCONST( "/com.sun.star.comp.extensions.SVGPrinter/UNO/SERVICES/com.sun.star.svg.SVGPrinter" ) ) );
-
- bRet = sal_True;
- }
- catch( NMSP_REGISTRY::InvalidRegistryException& )
- {
- OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
- }
- }
-
- return bRet;
-}
-
// ------------------------
// - component_getFactory -
// ------------------------
diff --git a/extensions/source/svg/svgwriter.cxx b/extensions/source/svg/svgwriter.cxx
index 5344d516e87e..e89c69e4b4e1 100644
--- a/extensions/source/svg/svgwriter.cxx
+++ b/extensions/source/svg/svgwriter.cxx
@@ -46,7 +46,7 @@ private:
protected:
virtual void _ExportMeta() {}
- virtual void _ExportStyles( BOOL /*bUsed*/ ) {}
+ virtual void _ExportStyles( sal_Bool /*bUsed*/ ) {}
virtual void _ExportAutoStyles() {}
virtual void _ExportContent() {}
virtual void _ExportMasterStyles() {}
@@ -106,7 +106,7 @@ void SVGMtfExport::writeMtf( const GDIMetaFile& rMtf )
AddAttribute( XML_NAMESPACE_NONE, "viewBox", aAttr );
{
- SvXMLElementExport aSVG( *this, XML_NAMESPACE_NONE, "svg", TRUE, TRUE );
+ SvXMLElementExport aSVG( *this, XML_NAMESPACE_NONE, "svg", sal_True, sal_True );
SVGActionWriter* pWriter = new SVGActionWriter( *this, rMtf );
delete pWriter;
diff --git a/extensions/source/update/check/makefile.mk b/extensions/source/update/check/makefile.mk
index 9f5f544102dd..47da869ea11e 100644
--- a/extensions/source/update/check/makefile.mk
+++ b/extensions/source/update/check/makefile.mk
@@ -132,3 +132,11 @@ $(SPOOLDIR)$/$(PACKAGEDIR)$/Jobs$/Jobs-onlineupdate.xcu : $(XCU_SOURCEDIR)$/Jobs
@$(COPY) $< $@
# @$(PERL) transform.pl < $< > $@
+
+ALLTAR : $(MISC)/updchk.uno.component
+
+$(MISC)/updchk.uno.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+ updchk.uno.component
+ $(XSLTPROC) --nonet --stringparam uri \
+ '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+ $(SOLARENV)/bin/createcomponent.xslt updchk.uno.component
diff --git a/extensions/source/update/check/updatecheckconfig.cxx b/extensions/source/update/check/updatecheckconfig.cxx
index 9bce2540662d..2b3d6a79cf86 100644
--- a/extensions/source/update/check/updatecheckconfig.cxx
+++ b/extensions/source/update/check/updatecheckconfig.cxx
@@ -33,7 +33,8 @@
#include "updatecheckconfig.hxx"
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/beans/XPropertyState.hpp>
-
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/lang/XSingleServiceFactory.hpp>
#include <osl/security.hxx>
#include <osl/time.h>
#include <osl/file.hxx>
@@ -76,6 +77,8 @@ namespace uno = com::sun::star::uno ;
#define RELEASE_NOTE "ReleaseNote"
#define EXTENSION_PREFIX "Extension_"
+#define PROPERTY_VERSION UNISTRING("Version")
+
static const sal_Char * const aUpdateEntryProperties[] = {
UPDATE_VERSION,
UPDATE_BUILDID,
@@ -244,19 +247,19 @@ rtl::OUString UpdateCheckConfig::getAllUsersDirectory()
}
//------------------------------------------------------------------------------
-
-UpdateCheckConfig::UpdateCheckConfig(
- const uno::Reference<container::XNameContainer>& xContainer,
- const ::rtl::Reference< UpdateCheckConfigListener >& rListener
-) : m_xContainer(xContainer), m_rListener(rListener)
-{
-}
+UpdateCheckConfig::UpdateCheckConfig( const uno::Reference<container::XNameContainer>& xContainer,
+ const uno::Reference<container::XNameContainer>& xAvailableUpdates,
+ const uno::Reference<container::XNameContainer>& xIgnoredUpdates,
+ const ::rtl::Reference< UpdateCheckConfigListener >& rListener ) :
+ m_xContainer( xContainer ),
+ m_xAvailableUpdates( xAvailableUpdates ),
+ m_xIgnoredUpdates( xIgnoredUpdates ),
+ m_rListener( rListener )
+{}
//------------------------------------------------------------------------------
-
UpdateCheckConfig::~UpdateCheckConfig()
-{
-}
+{}
//------------------------------------------------------------------------------
@@ -293,7 +296,15 @@ UpdateCheckConfig::get(
UNISTRING("com.sun.star.configuration.ConfigurationUpdateAccess"), aArgumentList ),
uno::UNO_QUERY_THROW );
- return new UpdateCheckConfig( xContainer, rListener );
+ aProperty.Value = uno::makeAny( UNISTRING("/org.openoffice.Office.ExtensionManager/ExtensionUpdateData/IgnoredUpdates") );
+ aArgumentList[0] = uno::makeAny( aProperty );
+ uno::Reference< container::XNameContainer > xIgnoredExt( xConfigProvider->createInstanceWithArguments( UNISTRING("com.sun.star.configuration.ConfigurationUpdateAccess"), aArgumentList ), uno::UNO_QUERY_THROW );
+
+ aProperty.Value = uno::makeAny( UNISTRING("/org.openoffice.Office.ExtensionManager/ExtensionUpdateData/AvailableUpdates") );
+ aArgumentList[0] = uno::makeAny( aProperty );
+ uno::Reference< container::XNameContainer > xUpdateAvail( xConfigProvider->createInstanceWithArguments( UNISTRING("com.sun.star.configuration.ConfigurationUpdateAccess"), aArgumentList ), uno::UNO_QUERY_THROW );
+
+ return new UpdateCheckConfig( xContainer, xUpdateAvail, xIgnoredExt, rListener );
}
//------------------------------------------------------------------------------
@@ -625,6 +636,19 @@ UpdateCheckConfig::commitChanges()
}
}
}
+
+ xChangesBatch = uno::Reference< util::XChangesBatch > ( m_xAvailableUpdates, uno::UNO_QUERY );
+ if( xChangesBatch.is() && xChangesBatch->hasPendingChanges() )
+ {
+ util::ChangesSet aChangesSet = xChangesBatch->getPendingChanges();
+ xChangesBatch->commitChanges();
+ }
+ xChangesBatch = uno::Reference< util::XChangesBatch > ( m_xIgnoredUpdates, uno::UNO_QUERY );
+ if( xChangesBatch.is() && xChangesBatch->hasPendingChanges() )
+ {
+ util::ChangesSet aChangesSet = xChangesBatch->getPendingChanges();
+ xChangesBatch->commitChanges();
+ }
}
//------------------------------------------------------------------------------
@@ -652,40 +676,66 @@ UpdateCheckConfig::getPendingChanges( ) throw (uno::RuntimeException)
}
//------------------------------------------------------------------------------
-void UpdateCheckConfig::storeExtensionVersion( const rtl::OUString& rExtensionName,
+bool UpdateCheckConfig::storeExtensionVersion( const rtl::OUString& rExtensionName,
const rtl::OUString& rVersion )
{
- const rtl::OUString aExtName = UNISTRING( EXTENSION_PREFIX ) + rExtensionName;
- const uno::Any aValue = uno::makeAny( rVersion );
+ bool bNotify = true;
- if( m_xContainer->hasByName( aExtName ) )
- m_xContainer->replaceByName( aExtName, aValue );
+ if ( m_xAvailableUpdates->hasByName( rExtensionName ) )
+ uno::Reference< beans::XPropertySet >( m_xAvailableUpdates->getByName( rExtensionName ), uno::UNO_QUERY_THROW )->setPropertyValue( PROPERTY_VERSION, uno::Any( rVersion ) );
else
- m_xContainer->insertByName( aExtName, aValue );
+ {
+ uno::Reference< beans::XPropertySet > elem( uno::Reference< lang::XSingleServiceFactory >( m_xAvailableUpdates, uno::UNO_QUERY_THROW )->createInstance(), uno::UNO_QUERY_THROW );
+ elem->setPropertyValue( PROPERTY_VERSION, uno::Any( rVersion ) );
+ m_xAvailableUpdates->insertByName( rExtensionName, uno::Any( elem ) );
+ }
+
+ if ( m_xIgnoredUpdates->hasByName( rExtensionName ) )
+ {
+ ::rtl::OUString aIgnoredVersion;
+ uno::Any aValue( uno::Reference< beans::XPropertySet >( m_xIgnoredUpdates->getByName( rExtensionName ), uno::UNO_QUERY_THROW )->getPropertyValue( PROPERTY_VERSION ) );
+ aValue >>= aIgnoredVersion;
+ if ( aIgnoredVersion.getLength() == 0 ) // no version means ignore all updates
+ bNotify = false;
+ else if ( aIgnoredVersion == rVersion ) // the user wanted to ignore this update
+ bNotify = false;
+ }
commitChanges();
+
+ return bNotify;
}
//------------------------------------------------------------------------------
bool UpdateCheckConfig::checkExtensionVersion( const rtl::OUString& rExtensionName,
const rtl::OUString& rVersion )
{
- const rtl::OUString aExtName = UNISTRING( EXTENSION_PREFIX ) + rExtensionName;
-
- if( m_xContainer->hasByName( aExtName ) )
+ if ( m_xAvailableUpdates->hasByName( rExtensionName ) )
{
- uno::Any aValue = m_xContainer->getByName( aExtName );
- rtl::OUString aStoredVersion;
+ ::rtl::OUString aStoredVersion;
+ uno::Any aValue( uno::Reference< beans::XPropertySet >( m_xAvailableUpdates->getByName( rExtensionName ), uno::UNO_QUERY_THROW )->getPropertyValue( PROPERTY_VERSION ) );
aValue >>= aStoredVersion;
+ if ( m_xIgnoredUpdates->hasByName( rExtensionName ) )
+ {
+ ::rtl::OUString aIgnoredVersion;
+ uno::Any aValue2( uno::Reference< beans::XPropertySet >( m_xIgnoredUpdates->getByName( rExtensionName ), uno::UNO_QUERY_THROW )->getPropertyValue( PROPERTY_VERSION ) );
+ aValue2 >>= aIgnoredVersion;
+ if ( aIgnoredVersion.getLength() == 0 ) // no version means ignore all updates
+ return false;
+ else if ( aIgnoredVersion == aStoredVersion ) // the user wanted to ignore this update
+ return false;
+ // TODO: else delete ignored entry?
+ }
if ( isVersionGreater( rVersion, aStoredVersion ) )
return true;
else
{
- m_xContainer->removeByName( aExtName );
+ m_xAvailableUpdates->removeByName( rExtensionName );
commitChanges();
}
}
+
return false;
}
diff --git a/extensions/source/update/check/updatecheckconfig.hxx b/extensions/source/update/check/updatecheckconfig.hxx
index 7031ab196b0f..255b717c0372 100644..100755
--- a/extensions/source/update/check/updatecheckconfig.hxx
+++ b/extensions/source/update/check/updatecheckconfig.hxx
@@ -94,8 +94,10 @@ class UpdateCheckConfig : public ::cppu::WeakImplHelper3<
::com::sun::star::util::XChangesBatch,
::com::sun::star::lang::XServiceInfo >
{
- UpdateCheckConfig(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& xContainer,
- const ::rtl::Reference< UpdateCheckConfigListener >& rListener );
+ UpdateCheckConfig( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& xContainer,
+ const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& xAvailableUpdates,
+ const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& xIgnoredUpdates,
+ const ::rtl::Reference< UpdateCheckConfigListener >& rListener );
virtual ~UpdateCheckConfig();
@@ -155,7 +157,7 @@ public:
static rtl::OUString getAllUsersDirectory();
// store and retrieve information about extensions
- void storeExtensionVersion( const rtl::OUString& rExtensionName,
+ bool storeExtensionVersion( const rtl::OUString& rExtensionName,
const rtl::OUString& rVersion );
bool checkExtensionVersion( const rtl::OUString& rExtensionName,
const rtl::OUString& rVersion );
@@ -206,6 +208,8 @@ private:
static bool isVersionGreater( const rtl::OUString& rVersion1, const rtl::OUString& rVersion2 );
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > m_xContainer;
+ const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > m_xAvailableUpdates;
+ const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > m_xIgnoredUpdates;
const ::rtl::Reference< UpdateCheckConfigListener > m_rListener;
};
diff --git a/extensions/source/update/check/updatecheckjob.cxx b/extensions/source/update/check/updatecheckjob.cxx
index d223220490b1..f6ffb0e821a7 100644..100755
--- a/extensions/source/update/check/updatecheckjob.cxx
+++ b/extensions/source/update/check/updatecheckjob.cxx
@@ -328,13 +328,14 @@ void SAL_CALL UpdateCheckJob::queryTermination( lang::EventObject const & )
}
//------------------------------------------------------------------------------
-void SAL_CALL UpdateCheckJob::notifyTermination( lang::EventObject const & rEvt )
+void SAL_CALL UpdateCheckJob::notifyTermination( lang::EventObject const & )
throw ( uno::RuntimeException )
{
if ( m_pInitThread.get() != 0 )
+ {
m_pInitThread->setTerminating();
-
- disposing( rEvt );
+ m_pInitThread->join();
+ }
}
} // anonymous namespace
@@ -388,18 +389,6 @@ component_getImplementationEnvironment( const sal_Char **aEnvTypeName, uno_Envir
//------------------------------------------------------------------------------
-extern "C" sal_Bool SAL_CALL
-component_writeInfo(void *pServiceManager, void *pRegistryKey)
-{
- return cppu::component_writeInfoHelper(
- pServiceManager,
- pRegistryKey,
- kImplementations_entries
- );
-}
-
-//------------------------------------------------------------------------------
-
extern "C" void *
component_getFactory(const sal_Char *pszImplementationName, void *pServiceManager, void *pRegistryKey)
{
diff --git a/extensions/source/update/check/updatehdl.cxx b/extensions/source/update/check/updatehdl.cxx
index 0e08d417bcd7..b25854fc64a1 100644
--- a/extensions/source/update/check/updatehdl.cxx
+++ b/extensions/source/update/check/updatehdl.cxx
@@ -50,7 +50,7 @@
#include "com/sun/star/awt/XControl.hpp"
#include "com/sun/star/awt/XControlContainer.hpp"
#include "com/sun/star/awt/XMessageBox.hpp"
-#include "com/sun/star/awt/XThrobber.hpp"
+#include "com/sun/star/awt/XAnimation.hpp"
#include "com/sun/star/awt/XTopWindow.hpp"
#include "com/sun/star/awt/XVclWindowPeer.hpp"
#include "com/sun/star/awt/XVclContainer.hpp"
@@ -70,6 +70,7 @@
#include <com/sun/star/resource/XResourceBundleLoader.hpp>
#include "updatehdl.hrc"
+#include <tools/urlobj.hxx>
#define UNISTRING(s) rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(s))
@@ -159,7 +160,7 @@ void UpdateHandler::setDownloadBtnLabel( bool bAppendDots )
aLabel += UNISTRING( "..." );
setControlProperty( msButtonIDs[DOWNLOAD_BUTTON], UNISTRING("Label"), uno::Any( aLabel ) );
- setControlProperty( msButtonIDs[DOWNLOAD_BUTTON], UNISTRING("HelpURL"), uno::Any( UNISTRING( "HID:" ) + rtl::OUString::valueOf( (sal_Int32) HID_CHECK_FOR_UPD_DOWNLOAD2 ) ) );
+ setControlProperty( msButtonIDs[DOWNLOAD_BUTTON], UNISTRING("HelpURL"), uno::Any( UNISTRING( INET_HID_SCHEME ) + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_DOWNLOAD2 ) ) );
mbDownloadBtnHasDots = bAppendDots;
}
@@ -759,14 +760,14 @@ void UpdateHandler::loadStrings()
void UpdateHandler::startThrobber( bool bStart )
{
uno::Reference< awt::XControlContainer > xContainer( mxUpdDlg, uno::UNO_QUERY );
- uno::Reference< awt::XThrobber > xThrobber( xContainer->getControl( CTRL_THROBBER ), uno::UNO_QUERY );
+ uno::Reference< awt::XAnimation > xThrobber( xContainer->getControl( CTRL_THROBBER ), uno::UNO_QUERY );
if ( xThrobber.is() )
{
if ( bStart )
- xThrobber->start();
+ xThrobber->startAnimation();
else
- xThrobber->stop();
+ xThrobber->stopAnimation();
}
uno::Reference< awt::XWindow > xWindow( xContainer->getControl( CTRL_THROBBER ), uno::UNO_QUERY );
@@ -1084,8 +1085,8 @@ bool UpdateHandler::showOverwriteWarning() const
#define EDIT_WIDTH ( DIALOG_WIDTH - 2 * DIALOG_BORDER )
#define BOX1_BTN_X ( DIALOG_BORDER + EDIT_WIDTH - BUTTON_WIDTH - INNER_BORDER )
#define BOX1_BTN_Y ( DIALOG_BORDER + LABEL_HEIGHT + INNER_BORDER)
-#define THROBBER_WIDTH 14
-#define THROBBER_HEIGHT 14
+#define THROBBER_WIDTH 16
+#define THROBBER_HEIGHT 16
#define THROBBER_X_POS ( DIALOG_BORDER + 8 )
#define THROBBER_Y_POS ( DIALOG_BORDER + 23 )
#define BUTTON_BAR_HEIGHT 24
@@ -1175,7 +1176,7 @@ void UpdateHandler::createDialog()
xPropSet->setPropertyValue( UNISTRING("PositionY"), uno::Any(sal_Int32( 100 )) );
xPropSet->setPropertyValue( UNISTRING("Width"), uno::Any(sal_Int32( DIALOG_WIDTH )) );
xPropSet->setPropertyValue( UNISTRING("Height"), uno::Any(sal_Int32( DIALOG_HEIGHT )) );
- xPropSet->setPropertyValue( UNISTRING("HelpURL"), uno::Any( UNISTRING( "HID:" ) + rtl::OUString::valueOf( (sal_Int32) HID_CHECK_FOR_UPD_DLG ) ) );
+ xPropSet->setPropertyValue( UNISTRING("HelpURL"), uno::Any( UNISTRING( INET_HID_SCHEME ) + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_DLG ) ) );
}
{ // Label (fixed text) <status>
uno::Sequence< beans::NamedValue > aProps(1);
@@ -1202,7 +1203,7 @@ void UpdateHandler::createDialog()
setProperty( aProps, 3, UNISTRING("MultiLine"), uno::Any( true ) );
setProperty( aProps, 4, UNISTRING("ReadOnly"), uno::Any( true ) );
setProperty( aProps, 5, UNISTRING("AutoVScroll"), uno::Any( true ) );
- setProperty( aProps, 6, UNISTRING("HelpURL"), uno::Any( UNISTRING( "HID:" ) + rtl::OUString::valueOf( (sal_Int32) HID_CHECK_FOR_UPD_STATUS ) ) );
+ setProperty( aProps, 6, UNISTRING("HelpURL"), uno::Any( UNISTRING( INET_HID_SCHEME ) + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_STATUS ) ) );
insertControlModel( xControlModel, EDIT_FIELD_MODEL, TEXT_STATUS,
awt::Rectangle( DIALOG_BORDER + TEXT_OFFSET,
@@ -1233,7 +1234,7 @@ void UpdateHandler::createDialog()
setProperty( aProps, 1, UNISTRING("Enabled"), uno::Any( true ) );
setProperty( aProps, 2, UNISTRING("PushButtonType"), uno::Any( sal_Int16(awt::PushButtonType_STANDARD) ) );
setProperty( aProps, 3, UNISTRING("Label"), uno::Any( msPauseBtn ) );
- setProperty( aProps, 4, UNISTRING("HelpURL"), uno::Any( UNISTRING( "HID:" ) + rtl::OUString::valueOf( (sal_Int32) HID_CHECK_FOR_UPD_PAUSE ) ) );
+ setProperty( aProps, 4, UNISTRING("HelpURL"), uno::Any( UNISTRING( INET_HID_SCHEME ) + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_PAUSE ) ) );
insertControlModel ( xControlModel, BUTTON_MODEL, msButtonIDs[PAUSE_BUTTON],
awt::Rectangle( BOX1_BTN_X, BOX1_BTN_Y, BUTTON_WIDTH, BUTTON_HEIGHT ),
@@ -1246,7 +1247,7 @@ void UpdateHandler::createDialog()
setProperty( aProps, 1, UNISTRING("Enabled"), uno::Any( true ) );
setProperty( aProps, 2, UNISTRING("PushButtonType"), uno::Any( sal_Int16(awt::PushButtonType_STANDARD) ) );
setProperty( aProps, 3, UNISTRING("Label"), uno::Any( msResumeBtn ) );
- setProperty( aProps, 4, UNISTRING("HelpURL"), uno::Any( UNISTRING( "HID:" ) + rtl::OUString::valueOf( (sal_Int32) HID_CHECK_FOR_UPD_RESUME ) ) );
+ setProperty( aProps, 4, UNISTRING("HelpURL"), uno::Any( UNISTRING( INET_HID_SCHEME ) + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_RESUME ) ) );
insertControlModel ( xControlModel, BUTTON_MODEL, msButtonIDs[RESUME_BUTTON],
awt::Rectangle( BOX1_BTN_X,
@@ -1262,7 +1263,7 @@ void UpdateHandler::createDialog()
setProperty( aProps, 1, UNISTRING("Enabled"), uno::Any( true ) );
setProperty( aProps, 2, UNISTRING("PushButtonType"), uno::Any( sal_Int16(awt::PushButtonType_STANDARD) ) );
setProperty( aProps, 3, UNISTRING("Label"), uno::Any( msCancelBtn ) );
- setProperty( aProps, 4, UNISTRING("HelpURL"), uno::Any( UNISTRING( "HID:" ) + rtl::OUString::valueOf( (sal_Int32) HID_CHECK_FOR_UPD_CANCEL ) ) );
+ setProperty( aProps, 4, UNISTRING("HelpURL"), uno::Any( UNISTRING( INET_HID_SCHEME ) + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_CANCEL ) ) );
insertControlModel ( xControlModel, BUTTON_MODEL, msButtonIDs[CANCEL_BUTTON],
awt::Rectangle( BOX1_BTN_X,
@@ -1296,7 +1297,7 @@ void UpdateHandler::createDialog()
setProperty( aProps, 3, UNISTRING("MultiLine"), uno::Any( true ) );
setProperty( aProps, 4, UNISTRING("ReadOnly"), uno::Any( true ) );
setProperty( aProps, 5, UNISTRING("AutoVScroll"), uno::Any( true ) );
- setProperty( aProps, 6, UNISTRING("HelpURL"), uno::Any( UNISTRING( "HID:" ) + rtl::OUString::valueOf( (sal_Int32) HID_CHECK_FOR_UPD_DESCRIPTION ) ) );
+ setProperty( aProps, 6, UNISTRING("HelpURL"), uno::Any( UNISTRING( INET_HID_SCHEME ) + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_DESCRIPTION ) ) );
insertControlModel( xControlModel, EDIT_FIELD_MODEL, TEXT_DESCRIPTION,
awt::Rectangle( DIALOG_BORDER + TEXT_OFFSET,
@@ -1326,7 +1327,7 @@ void UpdateHandler::createDialog()
// setProperty( aProps, 2, UNISTRING("PushButtonType"), uno::Any( sal_Int16(awt::PushButtonType_CANCEL) ) );
// [property] string Label // only if PushButtonType_STANDARD
setProperty( aProps, 3, UNISTRING("Label"), uno::Any( msClose ) );
- setProperty( aProps, 4, UNISTRING("HelpURL"), uno::Any( UNISTRING( "HID:" ) + rtl::OUString::valueOf( (sal_Int32) HID_CHECK_FOR_UPD_CLOSE ) ) );
+ setProperty( aProps, 4, UNISTRING("HelpURL"), uno::Any( UNISTRING( INET_HID_SCHEME ) + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_CLOSE ) ) );
insertControlModel ( xControlModel, BUTTON_MODEL, msButtonIDs[ CLOSE_BUTTON ],
awt::Rectangle( CLOSE_BTN_X, BUTTON_Y_POS, BUTTON_WIDTH, BUTTON_HEIGHT ),
@@ -1339,7 +1340,7 @@ void UpdateHandler::createDialog()
setProperty( aProps, 1, UNISTRING("Enabled"), uno::Any( true ) );
setProperty( aProps, 2, UNISTRING("PushButtonType"), uno::Any( sal_Int16(awt::PushButtonType_STANDARD) ) );
setProperty( aProps, 3, UNISTRING("Label"), uno::Any( msInstall ) );
- setProperty( aProps, 4, UNISTRING("HelpURL"), uno::Any( UNISTRING( "HID:" ) + rtl::OUString::valueOf( (sal_Int32) HID_CHECK_FOR_UPD_INSTALL ) ) );
+ setProperty( aProps, 4, UNISTRING("HelpURL"), uno::Any( UNISTRING( INET_HID_SCHEME ) + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_INSTALL ) ) );
insertControlModel ( xControlModel, BUTTON_MODEL, msButtonIDs[INSTALL_BUTTON],
awt::Rectangle( INSTALL_BTN_X, BUTTON_Y_POS, BUTTON_WIDTH, BUTTON_HEIGHT ),
@@ -1352,7 +1353,7 @@ void UpdateHandler::createDialog()
setProperty( aProps, 1, UNISTRING("Enabled"), uno::Any( true ) );
setProperty( aProps, 2, UNISTRING("PushButtonType"), uno::Any( sal_Int16(awt::PushButtonType_STANDARD) ) );
setProperty( aProps, 3, UNISTRING("Label"), uno::Any( msDownload ) );
- setProperty( aProps, 4, UNISTRING("HelpURL"), uno::Any( UNISTRING( "HID:" ) + rtl::OUString::valueOf( (sal_Int32) HID_CHECK_FOR_UPD_DOWNLOAD ) ) );
+ setProperty( aProps, 4, UNISTRING("HelpURL"), uno::Any( UNISTRING( INET_HID_SCHEME ) + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_DOWNLOAD ) ) );
insertControlModel ( xControlModel, BUTTON_MODEL, msButtonIDs[DOWNLOAD_BUTTON],
awt::Rectangle( DOWNLOAD_BTN_X, BUTTON_Y_POS, BUTTON_WIDTH, BUTTON_HEIGHT ),
@@ -1372,7 +1373,7 @@ void UpdateHandler::createDialog()
{ // @see awt/UnoControlThrobberModel.idl
uno::Sequence< beans::NamedValue > aProps;
- insertControlModel( xControlModel, UNISTRING("com.sun.star.awt.UnoThrobberControlModel"), CTRL_THROBBER,
+ insertControlModel( xControlModel, UNISTRING("com.sun.star.awt.SpinningProgressControlModel"), CTRL_THROBBER,
awt::Rectangle( THROBBER_X_POS, THROBBER_Y_POS, THROBBER_WIDTH, THROBBER_HEIGHT),
aProps );
}
diff --git a/extensions/source/update/check/updateprotocol.cxx b/extensions/source/update/check/updateprotocol.cxx
index 7de4681b9d62..5a59b4e070fe 100644..100755
--- a/extensions/source/update/check/updateprotocol.cxx
+++ b/extensions/source/update/check/updateprotocol.cxx
@@ -254,16 +254,18 @@ checkForUpdates(
bool storeExtensionUpdateInfos( const uno::Reference< uno::XComponentContext > & rxContext,
const uno::Sequence< uno::Sequence< rtl::OUString > > &rUpdateInfos )
{
+ bool bNotify = false;
+
if ( rUpdateInfos.hasElements() )
{
rtl::Reference< UpdateCheckConfig > aConfig = UpdateCheckConfig::get( rxContext );
for ( sal_Int32 i = rUpdateInfos.getLength() - 1; i >= 0; i-- )
{
- aConfig->storeExtensionVersion( rUpdateInfos[i][0], rUpdateInfos[i][1] );
+ bNotify |= aConfig->storeExtensionVersion( rUpdateInfos[i][0], rUpdateInfos[i][1] );
}
}
- return rUpdateInfos.hasElements();
+ return bNotify;
}
//------------------------------------------------------------------------------
@@ -288,9 +290,9 @@ bool checkForExtensionUpdates( const uno::Reference< uno::XComponentContext > &
if ( !xInfoProvider.is() ) return false;
aUpdateList = xInfoProvider->isUpdateAvailable( ::rtl::OUString() );
- storeExtensionUpdateInfos( rxContext, aUpdateList );
+ bool bNotify = storeExtensionUpdateInfos( rxContext, aUpdateList );
- return aUpdateList.hasElements();
+ return bNotify;
}
//------------------------------------------------------------------------------
diff --git a/extensions/source/update/check/updchk.uno.component b/extensions/source/update/check/updchk.uno.component
new file mode 100644
index 000000000000..b1eb32917eaf
--- /dev/null
+++ b/extensions/source/update/check/updchk.uno.component
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+ xmlns="http://openoffice.org/2010/uno-components">
+ <implementation name="vnd.sun.UpdateCheck">
+ <service name="com.sun.star.setup.UpdateCheck"/>
+ </implementation>
+ <implementation name="vnd.sun.UpdateCheckConfig">
+ <service name="com.sun.star.setup.UpdateCheckConfig"/>
+ </implementation>
+</component>
diff --git a/extensions/source/update/feed/makefile.mk b/extensions/source/update/feed/makefile.mk
index 7e12970ddef1..6361f20bdd73 100644
--- a/extensions/source/update/feed/makefile.mk
+++ b/extensions/source/update/feed/makefile.mk
@@ -62,3 +62,11 @@ DEF1NAME=$(SHL1TARGET)
.INCLUDE : target.mk
+
+ALLTAR : $(MISC)/updatefeed.component
+
+$(MISC)/updatefeed.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+ updatefeed.component
+ $(XSLTPROC) --nonet --stringparam uri \
+ '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+ $(SOLARENV)/bin/createcomponent.xslt updatefeed.component
diff --git a/extensions/source/update/feed/updatefeed.component b/extensions/source/update/feed/updatefeed.component
new file mode 100644
index 000000000000..2d53ff5f9398
--- /dev/null
+++ b/extensions/source/update/feed/updatefeed.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+ xmlns="http://openoffice.org/2010/uno-components">
+ <implementation name="vnd.sun.UpdateInformationProvider">
+ <service name="com.sun.star.deployment.UpdateInformationProvider"/>
+ </implementation>
+</component>
diff --git a/extensions/source/update/feed/updatefeed.cxx b/extensions/source/update/feed/updatefeed.cxx
index afc3ba1f76ed..7105c72cea95 100644
--- a/extensions/source/update/feed/updatefeed.cxx
+++ b/extensions/source/update/feed/updatefeed.cxx
@@ -852,18 +852,6 @@ component_getImplementationEnvironment( const sal_Char **aEnvTypeName, uno_Envir
//------------------------------------------------------------------------------
-extern "C" sal_Bool SAL_CALL
-component_writeInfo(void *pServiceManager, void *pRegistryKey)
-{
- return cppu::component_writeInfoHelper(
- pServiceManager,
- pRegistryKey,
- kImplementations_entries
- );
-}
-
-//------------------------------------------------------------------------------
-
extern "C" void *
component_getFactory(const sal_Char *pszImplementationName, void *pServiceManager, void *pRegistryKey)
{
diff --git a/extensions/source/update/ui/makefile.mk b/extensions/source/update/ui/makefile.mk
index c4826efba9ca..5ea6994d3d22 100644
--- a/extensions/source/update/ui/makefile.mk
+++ b/extensions/source/update/ui/makefile.mk
@@ -72,3 +72,11 @@ DEF1NAME=$(SHL1TARGET)
.INCLUDE : target.mk
+
+ALLTAR : $(MISC)/updchk.component
+
+$(MISC)/updchk.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+ updchk.component
+ $(XSLTPROC) --nonet --stringparam uri \
+ '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+ $(SOLARENV)/bin/createcomponent.xslt updchk.component
diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx
index 35066dc8db17..dbb220acae70 100644
--- a/extensions/source/update/ui/updatecheckui.cxx
+++ b/extensions/source/update/ui/updatecheckui.cxx
@@ -52,7 +52,7 @@
#include <vcl/outdev.hxx>
#include <vcl/msgbox.hxx>
#include <vcl/lineinfo.hxx>
-#include <vcl/imagebtn.hxx>
+#include <vcl/button.hxx>
#include <vcl/settings.hxx>
#include <vcl/svapp.hxx>
#include <sfx2/sfx.hrc>
@@ -123,7 +123,7 @@ public:
virtual void MouseButtonDown( const MouseEvent& rMEvt );
virtual void Paint( const Rectangle& rRect );
void Resize();
- void Show( BOOL bVisible = TRUE, USHORT nFlags = SHOW_NOACTIVATE );
+ void Show( sal_Bool bVisible = sal_True, sal_uInt16 nFlags = SHOW_NOACTIVATE );
void SetTipPosPixel( const Point& rTipPos ) { maTipPos = rTipPos; }
void SetTitleAndText( const XubString& rTitle, const XubString& rText,
const Image& rImage );
@@ -151,10 +151,10 @@ class UpdateCheckUI : public ::cppu::WeakImplHelper3
bool mbShowBubble;
bool mbShowMenuIcon;
bool mbBubbleChanged;
- USHORT mnIconID;
+ sal_uInt16 mnIconID;
private:
- DECL_LINK( ClickHdl, USHORT* );
+ DECL_LINK( ClickHdl, sal_uInt16* );
DECL_LINK( HighlightHdl, MenuBar::MenuBarButtonCallbackArg* );
DECL_LINK( WaitTimeOutHdl, Timer* );
DECL_LINK( TimeOutHdl, Timer* );
@@ -409,7 +409,7 @@ void UpdateCheckUI::AddMenuBarIcon( SystemWindow *pSysWin, bool bAddEventHdl )
mpBubbleWin = GetBubbleWindow();
if ( mpBubbleWin )
{
- mpBubbleWin->Show( TRUE );
+ mpBubbleWin->Show( sal_True );
maTimeoutTimer.Start();
}
mbShowBubble = false;
@@ -478,7 +478,7 @@ void UpdateCheckUI::setPropertyValue(const rtl::OUString& rPropertyName,
if ( mbShowBubble )
Application::PostUserEvent( LINK( this, UpdateCheckUI, UserEventHdl ) );
else if ( mpBubbleWin )
- mpBubbleWin->Show( FALSE );
+ mpBubbleWin->Show( sal_False );
}
else if( rPropertyName.compareToAscii( PROPERTY_CLICK_HDL ) == 0 ) {
uno::Reference< task::XJob > aJob;
@@ -504,7 +504,7 @@ void UpdateCheckUI::setPropertyValue(const rtl::OUString& rPropertyName,
throw beans::UnknownPropertyException();
if ( mbBubbleChanged && mpBubbleWin )
- mpBubbleWin->Show( FALSE );
+ mpBubbleWin->Show( sal_False );
}
//------------------------------------------------------------------------------
@@ -635,13 +635,13 @@ void UpdateCheckUI::RemoveBubbleWindow( bool bRemoveIcon )
}
// -----------------------------------------------------------------------
-IMPL_LINK( UpdateCheckUI, ClickHdl, USHORT*, EMPTYARG )
+IMPL_LINK( UpdateCheckUI, ClickHdl, sal_uInt16*, EMPTYARG )
{
SolarMutexGuard aGuard;
maWaitTimer.Stop();
if ( mpBubbleWin )
- mpBubbleWin->Show( FALSE );
+ mpBubbleWin->Show( sal_False );
if ( mrJob.is() )
{
@@ -727,7 +727,7 @@ IMPL_LINK( UpdateCheckUI, UserEventHdl, UpdateCheckUI*, EMPTYARG )
// -----------------------------------------------------------------------
IMPL_LINK( UpdateCheckUI, WindowEventHdl, VclWindowEvent*, pEvent )
{
- ULONG nEventID = pEvent->GetId();
+ sal_uLong nEventID = pEvent->GetId();
if ( VCLEVENT_OBJECT_DYING == nEventID )
{
@@ -920,11 +920,11 @@ void BubbleWindow::Paint( const Rectangle& )
//------------------------------------------------------------------------------
void BubbleWindow::MouseButtonDown( const MouseEvent& )
{
- Show( FALSE );
+ Show( sal_False );
}
//------------------------------------------------------------------------------
-void BubbleWindow::Show( BOOL bVisible, USHORT nFlags )
+void BubbleWindow::Show( sal_Bool bVisible, sal_uInt16 nFlags )
{
SolarMutexGuard aGuard;
@@ -976,7 +976,7 @@ void BubbleWindow::Show( BOOL bVisible, USHORT nFlags )
void BubbleWindow::RecalcTextRects()
{
Size aTotalSize;
- BOOL bFinished = FALSE;
+ sal_Bool bFinished = sal_False;
Font aOldFont = GetFont();
Font aBoldFont = aOldFont;
@@ -1008,7 +1008,7 @@ void BubbleWindow::RecalcTextRects()
maMaxTextSize.Height() = maMaxTextSize.Height() * 3 / 2;
}
else
- bFinished = TRUE;
+ bFinished = sal_True;
}
maTitleRect.Move( 2*BUBBLE_BORDER, BUBBLE_BORDER + TIP_HEIGHT );
maTextRect.Move( 2*BUBBLE_BORDER, BUBBLE_BORDER + TIP_HEIGHT + maTitleRect.GetHeight() + aBoldFont.GetHeight() * 3 / 4 );
@@ -1052,18 +1052,6 @@ component_getImplementationEnvironment( const sal_Char **aEnvTypeName, uno_Envir
//------------------------------------------------------------------------------
-extern "C" sal_Bool SAL_CALL
-component_writeInfo(void *pServiceManager, void *pRegistryKey)
-{
- return cppu::component_writeInfoHelper(
- pServiceManager,
- pRegistryKey,
- kImplementations_entries
- );
-}
-
-//------------------------------------------------------------------------------
-
extern "C" void *
component_getFactory(const sal_Char *pszImplementationName, void *pServiceManager, void *pRegistryKey)
{
diff --git a/extensions/source/update/ui/updchk.component b/extensions/source/update/ui/updchk.component
new file mode 100644
index 000000000000..bd533e30d1f3
--- /dev/null
+++ b/extensions/source/update/ui/updchk.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+ xmlns="http://openoffice.org/2010/uno-components">
+ <implementation name="vnd.sun.UpdateCheckUI">
+ <service name="com.sun.star.setup.UpdateCheckUI"/>
+ </implementation>
+</component>
diff --git a/extensions/source/xmlextract/makefile.mk b/extensions/source/xmlextract/makefile.mk
index 0a021027f4b4..fa54df738b58 100644
--- a/extensions/source/xmlextract/makefile.mk
+++ b/extensions/source/xmlextract/makefile.mk
@@ -63,3 +63,11 @@ SHL1LIBS= $(SLB)$/$(TARGET).lib
# --- Targets ----------------------------------
.INCLUDE : target.mk
+
+ALLTAR : $(MISC)/xmx.component
+
+$(MISC)/xmx.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+ xmx.component
+ $(XSLTPROC) --nonet --stringparam uri \
+ '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+ $(SOLARENV)/bin/createcomponent.xslt xmx.component
diff --git a/extensions/source/xmlextract/xmx.component b/extensions/source/xmlextract/xmx.component
new file mode 100644
index 000000000000..456ff33b6c06
--- /dev/null
+++ b/extensions/source/xmlextract/xmx.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+ xmlns="http://openoffice.org/2010/uno-components">
+ <implementation name="com.sun.star.comp.io.XMLExtractor">
+ <service name="com.sun.star.io.XMLExtractor"/>
+ </implementation>
+</component>
diff --git a/extensions/source/xmlextract/xmxtrct.cxx b/extensions/source/xmlextract/xmxtrct.cxx
index b738c7fa5b1e..f49be79a6d84 100644
--- a/extensions/source/xmlextract/xmxtrct.cxx
+++ b/extensions/source/xmlextract/xmxtrct.cxx
@@ -189,7 +189,7 @@ REF( NMSP_IO::XInputStream ) SAL_CALL XMLExtractor::extract( const REF( NMSP_IO:
aCodec.Decompress( *xStream, *pMemStm );
aCodec.EndCompression();
- xRet = new ::utl::OInputStreamHelper( new SvLockBytes( pMemStm, TRUE ), 65535 );
+ xRet = new ::utl::OInputStreamHelper( new SvLockBytes( pMemStm, sal_True ), 65535 );
}
}
}
diff --git a/extensions/source/xmlextract/xmxuno.cxx b/extensions/source/xmlextract/xmxuno.cxx
index 7cb63ea4d13c..81bd158e2f93 100644
--- a/extensions/source/xmlextract/xmxuno.cxx
+++ b/extensions/source/xmlextract/xmxuno.cxx
@@ -53,27 +53,6 @@ void SAL_CALL component_getImplementationEnvironment(
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
//==================================================================================================
-sal_Bool SAL_CALL component_writeInfo(
- void * /*pServiceManager*/, void * pRegistryKey )
-{
- if (pRegistryKey)
- {
- try
- {
- REF( NMSP_REGISTRY::XRegistryKey ) xNewKey(
- reinterpret_cast< NMSP_REGISTRY::XRegistryKey * >( pRegistryKey )->createKey(
- NMSP_RTL::OUString( RTL_CONSTASCII_USTRINGPARAM("/com.sun.star.comp.io.XMLExtractor/UNO/SERVICES/com.sun.star.io.XMLExtractor") ) ) );
-
- return sal_True;
- }
- catch (NMSP_REGISTRY::InvalidRegistryException &)
- {
- OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
- }
- }
- return sal_False;
-}
-//==================================================================================================
void * SAL_CALL component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
{