[Libreoffice-commits] .: 18 commits - starmath/AllLangResTarget_sm.mk starmath/inc starmath/JunitTest_sm_unoapi.mk starmath/Library_smd.mk starmath/Library_sm.mk starmath/Module_starmath.mk starmath/Package_uiconfig.mk starmath/prj starmath/qa starmath/source starmath/util starmath/workben sw/inc sw/JunitTest_sw_complex.mk sw/JunitTest_sw_unoapi.mk sw/Library_msword.mk sw/Library_swd.mk sw/Library_sw.mk sw/Library_swui.mk sw/qa sw/source
Bjoern Michaelsen
bmichaelsen at kemper.freedesktop.org
Sun Jul 24 11:50:48 PDT 2011
starmath/AllLangResTarget_sm.mk | 62 ++---
starmath/JunitTest_sm_unoapi.mk | 52 ++++
starmath/Library_sm.mk | 14 -
starmath/Library_smd.mk | 75 +++---
starmath/Module_starmath.mk | 59 ++---
starmath/Package_uiconfig.mk | 45 ++-
starmath/inc/makefile.mk | 47 ----
starmath/prj/makefile.mk | 2
starmath/qa/unoapi/Test.java | 52 ++++
starmath/source/detreg.cxx | 2
starmath/source/eqnolefilehdr.hxx | 2
starmath/source/register.cxx | 2
starmath/source/smdetect.cxx | 6
starmath/source/view.cxx | 2
starmath/util/hidother.src | 116 ----------
starmath/workben/smath-dump-watch.sh | 8
sw/JunitTest_sw_complex.mk | 2
sw/JunitTest_sw_unoapi.mk | 2
sw/Library_msword.mk | 11
sw/Library_sw.mk | 13 -
sw/Library_swd.mk | 4
sw/Library_swui.mk | 4
sw/inc/IDocumentState.hxx | 2
sw/inc/IDocumentStylePoolAccess.hxx | 10
sw/inc/doc.hxx | 4
sw/inc/docufld.hxx | 2
sw/inc/format.hxx | 4
sw/inc/frmfmt.hxx | 2
sw/inc/iodetect.hxx | 12 -
sw/inc/ndgrf.hxx | 2
sw/inc/ndhints.hxx | 4
sw/inc/node.hxx | 4
sw/inc/paratr.hxx | 2
sw/inc/printdata.hxx | 2
sw/inc/shellio.hxx | 2
sw/inc/swdbtoolsclient.hxx | 2
sw/inc/swundo.hxx | 2
sw/inc/tox.hxx | 2
sw/qa/complex/accessibility/makefile.mk | 50 ----
sw/qa/complex/checkColor/makefile.mk | 50 ----
sw/source/core/access/acccontext.hxx | 2
sw/source/core/docnode/ndtbl.cxx | 2
sw/source/core/inc/txtfrm.hxx | 2
sw/source/core/layout/pagefrm.src | 1
sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx | 4
sw/source/core/unocore/unoidx.cxx | 2
sw/source/core/unocore/unosect.cxx | 4
sw/source/core/unocore/unosett.cxx | 4
sw/source/filter/ww8/ww8toolbar.hxx | 2
sw/source/ui/app/appenv.cxx | 20 -
sw/source/ui/app/docst.cxx | 10
sw/source/ui/config/optpage.cxx | 4
sw/source/ui/config/uinums.cxx | 52 ++--
sw/source/ui/docvw/edtwin.cxx | 12 -
sw/source/ui/docvw/edtwin2.cxx | 2
sw/source/ui/docvw/edtwin3.cxx | 4
sw/source/ui/docvw/extedit.cxx | 2
sw/source/ui/docvw/srcedtw.cxx | 2
sw/source/ui/envelp/envlop1.cxx | 2
sw/source/ui/envelp/labfmt.cxx | 4
sw/source/ui/fldui/changedb.cxx | 2
sw/source/ui/fldui/flddb.cxx | 4
sw/source/ui/fldui/flddinf.cxx | 6
sw/source/ui/fldui/flddok.cxx | 16 -
sw/source/ui/fldui/fldedt.cxx | 6
sw/source/ui/fldui/fldfunc.cxx | 16 -
sw/source/ui/fldui/fldfunc.hxx | 2
sw/source/ui/fldui/fldmgr.cxx | 20 -
sw/source/ui/fldui/fldpage.cxx | 4
sw/source/ui/fldui/fldref.cxx | 14 -
sw/source/ui/fldui/fldtdlg.cxx | 2
sw/source/ui/fldui/fldvar.cxx | 20 -
sw/source/ui/fldui/fldvar.hxx | 2
sw/source/ui/frmdlg/column.cxx | 6
sw/source/ui/frmdlg/frmpage.cxx | 8
sw/source/ui/frmdlg/wrap.cxx | 4
sw/source/ui/inc/edtwin.hxx | 6
sw/source/ui/inc/fldmgr.hxx | 4
sw/source/ui/inc/numpara.hxx | 2
sw/source/ui/inc/optpage.hxx | 2
sw/source/ui/inc/toxmgr.hxx | 2
sw/source/ui/inc/uitool.hxx | 2
sw/source/ui/inc/view.hxx | 4
sw/source/ui/inc/wrtsh.hxx | 6
sw/source/ui/index/cnttab.cxx | 2
sw/source/ui/index/swuiidxmrk.cxx | 14 -
sw/source/ui/index/toxmgr.cxx | 2
sw/source/ui/misc/glosdoc.cxx | 6
sw/source/ui/misc/glossary.cxx | 2
sw/source/ui/misc/linenum.cxx | 2
sw/source/ui/misc/outline.cxx | 2
sw/source/ui/misc/redlndlg.cxx | 2
sw/source/ui/shells/drwtxtsh.cxx | 2
93 files changed, 457 insertions(+), 614 deletions(-)
New commits:
commit 78e4fc15d3b4904317785c4004c26f612c49b4d2
Merge: 853bfc8... 68b6265...
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Sun Jul 24 19:23:00 2011 +0200
Merge branch 'master' into feature/gnumake4
commit 853bfc8f7ff406f3c13ec44d2a18f1790be82c76
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Sat Jul 23 15:23:25 2011 +0200
keep gbuild calls consistent at now, even if it is a bit longer
diff --git a/sw/Library_msword.mk b/sw/Library_msword.mk
index c06bbcb..5ca4115 100644
--- a/sw/Library_msword.mk
+++ b/sw/Library_msword.mk
@@ -38,7 +38,6 @@ $(eval $(call gb_Library_set_include,msword,\
-I$(WORKDIR)/inc/sw/sdi \
-I$(WORKDIR)/Misc/sw/ \
$$(INCLUDE) \
- $(if $(filter YES,$(SYSTEM_LIBXML)),$(LIBXML_CFLAGS)) \
-I$(OUTDIR)/inc/sw \
))
@@ -75,7 +74,10 @@ $(eval $(call gb_Library_add_linked_libs,msword,\
$(gb_STDLIBS) \
))
-$(call gb_Library_use_external,msword,icuuc)
+$(eval $(call gb_Library_use_externals,msword,\
+ icuuc \
+ libxml2 \
+))
$(eval $(call gb_Library_add_exception_objects,msword,\
sw/source/filter/rtf/rtffld \
diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index e541473..84471a3 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -42,7 +42,6 @@ $(eval $(call gb_Library_set_include,sw,\
-I$(WORKDIR)/SdiTarget/sw/sdi \
-I$(WORKDIR)/Misc/sw/ \
$$(INCLUDE) \
- $(if $(filter YES,$(SYSTEM_LIBXML)),$(LIBXML_CFLAGS)) \
-I$(OUTDIR)/inc \
))
@@ -83,11 +82,13 @@ $(eval $(call gb_Library_add_linked_libs,sw,\
vbahelper \
vcl \
xo \
- xml2 \
$(gb_STDLIBS) \
))
-$(call gb_Library_use_external,sw,icuuc)
+$(eval $(call gb_Library_use_externals,sw,\
+ icuuc \
+ libxml2 \
+))
$(eval $(call gb_Library_add_exception_objects,sw,\
sw/source/core/SwNumberTree/SwNodeNum \
commit 4dec74dce2ff658ce885c9f8d08561f9f7edce61
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Fri Jul 22 21:04:25 2011 +0200
postmerge fixes for gnumake4
diff --git a/starmath/Library_sm.mk b/starmath/Library_sm.mk
index 6d9e05e..2aef309 100644
--- a/starmath/Library_sm.mk
+++ b/starmath/Library_sm.mk
@@ -35,11 +35,11 @@ $(eval $(call gb_Library_set_include,sm,\
-I$(OUTDIR)/inc \
))
-))
-
$(eval $(call gb_Library_add_api,sm,\
offapi \
udkapi \
+))
+
$(eval $(call gb_Library_add_linked_libs,sm,\
comphelper \
cppu \
diff --git a/sw/Library_swui.mk b/sw/Library_swui.mk
index 9649aab..91a8903 100644
--- a/sw/Library_swui.mk
+++ b/sw/Library_swui.mk
@@ -38,11 +38,11 @@ $(eval $(call gb_Library_set_include,swui,\
$$(INCLUDE) \
))
-))
-
$(eval $(call gb_Library_add_api,swui,\
udkapi \
offapi \
+))
+
$(eval $(call gb_Library_add_linked_libs,swui,\
comphelper \
cppu \
commit 5c2e5bba411e367ffae7feac6a84b58569f6c91e
Merge: 3228802... b77c9a6...
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Thu Jul 21 19:01:55 2011 +0200
resyncing to master
diff --cc starmath/Library_sm.mk
index 7e5162f,8bed8a5..6d9e05e
--- a/starmath/Library_sm.mk
+++ b/starmath/Library_sm.mk
@@@ -31,11 -31,22 +31,15 @@@ $(eval $(call gb_Library_set_include,sm
-I$(realpath $(SRCDIR)/starmath/inc/pch) \
-I$(realpath $(SRCDIR)/starmath/inc) \
-I$(WORKDIR)/SdiTarget/starmath/sdi \
- -I$(WORKDIR)/Misc/starmath/ \
$$(INCLUDE) \
-I$(OUTDIR)/inc \
))
-$(eval $(call gb_Library_set_defs,sm,\
- $$(DEFS) \
- -DSMDLL \
- -DSC_INFO_OSVERSION=\"$(OS)\" \
+ ))
+
+ $(eval $(call gb_Library_add_api,sm,\
+ offapi \
+ udkapi \
-))
-
$(eval $(call gb_Library_add_linked_libs,sm,\
comphelper \
cppu \
diff --cc starmath/Library_smd.mk
index 5653614,4889413..995cd77
--- a/starmath/Library_smd.mk
+++ b/starmath/Library_smd.mk
@@@ -32,10 -26,20 +32,14 @@@ $(eval $(call gb_Library_add_precompile
$(eval $(call gb_Library_set_componentfile,smd,starmath/util/smd))
$(eval $(call gb_Library_set_include,smd,\
- -I$(realpath $(SRCDIR)/starmath/inc/pch) \
- -I$(realpath $(SRCDIR)/starmath/inc) \
- -I$(WORKDIR)/Misc/sm/ \
- $$(INCLUDE) \
- -I$(OUTDIR)/inc \
-))
-
-$(eval $(call gb_Library_set_defs,smd,\
- $$(DEFS) \
+ $$(INCLUDE) \
+ -I$(SRCDIR)/starmath/inc \
+ -I$(SRCDIR)/starmath/inc/pch \
- -I$(OUTDIR)/inc/offuh \
+ ))
+
+ $(eval $(call gb_Library_add_api,smd,\
+ offapi \
+ udkapi \
))
$(eval $(call gb_Library_add_linked_libs,smd,\
diff --cc sw/Library_msword.mk
index e90639e,00870e3..c06bbcb
--- a/sw/Library_msword.mk
+++ b/sw/Library_msword.mk
@@@ -42,7 -42,15 +42,11 @@@ $(eval $(call gb_Library_set_include,ms
-I$(OUTDIR)/inc/sw \
))
+ $(eval $(call gb_Library_add_api,msword,\
+ udkapi \
+ offapi \
+ ))
+
-$(eval $(call gb_Library_set_defs,msword,\
- $$(DEFS) \
-))
-
$(eval $(call gb_Library_add_linked_libs,msword,\
basegfx \
comphelper \
diff --cc sw/Library_sw.mk
index a2a555a,82ea9aa..e541473
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@@ -46,8 -46,13 +46,12 @@@ $(eval $(call gb_Library_set_include,sw
-I$(OUTDIR)/inc \
))
+ $(eval $(call gb_Library_add_api,sw,\
+ udkapi \
+ offapi \
+ ))
+
-$(eval $(call gb_Library_set_defs,sw,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,sw,\
-DSW_DLLIMPLEMENTATION \
))
diff --cc sw/Library_swd.mk
index 067adb7,b155983..5298884
--- a/sw/Library_swd.mk
+++ b/sw/Library_swd.mk
@@@ -38,11 -38,15 +38,15 @@@ $(eval $(call gb_Library_set_include,sw
-I$(realpath $(SRCDIR)/sw/source/core/inc) \
-I$(realpath $(SRCDIR)/sw/source/filter/inc) \
-I$(realpath $(SRCDIR)/sw/source/ui/inc) \
- -I$(OUTDIR)/inc/offuh \
+ ))
+
+ $(eval $(call gb_Library_add_api,swd,\
+ udkapi \
+ offapi \
))
-$(eval $(call gb_Library_set_defs,swd,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,swd,\
+ -DSWD_DLLIMPLEMENTATION \
-DSWD_DLLIMPLEMENTATION \
))
diff --cc sw/Library_swui.mk
index c46b603,2cdf1b5..9649aab
--- a/sw/Library_swui.mk
+++ b/sw/Library_swui.mk
@@@ -36,9 -36,17 +36,13 @@@ $(eval $(call gb_Library_set_include,sw
-I$(WORKDIR)/SdiTarget/sw/sdi \
-I$(WORKDIR)/Misc/sw \
$$(INCLUDE) \
- -I$(OUTDIR)/inc/offuh \
))
-$(eval $(call gb_Library_set_defs,swui,\
- $$(DEFS) \
+ ))
+
+ $(eval $(call gb_Library_add_api,swui,\
+ udkapi \
+ offapi \
-))
-
$(eval $(call gb_Library_add_linked_libs,swui,\
comphelper \
cppu \
commit 32288027fcb5acdbbc1c69183db9a140d149dd3e
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Thu Jul 21 12:47:51 2011 +0200
Add missing-files to starmath libraries
diff --git a/starmath/Library_sm.mk b/starmath/Library_sm.mk
index 20e797d..7e5162f 100644
--- a/starmath/Library_sm.mk
+++ b/starmath/Library_sm.mk
@@ -66,7 +66,6 @@ $(eval $(call gb_Library_add_exception_objects,sm,\
starmath/source/dialog \
starmath/source/document \
starmath/source/edit \
- starmath/source/eqnolefilehdr \
starmath/source/format \
starmath/source/mathmlexport \
starmath/source/mathmlimport \
@@ -74,6 +73,7 @@ $(eval $(call gb_Library_add_exception_objects,sm,\
starmath/source/node \
starmath/source/parse \
starmath/source/rect \
+ starmath/source/register \
starmath/source/smdll \
starmath/source/smmod \
starmath/source/symbol \
diff --git a/starmath/Library_smd.mk b/starmath/Library_smd.mk
index d1596e7..5653614 100644
--- a/starmath/Library_smd.mk
+++ b/starmath/Library_smd.mk
@@ -43,7 +43,6 @@ $(eval $(call gb_Library_add_linked_libs,smd,\
cppuhelper \
sal \
sfx \
- sm \
sot \
svl \
svt \
@@ -54,7 +53,9 @@ $(eval $(call gb_Library_add_linked_libs,smd,\
))
$(eval $(call gb_Library_add_exception_objects,smd,\
+ starmath/source/detreg \
starmath/source/smdetect \
+ starmath/source/eqnolefilehdr \
))
# vim: set noet sw=4 ts=4:
diff --git a/starmath/source/detreg.cxx b/starmath/source/detreg.cxx
new file mode 100644
index 0000000..73dec83
--- /dev/null
+++ b/starmath/source/detreg.cxx
@@ -0,0 +1,84 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_starmath.hxx"
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/registry/XRegistryKey.hpp>
+#include <com/sun/star/uno/Sequence.h>
+#include <rtl/ustring.hxx>
+
+#include "smdetect.hxx"
+
+using namespace ::rtl;
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::lang;
+
+extern "C" {
+
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName,
+ void* pServiceManager,
+ void* /*pRegistryKey*/ )
+{
+ // Set default return value for this operation - if it failed.
+ void* pReturn = NULL ;
+
+ if (
+ ( pImplementationName != NULL ) &&
+ ( pServiceManager != NULL )
+ )
+ {
+ // Define variables which are used in following macros.
+ Reference< XSingleServiceFactory > xFactory ;
+ Reference< XMultiServiceFactory > xServiceManager( reinterpret_cast< XMultiServiceFactory* >( pServiceManager ) ) ;
+
+ if( SmFilterDetect::impl_getStaticImplementationName().equalsAscii( pImplementationName ) )
+ {
+ xFactory = ::cppu::createSingleFactory( xServiceManager,
+ SmFilterDetect::impl_getStaticImplementationName(),
+ SmFilterDetect::impl_createInstance,
+ SmFilterDetect::impl_getStaticSupportedServiceNames() );
+ }
+
+ // Factory is valid - service was found.
+ if ( xFactory.is() )
+ {
+ xFactory->acquire();
+ pReturn = xFactory.get();
+ }
+ }
+
+ // Return with result of this operation.
+ return pReturn ;
+}
+} // extern "C"
+
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/starmath/source/register.cxx b/starmath/source/register.cxx
new file mode 100644
index 0000000..39ff91a
--- /dev/null
+++ b/starmath/source/register.cxx
@@ -0,0 +1,228 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_starmath.hxx"
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/registry/XRegistryKey.hpp>
+#include <com/sun/star/uno/Sequence.h>
+#include <rtl/ustring.hxx>
+
+#include <sfx2/sfxmodelfactory.hxx>
+
+#include "smdll.hxx"
+#include "document.hxx"
+#include "unomodel.hxx"
+
+using namespace ::rtl;
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::lang;
+
+//Math document
+extern Sequence< OUString > SAL_CALL
+ SmDocument_getSupportedServiceNames() throw();
+extern OUString SAL_CALL
+ SmDocument_getImplementationName() throw();
+extern Reference< XInterface >SAL_CALL
+ SmDocument_createInstance(const Reference< XMultiServiceFactory > & rSMgr, const sal_uInt64 _nCreationFlags) throw( Exception );
+
+//MathML import
+extern Sequence< OUString > SAL_CALL
+ SmXMLImport_getSupportedServiceNames() throw();
+extern OUString SAL_CALL
+ SmXMLImport_getImplementationName() throw();
+extern Reference< XInterface > SAL_CALL
+ SmXMLImport_createInstance(const Reference< XMultiServiceFactory > & rSMgr) throw( Exception );
+extern Sequence< OUString > SAL_CALL
+ SmXMLImportMeta_getSupportedServiceNames() throw();
+extern OUString SAL_CALL
+ SmXMLImportMeta_getImplementationName() throw();
+extern Reference< XInterface > SAL_CALL
+ SmXMLImportMeta_createInstance(const Reference< XMultiServiceFactory > & rSMgr) throw( Exception );
+extern Sequence< OUString > SAL_CALL
+ SmXMLImportSettings_getSupportedServiceNames() throw();
+extern OUString SAL_CALL SmXMLImportSettings_getImplementationName() throw();
+extern Reference< XInterface > SAL_CALL
+ SmXMLImportSettings_createInstance(const Reference< XMultiServiceFactory > & rSMgr) throw( Exception );
+
+//MathML export
+extern Sequence< OUString > SAL_CALL
+ SmXMLExport_getSupportedServiceNames() throw();
+extern OUString SAL_CALL
+ SmXMLExport_getImplementationName() throw();
+extern Reference< XInterface > SAL_CALL
+ SmXMLExport_createInstance(const Reference< XMultiServiceFactory > & rSMgr) throw( Exception );
+extern Sequence< OUString > SAL_CALL
+ SmXMLExportMetaOOO_getSupportedServiceNames() throw();
+extern OUString SAL_CALL
+ SmXMLExportMetaOOO_getImplementationName() throw();
+extern Reference< XInterface > SAL_CALL
+ SmXMLExportMetaOOO_createInstance(const Reference< XMultiServiceFactory > & rSMgr) throw( Exception );
+extern Sequence< OUString > SAL_CALL
+ SmXMLExportMeta_getSupportedServiceNames() throw();
+extern OUString SAL_CALL
+ SmXMLExportMeta_getImplementationName() throw();
+extern Reference< XInterface > SAL_CALL
+ SmXMLExportMeta_createInstance(const Reference< XMultiServiceFactory > & rSMgr) throw( Exception );
+extern Sequence< OUString > SAL_CALL
+ SmXMLExportSettingsOOO_getSupportedServiceNames() throw();
+extern OUString SAL_CALL
+ SmXMLExportSettingsOOO_getImplementationName() throw();
+extern Reference< XInterface > SAL_CALL
+ SmXMLExportSettingsOOO_createInstance(const Reference< XMultiServiceFactory > & rSMgr) throw( Exception );
+extern Sequence< OUString > SAL_CALL
+ SmXMLExportSettings_getSupportedServiceNames() throw();
+extern OUString SAL_CALL
+ SmXMLExportSettings_getImplementationName() throw();
+extern Reference< XInterface > SAL_CALL
+ SmXMLExportSettings_createInstance(const Reference< XMultiServiceFactory > & rSMgr) throw( Exception );
+extern Sequence< OUString > SAL_CALL
+ SmXMLExportContent_getSupportedServiceNames() throw();
+extern OUString SAL_CALL
+ SmXMLExportContent_getImplementationName() throw();
+extern Reference< XInterface > SAL_CALL
+ SmXMLExportContent_createInstance(const Reference< XMultiServiceFactory > & rSMgr) throw( Exception );
+
+
+extern "C" {
+
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName,
+ void* pServiceManager,
+ void* /*pRegistryKey*/ )
+{
+ // Set default return value for this operation - if it failed.
+ void* pReturn = NULL ;
+
+ if (
+ ( pImplementationName != NULL ) &&
+ ( pServiceManager != NULL )
+ )
+ {
+ // Define variables which are used in following macros.
+ Reference< XSingleServiceFactory > xFactory ;
+ Reference< XMultiServiceFactory > xServiceManager( reinterpret_cast< XMultiServiceFactory* >( pServiceManager ) ) ;
+
+ if( SmXMLImport_getImplementationName().equalsAsciiL(
+ pImplementationName, strlen(pImplementationName)) )
+ {
+ xFactory = ::cppu::createSingleFactory( xServiceManager,
+ SmXMLImport_getImplementationName(),
+ SmXMLImport_createInstance,
+ SmXMLImport_getSupportedServiceNames() );
+ }
+ else if( SmXMLExport_getImplementationName().equalsAsciiL(
+ pImplementationName, strlen(pImplementationName)) )
+ {
+ xFactory = ::cppu::createSingleFactory( xServiceManager,
+ SmXMLExport_getImplementationName(),
+ SmXMLExport_createInstance,
+ SmXMLExport_getSupportedServiceNames() );
+ }
+ else if( SmXMLImportMeta_getImplementationName().equalsAsciiL(
+ pImplementationName, strlen(pImplementationName)) )
+ {
+ xFactory = ::cppu::createSingleFactory( xServiceManager,
+ SmXMLImportMeta_getImplementationName(),
+ SmXMLImportMeta_createInstance,
+ SmXMLImportMeta_getSupportedServiceNames() );
+ }
+ else if( SmXMLExportMetaOOO_getImplementationName().equalsAsciiL(
+ pImplementationName, strlen(pImplementationName)) )
+ {
+ xFactory = ::cppu::createSingleFactory( xServiceManager,
+ SmXMLExportMetaOOO_getImplementationName(),
+ SmXMLExportMetaOOO_createInstance,
+ SmXMLExportMetaOOO_getSupportedServiceNames() );
+ }
+ else if( SmXMLExportMeta_getImplementationName().equalsAsciiL(
+ pImplementationName, strlen(pImplementationName)) )
+ {
+ xFactory = ::cppu::createSingleFactory( xServiceManager,
+ SmXMLExportMeta_getImplementationName(),
+ SmXMLExportMeta_createInstance,
+ SmXMLExportMeta_getSupportedServiceNames() );
+ }
+ else if( SmXMLImportSettings_getImplementationName().equalsAsciiL(
+ pImplementationName, strlen(pImplementationName)) )
+ {
+ xFactory = ::cppu::createSingleFactory( xServiceManager,
+ SmXMLImportSettings_getImplementationName(),
+ SmXMLImportSettings_createInstance,
+ SmXMLImportSettings_getSupportedServiceNames() );
+ }
+ else if( SmXMLExportSettingsOOO_getImplementationName().equalsAsciiL(
+ pImplementationName, strlen(pImplementationName)) )
+ {
+ xFactory = ::cppu::createSingleFactory( xServiceManager,
+ SmXMLExportSettingsOOO_getImplementationName(),
+ SmXMLExportSettingsOOO_createInstance,
+ SmXMLExportSettingsOOO_getSupportedServiceNames() );
+ }
+ else if( SmXMLExportSettings_getImplementationName().equalsAsciiL(
+ pImplementationName, strlen(pImplementationName)) )
+ {
+ xFactory = ::cppu::createSingleFactory( xServiceManager,
+ SmXMLExportSettings_getImplementationName(),
+ SmXMLExportSettings_createInstance,
+ SmXMLExportSettings_getSupportedServiceNames() );
+ }
+ else if( SmXMLExportContent_getImplementationName().equalsAsciiL(
+ pImplementationName, strlen(pImplementationName)) )
+ {
+ xFactory = ::cppu::createSingleFactory( xServiceManager,
+ SmXMLExportContent_getImplementationName(),
+ SmXMLExportContent_createInstance,
+ SmXMLExportContent_getSupportedServiceNames() );
+ }
+ else if( SmDocument_getImplementationName().equalsAsciiL(
+ pImplementationName, strlen(pImplementationName)) )
+ {
+ xFactory = ::sfx2::createSfxModelFactory( xServiceManager,
+ SmDocument_getImplementationName(),
+ SmDocument_createInstance,
+ SmDocument_getSupportedServiceNames() );
+ }
+
+
+ // Factory is valid - service was found.
+ if ( xFactory.is() )
+ {
+ xFactory->acquire();
+ pReturn = xFactory.get();
+ }
+ }
+
+ // Return with result of this operation.
+ return pReturn ;
+}
+} // extern "C"
+
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 90f4dd90e6b314dbc72e271c38dc958a8c9a448e
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Tue Jun 21 13:21:30 2011 +0200
gnumake4: postmerge fixes in starmath
diff --git a/starmath/Library_sm.mk b/starmath/Library_sm.mk
index c1c03aa..20e797d 100644
--- a/starmath/Library_sm.mk
+++ b/starmath/Library_sm.mk
@@ -31,17 +31,11 @@ $(eval $(call gb_Library_set_include,sm,\
-I$(realpath $(SRCDIR)/starmath/inc/pch) \
-I$(realpath $(SRCDIR)/starmath/inc) \
-I$(WORKDIR)/SdiTarget/starmath/sdi \
- -I$(WORKDIR)/Misc/starmath/ \
$$(INCLUDE) \
-I$(OUTDIR)/inc/offuh \
-I$(OUTDIR)/inc \
))
-$(eval $(call gb_Library_add_defs,sm,\
- -DSMDLL \
- -DSC_INFO_OSVERSION=\"$(OS)\" \
-))
-
$(eval $(call gb_Library_add_linked_libs,sm,\
comphelper \
cppu \
@@ -59,7 +53,6 @@ $(eval $(call gb_Library_add_linked_libs,sm,\
tl \
utl \
vcl \
- ucbhelper \
xo \
))
@@ -73,6 +66,7 @@ $(eval $(call gb_Library_add_exception_objects,sm,\
starmath/source/dialog \
starmath/source/document \
starmath/source/edit \
+ starmath/source/eqnolefilehdr \
starmath/source/format \
starmath/source/mathmlexport \
starmath/source/mathmlimport \
@@ -80,8 +74,7 @@ $(eval $(call gb_Library_add_exception_objects,sm,\
starmath/source/node \
starmath/source/parse \
starmath/source/rect \
- starmath/source/register \
- starmath/source/smdll \
+ starmath/source/smdll \
starmath/source/smmod \
starmath/source/symbol \
starmath/source/toolbox \
diff --git a/starmath/Library_smd.mk b/starmath/Library_smd.mk
index 5ea8fda..d1596e7 100644
--- a/starmath/Library_smd.mk
+++ b/starmath/Library_smd.mk
@@ -54,7 +54,6 @@ $(eval $(call gb_Library_add_linked_libs,smd,\
))
$(eval $(call gb_Library_add_exception_objects,smd,\
- starmath/source/detreg \
starmath/source/smdetect \
))
commit 31f8bb821e865d12e661632b91f1893b3defaf72
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Mon Jun 20 09:50:02 2011 +0200
formatting fixes
diff --git a/sw/source/core/doc/doclay.cxx.rej b/sw/source/core/doc/doclay.cxx.rej
deleted file mode 100644
index 66b6331..0000000
--- a/sw/source/core/doc/doclay.cxx.rej
+++ /dev/null
@@ -1,7 +0,0 @@
---- sw/source/core/doc/doclay.cxx
-+++ sw/source/core/doc/doclay.cxx
-@@ -2357,4 +2357,4 @@
- return aAllLayouts;
- }//swmod 070825
-
--/* vim:set shiftwidth=4 softtabstop=4 expandtab: */+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/layout/pagefrm.src b/sw/source/core/layout/pagefrm.src
index 1c5cafc..4b0c4b2 100644
--- a/sw/source/core/layout/pagefrm.src
+++ b/sw/source/core/layout/pagefrm.src
@@ -4,4 +4,3 @@ Bitmap BMP_PAGE_SHADOW_MASK
{
File = "page-shadow-mask.png";
};
-
commit 74bff5b5f3d7a39e7780019b198bac055226a667
Merge: fd36896... f28095a...
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Mon Jun 20 09:48:41 2011 +0200
Merge branch 'master' into feature/gnumake4
Conflicts:
starmath/JunitTest_sm_unoapi.mk
starmath/Library_sm.mk
starmath/Library_smd.mk
starmath/Makefile
starmath/prj/build.lst
starmath/prj/makefile.mk
starmath/qa/unoapi/Test.java
starmath/source/detreg.cxx
starmath/source/register.cxx
starmath/source/smdetect.cxx
sw/Library_sw.mk
sw/Library_swd.mk
sw/Library_swui.mk
sw/Library_vbaswobj.mk
sw/inc/iodetect.hxx
sw/inc/swddllapi.h
sw/source/filter/basflt/iodetect.cxx
diff --cc starmath/Library_sm.mk
index 78648e0,bd492df..c1c03aa
--- a/starmath/Library_sm.mk
+++ b/starmath/Library_sm.mk
@@@ -34,12 -28,19 +28,18 @@@ $(eval $(call gb_Library_add_precompile
$(eval $(call gb_Library_set_componentfile,sm,starmath/util/sm))
$(eval $(call gb_Library_set_include,sm,\
- -I$(SRCDIR)/starmath/inc/pch \
- -I$(SRCDIR)/starmath/inc \
- -I$(WORKDIR)/SdiTarget/starmath/sdi \
- $$(INCLUDE) \
- -I$(OUTDIR)/inc/offuh \
- -I$(OUTDIR)/inc \
+ -I$(realpath $(SRCDIR)/starmath/inc/pch) \
+ -I$(realpath $(SRCDIR)/starmath/inc) \
+ -I$(WORKDIR)/SdiTarget/starmath/sdi \
+ -I$(WORKDIR)/Misc/starmath/ \
+ $$(INCLUDE) \
+ -I$(OUTDIR)/inc/offuh \
+ -I$(OUTDIR)/inc \
+ ))
+
-$(eval $(call gb_Library_set_defs,sm,\
- $$(DEFS) \
++$(eval $(call gb_Library_add_defs,sm,\
+ -DSMDLL \
+ -DSC_INFO_OSVERSION=\"$(OS)\" \
))
$(eval $(call gb_Library_add_linked_libs,sm,\
@@@ -96,9 -99,8 +98,10 @@@ $(eval $(call gb_Library_add_exception_
$(eval $(call gb_SdiTarget_SdiTarget,starmath/sdi/smslots,starmath/sdi/smath))
$(eval $(call gb_SdiTarget_set_include,starmath/sdi/smslots,\
- -I$(SRCDIR)/starmath/inc \
- -I$(SRCDIR)/starmath/sdi \
- $$(INCLUDE) \
+ -I$(realpath $(SRCDIR)/starmath/inc) \
+ -I$(realpath $(SRCDIR)/starmath/sdi) \
+ $$(INCLUDE) \
+ -I$(OUTDIR)/inc \
))
+
+# vim: set noet sw=4 ts=4:
diff --cc starmath/source/eqnolefilehdr.hxx
index 08e3424,1d382b8..365e50a
--- a/starmath/source/eqnolefilehdr.hxx
+++ b/starmath/source/eqnolefilehdr.hxx
@@@ -53,11 -54,31 +54,31 @@@ public
sal_uInt32 nReserved3; // not used
sal_uInt32 nReserved4; // not used
- void Read(SvStorageStream *pS);
- void Write(SvStorageStream *pS);
+ inline void Read(SvStorageStream *pS)
+ {
+ *pS >> nCBHdr;
+ *pS >> nVersion;
+ *pS >> nCf;
+ *pS >> nCBObject;
+ *pS >> nReserved1;
+ *pS >> nReserved2;
+ *pS >> nReserved3;
+ *pS >> nReserved4;
+ }
+ inline void Write(SvStorageStream *pS)
+ {
+ *pS << nCBHdr;
+ *pS << nVersion;
+ *pS << nCf;
+ *pS << nCBObject;
+ *pS << nReserved1;
+ *pS << nReserved2;
+ *pS << nReserved3;
+ *pS << nReserved4;
+ }
};
-sal_Bool GetMathTypeVersion( SotStorage* pStor, sal_uInt8 &nVersion );
+SAL_DLLPUBLIC_EXPORT sal_Bool GetMathTypeVersion( SotStorage* pStor, sal_uInt8 &nVersion );
#endif
diff --cc starmath/source/smdetect.cxx
index 68e0a15,13f2324..ccf23ef
--- a/starmath/source/smdetect.cxx
+++ b/starmath/source/smdetect.cxx
@@@ -44,9 -46,10 +44,8 @@@
#include <com/sun/star/ucb/InteractiveAppException.hpp>
#include <com/sun/star/ucb/XContent.hpp>
#include <com/sun/star/packages/zip/ZipIOException.hpp>
- #include <framework/interaction.hxx>
-
#include <toolkit/helper/vclunohelper.hxx>
#include <ucbhelper/simpleinteractionrequest.hxx>
-
#include <rtl/ustring.h>
#include <rtl/logfile.hxx>
#include <svl/itemset.hxx>
diff --cc starmath/source/view.cxx
index ddc4b8a,79bfd82..015adac
mode 100755,100644..100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@@ -366,15 -552,14 +552,14 @@@ void SmGraphicWindow::Command(const Com
Point aPos(5, 5);
if (rCEvt.IsMouseEvent())
aPos = rCEvt.GetMousePosPixel();
- DBG_ASSERT( pViewShell, "view shell missing" );
+ OSL_ENSURE( pViewShell, "view shell missing" );
- // added for replaceability of context menus #96085, #93782
- // added for replaceability of context menus
++ // added for replaceability of context menus
pViewShell->GetViewFrame()->GetBindings().GetDispatcher()
->ExecutePopup( aResId, this, &aPos );
- //pPopupMenu->Execute( this, aPos );
delete pPopupMenu;
- bCallBase = sal_False;
+ bCallBase = false;
}
break;
diff --cc starmath/workben/smath-dump-watch.sh
index 0000000,6ca1b0c..21ec5f1
mode 000000,100755..100755
--- a/starmath/workben/smath-dump-watch.sh
+++ b/starmath/workben/smath-dump-watch.sh
@@@ -1,0 -1,26 +1,26 @@@
+ #!/bin/bash
+
+
-# Watches for formula dumps by starmath and renders them
++# Watches for formula dumps by starmath and renders them
+ # If starmath is compiled with the macro DEBUG_ENABLE_DUMPASDOT defined.
+ # shift+enter, in the visual formula editor will make starmath dump a
+ # graphviz graph of the formula tree structure. This is very useful when
+ # debugging. The formula is dumped to /tmp/smath-dump.gv-
+ # This script monitors this file and renders the graph when written,
+ # after which the formula is displayed using feh.
+ #
+ # Usage: Let this script run in the background, e.g. start it in a terminal
+ # (and don't close the terminal). Then compile starmath with DEBUG_ENABLE_DUMPASDOT
+ # defined, use the visual formula editor to write something and hit shift+enter.
+ #
+ # Note: This won't work on Windows as the /tmp/ folder will be missing.
+ #
+ # Author: "Jonas Finnemann Jensen" <jopsen at gmail.com>
+
+ touch /tmp/smath-dump.gv;
+ while inotifywait -q -e close_write /tmp/smath-dump.gv;
+ do
- dot -Tpng < /tmp/smath-dump.gv > /tmp/smath-dump.png; > /dev/null
- kill `pidof -s feh`; > /dev/null
- feh /tmp/smath-dump.png & > /dev/null
++ dot -Tpng < /tmp/smath-dump.gv > /tmp/smath-dump.png; > /dev/null
++ kill `pidof -s feh`; > /dev/null
++ feh /tmp/smath-dump.png & > /dev/null
+ done
diff --cc sw/Library_msword.mk
index b59967d,9c41a56..e90639e
--- a/sw/Library_msword.mk
+++ b/sw/Library_msword.mk
@@@ -50,11 -55,14 +51,13 @@@ $(eval $(call gb_Library_add_linked_lib
editeng \
i18nisolang1 \
i18nutil \
- icuuc \
msfilter \
sal \
+ sax \
+ sb \
+ oox \
sfx \
sot \
- stl \
svl \
svt \
svx \
diff --cc sw/Library_swd.mk
index 1979b04,0b1ca39..067adb7
--- a/sw/Library_swd.mk
+++ b/sw/Library_swd.mk
@@@ -41,8 -41,9 +41,9 @@@ $(eval $(call gb_Library_set_include,sw
-I$(OUTDIR)/inc/offuh \
))
-$(eval $(call gb_Library_set_defs,swd,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,swd,\
+ -DSWD_DLLIMPLEMENTATION \
+ -DSWD_DLLIMPLEMENTATION \
))
$(eval $(call gb_Library_add_linked_libs,swd,\
diff --cc sw/inc/IDocumentState.hxx
index f548c00,913a5a4..4a1d66f
--- a/sw/inc/IDocumentState.hxx
+++ b/sw/inc/IDocumentState.hxx
@@@ -35,7 -36,7 +36,7 @@@
class IDocumentState
{
public:
- /** Bei Formataenderungen muss das zu Fuss gerufen werden!
- /** Must be called manually at changes of format.
++ /** Must be called manually at changes of format.
*/
virtual void SetModified() = 0;
diff --cc sw/inc/IDocumentStylePoolAccess.hxx
index c443273,77ea7c9..ec469f0
--- a/sw/inc/IDocumentStylePoolAccess.hxx
+++ b/sw/inc/IDocumentStylePoolAccess.hxx
@@@ -46,26 -47,24 +47,24 @@@
{
public:
- /** Gebe die "Auto-Collection" mit der Id zurueck. Existiert
- sie noch nicht, dann erzuege sie
- Ist der String-Pointer definiert, dann erfrage nur die
- Beschreibung der Attribute, !! es legt keine Vorlage an !!
- /** Return "Auto-Collection with ID.
++ /** Return "Auto-Collection with ID.
+ Create, if it does not yet exist.
- If string pointer is defined request only description
++ If string pointer is defined request only description
+ of attributes, do not create style sheet!
*/
virtual SwTxtFmtColl* GetTxtCollFromPool( sal_uInt16 nId, bool bRegardLanguage = true ) = 0;
- /** return das geforderte automatische Format - Basis-Klasse !
- /** Return required automatic format base class.
++ /** Return required automatic format base class.
*/
virtual SwFmt* GetFmtFromPool( sal_uInt16 nId ) = 0;
- /** returne das geforderte automatische Format
- /** Return required automatic format.
++ /** Return required automatic format.
*/
virtual SwFrmFmt* GetFrmFmtFromPool( sal_uInt16 nId ) = 0;
- /**
- */
virtual SwCharFmt* GetCharFmtFromPool( sal_uInt16 nId ) = 0;
- /** returne die geforderte automatische Seiten-Vorlage
- /** Return required automatic page style.
++ /** Return required automatic page style.
*/
virtual SwPageDesc* GetPageDescFromPool( sal_uInt16 nId, bool bRegardLanguage = true ) = 0;
diff --cc sw/inc/doc.hxx
index e5b3fd8,32d438c..ccc1eae
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@@ -1858,26 -1801,27 +1801,27 @@@ public
bool RemoveInvisibleContent();
/// restore the invisible content if it's available on the undo stack
bool RestoreInvisibleContent();
- // replace fields by text - mailmerge support
+
sal_Bool ConvertFieldsToText();
- // erzeuge Anhand der vorgebenen Collection Teildokumente
- // falls keine angegeben ist, nehme die Kapitelvorlage der 1. Ebene
+ // Create sub-documents according to given collection.
+ // If no collection is given, use chapter styles for 1st level.
sal_Bool GenerateGlobalDoc( const String& rPath,
const SwTxtFmtColl* pSplitColl = 0 );
- sal_Bool GenerateGlobalDoc( const String& rPath, int nOutlineLevel = 0 ); //#outline level,add by zhaojianwei
- sal_Bool GenerateGlobalDoc( const String& rPath, int nOutlineLevel = 0 );
++ sal_Bool GenerateGlobalDoc( const String& rPath, int nOutlineLevel = 0 );
sal_Bool GenerateHTMLDoc( const String& rPath,
const SwTxtFmtColl* pSplitColl = 0 );
- sal_Bool GenerateHTMLDoc( const String& rPath, int nOutlineLevel = 0 ); //#outline level,add by zhaojianwei
- sal_Bool GenerateHTMLDoc( const String& rPath, int nOutlineLevel = 0 );
++ sal_Bool GenerateHTMLDoc( const String& rPath, int nOutlineLevel = 0 );
- // vergleiche zwei Dokument miteinander
+ // Compare two documents.
long CompareDoc( const SwDoc& rDoc );
- // merge zweier Dokumente
+
+ // Merge two documents.
long MergeDoc( const SwDoc& rDoc );
- // setze Kommentar-Text fuers Redline, das dann per AppendRedline
- // hereinkommt. Wird vom Autoformat benutzt. 0-Pointer setzt den Modus
- // wieder zurueck. Die SequenceNummer ist fuers UI-seitige zusammen-
- // fassen von Redlines.
+
+ // Set comment-text for Redline. It then comes in via AppendRedLine.
+ // Used by AutoFormat. 0-pointer resets mode.
+ // Sequence number is for conjoining of Redlines by the UI.
void SetAutoFmtRedlineComment( const String* pTxt, sal_uInt16 nSeqNo = 0 );
bool IsAutoFmtRedline() const { return mbIsAutoFmtRedline; }
diff --cc sw/inc/docufld.hxx
index eacd63c,e40ce15..47e3d1e
--- a/sw/inc/docufld.hxx
+++ b/sw/inc/docufld.hxx
@@@ -398,9 -398,9 +398,9 @@@ public
virtual sal_uInt16 GetSubType() const;
- // virtual void SetSubType(sal_uInt16 nSub); // OM: entfernt, da unbenoetigt und gefaehrlich
- virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const;
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
-
++
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
};
/*--------------------------------------------------------------------
diff --cc sw/inc/format.hxx
index c00e52a,08ec419..b1ad412
--- a/sw/inc/format.hxx
+++ b/sw/inc/format.hxx
@@@ -302,9 -292,8 +292,8 @@@ public
inline const SwTblBoxFormula &GetTblBoxFormula( sal_Bool = sal_True ) const;
inline const SwTblBoxValue &GetTblBoxValue( sal_Bool = sal_True ) const;
- /** SwFmt::IsBackgroundTransparent - for feature #99657#
- /** SwFmt::IsBackgroundTransparent
++ /** SwFmt::IsBackgroundTransparent
- OD 22.08.2002
Virtual method to determine, if background of format is transparent.
Default implementation returns false. Thus, subclasses have to overload
method, if the specific subclass can have a transparent background.
@@@ -315,9 -304,8 +304,8 @@@
*/
virtual sal_Bool IsBackgroundTransparent() const;
- /** SwFmt::IsShadowTransparent - for feature #99657#
- /** SwFmt::IsShadowTransparent
++ /** SwFmt::IsShadowTransparent
- OD 22.08.2002
Virtual method to determine, if shadow of format is transparent.
Default implementation returns false. Thus, subclasses have to overload
method, if the specific subclass can have a transparent shadow.
diff --cc sw/inc/frmfmt.hxx
index ee1c31c,5d2761d..5cd6ae7
--- a/sw/inc/frmfmt.hxx
+++ b/sw/inc/frmfmt.hxx
@@@ -209,9 -204,9 +204,9 @@@ public
*/
virtual sal_Bool IsBackgroundTransparent() const;
- /** SwFlyFrmFmt::IsBackgroundBrushInherited - for #103898#
- /** SwFlyFrmFmt::IsBackgroundBrushInherited
++ /** SwFlyFrmFmt::IsBackgroundBrushInherited
- OD 08.10.2002 - method to determine, if the brush for drawing the
+ Method to determine, if the brush for drawing the
background is "inherited" from its parent/grandparent.
This is the case, if no background graphic is set and the background
color is "no fill"/"auto fill"
diff --cc sw/inc/iodetect.hxx
index 094f174,0358632..7ac99ae
--- a/sw/inc/iodetect.hxx
+++ b/sw/inc/iodetect.hxx
@@@ -96,16 -96,14 +96,16 @@@ extern SWD_DLLPUBLIC SwIoDetect aFilter
class SwIoSystem
{
public:
- // suche ueber den internen FormatNamen den Filtereintrag
+ // find for an internal format name the corresponding filter entry
- SWD_DLLPUBLIC static const SfxFilter* GetFilterOfFormat( const String& rFormat,
+ SWD_DLLPUBLIC static const SfxFilter*
+ GetFilterOfFormat( const String& rFormat,
const SfxFilterContainer* pCnt = 0 );
- // Feststellen des zu verwendenden Filters fuer die uebergebene
- // Datei. Der Filtername wird zurueckgeliefert. Konnte kein Filter
- // zurueckgeliefert werden, wird der Name des ASCII-Filters geliefert!
+ // Detect for the given file which filter should be used. The filter name
+ // is returned. If no filter could be found, the name of the ASCII filter
+ // is returned!
- SWD_DLLPUBLIC static const SfxFilter* GetFileFilter( const String& rFileName,
+ SWD_DLLPUBLIC static const SfxFilter*
+ GetFileFilter( const String& rFileName,
const String& rPrefFltName,
SfxMedium* pMedium = 0 );
@@@ -117,10 -115,8 +117,9 @@@
static sal_Bool IsValidStgFilter( SotStorage& , const SfxFilter& );
static sal_Bool IsValidStgFilter( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rStg, const SfxFilter& rFilter);
- SWD_DLLPUBLIC static bool IsDetectableText( const sal_Char* pBuf, sal_uLong &rLen,
+ SWD_DLLPUBLIC static bool
+ IsDetectableText( const sal_Char* pBuf, sal_uLong &rLen,
CharSet *pCharSet=0, bool *pSwap=0, LineEnd *pLineEnd=0, bool bEncodedFilter = false );
- // static bool IsDetectableW4W(const String& rFileName, const String& rUserData);
static const SfxFilter* GetTextFilter( const sal_Char* pBuf, sal_uLong nLen );
diff --cc sw/inc/ndgrf.hxx
index 94cda66,dcf69f4..1ac5915
--- a/sw/inc/ndgrf.hxx
+++ b/sw/inc/ndgrf.hxx
@@@ -208,11 -197,11 +197,11 @@@ public
sal_Bool GetFileFilterNms( String* pFileNm, String* pFilterNm ) const;
void ReleaseLink();
- // Skalieren einer Image-Map: Die Image-Map wird um den Faktor
- // zwischen Grafik-Groesse und Rahmen-Groesse vergroessert/verkleinert
- // Scale an image-map: the image-map becomes zoomed in / out by
++ // Scale an image-map: the image-map becomes zoomed in / out by
+ // factor between graphic-size and border-size.
void ScaleImageMap();
- // returns the with our graphic attributes filled Graphic-Attr-Structure
+ // Returns the with our graphic attributes filled Graphic-Attr-Structure.
GraphicAttr& GetGraphicAttr( GraphicAttr&, const SwFrm* pFrm ) const;
#endif
diff --cc sw/inc/ndhints.hxx
index e2e3a3d,319102a..9a33978
--- a/sw/inc/ndhints.hxx
+++ b/sw/inc/ndhints.hxx
@@@ -62,19 -62,15 +62,15 @@@ SW_DLLPRIVATE SwTxtAttr
MakeRedlineTxtAttr( SwDoc & rDoc, SfxPoolItem& rAttr );
- /*
- * Ableitung der Klasse SwpHints ueber den Umweg ueber SwpHts, da
- * lediglich die Klasse SwTxtNode Attribute einfuegen und
- * loeschen koennen soll. Anderen Klassen wie den Frames steht
- * lediglich ein lesender Zugriff ueber den Index-Operator zur
- * Verfuegung.
- * Groesse beim Anlegen gleich 1, weil nur dann ein Array erzeug wird, wenn
- * auch ein Hint eingefuegt wird.
- */
-// Class SwpHints is derived indirectly via SwpHts, because only the
++// Class SwpHints is derived indirectly via SwpHts, because only the
+ // class SwTxtNode should be allowed to insert and remove attributes.
+ // Other classes like the Frames are given only reading access via
+ // the index-operator.
-// Size when created is 1 because an array is created only if
++// Size when created is 1 because an array is created only if
+ // also a hint is inserted.
+
+ // Class SwpHtStart/End
- /*************************************************************************
- * class SwpHtStart/End
- *************************************************************************/
SV_DECL_PTRARR_SORT(SwpHtStart,SwTxtAttr*,1,1)
SV_DECL_PTRARR_SORT(SwpHtEnd,SwTxtAttr*,1,1)
diff --cc sw/inc/node.hxx
index 4d0bb8d,0492fee..c6c0750
--- a/sw/inc/node.hxx
+++ b/sw/inc/node.hxx
@@@ -275,26 -272,23 +272,23 @@@ public
*/
IDocumentListItems& getIDocumentListItems();
- // liegt der Node im Sichtbarenbereich der Shell ?
+ // Is node in the visible area of the Shell?
sal_Bool IsInVisibleArea( ViewShell* pSh = 0 ) const;
- // befindet sich der Node in einem geschuetzten Bereich?
+ // Is node in an protected area?
sal_Bool IsInProtectSect() const;
- // befindet sich der Node in irgendetwas geschuetzten ?
- // (Bereich/Rahmen/Tabellenzellen/... incl. des Ankers bei
- // Rahmen/Fussnoten/..)
- // Is node in something that is protected (range, frame,
++ // Is node in something that is protected (range, frame,
+ // table cells ... including anchor in case of frames or footnotes)?
sal_Bool IsProtect() const;
- // suche den PageDesc, mit dem dieser Node formatiert ist. Wenn das
- // Layout vorhanden ist wird ueber das gesucht, ansonsten gibt es nur
- // die harte Tour ueber die Nodes nach vorne suchen!!
- // OD 18.03.2003 #106326#
+
+ // Search PageDesc with which this node is formated. If layout is existent
+ // search over layout, else only the hard way is left: search over the nodes
+ // to the front!!
const SwPageDesc* FindPageDesc( sal_Bool bCalcLay, sal_uInt32* pPgDescNdIdx = 0 ) const;
- // falls der Node in einem Fly steht, dann wird das entsprechende Format
- // returnt
+ // If node is in a fly return the respective format.
SwFrmFmt* GetFlyFmt() const;
- // falls der Node in einer Tabelle steht, dann wird die entsprechende
- // TabellenBox returnt
+ // If node is in a table return the respective table box.
SwTableBox* GetTblBox() const;
inline sal_uLong GetIndex() const { return GetPos(); }
@@@ -435,24 -425,17 +425,17 @@@ public
SwRect FindPageFrmRect( const sal_Bool bPrtArea = sal_False,
const Point* pPoint = 0,
const sal_Bool bCalcFrm = sal_False ) const;
- /*
- * Methode erzeugt fuer den angegebenen Node alle Ansichten vom
- * Dokument. Die erzeugten Contentframes werden in das entsprechende
- * Layout gehaengt.
- */
+
+ // Method creates all views of document for given node. The content
+ // frames that are created are put in the respective layout.
void MakeFrms( SwCntntNode& rNode );
- /*
- * Methode loescht fuer den Node alle Ansichten vom
- * Dokument. Die Contentframes werden aus dem entsprechenden
- * Layout ausgehaengt.
- */
+
+ // Method deletes all vies of document for the node. The content-
+ // frames are removed from the respective layout.
void DelFrms();
- /*
- * liefert die Anzahl der Elemente des Inhalts des Nodes;
- * Default ist 1, Unterschiede gibt es beim TextNode und beim
- * Formelnode.
- */
- // Returns count of elements of node content. Default is 1.
++ // Returns count of elements of node content. Default is 1.
+ // There are differences between text node and formula node.
virtual xub_StrLen Len() const;
virtual SwCntntNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const = 0;
diff --cc sw/inc/paratr.hxx
index fefe6f2,87f931d..7bda101
--- a/sw/inc/paratr.hxx
+++ b/sw/inc/paratr.hxx
@@@ -38,28 -40,23 +40,23 @@@
class SwCharFmt;
class IntlWrapper;
- /*************************************************************************
- |* class SwFmtDrop
- *************************************************************************/
-
#define DROP_WHOLEWORD ((sal_uInt16)0x0001)
- //Wenn ein SwFmtDrop Client ist, so ist dies das CharFmt welches den Font fuer
- //die DropCaps beschreibt. Ist es kein Client, so wird von der Formatierung
- //das CharFmt des Absatzes benutzt.
- //Wird das CharFmt verandert, so wird diese Aenderung ueber das Modify des
- //SwFmtDrop an die Absatze propagiert.
+ // If SwFmtDrop is a Client, it is the CharFmt that describes the font for the
+ // DropCaps. If it is not a Client, formating uses the CharFmt of the paragraph.
-// If the CharFmt is modified, this change is propagated to the paragraphs
++// If the CharFmt is modified, this change is propagated to the paragraphs
+ // via the Modify of SwFmtDrop.
class SW_DLLPUBLIC SwFmtDrop: public SfxPoolItem, public SwClient
{
- SwModify* pDefinedIn; // Modify-Object, in dem der DropCaps steht
- // kann nur TxtFmtCollection/TxtNode sein
- sal_uInt16 nDistance; // Abstand zum Textbeginn
- sal_uInt16 nReadFmt; // fuer den Sw3-Reader: CharFormat-Id (Pool laden!)
- sal_uInt8 nLines; // Anzahl der Zeilen
- sal_uInt8 nChars; // Anzahl der Zeichen
- sal_Bool bWholeWord; // Erstes Wort als Initialen
+ SwModify* pDefinedIn; // Modify-Object, that contains DropCaps.
+ // Can only be TxtFmtCollection/TxtNode.
+ sal_uInt16 nDistance; // Distance to beginning of text.
+ sal_uInt16 nReadFmt; // For Sw3-Reader: CharFormat-Id (load Pool!).
+ sal_uInt8 nLines; // Line count.
+ sal_uInt8 nChars; // Character count.
+ sal_Bool bWholeWord; // First word with initials.
public:
- TYPEINFO(); //Bereits in der Basisklasse SwClient
+ TYPEINFO(); // Already in base class SwClient.
SwFmtDrop();
virtual ~SwFmtDrop();
diff --cc sw/inc/printdata.hxx
index 7b2e246,f7ecb55..14dc680
--- a/sw/inc/printdata.hxx
+++ b/sw/inc/printdata.hxx
@@@ -70,9 -71,9 +71,9 @@@ public
bPrintLeftPages, bPrintRightPages, bPrintReverse, bPrintProspect,
bPrintProspectRTL,
bPrintSingleJobs, bPaperFromSetup,
- // --> FME 2005-12-13 #b6354161# Print empty pages
+ // Print empty pages
bPrintEmptyPages,
- // <--
-
++
// #i56195# no field update while printing mail merge documents
bUpdateFieldsInPrinting,
bModified;
diff --cc sw/inc/shellio.hxx
index edf9707,49c530f..2af8b8d
--- a/sw/inc/shellio.hxx
+++ b/sw/inc/shellio.hxx
@@@ -172,20 -170,15 +170,15 @@@ class SwReader: public SwDocFa
String sBaseURL;
public:
- /*
- * Initiales Einlesen. Dokument wird erst beim Read(..) angelegt.
- * JP 25.04.95: oder falls es mitgegeben wird, in dieses.
- * Sonderfall fuer Load mit Sw3Reader
- */
- //SwReader( SotStorage&, const String& rFilename, SwDoc *pDoc = 0 );
- //SwReader( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, const String& rFilename, SwDoc *pDoc = 0 );
-
++
+ // Initial reading. Document is created only at Read(...)
+ // or in case it is given, into that.
+ // Special case for Load with Sw3Reader.
SwReader( SfxMedium&, const String& rFilename, SwDoc *pDoc = 0 );
- /*
- * In ein existierendes Dokument einlesen, Dokument und
- * Position im Dokument werden aus dem SwPaM uebernommen.
- */
+
+ // Read into existing document.
+ // Document and position in document are taken from SwPaM.
SwReader( SvStream&, const String& rFilename, const String& rBaseURL, SwPaM& );
- //SwReader( SotStorage&, const String& rFilename, SwPaM& );
SwReader( SfxMedium&, const String& rFilename, SwPaM& );
SwReader( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, const String& rFilename, SwPaM& );
diff --cc sw/inc/swdbtoolsclient.hxx
index 9ce9235,7efaf0e..02aad4a
--- a/sw/inc/swdbtoolsclient.hxx
+++ b/sw/inc/swdbtoolsclient.hxx
@@@ -32,9 -33,9 +33,9 @@@
#include <osl/module.h>
#include "swdllapi.h"
- /* -----------------------------30.08.2001 11:01------------------------------
-/*
++/*
Client to use the dbtools library as load-on-call
- ---------------------------------------------------------------------------*/
+ */
class SW_DLLPUBLIC SwDbtoolsClient
{
private:
diff --cc sw/inc/swundo.hxx
index 7aae080,70e7b2f..68b29d0
--- a/sw/inc/swundo.hxx
+++ b/sw/inc/swundo.hxx
@@@ -139,7 -138,7 +138,7 @@@ enum SwUndoI
UNDO_CHANGE_PAGEDESC, // 89
UNDO_DELETE_PAGEDESC, // 90
UNDO_HEADER_FOOTER, // 91 #i7983#
- UNDO_FIELD, // 92 #111840#
- UNDO_FIELD, // 92
++ UNDO_FIELD, // 92
UNDO_TXTFMTCOL_CREATE, // 93
UNDO_TXTFMTCOL_DELETE, // 94
UNDO_TXTFMTCOL_RENAME, // 95
diff --cc sw/inc/tox.hxx
index 2ce5c70,246c085..b3ec837
--- a/sw/inc/tox.hxx
+++ b/sw/inc/tox.hxx
@@@ -471,8 -459,7 +459,7 @@@ namespace nsSwTOOElement
const SwTOOElements TOO_OTHER = 0x80;
}
- #define TOX_STYLE_DELIMITER ((sal_Unicode)0x01) //JP 19.07.00: use a control char
-#define TOX_STYLE_DELIMITER ((sal_Unicode)0x01)
++#define TOX_STYLE_DELIMITER ((sal_Unicode)0x01)
/*--------------------------------------------------------------------
Description: Class for all indexes
diff --cc sw/source/core/access/acccontext.hxx
index 090f0d1,c258ed7..46f6c49
--- a/sw/source/core/access/acccontext.hxx
+++ b/sw/source/core/access/acccontext.hxx
@@@ -389,23 -372,12 +372,12 @@@ public
bool HasAdditionalAccessibleChildren();
- /** get additional child by index
-
- OD 2010-01-27 #i88070#
-
- @author OD
- */
+ // #i88070# - get additional child by index
- Window* GetAdditionalAccessibleChild( const sal_Int32 nIndex );
+ Window* GetAdditionalAccessibleChild( const sal_Int32 nIndex );
- /** get all additional accessible children
-
- OD 2010-01-27 #i88070#
-
- @author OD
- */
+ // #i88070# - get all additional accessible children
void GetAdditionalAccessibleChildren( std::vector< Window* >* pChildren );
-
const ::rtl::OUString& GetName() const { return sName; }
virtual sal_Bool HasCursor(); // required by map to remember that object
diff --cc sw/source/core/doc/doclay.cxx.rej
index 0000000,a425d2a..66b6331
mode 000000,100644..100644
--- a/sw/source/core/doc/doclay.cxx.rej
+++ b/sw/source/core/doc/doclay.cxx.rej
@@@ -1,0 -1,7 +1,7 @@@
+ --- sw/source/core/doc/doclay.cxx
+ +++ sw/source/core/doc/doclay.cxx
+ @@ -2357,4 +2357,4 @@
+ return aAllLayouts;
+ }//swmod 070825
-
++
+ -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --cc sw/source/core/docnode/ndtbl.cxx
index 26e40ad,60ee732..5220054
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@@ -969,7 -933,7 +933,7 @@@ SwTableNode* SwNodes::TextToTable( cons
}
}
- aPosArr.Insert( /*aFInfo.GetFrm()->Frm().Left() +*/
- aPosArr.Insert(
++ aPosArr.Insert(
static_cast<sal_uInt16>(aFInfo.GetFrm()->IsVertical() ?
aFInfo.GetFrm()->Prt().Bottom() :
aFInfo.GetFrm()->Prt().Right()),
diff --cc sw/source/core/inc/txtfrm.hxx
index df28ce4,cb740df..d5280d2
--- a/sw/source/core/inc/txtfrm.hxx
+++ b/sw/source/core/inc/txtfrm.hxx
@@@ -614,6 -608,8 +608,8 @@@ public
}
static void repaintTextFrames( const SwTxtNode& rNode );
-
++
+ virtual void dumpAsXmlAttributes(xmlTextWriterPtr writer);
};
/*************************************************************************
diff --cc sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx
index 0edcf9a,3eee736..e153ab4
--- a/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx
+++ b/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx
@@@ -792,7 -775,7 +775,7 @@@ void SwToCntntAnchoredObjectPosition::C
(pUpperOfOrientFrm->*fnRect->fnGetPrtBottom)() );
if( nDist < 0 )
{
- // --> OD 2004-07-20 #i23512# - correction:
- // #i23512# - correction:
++ // #i23512# - correction:
// consider section frame for grow in online layout and
// consider page alignment for grow in table.
SwLayoutFrm* pLayoutFrmToGrow = 0L;
@@@ -932,7 -911,7 +911,7 @@@
? MAKEPAGE_NOSECTION
: ( bInFtn ? MAKEPAGE_NONE : MAKEPAGE_APPEND ) ),
sal_True, &rAnchorTxtFrm );
- // OD 06.10.2003 #110978# - correction:
- // correction:
++ // correction:
// If anchor is in footnote and proposed next layout environment
// isn't a footnote frame, object can't follow the text flow
if ( bInFtn && pNextLay && !pNextLay->IsFtnFrm() )
diff --cc sw/source/core/unocore/unoidx.cxx
index 6039ef6,73cde70..f74d416
--- a/sw/source/core/unocore/unoidx.cxx
+++ b/sw/source/core/unocore/unoidx.cxx
@@@ -1954,7 -1843,7 +1843,7 @@@ throw (lang::IllegalArgumentException,
}
SwUnoInternalPaM aPam(*pDoc);
- //das muss jetzt sal_True liefern
- //which must now return sal_True
++ //which must now return sal_True
::sw::XTextRangeToSwPaM(aPam, xTextRange);
SwTOXMark aMark (pTOXType);
if (m_pImpl->m_sAltText.getLength())
diff --cc sw/source/core/unocore/unosect.cxx
index 600c6e9,ab71036..dcc26fb
--- a/sw/source/core/unocore/unosect.cxx
+++ b/sw/source/core/unocore/unosect.cxx
@@@ -90,7 -86,7 +86,7 @@@ struct SwTextSectionProperties_Imp
::std::auto_ptr<SvXMLAttrContainerItem> m_pXMLAttr;
::std::auto_ptr<SwFmtNoBalancedColumns> m_pNoBalanceItem;
::std::auto_ptr<SvxFrameDirectionItem> m_pFrameDirItem;
- ::std::auto_ptr<SvxLRSpaceItem> m_pLRSpaceItem; // #109700#
- ::std::auto_ptr<SvxLRSpaceItem> m_pLRSpaceItem;
++ ::std::auto_ptr<SvxLRSpaceItem> m_pLRSpaceItem;
bool m_bDDE;
bool m_bHidden;
@@@ -390,7 -354,7 +354,7 @@@ throw (lang::IllegalArgumentException,
RES_COL, RES_COL,
RES_BACKGROUND, RES_BACKGROUND,
RES_FTN_AT_TXTEND, RES_FRAMEDIR,
- RES_LR_SPACE, RES_LR_SPACE, // #109700#
- RES_LR_SPACE, RES_LR_SPACE,
++ RES_LR_SPACE, RES_LR_SPACE,
RES_UNKNOWNATR_CONTAINER,RES_UNKNOWNATR_CONTAINER,
0);
if (m_pImpl->m_pProps->m_pBrushItem.get())
diff --cc sw/source/core/unocore/unosett.cxx
index a81cad1,3794d6e..a0ef41b
--- a/sw/source/core/unocore/unosett.cxx
+++ b/sw/source/core/unocore/unosett.cxx
@@@ -2179,12 -2053,7 +2053,7 @@@ void SwXNumberingRules::SetNumberingRul
SwTxtFmtColl &rTxtColl = *((*pColls)[k]);
if(rTxtColl.IsDefault())
continue;
- //if(rTxtColl.GetOutlineLevel() == nIndex && //#outline level,removed by zhaojianwei
- // rTxtColl.GetName() != sStyleName)
- // rTxtColl..SetOutlineLevel(NO_NUMBERING);
- //else if(rTxtColl.GetName() == sStyleName)
- // rTxtColl.SetOutlineLevel(sal_Int8(nIndex));
- if ( rTxtColl.IsAssignedToListLevelOfOutlineStyle() && //add by zhaojianwei
- if ( rTxtColl.IsAssignedToListLevelOfOutlineStyle() &&
++ if ( rTxtColl.IsAssignedToListLevelOfOutlineStyle() &&
rTxtColl.GetAssignedOutlineStyleLevel() == nIndex &&
rTxtColl.GetName() != sStyleName )
{
@@@ -2193,7 -2062,7 +2062,7 @@@
else if ( rTxtColl.GetName() == sStyleName )
{
rTxtColl.AssignToListLevelOfOutlineStyle( nIndex );
- } //<-end,,zhaojianwei,
- }
++ }
}
}
break;
diff --cc sw/source/filter/ww8/ww8toolbar.hxx
index 0000000,61ae023..b983eaf
mode 000000,100644..100644
--- a/sw/source/filter/ww8/ww8toolbar.hxx
+++ b/sw/source/filter/ww8/ww8toolbar.hxx
@@@ -1,0 -1,379 +1,379 @@@
+ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+ /*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ * Noel Power <noel.power at novell.com>
+ * Portions created by the Initial Developer are Copyright (C) 2010 the
+ * Initial Developer. All Rights Reserved.
+ *
- * Contributor(s):
++ * Contributor(s):
+ * Noel Power <noel.power at novell.com>
+ *
+ * For minor contributions see the git repository.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+ #ifndef _WW8TOOLBAR_HXX
+ #define _WW8TOOLBAR_HXX
+
+ #include <filter/msfilter/mstoolbar.hxx>
+
+ namespace css = ::com::sun::star;
+
+ class Xst : public TBBase
+ {
+ rtl::OUString sString;
+ public:
+ Xst(){}
+ bool Read(SvStream *pS);
+ rtl::OUString getString() { return sString; }
+ void Print( FILE* fp );
+ };
+
+ class CTBWrapper;
+ class TBC : public TBBase
+ {
+ TBCHeader tbch;
+ boost::shared_ptr< sal_uInt32 > cid; // optional
+ boost::shared_ptr<TBCData> tbcd;
+ public:
+ TBC();
+ ~TBC();
+ bool Read(SvStream *pS);
+ void Print( FILE* );
+ bool ImportToolBarControl( CTBWrapper&, const css::uno::Reference< css::container::XIndexContainer >&, CustomToolBarImportHelper&, bool );
+ rtl::OUString GetCustomText();
+ };
+
+ class CTB : public TBBase
+ {
+ Xst name;
+ sal_Int32 cbTBData;
+ TB tb;
+ std::vector<TBVisualData> rVisualData;
+ sal_Int32 iWCTBl;
+ sal_uInt16 reserved;
+ sal_uInt16 unused;
+ sal_Int32 cCtls;
+ std::vector< TBC > rTBC;
+
+ CTB(const CTB&);
+ CTB& operator = ( const CTB&);
+ public:
+ CTB();
+ ~CTB();
+ bool Read(SvStream *pS);
+ void Print( FILE* fp );
+ bool IsMenuToolbar();
+ bool ImportCustomToolBar( CTBWrapper&, CustomToolBarImportHelper& );
+ bool ImportMenuTB( CTBWrapper&, const css::uno::Reference< css::container::XIndexContainer >&, CustomToolBarImportHelper& );
+ rtl::OUString GetName() { return tb.getName().getString(); }
+ };
+
+ class TBDelta : public TBBase
+ {
+ sal_uInt8 doprfatendFlags;
+
+ sal_uInt8 ibts;
+ sal_Int32 cidNext;
+ sal_Int32 cid;
+ sal_Int32 fc;
+ sal_uInt16 CiTBDE; // careful of this ( endian matters etc. )
+ sal_uInt16 cbTBC;
+ public:
+ TBDelta();
+ ~TBDelta(){}
+ bool Read(SvStream *pS);
+ void Print( FILE* );
+ bool ControlIsModified();
+ bool ControlIsInserted();
+ bool ControlIsChanged();
+ bool ControlDropsToolBar();
+ sal_Int32 TBCStreamOffset();
+ sal_Int16 CustomizationIndex();
+
+ };
+
+ class Tcg255SubStruct : public TBBase
+ {
+ friend class Tcg255;
+ bool mbReadId;
+ Tcg255SubStruct(const Tcg255SubStruct&);
+ Tcg255SubStruct& operator = ( const Tcg255SubStruct&);
+ protected:
+ sal_uInt8 ch;
+ public:
+ Tcg255SubStruct( bool bReadId );
+ ~Tcg255SubStruct(){}
+ virtual sal_uInt8 id() const { return ch; }
+ bool Read(SvStream *pS);
+ };
+
+ class CTBWrapper;
+ class Customization : public TBBase
+ {
+ friend class CTBWrapper;
+ sal_Int32 tbidForTBD;
+ sal_uInt16 reserved1;
+ sal_Int16 ctbds;
+ CTBWrapper* pWrapper;
+ boost::shared_ptr< CTB > customizationDataCTB;
+ std::vector< TBDelta > customizationDataTBDelta;
+ bool bIsDroppedMenuTB;
+ bool ImportMenu( CTBWrapper&, const css::uno::Reference< css::container::XIndexContainer >&, CustomToolBarImportHelper& );
+ public:
+ Customization( CTBWrapper* rapper );
+ ~Customization();
+ bool Read(SvStream *pS);
+ bool ImportCustomToolBar( CTBWrapper&, CustomToolBarImportHelper& );
+ bool ImportMenu( CTBWrapper&, CustomToolBarImportHelper& );
+ void Print( FILE* );
+ sal_Int32 GetTBIDForTB(){ return tbidForTBD; }
+ CTB* GetCustomizationData() { return customizationDataCTB.get(); };
+ };
+
+ class SfxObjectShell;
+
+ class CTBWrapper : public Tcg255SubStruct
+ {
+ // reserved1 is the ch field of Tcg255SubStruct
+ sal_uInt16 reserved2;
+ sal_uInt8 reserved3;
+ sal_uInt16 reserved4;
+ sal_uInt16 reserved5;
+
+ sal_Int16 cbTBD;
+ sal_Int16 cCust;
+
+ sal_Int32 cbDTBC;
+
+ std::vector< TBC > rtbdc; //
+ std::vector< Customization > rCustomizations; // array of Customizations
+ std::vector< sal_Int16 > dropDownMenuIndices; // array of indexes of Customization toolbars that are dropped by a menu
+ CTBWrapper(const CTBWrapper&);
+ CTBWrapper& operator = ( const CTBWrapper&);
+ public:
+ CTBWrapper( bool bReadId = true );
+ ~CTBWrapper();
+ void InsertDropIndex( sal_Int32 aIndex ) { dropDownMenuIndices.push_back( aIndex ); }
+ TBC* GetTBCAtOffset( sal_uInt32 nStreamOffset );
+ bool Read(SvStream *pS);
+ bool ImportCustomToolBar( SfxObjectShell& rDocSh );
+
+ Customization* GetCustomizaton( sal_Int16 index );
+ CTB* GetCustomizationData( const rtl::OUString& name );
+ void Print( FILE* );
+ };
+
+ class MCD : public TBBase
+ {
+ sal_Int8 reserved1; // A signed integer that MUST be 0x56.
+ sal_uInt8 reserved2; // MUST be 0.
+ sal_uInt16 ibst; // Unsigned integer that specifies the name of the macro. Macro name is specified by MacroName.xstz of the MacroName entry in the MacroNames such that MacroName.ibst equals ibst. MacroNames MUST contain such an entry.
+ sal_uInt16 ibstName; // An unsigned integer that specifies the index into the Command String Table (TcgSttbf.sttbf) where the macro‘s name and arguments are specified.
+ sal_uInt16 reserved3; // An unsigned integer that MUST be 0xFFFF.
+ sal_uInt32 reserved4; //MUST be ignored.
+ sal_uInt32 reserved5; //MUST be 0.
+ sal_uInt32 reserved6; //MUST be ignored.
+ sal_uInt32 reserved7; //MUST be ignored
+
+ MCD(const MCD&);
+ MCD& operator = ( const MCD&);
+ public:
+ MCD();
+ ~MCD(){}
+ bool Read(SvStream *pS);
+ void Print( FILE* );
+ };
+
+ class PlfMcd : public Tcg255SubStruct
+ {
+ sal_Int32 iMac;
+ MCD* rgmcd; // array of MCD's
+ PlfMcd(const PlfMcd&);
+ PlfMcd& operator = ( const PlfMcd&);
+ public:
+ PlfMcd( bool bReadId = true );
+ ~PlfMcd();
+ bool Read(SvStream *pS);
+ void Print( FILE* );
+ };
+
+ class Acd : public TBBase
+ {
+ sal_Int16 ibst;
+ sal_uInt16 fciBasedOnABC; // fciBasedOn(13 bits) A(1bit)B(1bit)C(1Bit)
+ Acd(const Acd&);
+ Acd& operator = ( const Acd&);
+ public:
+ Acd();
+ ~Acd(){}
+ bool Read(SvStream *pS);
+ void Print( FILE* );
+ };
+
+ class PlfAcd: public Tcg255SubStruct
+ {
+ sal_Int32 iMac;
+ Acd* rgacd;
+ PlfAcd(const PlfAcd&);
+ PlfAcd& operator = ( const PlfAcd&);
+ public:
+ PlfAcd( bool bReadId = true );
+ ~PlfAcd();
+ bool Read(SvStream *pS);
+ void Print(FILE*);
+ };
+
+ class Kme : public TBBase
+ {
+ sal_Int16 reserved1; //MUST be zero.
+ sal_Int16 reserved2; //MUST be zero.
+ sal_uInt16 kcm1; //A Kcm that specifies the primary shortcut key.
+ sal_uInt16 kcm2; //A Kcm that specifies the secondary shortcut key, or 0x00FF if there is no secondary shortcut key.
+ sal_uInt16 kt; //A Kt that specifies the type of action to be taken when the key combination is pressed.
+ sal_uInt32 param; //The meaning of this field depends on the value of kt
+
+ Kme(const Kme&);
+ Kme& operator = ( const Kme&);
+ public:
+ Kme();
+ ~Kme();
+ bool Read(SvStream *pS);
+ void Print( FILE* );
+ };
+
+ class PlfKme : public Tcg255SubStruct
+ {
+ sal_Int32 iMac;
+ Kme* rgkme;
+ PlfKme(const PlfKme&);
+ PlfKme& operator = ( const PlfKme&);
+ public:
+ PlfKme( bool bReadId = true );
+ ~PlfKme();
+ bool Read(SvStream *pS);
+ void Print( FILE* );
+ };
+
+ class TcgSttbfCore : public TBBase
+ {
+ struct SBBItem
+ {
+ sal_uInt16 cchData;
+ rtl::OUString data;
+ sal_uInt16 extraData;
+ SBBItem() : cchData(0), extraData(0){}
+ };
+ sal_uInt16 fExtend;
+ sal_uInt16 cData;
+ sal_uInt16 cbExtra;
+ SBBItem* dataItems;
+ TcgSttbfCore(const TcgSttbfCore&);
+ TcgSttbfCore& operator = ( const TcgSttbfCore&);
+ public:
+ TcgSttbfCore();
+ ~TcgSttbfCore();
+ bool Read(SvStream *pS);
+ void Print( FILE* fp );
+ };
+
+ class TcgSttbf : public Tcg255SubStruct
+ {
+ TcgSttbfCore sttbf;
+ TcgSttbf(const TcgSttbf&);
+ TcgSttbf& operator = ( const TcgSttbf&);
+ public:
+ TcgSttbf( bool bReadId = true );
+ ~TcgSttbf(){}
+ bool Read(SvStream *pS);
+ void Print( FILE* fp );
+ };
+
+ class Xstz : public TBBase
+ {
+ Xst xst; //An Xst specifying the string with its pre-pended length.
+ sal_uInt16 chTerm;
+
+ Xstz(const Xstz&);
+ Xstz& operator = ( const Xstz&);
+ public:
+ Xstz();
+ ~Xstz(){}
+ bool Read(SvStream *pS);
+ void Print( FILE* fp );
+ };
+
+ class MacroName : public TBBase
+ {
+ sal_uInt16 ibst; //An unsigned integer that specifies the index of the current entry in the macro name table. MUST NOT be the same as the index of any other entry.
+ Xstz xstz;
+ MacroName(const MacroName&);
+ MacroName& operator = ( const MacroName&);
+ public:
+ MacroName();
+ ~MacroName(){}
+ bool Read(SvStream *pS);
+ void Print( FILE* );
+ };
+
+ class MacroNames : public Tcg255SubStruct
+ {
+ sal_uInt16 iMac; //An unsigned integer that specifies the number of MacroName structures in rgNames.
+ MacroName* rgNames;
+
+ MacroNames(const MacroNames&);
+ MacroNames& operator = ( const MacroNames&);
+ public:
+ MacroNames( bool bReadId = true );
+ ~MacroNames();
+ bool Read(SvStream *pS);
+ void Print( FILE* );
+ };
+
+ class Tcg255 : public TBBase
+ {
+ std::vector< Tcg255SubStruct* > rgtcgData; // array of sub structures
+ Tcg255(const Tcg255&);
+ Tcg255& operator = ( const Tcg255&);
+ bool processSubStruct( sal_uInt8 nId, SvStream* );
+ public:
+ Tcg255();
+ ~Tcg255();
+ bool Read(SvStream *pS);
+ void Print( FILE* );
+ bool ImportCustomToolBar( SfxObjectShell& rDocSh );
+ };
+
+ class Tcg: public TBBase
+ {
+ sal_Int8 nTcgVer;
+ std::auto_ptr< Tcg255 > tcg;
+ Tcg(const Tcg&);
+ Tcg& operator = ( const Tcg&);
+ public:
+ Tcg();
+ ~Tcg(){}
+ bool Read(SvStream *pS);
+ bool ImportCustomToolBar( SfxObjectShell& rDocSh );
+ void Print( FILE* );
+ };
+
+ #endif
+
+ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --cc sw/source/ui/app/appenv.cxx
index e850be3,53c7bc8..4540e3b
--- a/sw/source/ui/app/appenv.cxx
+++ b/sw/source/ui/app/appenv.cxx
@@@ -88,16 -79,12 +79,12 @@@
#include "envelp.hrc"
#include "envimg.hxx"
--#define ENV_NEWDOC RET_OK
--#define ENV_INSERT RET_USER
--#define ENV_CANCEL SHRT_MAX
-
-
- // --------------------------------------------------------------------------
++#define ENV_NEWDOC RET_OK
++#define ENV_INSERT RET_USER
++#define ENV_CANCEL SHRT_MAX
- // Funktion wird fuer Etiketten und Briefumschlaege benutzt!
- // im applab.cxx und appenv.cxx
+ // Function used for labels and envelopes in applab.cxx and appenv.cxx
String InsertLabEnvText( SwWrtShell& rSh, SwFldMgr& rFldMgr, const String& rText )
{
String sRet;
@@@ -154,7 -138,7 +138,7 @@@
}
rSh.InsertLineBreak();
}
- rSh.DelLeft(); // Letzten Linebreak wieder l???schen
- rSh.DelLeft(); // Again remove last linebreak
++ rSh.DelLeft(); // Again remove last linebreak
return sRet;
}
@@@ -171,24 -152,21 +152,21 @@@ void lcl_CopyCollAttr(SwWrtShell* pOldS
pNewSh->GetTxtCollFromPool(nCollId)->SetFmtAttr(pColl->GetAttrSet());
}
- // ----------------------------------------------------------------------------
-
-
void SwModule::InsertEnv( SfxRequest& rReq )
{
- static sal_uInt16 nTitleNo = 0;
+ static sal_uInt16 nTitleNo = 0;
-- SwDocShell *pMyDocSh;
-- SfxViewFrame *pFrame;
++ SwDocShell *pMyDocSh;
++ SfxViewFrame *pFrame;
SwView *pNewView;
-- SwWrtShell *pOldSh,
++ SwWrtShell *pOldSh,
*pSh;
- //aktuelle Shell besorgen
+ // Get current shell
pMyDocSh = (SwDocShell*) SfxObjectShell::Current();
-- pOldSh = pMyDocSh ? pMyDocSh->GetWrtShell() : 0;
++ pOldSh = pMyDocSh ? pMyDocSh->GetWrtShell() : 0;
- // Neues Dokument erzeugen (kein Show!)
+ // Create new document (don't show!)
SfxObjectShellLock xDocSh( new SwDocShell( SFX_CREATE_MODE_STANDARD ) );
xDocSh->DoInitNew( 0 );
pFrame = SfxViewFrame::LoadHiddenDocument( *xDocSh, 0 );
@@@ -371,8 -349,7 +349,7 @@@
Printer *pPrt = pSh->getIDocumentDeviceAccess()->getPrinter( true );
- // Raender (setzen sich zusammen aus Shift-Offset und
- // Ausrichtung)
- // Borders (are put together by Shift-Offset and alignment)
++ // Borders (are put together by Shift-Offset and alignment)
Size aPaperSize = pPrt->PixelToLogic( pPrt->GetPaperSizePixel(),
MAP_TWIP);
if ( !aPaperSize.Width() && !aPaperSize.Height() )
@@@ -528,7 -505,7 +505,7 @@@
rReq.Done();
}
- else //Abbruch
- else // Abort
++ else // Abort
{
rReq.Ignore();
diff --cc sw/source/ui/app/docst.cxx
index cd2dc95,94f4669..3543215
--- a/sw/source/ui/app/docst.cxx
+++ b/sw/source/ui/app/docst.cxx
@@@ -127,8 -121,8 +121,8 @@@ void SwDocShell::StateStyleSheet(SfxIt
switch (nWhich)
{
case SID_STYLE_APPLY:
- {//hier wird die Vorlage und ihre Familie an die StyleBox
- //uebergeben, damit diese Familie angezeigt wird
- {// here the template and its family are passed to the StyleBox
++ {// here the template and its family are passed to the StyleBox
+ // so that this family is being showed
if(pShell->IsFrmSelected())
{
SwFrmFmt* pFmt = pShell->GetCurFrmFmt();
@@@ -268,7 -262,7 +262,7 @@@
/*--------------------------------------------------------------------
- Beschreibung: StyleSheet-Requeste auswerten
- Description: evaluate StyleSheet-Requests
++ Description: evaluate StyleSheet-Requests
--------------------------------------------------------------------*/
@@@ -664,7 -643,7 +643,7 @@@ sal_uInt16 SwDocShell::Edit( const Stri
}
if (!bBasic)
{
- // vor dem Dialog wird der HtmlMode an der DocShell versenkt
- // prior to the dialog the HtmlMode at the DocShell is being sunk
++ // prior to the dialog the HtmlMode at the DocShell is being sunk
sal_uInt16 nHtmlMode = ::GetHtmlMode(this);
// In HTML mode, we do not always have a printer. In order to show
@@@ -688,7 -670,7 +670,7 @@@
{
GetWrtShell()->StartAllAction();
- // nur bei Absatz-Vorlagen die Maske neu setzen
- // newly set the mask only with paragraph-templates
++ // newly set the mask only with paragraph-templates
if( bNew )
{
nRet = SFX_STYLE_FAMILY_PARA == pStyle->GetFamily()
@@@ -1045,8 -1022,7 +1022,7 @@@ sal_uInt16 SwDocShell::UpdateStyle(cons
{
pCurrWrtShell->StartAllAction();
pCurrWrtShell->FillByEx(pChar);
- // Vorlage auch anwenden, um harte Attributierung
- // zu entfernen
- // also apply template to remove hard set attributes
++ // also apply template to remove hard set attributes
pCurrWrtShell->EndAllAction();
}
diff --cc sw/source/ui/config/optpage.cxx
index 8514156,0864d35..da8c0e3
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@@ -1837,10 -1679,10 +1679,10 @@@ void SwMarkPreview::Paint(const Rectang
void SwMarkPreview::PaintPage(const Rectangle &rRect)
{
- // PrintArea zeichnen
- // draw PrintArea
++ // draw PrintArea
DrawRect(rRect, m_aTransCol, m_aPrintAreaCol );
- // Testabsatz zeichnen
+ // draw Testparagraph
sal_uLong nLTxtBorder = 4;
sal_uLong nRTxtBorder = 4;
sal_uLong nTTxtBorder = 4;
@@@ -1857,8 -1699,7 +1699,7 @@@
nStep = aTextLine.GetHeight() + 2;
nLines = (sal_uInt16)(rRect.GetHeight() / (aTextLine.GetHeight() + 2)) - 1;
- // Text simulieren
- //
- // simulate text
++ // simulate text
for (sal_uInt16 i = 0; i < nLines; ++i)
{
if (i == (nLines - 1))
diff --cc sw/source/ui/config/uinums.cxx
index 39f09c2,ae96f2a..ac139fc
--- a/sw/source/ui/config/uinums.cxx
+++ b/sw/source/ui/config/uinums.cxx
@@@ -41,10 -37,9 +37,9 @@@
#include <svl/itemiter.hxx>
#include <editeng/brshitem.hxx>
-
#include <tools/resid.hxx>
#include <fmtornt.hxx>
- #include <swtypes.hxx> // Leerstring
-#include <swtypes.hxx> // empty string
++#include <swtypes.hxx> // empty string
#include <wrtsh.hxx>
#include <uinums.hxx>
#include <poolfmt.hxx>
@@@ -56,12 -51,12 +51,12 @@@
using namespace ::com::sun::star;
--#define VERSION_30B ((sal_uInt16)250)
--#define VERSION_31B ((sal_uInt16)326)
--#define VERSION_40A ((sal_uInt16)364)
++#define VERSION_30B ((sal_uInt16)250)
++#define VERSION_31B ((sal_uInt16)326)
++#define VERSION_40A ((sal_uInt16)364)
#define VERSION_50A ((sal_uInt16)373)
#define VERSION_53A ((sal_uInt16)596)
--#define ACT_NUM_VERSION VERSION_53A
++#define ACT_NUM_VERSION VERSION_53A
#define NUMRULE_FILENAME "numrule.cfg"
#define CHAPTER_FILENAME "chapter.cfg"
@@@ -77,10 -67,10 +67,10 @@@ SV_IMPL_PTRARR( _SwNumFmtsAttrs, SfxPoo
// SwNumRulesWithName ----------------------------------------------------
// PUBLIC METHODES -------------------------------------------------------
/*------------------------------------------------------------------------
- Beschreibung: Speichern einer Regel
- Parameter: rCopy -- die zu speichernde Regel
- nIdx -- Position, an der die Regel zu speichern ist.
- Eine alte Regel an dieser Position wird ueberschrieben.
- Description: Saving a rule
- Parameter: rCopy -- the rule to save
- nIdx -- position, where the rule is to be saved.
++ Description: Saving a rule
++ Parameter: rCopy -- the rule to save
++ nIdx -- position, where the rule is to be saved.
+ An old rule at that position will be overwritten.
------------------------------------------------------------------------*/
SwBaseNumRules::SwBaseNumRules( const String& rFileName )
@@@ -167,16 -143,9 +143,9 @@@ sal_Bool SwBaseNumRules::Store(SvStrea
return sal_True;
}
-
-
- /*------------------------------------------------------------------------
- Beschreibung: Speichern / Laden
- ------------------------------------------------------------------------*/
-
-
int SwBaseNumRules::Load(SvStream &rStream)
{
-- int rc = 0;
++ int rc = 0;
rStream >> nVersion;
@@@ -419,48 -339,48 +339,48 @@@ SwNumRulesWithName::_SwNumFmtGlobal::_S
sal_Bool bFlag;
String sStr;
-- rStream >> nUS; aFmt.SetNumberingType((sal_Int16)nUS );
++ rStream >> nUS; aFmt.SetNumberingType((sal_Int16)nUS );
if( VERSION_53A > nVersion )
{
-- rStream >> cChar; aFmt.SetBulletChar( cChar );
++ rStream >> cChar; aFmt.SetBulletChar( cChar );
}
else
{
-- rStream >> nUS; aFmt.SetBulletChar( nUS );
++ rStream >> nUS; aFmt.SetBulletChar( nUS );
}
-- rStream >> bFlag; aFmt.SetIncludeUpperLevels( bFlag );
++ rStream >> bFlag; aFmt.SetIncludeUpperLevels( bFlag );
if( VERSION_30B == nVersion )
{
long nL;
-- rStream >> cChar; aFmt.SetStart( (sal_uInt16)cChar );
++ rStream >> cChar; aFmt.SetStart( (sal_uInt16)cChar );
rStream.ReadByteString(sStr, eEncoding);
aFmt.SetPrefix( sStr );
rStream.ReadByteString(sStr, eEncoding);
aFmt.SetSuffix( sStr );
-- rStream >> nUS; aFmt.SetNumAdjust( SvxAdjust( nUS ) );
-- rStream >> nL; aFmt.SetLSpace( lNumIndent );
-- rStream >> nL; aFmt.SetFirstLineOffset( (short)nL );
++ rStream >> nUS; aFmt.SetNumAdjust( SvxAdjust( nUS ) );
++ rStream >> nL; aFmt.SetLSpace( lNumIndent );
++ rStream >> nL; aFmt.SetFirstLineOffset( (short)nL );
}
- else // alter StartWert war ein Byte
- else // old start-value was a Byte
++ else // old start-value was a Byte
{
- rStream >> nUS; aFmt.SetStart( nUS );
+ short nShort;
- rStream >> nUS; aFmt.SetStart( nUS );
++ rStream >> nUS; aFmt.SetStart( nUS );
rStream.ReadByteString(sStr, eEncoding);
aFmt.SetPrefix( sStr );
rStream.ReadByteString(sStr, eEncoding);
aFmt.SetSuffix( sStr );
-- rStream >> nUS; aFmt.SetNumAdjust( SvxAdjust( nUS ) );
-- rStream >> nUS; aFmt.SetAbsLSpace( nUS );
-- rStream >> nShort; aFmt.SetFirstLineOffset( nShort );
-- rStream >> nUS; aFmt.SetCharTextDistance( nUS );
-- rStream >> nShort; aFmt.SetLSpace( nShort );
++ rStream >> nUS; aFmt.SetNumAdjust( SvxAdjust( nUS ) );
++ rStream >> nUS; aFmt.SetAbsLSpace( nUS );
++ rStream >> nShort; aFmt.SetFirstLineOffset( nShort );
++ rStream >> nUS; aFmt.SetCharTextDistance( nUS );
++ rStream >> nShort; aFmt.SetLSpace( nShort );
rStream >> bFlag;
}
-- sal_uInt16 nFamily;
++ sal_uInt16 nFamily;
sal_uInt16 nCharSet;
short nWidth;
short nHeight;
@@@ -660,7 -567,7 +567,7 @@@ void SwNumRulesWithName::_SwNumFmtGloba
else
pFmt = rSh.GetCharFmtFromPool( nCharPoolId );
- if( !pFmt->GetDepends() ) // Attribute setzen
- if( !pFmt->GetDepends() ) // set attributes
++ if( !pFmt->GetDepends() ) // set attributes
for( sal_uInt16 n = aItems.Count(); n; )
pFmt->SetFmtAttr( *aItems[ --n ] );
}
diff --cc sw/source/ui/docvw/edtwin.cxx
index 520465e,53a9238..a7f86a6
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@@ -286,10 -268,10 +268,10 @@@ inline sal_Bool IsMinMove(const Point &
}
/*--------------------------------------------------------------------
- JP 30.07.98: fuer MouseButtonDown - feststellen, ob ein DrawObject
- und KEIN SwgFrame getroffen wurde! Shift/Ctrl sollen
- nur bei DrawObjecte zum Selektieren fuehren, bei SwgFlys
- ggfs zum ausloesen von Hyperlinks (DownLoad/NewWindow!)
- for MouseButtonDown - determine whether a DrawObject
++ for MouseButtonDown - determine whether a DrawObject
+ an NO SwgFrame was hit! Shift/Ctrl should only result
+ in selecting, with DrawObjects; at SwgFlys to trigger
+ hyperlinks if applicable (DownLoad/NewWindow!)
--------------------------------------------------------------------*/
inline sal_Bool IsDrawObjSelectable( const SwWrtShell& rSh, const Point& rPt )
{
@@@ -1294,9 -1262,8 +1262,8 @@@ void SwEditWin::KeyInput(const KeyEven
SfxObjectShell *pObjSh = (SfxObjectShell*)rView.GetViewFrame()->GetObjectShell();
if ( bLockInput || (pObjSh && pObjSh->GetProgress()) )
- // Wenn die Rechenleiste aktiv ist oder
- // auf dem Document ein Progress laeuft wird keine
- // Bestellungen angenommen.
- // When the progress bar is active or a progress is
++ // When the progress bar is active or a progress is
+ // running on a document, no order is being taken
return;
if( pShadCrsr )
@@@ -2293,9 -2251,8 +2251,8 @@@ KEYINPUT_CHECKTABLE_INSDEL
if( bChkInsBlank && bIsNormalChar &&
(aInBuffer.Len() || !rSh.IsSttPara() || !rSh.IsEndPara() ))
{
- // vor dem Zeichen noch ein Blank einfuegen. Dieses
- // kommt zwischen den Expandierten Text und dem neuen
- // "nicht Worttrenner".
- // insert a blank ahead of the character. this ends up
++ // insert a blank ahead of the character. this ends up
+ // between the expanded text and the new "non-word-seperator".
aInBuffer.Expand( aInBuffer.Len() + 1, ' ' );
}
@@@ -3002,9 -2923,8 +2923,8 @@@ void SwEditWin::MouseButtonDown(const M
if( !bSelObj )
{
- // Cursor hier umsetzen, damit er nicht zuerst
- // im Rahmen gezeichnet wird; ShowCrsr() geschieht
- // in LeaveSelFrmMode()
- // move cursor here so that it is not drawn in the
++ // move cursor here so that it is not drawn in the
+ // frame first; ShowCrsr() happens in LeaveSelFrmMode()
bValidCrsrPos = !(CRSR_POSCHG & (rSh.*rSh.fnSetCrsr)(&aDocPos,sal_False));
rSh.LeaveSelFrmMode();
rView.AttrChangedNotify( &rSh );
@@@ -3317,8 -3232,8 +3232,8 @@@
}
if ( !rSh.IsExtMode() )
{
- // keine Selection anfangen, wenn in ein URL-
- // Feld oder eine -Grafik geklickt wird
- // don't start a selection when an
++ // don't start a selection when an
+ // URL field or a graphic is clicked
sal_Bool bSttSelect = rSh.HasSelection() ||
Pointer(POINTER_REFHAND) != GetPointer();
@@@ -4505,8 -4378,8 +4378,8 @@@ void SwEditWin::MouseButtonUp(const Mou
}
ReleaseMouse();
- // Hier kommen nur verarbeitete MouseEvents an; nur bei diesen duerfen
- // die Modi zurueckgesetzt werden.
- // Only processed MouseEvents arrive here; only at these the moduses can
++ // Only processed MouseEvents arrive here; only at these the moduses can
+ // be resetted.
bMBPressed = sal_False;
//sicherheitshalber aufrufen, da jetzt das Selektieren bestimmt zu Ende ist.
diff --cc sw/source/ui/docvw/edtwin2.cxx
index 68a0e23,3a39e2c..3d1bfd3
--- a/sw/source/ui/docvw/edtwin2.cxx
+++ b/sw/source/ui/docvw/edtwin2.cxx
@@@ -563,9 -523,9 +523,9 @@@ void SwEditWin::Paint(const Rectangle
delete pShadCrsr, pShadCrsr = 0;
else if( rRect.IsOver( aRect ))
{
- // liegt irgendwie drueber, dann ist alles ausserhalb geclippt
- // und wir muessen den "inneren Teil" am Ende vom Paint
- // wieder sichtbar machen. Sonst kommt es zu Paintfehlern!
+ // resides somewhat above, then everything is clipped outside
- // and we have to make the "inner part" at the end of the
++ // and we have to make the "inner part" at the end of the
+ // Paint visible again. Otherwise Paint errors occur!
bPaintShadowCrsr = sal_True;
}
}
diff --cc sw/source/ui/docvw/edtwin3.cxx
index 4e12917,ccac547..bf0532b
--- a/sw/source/ui/docvw/edtwin3.cxx
+++ b/sw/source/ui/docvw/edtwin3.cxx
@@@ -187,10 -185,10 +185,10 @@@ void SwEditWin::DataChanged( const Data
switch( rDCEvt.GetType() )
{
case DATACHANGED_SETTINGS:
- // ScrollBars neu anordnen bzw. Resize ausloesen, da sich
- // ScrollBar-Groesse geaendert haben kann. Dazu muss dann im
- // Resize-Handler aber auch die Groesse der ScrollBars aus
- // den Settings abgefragt werden.
+ // rearrange ScrollBars, respectively trigger resize, because
- // the ScrollBar size can have change. For that, in the reset
- // handler, the size of the ScrollBars also has to be queried
++ // the ScrollBar size can have change. For that, in the reset
++ // handler, the size of the ScrollBars also has to be queried
+ // from the settings.
if( rDCEvt.GetFlags() & SETTINGS_STYLE )
{
pSh->LockPaint();
diff --cc sw/source/ui/docvw/extedit.cxx
index 0000000,cf5236c..8010a9d
mode 000000,100644..100644
--- a/sw/source/ui/docvw/extedit.cxx
+++ b/sw/source/ui/docvw/extedit.cxx
@@@ -1,0 -1,150 +1,150 @@@
+ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+ /*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ * [ Surendran Mahendran <surenspost at gmail.com>]
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+ #include "precompiled_sw.hxx"
+ #include <extedit.hxx>
+ #include <view.hxx>
+ #include <sfx2/viewfrm.hxx>
+ #include <sfx2/bindings.hxx>
+ #include <wrtsh.hxx>
+ #include <osl/file.hxx>
+ #include <osl/thread.hxx>
+ #include <osl/process.h>
+ #include <osl/time.h>
+ #include <svtools/filter.hxx>
+ #include <svtools/filechangedchecker.hxx>
+ #include <svx/xoutbmp.hxx>
+ #include <unotools/ucbstreamhelper.hxx>
+ #include <vcl/svapp.hxx>
+ #include <vcl/graph.hxx>
+ #include <vcl/cvtgrf.hxx>
+ #include <basesh.hxx>
+ #include "romenu.hxx"
+ #include "com/sun/star/system/XSystemShellExecute.hpp"
+ #include "com/sun/star/system/SystemShellExecuteFlags.hpp"
+ #include <comphelper/processfactory.hxx>
+
+ #include <boost/bind.hpp>
+
+ using namespace ::com::sun::star;
+
+ void HandleCloseEvent(const String& rURL, SwWrtShell *rSh)
+ {
+ //create a new Graphic
+ Graphic newGraphic;
+
+ //import the temp file image stream into the newGraphic
+ SvStream* pStream = utl::UcbStreamHelper::CreateStream(rURL, STREAM_READ);
+ if(pStream)
+ {
+ GraphicConverter::Import(*pStream, newGraphic);
+
+ // Now update the Graphic in the shell by re-reading from the newGraphic
+ // TODO: Make this action Undoable !
+ rSh->ReRead(aEmptyStr, aEmptyStr, (const Graphic*) &newGraphic);
+
+ delete(pStream);
+ }
+ }
+
+ IMPL_LINK (ExternalProcessClass_Impl, StartListeningEvent, void*, pEvent)
+ {
+ //Start an event listener implemented via VCL timeout
+ Data *pData = ( Data* )pEvent;
+ String aURL( pData->fileName );
+
+ new FileChangedChecker(
- pData->fileName,
++ pData->fileName,
+ ::boost::bind(&HandleCloseEvent,aURL,pData->rSh));
+
+ return 0;
+ }
+
+ void pWorker(void *pThreadData)
+ {
+ Data *pData = (Data*)(pThreadData);
+ rtl_uString *aFileName = new rtl_uString();
+ rtl_uString_newFromAscii (
+ &aFileName, rtl::OUStringToOString(
+ pData->fileName, RTL_TEXTENCODING_UTF8).getStr());
+
+ // Make an asynchronous call to listen to the event of temporary image file
+ // getting changed
+ Application::PostUserEvent(
+ LINK(NULL, ExternalProcessClass_Impl, StartListeningEvent), pThreadData);
+
+ uno::Reference< com::sun::star::system::XSystemShellExecute > xSystemShellExecute(
+ ::comphelper::getProcessServiceFactory()->createInstance(
+ DEFINE_CONST_UNICODE("com.sun.star.system.SystemShellExecute") ), uno::UNO_QUERY_THROW );
+ xSystemShellExecute->execute( pData->fileName, rtl::OUString(), com::sun::star::system::SystemShellExecuteFlags::DEFAULTS );
+ }
+
+ void EditWithExternalTool(GraphicObject *pGraphicObject, SwWrtShell *rSh)
+ {
+ //Get the graphic from the GraphicObject
+ const Graphic pGraphic = pGraphicObject->GetGraphic();
+
+ //get the Preferred File Extension for this graphic
+ String fExt;
+ GetPreferedExtension(fExt, pGraphic);
+
+ //Create the temp File
+ rtl::OUString tempFileBase, tempFileName;
+ oslFileHandle pHandle;
+ osl::FileBase::createTempFile(0, &pHandle, &tempFileBase);
+
+ // Move it to a file name with image extension properly set
+ tempFileName = tempFileBase + rtl::OUString(String('.')) +
+ rtl::OUString(fExt);
+ osl::File::move(tempFileBase, tempFileName);
+
+ //Write Graphic to the Temp File
+ GraphicFilter& rGF = GraphicFilter::GetGraphicFilter();
+ sal_uInt16 nFilter(rGF.GetExportFormatNumber(fExt));
+ String aFilter(rGF.GetExportFormatShortName(nFilter));
+ String sPath(tempFileName.getStr());
+
+ // Write the Graphic to the file now
+ XOutBitmap::WriteGraphic(pGraphic, sPath, aFilter,
+ XOUTBMP_USE_NATIVE_IF_POSSIBLE|XOUTBMP_DONT_EXPAND_FILENAME);
+
+ // There is a possiblity that sPath extnesion might have been changed if the
+ // provided extension is not writable
+ tempFileName = rtl::OUString(sPath);
+
+ //Create a thread
+ rtl_uString *fileName = new rtl_uString();
+ rtl_uString_newFromAscii(
+ &fileName, rtl::OUStringToOString(tempFileName,
+ RTL_TEXTENCODING_UTF8).getStr());
+
+ // Create the data that is needed by the thread later
+ Data *pThreadData = new Data();
+ pThreadData->pGraphicObject = pGraphicObject;
+ pThreadData->fileName = fileName;
+ pThreadData->rSh = rSh ;
+
+ osl_createThread(pWorker, pThreadData);
+
+ }
diff --cc sw/source/ui/docvw/srcedtw.cxx
index 029e640,9bc0d1a..3c42717
--- a/sw/source/ui/docvw/srcedtw.cxx
+++ b/sw/source/ui/docvw/srcedtw.cxx
@@@ -286,10 -263,10 +263,10 @@@ void SwSrcEditWindow::DataChanged( cons
switch ( rDCEvt.GetType() )
{
case DATACHANGED_SETTINGS:
- // ScrollBars neu anordnen bzw. Resize ausloesen, da sich
- // ScrollBar-Groesse geaendert haben kann. Dazu muss dann im
- // Resize-Handler aber auch die Groesse der ScrollBars aus
- // den Settings abgefragt werden.
- // newly rearrange ScrollBars or trigger Resize, because
++ // newly rearrange ScrollBars or trigger Resize, because
+ // ScrollBar size could have changed. For this, in the
+ // Resize handler the size of ScrollBars has to be queried
+ // from the settings as well.
if( rDCEvt.GetFlags() & SETTINGS_STYLE )
Resize();
break;
diff --cc sw/source/ui/envelp/envlop1.cxx
index 4bd38b8,cda3fde..914c280
--- a/sw/source/ui/envelp/envlop1.cxx
+++ b/sw/source/ui/envelp/envlop1.cxx
@@@ -116,7 -105,7 +105,7 @@@ void SwEnvPreview::Paint(const Rectangl
SetLineColor( aFront );
- // Umschlag
- // Envelope
++ // Envelope
long nW = (sal_uInt16) (f * nPageW),
nH = (sal_uInt16) (f * nPageH),
nX = (GetOutputSizePixel().Width () - nW) / 2,
diff --cc sw/source/ui/envelp/labfmt.cxx
index 4d1adfa,a670927..5d5bcee
--- a/sw/source/ui/envelp/labfmt.cxx
+++ b/sw/source/ui/envelp/labfmt.cxx
@@@ -142,12 -140,12 +140,12 @@@ void SwLabPreview::Paint(const Rectangl
else
lDispH += ROUND(aItem.lVDist / 10);
- // Skalierungsfaktor
- // Scale factor
++ // Scale factor
float fx = (float) lOutWPix23 / Max(1L, lDispW),
fy = (float) lOutHPix23 / Max(1L, lDispH),
f = fx < fy ? fx : fy;
- // Nullpunkt
- // zero point
++ // zero point
long lOutlineW = ROUND(f * lDispW);
long lOutlineH = ROUND(f * lDispH);
diff --cc sw/source/ui/fldui/changedb.cxx
index baf5d88,6330586..272bf19
--- a/sw/source/ui/fldui/changedb.cxx
+++ b/sw/source/ui/fldui/changedb.cxx
@@@ -240,9 -203,9 +203,9 @@@ SvLBoxEntry* SwChangeDBDlg::Insert(cons
}
/*--------------------------------------------------------------------
- Beschreibung: Dialog zerstoeren
- Description: destroy dialog
++ Description: destroy dialog
--------------------------------------------------------------------*/
- __EXPORT SwChangeDBDlg::~SwChangeDBDlg()
+ SwChangeDBDlg::~SwChangeDBDlg()
{
delete pMgr;
}
diff --cc sw/source/ui/fldui/flddb.cxx
index f9e99f5,9c74cb3..79b45be
--- a/sw/source/ui/fldui/flddb.cxx
+++ b/sw/source/ui/fldui/flddb.cxx
@@@ -106,10 -86,9 +86,9 @@@ SwFldDBPage::~SwFldDBPage(
}
/*--------------------------------------------------------------------
- Beschreibung: TabPage initialisieren
- Description: initialise TabPage
++ Description: initialise TabPage
--------------------------------------------------------------------*/
-
- void __EXPORT SwFldDBPage::Reset(const SfxItemSet&)
+ void SwFldDBPage::Reset(const SfxItemSet&)
{
Init(); // Allgemeine initialisierung
@@@ -123,7 -102,7 +102,7 @@@
if (!IsFldEdit())
{
- // TypeListBox initialisieren
- // initialise TypeListBox
++ // initialise TypeListBox
const SwFldGroupRgn& rRg = GetFldMgr().GetGroupRange(IsFldDlgHtmlMode(), GetGroup());
for(i = rRg.nStart; i < rRg.nEnd; ++i)
diff --cc sw/source/ui/fldui/flddinf.cxx
index b4924cf,f1a15f6..2a18e11
--- a/sw/source/ui/fldui/flddinf.cxx
+++ b/sw/source/ui/fldui/flddinf.cxx
@@@ -111,15 -99,11 +99,11 @@@ SwFldDokInfPage::~SwFldDokInfPage(
{
}
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list