date:20131125

[Libreoffice-commits] core.git: winaccessibility/inc winaccessibility/Library_uacccom.mk winaccessibility/Library_winaccessibility.mk winaccessibility/source

2013-11-25 Thread Michael Stahl

 winaccessibility/Library_uacccom.mk  |1 
 winaccessibility/Library_winaccessibility.mk |1 
 winaccessibility/inc/UAccCOMdllapi.h |   24 +++
 winaccessibility/inc/accHelper.hxx   |4 +
 winaccessibility/source/UAccCOM/AccHypertext.cxx |8 --
 winaccessibility/source/UAccCOM/AccTable.cxx |   16 -
 winaccessibility/source/UAccCOM/EnumVariant.cxx  |5 -
 winaccessibility/source/UAccCOM/MAccessible.cxx  |   73 ++-
 winaccessibility/source/UAccCOM/UAccCOM.cxx  |9 ++
 winaccessibility/source/UAccCOM/acccommon.h  |6 +
 winaccessibility/source/service/AccObject.cxx|   18 +
 11 files changed, 114 insertions(+), 51 deletions(-)

New commits:
commit 3b86569fcba210eb6570fabef7ff8abf6aff91f0
Author: Michael Stahl mst...@redhat.com
Date:   Sun Nov 24 00:52:12 2013 +0100

winaccessibility: replace CoCreateInstance with direct instantiation

This is an alternative (to 732ec36edfd09d2091d70c4d71b5f182fe279c45)
solution to the CoCreateInstance does not work problem:
replace all CoCreateInstance calls with equivalent calls to create
the components directly.

Since the only reason why this COM stuff needs to be registered
at all is that AccObject uses CoCreateInstance() to create its
COM objects, another possible solution appears to be to simply link
the libraries and instantiate the COM objects directly, without COM.

The only difference appears to be that CoCreateInstance would
automatically add proxy objects in case the COM objects reside in a
single-threaded appartment; not sure if that is relevant here.

Change-Id: I8ffb8af501f6084f3145fa4d4f53366a070e1691
Reviewed-on: https://gerrit.libreoffice.org/6792
Reviewed-by: Michael Meeks michael.me...@collabora.com
Tested-by: Michael Meeks michael.me...@collabora.com

diff --git a/winaccessibility/Library_uacccom.mk 
b/winaccessibility/Library_uacccom.mk
index f481b40..1592804 100644
--- a/winaccessibility/Library_uacccom.mk
+++ b/winaccessibility/Library_uacccom.mk
@@ -20,6 +20,7 @@ $(eval $(call gb_Library_set_include,UAccCOM,\
 ))
 
 $(eval $(call gb_Library_add_defs,UAccCOM,\
+   -DUACCCOM_DLLIMPLEMENTATION \
-D_UNICODE=1 \
 ))
 
