[Libreoffice-commits] .: accessibility/inc accessibility/prj accessibility/source automation/inc automation/prj automation/source basctl/inc basctl/sdi basctl/source bean/com bean/native bean/prj crashrep/prj cui/Library_cui.mk cui/source embedserv/prj embedserv/source extensions/source extensions/test forms/Library_frm.mk forms/qa forms/source lingucomponent/prj lingucomponent/source MathMLDTD/prj package/inc package/qa package/source setup_native/prj setup_native/source UnoControls/prj xmlsecurity/inc xmlsecurity/qa xmlsecurity/source xmlsecurity/test_docs xmlsecurity/util
Norbert Thiebaud
nthiebaud at kemper.freedesktop.org
Sun Aug 21 16:47:38 PDT 2011
MathMLDTD/prj/d.lst | 4
UnoControls/prj/build.lst | 2
UnoControls/prj/d.lst | 12
accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx | 5
accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx | 5
accessibility/prj/build.lst | 2
accessibility/prj/d.lst | 12
accessibility/source/extended/AccessibleBrowseBoxBase.cxx | 24
accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx | 11
accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx | 11
accessibility/source/extended/AccessibleGridControlBase.cxx | 22
accessibility/source/extended/AccessibleGridControlHeader.cxx | 11
accessibility/source/extended/AccessibleGridControlTableBase.cxx | 11
accessibility/source/helper/accresmgr.cxx | 4
automation/inc/automation/commdefines.hxx | 20
automation/inc/automation/commtypes.hxx | 11
automation/prj/d.lst | 44
automation/source/inc/cmdbasestream.hxx | 32
automation/source/inc/icommstream.hxx | 14
automation/source/inc/rcontrol.hxx | 16
automation/source/inc/svcommstream.hxx | 14
automation/source/miniapp/servres.cxx | 6
automation/source/miniapp/servres.hxx | 7
automation/source/miniapp/testapp.cxx | 2
automation/source/server/XMLParser.cxx | 12
automation/source/server/cmdbasestream.cxx | 150 -
automation/source/server/recorder.cxx | 26
automation/source/server/retstrm.cxx | 8
automation/source/server/retstrm.hxx | 16
automation/source/server/scmdstrm.cxx | 24
automation/source/server/scmdstrm.hxx | 4
automation/source/server/sta_list.cxx | 9
automation/source/server/statemnt.cxx | 548 +--
automation/source/server/statemnt.hxx | 18
automation/source/server/svcommstream.cxx | 14
automation/source/simplecm/communiio.hxx | 12
automation/source/simplecm/packethandler.cxx | 4
automation/source/simplecm/tcpio.cxx | 4
automation/source/simplecm/tcpio.hxx | 4
automation/source/testtool/cmdstrm.cxx | 42
automation/source/testtool/cmdstrm.hxx | 10
automation/source/testtool/cretstrm.hxx | 4
automation/source/testtool/makefile.mk | 2
automation/source/testtool/objtest.cxx | 100
automation/source/testtool/tcommuni.cxx | 6
automation/source/testtool/testtool.ini | 1
basctl/inc/basidesh.hrc | 1
basctl/sdi/baside.sdi | 5
basctl/source/basicide/baside2.cxx | 9
basctl/source/basicide/baside2.hxx | 1
basctl/source/basicide/baside2b.cxx | 32
basctl/source/basicide/basidesh.src | 5
basctl/source/basicide/iderdll.cxx | 3
basctl/source/basicide/moduldl2.cxx | 2
basctl/source/dlged/dlged.cxx | 9
bean/com/sun/star/comp/beans/HasConnectionException.java | 2
bean/native/unix/com_sun_star_beans_LocalOfficeWindow.c | 1
bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow.c | 1
bean/native/win32/com_sun_star_beans_LocalOfficeWindow.c | 9
bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c | 24
bean/prj/d.lst | 8
crashrep/prj/d.lst | 6
cui/Library_cui.mk | 6
cui/source/customize/acccfg.cxx | 2
cui/source/customize/macropg.cxx | 20
cui/source/dialogs/about.cxx | 223 -
cui/source/dialogs/about.hrc | 7
cui/source/dialogs/about.src | 8
cui/source/dialogs/cuigaldlg.cxx | 92
cui/source/dialogs/cuihyperdlg.cxx | 1
cui/source/dialogs/hldocntp.cxx | 2
cui/source/dialogs/hlinettp.cxx | 50
cui/source/dialogs/hltpbase.cxx | 4
cui/source/dialogs/hyperdlg.hrc | 1
cui/source/dialogs/hyperdlg.src | 27
cui/source/dialogs/iconcdlg.cxx | 14
cui/source/dialogs/srchxtra.cxx | 8
cui/source/factory/cuiresmgr.cxx | 7
cui/source/factory/dlgfact.cxx | 1
cui/source/inc/about.hxx | 3
cui/source/inc/chardlg.hxx | 8
cui/source/inc/cuigaldlg.hxx | 28
cui/source/inc/cuitabline.hxx | 59
cui/source/inc/hlinettp.hxx | 9
cui/source/inc/hltpbase.hxx | 2
cui/source/inc/page.hxx | 2
cui/source/options/fontsubs.cxx | 1
cui/source/options/fontsubs.hxx | 1
cui/source/options/optchart.cxx | 4
cui/source/options/optgdlg.cxx | 22
cui/source/options/opthtml.cxx | 74
cui/source/options/optinet2.cxx | 407 --
cui/source/options/optinet2.hrc | 23
cui/source/options/optinet2.hxx | 69
cui/source/options/optinet2.src | 166 -
cui/source/options/optmemory.cxx | 4
cui/source/options/optpath.cxx | 1
cui/source/options/optsave.cxx | 10
cui/source/options/treeopt.cxx | 4
cui/source/options/treeopt.src | 4
cui/source/tabpages/autocdlg.cxx | 58
cui/source/tabpages/chardlg.cxx | 288 -
cui/source/tabpages/numpages.cxx | 9
cui/source/tabpages/page.cxx | 17
cui/source/tabpages/tpline.cxx | 23
embedserv/prj/build.lst | 2
embedserv/prj/d.lst | 4
embedserv/source/inc/embservconst.h | 2
extensions/source/ole/oleobjw.cxx | 11
extensions/source/ole/oleobjw.hxx | 4
extensions/source/oooimprovement/onlogrotate_job.cxx | 2
extensions/source/plugin/inc/plugin/unx/plugcon.hxx | 2
extensions/source/propctrlr/eventhandler.cxx | 3
extensions/source/propctrlr/standardcontrol.cxx | 4
extensions/source/svg/makefile.mk | 67
extensions/source/svg/svgaction.cxx | 1461 ----------
extensions/source/svg/svgaction.hxx | 167 -
extensions/source/svg/svgcom.hxx | 76
extensions/source/svg/svgprinter.cxx | 331 --
extensions/source/svg/svgprinter.hxx | 70
extensions/source/svg/svguno.cxx | 101
extensions/source/svg/svgwriter.cxx | 174 -
extensions/source/svg/svgwriter.hxx | 63
extensions/source/update/check/Jobs.xcu | 2
extensions/source/update/tools/ztool.cxx | 6
extensions/test/ole/OleClient/clientTest.cxx | 2
extensions/test/ole/OleConverterVar1/convTest.cxx | 2
extensions/test/ole/cppToUno/testcppuno.cxx | 2
forms/Library_frm.mk | 6
forms/qa/unoapi/knownissues.xcl | 6
forms/source/component/Columns.cxx | 30
forms/source/component/DatabaseForm.cxx | 91
forms/source/component/Edit.cxx | 62
forms/source/component/Edit.hxx | 1
forms/source/component/Filter.cxx | 34
forms/source/component/FormattedField.cxx | 4
forms/source/resource/frm_resource.cxx | 4
lingucomponent/prj/d.lst | 106
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx | 8
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk | 4
lingucomponent/source/spellcheck/spell/sspellimp.cxx | 15
lingucomponent/source/thesaurus/libnth/makefile.mk | 3
package/inc/EncryptedDataHeader.hxx | 32
package/inc/EncryptionData.hxx | 52
package/inc/PackageConstants.hxx | 36
package/inc/ZipFile.hxx | 52
package/inc/ZipOutputStream.hxx | 33
package/inc/ZipPackage.hxx | 42
package/inc/ZipPackageEntry.hxx | 106
package/inc/ZipPackageFolder.hxx | 4
package/inc/ZipPackageStream.hxx | 218 +
package/qa/storages/TestHelper.java | 16
package/source/manifest/Base64Codec.cxx | 8
package/source/manifest/Base64Codec.hxx | 4
package/source/manifest/ManifestDefines.hxx | 21
package/source/manifest/ManifestExport.cxx | 285 +
package/source/manifest/ManifestImport.cxx | 169 -
package/source/manifest/ManifestImport.hxx | 28
package/source/manifest/UnoRegister.cxx | 5
package/source/xstor/owriteablestream.cxx | 188 -
package/source/xstor/xstorage.cxx | 212 +
package/source/xstor/xstorage.hxx | 11
package/source/zipapi/Deflater.cxx | 8
package/source/zipapi/EntryInputStream.cxx | 205 -
package/source/zipapi/EntryInputStream.hxx | 85
package/source/zipapi/Inflater.cxx | 4
package/source/zipapi/MemoryByteGrabber.hxx | 2
package/source/zipapi/XFileStream.cxx | 230 -
package/source/zipapi/XFileStream.hxx | 95
package/source/zipapi/XMemoryStream.cxx | 55
package/source/zipapi/XMemoryStream.hxx | 45
package/source/zipapi/XUnbufferedStream.cxx | 100
package/source/zipapi/XUnbufferedStream.hxx | 17
package/source/zipapi/ZipFile.cxx | 512 +--
package/source/zipapi/ZipOutputStream.cxx | 124
package/source/zipapi/blowfishcontext.cxx | 122
package/source/zipapi/blowfishcontext.hxx | 58
package/source/zipapi/makefile.mk | 2
package/source/zipapi/sha1context.cxx | 97
package/source/zipapi/sha1context.hxx | 59
package/source/zippackage/ZipPackage.cxx | 573 ++-
package/source/zippackage/ZipPackageEntry.cxx | 24
package/source/zippackage/ZipPackageEntry.hxx | 106
package/source/zippackage/ZipPackageFolder.cxx | 197 -
package/source/zippackage/ZipPackageStream.cxx | 406 +-
package/source/zippackage/ZipPackageStream.hxx | 196 -
package/source/zippackage/zipfileaccess.cxx | 5
setup_native/prj/build.lst | 1
setup_native/prj/d.lst | 19
setup_native/source/mac/ooo/DS_Store |binary
setup_native/source/mac/ooo/DS_Store_Langpack |binary
setup_native/source/mac/ooo3_installer.icns |binary
setup_native/source/packinfo/packinfo_extensions.txt | 44
setup_native/source/packinfo/packinfo_office.txt | 108
setup_native/source/packinfo/packinfo_office_lang.txt | 4
setup_native/source/packinfo/shellscripts_extensions.txt | 24
setup_native/source/packinfo/spellchecker_selection.txt | 84
setup_native/source/win32/customactions/javafilter/makefile.mk | 4
setup_native/source/win32/customactions/languagepacks/makefile.mk | 2
setup_native/source/win32/customactions/patch/makefile.mk | 3
setup_native/source/win32/customactions/quickstarter/makefile.mk | 3
setup_native/source/win32/customactions/rebase/makefile.mk | 2
setup_native/source/win32/customactions/rebase/rebase.cxx | 85
setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk | 2
setup_native/source/win32/customactions/reg4msdoc/registrar.cxx | 48
setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.cxx | 36
setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.hxx | 14
setup_native/source/win32/customactions/reg64/makefile.mk | 3
setup_native/source/win32/customactions/regactivex/makefile.mk | 3
setup_native/source/win32/customactions/regpatchactivex/makefile.mk | 10
setup_native/source/win32/customactions/relnotes/exports.dxp | 3
setup_native/source/win32/customactions/relnotes/makefile.mk | 76
setup_native/source/win32/customactions/relnotes/relnotes.cxx | 188 -
setup_native/source/win32/customactions/sellang/makefile.mk | 20
setup_native/source/win32/customactions/shellextensions/makefile.mk | 4
setup_native/source/win32/customactions/shellextensions/registerextensions.cxx | 25
setup_native/source/win32/customactions/thesaurus/makefile.mk | 9
setup_native/source/win32/customactions/tools/makefile.mk | 4
setup_native/source/win32/msi-encodinglist.txt | 2
xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx | 4
xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx | 7
xmlsecurity/qa/certext/User_35_Root_11.crt | 64
xmlsecurity/source/component/documentdigitalsignatures.cxx | 10
xmlsecurity/source/dialogs/certificateviewer.cxx | 22
xmlsecurity/source/dialogs/dialogs.hrc | 12
xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx | 4
xmlsecurity/source/dialogs/macrosecurity.cxx | 2
xmlsecurity/source/dialogs/resourcemanager.cxx | 3
xmlsecurity/source/dialogs/stbcontrl.cxx | 8
xmlsecurity/source/dialogs/warnings.cxx | 6
xmlsecurity/source/framework/buffernode.cxx | 6
xmlsecurity/source/framework/elementcollector.cxx | 7
xmlsecurity/source/framework/elementcollector.hxx | 1
xmlsecurity/source/framework/securityengine.hxx | 1
xmlsecurity/source/framework/xmlencryptiontemplateimpl.cxx | 3
xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx | 3
xmlsecurity/source/helper/xmlsignaturehelper.cxx | 7
xmlsecurity/source/helper/xmlsignaturehelper2.cxx | 1
xmlsecurity/source/xmlsec/diagnose.cxx | 3
xmlsecurity/source/xmlsec/makefile.mk | 6
xmlsecurity/source/xmlsec/mscrypt/makefile.mk | 3
xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.cxx | 182 +
xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.hxx | 84
xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx | 20
xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx | 3
xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx | 28
xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx | 161 -
xmlsecurity/source/xmlsec/nss/ciphercontext.cxx | 276 +
xmlsecurity/source/xmlsec/nss/ciphercontext.hxx | 89
xmlsecurity/source/xmlsec/nss/digestcontext.cxx | 101
xmlsecurity/source/xmlsec/nss/digestcontext.hxx | 68
xmlsecurity/source/xmlsec/nss/makefile.mk | 27
xmlsecurity/source/xmlsec/nss/nssinitializer.cxx | 521 +++
xmlsecurity/source/xmlsec/nss/nssinitializer.hxx | 90
xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx | 244 +
xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx | 77
xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx | 57
xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx | 365 --
xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx | 62
xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx | 74
xmlsecurity/source/xmlsec/nss/xsec_nss.cxx | 34
xmlsecurity/source/xmlsec/saxhelper.cxx | 96
xmlsecurity/source/xmlsec/xsec_xmlsec.cxx | 4
xmlsecurity/test_docs/CAs/Root_11/demoCA/index.txt | 1
xmlsecurity/test_docs/CAs/Root_11/demoCA/newcerts/1022.pem | 64
xmlsecurity/test_docs/CAs/Root_11/demoCA/serial | 2
xmlsecurity/test_docs/CAs/Root_11/openssl.cfg | 17
xmlsecurity/test_docs/certs/end_certs/User_35_Root_11.crt | 64
xmlsecurity/util/makefile.mk | 11
xmlsecurity/util/xsec_xmlsec.component | 1
xmlsecurity/util/xsec_xmlsec.windows.component | 3
271 files changed, 6520 insertions(+), 8307 deletions(-)
New commits:
commit 0d4720d1e1ffcefc43ae2af59c7487ab0bfab2ce
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sun Aug 21 18:12:16 2011 -0500
undo anything not wizard related in the previous merge-commit
diff --git a/MathMLDTD/prj/d.lst b/MathMLDTD/prj/d.lst
index 40d4a6a..b2a942f 100644
--- a/MathMLDTD/prj/d.lst
+++ b/MathMLDTD/prj/d.lst
@@ -1,2 +1,2 @@
-..\math.dtd %_DEST%\bin%_EXT%\math.dtd
-..\w3c_ipr_software_notice.html %_DEST%\bin%_EXT%\w3c_ipr_software_notice.html
+..\math.dtd %_DEST%\bin\math.dtd
+..\w3c_ipr_software_notice.html %_DEST%\bin\w3c_ipr_software_notice.html
diff --git a/UnoControls/prj/build.lst b/UnoControls/prj/build.lst
index 775cb90..473776f 100644
--- a/UnoControls/prj/build.lst
+++ b/UnoControls/prj/build.lst
@@ -1,4 +1,4 @@
-us UnoControls : LIBXSLT:libxslt cppuhelper offuh tools NULL
+us UnoControls : LIBXSLT:libxslt cppuhelper offapi tools NULL
us UnoControls usr1 - all us_mkout NULL
us UnoControls\source\base nmake - all us_base NULL
us UnoControls\source\controls nmake - all us_ctrls NULL
diff --git a/UnoControls/prj/d.lst b/UnoControls/prj/d.lst
index 370fc0c..4c1de78 100644
--- a/UnoControls/prj/d.lst
+++ b/UnoControls/prj/d.lst
@@ -1,6 +1,6 @@
-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
-..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
-..\%__SRC%\lib\*.sl %_DEST%\lib%_EXT%\*.sl
-..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
-..\%__SRC%\misc\ctl.component %_DEST%\xml%_EXT%\ctl.component
+..\%__SRC%\bin\*.dll %_DEST%\bin\*.dll
+..\%__SRC%\lib\lib*.so %_DEST%\lib
+..\%__SRC%\lib\*.sl %_DEST%\lib\*.sl
+..\%__SRC%\bin\*.res %_DEST%\bin\*.res
+..\%__SRC%\lib\*.dylib %_DEST%\lib\*.dylib
+..\%__SRC%\misc\ctl.component %_DEST%\xml\ctl.component
diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx
index 67f0574..ccf0dc9 100644
--- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx
@@ -353,11 +353,6 @@ protected:
Rectangle getBoundingBoxOnScreen()
throw ( ::com::sun::star::lang::DisposedException );
- /** Creates a new UUID, if rId is empty.
- @attention This method requires locked global mutex to prevent double
- creation of an UUID. */
- static void implCreateUuid( ::com::sun::star::uno::Sequence< sal_Int8 >& rId );
-
::comphelper::AccessibleEventNotifier::TClientId getClientId() const { return m_aClientId; }
void setClientId(::comphelper::AccessibleEventNotifier::TClientId _aNewClientId) { m_aClientId = _aNewClientId; }
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx
index 383c641..6c406b4 100644
--- a/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx
@@ -322,11 +322,6 @@ protected:
Rectangle getBoundingBoxOnScreen()
throw ( ::com::sun::star::lang::DisposedException );
- /** Creates a new UUID, if rId is empty.
- @attention This method requires locked global mutex to prevent double
- creation of an UUID. */
- static void implCreateUuid( ::com::sun::star::uno::Sequence< sal_Int8 >& rId );
-
::comphelper::AccessibleEventNotifier::TClientId getClientId() const { return m_aClientId; }
void setClientId(::comphelper::AccessibleEventNotifier::TClientId _aNewClientId) { m_aClientId = _aNewClientId; }
diff --git a/accessibility/prj/build.lst b/accessibility/prj/build.lst
index 469a59e..6169221 100644
--- a/accessibility/prj/build.lst
+++ b/accessibility/prj/build.lst
@@ -1,4 +1,4 @@
-ac accessibility : TRANSLATIONS:translations tools jurt offuh unoil vcl javaunohelper jvmaccess cppu sal toolkit svtools LIBXSLT:libxslt NULL
+ac accessibility : TRANSLATIONS:translations tools jurt offapi unoil vcl javaunohelper jvmaccess cppu sal toolkit svtools LIBXSLT:libxslt NULL
ac accessibility usr1 - all ac_mkout NULL
ac accessibility\inc nmake - all ac_inc NULL
ac accessibility\bridge\org\openoffice\java\accessibility nmake - w ac_ooja ac_inc NULL
diff --git a/accessibility/prj/d.lst b/accessibility/prj/d.lst
index 662373c..1e47390 100644
--- a/accessibility/prj/d.lst
+++ b/accessibility/prj/d.lst
@@ -1,8 +1,8 @@
-..\%__SRC%\class\java_uno_accessbridge.jar %_DEST%\bin%_EXT%\java_uno_accessbridge.jar
-..\%__SRC%\class\java_accessibility.jar %_DEST%\bin%_EXT%\java_accessibility.jar
+..\%__SRC%\class\java_uno_accessbridge.jar %_DEST%\bin\java_uno_accessbridge.jar
+..\%__SRC%\class\java_accessibility.jar %_DEST%\bin\java_accessibility.jar
-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
-..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res
-..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
+..\%__SRC%\bin\*.dll %_DEST%\bin\*.dll
+..\%__SRC%\bin\*.res %_DEST%\bin\*.res
+..\%__SRC%\lib\lib*.so %_DEST%\lib
+..\%__SRC%\lib\*.dylib %_DEST%\lib\*.dylib
..\%__SRC%\misc\java_uno_accessbridge.component %_DEST%\xml\java_uno_accessbridge.component
diff --git a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
index 24cc3ce..97baa20 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
@@ -30,8 +30,8 @@
#include "precompiled_accessibility.hxx"
#include "accessibility/extended/AccessibleBrowseBoxBase.hxx"
#include <svtools/accessibletableprovider.hxx>
-#include <rtl/uuid.h>
-//
+#include <comphelper/servicehelper.hxx>
+
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <unotools/accessiblerelationsethelper.hxx>
@@ -344,13 +344,15 @@ void SAL_CALL AccessibleBrowseBoxBase::removeEventListener(
// XTypeProvider --------------------------------------------------------------
+namespace
+{
+ class theAccessibleBrowseBoxBaseImplementationId : public rtl::Static< UnoTunnelIdInit, theAccessibleBrowseBoxBaseImplementationId > {};
+}
+
Sequence< sal_Int8 > SAL_CALL AccessibleBrowseBoxBase::getImplementationId()
throw ( uno::RuntimeException )
{
- ::osl::MutexGuard aGuard( getOslGlobalMutex() );
- static Sequence< sal_Int8 > aId;
- implCreateUuid( aId );
- return aId;
+ return theAccessibleBrowseBoxBaseImplementationId::get().getSeq();
}
// XServiceInfo ---------------------------------------------------------------
@@ -508,17 +510,7 @@ void AccessibleBrowseBoxBase::commitEvent(
AccessibleEventNotifier::addEvent( getClientId( ), aEvent );
}
-// -----------------------------------------------------------------------------
-void AccessibleBrowseBoxBase::implCreateUuid( Sequence< sal_Int8 >& rId )
-{
- if( !rId.hasElements() )
- {
- rId.realloc( 16 );
- rtl_createUuid( reinterpret_cast< sal_uInt8* >( rId.getArray() ), 0, sal_True );
- }
-}
-// -----------------------------------------------------------------------------
sal_Int16 SAL_CALL AccessibleBrowseBoxBase::getAccessibleRole()
throw ( uno::RuntimeException )
{
diff --git a/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx b/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx
index b40253c..33d50c0 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx
@@ -32,6 +32,7 @@
#include "accessibility/extended/AccessibleBrowseBoxHeaderBar.hxx"
#include <svtools/accessibletableprovider.hxx>
+#include <comphelper/servicehelper.hxx>
// ============================================================================
@@ -344,13 +345,15 @@ OUString SAL_CALL AccessibleBrowseBoxHeaderBar::getImplementationName()
return OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.svtools.AccessibleBrowseBoxHeaderBar" ) );
}
+namespace
+{
+ class theAccessibleBrowseBoxHeaderBarImplementationId : public rtl::Static< UnoTunnelIdInit, theAccessibleBrowseBoxHeaderBarImplementationId > {};
+}
+
Sequence< sal_Int8 > SAL_CALL AccessibleBrowseBoxHeaderBar::getImplementationId()
throw ( uno::RuntimeException )
{
- ::osl::MutexGuard aGuard( getOslGlobalMutex() );
- static Sequence< sal_Int8 > aId;
- implCreateUuid( aId );
- return aId;
+ return theAccessibleBrowseBoxHeaderBarImplementationId::get().getSeq();
}
// internal virtual methods ---------------------------------------------------
diff --git a/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx b/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx
index 825689c..6108672 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx
@@ -34,6 +34,7 @@
#include <svtools/accessibletableprovider.hxx>
#include <tools/multisel.hxx>
#include <comphelper/sequence.hxx>
+#include <comphelper/servicehelper.hxx>
// ============================================================================
@@ -206,13 +207,15 @@ Sequence< uno::Type > SAL_CALL AccessibleBrowseBoxTableBase::getTypes()
AccessibleBrowseBoxTableImplHelper::getTypes() );
}
+namespace
+{
+ class theAccessibleBrowseBoxTableBaseImplementationId : public rtl::Static< UnoTunnelIdInit, theAccessibleBrowseBoxTableBaseImplementationId > {};
+}
+
Sequence< sal_Int8 > SAL_CALL AccessibleBrowseBoxTableBase::getImplementationId()
throw ( uno::RuntimeException )
{
- ::osl::MutexGuard aGuard( getOslGlobalMutex() );
- static Sequence< sal_Int8 > aId;
- implCreateUuid( aId );
- return aId;
+ return theAccessibleBrowseBoxTableBaseImplementationId::get().getSeq();
}
// internal virtual methods ---------------------------------------------------
diff --git a/accessibility/source/extended/AccessibleGridControlBase.cxx b/accessibility/source/extended/AccessibleGridControlBase.cxx
index bf1fb2c..c3af90e 100644
--- a/accessibility/source/extended/AccessibleGridControlBase.cxx
+++ b/accessibility/source/extended/AccessibleGridControlBase.cxx
@@ -30,7 +30,7 @@
#include "precompiled_accessibility.hxx"
#include "accessibility/extended/AccessibleGridControlBase.hxx"
#include <svtools/accessibletable.hxx>
-#include <rtl/uuid.h>
+#include <comphelper/servicehelper.hxx>
//
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
@@ -280,13 +280,15 @@ void SAL_CALL AccessibleGridControlBase::removeEventListener(
// XTypeProvider --------------------------------------------------------------
+namespace
+{
+ class theAccessibleGridControlBaseImplementationId : public rtl::Static< UnoTunnelIdInit, theAccessibleGridControlBaseImplementationId > {};
+}
+
Sequence< sal_Int8 > SAL_CALL AccessibleGridControlBase::getImplementationId()
throw ( uno::RuntimeException )
{
- ::osl::MutexGuard aGuard( getOslGlobalMutex() );
- static Sequence< sal_Int8 > aId;
- implCreateUuid( aId );
- return aId;
+ return theAccessibleGridControlBaseImplementationId::get().getSeq();
}
// XServiceInfo ---------------------------------------------------------------
@@ -409,17 +411,7 @@ void AccessibleGridControlBase::commitEvent(
AccessibleEventNotifier::addEvent( getClientId( ), aEvent );
}
-// -----------------------------------------------------------------------------
-void AccessibleGridControlBase::implCreateUuid( Sequence< sal_Int8 >& rId )
-{
- if( !rId.hasElements() )
- {
- rId.realloc( 16 );
- rtl_createUuid( reinterpret_cast< sal_uInt8* >( rId.getArray() ), 0, sal_True );
- }
-}
-// -----------------------------------------------------------------------------
sal_Int16 SAL_CALL AccessibleGridControlBase::getAccessibleRole()
throw ( uno::RuntimeException )
{
diff --git a/accessibility/source/extended/AccessibleGridControlHeader.cxx b/accessibility/source/extended/AccessibleGridControlHeader.cxx
index 464d584..a46a380 100644
--- a/accessibility/source/extended/AccessibleGridControlHeader.cxx
+++ b/accessibility/source/extended/AccessibleGridControlHeader.cxx
@@ -34,6 +34,7 @@
#include "accessibility/extended/AccessibleGridControlHeaderCell.hxx"
#include "accessibility/extended/AccessibleGridControlTableCell.hxx"
#include <svtools/accessibletable.hxx>
+#include <comphelper/servicehelper.hxx>
// ============================================================================
@@ -227,13 +228,15 @@ OUString SAL_CALL AccessibleGridControlHeader::getImplementationName()
return OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.accessibility.AccessibleGridControlHeader" ) );
}
+namespace
+{
+ class theAccessibleGridControlHeaderImplementationId : public rtl::Static< UnoTunnelIdInit, theAccessibleGridControlHeaderImplementationId > {};
+}
+
Sequence< sal_Int8 > SAL_CALL AccessibleGridControlHeader::getImplementationId()
throw ( uno::RuntimeException )
{
- ::osl::MutexGuard aGuard( getOslGlobalMutex() );
- static Sequence< sal_Int8 > aId;
- implCreateUuid( aId );
- return aId;
+ return theAccessibleGridControlHeaderImplementationId::get().getSeq();
}
// internal virtual methods ---------------------------------------------------
diff --git a/accessibility/source/extended/AccessibleGridControlTableBase.cxx b/accessibility/source/extended/AccessibleGridControlTableBase.cxx
index 5dc6032..6b034b9 100644
--- a/accessibility/source/extended/AccessibleGridControlTableBase.cxx
+++ b/accessibility/source/extended/AccessibleGridControlTableBase.cxx
@@ -34,6 +34,7 @@
#include <svtools/accessibletable.hxx>
#include <tools/multisel.hxx>
#include <comphelper/sequence.hxx>
+#include <comphelper/servicehelper.hxx>
// ============================================================================
@@ -210,13 +211,15 @@ Sequence< uno::Type > SAL_CALL AccessibleGridControlTableBase::getTypes()
AccessibleGridControlTableImplHelper::getTypes() );
}
+namespace
+{
+ class theAccessibleGridControlTableBaseImplementationId : public rtl::Static< UnoTunnelIdInit, theAccessibleGridControlTableBaseImplementationId > {};
+}
+
Sequence< sal_Int8 > SAL_CALL AccessibleGridControlTableBase::getImplementationId()
throw ( uno::RuntimeException )
{
- ::osl::MutexGuard aGuard( getOslGlobalMutex() );
- static Sequence< sal_Int8 > aId;
- implCreateUuid( aId );
- return aId;
+ return theAccessibleGridControlTableBaseImplementationId::get().getSeq();
}
// internal helper methods ----------------------------------------------------
diff --git a/accessibility/source/helper/accresmgr.cxx b/accessibility/source/helper/accresmgr.cxx
index c2e5516..48c0eb1 100644
--- a/accessibility/source/helper/accresmgr.cxx
+++ b/accessibility/source/helper/accresmgr.cxx
@@ -56,9 +56,7 @@ void TkResMgr::ensureImplExists()
::com::sun::star::lang::Locale aLocale = Application::GetSettings().GetUILocale();
- ByteString sResMgrName( "acc" );
-
- m_pImpl = SimpleResMgr::Create( sResMgrName.GetBuffer(), aLocale );
+ m_pImpl = SimpleResMgr::Create("acc", aLocale );
if (m_pImpl)
{
diff --git a/automation/inc/automation/commdefines.hxx b/automation/inc/automation/commdefines.hxx
index 15e38a8..24ca058 100644
--- a/automation/inc/automation/commdefines.hxx
+++ b/automation/inc/automation/commdefines.hxx
@@ -38,22 +38,22 @@
#include <osl/endian.h>
#ifndef MAKEDWORD
-#define MAKEDWORD(wl, wh) ((comm_DWORD)((wl) & 0xFFFF) | (((comm_DWORD)(wh) & 0xFFFF) << 16))
+#define MAKEDWORD(wl, wh) ((sal_uInt32)((wl) & 0xFFFF) | (((sal_uInt32)(wh) & 0xFFFF) << 16))
#endif
#ifndef LOWORD
-#define LOWORD(d) ((comm_WORD)((comm_DWORD)(d) & 0xFFFF))
+#define LOWORD(d) ((sal_uInt16)((sal_uInt32)(d) & 0xFFFF))
#endif
#ifndef HIWORD
-#define HIWORD(d) ((comm_WORD)(((comm_DWORD)(d) >> 16) & 0xFFFF))
+#define HIWORD(d) ((sal_uInt16)(((sal_uInt32)(d) >> 16) & 0xFFFF))
#endif
#ifndef MAKEWORD
-#define MAKEWORD(bl, bh) ((comm_WORD)((bl) & 0xFF) | (((comm_WORD)(bh) & 0xFF) << 8))
+#define MAKEWORD(bl, bh) ((sal_uInt16)((bl) & 0xFF) | (((sal_uInt16)(bh) & 0xFF) << 8))
#endif
#ifndef LOBYTE
-#define LOBYTE(w) ((comm_BYTE)((comm_WORD)(w) & 0xFF))
+#define LOBYTE(w) ((comm_BYTE)((sal_uInt16)(w) & 0xFF))
#endif
#ifndef HIBYTE
-#define HIBYTE(w) ((comm_BYTE)(((comm_WORD)(w) >> 8) & 0xFF))
+#define HIBYTE(w) ((comm_BYTE)(((sal_uInt16)(w) >> 8) & 0xFF))
#endif
#ifndef MAKEBYTE
#define MAKEBYTE(nl, nh) ((comm_BYTE)(((nl) & 0x0F) | (((nh) & 0x0F) << 4)))
@@ -74,10 +74,10 @@
#ifdef OSL_BIGENDIAN
#ifndef NETWORD
-#define NETWORD(w) (comm_WORD)(w)
+#define NETWORD(w) (sal_uInt16)(w)
#endif
#ifndef NETDWORD
-#define NETDWORD(d) (comm_DWORD)(d)
+#define NETDWORD(d) (sal_uInt32)(d)
#endif
#endif // OSL_BIGENDIAN
@@ -123,8 +123,8 @@ typedef comm_UINT16 CMProtocol;
#define CM_PROTOCOL_BROADCASTER (CMProtocol)0x0002
#define CM_PROTOCOL_USER_START (CMProtocol)0x0100
-typedef comm_USHORT HandshakeType;
-typedef comm_USHORT CommunicationOption;
+typedef comm_UINT16 HandshakeType;
+typedef comm_UINT16 CommunicationOption;
#define CH_NoHeader 0x0000
#define CH_SimpleMultiChannel 0x0001
diff --git a/automation/inc/automation/commtypes.hxx b/automation/inc/automation/commtypes.hxx
index 8d7c976..88bf89c 100644
--- a/automation/inc/automation/commtypes.hxx
+++ b/automation/inc/automation/commtypes.hxx
@@ -36,13 +36,9 @@
*
************************************************************************/
-/** defines al least types
+/** defines:
comm_BYTE
- comm_WORD;
- comm_DWORD;
comm_BOOL
- comm_ULONG
- comm_USHORT
comm_UINT16
comm_UINT32
comm_UniChar
@@ -60,14 +56,9 @@ typedef sal_Unicode comm_UniChar;
#include <tools/solar.h>
typedef sal_uInt8 comm_BYTE;
typedef sal_Bool comm_BOOL;
-typedef sal_uInt32 comm_ULONG;
-typedef sal_uInt16 comm_USHORT;
typedef sal_uInt16 comm_UINT16;
typedef sal_uInt32 comm_UINT32;
-typedef sal_uInt16 comm_WORD;
-typedef sal_uInt32 comm_DWORD;
-
class String;
#define comm_String String
diff --git a/automation/prj/d.lst b/automation/prj/d.lst
index c83a228..69f82e4 100644
--- a/automation/prj/d.lst
+++ b/automation/prj/d.lst
@@ -1,27 +1,27 @@
-mkdir: %COMMON_DEST%\bin%_EXT%\hid
-mkdir: %_DEST%\inc%_EXT%\automation
+mkdir: %COMMON_DEST%\bin\hid
+mkdir: %_DEST%\inc\automation
-#..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
-..\util\manually_added_ids.hid %COMMON_DEST%\bin%_EXT%\hid\manually_added_ids.hid
-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
-..\%__SRC%\lib\lib* %_DEST%\lib%_EXT%\*
-..\%__SRC%\lib\ists.lib %_DEST%\lib%_EXT%\ists.lib
-..\%__SRC%\lib\isimplecm.lib %_DEST%\lib%_EXT%\isimplecm.lib
-..\%__SRC%\lib\icommuni.lib %_DEST%\lib%_EXT%\icommuni.lib
+#..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin\hid\*.hid
+..\util\manually_added_ids.hid %COMMON_DEST%\bin\hid\manually_added_ids.hid
+..\%__SRC%\bin\*.dll %_DEST%\bin\*.dll
+..\%__SRC%\lib\lib* %_DEST%\lib\*
+..\%__SRC%\lib\ists.lib %_DEST%\lib\ists.lib
+..\%__SRC%\lib\isimplecm.lib %_DEST%\lib\isimplecm.lib
+..\%__SRC%\lib\icommuni.lib %_DEST%\lib\icommuni.lib
-..\inc\automation\automation.hxx %_DEST%\inc%_EXT%\automation\automation.hxx
-..\inc\automation\commdefines.hxx %_DEST%\inc%_EXT%\automation\commdefines.hxx
-..\inc\automation\commtypes.hxx %_DEST%\inc%_EXT%\automation\commtypes.hxx
-..\inc\automation\communi.hxx %_DEST%\inc%_EXT%\automation\communi.hxx
-..\inc\automation\simplecm.hxx %_DEST%\inc%_EXT%\automation\simplecm.hxx
+..\inc\automation\automation.hxx %_DEST%\inc\automation\automation.hxx
+..\inc\automation\commdefines.hxx %_DEST%\inc\automation\commdefines.hxx
+..\inc\automation\commtypes.hxx %_DEST%\inc\automation\commtypes.hxx
+..\inc\automation\communi.hxx %_DEST%\inc\automation\communi.hxx
+..\inc\automation\simplecm.hxx %_DEST%\inc\automation\simplecm.hxx
-..\%__SRC%\bin\testtool.exe %_DEST%\bin%_EXT%\testtool.bin
-..\%__SRC%\bin\testtool %_DEST%\bin%_EXT%\testtool.bin
-..\%__SRC%\inc\classes %_DEST%\bin%_EXT%\classes
-..\%__SRC%\inc\keycodes %_DEST%\bin%_EXT%\keycodes
-..\%__SRC%\inc\res_type %_DEST%\bin%_EXT%\res_type
+..\%__SRC%\bin\testtool.exe %_DEST%\bin\testtool.bin
+..\%__SRC%\bin\testtool %_DEST%\bin\testtool.bin
+..\%__SRC%\inc\classes %_DEST%\bin\classes
+..\%__SRC%\inc\keycodes %_DEST%\bin\keycodes
+..\%__SRC%\inc\res_type %_DEST%\bin\res_type
-..\%COMMON_OUTDIR%\bin\images_tt.zip %COMMON_DEST%\bin%_EXT%\images_tt.zip
+..\%COMMON_OUTDIR%\bin\images_tt.zip %COMMON_DEST%\bin\images_tt.zip
-..\%__SRC%\bin\testtoolrc %_DEST%\lib%_EXT%\testtoolrc
-..\%__SRC%\bin\testtool.ini %_DEST%\bin%_EXT%\testtool.ini
+..\%__SRC%\bin\testtoolrc %_DEST%\lib\testtoolrc
+..\%__SRC%\bin\testtool.ini %_DEST%\bin\testtool.ini
diff --git a/automation/source/inc/cmdbasestream.hxx b/automation/source/inc/cmdbasestream.hxx
index 71666ce..7011299 100644
--- a/automation/source/inc/cmdbasestream.hxx
+++ b/automation/source/inc/cmdbasestream.hxx
@@ -51,16 +51,16 @@ public:
void GenError( rtl::OString *pUId, comm_String *pString );
- void GenReturn( comm_USHORT nRet, comm_ULONG nNr );
- void GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_ULONG nNr );
- void GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_String *pString );
- void GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_BOOL bBool );
- void GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_ULONG nNr, comm_String *pString, comm_BOOL bBool );
+ void GenReturn( comm_UINT16 nRet, comm_UINT32 nNr );
+ void GenReturn( comm_UINT16 nRet, rtl::OString *pUId, comm_UINT32 nNr );
+ void GenReturn( comm_UINT16 nRet, rtl::OString *pUId, comm_String *pString );
+ void GenReturn( comm_UINT16 nRet, rtl::OString *pUId, comm_BOOL bBool );
+ void GenReturn( comm_UINT16 nRet, rtl::OString *pUId, comm_UINT32 nNr, comm_String *pString, comm_BOOL bBool );
- void GenReturn( comm_USHORT nRet, comm_USHORT nMethod, comm_ULONG nNr );
- void GenReturn( comm_USHORT nRet, comm_USHORT nMethod, comm_String *pString );
- void GenReturn( comm_USHORT nRet, comm_USHORT nMethod, comm_BOOL bBool );
- void GenReturn( comm_USHORT nRet, comm_USHORT nMethod, comm_USHORT nNr );
+ void GenReturn( comm_UINT16 nRet, comm_UINT16 nMethod, comm_UINT32 nNr );
+ void GenReturn( comm_UINT16 nRet, comm_UINT16 nMethod, comm_String *pString );
+ void GenReturn( comm_UINT16 nRet, comm_UINT16 nMethod, comm_BOOL bBool );
+ void GenReturn( comm_UINT16 nRet, comm_UINT16 nMethod, comm_UINT16 nNr );
// MacroRecorder
void GenReturn( comm_UINT16 nRet, rtl::OString *pUId, comm_UINT16 nMethod ); // also used outside MacroRecorder
@@ -68,15 +68,15 @@ public:
void GenReturn( comm_UINT16 nRet, rtl::OString *pUId, comm_UINT16 nMethod, comm_String *pString, comm_BOOL bBool );
void GenReturn( comm_UINT16 nRet, rtl::OString *pUId, comm_UINT16 nMethod, comm_UINT32 nNr );
- void Read ( comm_USHORT &nNr );
- void Read ( comm_ULONG &nNr );
- void Read (comm_UniChar* &aString, comm_USHORT &nLenInChars );
+ void Read ( comm_UINT16 &nNr );
+ void Read ( comm_UINT32 &nNr );
+ void Read (comm_UniChar* &aString, comm_UINT16 &nLenInChars );
void Read ( comm_BOOL &bBool );
- comm_USHORT GetNextType();
+ comm_UINT16 GetNextType();
- void Write( comm_USHORT nNr );
- void Write( comm_ULONG nNr );
- void Write( const comm_UniChar* aString, comm_USHORT nLenInChars );
+ void Write( comm_UINT16 nNr );
+ void Write( comm_UINT32 nNr );
+ void Write( const comm_UniChar* aString, comm_UINT16 nLenInChars );
void Write( comm_BOOL bBool );
// Complex Datatypes to be handled system dependent
diff --git a/automation/source/inc/icommstream.hxx b/automation/source/inc/icommstream.hxx
index adc9be1..864293b 100644
--- a/automation/source/inc/icommstream.hxx
+++ b/automation/source/inc/icommstream.hxx
@@ -46,19 +46,19 @@ public:
ICommStream(){}
virtual ~ICommStream(){}
- virtual ICommStream& operator>>( comm_USHORT& rUShort )=0;
- virtual ICommStream& operator>>( comm_ULONG& rULong )=0;
+ virtual ICommStream& operator>>( comm_UINT16& rUShort )=0;
+ virtual ICommStream& operator>>( comm_UINT32& rULong )=0;
virtual ICommStream& operator>>( comm_BOOL& rChar )=0;
- virtual ICommStream& operator<<( comm_USHORT nUShort )=0;
- virtual ICommStream& operator<<( comm_ULONG nULong )=0;
+ virtual ICommStream& operator<<( comm_UINT16 nUShort )=0;
+ virtual ICommStream& operator<<( comm_UINT32 nULong )=0;
virtual ICommStream& operator<<( comm_BOOL nChar )=0;
- virtual comm_ULONG Read( void* pData, comm_ULONG nSize )=0;
- virtual comm_ULONG Write( const void* pData, comm_ULONG nSize )=0;
+ virtual comm_UINT32 Read( void* pData, comm_UINT32 nSize )=0;
+ virtual comm_UINT32 Write( const void* pData, comm_UINT32 nSize )=0;
virtual comm_BOOL IsEof() const=0;
- virtual comm_ULONG SeekRel( long nPos )=0;
+ virtual comm_UINT32 SeekRel( long nPos )=0;
};
diff --git a/automation/source/inc/rcontrol.hxx b/automation/source/inc/rcontrol.hxx
index 1310289..14a26fe 100644
--- a/automation/source/inc/rcontrol.hxx
+++ b/automation/source/inc/rcontrol.hxx
@@ -54,8 +54,8 @@
#define SIReturnError 13
// Typisierung im Stream
-#define BinUSHORT 11
-#define BinULONG 14
+#define BinUINT16 11
+#define BinUINT32 14
#define BinString 12
#define BinBool 13
#define BinSbxValue 15
@@ -443,12 +443,12 @@
// Beschreibt die Parametertypen als Bitfeld Reihenfolge immer!
// wie hier Aufgelistet
#define PARAM_NONE 0x0000
-#define PARAM_USHORT_1 0x0001
-#define PARAM_USHORT_2 0x0002
-#define PARAM_USHORT_3 0x0100 // Nicht in der Reihe!!
-#define PARAM_USHORT_4 0x0200 // Nicht in der Reihe!!
-#define PARAM_ULONG_1 0x0004
-#define PARAM_ULONG_2 0x0008
+#define PARAM_UINT16_1 0x0001
+#define PARAM_UINT16_2 0x0002
+#define PARAM_UINT16_3 0x0100 // Nicht in der Reihe!!
+#define PARAM_UINT16_4 0x0200 // Nicht in der Reihe!!
+#define PARAM_UINT32_1 0x0004
+#define PARAM_UINT32_2 0x0008
#define PARAM_STR_1 0x0010
#define PARAM_STR_2 0x0020
#define PARAM_BOOL_1 0x0040
diff --git a/automation/source/inc/svcommstream.hxx b/automation/source/inc/svcommstream.hxx
index 0cf2891..7a122ba 100644
--- a/automation/source/inc/svcommstream.hxx
+++ b/automation/source/inc/svcommstream.hxx
@@ -41,19 +41,19 @@ public:
SvCommStream( SvStream* pIO );
~SvCommStream();
- ICommStream& operator>>( comm_USHORT& rUShort );
- ICommStream& operator>>( comm_ULONG& rULong );
+ ICommStream& operator>>( comm_UINT16& rUShort );
+ ICommStream& operator>>( comm_UINT32& rULong );
ICommStream& operator>>( comm_BOOL& rChar );
- ICommStream& operator<<( comm_USHORT nUShort );
- ICommStream& operator<<( comm_ULONG nULong );
+ ICommStream& operator<<( comm_UINT16 nUShort );
+ ICommStream& operator<<( comm_UINT32 nULong );
ICommStream& operator<<( comm_BOOL nChar );
- comm_ULONG Read( void* pData, comm_ULONG nSize );
- comm_ULONG Write( const void* pData, comm_ULONG nSize );
+ comm_UINT32 Read( void* pData, comm_UINT32 nSize );
+ comm_UINT32 Write( const void* pData, comm_UINT32 nSize );
comm_BOOL IsEof() const;
- comm_ULONG SeekRel( long nPos );
+ comm_UINT32 SeekRel( long nPos );
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/automation/source/miniapp/servres.cxx b/automation/source/miniapp/servres.cxx
index 1bd795f..cedbffe 100644
--- a/automation/source/miniapp/servres.cxx
+++ b/automation/source/miniapp/servres.cxx
@@ -53,10 +53,4 @@ ModalDialogGROSSER_TEST_DLG::ModalDialogGROSSER_TEST_DLG( Window * pParent, cons
if( bFreeRes ) FreeResource();
}
-MenuMENU_CLIENT::MenuMENU_CLIENT( const ResId & rResId, sal_Bool )
- : MenuBar( rResId )
-{
- // No subresources, automatic free resource
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/automation/source/miniapp/servres.hxx b/automation/source/miniapp/servres.hxx
index 7258416..2b04595 100644
--- a/automation/source/miniapp/servres.hxx
+++ b/automation/source/miniapp/servres.hxx
@@ -55,11 +55,4 @@ public:
ModalDialogGROSSER_TEST_DLG( Window * pParent, const ResId & rResId, sal_Bool bFreeRes = sal_True );
};
-class MenuMENU_CLIENT : public MenuBar
-{
-protected:
-public:
- MenuMENU_CLIENT( const ResId & rResId, sal_Bool bFreeRes = sal_True );
-};
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/automation/source/miniapp/testapp.cxx b/automation/source/miniapp/testapp.cxx
index 66cbb38..bb44281 100644
--- a/automation/source/miniapp/testapp.cxx
+++ b/automation/source/miniapp/testapp.cxx
@@ -209,7 +209,7 @@ sal_uInt16 MyDispatcher::ExecuteFunction( sal_uInt16 nSID, SfxPoolItem** ppArgs,
case IDM_SYS_DLG: pMainWin->SysDlg(); break;
default:
{
- OSL_TRACE("Dispatcher kennt Funktion nicht %s",ByteString::CreateFromInt64(nSID).GetBuffer());
+ OSL_TRACE("Dispatcher kennt Funktion nicht %s", rtl::OString::valueOf(static_cast<sal_Int64>(nSID)).getStr());
return EXECUTE_NO;
}
diff --git a/automation/source/server/XMLParser.cxx b/automation/source/server/XMLParser.cxx
index d056fba..5521441 100644
--- a/automation/source/server/XMLParser.cxx
+++ b/automation/source/server/XMLParser.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -351,7 +351,7 @@ void SAXParser::startElement( const ::rtl::OUString& aName, const ::com::sun::st
void SAXParser::endElement( const ::rtl::OUString& aName ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException)
{
- (void) aName; /* avoid warning about unused parameter */
+ (void) aName; /* avoid warning about unused parameter */
xCurrentNode = xCurrentNode->GetParent();
}
@@ -375,18 +375,18 @@ void SAXParser::characters( const ::rtl::OUString& aChars ) throw (::com::sun::s
void SAXParser::ignorableWhitespace( const ::rtl::OUString& aWhitespaces ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException)
{
- (void) aWhitespaces; /* avoid warning about unused parameter */
+ (void) aWhitespaces; /* avoid warning about unused parameter */
}
void SAXParser::processingInstruction( const ::rtl::OUString& aTarget, const ::rtl::OUString& aData ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException)
{
- (void) aTarget; /* avoid warning about unused parameter */
- (void) aData; /* avoid warning about unused parameter */
+ (void) aTarget; /* avoid warning about unused parameter */
+ (void) aData; /* avoid warning about unused parameter */
}
void SAXParser::setDocumentLocator( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >& xLocator ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException)
{
- (void) xLocator; /* avoid warning about unused parameter */
+ (void) xLocator; /* avoid warning about unused parameter */
#if OSL_DEBUG_LEVEL > 1
::rtl::OUString aTester;
aTester = xLocator->getPublicId();
diff --git a/automation/source/server/cmdbasestream.cxx b/automation/source/server/cmdbasestream.cxx
index 1144cde..154ca63 100644
--- a/automation/source/server/cmdbasestream.cxx
+++ b/automation/source/server/cmdbasestream.cxx
@@ -53,132 +53,132 @@ CmdBaseStream::~CmdBaseStream()
void CmdBaseStream::GenError (rtl::OString *pUId, comm_String *pString )
{
- Write(comm_USHORT(SIReturnError));
+ Write(comm_UINT16(SIReturnError));
Write(pUId);
Write(pString);
}
-void CmdBaseStream::GenReturn (comm_USHORT nRet, comm_ULONG nUId )
+void CmdBaseStream::GenReturn (comm_UINT16 nRet, comm_UINT32 nUId )
{
- Write(comm_USHORT(SIReturn));
+ Write(comm_UINT16(SIReturn));
Write(nRet);
Write(nUId);
- Write(comm_USHORT(PARAM_NONE)); // Typ der folgenden Parameter
+ Write(comm_UINT16(PARAM_NONE)); // Typ der folgenden Parameter
}
-void CmdBaseStream::GenReturn (comm_USHORT nRet, rtl::OString *pUId, comm_ULONG nNr )
+void CmdBaseStream::GenReturn (comm_UINT16 nRet, rtl::OString *pUId, comm_UINT32 nNr )
{
- Write(comm_USHORT(SIReturn));
+ Write(comm_UINT16(SIReturn));
Write(nRet);
- if ( pUId->equals( rtl::OString( "UID_ACTIVE" ) ) )
- Write(comm_ULONG(0));
+ if (pUId->equalsL(RTL_CONSTASCII_STRINGPARAM("UID_ACTIVE")))
+ Write(comm_UINT32(0));
else
Write(pUId);
- Write(comm_USHORT(PARAM_ULONG_1)); // Typ der folgenden Parameter
+ Write(comm_UINT16(PARAM_UINT32_1)); // Typ der folgenden Parameter
Write(nNr);
}
-void CmdBaseStream::GenReturn (comm_USHORT nRet, rtl::OString *pUId, comm_String *pString )
+void CmdBaseStream::GenReturn (comm_UINT16 nRet, rtl::OString *pUId, comm_String *pString )
{
- Write(comm_USHORT(SIReturn));
+ Write(comm_UINT16(SIReturn));
Write(nRet);
- if ( pUId->equals( rtl::OString( "UID_ACTIVE" ) ) )
- Write(comm_ULONG(0));
+ if (pUId->equalsL(RTL_CONSTASCII_STRINGPARAM("UID_ACTIVE")))
+ Write(comm_UINT32(0));
else
Write(pUId);
- Write(comm_USHORT(PARAM_STR_1)); // Typ der folgenden Parameter
+ Write(comm_UINT16(PARAM_STR_1)); // Typ der folgenden Parameter
Write(pString);
}
-void CmdBaseStream::GenReturn (comm_USHORT nRet, rtl::OString *pUId, comm_BOOL bBool )
+void CmdBaseStream::GenReturn (comm_UINT16 nRet, rtl::OString *pUId, comm_BOOL bBool )
{
- Write(comm_USHORT(SIReturn));
+ Write(comm_UINT16(SIReturn));
Write(nRet);
- if ( pUId->equals( rtl::OString( "UID_ACTIVE" ) ) )
- Write(comm_ULONG(0));
+ if (pUId->equalsL(RTL_CONSTASCII_STRINGPARAM("UID_ACTIVE")))
+ Write(comm_UINT32(0));
else
Write(pUId);
- Write(comm_USHORT(PARAM_BOOL_1)); // Typ der folgenden Parameter
+ Write(comm_UINT16(PARAM_BOOL_1)); // Typ der folgenden Parameter
Write(bBool);
}
-void CmdBaseStream::GenReturn (comm_USHORT nRet, rtl::OString *pUId, comm_ULONG nNr, comm_String *pString, comm_BOOL bBool )
+void CmdBaseStream::GenReturn (comm_UINT16 nRet, rtl::OString *pUId, comm_UINT32 nNr, comm_String *pString, comm_BOOL bBool )
{
- Write(comm_USHORT(SIReturn));
+ Write(comm_UINT16(SIReturn));
Write(nRet);
- if ( pUId->equals( rtl::OString( "UID_ACTIVE" ) ) )
- Write(comm_ULONG(0));
+ if (pUId->equalsL(RTL_CONSTASCII_STRINGPARAM("UID_ACTIVE")))
+ Write(comm_UINT32(0));
else
Write(pUId);
- Write(comm_USHORT(PARAM_ULONG_1|PARAM_STR_1|PARAM_BOOL_1)); // Typ der folgenden Parameter
+ Write(comm_UINT16(PARAM_UINT32_1|PARAM_STR_1|PARAM_BOOL_1)); // Typ der folgenden Parameter
Write(nNr);
Write(pString);
Write(bBool);
}
-void CmdBaseStream::GenReturn (comm_USHORT nRet, comm_USHORT nMethod, comm_ULONG nNr )
+void CmdBaseStream::GenReturn (comm_UINT16 nRet, comm_UINT16 nMethod, comm_UINT32 nNr )
{
- Write(comm_USHORT(SIReturn));
+ Write(comm_UINT16(SIReturn));
Write(nRet);
- Write((comm_ULONG)nMethod); //HELPID BACKWARD (no sal_uLong needed)
- Write(comm_USHORT(PARAM_ULONG_1)); // Typ der folgenden Parameter
+ Write((comm_UINT32)nMethod); //HELPID BACKWARD (no sal_uLong needed)
+ Write(comm_UINT16(PARAM_UINT32_1)); // Typ der folgenden Parameter
Write(nNr);
}
-void CmdBaseStream::GenReturn (comm_USHORT nRet, comm_USHORT nMethod, comm_String *pString )
+void CmdBaseStream::GenReturn (comm_UINT16 nRet, comm_UINT16 nMethod, comm_String *pString )
{
- Write(comm_USHORT(SIReturn));
+ Write(comm_UINT16(SIReturn));
Write(nRet);
- Write((comm_ULONG)nMethod); //HELPID BACKWARD (no sal_uLong needed)
- Write(comm_USHORT(PARAM_STR_1)); // Typ der folgenden Parameter
+ Write((comm_UINT32)nMethod); //HELPID BACKWARD (no sal_uLong needed)
+ Write(comm_UINT16(PARAM_STR_1)); // Typ der folgenden Parameter
Write(pString);
}
-void CmdBaseStream::GenReturn (comm_USHORT nRet, comm_USHORT nMethod, comm_BOOL bBool )
+void CmdBaseStream::GenReturn (comm_UINT16 nRet, comm_UINT16 nMethod, comm_BOOL bBool )
{
- Write(comm_USHORT(SIReturn));
+ Write(comm_UINT16(SIReturn));
Write(nRet);
- Write((comm_ULONG)nMethod); //HELPID BACKWARD (no sal_uLong needed)
- Write(comm_USHORT(PARAM_BOOL_1)); // Typ der folgenden Parameter
+ Write((comm_UINT32)nMethod); //HELPID BACKWARD (no sal_uLong needed)
+ Write(comm_UINT16(PARAM_BOOL_1)); // Typ der folgenden Parameter
Write(bBool);
}
-void CmdBaseStream::GenReturn (comm_USHORT nRet, comm_USHORT nMethod, comm_USHORT nNr )
+void CmdBaseStream::GenReturn (comm_UINT16 nRet, comm_UINT16 nMethod, comm_UINT16 nNr )
{
- Write(comm_USHORT(SIReturn));
+ Write(comm_UINT16(SIReturn));
Write(nRet);
- Write((comm_ULONG)nMethod); //HELPID BACKWARD (no sal_uLong needed)
- Write(comm_USHORT(PARAM_USHORT_1)); // Typ der folgenden Parameter
+ Write((comm_UINT32)nMethod); //HELPID BACKWARD (no sal_uLong needed)
+ Write(comm_UINT16(PARAM_UINT16_1)); // Typ der folgenden Parameter
Write(nNr);
}
// MacroRecorder
-void CmdBaseStream::GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_USHORT nMethod )
+void CmdBaseStream::GenReturn( comm_UINT16 nRet, rtl::OString *pUId, comm_UINT16 nMethod )
{
- Write(comm_USHORT(SIReturn));
+ Write(comm_UINT16(SIReturn));
Write(nRet);
Write(pUId);
- Write(comm_USHORT(PARAM_USHORT_1)); // Typ der folgenden Parameter
+ Write(comm_UINT16(PARAM_UINT16_1)); // Typ der folgenden Parameter
Write(nMethod);
}
-void CmdBaseStream::GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_USHORT nMethod, comm_String *pString )
+void CmdBaseStream::GenReturn( comm_UINT16 nRet, rtl::OString *pUId, comm_UINT16 nMethod, comm_String *pString )
{
- Write(comm_USHORT(SIReturn));
+ Write(comm_UINT16(SIReturn));
Write(nRet);
Write(pUId);
- Write(comm_USHORT(PARAM_USHORT_1|PARAM_STR_1)); // Typ der folgenden Parameter
+ Write(comm_UINT16(PARAM_UINT16_1|PARAM_STR_1)); // Typ der folgenden Parameter
Write(nMethod);
Write(pString);
}
-void CmdBaseStream::GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_USHORT nMethod, comm_String *pString, comm_BOOL bBool )
+void CmdBaseStream::GenReturn( comm_UINT16 nRet, rtl::OString *pUId, comm_UINT16 nMethod, comm_String *pString, comm_BOOL bBool )
{
- Write(comm_USHORT(SIReturn));
+ Write(comm_UINT16(SIReturn));
Write(nRet);
Write(pUId);
- Write(comm_USHORT(PARAM_USHORT_1|PARAM_STR_1|PARAM_BOOL_1)); // Typ der folgenden Parameter
+ Write(comm_UINT16(PARAM_UINT16_1|PARAM_STR_1|PARAM_BOOL_1)); // Typ der folgenden Parameter
Write(nMethod);
Write(pString);
Write(bBool);
@@ -186,41 +186,41 @@ void CmdBaseStream::GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_USHORT
void CmdBaseStream::GenReturn( comm_UINT16 nRet, rtl::OString *pUId, comm_UINT16 nMethod, comm_UINT32 nNr )
{
- Write(comm_USHORT(SIReturn));
+ Write(comm_UINT16(SIReturn));
Write(nRet);
Write(pUId);
- Write(comm_USHORT(PARAM_USHORT_1|PARAM_ULONG_1)); // Typ der folgenden Parameter
+ Write(comm_UINT16(PARAM_UINT16_1|PARAM_UINT32_1)); // Typ der folgenden Parameter
Write(nMethod);
Write(nNr);
}
-void CmdBaseStream::Read (comm_USHORT &nNr)
+void CmdBaseStream::Read (comm_UINT16 &nNr)
{
- comm_USHORT nId;
+ comm_UINT16 nId;
*pCommStream >> nId;
if (pCommStream->IsEof()) return;
#if OSL_DEBUG_LEVEL > 1
- if (nId != BinUSHORT) OSL_TRACE( "Falscher Typ im Stream: Erwartet USHORT, gefunden :%hu", nId );
+ if (nId != BinUINT16) OSL_TRACE( "Falscher Typ im Stream: Erwartet USHORT, gefunden :%hu", nId );
#endif
*pCommStream >> nNr;
}
-void CmdBaseStream::Read (comm_ULONG &nNr)
+void CmdBaseStream::Read (comm_UINT32 &nNr)
{
- comm_USHORT nId;
+ comm_UINT16 nId;
*pCommStream >> nId;
if (pCommStream->IsEof()) return;
#if OSL_DEBUG_LEVEL > 1
- if (nId != BinULONG) OSL_TRACE( "Falscher Typ im Stream: Erwartet ULONG, gefunden :%hu", nId );
+ if (nId != BinUINT32) OSL_TRACE( "Falscher Typ im Stream: Erwartet ULONG, gefunden :%hu", nId );
#endif
*pCommStream >> nNr;
}
-void CmdBaseStream::Read (comm_UniChar* &aString, comm_USHORT &nLenInChars )
+void CmdBaseStream::Read (comm_UniChar* &aString, comm_UINT16 &nLenInChars )
{
- comm_USHORT nId;
+ comm_UINT16 nId;
*pCommStream >> nId;
#if OSL_DEBUG_LEVEL > 1
if (nId != BinString) OSL_TRACE( "Falscher Typ im Stream: Erwartet String, gefunden :%hu", nId );
@@ -229,10 +229,10 @@ void CmdBaseStream::Read (comm_UniChar* &aString, comm_USHORT &nLenInChars )
*pCommStream >> nLenInChars;
aString = new comm_UniChar [nLenInChars];
- pCommStream->Read( aString, ((comm_ULONG)nLenInChars) * sizeof( comm_UniChar ) );
+ pCommStream->Read( aString, ((comm_UINT32)nLenInChars) * sizeof( comm_UniChar ) );
#ifdef OSL_BIGENDIAN
// we have to change the byteorder
- comm_USHORT n;
+ comm_UINT16 n;
for ( n = 0 ; n < nLenInChars ; n++ )
aString[ n ] = aString[ n ] >> 8 | aString[ n ] << 8;
#endif
@@ -240,7 +240,7 @@ void CmdBaseStream::Read (comm_UniChar* &aString, comm_USHORT &nLenInChars )
void CmdBaseStream::Read (comm_BOOL &bBool)
{
- comm_USHORT nId;
+ comm_UINT16 nId;
*pCommStream >> nId;
#if OSL_DEBUG_LEVEL > 1
if (nId != BinBool) OSL_TRACE( "Falscher Typ im Stream: Erwartet BOOL, gefunden :%hu", nId );
@@ -248,39 +248,39 @@ void CmdBaseStream::Read (comm_BOOL &bBool)
*pCommStream >> bBool;
}
-comm_USHORT CmdBaseStream::GetNextType()
+comm_UINT16 CmdBaseStream::GetNextType()
{
- comm_USHORT nId;
+ comm_UINT16 nId;
*pCommStream >> nId;
pCommStream->SeekRel(-2);
return nId;
}
-void CmdBaseStream::Write( comm_USHORT nNr )
+void CmdBaseStream::Write( comm_UINT16 nNr )
{
- *pCommStream << comm_USHORT( BinUSHORT );
+ *pCommStream << comm_UINT16( BinUINT16 );
*pCommStream << nNr;
}
-void CmdBaseStream::Write( comm_ULONG nNr )
+void CmdBaseStream::Write( comm_UINT32 nNr )
{
- *pCommStream << comm_USHORT( BinULONG );
+ *pCommStream << comm_UINT16( BinUINT32 );
*pCommStream << nNr;
}
-void CmdBaseStream::Write( const comm_UniChar* aString, comm_USHORT nLenInChars )
+void CmdBaseStream::Write( const comm_UniChar* aString, comm_UINT16 nLenInChars )
{
- *pCommStream << comm_USHORT(BinString);
+ *pCommStream << comm_UINT16(BinString);
- comm_USHORT n;
+ comm_UINT16 n;
// remove BiDi and zero-width-markers 0x200B - 0x200F
// remove BiDi and paragraph-markers 0x2028 - 0x202E
comm_UniChar* aNoBiDiString;
aNoBiDiString = new comm_UniChar [nLenInChars];
- comm_USHORT nNewLenInChars = 0;
+ comm_UINT16 nNewLenInChars = 0;
for ( n = 0 ; n < nLenInChars ; n++ )
{
comm_UniChar c = aString[ n ];
@@ -303,10 +303,10 @@ void CmdBaseStream::Write( const comm_UniChar* aString, comm_USHORT nLenInChars
aNewString = new comm_UniChar [nNewLenInChars];
for ( n = 0 ; n < nNewLenInChars ; n++ )
aNewString[ n ] = aNoBiDiString[ n ] >> 8 | aNoBiDiString[ n ] << 8;
- pCommStream->Write( aNewString, ((comm_ULONG)nNewLenInChars) * sizeof( comm_UniChar ) );
+ pCommStream->Write( aNewString, ((comm_UINT32)nNewLenInChars) * sizeof( comm_UniChar ) );
delete [] aNewString;
#else
- pCommStream->Write( aNoBiDiString, ((comm_ULONG)nNewLenInChars) * sizeof( comm_UniChar ) );
+ pCommStream->Write( aNoBiDiString, ((comm_UINT32)nNewLenInChars) * sizeof( comm_UniChar ) );
#endif
delete [] aNoBiDiString;
@@ -314,7 +314,7 @@ void CmdBaseStream::Write( const comm_UniChar* aString, comm_USHORT nLenInChars
void CmdBaseStream::Write( comm_BOOL bBool )
{
- *pCommStream << comm_USHORT( BinBool );
+ *pCommStream << comm_UINT16( BinBool );
*pCommStream << bBool;
}
diff --git a/automation/source/server/recorder.cxx b/automation/source/server/recorder.cxx
index 6ec7ed4..c74380d 100644
--- a/automation/source/server/recorder.cxx
+++ b/automation/source/server/recorder.cxx
@@ -190,7 +190,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
case VCLEVENT_WINDOW_ACTIVATE:
if ( m_bRecord )
{
- StatementList::pRet->GenReturn( RET_MacroRecorder, rtl::OString(), (comm_USHORT)(M_SetPage|M_RET_NUM_CONTROL), Id2Str( pWin->GetUniqueOrHelpId() ) );
+ StatementList::pRet->GenReturn( RET_MacroRecorder, rtl::OString(), (comm_UINT16)(M_SetPage|M_RET_NUM_CONTROL), Id2Str( pWin->GetUniqueOrHelpId() ) );
bSendData = sal_True;
}
if ( m_bLog )
@@ -210,7 +210,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
{
if ( m_bRecord )
{
- StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), (comm_USHORT)M_Check );
+ StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), (comm_UINT16)M_Check );
bSendData = sal_True;
}
if ( m_bLog )
@@ -228,7 +228,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
{
case VCLEVENT_BUTTON_CLICK: //VCLEVENT_CHECKBOX_TOGGLE:
{
- comm_USHORT nMethod;
+ comm_UINT16 nMethod;
String aMethod;
switch ( ((TriStateBox*)pWin)->GetState() )
{
@@ -273,7 +273,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
case VCLEVENT_LISTBOX_SELECT:
if ( m_bRecord )
{
- StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), (comm_USHORT)M_Select, comm_ULONG( ((ListBox*)pWin)->GetSelectEntryPos() +1 ) );
+ StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), (comm_UINT16)M_Select, comm_UINT32( ((ListBox*)pWin)->GetSelectEntryPos() +1 ) );
bSendData = sal_True;
}
if ( m_bLog )
@@ -308,7 +308,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
Sound::Beep();
else
{
- StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), (comm_USHORT)M_Select, (comm_ULONG) nPos+1 );
+ StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), (comm_UINT16)M_Select, (comm_UINT32) nPos+1 );
bSendData = sal_True;
}
}
@@ -341,7 +341,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
case WINDOW_QUERYBOX:
case WINDOW_BUTTONDIALOG:
{
- comm_USHORT nMethod;
+ comm_UINT16 nMethod;
String aMethod;
ButtonDialog* pBD = (ButtonDialog*)pParent;
@@ -372,7 +372,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
if ( nMethod != M_Click )
StatementList::pRet->GenReturn( RET_MacroRecorder, UID_ACTIVE, nMethod );
else
- StatementList::pRet->GenReturn( RET_MacroRecorder, UID_ACTIVE, nMethod, (comm_ULONG)nCurrentButtonId );
+ StatementList::pRet->GenReturn( RET_MacroRecorder, UID_ACTIVE, nMethod, (comm_UINT32)nCurrentButtonId );
bSendData = sal_True;
}
if ( m_bLog )
@@ -387,7 +387,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
break;
default:
{
- comm_USHORT nMethod;
+ comm_UINT16 nMethod;
String aMethod;
switch ( pWin->GetType() )
{
@@ -415,7 +415,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
{
if ( !bSendData && pWin->GetUniqueOrHelpId().getLength() )
{
- StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), (comm_USHORT)M_Click );
+ StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), (comm_UINT16)M_Click );
bSendData = sal_True;
}
}
@@ -443,7 +443,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
pEditModify = NULL;
aEditModifyString.Erase();
- comm_USHORT nMethod;
+ comm_UINT16 nMethod;
String aMethod;
switch ( nEventID )
{
@@ -478,7 +478,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
case VCLEVENT_BUTTON_CLICK:
if ( m_bRecord )
{
- StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), (comm_USHORT)M_Click );
+ StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), (comm_UINT16)M_Click );
bSendData = sal_True;
}
if ( m_bLog )
@@ -502,10 +502,10 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
{
if ( !pWin->GetUniqueOrHelpId().getLength() /* || pWin->GetUniqueOrHelpId().Matches( 1 ) */ )
// generate direct Button access
- StatementList::pRet->GenReturn( RET_MacroRecorder, Str2Id( pTB->GetItemCommand( pTB->GetCurItemId() ) ), (comm_USHORT)(M_Click) );
+ StatementList::pRet->GenReturn( RET_MacroRecorder, Str2Id( pTB->GetItemCommand( pTB->GetCurItemId() ) ), (comm_UINT16)(M_Click) );
else
// access via Toolbox
- StatementList::pRet->GenReturn( RET_MacroRecorder, pTB->GetUniqueOrHelpId(), (comm_USHORT)(M_Click|M_RET_NUM_CONTROL), Id2Str( pTB->GetHelpId( pTB->GetCurItemId() ) ) );
+ StatementList::pRet->GenReturn( RET_MacroRecorder, pTB->GetUniqueOrHelpId(), (comm_UINT16)(M_Click|M_RET_NUM_CONTROL), Id2Str( pTB->GetHelpId( pTB->GetCurItemId() ) ) );
bSendData = sal_True;
}
}
diff --git a/automation/source/server/retstrm.cxx b/automation/source/server/retstrm.cxx
index 3f5d2d8..df36835 100644
--- a/automation/source/server/retstrm.cxx
+++ b/automation/source/server/retstrm.cxx
@@ -58,18 +58,18 @@ void RetStream::GenReturn ( sal_uInt16 nRet, rtl::OString aUId, String aString )
CmdBaseStream::GenReturn ( nRet, &aUId, &aString );
}
-void RetStream::GenReturn ( sal_uInt16 nRet, rtl::OString aUId, comm_ULONG nNr, String aString, sal_Bool bBool )
+void RetStream::GenReturn ( sal_uInt16 nRet, rtl::OString aUId, comm_UINT32 nNr, String aString, sal_Bool bBool )
{
CmdBaseStream::GenReturn ( nRet, &aUId, nNr, &aString, bBool );
}
// MacroRecorder
-void RetStream::GenReturn( sal_uInt16 nRet, rtl::OString aUId, comm_USHORT nMethod, String aString )
+void RetStream::GenReturn( sal_uInt16 nRet, rtl::OString aUId, comm_UINT16 nMethod, String aString )
{
CmdBaseStream::GenReturn ( nRet, &aUId, nMethod, &aString );
}
-void RetStream::GenReturn( sal_uInt16 nRet, rtl::OString aUId, comm_USHORT nMethod, String aString, sal_Bool bBool )
+void RetStream::GenReturn( sal_uInt16 nRet, rtl::OString aUId, comm_UINT16 nMethod, String aString, sal_Bool bBool )
{
CmdBaseStream::GenReturn ( nRet, &aUId, nMethod, &aString, bBool );
}
@@ -79,7 +79,7 @@ void RetStream::GenReturn ( sal_uInt16 nRet, sal_uInt16 nMethod, SbxValue &aValu
{
Write(sal_uInt16(SIReturn));
Write(nRet);
- Write((comm_ULONG)nMethod); //HELPID BACKWARD (no sal_uLong needed)
+ Write((comm_UINT32)nMethod); //HELPID BACKWARD (no sal_uLong needed)
Write(sal_uInt16(PARAM_SBXVALUE_1)); // Typ der folgenden Parameter
Write(aValue);
}
diff --git a/automation/source/server/retstrm.hxx b/automation/source/server/retstrm.hxx
index 19ee23f..b61911a 100644
--- a/automation/source/server/retstrm.hxx
+++ b/automation/source/server/retstrm.hxx
@@ -44,24 +44,24 @@ public:
void GenError( rtl::OString aUId, String aString );
using CmdBaseStream::GenReturn;
- void GenReturn( comm_USHORT nRet, comm_ULONG nNr ){CmdBaseStream::GenReturn( nRet, nNr );}
- void GenReturn( comm_USHORT nRet, rtl::OString aUId, comm_ULONG nNr ){CmdBaseStream::GenReturn( nRet, &aUId, nNr );}
- void GenReturn( comm_USHORT nRet, rtl::OString aUId, comm_BOOL bBool ){CmdBaseStream::GenReturn( nRet, &aUId, bBool );}
+ void GenReturn( comm_UINT16 nRet, comm_UINT32 nNr ){CmdBaseStream::GenReturn( nRet, nNr );}
+ void GenReturn( comm_UINT16 nRet, rtl::OString aUId, comm_UINT32 nNr ){CmdBaseStream::GenReturn( nRet, &aUId, nNr );}
+ void GenReturn( comm_UINT16 nRet, rtl::OString aUId, comm_BOOL bBool ){CmdBaseStream::GenReturn( nRet, &aUId, bBool );}
// MacroRecorder
void GenReturn( comm_UINT16 nRet, rtl::OString aUId, comm_UINT16 nMethod ){CmdBaseStream::GenReturn( nRet, &aUId, nMethod );} // also used outside MacroRecorder
void GenReturn( comm_UINT16 nRet, rtl::OString aUId, comm_UINT16 nMethod, comm_UINT32 nNr ){CmdBaseStream::GenReturn( nRet, &aUId, nMethod, nNr );}
void GenReturn( sal_uInt16 nRet, rtl::OString aUId, String aString );
- void GenReturn( sal_uInt16 nRet, rtl::OString aUId, comm_ULONG nNr, String aString, sal_Bool bBool );
+ void GenReturn( sal_uInt16 nRet, rtl::OString aUId, comm_UINT32 nNr, String aString, sal_Bool bBool );
// needed for RemoteCommand and Profiling
void GenReturn( sal_uInt16 nRet, sal_uInt16 nMethod, SbxValue &aValue );
void GenReturn( sal_uInt16 nRet, sal_uInt16 nMethod, String aString );
// MacroRecorder
- void GenReturn( sal_uInt16 nRet, rtl::OString aUId, comm_USHORT nMethod, String aString );
- void GenReturn( sal_uInt16 nRet, rtl::OString aUId, comm_USHORT nMethod, String aString, sal_Bool bBool );
+ void GenReturn( sal_uInt16 nRet, rtl::OString aUId, comm_UINT16 nMethod, String aString );
+ void GenReturn( sal_uInt16 nRet, rtl::OString aUId, comm_UINT16 nMethod, String aString, sal_Bool bBool );
void Reset();
SvStream* GetStream();
@@ -69,8 +69,8 @@ public:
using CmdBaseStream::Write;
- void Write( comm_USHORT nNr ){CmdBaseStream::Write( nNr );}
- void Write( comm_ULONG nNr ){CmdBaseStream::Write( nNr );}
+ void Write( comm_UINT16 nNr ){CmdBaseStream::Write( nNr );}
+ void Write( comm_UINT32 nNr ){CmdBaseStream::Write( nNr );}
void Write( comm_BOOL bBool ){CmdBaseStream::Write( bBool );}
void Write( SbxValue &aValue );
diff --git a/automation/source/server/scmdstrm.cxx b/automation/source/server/scmdstrm.cxx
index 8cd69cb..65bc818 100644
--- a/automation/source/server/scmdstrm.cxx
+++ b/automation/source/server/scmdstrm.cxx
@@ -86,24 +86,24 @@ void SCmdStream::Read ( SfxPoolItem *&pItem )
Read( nType );
switch (nType)
{
- case BinUSHORT:
+ case BinUINT16:
{
- comm_USHORT nNr;
+ comm_UINT16 nNr;
Read (nNr );
pItem = new SfxUInt16Item(nId,nNr);
#if OSL_DEBUG_LEVEL > 1
- StatementList::m_pDbgWin->AddText( "USHORT:" );
+ StatementList::m_pDbgWin->AddText( "UINT16" );
StatementList::m_pDbgWin->AddText( String::CreateFromInt32( nNr ) );
#endif
}
break;
- case BinULONG:
+ case BinUINT32:
{
- comm_ULONG nNr;
+ comm_UINT32 nNr;
Read (nNr );
pItem = new SfxUInt32Item(nId,nNr);
#if OSL_DEBUG_LEVEL > 1
- StatementList::m_pDbgWin->AddText( "ULONG:" );
+ StatementList::m_pDbgWin->AddText( "UINT32" );
StatementList::m_pDbgWin->AddText( String::CreateFromInt64( nNr ) );
#endif
}
@@ -157,24 +157,24 @@ void SCmdStream::Read ( ::com::sun::star::beans::PropertyValue &rItem )
nType = GetNextType();
switch (nType)
{
- case BinUSHORT:
+ case BinUINT16:
{
- comm_USHORT nNr;
+ comm_UINT16 nNr;
Read (nNr );
rItem.Value <<= nNr;
#if OSL_DEBUG_LEVEL > 1
- StatementList::m_pDbgWin->AddText( "USHORT:" );
+ StatementList::m_pDbgWin->AddText( "UINT16" );
StatementList::m_pDbgWin->AddText( String::CreateFromInt32( nNr ) );
#endif
}
break;
- case BinULONG:
+ case BinUINT32:
{
- comm_ULONG nNr;
+ comm_UINT32 nNr;
Read (nNr );
rItem.Value <<= nNr;
#if OSL_DEBUG_LEVEL > 1
- StatementList::m_pDbgWin->AddText( "ULONG:" );
+ StatementList::m_pDbgWin->AddText( "UINT32" );
StatementList::m_pDbgWin->AddText( String::CreateFromInt64( nNr ) );
#endif
}
diff --git a/automation/source/server/scmdstrm.hxx b/automation/source/server/scmdstrm.hxx
index e2725b6..5962e39 100644
--- a/automation/source/server/scmdstrm.hxx
+++ b/automation/source/server/scmdstrm.hxx
@@ -47,8 +47,8 @@ public:
~SCmdStream();
using CmdBaseStream::Read;
- void Read ( comm_USHORT &nNr ){CmdBaseStream::Read ( nNr );}
- void Read ( comm_ULONG &nNr ){CmdBaseStream::Read ( nNr );}
+ void Read ( comm_UINT16 &nNr ){CmdBaseStream::Read ( nNr );}
+ void Read ( comm_UINT32 &nNr ){CmdBaseStream::Read ( nNr );}
void Read ( comm_BOOL &bBool ){CmdBaseStream::Read ( bBool );}
void Read ( String &aString );
void Read ( SfxPoolItem *&pItem );
diff --git a/automation/source/server/sta_list.cxx b/automation/source/server/sta_list.cxx
index e8be991..3ff44fa 100644
--- a/automation/source/server/sta_list.cxx
+++ b/automation/source/server/sta_list.cxx
@@ -124,11 +124,10 @@ TTSettings* GetTTSettings()
return pTTSettings;
}
-
-
-
// FIXME: HELPID
-#define IS_WINP_CLOSING(pWin) (pWin->GetHelpId().equals( "TT_Win_is_closing_HID" ) && pWin->GetUniqueId().equals( "TT_Win_is_closing_UID" ))
+#define IS_WINP_CLOSING(pWin) \
+ (pWin->GetHelpId().equalsL(RTL_CONSTASCII_STRINGPARAM("TT_Win_is_closing_HID")) && \
+ pWin->GetUniqueId().equalsL(RTL_CONSTASCII_STRINGPARAM("TT_Win_is_closing_UID")))
StatementList::StatementList()
: nRetryCount(MAX_RETRIES)
@@ -167,7 +166,7 @@ void StatementList::SendProfile( String aText )
if ( pProfiler->IsPartitioning() )
// FIXME: HELPID
- pRet->GenReturn( RET_ProfileInfo, S_ProfileTime, static_cast<comm_ULONG>(pProfiler->GetPartitioningTime()) ); // GetPartitioningTime() sal_uLong != comm_ULONG on 64bit
+ pRet->GenReturn( RET_ProfileInfo, S_ProfileTime, static_cast<comm_UINT32>(pProfiler->GetPartitioningTime()) ); // GetPartitioningTime() sal_uLong != comm_UINT32 on 64bit
}
if ( pProfiler->IsAutoProfiling() )
diff --git a/automation/source/server/statemnt.cxx b/automation/source/server/statemnt.cxx
index 23641de..ed0e110 100644
--- a/automation/source/server/statemnt.cxx
+++ b/automation/source/server/statemnt.cxx
@@ -191,7 +191,7 @@ void StatementFlow::SendViaSocket()
bSending = sal_True;
if ( pCommLink )
{
- if ( !pCommLink->TransferDataStream( pRet->GetStream() ) ) // tritt ein Fehler auf, so wird sofort gel�scht ...
+ if ( !pCommLink->TransferDataStream( pRet->GetStream() ) ) // tritt ein Fehler auf, so wird sofort gel�scht ...
pCommLink = NULL;
}
else
@@ -220,15 +220,15 @@ sal_Bool StatementFlow::Execute()
if ( !bUseIPC )
{
// bBool1 wurde im CTOR auf sal_False initialisiert
- if ( !bBool1 ) // also erster Durchlauf
+ if ( !bBool1 ) // also erster Durchlauf
{
pRemoteControl->pRetStream = pRet->GetStream();
- bBool1 = sal_True; // wurde im CTOR auf sal_False initialisiert
+ bBool1 = sal_True; // wurde im CTOR auf sal_False initialisiert
nRetryCount = nRetryCount * 4;
}
- if ( pRemoteControl->pRetStream && (nRetryCount--) ) // also solange nicht abgeholt
+ if ( pRemoteControl->pRetStream && (nRetryCount--) ) // also solange nicht abgeholt
{
- return sal_False; // Bitte einmal vom Callstack runter
+ return sal_False; // Bitte einmal vom Callstack runter
}
}
@@ -241,7 +241,7 @@ sal_Bool StatementFlow::Execute()
{
case F_EndCommandBlock:
if ( !bUseIPC )
- { // wird oben abgehandelt
+ { // wird oben abgehandelt
pRet->Reset();
IsError = sal_False;
}
@@ -276,59 +276,59 @@ static short ImpGetRType( Window *pWin )
short nRT = C_NoType;
WindowType eRT = pWin->GetType();
switch( eRT ) {
- case WINDOW_WINDOW: nRT = C_Window ; break;
-
- case WINDOW_TABCONTROL: nRT = C_TabControl ; break;
- case WINDOW_RADIOBUTTON: nRT = C_RadioButton ; break;
- case WINDOW_CHECKBOX: nRT = C_CheckBox ; break;
- case WINDOW_TRISTATEBOX: nRT = C_TriStateBox ; break;
- case WINDOW_EDIT: nRT = C_Edit ; break;
- case WINDOW_MULTILINEEDIT: nRT = C_MultiLineEdit ; break;
- case WINDOW_MULTILISTBOX: nRT = C_MultiListBox ; break;
- case WINDOW_LISTBOX: nRT = C_ListBox ; break;
- case WINDOW_COMBOBOX: nRT = C_ComboBox ; break;
- case WINDOW_PUSHBUTTON: nRT = C_PushButton ; break;
- case WINDOW_SPINFIELD: nRT = C_SpinField ; break;
- case WINDOW_PATTERNFIELD: nRT = C_PatternField ; break;
- case WINDOW_NUMERICFIELD: nRT = C_NumericField ; break;
- case WINDOW_METRICFIELD: nRT = C_MetricField ; break;
- case WINDOW_CURRENCYFIELD: nRT = C_CurrencyField ; break;
- case WINDOW_DATEFIELD: nRT = C_DateField ; break;
- case WINDOW_TIMEFIELD: nRT = C_TimeField ; break;
- case WINDOW_IMAGERADIOBUTTON: nRT = C_ImageRadioButton ; break;
- case WINDOW_NUMERICBOX: nRT = C_NumericBox ; break;
- case WINDOW_METRICBOX: nRT = C_MetricBox ; break;
- case WINDOW_CURRENCYBOX: nRT = C_CurrencyBox ; break;
- case WINDOW_DATEBOX: nRT = C_DateBox ; break;
- case WINDOW_TIMEBOX: nRT = C_TimeBox ; break;
- case WINDOW_IMAGEBUTTON: nRT = C_ImageButton ; break;
- case WINDOW_MENUBUTTON: nRT = C_MenuButton ; break;
- case WINDOW_MOREBUTTON: nRT = C_MoreButton ; break;
-
-
- case WINDOW_TABPAGE: nRT = C_TabPage; break;
- case WINDOW_MODALDIALOG: nRT = C_ModalDlg; break;
- case WINDOW_FLOATINGWINDOW: nRT = C_FloatWin; break;
- case WINDOW_MODELESSDIALOG: nRT = C_ModelessDlg; break;
- case WINDOW_WORKWINDOW: nRT = C_WorkWin; break;
- case WINDOW_DOCKINGWINDOW: nRT = C_DockingWin; break;
-
- case WINDOW_MESSBOX: nRT = C_MessBox; break;
- case WINDOW_INFOBOX: nRT = C_InfoBox; break;
- case WINDOW_WARNINGBOX: nRT = C_WarningBox; break;
- case WINDOW_ERRORBOX: nRT = C_ErrorBox; break;
- case WINDOW_QUERYBOX: nRT = C_QueryBox; break;
- case WINDOW_TABDIALOG: nRT = C_TabDlg; break;
-
- case WINDOW_PATTERNBOX: nRT = C_PatternBox; break;
- case WINDOW_TOOLBOX: nRT = C_ToolBox; break;
- case WINDOW_CONTROL: nRT = C_Control; break;
- case WINDOW_OKBUTTON: nRT = C_OkButton; break;
- case WINDOW_CANCELBUTTON: nRT = C_CancelButton; break;
- case WINDOW_BUTTONDIALOG: nRT = C_ButtonDialog; break;
- case WINDOW_TREELISTBOX: nRT = C_TreeListBox; break;
-
- case WINDOW_DIALOG: nRT = C_Dialog; break;
+ case WINDOW_WINDOW: nRT = C_Window ; break;
+
+ case WINDOW_TABCONTROL: nRT = C_TabControl ; break;
+ case WINDOW_RADIOBUTTON: nRT = C_RadioButton ; break;
+ case WINDOW_CHECKBOX: nRT = C_CheckBox ; break;
+ case WINDOW_TRISTATEBOX: nRT = C_TriStateBox ; break;
+ case WINDOW_EDIT: nRT = C_Edit ; break;
+ case WINDOW_MULTILINEEDIT: nRT = C_MultiLineEdit ; break;
+ case WINDOW_MULTILISTBOX: nRT = C_MultiListBox ; break;
+ case WINDOW_LISTBOX: nRT = C_ListBox ; break;
+ case WINDOW_COMBOBOX: nRT = C_ComboBox ; break;
+ case WINDOW_PUSHBUTTON: nRT = C_PushButton ; break;
+ case WINDOW_SPINFIELD: nRT = C_SpinField ; break;
+ case WINDOW_PATTERNFIELD: nRT = C_PatternField ; break;
+ case WINDOW_NUMERICFIELD: nRT = C_NumericField ; break;
+ case WINDOW_METRICFIELD: nRT = C_MetricField ; break;
+ case WINDOW_CURRENCYFIELD: nRT = C_CurrencyField ; break;
+ case WINDOW_DATEFIELD: nRT = C_DateField ; break;
+ case WINDOW_TIMEFIELD: nRT = C_TimeField ; break;
+ case WINDOW_IMAGERADIOBUTTON: nRT = C_ImageRadioButton ; break;
+ case WINDOW_NUMERICBOX: nRT = C_NumericBox ; break;
+ case WINDOW_METRICBOX: nRT = C_MetricBox ; break;
+ case WINDOW_CURRENCYBOX: nRT = C_CurrencyBox ; break;
+ case WINDOW_DATEBOX: nRT = C_DateBox ; break;
+ case WINDOW_TIMEBOX: nRT = C_TimeBox ; break;
+ case WINDOW_IMAGEBUTTON: nRT = C_ImageButton ; break;
+ case WINDOW_MENUBUTTON: nRT = C_MenuButton ; break;
+ case WINDOW_MOREBUTTON: nRT = C_MoreButton ; break;
+
+
+ case WINDOW_TABPAGE: nRT = C_TabPage; break;
+ case WINDOW_MODALDIALOG: nRT = C_ModalDlg; break;
+ case WINDOW_FLOATINGWINDOW: nRT = C_FloatWin; break;
+ case WINDOW_MODELESSDIALOG: nRT = C_ModelessDlg; break;
+ case WINDOW_WORKWINDOW: nRT = C_WorkWin; break;
+ case WINDOW_DOCKINGWINDOW: nRT = C_DockingWin; break;
+
+ case WINDOW_MESSBOX: nRT = C_MessBox; break;
+ case WINDOW_INFOBOX: nRT = C_InfoBox; break;
+ case WINDOW_WARNINGBOX: nRT = C_WarningBox; break;
+ case WINDOW_ERRORBOX: nRT = C_ErrorBox; break;
+ case WINDOW_QUERYBOX: nRT = C_QueryBox; break;
+ case WINDOW_TABDIALOG: nRT = C_TabDlg; break;
+
+ case WINDOW_PATTERNBOX: nRT = C_PatternBox; break;
+ case WINDOW_TOOLBOX: nRT = C_ToolBox; break;
+ case WINDOW_CONTROL: nRT = C_Control; break;
+ case WINDOW_OKBUTTON: nRT = C_OkButton; break;
+ case WINDOW_CANCELBUTTON: nRT = C_CancelButton; break;
+ case WINDOW_BUTTONDIALOG: nRT = C_ButtonDialog; break;
+ case WINDOW_TREELISTBOX: nRT = C_TreeListBox; break;
+
+ case WINDOW_DIALOG: nRT = C_Dialog; break;
}
return nRT;
}
@@ -640,7 +640,7 @@ sal_Bool StatementSlot::Execute()
}
-/* Neues Verfahren ab 334!
+/* Neues Verfahren ab 334!
Neue Methode zum einstellen, da� Modale Dialoge immer Asynchron aufgerufen werden
und echter Returnwert, ob Slot geklappt hat
und Testen ob Slot �berhaupt durch UI aufgerufen werden kann */
@@ -688,13 +688,13 @@ StatementCommand::StatementCommand( StatementList *pAfterThis, sal_uInt16 Method
m_pDbgWin->AddText( " Methode: " );
m_pDbgWin->AddText( String::CreateFromInt32( nMethodId ) );
m_pDbgWin->AddText( " Params:" );
- if( nParams & PARAM_UINT16_1 ) {m_pDbgWin->AddText( " n1:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr1 ) );}
- if( nParams & PARAM_UINT16_2 ) {m_pDbgWin->AddText( " n2:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr2 ) );}
- if( nParams & PARAM_UINT16_3 ) {m_pDbgWin->AddText( " n3:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr3 ) );}
- if( nParams & PARAM_UINT16_4 ) {m_pDbgWin->AddText( " n4:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr4 ) );}
- if( nParams & PARAM_UINT32_1 ) {m_pDbgWin->AddText( " nl1:" );m_pDbgWin->AddText( String::CreateFromInt64( nLNr1 ) );}
- if( nParams & PARAM_STR_1 ) {m_pDbgWin->AddText( " s1:" );m_pDbgWin->AddText( aString1 );}
- if( nParams & PARAM_STR_2 ) {m_pDbgWin->AddText( " s2:" );m_pDbgWin->AddText( aString2 );}
+ if( nParams & PARAM_UINT16_1 ) {m_pDbgWin->AddText( " n1:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr1 ) );}
+ if( nParams & PARAM_UINT16_2 ) {m_pDbgWin->AddText( " n2:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr2 ) );}
+ if( nParams & PARAM_UINT16_3 ) {m_pDbgWin->AddText( " n3:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr3 ) );}
+ if( nParams & PARAM_UINT16_4 ) {m_pDbgWin->AddText( " n4:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr4 ) );}
+ if( nParams & PARAM_UINT32_1 ) {m_pDbgWin->AddText( " nl1:" );m_pDbgWin->AddText( String::CreateFromInt64( nLNr1 ) );}
+ if( nParams & PARAM_STR_1 ) {m_pDbgWin->AddText( " s1:" );m_pDbgWin->AddText( aString1 );}
+ if( nParams & PARAM_STR_2 ) {m_pDbgWin->AddText( " s2:" );m_pDbgWin->AddText( aString2 );}
if( nParams & PARAM_BOOL_1 ) {m_pDbgWin->AddText( " b1:" );m_pDbgWin->AddText( bBool1 ? "TRUE" : "FALSE" );}
if( nParams & PARAM_BOOL_2 ) {m_pDbgWin->AddText( " b2:" );m_pDbgWin->AddText( bBool2 ? "TRUE" : "FALSE" );}
m_pDbgWin->AddText( "\n" );
@@ -720,28 +720,28 @@ StatementCommand::StatementCommand( SCmdStream *pCmdIn )
pCmdIn->Read( nMethodId );
pCmdIn->Read( nParams );
- if( nParams & PARAM_UINT16_1 ) pCmdIn->Read( nNr1 );
- if( nParams & PARAM_UINT16_2 ) pCmdIn->Read( nNr2 );
- if( nParams & PARAM_UINT16_3 ) pCmdIn->Read( nNr3 );
- if( nParams & PARAM_UINT16_4 ) pCmdIn->Read( nNr4 );
- if( nParams & PARAM_UINT32_1 ) pCmdIn->Read( nLNr1_and_Pointer.nLNr1 );
- if( nParams & PARAM_STR_1 ) pCmdIn->Read( aString1 );
- if( nParams & PARAM_STR_2 ) pCmdIn->Read( aString2 );
- if( nParams & PARAM_BOOL_1 ) pCmdIn->Read( bBool1 );
- if( nParams & PARAM_BOOL_2 ) pCmdIn->Read( bBool2 );
+ if( nParams & PARAM_UINT16_1 ) pCmdIn->Read( nNr1 );
+ if( nParams & PARAM_UINT16_2 ) pCmdIn->Read( nNr2 );
+ if( nParams & PARAM_UINT16_3 ) pCmdIn->Read( nNr3 );
+ if( nParams & PARAM_UINT16_4 ) pCmdIn->Read( nNr4 );
+ if( nParams & PARAM_UINT32_1 ) pCmdIn->Read( nLNr1_and_Pointer.nLNr1 );
+ if( nParams & PARAM_STR_1 ) pCmdIn->Read( aString1 );
+ if( nParams & PARAM_STR_2 ) pCmdIn->Read( aString2 );
+ if( nParams & PARAM_BOOL_1 ) pCmdIn->Read( bBool1 );
+ if( nParams & PARAM_BOOL_2 ) pCmdIn->Read( bBool2 );
#if OSL_DEBUG_LEVEL > 1
m_pDbgWin->AddText( "Reading Conmmand:" );
m_pDbgWin->AddText( " Methode: " );
m_pDbgWin->AddText( String::CreateFromInt32( nMethodId ) );
m_pDbgWin->AddText( " Params:" );
- if( nParams & PARAM_UINT16_1 ) {m_pDbgWin->AddText( " n1:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr1 ) );}
- if( nParams & PARAM_UINT16_2 ) {m_pDbgWin->AddText( " n2:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr2 ) );}
- if( nParams & PARAM_UINT16_3 ) {m_pDbgWin->AddText( " n3:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr3 ) );}
- if( nParams & PARAM_UINT16_4 ) {m_pDbgWin->AddText( " n4:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr4 ) );}
- if( nParams & PARAM_UINT32_1 ) {m_pDbgWin->AddText( " nl1:" );m_pDbgWin->AddText( String::CreateFromInt64( nLNr1 ) );}
- if( nParams & PARAM_STR_1 ) {m_pDbgWin->AddText( " s1:" );m_pDbgWin->AddText( aString1 );}
- if( nParams & PARAM_STR_2 ) {m_pDbgWin->AddText( " s2:" );m_pDbgWin->AddText( aString2 );}
+ if( nParams & PARAM_UINT16_1 ) {m_pDbgWin->AddText( " n1:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr1 ) );}
+ if( nParams & PARAM_UINT16_2 ) {m_pDbgWin->AddText( " n2:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr2 ) );}
+ if( nParams & PARAM_UINT16_3 ) {m_pDbgWin->AddText( " n3:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr3 ) );}
+ if( nParams & PARAM_UINT16_4 ) {m_pDbgWin->AddText( " n4:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr4 ) );}
+ if( nParams & PARAM_UINT32_1 ) {m_pDbgWin->AddText( " nl1:" );m_pDbgWin->AddText( String::CreateFromInt64( nLNr1 ) );}
+ if( nParams & PARAM_STR_1 ) {m_pDbgWin->AddText( " s1:" );m_pDbgWin->AddText( aString1 );}
+ if( nParams & PARAM_STR_2 ) {m_pDbgWin->AddText( " s2:" );m_pDbgWin->AddText( aString2 );}
if( nParams & PARAM_BOOL_1 ) {m_pDbgWin->AddText( " b1:" );m_pDbgWin->AddText( bBool1 ? "TRUE" : "FALSE" );}
if( nParams & PARAM_BOOL_2 ) {m_pDbgWin->AddText( " b2:" );m_pDbgWin->AddText( bBool2 ? "TRUE" : "FALSE" );}
m_pDbgWin->AddText( "\n" );
@@ -783,7 +783,7 @@ void StatementCommand::WriteControlData( Window *pBase, sal_uLong nConf, sal_Boo
pBase = pBase->GetParent();
}
- { // Klammerung, so da� der String nicht w�hrend der Rekursion bestehen bleibt
+ { // Klammerung, so da� der String nicht w�hrend der Rekursion bestehen bleibt
String aName;
sal_Bool bSkip = sal_False;
@@ -888,7 +888,7 @@ void StatementCommand::WriteControlData( Window *pBase, sal_uLong nConf, sal_Boo
TypeString(pBase->GetType()).Append(aTypeSuffix).AppendAscii(": ").Append(aName), sal_False );
- if ( pBase->GetType() == WINDOW_TOOLBOX ) // Buttons und Controls auf Toolboxen.
+ if ( pBase->GetType() == WINDOW_TOOLBOX ) // Buttons und Controls auf Toolboxen.
{
ToolBox *pTB = ((ToolBox*)pBase);
sal_uInt16 i;
@@ -961,11 +961,11 @@ void StatementCommand::WriteControlData( Window *pBase, sal_uLong nConf, sal_Boo
}
}
- return; // ToolBox ist hier schon komplett abgehandelt.
+ return; // ToolBox ist hier schon komplett abgehandelt.
}
- if ( pBase->GetType() == WINDOW_BUTTONDIALOG // Buttons auf Buttondialogen mit ID
+ if ( pBase->GetType() == WINDOW_BUTTONDIALOG // Buttons auf Buttondialogen mit ID
|| pBase->GetType() == WINDOW_MESSBOX
|| pBase->GetType() == WINDOW_INFOBOX
|| pBase->GetType() == WINDOW_WARNINGBOX
@@ -1006,18 +1006,18 @@ void StatementCommand::WriteControlData( Window *pBase, sal_uLong nConf, sal_Boo
break;
}
- pRet->GenReturn ( RET_WinInfo, aID, (comm_UINT32)pBD->GetPushButton( pBD->GetButtonId(i) )->GetType(), // So da� der Text angezeigt wird!
+ pRet->GenReturn ( RET_WinInfo, aID, (comm_UINT32)pBD->GetPushButton( pBD->GetButtonId(i) )->GetType(), // So da� der Text angezeigt wird!
TypeString(pBD->GetPushButton( pBD->GetButtonId(i) )->GetType()).AppendAscii(": ").Append(aName)
.AppendAscii(" ButtonId = ").AppendAscii( aID.GetBuffer() ), sal_False );
}
- return; // ButtonDialog ist hier schon komplett abgehandelt.
+ return; // ButtonDialog ist hier schon komplett abgehandelt.
}
Menu* pMenu = GetMatchingMenu( pBase );
- if ( pMenu ) // Menus
+ if ( pMenu ) // Menus
{
sal_uInt16 i;
for ( i = 0; i < pMenu->GetItemCount() ; i++ )
@@ -1063,7 +1063,7 @@ void StatementCommand::WriteControlData( Window *pBase, sal_uLong nConf, sal_Boo
}
}
- return; // Menu ist hier schon komplett abgehandelt.
+ return; // Menu ist hier schon komplett abgehandelt.
}
}
}
@@ -1080,8 +1080,8 @@ private:
public:
SysWinContainer( ToolBox *pClient );
~SysWinContainer();
- virtual void Resize();
- virtual void Resizing( Size& rSize );
+ virtual void Resize();
+ virtual void Resizing( Size& rSize );
};
SysWinContainer::SysWinContainer( ToolBox *pClient )
@@ -1142,9 +1142,9 @@ void SysWinContainer::Resizing( Size& rSize )
class DisplayHidWin : public ToolBox
{
- Edit *pEdit;
- Size aMinEditSize;
- sal_uInt16 nLastItemID;
+ Edit *pEdit;
+ Size aMinEditSize;
+ sal_uInt16 nLastItemID;
sal_Bool bIsDraging;
sal_Bool bIsPermanentDraging;
void SetDraging( sal_Bool bNewDraging );
@@ -1172,10 +1172,10 @@ public:
DisplayHidWin();
~DisplayHidWin();
- virtual void Tracking( const TrackingEvent& rTEvt );
- virtual void Click();
- virtual void Select();
- virtual void SetText( const XubString& rStr );
+ virtual void Tracking( const TrackingEvent& rTEvt );
+ virtual void Click();
+ virtual void Select();
+ virtual void SetText( const XubString& rStr );
void SetDisplayText( const String &aNewText ){ pEdit->SetText(aNewText); }
String GetDisplayText() const { return pEdit->GetText(); }
@@ -1208,7 +1208,7 @@ DisplayHidWin::DisplayHidWin()
SetOutStyle( TOOLBOX_STYLE_HANDPOINTER | TOOLBOX_STYLE_FLAT );
pEdit = new Edit( this, WB_CENTER | WB_BORDER );
aMinEditSize = GetItemRect( TT_OUTPUT ).GetSize();
-/**/ aMinEditSize=Size(20,20);
+/**/ aMinEditSize=Size(20,20);
aMinEditSize.Width() *= 12;
pEdit->SetSizePixel( aMinEditSize );
pEdit->Show();
@@ -1363,16 +1363,16 @@ sal_Bool StatementCommand::DisplayHID()
{
// Return sal_True -> reexecute command
- if ( !bBool2 ) // Wird auf sal_False initialisiert
+ if ( !bBool2 ) // Wird auf sal_False initialisiert
{
- bBool2 = sal_True; // Wir sind initialisiert.
- GetTTSettings()->pDisplayInstance = this; // Und haben die Macht (Alle anderen beenden sich)
+ bBool2 = sal_True; // Wir sind initialisiert.
+ GetTTSettings()->pDisplayInstance = this; // Und haben die Macht (Alle anderen beenden sich)
if ( !(nParams & PARAM_UINT32_1) )
{
- if( GetTTSettings()->pDisplayHidWin ) // Nichts ver�ndern
+ if( GetTTSettings()->pDisplayHidWin ) // Nichts ver�ndern
nLNr1_and_Pointer.nLNr1 = GetTTSettings()->pDisplayHidWin->GetConfig();
- else // Beim ersten Aufruf wollen wir alles richtig einstellen
+ else // Beim ersten Aufruf wollen wir alles richtig einstellen
nLNr1_and_Pointer.nLNr1 = DH_MODE_KURZNAME | DH_MODE_LANGNAME;
if( ((nParams & PARAM_BOOL_1) && bBool1) )
@@ -1388,7 +1388,7 @@ sal_Bool StatementCommand::DisplayHID()
if ( GetTTSettings()->pDisplayInstance && GetTTSettings()->pDisplayInstance != this )
{
DBG_WARNING("Mehrere DisplayHID am laufen");
- return sal_False; // Noch eine andere Instanz macht das gleiche!
+ return sal_False; // Noch eine andere Instanz macht das gleiche!
}
if ( !GetTTSettings()->pDisplayHidWin )
@@ -1418,35 +1418,35 @@ sal_Bool StatementCommand::DisplayHID()
{
-#define HIGHLIGHT_WIN( WinPtr ) \
- { \
- Color aLineColMem = WinPtr->GetLineColor(); \
- WinPtr->SetLineColor( Color( COL_WHITE ) ); \
- Color aFillColMem = WinPtr->GetFillColor(); \
- WinPtr->SetFillColor( Color( COL_LIGHTRED ) ); \
- RasterOp aROp = WinPtr->GetRasterOp(); \
- WinPtr->SetRasterOp( ROP_XOR ); \
+#define HIGHLIGHT_WIN( WinPtr ) \
+ { \
+ Color aLineColMem = WinPtr->GetLineColor(); \
+ WinPtr->SetLineColor( Color( COL_WHITE ) ); \
+ Color aFillColMem = WinPtr->GetFillColor(); \
+ WinPtr->SetFillColor( Color( COL_LIGHTRED ) ); \
+ RasterOp aROp = WinPtr->GetRasterOp(); \
+ WinPtr->SetRasterOp( ROP_XOR ); \
Size aSz = WinPtr->PixelToLogic( WinPtr->GetSizePixel() );\
sal_uLong nMaxCornerRadius = WinPtr->PixelToLogic( Point( 80, 0 ) ).X();\
sal_uLong iCorner = std::max ((sal_uLong) 8, (sal_uLong) std::min( nMaxCornerRadius, (sal_uLong) std::min((sal_uLong) (aSz.Width() / 6), (sal_uLong)(aSz.Height() / 6))));\
WinPtr->DrawRect(Rectangle(Point(),aSz), iCorner, iCorner);\
- WinPtr->SetLineColor( aLineColMem ); \
- WinPtr->SetFillColor( aFillColMem ); \
- WinPtr->SetRasterOp( aROp ); \
+ WinPtr->SetLineColor( aLineColMem ); \
+ WinPtr->SetFillColor( aFillColMem ); \
+ WinPtr->SetRasterOp( aROp ); \
}
-#define SET_WIN( WinPtr ) \
- if ( StatementList::WinPtrValid(WinPtr) ) \
- { \
- HIGHLIGHT_WIN ( WinPtr ); \
+#define SET_WIN( WinPtr ) \
+ if ( StatementList::WinPtrValid(WinPtr) ) \
+ { \
+ HIGHLIGHT_WIN ( WinPtr ); \
}
-#define RESET_WIN( WinPtr ) \
- if ( StatementList::WinPtrValid(WinPtr) ) \
- { \
- WinPtr->Invalidate( INVALIDATE_NOTRANSPARENT ); \
- WinPtr->Update(); \
+#define RESET_WIN( WinPtr ) \
+ if ( StatementList::WinPtrValid(WinPtr) ) \
+ { \
+ WinPtr->Invalidate( INVALIDATE_NOTRANSPARENT ); \
+ WinPtr->Update(); \
}
@@ -1493,9 +1493,9 @@ sal_Bool StatementCommand::DisplayHID()
if ( GetTTSettings()->pDisplayHidWin->IsSendData() && GetTTSettings()->Act )
{
if ( !StatementFlow::bSending )
- { // Normalerweise syncronisierung �ber Protokoll. Hier ist das aber asyncron!!!
+ { // Normalerweise syncronisierung �ber Protokoll. Hier ist das aber asyncron!!!
WriteControlData( GetTTSettings()->Act, GetTTSettings()->pDisplayHidWin->GetConfig() );
- new StatementFlow( this, F_EndCommandBlock ); // Kommando zum Senden erzeugen und in que eintragen
+ new StatementFlow( this, F_EndCommandBlock ); // Kommando zum Senden erzeugen und in que eintragen
}
}
}
@@ -1508,9 +1508,9 @@ sal_Bool StatementCommand::DisplayHID()
}
}
- if ( pFirst == this ) // Sollte immer so sein, aber besser isses
- if ( pNext ) // Befehle warten auf Ausf�hrung
- { // An Ende neu einsortieren
+ if ( pFirst == this ) // Sollte immer so sein, aber besser isses
+ if ( pNext ) // Befehle warten auf Ausf�hrung
+ { // An Ende neu einsortieren
Advance();
QueStatement( NULL );
}
@@ -1686,11 +1686,11 @@ IMPL_LINK( TranslateWin, DoRestore, PushButton*, EMPTYARG )
sTT_E_NEW.SearchAndReplaceAll( CUniString("\\t"), CUniString("\t") );
if ( StatementList::WinPtrValid( pTranslateWin ) && pTranslateWin->GetText().CompareTo( sTT_E_NEW ) == COMPARE_EQUAL )
- { // Im ersten schritt nur in der UI zur�ck
+ { // Im ersten schritt nur in der UI zur�ck
pTranslateWin->SetText( sTT_E_OLD );
}
else
- { // Im zweite Schritt auch den eingegebenen Text
+ { // Im zweite Schritt auch den eingegebenen Text
EditTT_E_NEW.SetText( FixedTextTT_FT_OLD.GetText() );
PushButtonTT_PB_RESTORE.Disable();
}
@@ -1817,9 +1817,9 @@ long TranslateWin::VCLEventHook( NotifyEvent& rEvt )
return 0;
}
-#define FDS_ACTION_COLLECT 1
-#define FDS_ACTION_MARK 2
-#define FDS_ACTION_UNMARK 3
+#define FDS_ACTION_COLLECT 1
+#define FDS_ACTION_MARK 2
+#define FDS_ACTION_UNMARK 3
class FindShortcutErrors: public Search
{
@@ -1835,7 +1835,7 @@ public:
FindShortcutErrors::FindShortcutErrors()
: Search( SEARCH_NOOVERLAP | SEARCH_NO_TOPLEVEL_WIN )
{
- SetAction( FDS_ACTION_COLLECT ); // Wir fange immer mit sammeln an, ODER??
+ SetAction( FDS_ACTION_COLLECT ); // Wir fange immer mit sammeln an, ODER??
}
void FindShortcutErrors::SetAction( sal_uInt16 nA )
@@ -1876,10 +1876,10 @@ sal_Bool FindShortcutErrors::IsWinOK( Window *pWin )
case FDS_ACTION_MARK:
{
sal_Bool bMissing = sal_False;
- if ( !bHasAccel && aText.Len() ) // should there be an accelarator defined
+ if ( !bHasAccel && aText.Len() ) // should there be an accelarator defined
{
- Window* pChild;
+ Window* pChild;
pChild = pWin->GetWindow( WINDOW_CLIENT );
if ( (pChild->GetType() == WINDOW_RADIOBUTTON) ||
@@ -1977,7 +1977,7 @@ String TranslateWin::MarkShortcutErrors( Window* pBase, sal_Bool bMark )
FindShortcutErrors aFinder;
if ( bMark )
{
- StatementList::SearchAllWin( pBase, aFinder, sal_True ); // collect Shortcuts first
+ StatementList::SearchAllWin( pBase, aFinder, sal_True ); // collect Shortcuts first
aFinder.SetAction( FDS_ACTION_MARK );
}
else
@@ -2066,7 +2066,7 @@ void StatementCommand::Translate()
aTranslation += TypeString( pParentDialog->GetType() );
}
else
- aTranslation.AppendAscii( "0;" ); // Zahl + leerer String
+ aTranslation.AppendAscii( "0;" ); // Zahl + leerer String
aTranslation += ';';
aTranslation += '\"';
@@ -2119,7 +2119,7 @@ void StatementCommand::Translate()
}
Window* StatementCommand::GetNextOverlap( Window* pBase )
-{ // Findet irgendwelche Overlap-Fenster, die schlie�bar aussehen
+{ // Findet irgendwelche Overlap-Fenster, die schlie�bar aussehen
// Eventuell mu� noch die Auswahl verfeinert werden.
if ( pBase->GetType() != WINDOW_BORDERWINDOW )
@@ -2220,25 +2220,25 @@ sal_Bool StatementCommand::Execute()
#if OSL_DEBUG_LEVEL > 1
-#define REPORT_WIN_CLOSED(pControl, aInfo) \
- _REPORT_WIN_CLOSED(pControl, aInfo) \
+#define REPORT_WIN_CLOSED(pControl, aInfo) \
+ _REPORT_WIN_CLOSED(pControl, aInfo) \
m_pDbgWin->AddText( aInfo.AppendAscii(" \"").Append( pControl->GetText() ).AppendAscii("\" geschlossen, RType = ").Append( TypeString(pControl->GetType()) ).AppendAscii(", UId = ").Append( UIdString( pControl->GetUniqueOrHelpId() ) ) );
#else
-#define REPORT_WIN_CLOSED(pControl, aInfo) _REPORT_WIN_CLOSED(pControl, aInfo)
+#define REPORT_WIN_CLOSED(pControl, aInfo) _REPORT_WIN_CLOSED(pControl, aInfo)
#endif
-#define REPORT_WIN_CLOSEDc(pControl, aInfo ) \
+#define REPORT_WIN_CLOSEDc(pControl, aInfo ) \
REPORT_WIN_CLOSED(pControl, CUniString(aInfo) )
-#define _REPORT_WIN_CLOSED(pControl, aInfo) \
- if ( aString1.Len() ) \
- aString1 += '\n'; \
- aString1 += aInfo; \
- aString1.AppendAscii(" \""); \
- aString1 += pControl->GetText(); \
+#define _REPORT_WIN_CLOSED(pControl, aInfo) \
+ if ( aString1.Len() ) \
+ aString1 += '\n'; \
+ aString1 += aInfo; \
+ aString1.AppendAscii(" \""); \
+ aString1 += pControl->GetText(); \
aString1.AppendAscii("\" geschlossen, RType = ");\
- aString1 += TypeString(pControl->GetType()); \
- aString1.AppendAscii(", UId = "); \
+ aString1 += TypeString(pControl->GetType()); \
+ aString1.AppendAscii(", UId = "); \
aString1 += UIdString(pControl->GetUniqueOrHelpId());
@@ -2250,7 +2250,7 @@ sal_Bool StatementCommand::Execute()
nLNr1_and_Pointer.nLNr1 = Time().GetTime() + nNr1/10;
bBool1 = sal_True;
}
- if ( Time().GetTime() < sal_Int32(nLNr1_and_Pointer.nLNr1) ) // Aktuelle Zeit kleiner Endzeit
+ if ( Time().GetTime() < sal_Int32(nLNr1_and_Pointer.nLNr1) ) // Aktuelle Zeit kleiner Endzeit
return sal_False;
break;
case RC_DisplayHid:
@@ -2261,11 +2261,11 @@ sal_Bool StatementCommand::Execute()
{
if ( !bBool1 )
{
- nRetryCount = 150; // das sollte reichen.
- bBool1 = sal_True; // Nur beim ersten mal!
- nNr1 = 1; // Welcher Button ist dran?
- nLNr1_and_Pointer.pWindow = 0; // Speichern des AppWin
- aString1 = UniString(); // Liste der geschlossenen Fenster
+ nRetryCount = 150; // das sollte reichen.
+ bBool1 = sal_True; // Nur beim ersten mal!
+ nNr1 = 1; // Welcher Button ist dran?
+ nLNr1_and_Pointer.pWindow = 0; // Speichern des AppWin
+ aString1 = UniString(); // Liste der geschlossenen Fenster
// So da� nacher auch wieder alles auf Default steht
nUseBindings = 0;
@@ -2287,7 +2287,7 @@ sal_Bool StatementCommand::Execute()
bBool2 = sal_False; // flag for wait when all windows are closed
pControl->GrabFocus();
- if ( pControl->GetType() != WINDOW_DOCKINGWINDOW
+ if ( pControl->GetType() != WINDOW_DOCKINGWINDOW
&& pControl->GetType() != WINDOW_FLOATINGWINDOW
&& pControl->GetType() != WINDOW_MODELESSDIALOG
&& pControl->GetType() != WINDOW_WORKWINDOW
@@ -2298,7 +2298,7 @@ sal_Bool StatementCommand::Execute()
short nRT = ImpGetRType( pControl );
if ( nRT == C_TabControl && pControl->GET_REAL_PARENT() && pControl->GET_REAL_PARENT()->GetType() == WINDOW_TABDIALOG )
- { // Bei Tabcontrol den zugeh�rigen Tabdialog nehmen
+ { // Bei Tabcontrol den zugeh�rigen Tabdialog nehmen
pControl = pControl->GET_REAL_PARENT();
nRT = ImpGetRType( pControl );
}
@@ -2333,7 +2333,7 @@ sal_Bool StatementCommand::Execute()
SET_WINP_CLOSING(pControl);
pBD->EndDialog(RET_OK);
}
- nNr1 = 10; // Nochmal alle Buttons der Reihe nach
+ nNr1 = 10; // Nochmal alle Buttons der Reihe nach
break;
case 4:
if ( pBD->GetPushButton( BUTTONID_CANCEL ) )
@@ -2400,17 +2400,17 @@ sal_Bool StatementCommand::Execute()
// Eigentlich nur bei TaskWindows! Hoffen wir mal, da� keine anderen DockingWindows dazwischen hauen.
if ( nLNr1_and_Pointer.pWindow != pControl )
- nNr1 = 1; // Zum durchprobieren der Buttons beim Schlie�en
+ nNr1 = 1; // Zum durchprobieren der Buttons beim Schlie�en
nLNr1_and_Pointer.pWindow = pControl;
return sal_False;
}
}
if ( nRetryCount--
- && ( (pControl->GetType() == WINDOW_FLOATINGWINDOW)
- || (pControl->GetType() == WINDOW_MODELESSDIALOG)
- || (pControl->GetType() == WINDOW_WORKWINDOW)
- || (pControl->GetType() == WINDOW_BORDERWINDOW) ) )
+ && ( (pControl->GetType() == WINDOW_FLOATINGWINDOW)
+ || (pControl->GetType() == WINDOW_MODELESSDIALOG)
+ || (pControl->GetType() == WINDOW_WORKWINDOW)
+ || (pControl->GetType() == WINDOW_BORDERWINDOW) ) )
{
// Special handling for last Document; do not close the Frame, only the Document
if ( GetDocWinCount() == 1 && IsDocFrame( pControl ) )
@@ -2429,7 +2429,7 @@ sal_Bool StatementCommand::Execute()
// nur bei TaskWindows!
if ( nLNr1_and_Pointer.pWindow != pControl )
- nNr1 = 1; // Zum durchprobieren der Buttons beim Schlie�en
+ nNr1 = 1; // Zum durchprobieren der Buttons beim Schlie�en
nLNr1_and_Pointer.pWindow = pControl;
return sal_False;
@@ -2445,7 +2445,7 @@ sal_Bool StatementCommand::Execute()
// Eigentlich nur bei TaskWindows!
if ( nLNr1_and_Pointer.pWindow != pControl )
- nNr1 = 1; // Zum durchprobieren der Buttons beim Schlie�en
+ nNr1 = 1; // Zum durchprobieren der Buttons beim Schlie�en
nLNr1_and_Pointer.pWindow = pControl;
return sal_False;
@@ -2460,7 +2460,7 @@ sal_Bool StatementCommand::Execute()
nLNr1_and_Pointer.nLNr1 = Time().GetTime() + 100; // 100 = 1 Second
bBool2 = sal_True;
}
- if ( Time().GetTime() < sal_Int32(nLNr1_and_Pointer.nLNr1) ) // Aktuelle Zeit kleiner Endzeit
+ if ( Time().GetTime() < sal_Int32(nLNr1_and_Pointer.nLNr1) ) // Aktuelle Zeit kleiner Endzeit
return sal_False;
else
pRet->GenReturn ( RET_Value, nMethodId, aString1);
@@ -2480,7 +2480,7 @@ sal_Bool StatementCommand::Execute()
pRet->GenReturn ( RET_Value, nMethodId, comm_UINT16(CONST_WSFinished) );
else
{
- if ( Time().GetTime() < sal_Int32(nLNr1_and_Pointer.nLNr1) ) // Aktuelle Zeit kleiner Endzeit
+ if ( Time().GetTime() < sal_Int32(nLNr1_and_Pointer.nLNr1) ) // Aktuelle Zeit kleiner Endzeit
return sal_False;
pRet->GenReturn ( RET_Value, nMethodId, comm_UINT16(CONST_WSTimeout) );
}
@@ -2494,12 +2494,12 @@ sal_Bool StatementCommand::Execute()
switch ( nMethodId )
{
- case RC_AppDelay: // Diese Befehle werden anderswo behandelt
+ case RC_AppDelay: // Diese Befehle werden anderswo behandelt
case RC_DisplayHid:
case RC_ResetApplication:
case RC_WaitSlot:
- case RC_AppAbort: // Sofortiges L�schen aller Befehle
+ case RC_AppAbort: // Sofortiges L�schen aller Befehle
break;
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list