diff --git a/winaccessibility/Library_winaccessibility.mk 
b/winaccessibility/Library_winaccessibility.mk
index 55057c3..45a86f3 100644
--- a/winaccessibility/Library_winaccessibility.mk
+++ b/winaccessibility/Library_winaccessibility.mk
@@ -53,6 +53,7 @@ $(eval $(call gb_Library_use_externals,winaccessibility,\
 ))
 
 $(eval $(call gb_Library_use_libraries,winaccessibility,\
+   UAccCOM \
cppu \
cppuhelper \
vcl \
diff --git a/winaccessibility/inc/UAccCOMdllapi.h 
b/winaccessibility/inc/UAccCOMdllapi.h
new file mode 100644
index 000..aca29b6
--- /dev/null
+++ b/winaccessibility/inc/UAccCOMdllapi.h
@@ -0,0 +1,24 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_UACCCOM_UACCCOMDLLAPI_H
+#define INCLUDED_UACCCOM_UACCCOMDLLAPI_H
+
+#include sal/types.h
+
+#if defined(UACCCOM_DLLIMPLEMENTATION)
+#define UACCCOM_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
+#else
+#define UACCCOM_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
+#endif
+#define UACCCOM_DLLPRIVATE SAL_DLLPRIVATE
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/winaccessibility/inc/accHelper.hxx 
b/winaccessibility/inc/accHelper.hxx
index 772393a..f0dd29b 100644
--- a/winaccessibility/inc/accHelper.hxx
+++ b/winaccessibility/inc/accHelper.hxx
@@ -20,6 +20,8 @@
 #ifndef __ACCHELPER_HXX
 #define __ACCHELPER_HXX
 
+#include UAccCOMdllapi.h
+
 enum DIRECTION
 {
 FIRST_CHILD=0,
@@ -30,6 +32,8 @@ enum DIRECTION
 
 #define UNO_MSAA_UNMAPPING   0x
 
+struct IMAccessible;
+UACCCOM_DLLPUBLIC IMAccessible * UAccCOMCreateInstance();
 
 #endif
 
diff --git a/winaccessibility/source/UAccCOM/AccHypertext.cxx 
b/winaccessibility/source/UAccCOM/AccHypertext.cxx
index ae9e86a..4679440 100644
--- a/winaccessibility/source/UAccCOM/AccHypertext.cxx
+++ b/winaccessibility/source/UAccCOM/AccHypertext.cxx
@@ -20,6 +20,8 @@
 #include stdafx.h
 #include UAccCOM.h
 #include AccHypertext.h
+#include AccHyperLink.h
+#include acccommon.h
 
 #include act.hxx
 
@@ -325,11 +327,7 @@ STDMETHODIMP CAccHypertext::get_hyperlink(long 
index,IAccessibleHyperlink **hype
 }
 
 IAccessibleHyperlink* plink = NULL;
-ActivateActContext();
-HRESULT hr = CoCreateInstance( CLSID_AccHyperLink, NULL, CLSCTX_SERVER ,
-   IID_IAccessibleHyperlink,
-   (void **)plink);
-DeactivateActContext();
+

Re: Questions about Domain Mapper

2013-11-25 Thread Miklos Vajna

Hi Adam,

On Sun, Nov 24, 2013 at 06:06:06PM +0200, Adam Fyne adam.f...@cloudon.com
wrote:
I think I was misunderstood.
I think you thought I was asking : I need to add each property like
bold\italic\underline separatly to the RedlineParams.
What I actually meant to ask was:
Currently there are a lot of XML nodes that might appear under 'rPr' node
(that is under the 'rPrChange').
For example: 'bold', 'boldbidi', 'italic', 'italicbidi', language, etc.
Currently each of these XML nodes is handled by different code in the
'DomainMapper.cxx' file
(here is some of it:
http://opengrok.libreoffice.org/xref/core/writerfilter/source/dmapper/DomainMapper.cxx#2100
)

So I am asking - do I have to go node-by-node and add it to the
'property-list' that will be in the 'RedlineParams'?
Or is there any smart way of turning on some flag when the 'rPrChange-rPr'
tag is entered,
and checking at the end of the 'rPrChange-rPr' tag which properties were
inserted to the 'rContext' and add those properties to the 'RedlineParams'.

Yes, that should be possible. Either when you expand the token of
rPrChange, then you can do something like:

- turn flag on
- resolve children
- turn flag off

(DomainMapper.cxx:3039 has examples of that, the interop-grab-bag
reading of table styles use this technique)

or in case that doesn't work, you can still generate tokens when you
start or leave a context. If you search for tblStart/tblEnd in
model.xml, you'll find examples for this as well.

*And some more elaboration on that:*
I just checked a simple DOCX that had some text in 'bold' and 'italic'. I
then turned ON the 'track changes' and removed the 'bold' and 'italic'.
When I round-tripped the DOCX through LO - the outputted file *had* the
'bold' and 'italic' turned on.
This means that the nodes that were inside the 'r-rPrChange-rPr' were
treated as if they were simply inside the 'r'-'rPr' (which is wrong).

Right, that's quite possible.

This ephasises the need to detect when 'r-rPrChange-rPr' are being
analyzed in the importer - and to *not* analyze them normally on the run
itself, but to store them in the 'RedlineParams' somehow.

Agreed, that makes sense.

Miklos

signature.asc
Description: Digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

1 2 3 4 >

1 - 100 of 384 matches

Mail list logo