Can libreoffice be used as an application platform like Eclipse RCP?
Cross-posting from SO: https://stackoverflow.com/questions/77541132 Given enough time, everything is possible. But is it viable to build a new product (e.g. a CAD application) on top of libreoffice code and get functionality for free like with Eclipse RCP, e.g.: - plugin / addon management - preferences system - cross-platform compatibility (Win, Linux, MacOS) - Undo/Redo - Help System - rich Widgets (e.g. object properties) - ...? If it is possible, is there documentation on how to get started? Related question: Are there other RCPs besides Eclipse RCP that are worth evaluating? Thank you! Thomas P.s. Meanwhile I got the impression, that it is not viable as the LO code is seriously underdocumented and crufted (correct me!). However it would probably serve as a good goal for LO code organisation to imagine LO as a platform?
[Libreoffice-commits] core.git: external/python3 RepositoryExternal.mk
RepositoryExternal.mk |2 external/python3/ExternalPackage_python3.mk | 125 ++-- external/python3/ExternalProject_python3.mk |1 3 files changed, 66 insertions(+), 62 deletions(-) New commits: commit 12142490cd43f8568ab29e0ddfa75b334d6d39d5 Author: Thomas Viehmann AuthorDate: Fri Nov 27 23:08:08 2020 +0100 Commit: Michael Stahl CommitDate: Tue Dec 1 10:16:17 2020 +0100 Enable Python Py_DEBUG setting when built with --enable-dbgutil on Linux This has been suggested on IRC for testing fixes/avoiding regressions when working on the GIL locking in PyUNO. Change-Id: Ifda21a867b3c0c7db636a9ec950050012e4742de Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106791 Reviewed-by: Michael Stahl Tested-by: Jenkins diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index f0cad01beb49..99dfcea22b40 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -3200,7 +3200,7 @@ $(call gb_LinkTarget_add_libs,$(1),\ else $(call gb_LinkTarget_add_libs,$(1),\ -L$(call gb_UnpackedTarball_get_dir,python3) \ - -lpython$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR) \ + -lpython$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)$(if $(ENABLE_DBGUTIL),d) \ ) endif diff --git a/external/python3/ExternalPackage_python3.mk b/external/python3/ExternalPackage_python3.mk index 4886b123cab4..5f1fd5ae70ea 100644 --- a/external/python3/ExternalPackage_python3.mk +++ b/external/python3/ExternalPackage_python3.mk @@ -43,8 +43,8 @@ $(eval $(call gb_ExternalPackage_add_files,python3,$(LIBO_BIN_FOLDER)/python-cor )) else $(eval $(call gb_ExternalPackage_add_file,python3,$(LIBO_BIN_FOLDER)/python.bin,python)) -$(eval $(call gb_ExternalPackage_add_file,python3,$(LIBO_BIN_FOLDER)/libpython$(PYTHON_VERSION_MAJOR).so,libpython$(PYTHON_VERSION_MAJOR).so)) -$(eval $(call gb_ExternalPackage_add_file,python3,$(LIBO_BIN_FOLDER)/libpython$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR).so.1.0,libpython$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR).so)) +$(eval $(call gb_ExternalPackage_add_file,python3,$(LIBO_BIN_FOLDER)/libpython$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)$(if $(ENABLE_DBGUTIL),d).so,libpython$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)$(if $(ENABLE_DBGUTIL),d).so)) +$(eval $(call gb_ExternalPackage_add_file,python3,$(LIBO_BIN_FOLDER)/libpython$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)$(if $(ENABLE_DBGUTIL),d).so.1.0,libpython$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)$(if $(ENABLE_DBGUTIL),d).so)) $(eval $(call gb_ExternalPackage_add_file,python3,$(LIBO_BIN_FOLDER)/python.bin-gdb.py,Tools/gdb/libpython.py)) # Unfortunately the python build system does not allow to explicitly enable or @@ -55,69 +55,72 @@ $(eval $(call gb_ExternalPackage_add_file,python3,$(LIBO_BIN_FOLDER)/python.bin- # that may not be available on baseline systems. ifneq ($(OS),AIX) +python3_EXTENSION_MODULE_SUFFIX=cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)$(if $(ENABLE_DBGUTIL),d) $(eval $(call gb_ExternalPackage_add_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/lib-dynload,\ - LO_lib/array.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR).so \ - LO_lib/_asyncio.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR).so \ - LO_lib/audioop.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR).so \ - LO_lib/binascii.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR).so \ - LO_lib/_bisect.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR).so \ - LO_lib/_blake2.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR).so \ - LO_lib/cmath.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR).so \ - LO_lib/_codecs_cn.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR).so \ - LO_lib/_codecs_hk.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR).so \ - LO_lib/_codecs_iso2022.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR).so \ - LO_lib/_codecs_jp.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR).so \ - LO_lib/_codecs_kr.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR).so \ - LO_lib/_codecs_tw.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR).so \ - LO_lib/_contextvars.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR).so \ - LO_lib/_crypt.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR).so \ - LO_lib/_csv.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR).so \ - LO_lib/_ctypes.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR).so \ - LO_lib/_datetime.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR).so \ - LO_lib/_decimal.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR).so \ - LO_lib/_elementtree.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR).so \ - LO_lib/fcntl.cpython-$(PYTHON_VERSION_MAJOR
[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - vcl/inc vcl/unx
vcl/inc/unx/gtk/gtksalmenu.hxx |2 +-
vcl/unx/gtk3/gtk3gtksalmenu.cxx | 22 +++---
2 files changed, 12 insertions(+), 12 deletions(-)
New commits:
commit 5270d6901ba69f411b595fa9e2d123169905ab72
Author: Thomas Viehmann
AuthorDate: Mon Nov 23 21:03:28 2020 +0100
Commit: Caolán McNamara
CommitDate: Wed Nov 25 14:56:33 2020 +0100
tdf#138425 vcl/gtk activate main menu in UpdateFull
VCL GTK (in contrast to X11 and apparently Windows) pre-activates popup
menus in GtkSalMenu::UpdateFull by calling GtkSalMenu::ActivateAllSubmenus.
Before this patch, this, called on the main menu, would not activate
the main menu itself (which does get activated in X11 eventually).
This patch changes the logic to also activate the main menu.
This patch deals only with gtk3. A followup patch would do the analogous
change in the VCL Qt5 plugin in Qt5Menu::DoFullMenuUpdate.
I haven't discovered yet where this type of functionality is currently
tested, so sadly I don't have an idea how to test this and so didn't include
a test case.
Change-Id: I6cd9929acfd3b3af731bbc62d649d643044ca692
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106454
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
(cherry picked from commit cbc18cc904c652a936c4b68fba4d975bd89b5abd)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106583
diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx
index d9aa403de9bd..d4857fe7e87a 100644
--- a/vcl/inc/unx/gtk/gtksalmenu.hxx
+++ b/vcl/inc/unx/gtk/gtksalmenu.hxx
@@ -112,7 +112,7 @@ public:
boolPrepUpdate();
virtual voidUpdate() override; // Update this menu only.
// Update full menu hierarchy from this menu.
-voidUpdateFull () {
ActivateAllSubmenus(mpVCLMenu); Update(); }
+voidUpdateFull () {
ActivateAllSubmenus(mpVCLMenu); }
// Clear ActionGroup and MenuModel from full menu hierarchy
voidClearActionGroupAndMenuModel();
GtkSalMenu* GetTopLevel();
diff --git a/vcl/unx/gtk3/gtk3gtksalmenu.cxx b/vcl/unx/gtk3/gtk3gtksalmenu.cxx
index 195e8ce071d2..72ad6e40d6bd 100644
--- a/vcl/unx/gtk3/gtk3gtksalmenu.cxx
+++ b/vcl/unx/gtk3/gtk3gtksalmenu.cxx
@@ -1205,23 +1205,23 @@ void GtkSalMenu::DispatchCommand(const gchar *pCommand)
void GtkSalMenu::ActivateAllSubmenus(Menu* pMenuBar)
{
-for (GtkSalMenuItem* pSalItem : maItems)
+// We can re-enter this method via the new event loop that gets created
+// in GtkClipboardTransferable::getTransferDataFlavorsAsVector, so use the
InActivateCallback
+// flag to detect that and skip some startup work.
+if (!mbInActivateCallback)
{
-if ( pSalItem->mpSubMenu != nullptr )
+mbInActivateCallback = true;
+pMenuBar->HandleMenuActivateEvent(GetMenu());
+mbInActivateCallback = false;
+for (GtkSalMenuItem* pSalItem : maItems)
{
-// We can re-enter this method via the new event loop that gets
created
-// in GtkClipboardTransferable::getTransferDataFlavorsAsVector, so
use the InActivateCallback
-// flag to detect that and skip some startup work.
-if (!pSalItem->mpSubMenu->mbInActivateCallback)
+if ( pSalItem->mpSubMenu != nullptr )
{
-pSalItem->mpSubMenu->mbInActivateCallback = true;
-
pMenuBar->HandleMenuActivateEvent(pSalItem->mpSubMenu->GetMenu());
-pSalItem->mpSubMenu->mbInActivateCallback = false;
pSalItem->mpSubMenu->ActivateAllSubmenus(pMenuBar);
-pSalItem->mpSubMenu->Update();
-
pMenuBar->HandleMenuDeActivateEvent(pSalItem->mpSubMenu->GetMenu());
}
}
+Update();
+pMenuBar->HandleMenuDeActivateEvent(GetMenu());
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/inc vcl/unx
vcl/inc/unx/gtk/gtksalmenu.hxx |2 +-
vcl/unx/gtk3/gtk3gtksalmenu.cxx | 22 +++---
2 files changed, 12 insertions(+), 12 deletions(-)
New commits:
commit cbc18cc904c652a936c4b68fba4d975bd89b5abd
Author: Thomas Viehmann
AuthorDate: Mon Nov 23 21:03:28 2020 +0100
Commit: Caolán McNamara
CommitDate: Wed Nov 25 10:50:07 2020 +0100
tdf#138425 vcl/gtk activate main menu in UpdateFull
VCL GTK (in contrast to X11 and apparently Windows) pre-activates popup
menus in GtkSalMenu::UpdateFull by calling GtkSalMenu::ActivateAllSubmenus.
Before this patch, this, called on the main menu, would not activate
the main menu itself (which does get activated in X11 eventually).
This patch changes the logic to also activate the main menu.
This patch deals only with gtk3. A followup patch would do the analogous
change in the VCL Qt5 plugin in Qt5Menu::DoFullMenuUpdate.
I haven't discovered yet where this type of functionality is currently
tested, so sadly I don't have an idea how to test this and so didn't include
a test case.
Change-Id: I6cd9929acfd3b3af731bbc62d649d643044ca692
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106454
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx
index d9aa403de9bd..d4857fe7e87a 100644
--- a/vcl/inc/unx/gtk/gtksalmenu.hxx
+++ b/vcl/inc/unx/gtk/gtksalmenu.hxx
@@ -112,7 +112,7 @@ public:
boolPrepUpdate();
virtual voidUpdate() override; // Update this menu only.
// Update full menu hierarchy from this menu.
-voidUpdateFull () {
ActivateAllSubmenus(mpVCLMenu); Update(); }
+voidUpdateFull () {
ActivateAllSubmenus(mpVCLMenu); }
// Clear ActionGroup and MenuModel from full menu hierarchy
voidClearActionGroupAndMenuModel();
GtkSalMenu* GetTopLevel();
diff --git a/vcl/unx/gtk3/gtk3gtksalmenu.cxx b/vcl/unx/gtk3/gtk3gtksalmenu.cxx
index 195e8ce071d2..72ad6e40d6bd 100644
--- a/vcl/unx/gtk3/gtk3gtksalmenu.cxx
+++ b/vcl/unx/gtk3/gtk3gtksalmenu.cxx
@@ -1205,23 +1205,23 @@ void GtkSalMenu::DispatchCommand(const gchar *pCommand)
void GtkSalMenu::ActivateAllSubmenus(Menu* pMenuBar)
{
-for (GtkSalMenuItem* pSalItem : maItems)
+// We can re-enter this method via the new event loop that gets created
+// in GtkClipboardTransferable::getTransferDataFlavorsAsVector, so use the
InActivateCallback
+// flag to detect that and skip some startup work.
+if (!mbInActivateCallback)
{
-if ( pSalItem->mpSubMenu != nullptr )
+mbInActivateCallback = true;
+pMenuBar->HandleMenuActivateEvent(GetMenu());
+mbInActivateCallback = false;
+for (GtkSalMenuItem* pSalItem : maItems)
{
-// We can re-enter this method via the new event loop that gets
created
-// in GtkClipboardTransferable::getTransferDataFlavorsAsVector, so
use the InActivateCallback
-// flag to detect that and skip some startup work.
-if (!pSalItem->mpSubMenu->mbInActivateCallback)
+if ( pSalItem->mpSubMenu != nullptr )
{
-pSalItem->mpSubMenu->mbInActivateCallback = true;
-
pMenuBar->HandleMenuActivateEvent(pSalItem->mpSubMenu->GetMenu());
-pSalItem->mpSubMenu->mbInActivateCallback = false;
pSalItem->mpSubMenu->ActivateAllSubmenus(pMenuBar);
-pSalItem->mpSubMenu->Update();
-
pMenuBar->HandleMenuDeActivateEvent(pSalItem->mpSubMenu->GetMenu());
}
}
+Update();
+pMenuBar->HandleMenuDeActivateEvent(GetMenu());
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
feature request for development, funding, and lessons
To Whom This May Concern, I am really interested in headless LibreOffice, and would like the functionality to be able to both convert docs to pdfs, and pdfs to docs via the command line. I am not sure if this functionality will be added in the next release of LibreOffice. I would like to engage in a conversation if this is a feature that can be funded somehow. Also, I do not know C++, but I would like to learn C++ and how to do LibreOffice development. I would be willing to pay $15 an hour for online lessons. Please let me know if you are interested. Thanks, Tom G. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
GSOC UX Topic Query
The topics 'Styles Inspector' and 'Styles Highlighter' seem interdependent, but if I'm not mistaken, they're treated as mutually exclusive topics for the purpose of GSOC and ergo, If I were to work on the same, I'd be expected to work on either the 'Styles Highlighter' or the 'Styles Inspector' but not both right? ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: antivirusDetection.vbs configure.ac
antivirusDetection.vbs | 30 ++
configure.ac | 40 ++--
2 files changed, 40 insertions(+), 30 deletions(-)
New commits:
commit 8d8f62852a64bd2fcae47a9499406d9167aebf83
Author: Michel Thomas
AuthorDate: Tue Feb 11 21:34:57 2020 +0530
Commit: Mike Kaganski
CommitDate: Wed Feb 12 09:14:03 2020 +0100
tdf#84553 Correctly handle failures while getting a WMI Object.
The output before this patch : checking for active Antivirus software...
C:\cygwin\home\tdf\lode\jenkins\workspace\gerrit_windows\antivirusDetection.vbs(1,
1) (null): 0x8004100E
found
The link for which is :
https://ci.libreoffice.org/job/gerrit_windows/57035/consoleFull
Change-Id: I714442739a8daf132e95b9f6a750aa7abab3561e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88465
Tested-by: Mike Kaganski
Reviewed-by: Mike Kaganski
diff --git a/antivirusDetection.vbs b/antivirusDetection.vbs
index a4e76731f0b6..ad22e267343d 100755
--- a/antivirusDetection.vbs
+++ b/antivirusDetection.vbs
@@ -1,19 +1,25 @@
+On Error Resume Next
Set objWMIService =
GetObject("winmgmts:{impersonationLevel=impersonate}!\\.\root\SecurityCenter2")
-Set installedAntiviruses = objWMIService.ExecQuery("Select * from
AntivirusProduct")
+If objWMIService is Nothing Then
+Wscript.StdOut.Write "NULL"
+Else
+Set installedAntiviruses = objWMIService.ExecQuery("Select * from
AntivirusProduct")
'Iterates through all the antivirus software,retrieved by the WMI
query,present on the system and prints only the ones that are active
'this is done by checking the 12th bit of the productState property of the
antivirus
'if 12th bit is on then it means that the antivirus is in active state
'if 12th bit is off then it is inactive.
'see http://neophob.com/2010/03/wmi-query-windows-securitycenter2/
-count=0
-list=""
-For Each antivirus in installedAntiviruses
-If antivirus.productState And Then 'checking the state of the
12th bit of productState property of the antivirus
-count=count+1
-list=list & VBNewLine & VBtab & "*" & antivirus.displayName
+count=0
+list=""
+For Each antivirus in installedAntiviruses
+If antivirus.productState And Then 'checking the state of the
12th bit of productState property of the antivirus
+count=count+1
+list=list & VBNewLine & VBtab & "*" & antivirus.displayName
+End if
+Next
+If count = 0 Then
+Wscript.StdOut.Write "NOT_FOUND"
+Else
+Wscript.Echo list
End if
-Next
-If count = 0 Then
- Wscript.StdOut.Write "NOT_FOUND"
-Else Wscript.Echo list
-End if
+End if
\ No newline at end of file
diff --git a/configure.ac b/configure.ac
index 615c9f2df8ee..4713f269ccbf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12980,24 +12980,28 @@ dnl
===
if test $_os = WINNT ; then
AC_MSG_CHECKING([for active Antivirus software])
ANTIVIRUS_LIST=`cscript.exe //Nologo $SRC_ROOT/antivirusDetection.vbs`
-if [ [ "$ANTIVIRUS_LIST" != "NOT_FOUND" ] ]; then
-AC_MSG_RESULT([found])
-
EICAR_STRING='X5O!P%@AP@<:@4\PZX54(P^)7CC)7}$EICAR-STANDARD-ANTIVIRUS-TEST-FILE!$H+H*'
-echo $EICAR_STRING > $SRC_ROOT/eicar
-EICAR_TEMP_FILE_CONTENTS=`cat $SRC_ROOT/eicar`
-rm $SRC_ROOT/eicar
-if [ [ "$EICAR_STRING" != "$EICAR_TEMP_FILE_CONTENTS" ] ]; then
-AC_MSG_ERROR([Exclude the build and source directories associated
with LibreOffice in the following Antivirus software: $ANTIVIRUS_LIST])
-fi
-echo $EICAR_STRING > $BUILDDIR/eicar
-EICAR_TEMP_FILE_CONTENTS=`cat $BUILDDIR/eicar`
-rm $BUILDDIR/eicar
-if [ [ "$EICAR_STRING" != "$EICAR_TEMP_FILE_CONTENTS" ] ]; then
-AC_MSG_ERROR([Exclude the build and source directories associated
with LibreOffice in the following Antivirus software: $ANTIVIRUS_LIST])
-fi
-add_warning "To speed up builds and avoid failures in unit tests, it
is highly recommended that you exclude the build and source directories
associated with LibreOffice in the following Antivirus software:
$ANTIVIRUS_LIST"
-else
-AC_MSG_RESULT([not found])
+if [ [ "$ANTIVIRUS_LIST" != "NULL" ] ]; then
+if [ [ "$ANTIVIRUS_LIST" != "NOT_FOUND" ] ]; then
+AC_MSG_RESULT([found])
+
EICAR_STRING='X5O!P%@AP@<:@4\PZX54(P^)7CC)7}$EICAR-STANDARD-ANTIVIRUS-TEST-FILE!$H+H*'
+echo $EICAR_STRING > $SRC_ROOT/eicar
+EICAR_TEMP_FILE_CONTENTS=`cat $SRC_ROOT/eicar`
+rm $SRC_ROOT/eicar
+if [ [ "$EICAR_STR
[Libreoffice-commits] core.git: configure.ac
configure.ac | 15 ++- 1 file changed, 14 insertions(+), 1 deletion(-) New commits: commit a570a6b122125e88629fde990306f525c561284c Author: Michel Thomas AuthorDate: Sat Feb 8 22:17:39 2020 +0530 Commit: Mike Kaganski CommitDate: Mon Feb 10 05:09:45 2020 +0100 tdf#84553 Detection of antivirus exclusion, EICAR test. Change-Id: I3577a361edcc67f85f86ddb75778cd39784b39a0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88269 Reviewed-by: Mike Kaganski Tested-by: Jenkins diff --git a/configure.ac b/configure.ac index 1bccce3578c8..96e2cbc58ae3 100644 --- a/configure.ac +++ b/configure.ac @@ -12982,7 +12982,20 @@ if test $_os = WINNT ; then ANTIVIRUS_LIST=`cscript.exe //Nologo $SRC_ROOT/antivirusDetection.vbs` if [ [ "$ANTIVIRUS_LIST" != "NOT_FOUND" ] ]; then AC_MSG_RESULT([found]) -add_warning "To speed up builds and avoid failures in unit tests, it is highly recommended that you exclude the build directories associated with LibreOffice in the following Antivirus software: $ANTIVIRUS_LIST" + EICAR_STRING='X5O!P%@AP@<:@4\PZX54(P^)7CC)7}$EICAR-STANDARD-ANTIVIRUS-TEST-FILE!$H+H*' +echo $EICAR_STRING > $SRC_ROOT/eicar +EICAR_TEMP_FILE_CONTENTS=`cat $SRC_ROOT/eicar` +rm $SRC_ROOT/eicar +if [ [ "$EICAR_STRING" != "$EICAR_TEMP_FILE_CONTENTS" ] ]; then +AC_MSG_ERROR([Exclude the build and source directories associated with LibreOffice in the following Antivirus software: $ANTIVIRUS_LIST]) +fi +echo $EICAR_STRING > $BUILDDIR/eicar +EICAR_TEMP_FILE_CONTENTS=`cat $BUILDDIR/eicar` +rm $BUILDDIR/eicar +if [ [ "$EICAR_STRING" != "$EICAR_TEMP_FILE_CONTENTS" ] ]; then +AC_MSG_ERROR([Exclude the build and source directories associated with LibreOffice in the following Antivirus software: $ANTIVIRUS_LIST]) +fi +add_warning "To speed up builds and avoid failures in unit tests, it is highly recommended that you exclude the build and source directories associated with LibreOffice in the following Antivirus software: $ANTIVIRUS_LIST" else AC_MSG_RESULT([not found]) fi ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: antivirusDetection.vbs configure.ac
antivirusDetection.vbs | 19 +++
configure.ac | 15 +++
2 files changed, 34 insertions(+)
New commits:
commit c16969b9bc73fdd77e763299d6aea7b614e203e2
Author: Michel Thomas
AuthorDate: Sun Feb 2 01:03:20 2020 +0530
Commit: Mike Kaganski
CommitDate: Sat Feb 8 06:17:03 2020 +0100
tdf#84553 Detect and warn of Windows Antivirus.
Change-Id: I7731cb316306c153ad14bb3d27f39600a44ed9ee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87811
Reviewed-by: Julien Nabet
Tested-by: Jenkins
diff --git a/antivirusDetection.vbs b/antivirusDetection.vbs
new file mode 100755
index ..a4e76731f0b6
--- /dev/null
+++ b/antivirusDetection.vbs
@@ -0,0 +1,19 @@
+Set objWMIService =
GetObject("winmgmts:{impersonationLevel=impersonate}!\\.\root\SecurityCenter2")
+Set installedAntiviruses = objWMIService.ExecQuery("Select * from
AntivirusProduct")
+'Iterates through all the antivirus software,retrieved by the WMI
query,present on the system and prints only the ones that are active
+'this is done by checking the 12th bit of the productState property of the
antivirus
+'if 12th bit is on then it means that the antivirus is in active state
+'if 12th bit is off then it is inactive.
+'see http://neophob.com/2010/03/wmi-query-windows-securitycenter2/
+count=0
+list=""
+For Each antivirus in installedAntiviruses
+If antivirus.productState And Then 'checking the state of the
12th bit of productState property of the antivirus
+count=count+1
+list=list & VBNewLine & VBtab & "*" & antivirus.displayName
+End if
+Next
+If count = 0 Then
+ Wscript.StdOut.Write "NOT_FOUND"
+Else Wscript.Echo list
+End if
diff --git a/configure.ac b/configure.ac
index d4a737aeaeb1..1bccce3578c8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12973,6 +12973,21 @@ fi
AC_SUBST(ENABLE_FORMULA_LOGGER)
+dnl ===
+dnl Checking for active Antivirus software.
+dnl ===
+
+if test $_os = WINNT ; then
+AC_MSG_CHECKING([for active Antivirus software])
+ANTIVIRUS_LIST=`cscript.exe //Nologo $SRC_ROOT/antivirusDetection.vbs`
+if [ [ "$ANTIVIRUS_LIST" != "NOT_FOUND" ] ]; then
+AC_MSG_RESULT([found])
+add_warning "To speed up builds and avoid failures in unit tests, it
is highly recommended that you exclude the build directories associated with
LibreOffice in the following Antivirus software: $ANTIVIRUS_LIST"
+else
+AC_MSG_RESULT([not found])
+fi
+fi
+
dnl ===
dnl Setting up the environment.
dnl ===
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
License Statement
All of my past & future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - sw/qa sw/source
sw/qa/python/check_styles.py| 10 ++
sw/source/core/unocore/unomap1.cxx |2 +-
sw/source/core/unocore/unomapproperties.hxx |2 +-
3 files changed, 12 insertions(+), 2 deletions(-)
New commits:
commit a73959947cc78bc9afc1d8b0216a2ddf7584eb6d
Author: Thomas Viehmann
AuthorDate: Fri Sep 13 11:24:43 2019 +0200
Commit: Michael Stahl
CommitDate: Tue Sep 17 13:30:06 2019 +0200
sw: Mark uno property ParaChapterNumberingLevel as MAYBEVOID
tdf#127534 TextRange.getPropertyValues runs into RuntimeException when
getting all properties form PropertySetinfo
We suspect that the property might be completely unused / useless.
However, removing it might be BC breaking for "buggy" uses of
the property, so this is a lower-risk fix.
Björn helped with great advice, thank you! All errors in the patch
are my own, though.
Change-Id: Ie80b61003de2b8516e458c800531aac951ebc148
Reviewed-on: https://gerrit.libreoffice.org/78865
Tested-by: Jenkins
Reviewed-by: Björn Michaelsen
(cherry picked from commit 2f679fd3e6f46df7cda77eb70a014bcfcac7df52)
Reviewed-on: https://gerrit.libreoffice.org/79052
Reviewed-by: Michael Stahl
diff --git a/sw/qa/python/check_styles.py b/sw/qa/python/check_styles.py
index 8746c479fbbe..cfd8a9e1bec1 100644
--- a/sw/qa/python/check_styles.py
+++ b/sw/qa/python/check_styles.py
@@ -27,6 +27,16 @@ class CheckStyle(unittest.TestCase):
def tearDownClass(cls):
cls._uno.tearDown()
+def test_TextRangeProperties(self):
+xDoc = CheckStyle._uno.openEmptyWriterDoc()
+xBodyText = xDoc.getText()
+xCursor = xBodyText.createTextCursor()
+xBodyText.insertString(xCursor, "Hello world", 0)
+xTextRange = list(xBodyText)[0]
+pnames = [p.Name for p in xTextRange.PropertySetInfo.Properties]
+xTextRange.getPropertyValues(pnames)
+xDoc.dispose()
+
def test_StyleFamilies(self):
xDoc = CheckStyle._uno.openEmptyWriterDoc()
xStyleFamilies = xDoc.StyleFamilies
diff --git a/sw/source/core/unocore/unomap1.cxx
b/sw/source/core/unocore/unomap1.cxx
index f5976ca50a4c..41e2d644f313 100644
--- a/sw/source/core/unocore/unomap1.cxx
+++ b/sw/source/core/unocore/unomap1.cxx
@@ -199,7 +199,7 @@ const SfxItemPropertyMapEntry*
SwUnoPropertyMapProvider::GetAutoParaStyleProper
{ OUString(UNO_NAME_CELL), FN_UNO_CELL,
cppu::UnoType::get(),
PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },
{ OUString(UNO_NAME_TEXT_FRAME), FN_UNO_TEXT_FRAME,
cppu::UnoType::get(),
PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },
{ OUString(UNO_NAME_TEXT_SECTION), FN_UNO_TEXT_SECTION,
cppu::UnoType::get(),
PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },
-{ OUString(UNO_NAME_PARA_CHAPTER_NUMBERING_LEVEL),
FN_UNO_PARA_CHAPTER_NUMBERING_LEVEL,cppu::UnoType::get(),
PROPERTY_NONE, 0},
+{ OUString(UNO_NAME_PARA_CHAPTER_NUMBERING_LEVEL),
FN_UNO_PARA_CHAPTER_NUMBERING_LEVEL,cppu::UnoType::get(),
PropertyAttribute::MAYBEVOID, 0},
{ OUString(UNO_NAME_PARA_CONDITIONAL_STYLE_NAME),
RES_FRMATR_CONDITIONAL_STYLE_NAME,cppu::UnoType::get(),
PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},
{ OUString(UNO_NAME_PARA_IS_NUMBERING_RESTART), FN_NUMBER_NEWSTART,
cppu::UnoType::get(), PropertyAttribute::MAYBEVOID, 0 },
{ OUString(UNO_NAME_OUTLINE_LEVEL), RES_PARATR_OUTLINELEVEL,
cppu::UnoType::get(),PropertyAttribute::MAYBEVOID,
0},
diff --git a/sw/source/core/unocore/unomapproperties.hxx
b/sw/source/core/unocore/unomapproperties.hxx
index 549f97cbee70..f9353e8b6b77 100644
--- a/sw/source/core/unocore/unomapproperties.hxx
+++ b/sw/source/core/unocore/unomapproperties.hxx
@@ -89,7 +89,7 @@
{ OUString(UNO_NAME_TEXT_FRAME), FN_UNO_TEXT_FRAME,
cppu::UnoType::get(),
PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },
\
{ OUString(UNO_NAME_TEXT_SECTION), FN_UNO_TEXT_SECTION,
cppu::UnoType::get(),
PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },
\
{ OUString(UNO_NAME_TEXT_PARAGRAPH), FN_UNO_TEXT_PARAGRAPH,
cppu::UnoType::get(),
PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },
\
-{ OUString(UNO_NAME_PARA_CHAPTER_NUMBERING_LEVEL),
FN_UNO_PARA_CHAPTER_NUMBERING_LEVEL,cppu::UnoType::get(),
PROPERTY_NONE, 0}, \
+{ OUString(UNO_NAME_PARA_CHAPTER_NUMBERING_LEVEL),
FN_UNO_PARA_CHAPTER_NUMBERING_LEVEL,cppu::UnoType::get(),
PropertyAttribute::MAYBEVOID, 0},
\
{ OUString(UNO_NAME_PARA_CONDITIONAL_STYLE_NAME),
FN_UNO_PARA_CONDITIONAL_STYLE_NAME
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/python/check_styles.py| 10 ++
sw/source/core/unocore/unomap1.cxx |2 +-
sw/source/core/unocore/unomapproperties.hxx |2 +-
3 files changed, 12 insertions(+), 2 deletions(-)
New commits:
commit 2f679fd3e6f46df7cda77eb70a014bcfcac7df52
Author: Thomas Viehmann
AuthorDate: Fri Sep 13 11:24:43 2019 +0200
Commit: Michael Stahl
CommitDate: Tue Sep 17 11:59:18 2019 +0200
sw: Mark uno property ParaChapterNumberingLevel as MAYBEVOID
tdf#127534 TextRange.getPropertyValues runs into RuntimeException when
getting all properties form PropertySetinfo
We suspect that the property might be completely unused / useless.
However, removing it might be BC breaking for "buggy" uses of
the property, so this is a lower-risk fix.
Björn helped with great advice, thank you! All errors in the patch
are my own, though.
Change-Id: Ie80b61003de2b8516e458c800531aac951ebc148
Reviewed-on: https://gerrit.libreoffice.org/78865
Tested-by: Jenkins
Reviewed-by: Björn Michaelsen
diff --git a/sw/qa/python/check_styles.py b/sw/qa/python/check_styles.py
index 8746c479fbbe..cfd8a9e1bec1 100644
--- a/sw/qa/python/check_styles.py
+++ b/sw/qa/python/check_styles.py
@@ -27,6 +27,16 @@ class CheckStyle(unittest.TestCase):
def tearDownClass(cls):
cls._uno.tearDown()
+def test_TextRangeProperties(self):
+xDoc = CheckStyle._uno.openEmptyWriterDoc()
+xBodyText = xDoc.getText()
+xCursor = xBodyText.createTextCursor()
+xBodyText.insertString(xCursor, "Hello world", 0)
+xTextRange = list(xBodyText)[0]
+pnames = [p.Name for p in xTextRange.PropertySetInfo.Properties]
+xTextRange.getPropertyValues(pnames)
+xDoc.dispose()
+
def test_StyleFamilies(self):
xDoc = CheckStyle._uno.openEmptyWriterDoc()
xStyleFamilies = xDoc.StyleFamilies
diff --git a/sw/source/core/unocore/unomap1.cxx
b/sw/source/core/unocore/unomap1.cxx
index 08d9d1e49943..1cc12a5cb170 100644
--- a/sw/source/core/unocore/unomap1.cxx
+++ b/sw/source/core/unocore/unomap1.cxx
@@ -200,7 +200,7 @@ const SfxItemPropertyMapEntry*
SwUnoPropertyMapProvider::GetAutoParaStyleProper
{ OUString(UNO_NAME_CELL), FN_UNO_CELL,
cppu::UnoType::get(),
PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },
{ OUString(UNO_NAME_TEXT_FRAME), FN_UNO_TEXT_FRAME,
cppu::UnoType::get(),
PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },
{ OUString(UNO_NAME_TEXT_SECTION), FN_UNO_TEXT_SECTION,
cppu::UnoType::get(),
PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },
-{ OUString(UNO_NAME_PARA_CHAPTER_NUMBERING_LEVEL),
FN_UNO_PARA_CHAPTER_NUMBERING_LEVEL,cppu::UnoType::get(),
PROPERTY_NONE, 0},
+{ OUString(UNO_NAME_PARA_CHAPTER_NUMBERING_LEVEL),
FN_UNO_PARA_CHAPTER_NUMBERING_LEVEL,cppu::UnoType::get(),
PropertyAttribute::MAYBEVOID, 0},
{ OUString(UNO_NAME_PARA_CONDITIONAL_STYLE_NAME),
RES_FRMATR_CONDITIONAL_STYLE_NAME,cppu::UnoType::get(),
PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},
{ OUString(UNO_NAME_PARA_IS_NUMBERING_RESTART), FN_NUMBER_NEWSTART,
cppu::UnoType::get(), PropertyAttribute::MAYBEVOID, 0 },
// TODO add RES_PARATR_LIST_AUTOFMT?
diff --git a/sw/source/core/unocore/unomapproperties.hxx
b/sw/source/core/unocore/unomapproperties.hxx
index aafe8263afbf..c3a7c0c22fb0 100644
--- a/sw/source/core/unocore/unomapproperties.hxx
+++ b/sw/source/core/unocore/unomapproperties.hxx
@@ -89,7 +89,7 @@
{ OUString(UNO_NAME_TEXT_FRAME), FN_UNO_TEXT_FRAME,
cppu::UnoType::get(),
PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },
\
{ OUString(UNO_NAME_TEXT_SECTION), FN_UNO_TEXT_SECTION,
cppu::UnoType::get(),
PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },
\
{ OUString(UNO_NAME_TEXT_PARAGRAPH), FN_UNO_TEXT_PARAGRAPH,
cppu::UnoType::get(),
PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },
\
-{ OUString(UNO_NAME_PARA_CHAPTER_NUMBERING_LEVEL),
FN_UNO_PARA_CHAPTER_NUMBERING_LEVEL,cppu::UnoType::get(),
PROPERTY_NONE, 0}, \
+{ OUString(UNO_NAME_PARA_CHAPTER_NUMBERING_LEVEL),
FN_UNO_PARA_CHAPTER_NUMBERING_LEVEL,cppu::UnoType::get(),
PropertyAttribute::MAYBEVOID, 0},
\
{ OUString(UNO_NAME_PARA_CONDITIONAL_STYLE_NAME),
FN_UNO_PARA_CONDITIONAL_STYLE_NAME, cppu::UnoType::get(),
PropertyAttribute::READONLY, 0},
\
{ OUString(UNO_NAME_LIST_ID), FN_UNO_LIST_ID,
cppu::UnoType::get(), PropertyAttribute::MAYBEVOID, 0}, \
{ OUString(UNO_NAME_PARA_IS_NUMBERING_RESTART)
Re: Converting Python Tuples / Lists into Any in PyUNO
Hello Stephan,
thank you for weighing in!
On 16/05/2019 09:20, Stephan Bergmann wrote:
On 15/05/2019 15:27, Thomas Viehmann wrote:
but that isn't really what this is about, it's about what sequence
types are expected when an any is passed.
My intuition would be that the more specific type is better when
applicable, but I would value your input whether such a change would
be considered an improvement.
There is no "better" or "worse" here, just "right" or "wrong".
In terms of calling the UNO method, I agree. However, I would venture
"better" binding API would be one that offers fewer surprises which is
where I don't see this as great.
That is, the PyUno language binding had to make a choice how to e.g. map
a Python tuple of strings into a UNOIDL any value. It may be debatable
whether the current choice (apparently mapping to a sequence
instead of, say, a sequence) is useful. Be aware that revising
that choice is an incompatible change. It may make writing certain
Python code more intuitive, but at the same time it may break existing
code.
Yeah, well, to me it looks like this was potentially done by accident
because reducing the sequence conversion to item conversion is very
attractive to the one implementing this API but the resulting API is
maybe less attractive to the one using it.
To move this forward or abandon:
0. I had half hoped that someone would step in and say that needing to
pass a sequence of Any wrapped in a single Any to an interface is a rare
thing.
1. If we were to form the opinion that not that many extension will be
impacted, would this be changeable or do we prefer to not apply breaking
changes at any rate?
2. If 1. is yes, would investigating github projects featuring "import
uno" and checking whether and how they use "Any" interfaces be an OKish
assessment method?
3. Independent of 1 and 2, maybe it would be a good idea to accept
constructed Any values when the UNOIDL signature demands Any to avoid
having to go through uno.invoke. I think having to spell Any("[]String",
...) instead of ... is still much better than going through invoke. Also
it might be nice to annotate known cases of needing to do this for
Python in the API docs.
Best regards
Thomas
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice
Converting Python Tuples / Lists into Any in PyUNO
Hello, currently, the PyUNO bridge converts tuples and lists by converting each element to Any and then constructing a list of []Any. This is not what many functions expect and leads to a suboptimal experience, e.g. when using XPropertySet.setPropertyValue: https://forum.openoffice.org/en/forum/viewtopic.php?t=56460 https://bugs.documentfoundation.org/show_bug.cgi?id=125307 A lazy grep through the sdk/idl gives 80 uses of []Any ( rgrep 'sequence< *any' sdk/idl | wc -l ) 220 uses of []String ( rgrep 'sequence< *string' sdk/idl | wc -l ) but that isn't really what this is about, it's about what sequence types are expected when an any is passed. My intuition would be that the more specific type is better when applicable, but I would value your input whether such a change would be considered an improvement. Best regards Thomas ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Writer Table Columns Access via Java API
Hey Andy, is is not a bug... the use of writer tables is a little bit different. the width of a column is not an absolute value, but will be calculated in realitionship to the width of the table itself. And the width of the table depends on width of your page, textarea and right/left margins. so... to change the width of a table-column you need to know a lot of values and then you can calulate the width of your table istself (a texttable will be always expand over the hole width of the textarea minus left and right margin (if set). Column-width will be specified in the struct com.sun.star.text.TableColumnSeperator - the array will define all tableseperators as value based on the total width of the table itself. For example: your textarea may have a width of 14 cm. Your table should have a width of 10 cm. So you define a magin left and right of 2 cm. Now your table will have two colums --- first column should be 3 cm, second column is now 7 cm. Your array TableColumnSeperator needs one element - starting from beginning of table the entry will have the value 3/10*1 = 3000. so, always starting from beginning of the table, the width of the Table is always 1 (abstarct number, means maybe 100%). The total width is 10 cm (calculate before), you need 3 cm --so you get: 3/10 * 1 - position of your column-seperator. it is a little bit complicated and I do not have an code-example in java or ruby, only a german-based basic example. But I hope, you get some hints so you can search for more informations. Best regards Thomas Am 06.05.2019 um 11:00 schrieb fxruby: Hello, I'm currently writing a program using the libreoffice java api. It's a programm controlling the Writer component. I can insert tables, place images inside the table and also change the height of table rows. Now I want to change the width of a table column. But when I try to get a column, I always get an empty object. Here's what I do (it's JRuby code, but very similar to java): [...] Is this a bug or what am I doing wrong? kind regards, Andy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - pyuno/source
pyuno/source/loader/pythonloader.py |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 71295a9d41a4e0f8b01c74ebf586fc2c15babfd2 Author: Thomas Viehmann AuthorDate: Mon Apr 1 09:34:20 2019 +0200 Commit: Thorsten Behrens CommitDate: Tue Apr 2 12:15:01 2019 +0200 For Python extensions, set __file__ before executing the module Previously __file__ was set after executing the module. This meant, however that it was not available during execution. This patch moves setting __file__ before the execution. As __file__ is a string (and not bytes), we remove the encoding. Change-Id: I63fe34b6f5d30f53aab16627d413c87b9de81992 Reviewed-on: https://gerrit.libreoffice.org/70048 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt (cherry picked from commit dbbf20a4b40916ca4f5c98f18827ede39ad7a828) Reviewed-on: https://gerrit.libreoffice.org/70119 Reviewed-by: Thorsten Behrens diff --git a/pyuno/source/loader/pythonloader.py b/pyuno/source/loader/pythonloader.py index ddb9001fc0e6..268cb168fe3c 100644 --- a/pyuno/source/loader/pythonloader.py +++ b/pyuno/source/loader/pythonloader.py @@ -100,8 +100,8 @@ class Loader( XImplementationLoader, XServiceInfo, unohelper.Base ): # compile and execute the module codeobject = compile( src, encfile(filename), "exec" ) +mod.__file__ = filename exec(codeobject, mod.__dict__) -mod.__file__ = encfile(filename) g_loadedComponents[url] = mod return mod elif "vnd.openoffice.pymodule" == protocol: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: pyuno/source
pyuno/source/loader/pythonloader.py |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit dbbf20a4b40916ca4f5c98f18827ede39ad7a828 Author: Thomas Viehmann AuthorDate: Mon Apr 1 09:34:20 2019 +0200 Commit: Samuel Mehrbrodt CommitDate: Tue Apr 2 09:22:03 2019 +0200 For Python extensions, set __file__ before executing the module Previously __file__ was set after executing the module. This meant, however that it was not available during execution. This patch moves setting __file__ before the execution. As __file__ is a string (and not bytes), we remove the encoding. Change-Id: I63fe34b6f5d30f53aab16627d413c87b9de81992 Reviewed-on: https://gerrit.libreoffice.org/70048 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt diff --git a/pyuno/source/loader/pythonloader.py b/pyuno/source/loader/pythonloader.py index ddb9001fc0e6..268cb168fe3c 100644 --- a/pyuno/source/loader/pythonloader.py +++ b/pyuno/source/loader/pythonloader.py @@ -100,8 +100,8 @@ class Loader( XImplementationLoader, XServiceInfo, unohelper.Base ): # compile and execute the module codeobject = compile( src, encfile(filename), "exec" ) +mod.__file__ = filename exec(codeobject, mod.__dict__) -mod.__file__ = encfile(filename) g_loadedComponents[url] = mod return mod elif "vnd.openoffice.pymodule" == protocol: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: no pagenumbers on a specific number of first pages
hello and thank you for your answers. i am familiar with the way to achieve the formerly described document style. i wanted to bring it to the attention of the developers that it is completely non intuitive that a page break inserted with ctrl-return is not sufficient to apply a page style from the sidebar why is it possible to select a page format template from the sidebar in the first place when the only template that can be applied this way is the "first page" template to the first page of the document. all the other templates applied to any other page will be used for the whole document - no matter what. inserting manual pagebreaks via the paragraph context menu or the insert menu while defining the template for the following page renders the reconfiguration of a finished document almost impossible without a lot of cut n paste work. it could be an easy task right from the sidebar. it should be possible to define a page template from there for every page in the document and allow to configure pagenumbers imho. cheers thomas On Thu, Feb 7, 2019 at 5:45 PM Thomas Weissel wrote: > helo everybody, > i'm a teacher and a lot of students come to me with their it problems.. > > one of them comes up every year when they have to deliver and print their > first pre-scientific work. > > it seems to be very very hard to get libre office to not display page > numbers on the first page and the abstract and the table of contents. > > applying site templates like "erste seite" or "verzeichnis" seems to work > in avery unpredictable way even if proper manual site breaks are in > place.. sometimes it removes the footer on all pages, sometimes on every > second page and most of the time it sets the template either for the page > after the current page or for the page before.. > > > i figured out a way to get it done but it is very unituitive > also getting the page numbers to start with nr.1 on page 4 is not > something an everyday user would ever be able figure out . > > > what is the proposed way to get this done.. could you consider reworking > that specific part .. thousands of students in austria need this every > year.. so it would be nice to have an intuitive easy way to get this done > and help with the adoption of libre office > > setting page templates seems a bit buggy too but thats probably because we > are "holding it wrong" > > thanks in advance > thomas > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
no pagenumbers on a specific number of first pages
helo everybody, i'm a teacher and a lot of students come to me with their it problems.. one of them comes up every year when they have to deliver and print their first pre-scientific work. it seems to be very very hard to get libre office to not display page numbers on the first page and the abstract and the table of contents. applying site templates like "erste seite" or "verzeichnis" seems to work in avery unpredictable way even if proper manual site breaks are in place.. sometimes it removes the footer on all pages, sometimes on every second page and most of the time it sets the template either for the page after the current page or for the page before.. i figured out a way to get it done but it is very unituitive also getting the page numbers to start with nr.1 on page 4 is not something an everyday user would ever be able figure out . what is the proposed way to get this done.. could you consider reworking that specific part .. thousands of students in austria need this every year.. so it would be nice to have an intuitive easy way to get this done and help with the adoption of libre office setting page templates seems a bit buggy too but thats probably because we are "holding it wrong" thanks in advance thomas ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: desktop/scripts svx/source
desktop/scripts/soffice.sh |7 ++-
desktop/scripts/unopkg.sh |6 +-
svx/source/gengal/gengal.sh |6 +-
3 files changed, 16 insertions(+), 3 deletions(-)
New commits:
commit 8db53bfd74e48f60e3002b2ae5f7f13c9387725a
Author: Thomas Klausner
Date: Mon Jun 25 23:42:44 2018 +0200
Fix "javaPathHelper: not found" errors during startup.
javaPathHelper is a tool from OpenBSD ports, so there is no point
looking for it on other operating systems.
Change-Id: I763d717fdf7172b412d527fcd88347b2e54a8fe9
diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh
index 5c76b6e2211d..df295cb76250 100755
--- a/desktop/scripts/soffice.sh
+++ b/desktop/scripts/soffice.sh
@@ -141,7 +141,7 @@ if echo "$checks" | grep -q "cc" ; then
fi
case "$(uname -s)" in
-NetBSD|OpenBSD|DragonFly)
+OpenBSD)
# this is a temporary hack until we can live with the default search paths
LD_LIBRARY_PATH="$sd_prog${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
JAVA_HOME=$(javaPathHelper -h libreoffice-java 2> /dev/null)
@@ -150,6 +150,11 @@ NetBSD|OpenBSD|DragonFly)
export JAVA_HOME
fi
;;
+NetBSD|DragonFly)
+# this is a temporary hack until we can live with the default search paths
+LD_LIBRARY_PATH="$sd_prog${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
+export LD_LIBRARY_PATH
+;;
AIX)
LIBPATH="$sd_prog${LIBPATH:+:$LIBPATH}"
export LIBPATH
diff --git a/desktop/scripts/unopkg.sh b/desktop/scripts/unopkg.sh
index 83068d29d35e..3adf69c2e56e 100755
--- a/desktop/scripts/unopkg.sh
+++ b/desktop/scripts/unopkg.sh
@@ -37,7 +37,7 @@ cd "$sd_cwd" || exit $?
# this is a temporary hack until we can live with the default search paths
case "$(uname -s)" in
-NetBSD|OpenBSD|FreeBSD|DragonFly)
+OpenBSD)
LD_LIBRARY_PATH="$sd_prog${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}"
JAVA_HOME=$(javaPathHelper -h libreoffice-java 2> /dev/null)
export LD_LIBRARY_PATH
@@ -45,6 +45,10 @@ NetBSD|OpenBSD|FreeBSD|DragonFly)
export JAVA_HOME
fi
;;
+NetBSD|FreeBSD|DragonFly)
+LD_LIBRARY_PATH="$sd_prog${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}"
+export LD_LIBRARY_PATH
+;;
AIX)
LIBPATH="$sd_prog${LIBPATH:+:${LIBPATH}}"
export LIBPATH
diff --git a/svx/source/gengal/gengal.sh b/svx/source/gengal/gengal.sh
index b4d10458650a..3970ab1fa9c8 100755
--- a/svx/source/gengal/gengal.sh
+++ b/svx/source/gengal/gengal.sh
@@ -35,7 +35,7 @@ cd "$sd_cwd"
# this is a temporary hack until we can live with the default search paths
case "$(uname -s)" in
-NetBSD|OpenBSD|FreeBSD|DragonFly)
+OpenBSD)
LD_LIBRARY_PATH=$sd_prog${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
JAVA_HOME=$(javaPathHelper -h libreoffice-java 2> /dev/null)
export LD_LIBRARY_PATH
@@ -43,6 +43,10 @@ NetBSD|OpenBSD|FreeBSD|DragonFly)
export JAVA_HOME
fi
;;
+NetBSD|FreeBSD|DragonFly)
+LD_LIBRARY_PATH=$sd_prog${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
+export LD_LIBRARY_PATH
+;;
AIX)
LIBPATH=$sd_prog${LIBPATH:+:${LIBPATH}}
export LIBPATH
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: How to check Uno objects types with Basic macro ?
Hey Patrick,
to check, if a basic object is a document section, you can check, if the
object supports the according service.. for example:
if oObj.supportsService("com.sun.star.text.TextSection") then ' is a
text section
a little bit different is this, if you have a cursor-object and want to
know, if this is a test section. in this case you have to check, if the
object (textSection) is not empty.
regarding some literature:
try Andrew Pitonyak´s "Makro explainen" document - > find it here:
http://www.pitonyak.org/oo.php
the best free paper :)
In Germany you can use my book: "Makro Grundlagen
LibreOffice/OpenOffice" see www.tintal.de
Best regards
Thomas
Am 21.12.2017 um 08:19 schrieb Patrick Gelin:
Hi,
I'm using basic macros with LibreOffice 5.4.2.2. I would like to check that
a basic Object is a document Section. I find out XTypeProvider interface
<http://www.openoffice.org/api/docs/common/ref/com/sun/star/lang/XTypeProvider.html#getTypes>
, but no exemples hjow to use it. I've never use UNO interface, so could
anybody send me a OOo Basic snippet code to show how to do ?
By the way, do you know a good book/PDF to download about UNO interface
and/or IDL language ?
Thank you !
Patrick
--
Sent from: http://nabble.documentfoundation.org/Dev-f1639786.html
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'private/swe/libreoffice-5-2+backports' - writerfilter/source
writerfilter/source/rtftok/rtfdispatchdestination.cxx | 24 +++---
writerfilter/source/rtftok/rtfdocumentimpl.cxx|2 -
2 files changed, 4 insertions(+), 22 deletions(-)
New commits:
commit ca968bd93f8b80da013c70a18f09e05cc30f1495
Author: Thomas Beck <thomas.b...@cib.de>
Date: Thu Dec 14 09:41:56 2017 +0100
related tdf#108947 - fix further issues in 5.2 branch
Change-Id: Ibecd30aac458d56dc98ca5c3ef39a4f4b275e2d6
diff --git a/writerfilter/source/rtftok/rtfdispatchdestination.cxx
b/writerfilter/source/rtftok/rtfdispatchdestination.cxx
index 1714434df331..1478ff5ce5ae 100644
--- a/writerfilter/source/rtftok/rtfdispatchdestination.cxx
+++ b/writerfilter/source/rtftok/rtfdispatchdestination.cxx
@@ -210,18 +210,10 @@ RTFError RTFDocumentImpl::dispatchDestination(RTFKeyword
nKeyword)
}
break;
case RTF_HEADERL:
-if (!m_hasLHeader)
-{
-nId = NS_ooxml::LN_headerl;
-m_hasLHeader = true;
-}
+nId = NS_ooxml::LN_headerl;
break;
case RTF_HEADERR:
-if (!m_hasRHeader)
-{
-nId = NS_ooxml::LN_headerr;
-m_hasRHeader = true;
-}
+nId = NS_ooxml::LN_headerr;
break;
case RTF_HEADERF:
if (!m_hasFHeader)
@@ -231,18 +223,10 @@ RTFError RTFDocumentImpl::dispatchDestination(RTFKeyword
nKeyword)
}
break;
case RTF_FOOTERL:
-if (!m_hasLFooter)
-{
-nId = NS_ooxml::LN_footerl;
-m_hasLFooter = true;
-}
+nId = NS_ooxml::LN_footerl;
break;
case RTF_FOOTERR:
-if (!m_hasRFooter)
-{
-nId = NS_ooxml::LN_footerr;
-m_hasRFooter = true;
-}
+nId = NS_ooxml::LN_footerr;
break;
case RTF_FOOTERF:
if (!m_hasFFooter)
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 571c2d83ac54..4d16fbe8c9f3 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -640,8 +640,6 @@ void RTFDocumentImpl::sectBreak(bool bFinal)
{
m_hasFHeader = false;
m_hasRHeader = false;
-m_hasLHeader = false;
-m_hasLFooter = false;
m_hasRFooter = false;
m_hasFFooter = false;
Mapper().endSectionGroup();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/swe/libreoffice-5-2+backports' - shell/source
shell/source/win32/SysShExec.cxx | 22 ++
1 file changed, 22 insertions(+)
New commits:
commit 21b490dbdfa2b7479b84dc7640ec239d6b700058
Author: Thomas Beck <thomas.b...@cib.de>
Date: Wed May 3 12:57:11 2017 +0200
tdf#107587 Opening Hyperlink opens Browser in Background.
Added neccessary WinAPI calls to bring called window into the
Foreground.
Change-Id: I080968f655e2230d1a514b3ef91bf916d904d844
Reviewed-on: https://gerrit.libreoffice.org/37196
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
(cherry picked from commit ad711bc6e2cc35c2ed114fff15008d5bbcfcf21c)
Reviewed-on: https://gerrit.libreoffice.org/45369
Tested-by: Thorsten Behrens <thorsten.behr...@cib.de>
diff --git a/shell/source/win32/SysShExec.cxx b/shell/source/win32/SysShExec.cxx
index 55cbb90a5782..70c694749b66 100644
--- a/shell/source/win32/SysShExec.cxx
+++ b/shell/source/win32/SysShExec.cxx
@@ -333,6 +333,28 @@ void SAL_CALL CSysShExec::execute( const OUString&
aCommand, const OUString& aPa
static_cast< XSystemShellExecute* >(this),
psxErr);
}
+else
+{
+// Get Permission make changes to the Window of the created Process
+HWND procHandle = 0;
+DWORD procId = GetProcessId(sei.hProcess);
+AllowSetForegroundWindow(procId);
+
+// Get the handle of the created Window
+DWORD check = 0;
+GetWindowThreadProcessId(procHandle, );
+SAL_WARN_IF(check != procId, "shell", "Could not get handle of process
called by shell.");
+
+// Move created Window into the foreground
+if(procHandle != 0)
+{
+SetForegroundWindow(procHandle);
+SetActiveWindow(procHandle);
+}
+}
+
+// Close the handle for the created childprocess when we are done
+CloseHandle(sei.hProcess);
}
// XServiceInfo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/swe/libreoffice-5-2+backports' - 8 commits - cui/source cui/uiconfig officecfg/registry sc/sdi sc/source sw/qa sw/source vcl/source
Rebased ref, commits from common ancestor:
commit 25fd3cdb8670e042d8095fed85cf446978a62b19
Author: Thomas Beck <thomas.b...@cib.de>
Date: Mon Nov 13 14:11:36 2017 +0100
tdf#108947 Added Unittest.
Added different branches for Windows/Linux because of differences in
linebreaks. Recommit with ifdef guard for preventing tinderbox failure
Reviewed-on: https://gerrit.libreoffice.org/44677
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
Conflicts:
sw/qa/extras/rtfimport/rtfimport.cxx
Change-Id: I08c45e3e653990a47a85aee6f63f063b2f9385a7
diff --git a/sw/qa/extras/rtfimport/data/tdf108947.rtf
b/sw/qa/extras/rtfimport/data/tdf108947.rtf
new file mode 100755
index ..77c2418705d5
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/tdf108947.rtf
@@ -0,0 +1,113 @@
+{\rtf1\ansi\ansicpg1252\deff0
+{\fonttbl
+{\f0\fnil\fcharset0\fprq0\fttruetype Tahoma;}
+{\f1\fnil\fcharset0\fprq0\fttruetype NULL;}
+{\f2\fnil\fcharset0\fprq0\fttruetype Dingbats;}
+{\f3\fnil\fcharset0\fprq0\fttruetype Symbol;}
+{\f4\fnil\fcharset0\fprq0\fttruetype Arial;}
+{\f5\fnil\fcharset0\fprq0\fttruetype Times New Roman;}
+{\f6\fnil\fcharset0\fprq0\fttruetype Courier New;}}
+{\colortbl
+\red0\green0\blue0;
+\red255\green255\blue255;}
+{\stylesheet
+{\s34\fi-431\li720 Tick List;}
+{\s21\fi-431\li720\sbasedon23 Lower Roman List;}
+{\s25\tx431\sbasedon15\snext23 Numbered Heading 1;}
+{\s26\tx431\sbasedon16\snext23 Numbered Heading 2;}
+{\s7\fi-431\li720 Diamond List;}
+{\*\cs9\sbasedon23 Endnote Text;}
+{\s10\tqc\tx4320\tqc\tx8640\f5\fs24\lang4105\sbasedon23\snext10 Footer;}
+{\s22\f5\fs20\lang0\snext22 No List;}
+{\s27\tx431\sbasedon17\snext23 Numbered Heading 3;}
+{\s28\fi-431\li720 Numbered List;}
+{\*\cs8\fs20\super Endnote Reference;}
+{\s14\tqc\tx4320\tqc\tx8640\f5\fs24\lang4105\sbasedon23\snext14 Header;}
+{\s4\tx1584\sbasedon25\snext23 Chapter Heading;}
+{\*\cs6\f5\fs20\lang0 Default Paragraph Font;}
+{\s31\fi-431\li720 Square List;}
+{\s5\fi-431\li720 Dashed List;}
+{\s37\fi-431\li720\sbasedon28 Upper Roman List;}
+{\s18\fi-431\li720 Heart List;}
+{\s24\sb100\f4\fs20\lang1033\sbasedon23\snext24 Normal (Web);}
+{\s3\fi-431\li720 Bullet List;}
+{\s13\fi-431\li720 Hand List;}
+{\*\cs12\fs20\sbasedon23 Footnote Text;}
+{\s15\sb440\sa60\f4\fs34\b\sbasedon23\snext23 Heading 1;}
+{\s16\sb440\sa60\f4\fs28\b\sbasedon23\snext23 Heading 2;}
+{\s17\sb440\sa60\f4\fs24\b\sbasedon23\snext23 Heading 3;}
+{\s33\f5\fs20\lang0\snext33 Table Normal;}
+{\s23\f5\fs24\lang4105\snext23 Normal;}
+{\s20\fi-431\li720\sbasedon28 Lower Case List;}
+{\s1\li1440\ri1440\sa120\sbasedon23 Block Text;}
+{\s36\fi-431\li720\sbasedon28 Upper Case List;}
+{\*\cs11\fs20\super Footnote Reference;}
+{\s30\tx1584\sbasedon25\snext23 Section Heading;}
+{\s19\fi-431\li720 Implies List;}
+{\s2\fi-431\li720 Box List;}
+{\s32\fi-431\li720 Star List;}
+{\s29\f6\sbasedon23 Plain Text;}
+{\s35\fi-431\li720 Triangle List;}}
+\kerning0\cf0\ftnbj\fet2\ftnstart1\ftnnar\aftnnar\ftnstart1\facingp\titlepg{\info}\deftab720\viewkind1\paperw12240\paperh15840\margl1440\margr1440\widowctl
+{\headerl\pard\plain
+\pard\plain\ltrpar\ql\s14\itap0\tqc\tx4320\tqc\tx8640{\f0\fs24\lang4105{\*\listtag0}
+\par}\pard\plain\ltrpar\ql\s23\itap0\par}{\f5\fs24\lang4105{\*\listtag0}}
+\sectd\sbknone\colsx360\marglsxn1800\margrsxn1800\pgncont\ltrsect
+\pard\plain\ltrpar\qc\s23\itap0{\f0\fs24\ul\lang4105{\*\listtag0}\abinodiroverride\ltrch
Sublet Agreement}
+\par\pard\plain\ltrpar\ql\s23\itap0{\f0\fs24\lang4105{\*\listtag0}\abinodiroverride\ltrch
Between}
+\par\pard\plain\ltrpar\ql\s23\itap0{\f0\fs24\lang4105{\*\listtag0}
+\par}\pard\plain\ltrpar\ql\s23\itap0{\f0\fs24\ul\lang4105{\*\listtag0}\abinodiroverride\ltrch
Joe Drew}{\f0\fs24\lang4105{\*\listtag0}\line (Hereinafter called the "TENANT"
of the first part).\line }
+\par\pard\plain\ltrpar\ql\s23\itap0{\f0\fs24\lang4105{\*\listtag0}\abinodiroverride\ltrch
And}
+\par\pard\plain\ltrpar\ql\s23\itap0{\f0\fs24\lang4105{\*\listtag0}\abinodiroverride\ltrch
\line }{\f0\fs24\ul\lang4105{\*\listtag0}John
Horn}{\f0\fs24\lang4105{\*\listtag0} }
+\par\pard\plain\ltrpar\ql\s23\itap0{\f0\fs24\lang4105{\*\listtag0}\abinodiroverride\ltrch
(Hereinafter called the "SUBTENANT" of the second part).\line \line The TENANT
hereby agrees to rent to the SUBTENANT and the SUBTENANT agrees to rent from
the TENANT the premises being:}
+\par\pard\plain\ltrpar\ql\s23\itap0{\f0\fs24\lang4105{\*\listtag0}
+\par}\pard\plain\ltrpar\ql\s23\itap0{\f0\fs24\ul\lang4105{\*\listtag0}\abinodiroverride\ltrch
511 Albert Street, Unit 111, Waterloo ON Canada N2L 5A7}
+\par\pard\plain\ltrpar\ql\s23\itap0{\f0\fs24\lang4105{\*\listtag0}
+\par}\pard\plain\ltrpar\ql\s23\itap0{\f0\fs24\lang4105{\*\listtag0}\abinodiroverride\ltrch
(hereinafter referred to as the \uc1\u8220\'93the premises\uc1\u8221\'94)
situated in the Municipality of Waterloo, said
[Libreoffice-commits] core.git: Branch 'private/swe/libreoffice-5-2+backports' - sw/qa
sw/qa/extras/rtfimport/data/tdf108947.rtf | 113 ++
sw/qa/extras/rtfimport/rtfimport.cxx | 21 +
2 files changed, 134 insertions(+)
New commits:
commit 54faa2a6f98b0fc8e7dad9673a63f00495b1c5f4
Author: Thomas Beck <thomas.b...@cib.de>
Date: Mon Nov 13 14:11:36 2017 +0100
tdf#108947 Added Unittest.
Added different branches for Windows/Linux because of differences in
linebreaks. Recommit with ifdef guard for preventing tinderbox failure
Reviewed-on: https://gerrit.libreoffice.org/44677
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
Conflicts:
sw/qa/extras/rtfimport/rtfimport.cxx
Change-Id: I08c45e3e653990a47a85aee6f63f063b2f9385a7
diff --git a/sw/qa/extras/rtfimport/data/tdf108947.rtf
b/sw/qa/extras/rtfimport/data/tdf108947.rtf
new file mode 100755
index ..77c2418705d5
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/tdf108947.rtf
@@ -0,0 +1,113 @@
+{\rtf1\ansi\ansicpg1252\deff0
+{\fonttbl
+{\f0\fnil\fcharset0\fprq0\fttruetype Tahoma;}
+{\f1\fnil\fcharset0\fprq0\fttruetype NULL;}
+{\f2\fnil\fcharset0\fprq0\fttruetype Dingbats;}
+{\f3\fnil\fcharset0\fprq0\fttruetype Symbol;}
+{\f4\fnil\fcharset0\fprq0\fttruetype Arial;}
+{\f5\fnil\fcharset0\fprq0\fttruetype Times New Roman;}
+{\f6\fnil\fcharset0\fprq0\fttruetype Courier New;}}
+{\colortbl
+\red0\green0\blue0;
+\red255\green255\blue255;}
+{\stylesheet
+{\s34\fi-431\li720 Tick List;}
+{\s21\fi-431\li720\sbasedon23 Lower Roman List;}
+{\s25\tx431\sbasedon15\snext23 Numbered Heading 1;}
+{\s26\tx431\sbasedon16\snext23 Numbered Heading 2;}
+{\s7\fi-431\li720 Diamond List;}
+{\*\cs9\sbasedon23 Endnote Text;}
+{\s10\tqc\tx4320\tqc\tx8640\f5\fs24\lang4105\sbasedon23\snext10 Footer;}
+{\s22\f5\fs20\lang0\snext22 No List;}
+{\s27\tx431\sbasedon17\snext23 Numbered Heading 3;}
+{\s28\fi-431\li720 Numbered List;}
+{\*\cs8\fs20\super Endnote Reference;}
+{\s14\tqc\tx4320\tqc\tx8640\f5\fs24\lang4105\sbasedon23\snext14 Header;}
+{\s4\tx1584\sbasedon25\snext23 Chapter Heading;}
+{\*\cs6\f5\fs20\lang0 Default Paragraph Font;}
+{\s31\fi-431\li720 Square List;}
+{\s5\fi-431\li720 Dashed List;}
+{\s37\fi-431\li720\sbasedon28 Upper Roman List;}
+{\s18\fi-431\li720 Heart List;}
+{\s24\sb100\f4\fs20\lang1033\sbasedon23\snext24 Normal (Web);}
+{\s3\fi-431\li720 Bullet List;}
+{\s13\fi-431\li720 Hand List;}
+{\*\cs12\fs20\sbasedon23 Footnote Text;}
+{\s15\sb440\sa60\f4\fs34\b\sbasedon23\snext23 Heading 1;}
+{\s16\sb440\sa60\f4\fs28\b\sbasedon23\snext23 Heading 2;}
+{\s17\sb440\sa60\f4\fs24\b\sbasedon23\snext23 Heading 3;}
+{\s33\f5\fs20\lang0\snext33 Table Normal;}
+{\s23\f5\fs24\lang4105\snext23 Normal;}
+{\s20\fi-431\li720\sbasedon28 Lower Case List;}
+{\s1\li1440\ri1440\sa120\sbasedon23 Block Text;}
+{\s36\fi-431\li720\sbasedon28 Upper Case List;}
+{\*\cs11\fs20\super Footnote Reference;}
+{\s30\tx1584\sbasedon25\snext23 Section Heading;}
+{\s19\fi-431\li720 Implies List;}
+{\s2\fi-431\li720 Box List;}
+{\s32\fi-431\li720 Star List;}
+{\s29\f6\sbasedon23 Plain Text;}
+{\s35\fi-431\li720 Triangle List;}}
+\kerning0\cf0\ftnbj\fet2\ftnstart1\ftnnar\aftnnar\ftnstart1\facingp\titlepg{\info}\deftab720\viewkind1\paperw12240\paperh15840\margl1440\margr1440\widowctl
+{\headerl\pard\plain
+\pard\plain\ltrpar\ql\s14\itap0\tqc\tx4320\tqc\tx8640{\f0\fs24\lang4105{\*\listtag0}
+\par}\pard\plain\ltrpar\ql\s23\itap0\par}{\f5\fs24\lang4105{\*\listtag0}}
+\sectd\sbknone\colsx360\marglsxn1800\margrsxn1800\pgncont\ltrsect
+\pard\plain\ltrpar\qc\s23\itap0{\f0\fs24\ul\lang4105{\*\listtag0}\abinodiroverride\ltrch
Sublet Agreement}
+\par\pard\plain\ltrpar\ql\s23\itap0{\f0\fs24\lang4105{\*\listtag0}\abinodiroverride\ltrch
Between}
+\par\pard\plain\ltrpar\ql\s23\itap0{\f0\fs24\lang4105{\*\listtag0}
+\par}\pard\plain\ltrpar\ql\s23\itap0{\f0\fs24\ul\lang4105{\*\listtag0}\abinodiroverride\ltrch
Joe Drew}{\f0\fs24\lang4105{\*\listtag0}\line (Hereinafter called the "TENANT"
of the first part).\line }
+\par\pard\plain\ltrpar\ql\s23\itap0{\f0\fs24\lang4105{\*\listtag0}\abinodiroverride\ltrch
And}
+\par\pard\plain\ltrpar\ql\s23\itap0{\f0\fs24\lang4105{\*\listtag0}\abinodiroverride\ltrch
\line }{\f0\fs24\ul\lang4105{\*\listtag0}John
Horn}{\f0\fs24\lang4105{\*\listtag0} }
+\par\pard\plain\ltrpar\ql\s23\itap0{\f0\fs24\lang4105{\*\listtag0}\abinodiroverride\ltrch
(Hereinafter called the "SUBTENANT" of the second part).\line \line The TENANT
hereby agrees to rent to the SUBTENANT and the SUBTENANT agrees to rent from
the TENANT the premises being:}
+\par\pard\plain\ltrpar\ql\s23\itap0{\f0\fs24\lang4105{\*\listtag0}
+\par}\pard\plain\ltrpar\ql\s23\itap0{\f0\fs24\ul\lang4105{\*\listtag0}\abinodiroverride\ltrch
511 Albert Street, Unit 111, Waterloo ON Canada N2L 5A7}
+\par\pard\plain\ltrpar\ql\s23\itap0{\f0\fs24\lang4105{\*\listtag0}
+\par}\pard\plain\ltrpar\ql\s23\itap0{\f0\fs24\lang4105{\*\listtag0
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/rtfimport/data/tdf108947.rtf | 113 ++
sw/qa/extras/rtfimport/rtfimport.cxx | 21 +
2 files changed, 134 insertions(+)
New commits:
commit b904d639a801d6d610d8e53ba23cae9781ab9569
Author: Thomas Beck <thomas.b...@cib.de>
Date: Mon Nov 13 14:11:36 2017 +0100
tdf#108947 Added Unittest.
Added different branches for Windows/Linux because of differences in
linebreaks. Recommit with ifdef guard for preventing tinderbox failure
Change-Id: I08c45e3e653990a47a85aee6f63f063b2f9385a7
Reviewed-on: https://gerrit.libreoffice.org/44677
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
diff --git a/sw/qa/extras/rtfimport/data/tdf108947.rtf
b/sw/qa/extras/rtfimport/data/tdf108947.rtf
new file mode 100755
index ..77c2418705d5
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/tdf108947.rtf
@@ -0,0 +1,113 @@
+{\rtf1\ansi\ansicpg1252\deff0
+{\fonttbl
+{\f0\fnil\fcharset0\fprq0\fttruetype Tahoma;}
+{\f1\fnil\fcharset0\fprq0\fttruetype NULL;}
+{\f2\fnil\fcharset0\fprq0\fttruetype Dingbats;}
+{\f3\fnil\fcharset0\fprq0\fttruetype Symbol;}
+{\f4\fnil\fcharset0\fprq0\fttruetype Arial;}
+{\f5\fnil\fcharset0\fprq0\fttruetype Times New Roman;}
+{\f6\fnil\fcharset0\fprq0\fttruetype Courier New;}}
+{\colortbl
+\red0\green0\blue0;
+\red255\green255\blue255;}
+{\stylesheet
+{\s34\fi-431\li720 Tick List;}
+{\s21\fi-431\li720\sbasedon23 Lower Roman List;}
+{\s25\tx431\sbasedon15\snext23 Numbered Heading 1;}
+{\s26\tx431\sbasedon16\snext23 Numbered Heading 2;}
+{\s7\fi-431\li720 Diamond List;}
+{\*\cs9\sbasedon23 Endnote Text;}
+{\s10\tqc\tx4320\tqc\tx8640\f5\fs24\lang4105\sbasedon23\snext10 Footer;}
+{\s22\f5\fs20\lang0\snext22 No List;}
+{\s27\tx431\sbasedon17\snext23 Numbered Heading 3;}
+{\s28\fi-431\li720 Numbered List;}
+{\*\cs8\fs20\super Endnote Reference;}
+{\s14\tqc\tx4320\tqc\tx8640\f5\fs24\lang4105\sbasedon23\snext14 Header;}
+{\s4\tx1584\sbasedon25\snext23 Chapter Heading;}
+{\*\cs6\f5\fs20\lang0 Default Paragraph Font;}
+{\s31\fi-431\li720 Square List;}
+{\s5\fi-431\li720 Dashed List;}
+{\s37\fi-431\li720\sbasedon28 Upper Roman List;}
+{\s18\fi-431\li720 Heart List;}
+{\s24\sb100\f4\fs20\lang1033\sbasedon23\snext24 Normal (Web);}
+{\s3\fi-431\li720 Bullet List;}
+{\s13\fi-431\li720 Hand List;}
+{\*\cs12\fs20\sbasedon23 Footnote Text;}
+{\s15\sb440\sa60\f4\fs34\b\sbasedon23\snext23 Heading 1;}
+{\s16\sb440\sa60\f4\fs28\b\sbasedon23\snext23 Heading 2;}
+{\s17\sb440\sa60\f4\fs24\b\sbasedon23\snext23 Heading 3;}
+{\s33\f5\fs20\lang0\snext33 Table Normal;}
+{\s23\f5\fs24\lang4105\snext23 Normal;}
+{\s20\fi-431\li720\sbasedon28 Lower Case List;}
+{\s1\li1440\ri1440\sa120\sbasedon23 Block Text;}
+{\s36\fi-431\li720\sbasedon28 Upper Case List;}
+{\*\cs11\fs20\super Footnote Reference;}
+{\s30\tx1584\sbasedon25\snext23 Section Heading;}
+{\s19\fi-431\li720 Implies List;}
+{\s2\fi-431\li720 Box List;}
+{\s32\fi-431\li720 Star List;}
+{\s29\f6\sbasedon23 Plain Text;}
+{\s35\fi-431\li720 Triangle List;}}
+\kerning0\cf0\ftnbj\fet2\ftnstart1\ftnnar\aftnnar\ftnstart1\facingp\titlepg{\info}\deftab720\viewkind1\paperw12240\paperh15840\margl1440\margr1440\widowctl
+{\headerl\pard\plain
+\pard\plain\ltrpar\ql\s14\itap0\tqc\tx4320\tqc\tx8640{\f0\fs24\lang4105{\*\listtag0}
+\par}\pard\plain\ltrpar\ql\s23\itap0\par}{\f5\fs24\lang4105{\*\listtag0}}
+\sectd\sbknone\colsx360\marglsxn1800\margrsxn1800\pgncont\ltrsect
+\pard\plain\ltrpar\qc\s23\itap0{\f0\fs24\ul\lang4105{\*\listtag0}\abinodiroverride\ltrch
Sublet Agreement}
+\par\pard\plain\ltrpar\ql\s23\itap0{\f0\fs24\lang4105{\*\listtag0}\abinodiroverride\ltrch
Between}
+\par\pard\plain\ltrpar\ql\s23\itap0{\f0\fs24\lang4105{\*\listtag0}
+\par}\pard\plain\ltrpar\ql\s23\itap0{\f0\fs24\ul\lang4105{\*\listtag0}\abinodiroverride\ltrch
Joe Drew}{\f0\fs24\lang4105{\*\listtag0}\line (Hereinafter called the "TENANT"
of the first part).\line }
+\par\pard\plain\ltrpar\ql\s23\itap0{\f0\fs24\lang4105{\*\listtag0}\abinodiroverride\ltrch
And}
+\par\pard\plain\ltrpar\ql\s23\itap0{\f0\fs24\lang4105{\*\listtag0}\abinodiroverride\ltrch
\line }{\f0\fs24\ul\lang4105{\*\listtag0}John
Horn}{\f0\fs24\lang4105{\*\listtag0} }
+\par\pard\plain\ltrpar\ql\s23\itap0{\f0\fs24\lang4105{\*\listtag0}\abinodiroverride\ltrch
(Hereinafter called the "SUBTENANT" of the second part).\line \line The TENANT
hereby agrees to rent to the SUBTENANT and the SUBTENANT agrees to rent from
the TENANT the premises being:}
+\par\pard\plain\ltrpar\ql\s23\itap0{\f0\fs24\lang4105{\*\listtag0}
+\par}\pard\plain\ltrpar\ql\s23\itap0{\f0\fs24\ul\lang4105{\*\listtag0}\abinodiroverride\ltrch
511 Albert Street, Unit 111, Waterloo ON Canada N2L 5A7}
+\par\pard\plain\ltrpar\ql\s23\itap0{\f0\fs24\lang4105{\*\listtag0}
+\par}\pard\plain\ltrpar\ql\s23\itap0{\f0\fs24\lang4105{\*\listtag0}\abinodiroverride\ltrch
(hereinafter referred to as the \uc1\u8220\'9
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/rtfimport/data/tdf108947.rtf | 113 ++
sw/qa/extras/rtfimport/rtfimport.cxx | 18
2 files changed, 131 insertions(+)
New commits:
commit 743efc3d4b086d20abd1449bcb73e9bce506c083
Author: Thomas Beck <thomas.b...@cib.de>
Date: Mon Nov 6 13:35:45 2017 +0100
tdf#108947 Added Unittest.
Added different branches for Windows/Linux because of differences in
linebreaks.
Change-Id: I17397155292e173bf698fa2680aaaf2711c064cf
Reviewed-on: https://gerrit.libreoffice.org/44358
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
Tested-by: Thorsten Behrens <thorsten.behr...@cib.de>
diff --git a/sw/qa/extras/rtfimport/data/tdf108947.rtf
b/sw/qa/extras/rtfimport/data/tdf108947.rtf
new file mode 100755
index ..77c2418705d5
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/tdf108947.rtf
@@ -0,0 +1,113 @@
+{\rtf1\ansi\ansicpg1252\deff0
+{\fonttbl
+{\f0\fnil\fcharset0\fprq0\fttruetype Tahoma;}
+{\f1\fnil\fcharset0\fprq0\fttruetype NULL;}
+{\f2\fnil\fcharset0\fprq0\fttruetype Dingbats;}
+{\f3\fnil\fcharset0\fprq0\fttruetype Symbol;}
+{\f4\fnil\fcharset0\fprq0\fttruetype Arial;}
+{\f5\fnil\fcharset0\fprq0\fttruetype Times New Roman;}
+{\f6\fnil\fcharset0\fprq0\fttruetype Courier New;}}
+{\colortbl
+\red0\green0\blue0;
+\red255\green255\blue255;}
+{\stylesheet
+{\s34\fi-431\li720 Tick List;}
+{\s21\fi-431\li720\sbasedon23 Lower Roman List;}
+{\s25\tx431\sbasedon15\snext23 Numbered Heading 1;}
+{\s26\tx431\sbasedon16\snext23 Numbered Heading 2;}
+{\s7\fi-431\li720 Diamond List;}
+{\*\cs9\sbasedon23 Endnote Text;}
+{\s10\tqc\tx4320\tqc\tx8640\f5\fs24\lang4105\sbasedon23\snext10 Footer;}
+{\s22\f5\fs20\lang0\snext22 No List;}
+{\s27\tx431\sbasedon17\snext23 Numbered Heading 3;}
+{\s28\fi-431\li720 Numbered List;}
+{\*\cs8\fs20\super Endnote Reference;}
+{\s14\tqc\tx4320\tqc\tx8640\f5\fs24\lang4105\sbasedon23\snext14 Header;}
+{\s4\tx1584\sbasedon25\snext23 Chapter Heading;}
+{\*\cs6\f5\fs20\lang0 Default Paragraph Font;}
+{\s31\fi-431\li720 Square List;}
+{\s5\fi-431\li720 Dashed List;}
+{\s37\fi-431\li720\sbasedon28 Upper Roman List;}
+{\s18\fi-431\li720 Heart List;}
+{\s24\sb100\f4\fs20\lang1033\sbasedon23\snext24 Normal (Web);}
+{\s3\fi-431\li720 Bullet List;}
+{\s13\fi-431\li720 Hand List;}
+{\*\cs12\fs20\sbasedon23 Footnote Text;}
+{\s15\sb440\sa60\f4\fs34\b\sbasedon23\snext23 Heading 1;}
+{\s16\sb440\sa60\f4\fs28\b\sbasedon23\snext23 Heading 2;}
+{\s17\sb440\sa60\f4\fs24\b\sbasedon23\snext23 Heading 3;}
+{\s33\f5\fs20\lang0\snext33 Table Normal;}
+{\s23\f5\fs24\lang4105\snext23 Normal;}
+{\s20\fi-431\li720\sbasedon28 Lower Case List;}
+{\s1\li1440\ri1440\sa120\sbasedon23 Block Text;}
+{\s36\fi-431\li720\sbasedon28 Upper Case List;}
+{\*\cs11\fs20\super Footnote Reference;}
+{\s30\tx1584\sbasedon25\snext23 Section Heading;}
+{\s19\fi-431\li720 Implies List;}
+{\s2\fi-431\li720 Box List;}
+{\s32\fi-431\li720 Star List;}
+{\s29\f6\sbasedon23 Plain Text;}
+{\s35\fi-431\li720 Triangle List;}}
+\kerning0\cf0\ftnbj\fet2\ftnstart1\ftnnar\aftnnar\ftnstart1\facingp\titlepg{\info}\deftab720\viewkind1\paperw12240\paperh15840\margl1440\margr1440\widowctl
+{\headerl\pard\plain
+\pard\plain\ltrpar\ql\s14\itap0\tqc\tx4320\tqc\tx8640{\f0\fs24\lang4105{\*\listtag0}
+\par}\pard\plain\ltrpar\ql\s23\itap0\par}{\f5\fs24\lang4105{\*\listtag0}}
+\sectd\sbknone\colsx360\marglsxn1800\margrsxn1800\pgncont\ltrsect
+\pard\plain\ltrpar\qc\s23\itap0{\f0\fs24\ul\lang4105{\*\listtag0}\abinodiroverride\ltrch
Sublet Agreement}
+\par\pard\plain\ltrpar\ql\s23\itap0{\f0\fs24\lang4105{\*\listtag0}\abinodiroverride\ltrch
Between}
+\par\pard\plain\ltrpar\ql\s23\itap0{\f0\fs24\lang4105{\*\listtag0}
+\par}\pard\plain\ltrpar\ql\s23\itap0{\f0\fs24\ul\lang4105{\*\listtag0}\abinodiroverride\ltrch
Joe Drew}{\f0\fs24\lang4105{\*\listtag0}\line (Hereinafter called the "TENANT"
of the first part).\line }
+\par\pard\plain\ltrpar\ql\s23\itap0{\f0\fs24\lang4105{\*\listtag0}\abinodiroverride\ltrch
And}
+\par\pard\plain\ltrpar\ql\s23\itap0{\f0\fs24\lang4105{\*\listtag0}\abinodiroverride\ltrch
\line }{\f0\fs24\ul\lang4105{\*\listtag0}John
Horn}{\f0\fs24\lang4105{\*\listtag0} }
+\par\pard\plain\ltrpar\ql\s23\itap0{\f0\fs24\lang4105{\*\listtag0}\abinodiroverride\ltrch
(Hereinafter called the "SUBTENANT" of the second part).\line \line The TENANT
hereby agrees to rent to the SUBTENANT and the SUBTENANT agrees to rent from
the TENANT the premises being:}
+\par\pard\plain\ltrpar\ql\s23\itap0{\f0\fs24\lang4105{\*\listtag0}
+\par}\pard\plain\ltrpar\ql\s23\itap0{\f0\fs24\ul\lang4105{\*\listtag0}\abinodiroverride\ltrch
511 Albert Street, Unit 111, Waterloo ON Canada N2L 5A7}
+\par\pard\plain\ltrpar\ql\s23\itap0{\f0\fs24\lang4105{\*\listtag0}
+\par}\pard\plain\ltrpar\ql\s23\itap0{\f0\fs24\lang4105{\*\listtag0}\abinodiroverride\ltrch
(hereinafter referred to as the \uc1\u8220\'93the premises\uc1\u8221\'94)
situated in the M
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/rtftok/rtfdispatchdestination.cxx | 24 +++---
writerfilter/source/rtftok/rtfdocumentimpl.cxx|2 -
2 files changed, 4 insertions(+), 22 deletions(-)
New commits:
commit c1cf755afefec033377b8a693afed73d837a1387
Author: Thomas Beck <thomas.b...@cib.de>
Date: Tue Oct 24 11:57:36 2017 +0200
tdf#108947 - Fixed regression
Handled Header/Footer that are specifically for Left/Right pages the old
way again. Fix done previously was too much.
Change-Id: I0f9e8d23022300a06bd3fb45054cca1b03cf096f
Reviewed-on: https://gerrit.libreoffice.org/43749
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Bartosz Kosiorek <gan...@poczta.onet.pl>
diff --git a/writerfilter/source/rtftok/rtfdispatchdestination.cxx
b/writerfilter/source/rtftok/rtfdispatchdestination.cxx
index 2aa635e13488..ed5748ab0c85 100644
--- a/writerfilter/source/rtftok/rtfdispatchdestination.cxx
+++ b/writerfilter/source/rtftok/rtfdispatchdestination.cxx
@@ -216,18 +216,10 @@ RTFError RTFDocumentImpl::dispatchDestination(RTFKeyword
nKeyword)
}
break;
case RTF_HEADERL:
-if (!m_hasLHeader)
-{
-nId = NS_ooxml::LN_headerl;
-m_hasLHeader = true;
-}
+nId = NS_ooxml::LN_headerl;
break;
case RTF_HEADERR:
-if (!m_hasRHeader)
-{
-nId = NS_ooxml::LN_headerr;
-m_hasRHeader = true;
-}
+nId = NS_ooxml::LN_headerr;
break;
case RTF_HEADERF:
if (!m_hasFHeader)
@@ -237,18 +229,10 @@ RTFError RTFDocumentImpl::dispatchDestination(RTFKeyword
nKeyword)
}
break;
case RTF_FOOTERL:
-if (!m_hasLFooter)
-{
-nId = NS_ooxml::LN_footerl;
-m_hasLFooter = true;
-}
+nId = NS_ooxml::LN_footerl;
break;
case RTF_FOOTERR:
-if (!m_hasRFooter)
-{
-nId = NS_ooxml::LN_footerr;
-m_hasRFooter = true;
-}
+nId = NS_ooxml::LN_footerr;
break;
case RTF_FOOTERF:
if (!m_hasFFooter)
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 8780abc8ce66..386d3085d903 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -630,8 +630,6 @@ void RTFDocumentImpl::sectBreak(bool bFinal)
{
m_hasFHeader = false;
m_hasRHeader = false;
-m_hasLHeader = false;
-m_hasLFooter = false;
m_hasRFooter = false;
m_hasFFooter = false;
Mapper().endSectionGroup();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/gsoc17-revamp-customize-dialog' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/docxattributeoutput.cxx |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 778a396adef3e62a87f6e9beec0964323ad57f44 Author: Thomas Beck <thomas.b...@cib.de> Date: Wed Jun 14 11:10:20 2017 +0200 tdf#43157 Clean up OSL_ASSERT, DBG_ASSERT, etc. Cleaned out the rest of OSL_ASSERT in docxattributeoutput, keeping consistency with the rest of the function where they were found. Change-Id: I87c637d11a184cb002168c5d1151a0f3112f69c1 Reviewed-on: https://gerrit.libreoffice.org/38774 Reviewed-by: Michael Stahl <mst...@redhat.com> Tested-by: Michael Stahl <mst...@redhat.com> diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index bd667fe58d17..f96a1e7465bc 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -1729,13 +1729,13 @@ void DocxAttributeOutput::StartRunProperties() } InitCollectedRunProperties(); -OSL_ASSERT( !m_pPostponedGraphic ); +assert( !m_pPostponedGraphic ); m_pPostponedGraphic.reset(new std::list); -OSL_ASSERT( !m_pPostponedDiagrams ); +assert( !m_pPostponedDiagrams ); m_pPostponedDiagrams.reset(new std::list); -OSL_ASSERT( !m_pPostponedVMLDrawings ); +assert( !m_pPostponedVMLDrawings ); m_pPostponedVMLDrawings.reset(new std::list); assert(!m_pPostponedDMLDrawings); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - include/salhelper salhelper/source sw/qa writerfilter/inc writerfilter/source
include/salhelper/refobj.hxx |4
salhelper/source/simplereferenceobject.cxx| 10
sw/qa/extras/rtfimport/data/tdf108055.rtf | 232 ++
sw/qa/extras/rtfimport/rtfimport.cxx | 50 +++
writerfilter/inc/dmapper/resourcemodel.hxx|1
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 24 -
writerfilter/source/dmapper/GraphicImport.cxx |1
writerfilter/source/rtftok/rtfdispatchdestination.cxx | 54 +++-
writerfilter/source/rtftok/rtfdocumentimpl.cxx| 18 +
writerfilter/source/rtftok/rtfdocumentimpl.hxx|8
10 files changed, 370 insertions(+), 32 deletions(-)
New commits:
commit 8a71a2a843c31e5eeb5ae4b08ee861ba8f2c4516
Author: Thomas Beck <thomas.b...@cib.de>
Date: Fri May 19 13:44:58 2017 +0200
tdf#108055 RTF: Header and Footer are added multiple times.
Made it so Header/Footer of a certain section can only be added once.
This change should only affect RTF-Files.
Added Unittest
Change-Id: I55025984e343d04da7fc0f201164ef39e3a26202
Reviewed-on: https://gerrit.libreoffice.org/37814
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk>
diff --git a/sw/qa/extras/rtfimport/data/tdf108055.rtf
b/sw/qa/extras/rtfimport/data/tdf108055.rtf
new file mode 100755
index ..15cc606b2e67
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/tdf108055.rtf
@@ -0,0 +1,232 @@
+{\rtf1\adeflang1025\ansi\ansicpg1252\uc1\adeff0\deff0\stshfdbch31505\stshfloch31506\stshfhich31506\stshfbi0\deflang1031\deflangfe1041\themelang1031\themelangfe1041\themelangcs0{\fonttbl{\f0\fbidi
\froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}
+{\f11\fbidi \fmodern\fcharset128\fprq1{\*\panose 02020609040205080304}MS
Mincho{\*\falt ?l?r ??\'81\'66c};}{\f34\fbidi \froman\fcharset0\fprq2{\*\panose
02040503050406030204}Cambria Math;}
+{\f37\fbidi \fswiss\fcharset0\fprq2{\*\panose
020f0502020204030204}Calibri;}{\f39\fbidi \fmodern\fcharset128\fprq1{\*\panose
02020609040205080304}@MS Mincho;}{\flomajor\f31500\fbidi
\froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}
+{\fdbmajor\f31501\fbidi \fmodern\fcharset128\fprq1{\*\panose
020b0609070205080204}MS Gothic{\*\falt \'82\'6c\'82\'72
\'83\'53\'83\'56\'83\'62\'83\'4e};}{\fhimajor\f31502\fbidi
\fswiss\fcharset0\fprq2{\*\panose 020f0302020204030204}Calibri Light;}
+{\fbimajor\f31503\fbidi \froman\fcharset0\fprq2{\*\panose
02020603050405020304}Times New Roman;}{\flominor\f31504\fbidi
\froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}
+{\fdbminor\f31505\fbidi \fmodern\fcharset128\fprq1{\*\panose
02020609040205080304}MS Mincho{\*\falt ?l?r
??\'81\'66c};}{\fhiminor\f31506\fbidi \fswiss\fcharset0\fprq2{\*\panose
020f0502020204030204}Calibri;}
+{\fbiminor\f31507\fbidi \froman\fcharset0\fprq2{\*\panose
02020603050405020304}Times New Roman;}{\f42\fbidi \froman\fcharset238\fprq2
Times New Roman CE;}{\f43\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}
+{\f45\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\f46\fbidi
\froman\fcharset162\fprq2 Times New Roman Tur;}{\f47\fbidi
\froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\f48\fbidi
\froman\fcharset178\fprq2 Times New Roman (Arabic);}
+{\f49\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\f50\fbidi
\froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\f154\fbidi
\fmodern\fcharset0\fprq1 MS Mincho Western{\*\falt ?l?r ??\'81\'66c};}
+{\f152\fbidi \fmodern\fcharset238\fprq1 MS Mincho CE{\*\falt ?l?r
??\'81\'66c};}{\f153\fbidi \fmodern\fcharset204\fprq1 MS Mincho Cyr{\*\falt
?l?r ??\'81\'66c};}{\f155\fbidi \fmodern\fcharset161\fprq1 MS Mincho
Greek{\*\falt ?l?r ??\'81\'66c};}
+{\f156\fbidi \fmodern\fcharset162\fprq1 MS Mincho Tur{\*\falt ?l?r
??\'81\'66c};}{\f159\fbidi \fmodern\fcharset186\fprq1 MS Mincho Baltic{\*\falt
?l?r ??\'81\'66c};}{\f382\fbidi \froman\fcharset238\fprq2 Cambria Math CE;}
+{\f383\fbidi \froman\fcharset204\fprq2 Cambria Math Cyr;}{\f385\fbidi
\froman\fcharset161\fprq2 Cambria Math Greek;}{\f386\fbidi
\froman\fcharset162\fprq2 Cambria Math Tur;}{\f389\fbidi
\froman\fcharset186\fprq2 Cambria Math Baltic;}
+{\f390\fbidi \froman\fcharset163\fprq2 Cambria Math (Vietnamese);}{\f412\fbidi
\fswiss\fcharset238\fprq2 Calibri CE;}{\f413\fbidi \fswiss\fcharset204\fprq2
Calibri Cyr;}{\f415\fbidi \fswiss\fcharset161\fprq2 Calibri Greek;}
+{\f416\fbidi \fswiss\fcharset162\fprq2 Calibri Tur;}{\f419\fbidi
\fswiss\fcharset186\fprq2 Calibri Baltic;}{\f420\fbidi
\fswiss\fcharset163\fprq2 Calibri (Vietnamese);}{\f434\fbidi
\fmodern\fcharset0\fprq1 @MS Mincho Western;}
+{\f432\fbidi \fmodern\fcharset238\fprq1 @MS Mincho CE;}{\f433\fbidi
\fmodern\fcharset204\fprq1 @MS Mincho Cyr;}{\f435\fbidi
\fmodern\fcharset161\fprq1 @MS Mincho Greek;}{\f436\fbidi
\fmodern\fcharset162\fprq1 @MS Mi
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/ww8par5.cxx | 196 ++-
1 file changed, 94 insertions(+), 102 deletions(-)
New commits:
commit a691c1e0405993e8cb40212d532d66c08184da2c
Author: Thomas Beck <thomas.b...@cib.de>
Date: Mon Jun 12 10:41:43 2017 +0200
tdf#39468 translate german comments, removing redundant ones
Translated remaining german comments in ww8par5.cxx
Change-Id: I7a21f0f0424e821cd5350c776dcab58658a0a24b
Reviewed-on: https://gerrit.libreoffice.org/38687
Reviewed-by: Michael Stahl <mst...@redhat.com>
Tested-by: Michael Stahl <mst...@redhat.com>
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index 88b6fca91adb..daaddd7ada2f 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -331,9 +331,9 @@ sal_Int32 FindParaStart( const OUString& rStr, sal_Unicode
cToken, sal_Unicode c
return -1;
}
-// FindPara() findet den ersten Parameter mit '\' und cToken. Es wird
-// ein neuer String allokiert ( der vom Aufrufer deallokiert werden muss )
-// und alles, was zum Parameter gehoert, wird in ihm zurueckgeliefert.
+// FindPara() finds the first parameter including '\' and cToken.
+// A new String will be allocated (has to be deallocated by the caller)
+// and everything that is part of the parameter will be returned.
OUString FindPara( const OUString& rStr, sal_Unicode cToken, sal_Unicode
cToken2 )
{
sal_Int32 n2; // end
@@ -343,20 +343,20 @@ OUString FindPara( const OUString& rStr, sal_Unicode
cToken, sal_Unicode cToken2
if(rStr[ n ] == '"'
|| rStr[ n ] == 132 )
-{ // Anfuehrungszeichen vor Para
-n++;// Anfuehrungszeichen ueberlesen
-n2 = n; // ab hier nach Ende suchen
+{ // Quotationmark in front of parameter
+n++;// Skip quotationmark
+n2 = n; // search for the end starting from here
while( n2 < rStr.getLength()
&& rStr[ n2 ] != 147
&& rStr[ n2 ] != '"' )
-n2++; // Ende d. Paras suchen
+n2++; // search end of parameter
}
else
-{ // keine Anfuehrungszeichen
-n2 = n; // ab hier nach Ende suchen
+{ // no quotationmarks
+n2 = n; // search for the end starting from here
while( n2 < rStr.getLength()
&& rStr[ n2 ] != ' ' )
-n2++; // Ende d. Paras suchen
+n2++; // search end of parameter
}
return rStr.copy( n, n2-n );
}
@@ -384,7 +384,7 @@ static SvxNumType GetNumTypeFromName(const OUString& rStr,
static SvxNumType GetNumberPara(const OUString& rStr, bool bAllowPageDesc =
false)
{
-OUString s( FindPara( rStr, '*', '*' ) ); // Ziffernart
+OUString s( FindPara( rStr, '*', '*' ) ); // Type of number
SvxNumType aType = GetNumTypeFromName( s, bAllowPageDesc );
return aType;
}
@@ -495,13 +495,13 @@ short SwWW8ImplReader::GetTimeDatePara(OUString& rStr,
sal_uInt32& rFormat,
return nNumFormatType;
}
-// Felder
+// Fields
-// Am Ende des Einlesens entsprechende Felder updaten ( z.Zt. die Referenzen )
+// Update respective fields after loading (currently references)
void SwWW8ImplReader::UpdateFields()
{
-m_rDoc.getIDocumentState().SetUpdateExpFieldStat(true); //
JP: neu fuer alles wichtige
-m_rDoc.SetInitDBFields(true); // Datenbank-Felder auch
+m_rDoc.getIDocumentState().SetUpdateExpFieldStat(true);
+m_rDoc.SetInitDBFields(true); // Also update fields in the
database
}
sal_uInt16 SwWW8ImplReader::End_Field()
@@ -728,9 +728,9 @@ void WW8FieldEntry::SetBookmarkCode(const OUString&
bookmarkCode)
}
-// Read_Field liest ein Feld ein oder, wenn es nicht gelesen werden kann,
-// wird 0 zurueckgegeben, so dass das Feld vom Aufrufer textuell gelesen wird.
-// Returnwert: Gesamtlaenge des Feldes ( zum UEberlesen )
+// Read_Field reads a field or returns 0 if the field cannot be read,
+// so that the calling function reads the field in text format.
+// Returnvalue: Total length of field
long SwWW8ImplReader::Read_Field(WW8PLCFManResult* pRes)
{
typedef eF_ResT (SwWW8ImplReader:: *FNReadField)( WW8FieldDesc*, OUString&
);
@@ -835,7 +835,7 @@ long SwWW8ImplReader::Read_Field(WW8PLCFManResult* pRes)
nullptr, // 93
nullptr, // 94
::Read_F_Shape, // 95
-nu
[Libreoffice-commits] core.git: sw/source
sw/source/filter/html/htmlform.cxx | 203 +
1 file changed, 95 insertions(+), 108 deletions(-)
New commits:
commit 0c745f84dffa71c80a34f93733d8af8c8564cc3f
Author: Thomas Beck <thomas.b...@cib.de>
Date: Wed Jun 7 10:53:11 2017 +0200
tdf#39468 translate German comments
translated comments in htmlform.cxx and removed unneccessary comments
and overused punctuation marks.
Change-Id: Ie3327ccc0bb3963d0942676b011ab9dcdf078b91
Reviewed-on: https://gerrit.libreoffice.org/38493
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Michael Stahl <mst...@redhat.com>
diff --git a/sw/source/filter/html/htmlform.cxx
b/sw/source/filter/html/htmlform.cxx
index 30e4282858db..70a5dc93e1f3 100644
--- a/sw/source/filter/html/htmlform.cxx
+++ b/sw/source/filter/html/htmlform.cxx
@@ -179,7 +179,7 @@ class SwHTMLForm_Impl
SvKeyValueIterator *m_pHeaderAttrs;
-// gecachte Interfaces
+// Cached interfaces
uno::Reference< drawing::XDrawPage >m_xDrawPage;
uno::Reference< container::XIndexContainer >m_xForms;
uno::Reference< drawing::XShapes > m_xShapes;
@@ -188,7 +188,7 @@ class SwHTMLForm_Impl
uno::Reference< script::XEventAttacherManager > m_xControlEventManager;
uno::Reference< script::XEventAttacherManager > m_xFormEventManager;
-// Kontext-Informationen
+// Context information
uno::Reference< container::XIndexContainer >m_xFormComps;
uno::Reference< beans::XPropertySet > m_xFCompPropertySet;
uno::Reference< drawing::XShape > m_xShape;
@@ -361,9 +361,9 @@ const uno::Reference< script::XEventAttacherManager >&
class SwHTMLImageWatcher :
public cppu::WeakImplHelper< awt::XImageConsumer, XEventListener >
{
-uno::Reference< drawing::XShape > xShape; // das control
+uno::Reference< drawing::XShape > xShape; // the control
uno::Reference< XImageProducerSupplier >xSrc;
-uno::Reference< awt::XImageConsumer > xThis; // man selbst
+uno::Reference< awt::XImageConsumer > xThis; // reference to self
boolbSetWidth;
boolbSetHeight;
@@ -373,11 +373,11 @@ public:
SwHTMLImageWatcher( const uno::Reference< drawing::XShape > & rShape,
bool bWidth, bool bHeight );
-// startProduction darf nicht im Konstruktor gerufen werden, weil
-// wir und ggf. selbst zerstoeren ... Deshlab eine eigene Methode.
+// startProduction can not be called in the constructor because it can
+// destruct itself, hence a seperate method.
void start() { xSrc->getImageProducer()->startProduction(); }
-// UNO Anbindung
+// UNO connection
// XImageConsumer
virtual void SAL_CALL init( sal_Int32 Width, sal_Int32 Height) override;
@@ -407,36 +407,34 @@ SwHTMLImageWatcher::SwHTMLImageWatcher(
xShape( rShape ),
bSetWidth( bWidth ), bSetHeight( bHeight )
{
-// Die Quelle des Images merken
+// Remember the source of the image
uno::Reference< drawing::XControlShape > xControlShape( xShape, UNO_QUERY
);
uno::Reference< awt::XControlModel > xControlModel(
xControlShape->getControl() );
xSrc.set( xControlModel, UNO_QUERY );
OSL_ENSURE( xSrc.is(), "Kein XImageProducerSupplier" );
-// Als Event-Listener am Shape anmelden, damit wir es beim dispose
-// loslassen ko"onnen ...
+// Register as Event-Listener on the shape to be able to release it on
dispose.
uno::Reference< XEventListener > xEvtLstnr = static_cast(this);
uno::Reference< XComponent > xComp( xShape, UNO_QUERY );
xComp->addEventListener( xEvtLstnr );
-// Zum Schluss halten wir noch eine Referenz auf uns selbst, damit
-// wir am Leben bleiben ... (eigentlich sollte das nicht neotig sein,
-// weil wir ja noch an diversen anderen Stellen angemeldet sind)
+// Lastly we keep a reference to ourselves so we are not destroyed
+// (should not be neccessary since we're still registered elsewhere)
xThis = static_cast(this);
-// und am ImageProducer anmelden, um die Groesse zu erehalten ...
+// Register at ImageProducer to retrieve the size...
xSrc->getImageProducer()->addConsumer( xThis );
}
void SwHTMLImageWatcher::clear()
{
-// Am Shape als Event-Listener abmelden
+// Unregister on Shape
uno::Reference< XEventListener > xEvtLstnr = static_cast(this);
uno::Reference< XComponent > xComp( xShape, UNO_QUERY );
xComp->removeEventListener( xEvtLstnr );
-// Am ImageProducer abmelden
+// Unregister on ImageProducer
uno::Reference xProd = xSrc->getIma
[Libreoffice-commits] core.git: sc/source
sc/source/ui/drawfunc/fuconarc.cxx | 24
sc/source/ui/drawfunc/fuconcustomshape.cxx | 30
sc/source/ui/drawfunc/fuconpol.cxx | 30
sc/source/ui/drawfunc/fuconrec.cxx | 25 -
sc/source/ui/drawfunc/fuconstr.cxx | 38
sc/source/ui/drawfunc/fuconuno.cxx | 24
sc/source/ui/drawfunc/fudraw.cxx | 54 +
sc/source/ui/drawfunc/fuins1.cxx | 24
sc/source/ui/drawfunc/fupoor.cxx | 30 ++--
sc/source/ui/drawfunc/fusel.cxx| 44 ++-
10 files changed, 12 insertions(+), 311 deletions(-)
New commits:
commit 575b457d728531a1cfff95d2eea1887e09d79009
Author: Thomas Beck <thomas.b...@cib.de>
Date: Thu May 18 12:54:31 2017 +0200
Removed unneccessary ASCII-Art and comments
Change-Id: I455d7aa7c6e6313a0d24137e02b7bf04ede9aae9
Reviewed-on: https://gerrit.libreoffice.org/37752
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
diff --git a/sc/source/ui/drawfunc/fuconarc.cxx
b/sc/source/ui/drawfunc/fuconarc.cxx
index 988cff764e82..2dd3aeb0fb7e 100644
--- a/sc/source/ui/drawfunc/fuconarc.cxx
+++ b/sc/source/ui/drawfunc/fuconarc.cxx
@@ -36,12 +36,6 @@ FuConstArc::~FuConstArc()
{
}
-/*
-|*
-|* MouseButtonDown-event
-|*
-\/
-
bool FuConstArc::MouseButtonDown( const MouseEvent& rMEvt )
{
// remember button state for creation of own MouseEvents
@@ -65,12 +59,6 @@ bool FuConstArc::MouseButtonDown( const MouseEvent& rMEvt )
return bReturn;
}
-/*
-|*
-|* MouseButtonUp-event
-|*
-\/
-
bool FuConstArc::MouseButtonUp( const MouseEvent& rMEvt )
{
// remember button state for creation of own MouseEvents
@@ -86,12 +74,6 @@ bool FuConstArc::MouseButtonUp( const MouseEvent& rMEvt )
return (FuConstruct::MouseButtonUp(rMEvt) || bReturn);
}
-/*
-|*
-|* Activate function
-|*
-\/
-
void FuConstArc::Activate()
{
SdrObjKind aObjKind;
@@ -127,12 +109,6 @@ void FuConstArc::Activate()
FuDraw::Activate();
}
-/*
-|*
-|* Deactivate functions
-|*
-\/
-
void FuConstArc::Deactivate()
{
FuDraw::Deactivate();
diff --git a/sc/source/ui/drawfunc/fuconcustomshape.cxx
b/sc/source/ui/drawfunc/fuconcustomshape.cxx
index a69037136f92..54d8470229f6 100644
--- a/sc/source/ui/drawfunc/fuconcustomshape.cxx
+++ b/sc/source/ui/drawfunc/fuconcustomshape.cxx
@@ -52,12 +52,6 @@ FuConstCustomShape::~FuConstCustomShape()
{
}
-/*
-|*
-|* MouseButtonDown-event
-|*
-\/
-
bool FuConstCustomShape::MouseButtonDown(const MouseEvent& rMEvt)
{
// remember button state for creation of own MouseEvents
@@ -93,12 +87,6 @@ bool FuConstCustomShape::MouseButtonDown(const MouseEvent&
rMEvt)
return bReturn;
}
-/*
-|*
-|* MouseButtonUp-event
-|*
-\/
-
bool FuConstCustomShape::MouseButtonUp(const MouseEvent& rMEvt)
{
// remember button state for creation of own MouseEvents
@@ -114,12 +102,6 @@ bool FuConstCustomShape::MouseButtonUp(const MouseEvent&
rMEvt)
return (FuConstruct::MouseButtonUp(rMEvt) || bReturn);
}
-/*
-|*
-|* Activate function
-|*
-\/
-
void FuConstCustomShape::Activate()
{
pView->SetCurrentObj( OBJ_CUSTOMSHAPE );
@@ -135,12 +117,6 @@ void FuConstCustomShape::Activate()
FuConstruct::Activate();
}
-/*
-|*
-|* Deactivate function
-|*
-\/
-
void FuConstCustomShape::Deactivate()
{
FuConstruct::Deactivate();
@@ -169,12 +145,6 @@ SdrObject* FuConstCustomShape::CreateDefaultObject(const
sal_uInt16 /* nID */, c
return pObj;
}
-/
[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - shell/source
shell/source/win32/SysShExec.cxx | 22 ++
1 file changed, 22 insertions(+)
New commits:
commit 45b2e11a6756ed322cda932142c31366fc2b6da6
Author: Thomas Beck <thomas.b...@cib.de>
Date: Wed May 3 12:57:11 2017 +0200
tdf#107587 Opening Hyperlink opens Browser in Background.
Added neccessary WinAPI calls to bring called window into the
Foreground.
Change-Id: I080968f655e2230d1a514b3ef91bf916d904d844
Reviewed-on: https://gerrit.libreoffice.org/37196
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
(cherry picked from commit ad711bc6e2cc35c2ed114fff15008d5bbcfcf21c)
Reviewed-on: https://gerrit.libreoffice.org/37266
Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk>
diff --git a/shell/source/win32/SysShExec.cxx b/shell/source/win32/SysShExec.cxx
index c69d3f2a0c59..6cb31942ba02 100644
--- a/shell/source/win32/SysShExec.cxx
+++ b/shell/source/win32/SysShExec.cxx
@@ -323,6 +323,28 @@ void SAL_CALL CSysShExec::execute( const OUString&
aCommand, const OUString& aPa
static_cast< XSystemShellExecute* >(this),
psxErr);
}
+else
+{
+// Get Permission make changes to the Window of the created Process
+HWND procHandle = 0;
+DWORD procId = GetProcessId(sei.hProcess);
+AllowSetForegroundWindow(procId);
+
+// Get the handle of the created Window
+DWORD check = 0;
+GetWindowThreadProcessId(procHandle, );
+SAL_WARN_IF(check != procId, "shell", "Could not get handle of process
called by shell.");
+
+// Move created Window into the foreground
+if(procHandle != 0)
+{
+SetForegroundWindow(procHandle);
+SetActiveWindow(procHandle);
+}
+}
+
+// Close the handle for the created childprocess when we are done
+CloseHandle(sei.hProcess);
}
// XServiceInfo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/drawfunc/drawsh.cxx |4 ++--
sc/source/ui/drawfunc/drawsh2.cxx | 14 +++---
sc/source/ui/drawfunc/drtxtob.cxx | 22 +++---
sc/source/ui/drawfunc/fuconarc.cxx | 16 ++--
sc/source/ui/drawfunc/fuconcustomshape.cxx | 10 ++
sc/source/ui/drawfunc/fuconpol.cxx | 14 +-
sc/source/ui/drawfunc/fuconrec.cxx | 16 ++--
sc/source/ui/drawfunc/fuconuno.cxx | 16 ++--
sc/source/ui/drawfunc/fuins1.cxx |8
sc/source/ui/drawfunc/fuins2.cxx |4 ++--
sc/source/ui/drawfunc/fupoor.cxx | 12 ++--
sc/source/ui/drawfunc/fusel.cxx|2 +-
12 files changed, 38 insertions(+), 100 deletions(-)
New commits:
commit 2fbcdd3e551710c8fcbe15d28b7b71f8d038d9ad
Author: Thomas Beck <thomas.b...@cib.de>
Date: Fri May 12 10:08:00 2017 +0200
tdf#39468 translate German comments
Translated comments in sc/source/ui/drawfunc/. There were still some
left that bin/find-german-comments did not find.
Removed unneccessary comments.
Change-Id: I61c1cadea259bb2a4b14721a25da85e9a9c0753e
Reviewed-on: https://gerrit.libreoffice.org/37530
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Katarina Behrens <katarina.behr...@cib.de>
diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx
index 24ccb51cd760..1befc0f56d29 100644
--- a/sc/source/ui/drawfunc/drawsh.cxx
+++ b/sc/source/ui/drawfunc/drawsh.cxx
@@ -120,7 +120,7 @@ void ScDrawShell::ExecDrawAttr( SfxRequest& rReq )
}
break;
-case SID_TEXT_STANDARD: // Harte Textattributierung loeschen
+case SID_TEXT_STANDARD: // delete hard text attributes
{
SfxItemSet aEmptyAttr(GetPool(), EE_ITEMS_START, EE_ITEMS_END);
pView->SetAttributes(aEmptyAttr, true);
@@ -152,7 +152,7 @@ void ScDrawShell::ExecDrawAttr( SfxRequest& rReq )
case SID_ATTR_SHADOW_XDISTANCE:
case SID_ATTR_SHADOW_YDISTANCE:
{
-// Wenn ToolBar vertikal :
+// if toolbar is vertical :
if ( !rReq.GetArgs() )
{
switch ( nSlot )
diff --git a/sc/source/ui/drawfunc/drawsh2.cxx
b/sc/source/ui/drawfunc/drawsh2.cxx
index 02215b8e1093..9921d0d3e2e9 100644
--- a/sc/source/ui/drawfunc/drawsh2.cxx
+++ b/sc/source/ui/drawfunc/drawsh2.cxx
@@ -77,7 +77,7 @@ ScDrawShell::~ScDrawShell()
mpSelectionChangeHandler->Disconnect();
}
-void ScDrawShell::GetState( SfxItemSet& rSet ) // Zustaende / Toggles
+void ScDrawShell::GetState( SfxItemSet& rSet ) // Conditions / Toggles
{
ScDrawView* pView= pViewData->GetScDrawView();
SdrDragMode eMode= pView->GetDragMode();
@@ -242,19 +242,19 @@ void ScDrawShell::GetDrawFuncState( SfxItemSet& rSet )
// disable functions
rSet.DisableItem( SID_TITLE_DESCRIPTION_OBJECT );
}
-if ( !nMarkCount ) // nichts selektiert
+if ( !nMarkCount ) // nothing selected
{
-// Anordnung
+// Arrangement
rSet.DisableItem( SID_FRAME_UP );
rSet.DisableItem( SID_FRAME_DOWN );
rSet.DisableItem( SID_FRAME_TO_TOP );
rSet.DisableItem( SID_FRAME_TO_BOTTOM );
-// Clipboard / loeschen
+// Clipboard / delete
rSet.DisableItem( SID_DELETE );
rSet.DisableItem( SID_DELETE_CONTENTS );
rSet.DisableItem( SID_CUT );
rSet.DisableItem( SID_COPY );
-// sonstiges
+// other
rSet.DisableItem( SID_ANCHOR_TOGGLE );
rSet.DisableItem( SID_ORIGINALSIZE );
rSet.DisableItem( SID_ATTR_TRANSFORM );
@@ -275,7 +275,7 @@ void ScDrawShell::GetDrawFuncState( SfxItemSet& rSet )
// disable functions
svx::FontworkBar::getState( pView, rSet );
}
-// Attribute fuer Drawing-Objekte
+// Attributes for Drawing-Objects
void ScDrawShell::GetDrawAttrState( SfxItemSet& rSet )
{
@@ -342,7 +342,7 @@ void ScDrawShell::GetDrawAttrState( SfxItemSet& rSet )
void ScDrawShell::GetAttrFuncState(SfxItemSet )
{
-// Dialoge fuer Draw-Attribute disablen, wenn noetig
+// Disable dialogs for Draw-attributes if neccessary
ScDrawView* pDrView = pViewData->GetScDrawView();
SfxItemSet aViewSet = pDrView->GetAttrFromMarked(false);
diff --git a/sc/source/ui/drawfunc/drtxtob.cxx
b/sc/source/ui/drawfunc/drtxtob.cxx
index ccd6bfe07a94..5ccb7823462e 100644
--- a/sc/source/ui/drawfunc/drtxtob.cxx
+++ b/sc/source/ui/drawfunc/drtxtob.cxx
@@ -538,11 +538,11 @@ void ScDrawTextObjectBar::GetClipState( SfxItemSet& rSet )
}
}
-// Attribute
+//
[Libreoffice-commits] core.git: svx/source
svx/source/form/fmview.cxx | 23 +++
1 file changed, 11 insertions(+), 12 deletions(-)
New commits:
commit a0badb15fa97e3f4be990ff83148e48ae1db7723
Author: Thomas Beck <thomas.b...@cib.de>
Date: Mon May 8 12:04:52 2017 +0200
tdf#39468 translate German comments, removing redundant ones
Translated remaining German comments in svx/source/form/fmview.cxx
Change-Id: I6e71bc1dc1ab1c0b87ec0a3d727cffe2237e9a59
Reviewed-on: https://gerrit.libreoffice.org/37381
Reviewed-by: Michael Stahl <mst...@redhat.com>
Tested-by: Michael Stahl <mst...@redhat.com>
diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx
index fa7c596913d3..e190402400df 100644
--- a/svx/source/form/fmview.cxx
+++ b/svx/source/form/fmview.cxx
@@ -91,15 +91,15 @@ void FmFormView::Init()
pFormShell = nullptr;
pImpl = new FmXFormView(this);
-// Model setzen
+// set model
SdrModel* pModel = GetModel();
-DBG_ASSERT( dynamic_cast( pModel) != nullptr,
"Falsches Model" );
+DBG_ASSERT( dynamic_cast( pModel) != nullptr, "Wrong
model" );
if( dynamic_cast( pModel) == nullptr ) return;
FmFormModel* pFormModel = static_cast<FmFormModel*>(pModel);
-// DesignMode vom Model holen
+// get DesignMode from model
bool bInitDesignMode = pFormModel->GetOpenInDesignMode();
if ( pFormModel->OpenInDesignModeIsDefaulted( ) )
{ // this means that nobody ever explicitly set this on the model, and
the model has never
@@ -124,8 +124,8 @@ void FmFormView::Init()
}
}
-// dieses wird in der Shell vorgenommen
-// bDesignMode = !bInitDesignMode; // erzwingt, dass SetDesignMode
ausgefuehrt wird
+// this will be done in the shell
+// bDesignMode = !bInitDesignMode; // forces execution of SetDesignMode
SetDesignMode( bInitDesignMode );
}
@@ -223,10 +223,9 @@ void FmFormView::ChangeDesignMode(bool bDesign)
FmFormModel* pModel = dynamic_cast<FmFormModel*>( GetModel() );
if (pModel)
-{ // fuer die Zeit des Uebergangs das Undo-Environment ausschalten, das
sichert, dass man dort auch nicht-transiente
-// Properties mal eben aendern kann (sollte allerdings mit Vorsicht
genossen und beim Rueckschalten des Modes
-// auch immer wieder rueckgaegig gemacht werden. Ein Beispiel ist das
Setzen der maximalen Text-Laenge durch das
-// FmXEditModel an seinem Control.)
+{ // For the duration of the transition the Undo-Environment is
disabled. This ensures that non-transient Properties can
+// also be changed (this should be done with care and also reversed
before switching the mode back. An example is the
+// setting of the maximal length of the text by FmXEditModel on its
control.)
pModel->GetUndoEnv().Lock();
}
@@ -297,7 +296,7 @@ void FmFormView::ChangeDesignMode(bool bDesign)
}
}
-// und mein Undo-Environment wieder an
+// Unlock Undo-Environment
if (pModel)
pModel->GetUndoEnv().UnLock();
}
@@ -321,7 +320,7 @@ SdrPageView* FmFormView::ShowSdrPage(SdrPage* pPage)
// creating the controllers
ActivateControls(pPV);
-// Alles deselektieren
+// Deselect all
UnmarkAll();
}
else if ( pFormShell && pFormShell->IsDesignMode() )
@@ -329,7 +328,7 @@ SdrPageView* FmFormView::ShowSdrPage(SdrPage* pPage)
FmXFormShell* pFormShellImpl = pFormShell->GetImpl();
pFormShellImpl->UpdateForms( true );
-// damit der Formular-Navigator auf den Seitenwechsel reagieren
kann
+// so that the form navigator can react to the pagechange
pFormShell->GetViewShell()->GetViewFrame()->GetBindings().Invalidate(SID_FM_FMEXPLORER_CONTROL,
true);
pFormShellImpl->SetSelection(GetMarkedObjectList());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - oox/source
oox/source/drawingml/fillproperties.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit da8e35e190b96a2cbd26f848bcd2acd139618ebb
Author: Thomas Beck <thomas.b...@cib.de>
Date: Fri Apr 7 15:04:25 2017 +0200
tdf#106520 xlsx: black square where image should be
Reversed order of Transforms. Duotone will now be applied after a
ColorChange due to the ColorChange Transform not being able to
distinguish the colors properly anymore after Duotone had been applied.
This seems to better match what MSO is doing there.
Change-Id: I6ca66cc411c3e2a3d009325f0f1641c560949a54
Reviewed-on: https://gerrit.libreoffice.org/36263
Reviewed-by: Katarina Behrens <katarina.behr...@cib.de>
Tested-by: Katarina Behrens <katarina.behr...@cib.de>
(cherry picked from commit 184362002955d750c6597a444ae5240cf15932ac)
Reviewed-on: https://gerrit.libreoffice.org/37236
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Bartosz Kosiorek <gan...@poczta.onet.pl>
diff --git a/oox/source/drawingml/fillproperties.cxx
b/oox/source/drawingml/fillproperties.cxx
index ed8dbfcc5741..ed01746b4c64 100644
--- a/oox/source/drawingml/fillproperties.cxx
+++ b/oox/source/drawingml/fillproperties.cxx
@@ -77,7 +77,7 @@ Reference< XGraphic > lclCheckAndApplyDuotoneTransform( const
BlipFillProperties
return xGraphic;
}
-Reference< XGraphic > lclCheckAndApplyChangeColorTransform( const
BlipFillProperties , Reference< XGraphic > & xGraphic,
+Reference< XGraphic > lclCheckAndApplyChangeColorTransform( const
BlipFillProperties , Reference< XGraphic > const & xGraphic,
const
GraphicHelper& rGraphicHelper, const sal_Int32 nPhClr )
{
if( aBlipProps.maColorChangeFrom.isUsed() &&
aBlipProps.maColorChangeTo.isUsed() )
@@ -709,8 +709,8 @@ void GraphicProperties::pushToPropMap( PropertyMap&
rPropMap, const GraphicHelpe
if( maBlipProps.mxGraphic.is() )
{
// created transformed graphic
-Reference< XGraphic > xGraphic = lclCheckAndApplyDuotoneTransform(
maBlipProps, maBlipProps.mxGraphic, rGraphicHelper, API_RGB_TRANSPARENT );
-xGraphic = lclCheckAndApplyChangeColorTransform( maBlipProps,
xGraphic, rGraphicHelper, API_RGB_TRANSPARENT );
+Reference< XGraphic > xGraphic =
lclCheckAndApplyChangeColorTransform(maBlipProps, maBlipProps.mxGraphic,
rGraphicHelper, API_RGB_TRANSPARENT);
+xGraphic = lclCheckAndApplyDuotoneTransform(maBlipProps, xGraphic,
rGraphicHelper, API_RGB_TRANSPARENT);
if (eColorMode == ColorMode_STANDARD && nBrightness == 70 && nContrast
== -70)
// map MSO 'washout' to our Watermark colormode
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: shell/source
shell/source/win32/SysShExec.cxx | 22 ++
1 file changed, 22 insertions(+)
New commits:
commit ad711bc6e2cc35c2ed114fff15008d5bbcfcf21c
Author: Thomas Beck <thomas.b...@cib.de>
Date: Wed May 3 12:57:11 2017 +0200
tdf#107587 Opening Hyperlink opens Browser in Background.
Added neccessary WinAPI calls to bring called window into the
Foreground.
Change-Id: I080968f655e2230d1a514b3ef91bf916d904d844
Reviewed-on: https://gerrit.libreoffice.org/37196
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
diff --git a/shell/source/win32/SysShExec.cxx b/shell/source/win32/SysShExec.cxx
index 274f000f05bb..59243289ad1e 100644
--- a/shell/source/win32/SysShExec.cxx
+++ b/shell/source/win32/SysShExec.cxx
@@ -323,6 +323,28 @@ void SAL_CALL CSysShExec::execute( const OUString&
aCommand, const OUString& aPa
static_cast< XSystemShellExecute* >(this),
psxErr);
}
+else
+{
+// Get Permission make changes to the Window of the created Process
+HWND procHandle = 0;
+DWORD procId = GetProcessId(sei.hProcess);
+AllowSetForegroundWindow(procId);
+
+// Get the handle of the created Window
+DWORD check = 0;
+GetWindowThreadProcessId(procHandle, );
+SAL_WARN_IF(check != procId, "shell", "Could not get handle of process
called by shell.");
+
+// Move created Window into the foreground
+if(procHandle != 0)
+{
+SetForegroundWindow(procHandle);
+SetActiveWindow(procHandle);
+}
+}
+
+// Close the handle for the created childprocess when we are done
+CloseHandle(sei.hProcess);
}
// XServiceInfo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: oox/source
oox/source/drawingml/fillproperties.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 184362002955d750c6597a444ae5240cf15932ac
Author: Thomas Beck <thomas.b...@cib.de>
Date: Fri Apr 7 15:04:25 2017 +0200
tdf#106520 xlsx: black square where image should be
Reversed order of Transforms. Duotone will now be applied after a
ColorChange due to the ColorChange Transform not being able to
distinguish the colors properly anymore after Duotone had been applied.
This seems to better match what MSO is doing there.
Change-Id: I6ca66cc411c3e2a3d009325f0f1641c560949a54
Reviewed-on: https://gerrit.libreoffice.org/36263
Reviewed-by: Katarina Behrens <katarina.behr...@cib.de>
Tested-by: Katarina Behrens <katarina.behr...@cib.de>
diff --git a/oox/source/drawingml/fillproperties.cxx
b/oox/source/drawingml/fillproperties.cxx
index 47c15028d5dd..314ff5822695 100644
--- a/oox/source/drawingml/fillproperties.cxx
+++ b/oox/source/drawingml/fillproperties.cxx
@@ -77,7 +77,7 @@ Reference< XGraphic > lclCheckAndApplyDuotoneTransform( const
BlipFillProperties
return xGraphic;
}
-Reference< XGraphic > lclCheckAndApplyChangeColorTransform( const
BlipFillProperties , Reference< XGraphic > & xGraphic,
+Reference< XGraphic > lclCheckAndApplyChangeColorTransform( const
BlipFillProperties , Reference< XGraphic > const & xGraphic,
const
GraphicHelper& rGraphicHelper, const sal_Int32 nPhClr )
{
if( aBlipProps.maColorChangeFrom.isUsed() &&
aBlipProps.maColorChangeTo.isUsed() )
@@ -709,8 +709,8 @@ void GraphicProperties::pushToPropMap( PropertyMap&
rPropMap, const GraphicHelpe
if( maBlipProps.mxGraphic.is() )
{
// created transformed graphic
-Reference< XGraphic > xGraphic = lclCheckAndApplyDuotoneTransform(
maBlipProps, maBlipProps.mxGraphic, rGraphicHelper, API_RGB_TRANSPARENT );
-xGraphic = lclCheckAndApplyChangeColorTransform( maBlipProps,
xGraphic, rGraphicHelper, API_RGB_TRANSPARENT );
+Reference< XGraphic > xGraphic =
lclCheckAndApplyChangeColorTransform(maBlipProps, maBlipProps.mxGraphic,
rGraphicHelper, API_RGB_TRANSPARENT);
+xGraphic = lclCheckAndApplyDuotoneTransform(maBlipProps, xGraphic,
rGraphicHelper, API_RGB_TRANSPARENT);
if (eColorMode == ColorMode_STANDARD && nBrightness == 70 && nContrast
== -70)
// map MSO 'washout' to our Watermark colormode
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Terminology in svtools
Hello Olivier, On Sat, Apr 22, 2017 at 07:43:12PM -0300, Olivier Hallot wrote: > Can some of the developers shed some light in this terminology? > > The word "inverse" is not clear in the context for translators. > > The file is svtools/source/dialogs/so3res.src : > > ERRCODE_SO_MK_REDUCED_TO_SELF_MAX ; >; > < "The connection name has no inverse." ; thank you very much for forwarding my question to the dev ML :) Hopefully you will get an answer soon ... ;) And thank you very much for all your other hard work on the new HC :) @dev-ML: As I am not subscribed to the list, it would be nice to CC me. TIA :) Have a nice Sunday Thomas. -- "Of all the tyrannies that affect mankind, tyranny in religion is the worst." -- Thomas Paine ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: officecfg/registry
officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu | 24 +- 1 file changed, 12 insertions(+), 12 deletions(-) New commits: commit 8438cd334a6116425b1039c34807ddcf54b056f2 Author: Thomas Beck <thomas.b...@cib.de> Date: Thu Apr 6 11:51:59 2017 +0200 tdf#100108 Layout labels not consistent Labels in layout menu are now consistent with the names of the tooltips shown in the layout tab Change-Id: Ie3dd13af03fcd8b29cfb5e9b6e8fe43b1668bc94 Reviewed-on: https://gerrit.libreoffice.org/36196 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Katarina Behrens <katarina.behr...@cib.de> diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu index 409a3d32e9af..d88339f110d0 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu @@ -2115,17 +2115,17 @@ - Blank + Blank Slide - Title + Title Only - Title, Text + Title Slide @@ -2140,27 +2140,27 @@ - Title, 2 Content + Title and 2 Content - Title, Content and 2 Content on Right + Title, Content and 2 Content - Title, 2 Content on Left and Content + Title, 2 Content and Content - Title, Content above Content + Title, Content over Content - Title, 2 Content above Content + Title, 2 Content over Content @@ -2175,22 +2175,22 @@ - Title, Content (Vertical) + Vertical Title, Vertical Text - Title, Content over Content (Vertical) + Vertical Title, Text, Chart - Title, Vertical Content + Title, Vertical Text - Title, 2 Vertical Content + Title, 2 Vertical Text, Clipart ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: officecfg/registry
officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu |4 1 file changed, 4 insertions(+) New commits: commit 8a6c538742bc9c25ae0c459c83631ec5ae030001 Author: Thomas Beck <thomas.b...@cib.de> Date: Wed Apr 5 13:32:54 2017 +0200 tdf#98604 Added requested panels to sidebar Added Text and Paragraph parameter panels to Sidebar if a line is drawn Change-Id: I3a6dc3b34671dbf75084048c39fdbc040cf27d76 Reviewed-on: https://gerrit.libreoffice.org/36139 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Katarina Behrens <katarina.behr...@cib.de> diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu index 3739d1af141c..5787aeff01ae 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu @@ -349,11 +349,13 @@ Calc, Cell, visible, .uno:CellTextDlg ; Calc, default,visible, .uno:CellTextDlg ; Calc, DrawText, visible; +Calc, DrawLine, hidden ; Calc, EditCell, visible; Calc, Pivot, visible, .uno:CellTextDlg ; DrawImpress, 3DObject, visible; DrawImpress, Draw, hidden ; DrawImpress, DrawText, visible; +DrawImpress, DrawLine, hidden ; DrawImpress, Graphic,hidden ; DrawImpress, OutlineText,visible; DrawImpress, Table, visible; @@ -1072,6 +1074,8 @@ Calc, DrawText, visible ; +Calc, DrawLine, hidden ; +DrawImpress,DrawLine, hidden ; DrawImpress,3DObject, hidden ; DrawImpress,Draw, hidden ; DrawImpress,DrawText, visible ; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - cui/uiconfig
cui/uiconfig/ui/tsaurldialog.ui | 66 +--- 1 file changed, 29 insertions(+), 37 deletions(-) New commits: commit c15eba1b1de9c41acd76f0b2a16cfbe38bf4fccb Author: Thomas Beck <thomas.b...@cib.de> Date: Tue Apr 4 13:31:22 2017 +0200 tdf#106938 TSA Dialog: Improve Dialog Layout Moved Label above the content area Change-Id: I0a23af5540bedc849c83fd342ac43538827e6b4a Reviewed-on: https://gerrit.libreoffice.org/36071 Reviewed-by: Samuel Mehrbrodt <samuel.mehrbr...@cib.de> Tested-by: Samuel Mehrbrodt <samuel.mehrbr...@cib.de> (cherry picked from commit 3873669fef3cac05a9b530de08f15e0d2a3fdc57) Reviewed-on: https://gerrit.libreoffice.org/36105 Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com> Tested-by: Adolfo Jayme Barrientos <fit...@ubuntu.com> diff --git a/cui/uiconfig/ui/tsaurldialog.ui b/cui/uiconfig/ui/tsaurldialog.ui index c1d6bc0a655a..172970d3d9e1 100644 --- a/cui/uiconfig/ui/tsaurldialog.ui +++ b/cui/uiconfig/ui/tsaurldialog.ui @@ -1,7 +1,6 @@ - - + False 6 @@ -118,16 +117,15 @@ 6 12 - + True False -True -True -6 +vertical True False +6 0 0 Add or delete Time Stamp Authority URLs @@ -136,8 +134,25 @@ 60 -0 -0 +False +True +0 + + + + +True +True +True +True + + + + + +False +True +1 @@ -154,6 +169,8 @@ 2 0 +1 +1 @@ -164,37 +181,11 @@ -0 -1 - - - - -True -True -True -True -in - - -True -True -True -True - - - - - - - -1 -0 +False +True +2 - - - @@ -220,6 +211,7 @@ help + delete add ok cancel ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/uiconfig
cui/uiconfig/ui/tsaurldialog.ui | 66 +--- 1 file changed, 29 insertions(+), 37 deletions(-) New commits: commit 3873669fef3cac05a9b530de08f15e0d2a3fdc57 Author: Thomas Beck <thomas.b...@cib.de> Date: Tue Apr 4 13:31:22 2017 +0200 tdf#106938 TSA Dialog: Improve Dialog Layout Moved Label above the content area Change-Id: I0a23af5540bedc849c83fd342ac43538827e6b4a Reviewed-on: https://gerrit.libreoffice.org/36071 Reviewed-by: Samuel Mehrbrodt <samuel.mehrbr...@cib.de> Tested-by: Samuel Mehrbrodt <samuel.mehrbr...@cib.de> diff --git a/cui/uiconfig/ui/tsaurldialog.ui b/cui/uiconfig/ui/tsaurldialog.ui index c1d6bc0a655a..172970d3d9e1 100644 --- a/cui/uiconfig/ui/tsaurldialog.ui +++ b/cui/uiconfig/ui/tsaurldialog.ui @@ -1,7 +1,6 @@ - - + False 6 @@ -118,16 +117,15 @@ 6 12 - + True False -True -True -6 +vertical True False +6 0 0 Add or delete Time Stamp Authority URLs @@ -136,8 +134,25 @@ 60 -0 -0 +False +True +0 + + + + +True +True +True +True + + + + + +False +True +1 @@ -154,6 +169,8 @@ 2 0 +1 +1 @@ -164,37 +181,11 @@ -0 -1 - - - - -True -True -True -True -in - - -True -True -True -True - - - - - - - -1 -0 +False +True +2 - - - @@ -220,6 +211,7 @@ help + delete add ok cancel ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: xmloff/source
xmloff/source/draw/ximppage.cxx |2 +-
xmloff/source/draw/ximpshap.cxx | 24
xmloff/source/draw/ximpstyl.cxx | 26 +-
xmloff/source/style/xmlexppr.cxx |2 +-
xmloff/source/style/xmlnumi.cxx | 16
5 files changed, 35 insertions(+), 35 deletions(-)
New commits:
commit 659cb8466495a15a680f684ec4aa1f1d3c4225cc
Author: Thomas Beck <thomas.b...@cib.de>
Date: Tue Mar 28 12:34:19 2017 +0200
tdf#96505 Get rid of cargo cult "long" integer literals
Removed "long" integer literals where applicable in some files of xmloff
module
Change-Id: I96f44c00583a95f8a0ae6acf25f439936433ac08
Reviewed-on: https://gerrit.libreoffice.org/35798
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Michael Stahl <mst...@redhat.com>
diff --git a/xmloff/source/draw/ximppage.cxx b/xmloff/source/draw/ximppage.cxx
index 6b37ecf5da98..dcc94e696e11 100644
--- a/xmloff/source/draw/ximppage.cxx
+++ b/xmloff/source/draw/ximppage.cxx
@@ -460,7 +460,7 @@ void SdXMLGenericPageContext::DeleteAllShapes()
while(mxShapes->getCount())
{
Reference< drawing::XShape > xShape;
-uno::Any aAny(mxShapes->getByIndex(0L));
+uno::Any aAny(mxShapes->getByIndex(0));
aAny >>= xShape;
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index 0eb5f9b38e8b..8f7196801da5 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -933,7 +933,7 @@ SdXMLRectShapeContext::SdXMLRectShapeContext(
uno::Reference< drawing::XShapes >& rShapes,
bool bTemporaryShape)
: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes,
bTemporaryShape ),
-mnRadius( 0L )
+mnRadius( 0 )
{
}
@@ -998,10 +998,10 @@ SdXMLLineShapeContext::SdXMLLineShapeContext(
uno::Reference< drawing::XShapes >& rShapes,
bool bTemporaryShape)
: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes,
bTemporaryShape ),
-mnX1( 0L ),
-mnY1( 0L ),
-mnX2( 1L ),
-mnY2( 1L )
+mnX1( 0 ),
+mnY1( 0 ),
+mnX2( 1 ),
+mnY2( 1 )
{
}
@@ -1077,9 +1077,9 @@ void SdXMLLineShapeContext::StartElement(const
uno::Reference< xml::sax::XAttrib
uno::Reference< beans::XPropertySet > xPropSet(mxShape,
uno::UNO_QUERY);
if(xPropSet.is())
{
-drawing::PointSequenceSequence aPolyPoly(1L);
+drawing::PointSequenceSequence aPolyPoly(1);
drawing::PointSequence* pOuterSequence = aPolyPoly.getArray();
-pOuterSequence->realloc(2L);
+pOuterSequence->realloc(2);
awt::Point* pInnerSequence = pOuterSequence->getArray();
*pInnerSequence = awt::Point( mnX1 - aTopLeft.X, mnY1 -
aTopLeft.Y);
@@ -,10 +,10 @@ SdXMLEllipseShapeContext::SdXMLEllipseShapeContext(
uno::Reference< drawing::XShapes >& rShapes,
bool bTemporaryShape)
: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes,
bTemporaryShape ),
-mnCX( 0L ),
-mnCY( 0L ),
-mnRX( 1L ),
-mnRY( 1L ),
+mnCX( 0 ),
+mnCY( 0 ),
+mnRX( 1 ),
+mnRY( 1 ),
meKind( drawing::CircleKind_FULL ),
mnStartAngle( 0 ),
mnEndAngle( 0 )
@@ -2242,7 +2242,7 @@ SdXMLCaptionShapeContext::SdXMLCaptionShapeContext(
bool bTemporaryShape)
: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes,
bTemporaryShape ),
// #86616# for correct edge rounding import mnRadius needs to be
initialized
-mnRadius( 0L )
+mnRadius( 0 )
{
}
diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx
index 88efe5bb46c0..010c16ab6669 100644
--- a/xmloff/source/draw/ximpstyl.cxx
+++ b/xmloff/source/draw/ximpstyl.cxx
@@ -290,12 +290,12 @@ SdXMLPageMasterStyleContext::SdXMLPageMasterStyleContext(
const OUString& rLName,
const uno::Reference< xml::sax::XAttributeList>& xAttrList)
: SvXMLStyleContext(rImport, nPrfx, rLName, xAttrList,
XML_STYLE_FAMILY_SD_PAGEMASTERSTYLECONEXT_ID),
-mnBorderBottom( 0L ),
-mnBorderLeft( 0L ),
-mnBorderRight( 0L ),
-mnBorderTop( 0L ),
-mnWidth( 0L ),
-mnHeight( 0L ),
+mnBorderBottom( 0 ),
+mnBorderLeft( 0 ),
+mnBorderRight( 0 ),
+mnBorderTop( 0 ),
+mnWidth( 0 ),
+mnHeight( 0 ),
meOrientation(GetSdImport().IsDraw() ? view::PaperOrientation_PORTRAIT :
view::PaperOrientation_LANDSCAPE)
{
// set family to something special at SvXMLStyleContext
@@ -679,10 +679,10 @@
SdXMLPresentationPlaceholderContext::SdXMLPresentationPlaceholderContext(
OUString& rLName,
const uno::Reference< xml::sax::XAttributeList>& xAttrList)
: SvXMLImportContext( rImport, nPrfx, rLName),
-mnX(0L),
-mnY(0L),
-mnWidth(1L),
-mnHeight(1L)
+mnX(0),
+mnY
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/ww8par3.cxx | 291 ++-
1 file changed, 141 insertions(+), 150 deletions(-)
New commits:
commit 5138170a4a3595d6b631b33c54f7aa166ce4639b
Author: Thomas Beck <thomas.b...@cib.de>
Date: Mon Mar 27 16:39:42 2017 +0200
tdf#39468 Comment translation GER-ENG
translated comments in sw/source/filter/ww8par3.cxx
Change-Id: I40b41cecb1c73b9678c51d7e4dc41745a96a243f
Reviewed-on: https://gerrit.libreoffice.org/35765
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index 990971d22d0c..4d23a150ac37 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -303,29 +303,29 @@ void SwWW8ImplReader::DeleteFormImpl()
m_pFormImpl = nullptr;
}
-// Hilfs-Deklarationen
+// Helper declarations
// Style Id's for each level
typedef sal_uInt16 WW8aIdSty[WW8ListManager::nMaxLevel];
-// Zeichenattribute aus GrpprlChpx
+// Character attributes from GrpprlChpx
typedef SfxItemSet* WW8aISet[WW8ListManager::nMaxLevel];
-// Zeichen Style Pointer
+// Character Style Pointer
typedef SwCharFormat* WW8aCFormat[WW8ListManager::nMaxLevel];
-struct WW8LST // nur DIE Eintraege, die WIR benoetigen!
+struct WW8LST // only THOSE entries, WE need!
{
WW8aIdSty aIdSty; // Style Id's for each level,
// nIStDNil if no style linked
sal_uInt32 nIdLst; // Unique List ID
-sal_uInt32 nTplC; // Unique template code - Was ist das bloss?
-bool bSimpleList:1;// Flag: Liste hat nur EINEN Level
-bool bRestartHdn:1;// WW6-Kompatibilitaets-Flag:
+sal_uInt32 nTplC; // Unique template code - What is this?
+bool bSimpleList:1;// Flag: List only has ONE level
+bool bRestartHdn:1;// WW6-Combatibility-Flag:
// true if the list
should start numbering over
}; // at the beginning
of each section
const sal_uInt32 cbLSTF=28;
-struct WW8LFO // nur DIE Eintraege, die WIR benoetigen!
+struct WW8LFO // only THOSE entries, WE need!
{
SwNumRule* pNumRule; // Parent NumRule
sal_uInt32 nIdLst; // Unique List ID
@@ -333,28 +333,28 @@ struct WW8LFO // nur DIE Eintraege, die WIR benoetigen!
bool bSimpleList;
};
-struct WW8LVL // nur DIE Eintraege, die WIR benoetigen!
+struct WW8LVL // only THE entries, WE need!
{
sal_Int32 nStartAt; // start at value for this value
-sal_Int32 nV6DxaSpace;// Ver6-Compatible: min Space between Num anf
text::Paragraph
-sal_Int32 nV6Indent; // Ver6-Compatible: Breite des Prefix Textes; ggfs.
zur
-// Definition d. Erstzl.einzug nutzen!
-// Absatzattribute aus GrpprlPapx
-sal_uInt16 nDxaLeft; // linker Einzug
-short nDxaLeft1; // Erstzeilen-Einzug
+sal_Int32 nV6DxaSpace;// Ver6-Compatible: min Space between Num and
text::Paragraph
+sal_Int32 nV6Indent; // Ver6-Compatible: Width of prefix text;
+// Use definition of first line indent if appropriate!
+// Paragraph attributes from GrpprlPapx
+sal_uInt16 nDxaLeft; // left indent
+short nDxaLeft1; // first line indent
sal_uInt8 nNFC; // number format code
-// Offset der Feldkodes im Num-X-String
+// Offset of fieldcodes in Num-X-String
sal_uInt8 aOfsNumsXCH[WW8ListManager::nMaxLevel];
sal_uInt8 nLenGrpprlChpx; // length, in bytes, of the LVL's grpprlChpx
sal_uInt8 nLenGrpprlPapx; // length, in bytes, of the LVL's grpprlPapx
sal_uInt8 nAlign: 2; // alignment (left, right, centered) of the number
-sal_uInt8 bLegal:1; // egal
-sal_uInt8 bNoRest:1; // egal
+sal_uInt8 bLegal:1; // doesn't matter
+sal_uInt8 bNoRest:1; // doesn't matter
sal_uInt8 bV6Prev:1; // Ver6-Compatible: number will include previous
levels
-sal_uInt8 bV6PrSp:1; // Ver6-Compatible: egal
-sal_uInt8 bV6: 1; // falls true , beachte die V6-Compatible
Eintraege!
-sal_uInt8 bDummy: 1; // (macht das Byte voll)
+sal_uInt8 bV6PrSp:1; // Ver6-Compatible: doesn't matter
+sal_uInt8 bV6: 1; // if true, pay attention to the V6-Compatible
Entries!
+sal_uInt8 bDummy: 1; // (fills the byte)
};
@@ -363,8 +363,8 @@ struct WW8LFOLVL
sal_Int32 nStartAt; // start-at value if bFormat==false and
bStartAt == true
// (if bFormat==true, the start-at
is stored in the LVL)
sal_uInt8 nLevel; // the level to be overridden
-// dieses Byte ist _absichtlich_ nicht in das folgende Byte hineingepackt
!!
-// (siehe Kommentar unten bei struct WW8LFOInfo)
[Libreoffice-qa] First draft for the TestLink admin guide
Hello Sophie, *, after playing around a bit, I have started to write the admin guide for TestLink at https://wiki.documentfoundation.org/TestLink/Admin_Guide, though I am still at the beginning of experimenting with TestLink and also with the documentation of it (found some strange behaviours on TestLink with my admin account as well as a newly created tester where I need to search for a solution on TestLink's documentation and / or issue tracker... :( ). I hope I will find some time the next days to add further details for it, but would be glad to have some proofreaders and especially any opinions here: what do you think about it? Am I "on the right track" (i.e. should I continue with it that way or would you prefer to see descriptions from every link beginning on the top left to the bottom right with its linked sides)? My idea was to start with user creation (maybe deletion as well) and assigning roles, later adding test projects for several NL communities, adding a Bugzilla (or maybe Redmine, if I cannot find a quick instruction to add ours to TestLink ... ;) ), and let all test related description go to the user guide ... ;) But maybe has some better / additional idea what could be added there ... ;) Have a nice evening Thomas. ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: https://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] TestLink to replace MozTrap, your help is wanted ; )
Hello Sophie, *, On 7/3/2017 14:34 Sophie wrote: > Le 07/03/2017 à 14:27, Thomas Hackert a écrit : >>> Thank you so much for your offer to help :-) I would like to document >>> the tool before launching it so please register to TestLink on our vm >>> and then, I'll grant you admin rights and you'll be able to have a full >>> overview of the tool. >> >> [done] ... ;) Registered as "thackert" there. > > And I granted you admin rights, you are now able to have a tour on all > functionalities :) Let me know if you have questions thank you very much for this quick change :) I will have a careful look there later today :) Thomas. ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: https://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] LibreOffice Online and Collabora Online demos for TDF members and contributors
Hello Michael, *, On 7/3/2017 14:21 Michael Meeks wrote: > On 07/03/17 12:21, Thomas Hackert wrote: >> sorry for this late answer > > No problem at all =) :) >> thank you very much for bringing this to a wider audience :) > > Our pleasure. :) >> Where should we report bugs found in LOOL? In our Bugzilla, here on >> this list or somewhere else? > > Bugs found against the TDF / master belong (if they are LibreOffice > Online, or LibreOffice bugs) at: > > https://bugs.documentfoundation.org/ > > vs. the 'LibreOffice Online' product if they are specific to online. If O.K. > they are bugs in the ownCloud / Nextcloud integration I guess they > belong at the relevant project's bug-trackers; I assume that Aron knows > where that is =) If it is clear that the bug is not LO/LOOL related, I will it report there ... ;) Thanks for your answer Thomas. ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: https://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] LibreOffice Online and Collabora Online demos for TDF members and contributors
Hello Andras, *, On 7/3/2017 13:31 Andras Timar wrote: > On Tue, Mar 7, 2017 at 1:21 PM, Thomas Hackert <thack...@nexgo.de> wrote: > >> Where should we report bugs found in LOOL? In our Bugzilla, here on >> this list or somewhere else? >> Have a nice afternoon >> Thomas. >> > > Please report LOOL bugs in TDF Bugzilla. There is the LibreOffice Online > product/project . > https://bugs.documentfoundation.org/enter_bug.cgi?product=LibreOffice%20Online O.K. Thank you very much for your answer :) Have a nice afternoon Thomas. ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: https://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] LibreOffice Online and Collabora Online demos for TDF members and contributors
Hello Michael, *, sorry for this late answer but for whatever reason I was not able to send mails via GMane the last weeks and did not find the time to search for a solution ... :( On 21/2/2017 11:37 Michael Meeks wrote: > We are happy to announce two demo servers: > > 1. LibreOffice Online powered by LibreOffice, weekly snapshot of >master branches of online and core repositories, with ownCloud 9.1 > > https://demo.collaboracloudsuite.com/tdf/ > > Here is where you can checkout the latest features, latest > translations, and help file and fix the latest bugs. > > 2. Collabora Online demo, the stable product from Collabora with Nextcloud 11 > https://demo.collaboracloudsuite.com/tdfnextcloud/ thank you very much for bringing this to a wider audience :) > We're eager to change that: there is lots of low hanging fruit here > for developers, and we love contributions. So please get testing, and > contributing to the code - patches welcome in gerrit and on the > development mailing lists. Where should we report bugs found in LOOL? In our Bugzilla, here on this list or somewhere else? Have a nice afternoon Thomas. ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: https://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] TestLink to replace MozTrap, your help is wanted ; )
Hello Sophie, *, On 6/3/2017 17:26 Sophie wrote: > Le 06/03/2017 à 15:18, Pedro a écrit : >> sophi wrote >>> As you may not know, we are migrating to TestLink instead of MozTrap to >>> manage and run LibreOffice manual tests. >>> The instance is here for the moment: >>> https://vm182.documentfoundation.org/ >> >> Excellent news! >> IMO this project could benefit from real users testing real documents! > > yes :) :) I would like to offer my help with testing and documenting this :) How should I proceed? Register myself to TestLink on our vm or should I wait for Guilhem implementing the SSO mentioned below? And how do I get access to the vm to help documenting the steps done? >> Would it be possible to use the TDF login mentioned by Michael (Meeks) so >> that there is no need for yet another registration? >> >>> + online/TDF/LDAP accounts etc. (Michael) >>> + https://user.documentfoundation.org > > Guilhem will have a look and I'll let you know if LDAP support in > TestLink is talking with ours ;) I have found http://forum.testlink.org/viewtopic.php?f=52=7493=18448=SSO#p18448 where $tlCfg->authentication['SSO_enabled'] = false; $tlCfg->authentication['SSO_method'] = 'CLIENT_CERTIFICATE'; $tlCfg->authentication['SSO_uid_field'] = 'SSL_CLIENT_S_DN_Email'; is mentioned. Maybe changing this to $tlCfg->authentication['SSO_enabled'] = true; $tlCfg->authentication['SSO_method'] = 'CLIENT_CERTIFICATE'; $tlCfg->authentication['SSO_uid_field'] = 'SSL_CLIENT_S_DN_Email'; and maybe the last line to $tlCfg->authentication['SSO_uid_field'] = 'SSL_CLIENT_S_DN_Loginname'; or something like that in its config file could help here? Thanks for your work on TestLink and have a nice day Thomas. ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: https://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] minutes of ESC call ...
Michael Meeks wrote: > On 17/02/17 11:41, Pedro wrote: >> Is TDF hosting a free account version of LOO (not a nice acronym >> for British English people ;) ) at least for testing purposes? > > Heh - so - Collabora is already hosting that as a service for the > community - with integration into the above LDAP-ness (please do > create an account there). It already works but is not yet > announced: we're expediting that =) happy to send anyone details > privately there. Yes, please :) As a translator, I would be glad to see, where our translations are ... ;) It is not that obvious to see in my demo account @ demo.collaboraonline ... :( >> How is LibreOffice Online comparable with Collabora Online? > > https://www.collaboraoffice.com/community-en/understanding-the-differences-between-libreoffice-online-code-and-collabora-online/ Thank you very much for this link :) Have a nice day Thomas. -- NP: Confusion Is Next – Chlorine ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: https://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-qa] Doubled "are listed" in Unit #117794159 in shared.po?
Hello @ll, I found this: Replacement options are listed are listed under the Find box and in the Other options area of the dialog. I think this should be Replacement options are listed under the Find box and in the Other options area of the dialog. (found in https://translations.documentfoundation.org/de/libo_help/translate/shared/01.po#unit=117794159) HTH Thomas. -- An optimist believes we live in the best world possible; a pessimist fears this is true. ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: https://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-qa] Where should "Get Help Online" entry lands in non-English versions?
Hi @ll, just out of interest: if I go to "Help - Get Help Online..." (or "Hilfe - Hilfe online erhalten..." in German), it opens a tab in my browser with the URL http://www.libreoffice.org/?LOlang=de. If using English UI language, this leads to http://www.libreoffice.org/?LOlang=en. Interestingly, both show the main page (http://www.libreoffice.org), but not e.g. http://www.libreoffice.org/get-help or http://www.libreoffice.org/get-help/community-support (or for the German version https://de.libreoffice.org/get-help/feedback/). Is this intended or is it a bug? And if this is a bug: does anybody know if it is already reported? OS: Debian Testing AMD64 LO: Version: 5.3.0.0.beta1+ Build-ID: 1093721a260d25f986fd794acd914b8fb7bcf92a CPU-Threads: 4; BS-Version: Linux 4.5; UI-Render: Standard; VCL: gtk2; Layout-Engine: neu; TinderBox: Linux-rpm_deb-x86_64@70-TDF, Branch:libreoffice-5-3, Time: 2016-12-10_03:55:11 Gebietsschema: de-DE (de_DE.UTF-8); Calc: group (parallel installed, following the instructions from https://wiki.documentfoundation.org/Installing_in_parallel/Linux) Have a nice afternoon Thomas. -- NP: Godflesh – Kingdom Come (Version) ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: https://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: Ask for help - disable OpenCL via config-file (*.xcu) or registry-key
Thanks Regina, Miklos, I have put your answers in ask.libreoffice.org assign to the questioner. Hope, it wioll help him. @Miklos: to try to extract a xcu file from dif in registrationmodification.xcu is normally not really sufficient. I did not have luck with my tries;) Thanks for your help, best regards Thomas Am 14.10.2016 um 11:31 schrieb Regina Henschel: Hi Thomas, Thomas Krumbein schrieb: Hey all, there is a technical question in german ask.libreoffice.org system I cannot answer. Maybe someone can help? I will pass the answer. # original message: "Hallo, wir nutzen LibreOffice in unseren Schule für ca. 3500 Accounts. Jetzt haben wir festgestellt, dass bei Impress im einer Fehler "fatal error" auftritt. Wir haben rausgefunden, dass dies mit der Hardwarebeschleunigung, Kantenglättung und OpenGL zusammenhängt. Kann mir bitte jemand die Registry-Keys zum Deaktiveren der Hardwarebeschleunigung und der Kantenglättung verraten? Zum deaktiveren von OpenGL habe ich schon ein Admx-Template gefunden. Vielen Dank" ## free translation: it is a school and the are using 3500 seats with LibreOffice. They do have a problem in Impress "fatal error" (crash) - this is a problem with OpenGL, edge smoothing and hardware acceleration options. Now they want to disable this options via Windows registry-Key. ## It would help if we have a caonfiguration file (*.xcu) - I can translate this to an registry key;) A registry fragment to disable OpenGL is attached to https://bugs.documentfoundation.org/show_bug.cgi?id=93546 Kind regards Regina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Ask for help - disable OpenCL via config-file (*.xcu) or registry-key
Hey all, there is a technical question in german ask.libreoffice.org system I cannot answer. Maybe someone can help? I will pass the answer. # original message: "Hallo, wir nutzen LibreOffice in unseren Schule für ca. 3500 Accounts. Jetzt haben wir festgestellt, dass bei Impress im einer Fehler "fatal error" auftritt. Wir haben rausgefunden, dass dies mit der Hardwarebeschleunigung, Kantenglättung und OpenGL zusammenhängt. Kann mir bitte jemand die Registry-Keys zum Deaktiveren der Hardwarebeschleunigung und der Kantenglättung verraten? Zum deaktiveren von OpenGL habe ich schon ein Admx-Template gefunden. Vielen Dank" ## free translation: it is a school and the are using 3500 seats with LibreOffice. They do have a problem in Impress "fatal error" (crash) - this is a problem with OpenGL, edge smoothing and hardware acceleration options. Now they want to disable this options via Windows registry-Key. ## It would help if we have a caonfiguration file (*.xcu) - I can translate this to an registry key;) Best regards Thomas ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-qa] Dummy Text in master does not work any longer?
Hello Xisco, *, Xisco Faulí wrote: > it's a bug: > https://bugs.documentfoundation.org/show_bug.cgi?id=101725 thanks for your answer and the link :) Have a nice day Thomas. -- A good USENET motto would be: a. "Together, a strong community." b. "Computers R Us." c. "I'm sick of programming, I think I'll just screw around for a while on company time." -- A Sane Man ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: https://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Bug 101213 (Marqeaux) - New Upgrade very slow in calc (5.1.5 vs 5.1.4)
Hello Miguel, *,
m.a.riosv wrote:
> could someone test this issue for Linux, if reproducible maybe
> critical. There are three users that can reproduce it.
it seems, that they report it for their LO version of their used
distro ... ;) Not sure, if they should report it there (at Ubuntu's
/ Linux Mint's / whatever bugtracker, that is ... ;) ).
And as they mention different observations in their use of Calc
("screen rendering is slow", "recalculating the spreadsheet", etc.),
I think it would be difficult to reproduce without
a. either a step by step instruction, so others can try to reproduce
it
or
b. a test document, with which this bug is reproducible.
Otherwise it would be difficult find out if it is really a bug or
just some kind of perceptional meaning ... ;)
Another idea would be to find out if their LO is recognizing their
installed Java™ version and/or if en|disabling OpenCL changes
anything.
HTH
Thomas (who hopefully will find the time later this day to write
this to the bug as well ... ;) ).
--
"Remember, extremism in the nondefense of moderation is not a
virtue."
-- Peter Neumann, about usenet
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: https://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Click on link in installed help crashes LO master
Hello Pedro, *, Pedro wrote: > Thomas Hackert wrote >> Would someone be so kind to test it on his/her system, please? > > Crashed under Windows 7 x64 as well thanks for confirming :) > Used build > Version: 5.3.0.0.alpha0+ > Build ID: 4da8378302093dd3e3dc3e201ac5e188c55f8009 > CPU Threads: 4; OS Version: Windows 6.1; UI Render: default; > TinderBox: Win-x86@62-merge-TDF, Branch:MASTER, Time: > 2016-07-22_13:59:23 Locale: pt-PT (pt_PT); Calc: group > > Link to the brand new automated crash report > crashreport.libreoffice.org/stats/crash_details/790f41b4-211c-484f- b88d-15bdb8453225 I would be glad, if the GNU/Linux versions were listed at the crashreport site as well. > Hope this helps! As Caolán has confirmed and fixed it in the meantime, I hope he can use this additional info somehow ... ;) Have a nice day Thomas. -- Q: What's the difference between an Irish wedding and an Irish wake? A: One less drunk. ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: https://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Click on link in installed help crashes LO master
Hello Caolán, *, Caolán McNamara wrote: > On Mon, 2016-07-25 at 13:18 +0200, Thomas Hackert wrote: >> I found a weird (and hopefully reproducible by others ... ;) ) >> bug in master: >> >> 1. Download LO master and install it parallel to your normal LO >> 2. Start LO master >> 3. Press >> 4. Press on any link on the right side > > Reproducible, fixed with > https://cgit.freedesktop.org/libreoffice/core/ > commit/?id=431730d7e846a6c3b3b574a7efb21d17a9eded21 thanks for confirming and fixing it :) Have a nice day Thomas. -- It's computer hardware, of course it's worth having -- Espy on #Debian ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: https://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-qa] Click on link in installed help crashes LO master
Hello @ll, I found a weird (and hopefully reproducible by others ... ;) ) bug in master: 1. Download LO master and install it parallel to your normal LO 2. Start LO master 3. Press 4. Press on any link on the right side On my system OS: Debian Testing AMD64 LO: master~2016-07-20_23.34.15_LibreOfficeDev_5.3.0.0.alpha0_Linux_x86-64_deb* with installed en_US lang- as well as helppack (sorry have not installed it any longer nor its tarballs ... :( ) and LO: Version: 5.3.0.0.alpha0+ Build-ID: f9f090d0d0f2b454d6c1dd14fe735e7e83fda9da CPU-Threads: 4; BS-Version: Linux 4.5; UI-Render: Standard; TinderBox: Linux-rpm_deb-x86_64@70-TDF, Branch:master, Time: 2016-07-24_06:28:54 Gebietsschema: de-DE (de_DE.UTF-8); Calc: group with installed de_DE, en_US and qtz lang- as well as helppacks (parallel installed, following the instructions from https://wiki.documentfoundation.org/Installing_in_parallel/Linux). And it does not matter which UI language I use: LO crashes immediately ... :( I cannot reproduce this crash with LO: Version: 5.2.0.3 Build-ID: 7dbd85f5a18cfeaf6801c594fc43a5edadc2df0c CPU-Threads: 4; BS-Version: Linux 4.5; UI-Render: Standard; Gebietsschema: de-DE (de_DE.UTF-8) nor with LO: Version: 5.2.1.0.0+ Build-ID: 77421906467e93e06c90740fb4ff95e7b8f8834b CPU-Threads: 4; BS-Version: Linux 4.5; UI-Render: Standard; TinderBox: Linux-rpm_deb-x86_64@70-TDF, Branch:libreoffice-5-2, Time: 2016-07-24_14:25:07 Gebietsschema: de-DE (de_DE.UTF-8); Calc: group nor with LO: Version: 5.1.5.1 Build ID: 1:5.1.5~rc1-1 CPU Threads: 4; OS Version: Linux 4.5; UI Render: GL; Locale: de-DE (de_DE.UTF-8); Calc: group (Debian's own version). Would someone be so kind to test it on his/her system, please? TIA Thomas. -- NP:: Fresh Body Shop – No One Is around You ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: https://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Changing "Tools - Options - LibreOffice - Paths" crashes 5.2.0.3 on Debian
Hello Robinson, *, Robinson Tryon wrote: > On Thu, Jul 21, 2016 at 7:10 AM, Thomas Hackert > <thack...@nexgo.de> wrote: >> I opened bug #101054 >> (https://bugs.documentfoundation.org/show_bug.cgi?id=101054) a >> couple of minutes ago. Would someone be so kind to have a look at >> it, please? Steps to reproduce are mentioned in the bug report, >> and I have also attached a compressed backtrace and strace ... ;) >> TIA >> Thomas (who hopes, that it is not an obscure bug, where he is the >> only one who can reproduce it ... :( ). > > Tried and failed to repro on Ubuntu 14.04. Any special tricks to > exercise the problem? ;-) not as far as I know. Maybe different Java version, hardware, bad luck, or something else? I can reproduce it with different versions from LO, beginning from 5.2.0.3, whereas 5.2.0.2 and earlier 5.2 versions were not crashing at that step ... > (Also added versions for 5.2.0.2 and 5.2.0.3 to Bugzilla. Let me > know if any other versions are missing) Thank you very much, and for changing my bug adequately :) Have a nice afternoon Thomas. -- Ada, the only language written to milspec. ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: https://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-qa] Changing "Tools - Options - LibreOffice - Paths" crashes 5.2.0.3 on Debian
Hi @ll, I opened bug #101054 (https://bugs.documentfoundation.org/show_bug.cgi?id=101054) a couple of minutes ago. Would someone be so kind to have a look at it, please? Steps to reproduce are mentioned in the bug report, and I have also attached a compressed backtrace and strace ... ;) TIA Thomas (who hopes, that it is not an obscure bug, where he is the only one who can reproduce it ... :( ). -- A strong conviction that something must be done is the parent of many bad measures. -- Daniel Webster ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: https://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] [Writer] Inserting dummy text, changing font to a non-existing one leads to grey menues in 5.2.0.0RC1
Hello Richard, *, Richard wrote: > Just tried this on my System: > Host: mx64 Kernel: 4.5.0-0.bpo.2-amd64 x86_64 (64 bit gcc: 4.9.2) > Desktop: Xfce 4.12.2 (Gtk 2.24.25) > Distro: MX-15_x64 Fusion 24 December 2015 (based on Jessie v8.5) > > I see nothing untoward, but then I have no uninstalled fonts like > Calligula. I have installed the ttf-mscorefonts-installer and all > it's baggage so files from MS users are usually not a problem. thanks for testing :) I am not even sure, if there is a font called "Calligula" ... ;) As written in my first mail, I used it to use a font, which is not installed on my system ... ;) I am using LO's font replacement for other fonts like "Arial", "Times New Roman" and the like ... ;) Have a nice evening Thomas. -- NP: Jennifer Rostock – Insekten im Eis ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: https://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] [Writer] Inserting dummy text, changing font to a non-existing one leads to grey menues in 5.2.0.0RC1
Hello V Stuart, *, V Stuart Foote wrote: > Tested your exact STR on Windows 10 Pro 64-bit en-US with > Version: 5.2.0.1 (x64) > Build ID: fcbcb4963bda8633ba72bd2108ca1e802aad557d > CPU Threads: 8; OS Version: Windows 6.19; UI Render: GL; > Locale: en-US (en_US) > > Can not reproduce on Windows. So, for others can you identify > your Debian Desktop Environment and theme. Sure. XFCE 4.12-3 but do not ask me, what theme (xfce-kde2? microdeck?). Maybe I will have the time to find this out later ... ;) Thanks for testing and have a nice evening Thomas. -- Ocean: A body of water occupying about two-thirds of a world made for man --who has no gills. -- Ambrose Bierce ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: https://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-qa] [Writer] Inserting dummy text, changing font to a non-existing one leads to grey menues in 5.2.0.0RC1
Hello @ll, while trying to reproduce bug 100318, I stumbled upon the following (originally reported to the German discuss list, but found a shorter way to reproduce it): 1. start Writer 2. enter "dt" and press 3. press to mark the whole text 4. press on the arrow right of the font name in the toolbar Standard 5. insert the name of a font, which is not installed on your system (e.g. "Calligula") 5. zoom your document to 180% or the like 6. press + (or , it does not matter) On my system OS: Debian Testing AMD64 LO: Version: 5.2.0.1 Build ID: fcbcb4963bda8633ba72bd2108ca1e802aad557d CPU Threads: 4; OS Version: Linux 4.5; UI Render: default; Locale: de-DE (de_DE.UTF-8) (parallel installed, following the instructions from https://wiki.documentfoundation.org/Installing_in_parallel/Linux) the menues are grey, without any text, visible hints for submenues, etc. ... :( Is someone else able to confirm tthis? I cannot reproduce it with Debian's LO Version: 5.1.4.2 Build-ID: 1:5.1.4~rc2-2 CPU-Threads: 4; BS-Version: Linux 4.5; UI-Render: Standard; Gebietsschema: de-DE (de_DE.UTF-8) ... :( TIA Thomas. -- Power corrupts. Absolute power is kind of neat. -- John Lehman, Secretary of the Navy, 1981-1987 ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: https://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Resizing image in Calc nearly freezes whole system?
Hello Richard, *, nearly forgot to open this bug, but now ... ;) Richard wrote: > I confirm the same hard freeze. > Versión: 5.1.3.2 > Id. de compilación: 644e4637d1d8544fd9f56425bd6cec110e49301b > on > Debian 8.4 x64 derivative. would you be so kind to confirm it at https://bugs.documentfoundation.org/show_bug.cgi?id=100165, please? TIA and have a nice evening Thomas. -- As to the Adjective: when in doubt, strike it out. -- Mark Twain, "Pudd'nhead Wilson's Calendar" ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: https://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Resizing image in Calc nearly freezes whole system?
Hello Richard, Pedro, *, Richard wrote: thank you both for testing / confirming :) > I confirm the same hard freeze. > Versión: 5.1.3.2 > Id. de compilación: 644e4637d1d8544fd9f56425bd6cec110e49301b > on > Debian 8.4 x64 derivative. I will try to find out, if it is reported already tomorrow. If you would be so kind ((and/or have the time ... ;) ) to search BZ and–if it is not reported already– to report it, feel free to do it ... ;) I will then confirm it tomorrow. Thanks for confirming it again and have a nice evening Thomas. -- The whole history of computers is rampant with cheerleading at best and bigotry at worst. -- Larry Wall in <199702111730.jaa28...@wall.org> ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: https://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-qa] Resizing image in Calc nearly freezes whole system?
Hello @ll, we got a report on the de@discuss list, which seems to be reproducible on GN/Linux (or better: Debian-based systems). Would someone be so kind to test it, please? Steps to reproduce: 1. download https://media-cdn.ubuntu-de.org/forum/attachments/41/20/8285598-no-border-no-nation.ods 2. open it in Calc 3. click on the image to get the handler 4. drag the right bottom handler to resize it. On my system (Debian Testing AMD64), this leads nearly immediately to a system freeze, where I have to switch to a VT to kill the soffice.bin ... :( The problem is, that still after killing the process with "kill -9 $PID" will not free the whole RAM / swap / whatever, so the system still seems to be blocking somewhere ... :( So be warned ... ;) Tested with: LO Version: 4.3.7.2 Build-ID: 8a35821d8636a03b8bf4e15b48f59794652c68ba (no freeze, but I was only able to resize the image at the right handler. All others leads to a vanishing image) Version: 4.4.1.2 Build-ID: 45e2de17089c24a1fa810c8f975a7171ba4cd432 Gebietsschema: de_DE (same as 4.3.7.2) Version: 4.4.6.2 Build-ID: 008d5d0ddffba0b82de2a2c36a65b9cba0a6b328 Gebietsschema: de_DE.UTF-8 (freeze) Version: 5.0.0.5 Build-ID: 437e4abdf9e72fd0a6e6f8697a0e659bc77f9b10 Gebietsschema: de-DE (de_DE.UTF-8) (freeze) These are the versions, which I have installed parallel (following the instructions from https://wiki.documentfoundation.org/Installing_in_parallel/Linux) Additionally, I tested it with Debian's own version Version: 5.1.3.2 Build-ID: 1:5.1.3-1 CPU-Threads: 4; BS-Version: Linux 4.5; UI-Render: Standard; Gebietsschema: de-DE (de_DE.UTF-8) , which also nearly freezes the whole system ... :( I then tried to get a backtrace or even a strace, but alas to no avail ... :( IMHO this freezes the system much harder than without them ... :( Is this reproducible on an other system to anyone? And: are you able to get a strace / backtrace? Is this already reported to bugzilla? TIA for testing Thomas. -- In Tennessee, it is illegal to shoot any game other than whales from a moving automobile. ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: https://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-qa] Switching UI language to another language crashes LO 5.2.0.0alpha1 during restart
Hello @ll, after installing LO 5.2.0.0alpha1 in parallel, I found out, that LO crashes, when I try to start LO ... :( Steps to reproduce: 1. Install LO in parallel, following the instructions on https://wiki.documentfoundation.org/Installing_in_parallel/Linux (or use the instructions for your OS ... ;) ) 2. Install a language pack for your language 3. Start LO 4. Go to "Tools - Options - Language Settings - Language 5. Switch the language of the "User Interface" from your language to English (or from English to your language) 6. Press „Restart Now" in the following window I am getting the following message terminate called after throwing an instance of 'com::sun::star::uno::DeploymentException' , when I start LO from the command line ... :( Can anybody reproduce this? LO: Version: 5.2.0.0.alpha1 Build-ID: 902b28a39528b6c92602e9b521a1d0861be1caf9 CPU-Threads: 4; BS-Version: Linux 4.4; UI-Render: Standard; Gebietsschema: de-DE (de_DE.UTF-8) (paralllel installed with de-DE lang- as well as helppack) OS: Debian Testing AMD64 Thanks in advance Thomas. -- Someday your prints will come. -- Kodak ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: https://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Danielt998 license statement
All of my past & future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: suggested method to create LibreOffice Extensions
Hey Andrea,
hmm, I will do an workshop tomorrow with a very equal questinary and
becouse I have used everytime BAB, I try to give you some more information:
Yes, BAB was and is a very usefull tool, unfortunatly Paolo do not
maintain it any more.
Because of an codechange in AOO for extensions, there is no way to
create the extension with this tool in both lines (AOO and LibO).
Jörg Schmidt did some work on the BAB and created two versions - one for
AOO and one for LibO with should work.
Additional we are planing at the moment, to rework the BAB, bt this
needs a little bit of money and we think about a crowdfounding network.
So, I will send you with seperat mail the version, I will use tomorrow
and I guess, this will work with LibO 5.x too (not really sure...).
Nevertheless LibreOffice need a tool like BAB - maybe with some
additional features - so I would appreciate your support for a new version.
Best regards
Thomas
Am 16.11.2015 09:52, schrieb Andrea Castellani:
> Hello everyone,
> almost three years ago I received help from this mailing list to create
> an extension for LibreOffice, which became "FirmaconDike" (thanks!):
> http://extensions.libreoffice.org/extension-center/firmacondike-1
>
> Today I have to re-examine this issue in a LibreOffice lesson, in witch
> I would like to explain how to create an extension "from scratch".
>
> I thought to write a simple macro with students, such as "Hello world",
> and explain step by step how to generate the oxt file.
>
> Seeking documentation, I saw a lot of confusion on the subject and the
> argument (as you know) is only present on the site of AOO.
>
> I tried to use BAB Paolo Mantovani, both in the new version that in the
> previous one, and it seemed a very good macro to create extensions.
>
> The Extension oxt who created BAB does not work, then I fear that BAB is
> incompatible with LibreOffice (I have the 5.0.2.2). Opening it, it gives
> me an error:
> (Com.sun.star.deployment.DeploymentException) {{Message = "You \ X00e8
> an error occurred while enabling: HelloWorld" Context =
> (com.sun.star.uno.XInterface) @ 7f2fec3ef8b0}, Cause = ( any)
> {(com.sun.star.lang.IllegalArgumentException) {{{Message = "" Context =
> (com.sun.star.uno.XInterface) @ 0}}, ArgumentPosition = (short) 0}}}
>
> Here you can find the extension generated by BAB:
> http://www.libreitalia.it/cloud/public.php?service=files=77d91958fb91ecab19ec2b0b62844d63
>
> I have not tried a "reverse engineering" of oxt file to understand what
> it changes from another oxt (such as "FirmaconDike"), looking for
> suggestions from you, who are much more experienced than me.
>
> Does anyone have experience with BAB and LibreOffice?
> What is the official method (or recommended one) to create extensions
> for LibreOffice?
>
> I apologize if you have already solved this problem in another thread
>
> Thank you,
>
> Andrea Castellani
> www.libreitalia.it
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/libreoffice
--
## Unterstützung der freien Office Suite
## http://de.libreOffice.org - www.LibreOffice.org
## Vorstand Freies Office Deutschland e.V.
## Mitglieder willkommen: www.FroDeV.org
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-bugs] Using ranges to find a maximum number
Trying to find maximum number of wins for multiple people. TEST.ods Description: application/vnd.oasis.opendocument.spreadsheet ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] Finding a range of numbers in a range
--- TEST.ods Description: application/vnd.oasis.opendocument.spreadsheet ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] Ignore my other email
The formula was wrong, I attached the corrected one which still does not work. TEST.ods Description: application/vnd.oasis.opendocument.spreadsheet ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] Calc error
I am trying to write a formula using Ranges to find the max number in a list. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] Fwd: Calc error
Forwarded Message Subject:Calc error Date: Mon, 21 Sep 2015 18:52:31 -0400 From: Thomas Damratowski <tomraymond...@gmail.com> To: libreoffice-bugs@lists.freedesktop.org I am trying to write a formula using Ranges to find the max number in a list. TEST.ods Description: application/vnd.oasis.opendocument.spreadsheet ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/ww8toolbar.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 938a1b00332090e68cca44c99eb6f4adeedc1f00
Author: Thomas Klausner w...@netbsd.org
Date: Sun Aug 9 20:28:24 2015 +0200
Fix some typos in strings.
Change-Id: I7fb077c08dbfa3fe3f03941c7567dc65630cf266
diff --git a/sw/source/filter/ww8/ww8toolbar.cxx
b/sw/source/filter/ww8/ww8toolbar.cxx
index 429d3b5..6460cc6 100644
--- a/sw/source/filter/ww8/ww8toolbar.cxx
+++ b/sw/source/filter/ww8/ww8toolbar.cxx
@@ -214,7 +214,7 @@ void SwCTBWrapper::Print( FILE* fp )
for ( std::vector Customization ::iterator it = rCustomizations.begin();
it != rCustomizations.end(); ++it, ++index )
{
-indent_printf(fp, Dumping custimization [%d]\n, static_cast int (
index ));
+indent_printf(fp, Dumping customization [%d]\n, static_cast int (
index ));
Indent c;
it-Print(fp);
}
@@ -258,7 +258,7 @@ Customization::~Customization()
bool Customization::Read( SvStream rS)
{
-SAL_INFO(sw.ww8,Custimization::Read() stream pos 0x std::hex
rS.Tell() );
+SAL_INFO(sw.ww8,Customization::Read() stream pos 0x std::hex
rS.Tell() );
nOffSet = rS.Tell();
rS.ReadInt32( tbidForTBD ).ReadUInt16( reserved1 ).ReadUInt16( ctbds );
if ( tbidForTBD )
@@ -273,7 +273,7 @@ bool Customization::Read( SvStream rS)
if (!aTBDelta.Read( rS ) )
return false;
customizationDataTBDelta.push_back( aTBDelta );
-// Only set the drop down for menu's associated with standard
toolbar
+// Only set the drop down for menus associated with standard
toolbar
if ( aTBDelta.ControlDropsToolBar() tbidForTBD == 0x25 )
pWrapper-InsertDropIndex( aTBDelta.CustomizationIndex() );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/ww8par6.cxx | 504 +++
1 file changed, 250 insertions(+), 254 deletions(-)
New commits:
commit 78a11f79d8eb5cd1d2b18c288852dec7e3d57a21
Author: Thomas Klausner w...@netbsd.org
Date: Mon Aug 10 07:57:07 2015 +0200
Translate German comments to English, part 1.
Only about 60% done, but this file is huge, so do a checkpoint commit.
Change-Id: Ic2ea67c894c525d89baf5287c8d009727911e816
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 9d3fd16..0e587a0 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -105,10 +105,10 @@ using namespace sw::types;
using namespace ::com::sun::star;
using namespace nsHdFtFlags;
-// diverses
+// various
-#define MM_250 1417 // WW-Default fuer Hor. Seitenraender: 2.5 cm
-#define MM_200 1134 // WW-Default fuer u.Seitenrand: 2.0 cm
+#define MM_250 1417 // WW default for horizontal borders: 2.5 cm
+#define MM_200 1134 // WW default for lower border: 2.0 cm
static sal_uInt8 lcl_ReadBorders(bool bVer67, WW8_BRCVer9* brc,
WW8PLCFx_Cp_FKP* pPap,
@@ -134,26 +134,26 @@ inline sal_uInt32 MSRoundTweak(sal_uInt32 x)
return x;
}
-// Seiten - Attribute, die nicht ueber die Attribut-Verwaltung, sondern
-// ueber ...-HasSprm abgearbeitet werden
-// ( ausser OLST, dass weiterhin ein normales Attribut ist )
+// page attribute which are not handled via the attribute management but
+// using ...-HasSprm
+// (except OLST which stays a normal attribute)
static short ReadSprm( const WW8PLCFx_SEPX* pSep, sal_uInt16 nId, short
nDefaultVal )
{
-const sal_uInt8* pS = pSep-HasSprm( nId ); // sprm da ?
+const sal_uInt8* pS = pSep-HasSprm( nId ); // sprm here?
short nVal = ( pS ) ? SVBT16ToShort( pS ) : nDefaultVal;
return nVal;
}
static sal_uInt16 ReadUSprm( const WW8PLCFx_SEPX* pSep, sal_uInt16 nId, short
nDefaultVal )
{
-const sal_uInt8* pS = pSep-HasSprm( nId ); // sprm da ?
+const sal_uInt8* pS = pSep-HasSprm( nId ); // sprm here?
sal_uInt16 nVal = ( pS ) ? SVBT16ToShort( pS ) : nDefaultVal;
return nVal;
}
static sal_uInt8 ReadBSprm( const WW8PLCFx_SEPX* pSep, sal_uInt16 nId,
sal_uInt8 nDefaultVal )
{
-const sal_uInt8* pS = pSep-HasSprm( nId ); // sprm da ?
+const sal_uInt8* pS = pSep-HasSprm( nId ); // sprm here?
sal_uInt8 nVal = pS ? *pS : nDefaultVal;
return nVal;
}
@@ -414,10 +414,10 @@ void wwSectionManager::SetLeftRight(wwSection rSection)
void wwSectionManager::SetPage(SwPageDesc rInPageDesc, SwFrameFormat rFormat,
const wwSection rSection, bool bIgnoreCols)
{
-// 1. Orientierung
+// 1. orientation
rInPageDesc.SetLandscape(rSection.IsLandScape());
-// 2. Papiergroesse
+// 2. paper size
SwFormatFrmSize aSz( rFormat.GetFrmSize() );
aSz.SetWidth(rSection.GetPageWidth());
aSz.SetHeight(SvxPaperInfo::GetSloppyPaperDimension(rSection.GetPageHeight()));
@@ -539,7 +539,7 @@ void wwSectionManager::GetPageULData(const wwSection
rSection,
if( rData.bHasHeader )
{
-rData.nSwUp = nWWHTop; // Header - umrechnen
+rData.nSwUp = nWWHTop; // Header - convert
// #i19922# - correction:
// consider that nWWUp can be negative, compare only if it's positive
if ( nWWUp 0
@@ -553,7 +553,7 @@ void wwSectionManager::GetPageULData(const wwSection
rSection,
if (rData.nSwHLo sal::static_int_cast sal_uInt32 (cMinHdFtHeight))
rData.nSwHLo = sal::static_int_cast sal_uInt32 (cMinHdFtHeight);
}
-else // kein Header - Up einfach uebernehmen
+else // no header - just use Up as-is
rData.nSwUp = std::abs(nWWUp);
rData.bHasFooter = (rSection.maSep.grpfIhdt
@@ -561,7 +561,7 @@ void wwSectionManager::GetPageULData(const wwSection
rSection,
if( rData.bHasFooter )
{
-rData.nSwLo = nWWFBot; // Footer - Umrechnen
+rData.nSwLo = nWWFBot; // footer - convert
// #i19922# - correction: consider that nWWLo can be negative,
compare only if it's positive
if ( nWWLo 0
static_castsal_uInt32(abs(nWWLo)) = nWWFBot )
@@ -574,16 +574,16 @@ void wwSectionManager::GetPageULData(const wwSection
rSection,
if (rData.nSwFUp sal::static_int_cast sal_uInt32 (cMinHdFtHeight))
rData.nSwFUp = sal::static_int_cast sal_uInt32 (cMinHdFtHeight);
}
-else // kein Footer - Lo einfach uebernehmen
+else // no footer - just use Lo as-is
rData.nSwLo = std::abs(nWWLo);
}
void wwSectionManager::SetPageULSpaceItems(SwFrameFormat rFormat,
wwSectionManager::wwULSpaceData rData, const wwSection rSection)
{
-if (rData.bHasHeader) // ... und Header-Lower setzen
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/ww8scan.cxx |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 2981bcf7e34d9f4c9d1e821045f3f22ddb318339
Author: Thomas Klausner w...@netbsd.org
Date: Sat Aug 8 09:43:02 2015 +0200
Translate two assertions to English, adapt two others for consistency.
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 6c1c600..04e07a1 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -1716,7 +1716,7 @@ WW8ScannerBase::WW8ScannerBase( SvStream* pSt, SvStream*
pTableSt,
break;
default:
-OSL_ENSURE( false, Es wurde vergessen, nVersion zu kodieren! );
+OSL_ENSURE( false, nVersion not implemented! );
break;
}
@@ -2842,7 +2842,7 @@ bool WW8PLCFx_Fc_FKP::NewFkp()
break;
default:
// program error!
-OSL_ENSURE( false, Someone forgot to encode nVersion! );
+OSL_ENSURE( false, nVersion not implemented! );
return false;
}
@@ -5341,7 +5341,7 @@ WW8Fib::WW8Fib(SvStream rSt, sal_uInt8 nWantedVersion,
sal_uInt32 nOffset)
nFibMin = 0;// programm error!
nFibMax = 0;
nFib= 1;
-OSL_ENSURE( false, It was forgotten to encode nVersion! );
+OSL_ENSURE( false, nVersion not implemented! );
break;
}
if ( (nFib nFibMin) || (nFib nFibMax) )
@@ -6402,7 +6402,7 @@ WW8Fonts::WW8Fonts( SvStream rSt, WW8Fib rFib )
// always in ANSI, even if eStructCharSet == CHARSET_MAC !!
if( rFib.lcbSttbfffn = 2 )
{
-OSL_ENSURE( false, Fonttabelle kaputt! (rFib.lcbSttbfffn 2) );
+OSL_ENSURE( false, font table is broken! (rFib.lcbSttbfffn 2) );
return;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 29690bee381a9075ffa90a826a2b5a5a94a6673a Author: Thomas Klausner w...@netbsd.org Date: Sat Aug 8 10:33:41 2015 +0200 When looking for tar, accept 'bsdtar'. libarchive installs it under that name at least on FreeBSD, NetBSD, and OpenBSD. Change-Id: I7c4ce8f2dcf59f6d2b23266f450a88f3f2217e4e diff --git a/configure.ac b/configure.ac index 0d45455..7b0f031 100644 --- a/configure.ac +++ b/configure.ac @@ -2465,7 +2465,7 @@ fi AC_SUBST(BASH) AC_MSG_CHECKING([for GNU or BSD tar]) -for a in $GNUTAR gtar gnutar tar /usr/sfw/bin/gtar; do +for a in $GNUTAR gtar gnutar bsdtar tar /usr/sfw/bin/gtar; do $a --version 2 /dev/null | egrep GNU|bsdtar 21 /dev/null if test $? -eq 0; then GNUTAR=$a ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/glm
external/glm/UnpackedTarball_glm.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 05925ef8a49f3ba302140bd37ba9c4848598638d Author: Thomas Klausner w...@netbsd.org Date: Sat Aug 8 17:59:09 2015 +0200 Do not add --binary to patch flags unconditionally. It is only needed for Cygwin, and some patch(1) don't support it, like NetBSD's. Solution suggested by vmiklos on irc. Change-Id: I65a3a82e755167828658218c7d73c4f2294e587f diff --git a/external/glm/UnpackedTarball_glm.mk b/external/glm/UnpackedTarball_glm.mk index 82f4a2c..f593254 100644 --- a/external/glm/UnpackedTarball_glm.mk +++ b/external/glm/UnpackedTarball_glm.mk @@ -11,7 +11,7 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,glm)) $(eval $(call gb_UnpackedTarball_set_tarball,glm,$(GLM_TARBALL))) -$(eval $(call gb_UnpackedTarball_set_patchflags,glm,--binary)) +$(eval $(call gb_UnpackedTarball_set_patchflags,glm,$(if $(filter MSC,$(COM)),--binary))) $(eval $(call gb_UnpackedTarball_set_patchlevel,glm,1)) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/docxattributeoutput.hxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit d026cad64c72eacf7bff9bbd7e3bb5b1a56f8479
Author: Thomas Klausner w...@netbsd.org
Date: Fri Aug 7 22:03:53 2015 +0200
Fix typos in comments.
Change-Id: I5b97d12171020dab1379d4f7e78cab7de4a779df
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx
b/sw/source/filter/ww8/docxattributeoutput.hxx
index a2e2599..54d3f11 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -937,10 +937,10 @@ public:
virtual DocxExport GetExport() SAL_OVERRIDE;
const DocxExport GetExport() const { return const_cast
DocxAttributeOutput* ( this )-GetExport(); }
-/// For eg. the output of the styles, we need to switch the serializer to
an other one.
+/// For e.g. the output of the styles, we need to switch the serializer to
another one.
void SetSerializer( ::sax_fastparser::FSHelperPtr pSerializer );
-/// Occasionnaly need to use this serializer from the outside
+/// Occasionally need to use this serializer from the outside
::sax_fastparser::FSHelperPtr GetSerializer( ) { return m_pSerializer; }
/// Do we have any footnotes?
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/ww8scan.hxx | 241 +++
1 file changed, 120 insertions(+), 121 deletions(-)
New commits:
commit 6f98a0ab51cc5c860576b4ad44478b438cc5a5eb
Author: Thomas Klausner w...@netbsd.org
Date: Fri Aug 7 18:24:45 2015 +0200
Translate remaining German comments to English.
Change-Id: I0b6b60bd4fa921993388340b8c16c533ba9f257f
diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx
index cc2d0f6..cd101bd 100644
--- a/sw/source/filter/ww8/ww8scan.hxx
+++ b/sw/source/filter/ww8/ww8scan.hxx
@@ -173,21 +173,21 @@ void WW8ReadSTTBF(bool bVer8, SvStream rStrm, sal_uInt32
nStart, sal_Int32 nLen
struct WW8FieldDesc
{
-long nLen; /// Gesamtlaenge ( zum Text ueberlesen )
-WW8_CP nSCode; /// Anfang Befehlscode
-WW8_CP nLCode; /// Laenge
-WW8_CP nSRes; /// Anfang Ergebnis
-WW8_CP nLRes; /// Laenge ( == 0, falls kein Ergebnis )
-sal_uInt16 nId; /// WW-Id fuer Felder
-sal_uInt8 nOpt; /// WW-Flags ( z.B.: vom User geaendert )
-bool bCodeNest:1; /// Befehl rekursiv verwendet
-bool bResNest:1;/// Befehl in Resultat eingefuegt
+long nLen; /// total length (to skip over text)
+WW8_CP nSCode; /// start of instructions code
+WW8_CP nLCode; /// length
+WW8_CP nSRes; /// start of result
+WW8_CP nLRes; /// length ( == 0, if no result )
+sal_uInt16 nId; /// WW-id for fields
+sal_uInt8 nOpt; /// WW-Flags ( e.g.: changed by user )
+bool bCodeNest:1; /// instruction used recursively
+bool bResNest:1;/// instruction inserted into result
};
struct WW8PLCFxSave1
{
sal_uLong nPLCFxPos;
-sal_uLong nPLCFxPos2; /// fuer PLCF_Cp_Fkp: PieceIter-Pos
+sal_uLong nPLCFxPos2; /// for PLCF_Cp_Fkp: PieceIter-Pos
long nPLCFxMemOfs;
WW8_CP nStartCp;/// for cp based iterator like PAP and CHP
long nCpOfs;
@@ -198,16 +198,16 @@ struct WW8PLCFxSave1
};
/**
-u.a. fuer Felder, also genausoviele Attr wie Positionen,
-falls Ctor-Param bNoEnd = false
+among others for fields, that is, the same number of attr as positions,
+if Ctor-Param bNoEnd = false
*/
-class WW8PLCFspecial// Iterator fuer PLCFs
+class WW8PLCFspecial// iterator for PLCFs
{
private:
-sal_Int32* pPLCF_PosArray; /// Pointer auf Pos-Array und auf ganze
Struktur
-sal_uInt8* pPLCF_Contents; /// Pointer auf Inhalts-Array-Teil des
Pos-Array
-long nIMax; /// Anzahl der Elemente
-long nIdx; /// Merker, wo wir gerade sind
+sal_Int32* pPLCF_PosArray; /// pointer to Pos-array and to the whole
structure
+sal_uInt8* pPLCF_Contents; /// pointer to content-array-part of
Pos-array
+long nIMax; /// number of elements
+long nIdx; /// marker where we currently are
sal_uInt32 nStru;
public:
@@ -217,8 +217,8 @@ public:
long GetIdx() const { return nIdx; }
void SetIdx( long nI ) { nIdx = nI; }
long GetIMax() const { return nIMax; }
-bool SeekPos(long nPos);// geht ueber FC- bzw. CP-Wert
-// bzw. naechste groesseren Wert
+bool SeekPos(long nPos);// walks over FC- or CP-value
+// resp. next biggest value
bool SeekPosExact(long nPos);
sal_Int32 Where() const
{ return ( nIdx = nIMax ) ? SAL_MAX_INT32 : pPLCF_PosArray[nIdx]; }
@@ -271,21 +271,21 @@ private:
WW8SprmIter operator=(const WW8SprmIter) SAL_DELETED_FUNCTION;
};
-/* u.a. fuer FKPs auf normale Attr., also ein Attr weniger als Positionen */
-class WW8PLCF // Iterator fuer PLCFs
+/* among others for FKPs to normal attr., i.e. one less attr than positions */
+class WW8PLCF // Iterator for PLCFs
{
private:
-WW8_CP* pPLCF_PosArray; // Pointer auf Pos-Array und auf ganze Struktur
-sal_uInt8* pPLCF_Contents; // Pointer auf Inhalts-Array-Teil des
Pos-Array
-sal_Int32 nIMax;// Anzahl der Elemente
+WW8_CP* pPLCF_PosArray; // pointer to Pos-array and the whole structure
+sal_uInt8* pPLCF_Contents; // pointer to content-array-part of Pos-array
+sal_Int32 nIMax;// number of elements
sal_Int32 nIdx;
int nStru;
void ReadPLCF(SvStream rSt, WW8_FC nFilePos, sal_uInt32 nPLCF);
/*
-Falls im Dok ein PLC fehlt und die FKPs solo dastehen,
-machen wir uns hiermit einen PLC:
+If a PLC is missing in the doc and the FKPs stand alone,
+we create a PLC with this:
*/
void GeneratePLCF(SvStream rSt, sal_Int32 nPN, sal_Int32 ncpN);
@@ -296,7 +296,7 @@ public:
WW8_CP nStartPos = -1);
/*
-folgender Ctor generiert ggfs. einen PLC
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/ww8par.hxx | 202 +++-
1 file changed, 100 insertions(+), 102 deletions(-)
New commits:
commit da4bd92d474455c6ef88ec2190b6c305ee3740ba
Author: Thomas Klausner w...@netbsd.org
Date: Fri Aug 7 18:43:22 2015 +0200
Translate remaining German comments to English.
Change-Id: If0bd1d61578176ae82630ed35309c6fe0e79a4d1
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index e2bd354..e11ef0f 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -113,7 +113,7 @@ namespace com{namespace sun {namespace star{
namespace lang{class XMultiServiceFactory;}
}}}
-// defines nur fuer die WW8-variable der INI-Datei
+// defines only for the WW8-variable of the INI file
#define WW8FL_NO_STYLES 2
#define WW8FL_NO_GRAF 0x80
@@ -121,10 +121,10 @@ namespace com{namespace sun {namespace star{
#define WW8FL_NO_IMPLPASP0x4000 // no implicit para space
#define WW8FL_NO_GRAFLAYER 0x8000
-// Zusatz-Filter-Flags, gueltig ab Winword 8
+// Add-on-filter-flags, valid from Winword 8 on
#define WW8FL_NO_FLY_FOR_TXBX 1
-//Listen-Manager (ab Ver8)
+//List-Manager (from Ver8 on)
struct WW8LFOInfo;
@@ -162,7 +162,7 @@ private:
const WW8FibrFib;
SvStreamrSt;
std::vectorWW8LSTInfo* maLSTInfos;
-boost::ptr_vectorWW8LFOInfo pLFOInfos;// D. aus PLF LFO, sortiert genau
wie im WW8 Stream
+boost::ptr_vectorWW8LFOInfo pLFOInfos;// D. from PLF LFO, sorted
exactly like in the WW8 Stream
sal_uInt16 nUniqueList; // current number for creating unique list
names
sal_uInt8* GrpprlHasSprm(sal_uInt16 nId, sal_uInt8 rSprms, sal_uInt8
nLen);
WW8LSTInfo* GetLSTByListId(sal_uInt32 nIdLst ) const;
@@ -172,9 +172,9 @@ private:
bool bSetStartNo, std::dequebool rNotReallyThere, sal_uInt16 nLevel,
ww::bytes rParaSprms);
-// Zeichenattribute aus GrpprlChpx
+// character attributes from GrpprlChpx
typedef SfxItemSet* WW8aISet[nMaxLevel];
-// Zeichen Style Pointer
+// character style pointer
typedef SwCharFormat* WW8aCFormat[nMaxLevel];
void AdjustLVL(sal_uInt8 nLevel, SwNumRule rNumRule, WW8aISet
rListItemSet,
@@ -187,20 +187,19 @@ private:
};
struct WW8FlyPara
-{ // WinWord-Attribute
-// Achtung: *Nicht* umsortieren, da Teile mit
-// memcmp verglichen werden
+{ // WinWord-attributes
+// Attention: *DO NOT* reorder, since parts will be
+// compared using memcmp
bool bVer67;
-sal_Int16 nSp26, nSp27; // rohe Position
-sal_Int16 nSp45, nSp28; // Breite / Hoehe
-sal_Int16 nLeMgn, nRiMgn, nUpMgn, nLoMgn; // Raender
-sal_uInt8 nSp29; // rohe Bindung + Alignment
+sal_Int16 nSp26, nSp27; // raw position
+sal_Int16 nSp45, nSp28; // width / height
+sal_Int16 nLeMgn, nRiMgn, nUpMgn, nLoMgn; // borders
+sal_uInt8 nSp29; // raw binding + alignment
sal_uInt8 nSp37; // Wrap-Mode ( 1 / 2; 0 = no Apo ? )
-WW8_BRCVer9_5 brc; // Umrandung Top, Left, Bottom, Right, Between
-bool bBorderLines; // Umrandungslinien
-bool bGrafApo; // true: Dieser Rahmen dient allein dazu, die
-// enthaltene Grafik anders als zeichengebunden
-// zu positionieren
+WW8_BRCVer9_5 brc; // borders Top, Left, Bottom, Right, Between
+bool bBorderLines; // border lines
+bool bGrafApo; // true: this frame is only used to position
+// the contained graphics *not* as a character
bool mbVertSet; // true if vertical positioning has been set
WW8FlyPara(bool bIsVer67, const WW8FlyPara* pSrc = 0);
@@ -217,9 +216,9 @@ class SwWW8StyInf
OUStringsWWStyleName;
sal_uInt16 nWWStyleId;
public:
-rtl_TextEncoding eLTRFontSrcCharSet;// rtl_TextEncoding fuer den Font
-rtl_TextEncoding eRTLFontSrcCharSet;// rtl_TextEncoding fuer den Font
-rtl_TextEncoding eCJKFontSrcCharSet;// rtl_TextEncoding fuer den Font
+rtl_TextEncoding eLTRFontSrcCharSet;// rtl_TextEncoding for the font
+rtl_TextEncoding eRTLFontSrcCharSet;// rtl_TextEncoding for the font
+rtl_TextEncoding eCJKFontSrcCharSet;// rtl_TextEncoding for the font
SwFormat* pFormat;
WW8FlyPara* pWWFly;
SwNumRule* pOutlineNumrule;
@@ -237,14 +236,14 @@ public:
// 9: body text
sal_uInt8 mnWW8OutlineLevel;
-sal_uInt16 n81Flags; // Fuer Bold, Italic, ...
-sal_uInt16 n81BiDiFlags; // Fuer Bold, Italic, ...
+sal_uInt16 n81Flags
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/wrtww8.hxx | 43 +++-
1 file changed, 21 insertions(+), 22 deletions(-)
New commits:
commit cf27d96fa3bffe603941f3e11e871b3202a3ba96
Author: Thomas Klausner w...@netbsd.org
Date: Fri Aug 7 18:54:33 2015 +0200
Translate remaining German comments to English.
XXX: one sentence sounds incorrect, I have added a TODO marker so someone
can check it.
Change-Id: I5bd5a01b64ad0f0234465ca9347b4b842e6d0172
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index 7e0d897..917b5f8 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -43,7 +43,7 @@
#include vcl/graph.hxx
class SvxBrushItem;
-// einige Forward Deklarationen
+// some forward declarations
class SwWW8AttrIter;
namespace msfilter
{
@@ -106,7 +106,7 @@ class WW8_WrPlcPn;
class WW8_WrPlcAnnotations;
class MSWordSections;
class WW8_WrPlcTextBoxes;
-class WW8_WrPct;// Verwaltung
+class WW8_WrPct;// administration
class WW8_WrtBookmarks;
class WW8_WrtRedlineAuthor;
class SvxMSExportOLEObjects;
@@ -122,7 +122,7 @@ class SvxBrushItem;
#include WW8TableInfo.hxx
-#define GRF_MAGIC_1 0x12// 3 magic Bytes fuer PicLocFc-Attribute
+#define GRF_MAGIC_1 0x12// 3 magic bytes for PicLocFc attribute
#define GRF_MAGIC_2 0x34
#define GRF_MAGIC_3 0x56
#define GRF_MAGIC_321 0x563412L
@@ -236,7 +236,7 @@ class WW8_WrPlcSepx : public MSWordSections
::std::vector ::boost::shared_ptrWW8_PdAttrDesc m_SectionAttributes;
// hack to prevent adding sections in endnotes
bool m_bHeaderFooterWritten;
-WW8_WrPlc0* pTextPos;// Pos der einzelnen Header / Footer
+WW8_WrPlc0* pTextPos;// Position of the headers/footers
WW8_WrPlcSepx( const WW8_WrPlcSepx ) SAL_DELETED_FUNCTION;
WW8_WrPlcSepx operator=( const WW8_WrPlcSepx ) SAL_DELETED_FUNCTION;
@@ -437,8 +437,9 @@ struct MSWordSaveData
bool bOldFlyFrmAttrs : 1;
bool bOldStartTOX : 1;
bool bOldInWriteTOX : 1;
-// bOutPageDesc muss nicht gesichert werden, da es nur nicht waehrend der
-// Ausgabe von Spezial-Texten veraendert wird.
+// bOutPageDesc does not have to be saved, since it is only not modified
+// when outputting special texts.
+/// TODO wiz 20150807: not modified - modified? (translated literally)
};
/// Base class for WW8Export and DocxExport
@@ -450,9 +451,9 @@ public:
typedef std::vectorsal_uLong::const_iterator mycCFIter;
OUString m_aMainStg;
std::vectorconst SwTOXType* m_aTOXArr;
-const SfxItemSet* m_pISet;// fuer Doppel-Attribute
+const SfxItemSet* m_pISet;// for double attributes
WW8_WrPct* m_pPiece; // Pointer auf Piece-Table
-SwNumRuleTable* m_pUsedNumTable; // alle used NumRules
+SwNumRuleTable* m_pUsedNumTable; // all used NumRules
const SwTextNode *m_pTopNodeOfHdFtPage; /// Top node of host page when in
hd/ft
std::map sal_uInt16, sal_uInt16 m_aRuleDuplicates; //map to Duplicated
numrules
std::stack sal_Int32 m_aCurrentCharPropStarts; /// To remember the
position in a run.
@@ -466,8 +467,8 @@ public:
sal_uInt16 m_nCharFormatStart;
sal_uInt16 m_nFormatCollStart;
-sal_uInt16 m_nStyleBeforeFly; /// Style-Nummer des Nodes,
-/// in/an dem ein Fly verankert ist
+sal_uInt16 m_nStyleBeforeFly; /// style number of the node
+/// to which the Fly is connected
sal_uInt16 m_nLastFormatId; /// Style of last TextNode in normal
range
sal_uInt16 m_nUniqueList; /// current number for creating unique
list names
unsigned int m_nHdFtIndex;
@@ -502,9 +503,8 @@ public:
const sw::Frame *m_pParentFrame; // If set we are exporting content inside
// a frame, e.g. a graphic node
-Point* m_pFlyOffset; // zur Justierung eines im Writer als
-RndStdIds m_eNewAnchorType; // Zeichen gebundenen Flys, der im WW
-// Absatzgebunden wird.
+Point* m_pFlyOffset; // for adjusting of character-bound Fly
in the Writer,
+RndStdIds m_eNewAnchorType; // that is paragraph-bound in the WW.
WW8_WrPlcField* m_pFieldMain; // fields in MainText
WW8_WrPlcField* m_pFieldHdFt; // fields in Header/Footer
@@ -527,7 +527,7 @@ public:
SwEscherEx* m_pEscher;// escher export class
// #i43447# - removed
-//SwTwips nFlyWidth, nFlyHeight; // Fuer Anpassung Graphic
+//SwTwips nFlyWidth, nFlyHeight; // for adaptation of graphics
sal_uInt8 m_nTextTyp;
@@ -538,7 +538,7 @@ public:
bool m_bOutPageDescs : 1; /// PageDescs (section properties) are
being written
bool m_bOutFirstPage : 1; // write Attrset of FirstPageDesc
bool m_bOutTable : 1; // table is being
[Libreoffice-commits] core.git: 2 commits - sw/source
sw/source/filter/ww8/docxfootnotes.hxx |2 -
sw/source/filter/ww8/ww8par2.hxx | 42 -
2 files changed, 22 insertions(+), 22 deletions(-)
New commits:
commit 4bc76a73f42dc37a1e9792d89f846f9a9280e668
Author: Thomas Klausner w...@netbsd.org
Date: Fri Aug 7 21:55:19 2015 +0200
Translate remaining German comments to English.
Change-Id: Iad76b958db7eab849a1bfe18b486a30eacc276e3
diff --git a/sw/source/filter/ww8/ww8par2.hxx b/sw/source/filter/ww8/ww8par2.hxx
index 453dfb3..c5c3c90 100644
--- a/sw/source/filter/ww8/ww8par2.hxx
+++ b/sw/source/filter/ww8/ww8par2.hxx
@@ -47,27 +47,27 @@ struct WW8SwFlyPara
{
SwFlyFrameFormat* pFlyFormat;
-// 1. Teil: daraus abgeleitete Sw-Attribute
+// part 1: directly derived Sw attributes
sal_Int16 nXPos, nYPos; // Position
-sal_Int16 nLeMgn, nRiMgn; // Raender
-sal_Int16 nUpMgn, nLoMgn; // Raender
-sal_Int16 nWidth, nHeight; // Groesse
+sal_Int16 nLeMgn, nRiMgn; // borders
+sal_Int16 nUpMgn, nLoMgn; // borders
+sal_Int16 nWidth, nHeight; // size
sal_Int16 nNetWidth;
-SwFrmSize eHeightFix; // Hoehe Fix oder Min
-RndStdIds eAnchor; // Bindung
-short eHRel; // Seite oder Seitenrand
-short eVRel; // Seite oder Seitenrand
-sal_Int16 eVAlign; // Oben, unten, mittig
-sal_Int16 eHAlign; // links, rechts, mittig
-SwSurround eSurround; // Wrap-Mode
+SwFrmSize eHeightFix; // height fixed or min
+RndStdIds eAnchor; // binding
+short eHRel; // page or page border
+short eVRel; // page or page border
+sal_Int16 eVAlign; // up, down, centered
+sal_Int16 eHAlign; // left, right, centered
+SwSurround eSurround; // wrap mode
-sal_uInt8 nXBind, nYBind;// relativ zu was gebunden
+sal_uInt8 nXBind, nYBind;// bound relative to what
-// 2.Teil: sich waehrend des Einlesens ergebende AEnderungen
+// part 2: changes found during reading
long nNewNetWidth;
-SwPosition* pMainTextPos; // um nach Apo in Haupttext zurueckzukehren
-sal_uInt16 nLineSpace; // LineSpace in tw fuer Graf-Apos
+SwPosition* pMainTextPos; // to return to main text after apo
+sal_uInt16 nLineSpace; // line space in tw for graf apos
bool bAutoWidth;
bool bToggelPos;
@@ -89,15 +89,15 @@ class WW8RStyle: public WW8Style
{
friend class SwWW8ImplReader;
wwSprmParser maSprmParser;
-SwWW8ImplReader* pIo; // Parser-Klasse
-SvStream* pStStrm; // Input-File
+SwWW8ImplReader* pIo; // parser class
+SvStream* pStStrm; // input file
-SwNumRule* pStyRule;// Bullets und Aufzaehlungen in Styles
+SwNumRule* pStyRule;// bullets and enumerations in styles
-sal_uInt8* pParaSprms; // alle ParaSprms des UPX falls UPX.Papx
-sal_uInt16 nSprmsLen; // Laenge davon
+sal_uInt8* pParaSprms; // all ParaSprms of the UPX if UPX.Papx
+sal_uInt16 nSprmsLen; // its length
-sal_uInt8 nWwNumLevel; // fuer Bullets und Aufzaehlungen in
Styles
+sal_uInt8 nWwNumLevel; // for bullets and enumerations in styles
bool bTextColChanged;
bool bFontChanged; // For Simulating Default-Font
commit 2724773573c68f5f4d0176c12a1deda0475a66e9
Author: Thomas Klausner w...@netbsd.org
Date: Fri Aug 7 21:54:47 2015 +0200
Fix typo in comment.
Change-Id: I4adabd4eedc6dd9156eb40476e2141dece1e448d
diff --git a/sw/source/filter/ww8/docxfootnotes.hxx
b/sw/source/filter/ww8/docxfootnotes.hxx
index 7969738..281d842 100644
--- a/sw/source/filter/ww8/docxfootnotes.hxx
+++ b/sw/source/filter/ww8/docxfootnotes.hxx
@@ -30,7 +30,7 @@ typedef ::std::vector const SwFormatFootnote*
FootnotesVector;
/** Remember footnotes/endnotes so that we can dump them in one go.
-Also rememeber the last added footnote Id to be able to write it in the
+Also remember the last added footnote Id to be able to write it in the
DocxAttributeOutput::EndRunProperties() method.
*/
class FootnotesList {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/ui/chrdlg/pardlg.cxx |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit a1438658ff8cf86618acf27e6a3522968163
Author: Thomas Klausner w...@netbsd.org
Date: Thu Aug 6 22:10:58 2015 +0200
Translate a comment to English.
Change-Id: I3cc3973e3740009b543d9a841396182e76e16203
diff --git a/sw/source/ui/chrdlg/pardlg.cxx b/sw/source/ui/chrdlg/pardlg.cxx
index c9bd552..7c1fb0c 100644
--- a/sw/source/ui/chrdlg/pardlg.cxx
+++ b/sw/source/ui/chrdlg/pardlg.cxx
@@ -225,8 +225,7 @@ void SwParaDlg::PageCreated(sal_uInt16 nId, SfxTabPage
rPage)
if(!( nHtmlMode HTMLMODE_ON ) ||
nHtmlMode HTMLMODE_SOME_STYLES)
{
-// Seitenumbruch nur, wenn der Cursor im Body-Bereich und nicht in
-// einer Tabelle steht
+// pagebreak only when the cursor is in the body-area and not in a
table
const FrmTypeFlags eType = rSh.GetFrmType(0,true);
if(!(FrmTypeFlags::BODY eType) ||
rSh.GetSelectionType() nsSelectionType::SEL_TBL)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/ww8struc.hxx | 45 ++
1 file changed, 22 insertions(+), 23 deletions(-)
New commits:
commit 54ae52e1cef40d888495b323583c22cff0da6a8d
Author: Thomas Klausner w...@netbsd.org
Date: Thu Aug 6 22:08:46 2015 +0200
Translate comments to English.
Change-Id: Ic1c22a4840c09249e9a1e8cf0712ee942fd030b1
diff --git a/sw/source/filter/ww8/ww8struc.hxx
b/sw/source/filter/ww8/ww8struc.hxx
index 8838536..307a5c1 100644
--- a/sw/source/filter/ww8/ww8struc.hxx
+++ b/sw/source/filter/ww8/ww8struc.hxx
@@ -175,8 +175,8 @@ struct WW8_STD
sal_uInt16 cupx : 4; // # of UPXs (and UPEs)
sal_uInt16 istdNext : 12; // next style
sal_uInt16 bchUpe;// offset to end of upx's, start of upe's
-// jetzt neu:
-// ab Ver8 gibts zwei Felder mehr:
+// new:
+// from Ver8 on there are two more fields:
sal_uInt16fAutoRedef : 1;/* auto redefine style when appropriate */
sal_uInt16fHidden : 1; /* hidden from UI? */
sal_uInt16: 14; /* unused bits */
@@ -191,7 +191,7 @@ struct WW8_STD
static_assert(sizeof (WW8_STD) == 10, this has to match the msword size);
-/** Basis zum Einlesen UND zum Arbeiten (wird jeweils unter schiedlich beerbt)
+/** base for reading AND working on (will have different subclasses */
*/
struct WW8_FFN_BASE // Font Descriptor
{
@@ -211,15 +211,15 @@ struct WW8_FFN_BASE // Font Descriptor
static_assert(sizeof (WW8_FFN_BASE) == 6, this has to match the msword size);
-/** Hiermit arbeiten wir im Parser (und Dumper)
+/** This is what we use in the Parser (and Dumper)
*/
struct WW8_FFN : public WW8_FFN_BASE
{
// ab Ver8 als Unicode
-OUString sFontname;// 0x6 bzw. 0x40 ab Ver8 zero terminated string that
+OUString sFontname;// 0x6 or 0x40 resp. from Ver8 on zero terminated
string that
// records name of font.
// Maximal size of szFfn is 65
characters.
-// Vorsicht: Dieses Array kann auch
kleiner sein!!!
+// Attention: This array can be
smaller!!!
// Possibly followed by a second sz
which records the
// name of an alternate font to use if
the first named
// font does not exist on this system.
@@ -429,10 +429,9 @@ struct WW8_DOGRID
short dxaGrid; // width of each grid square
short dyaGrid; // height of each grid square
-/* a c h t u n g : es duerfen keine solchen Bitfelder ueber einen
eingelesenes Byte-Array
-gelegt werden!!
-stattdessen ist ein aBits1 darueber zu legen, das
mit auszulesen ist
-GRUND: Compiler auf Intel und Sparc sortieren die Bits unterschiedlich
+/* attention: you must not put bit fields on top of such a byte array read
from a file!
+ instead put an aBits1 on it and read it out with .
+ reason: compilers on Intel and Sparc sort the bits differently
*/
short dyGridDisplay:7; // the number of grid squares (in the y direction)
@@ -530,7 +529,7 @@ struct WW8_TBD
// * int :2 C0 reserved
};
-struct WW8_TCell// hiermit wird weitergearbeitet (entspricht weitestgehend
dem Ver8-Format)
+struct WW8_TCell// this is the base for further work (corresponds mostly
to the Ver8 format)
{
// The single-bit fields should ideally be bool, but probably need to keep
// them as sal_uInt8 to make them combine with the following two-bit
@@ -546,7 +545,7 @@ struct WW8_TCell// hiermit wird weitergearbeitet
(entspricht weitestgehend d
// 0 top
// 1 center
// 2 bottom
-sal_uInt16 fUnused : 7;// reserved - nicht loeschen: macht das
sal_uInt16 voll !!
+sal_uInt16 fUnused : 7;// reserved - do not remove, fills up the
sal_uInt16!
WW8_BRCVer9 rgbrc[4]; // border codes
//notational convenience for referring to brcTop, brcLeft, etc fields.
@@ -557,7 +556,7 @@ struct WW8_TCell// hiermit wird weitergearbeitet
(entspricht weitestgehend d
};
// cbTC (count of bytes of a TC) is 18(decimal), 12(hex).
-struct WW8_TCellVer6// wird aus der Datei gelesen
+struct WW8_TCellVer6// read from file
{
sal_uInt8 aBits1Ver6;
sal_uInt8 aBits2Ver6;
@@ -573,22 +572,22 @@ struct WW8_TCellVer6// wird aus der Datei gelesen
};
// cbTC (count of bytes of a TC) is 10(decimal), A(hex).
-struct WW8_TCellVer8// wird aus der Datei gelesen
+struct WW8_TCellVer8// read from file
{
-SVBT16 aBits1Ver8; // Dokumentation siehe oben unter WW8_TCell
+SVBT16 aBits1Ver8
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/ww8struc.hxx |1 -
1 file changed, 1 deletion(-)
New commits:
commit 9f2beba81a0b70d1624cbb431fbb7563d6ef6b5b
Author: Thomas Klausner w...@netbsd.org
Date: Thu Aug 6 22:14:07 2015 +0200
Fix comment.
Change-Id: I0f18205f63c6bd5f9375cf3328b72ba5ef84cbde
diff --git a/sw/source/filter/ww8/ww8struc.hxx
b/sw/source/filter/ww8/ww8struc.hxx
index 307a5c1..43e1507 100644
--- a/sw/source/filter/ww8/ww8struc.hxx
+++ b/sw/source/filter/ww8/ww8struc.hxx
@@ -192,7 +192,6 @@ struct WW8_STD
static_assert(sizeof (WW8_STD) == 10, this has to match the msword size);
/** base for reading AND working on (will have different subclasses */
-*/
struct WW8_FFN_BASE // Font Descriptor
{
// ab Ver6
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Question presets upcomming version 5
Hey all, Is there a desicion made what will be the icon-preset in Version 5? Background: I try to publish new documentation on LibO 5 near to date of release LibO 5. Ducumentation must start now - and I want to take screenshots fitting to the preset Icon sets. My personal favorit is the Breeze icon set, but actual still Tango is standard. So is or when will you (ESC) made a decision? Thank you for a short answer:) Best regards Thomas -- ## Unterstützung der freien Office Suite ## http://de.libreOffice.org - www.LibreOffice.org ## Vorstand Freies Office Deutschland e.V. ## Mitglieder willkommen: www.FroDeV.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
How to hide configuration page BasicIDE?
Hello everybody, I am playing around with configuration-files (*.xcd) and registry-datas. I found the following example to hide an option page and it works fine. ?xml version=1.0 encoding=UTF-8? oor:data xmlns:xs=http://www.w3.org/2001/XMLSchema; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; xmlns:oor=http://openoffice.org/2001/registry; dependency file=main / !-- Hide Tools - Options - LibreOffice - Advanced -- oor:component-data xmlns:install=http://openoffice.org/2004/installation; oor:name=OptionsDialog oor:package=org.openoffice.Office node oor:name=OptionsDialogGroups node oor:name=ProductName oor:op=fuse node oor:name=Pages node oor:name=Java oor:op=fuse prop oor:name=Hide valuetrue/value /prop /node /node /node /node /oor:component-data /oor:data Now I tried to hide the following entry too - so the page which is called in german Optionen für die Basic IDE. I searched inside the main.xcd to find the page-name and - similar to the above example - it should be BasicIDE?. So I removed in the examplefile the pagename Java with BasicIDE - but nothing happend. I tried different names (f.e. Print - which hides the Printer entry and Page) but I do not have success with these advanced Basic IDE Page. What I am doing wrong? Is there a differnt place to find the correct pagenames? Thanks for your advice. Best regards Thomas -- ## Unterstützung der freien Office Suite ## http://de.libreOffice.org - www.LibreOffice.org ## Vorstand Freies Office Deutschland e.V. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: How to hide configuration page BasicIDE?
Am 02.04.2015 18:31, schrieb Andras Timar: [..] It is BasicIDEOptions. See http://opengrok.libreoffice.org/xref/core/cui/source/options/treeopt.cxx#346 Best regards, Andras Thank you, Andras :)) That answers my second question:)) Best regards Thomas -- ## Unterstützung der freien Office Suite ## http://de.libreOffice.org - www.LibreOffice.org ## Vorstand Freies Office Deutschland e.V. ## Mitglieder willkommen: www.FroDeV.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: How to hide configuration page BasicIDE?
Hey, I found the right page: BasicIDEOptions It works like it should :)) Nevertheless - where are those names dokumented? Searching the main.xcd you will not have a result looking for BasicIDEOptions? Best regards Thomas Am 02.04.2015 08:28, schrieb Thomas Krumbein: Hello everybody, I am playing around with configuration-files (*.xcd) and registry-datas. I found the following example to hide an option page and it works fine. ?xml version=1.0 encoding=UTF-8? oor:data xmlns:xs=http://www.w3.org/2001/XMLSchema; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; xmlns:oor=http://openoffice.org/2001/registry; dependency file=main / !-- Hide Tools - Options - LibreOffice - Advanced -- oor:component-data xmlns:install=http://openoffice.org/2004/installation; oor:name=OptionsDialog oor:package=org.openoffice.Office node oor:name=OptionsDialogGroups node oor:name=ProductName oor:op=fuse node oor:name=Pages node oor:name=Java oor:op=fuse prop oor:name=Hide valuetrue/value /prop /node /node /node /node /oor:component-data /oor:data Now I tried to hide the following entry too - so the page which is called in german Optionen für die Basic IDE. I searched inside the main.xcd to find the page-name and - similar to the above example - it should be BasicIDE?. So I removed in the examplefile the pagename Java with BasicIDE - but nothing happend. I tried different names (f.e. Print - which hides the Printer entry and Page) but I do not have success with these advanced Basic IDE Page. What I am doing wrong? Is there a differnt place to find the correct pagenames? Thanks for your advice. Best regards Thomas -- M.I.C. Consulting Riederbergstr. 92 65195 Wiesbaden Tel. 0611 - 188 53 39 Fax: 0611 - 188 53 40 http://www.mic-consulting.de e-Mail: i...@mic-consulting.de ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
string array in Windows policy registry value
Hello, Recently LibreOffice had the ability to read settings from the Windows registry as explained here: https://wiki.documentfoundation.org/ReleaseNotes/4.2#Windows_Registry_changes This is fine for settings that can be set with one string. There are, however, settings that require multiple string values, such as: org.openoffice.Office.Common\Security\Scripting\SecureURL, which contain multiple values in it tags. It there an undocumented delimiter that can be used in the registry Value that LibreOffice can use to split the string into multiple values? As this would be helpful in allowing Windows Systems Administrators to set Trusted File Locations via Group Policy. This thread here talks about the issue in more detail: http://ask.libreoffice.org/de/question/47077/konfiguration-ueber-registrygpo/?answer=47728#post-id-47728 Thanks. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
RE: string array in Windows policy registry value
Andras, Thanks very much, this has been very helpful to me! This works. Regards, Thomas Higgins Date: Mon, 16 Mar 2015 12:15:23 +0100 Subject: Re: string array in Windows policy registry value From: tima...@gmail.com To: thomas_higg...@live.com.au CC: libreoffice@lists.freedesktop.org On Mon, Mar 16, 2015 at 12:13 PM, Thomas Higgins thomas_higg...@live.com.au wrote: Andras, Thanks for the response. Next question: How do I put in locations that have spaces in them without the path being split? %20 (URL syntax) Regards, Andras ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
RE: string array in Windows policy registry value
Andras, Thanks for the response. Next question: How do I put in locations that have spaces in them without the path being split? Regards, Thomas Higgins Date: Mon, 16 Mar 2015 11:53:14 +0100 Subject: Re: string array in Windows policy registry value From: tima...@gmail.com To: thomas_higg...@live.com.au CC: libreoffice@lists.freedesktop.org On Sun, Mar 15, 2015 at 8:33 PM, Thomas Higgins thomas_higg...@live.com.au wrote: There are, however, settings that require multiple string values, such as: org.openoffice.Office.Common\Security\Scripting\SecureURL, which contain multiple values in it tags. it tags are optional. It works well with spaces as delimiters, too. It there an undocumented delimiter that can be used in the registry Value that LibreOffice can use to split the string into multiple values? Space is the path delimiter in registry. Regards, Andras ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: .git-hooks/post-merge
.git-hooks/post-merge |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f4f064da1aec45bb17d01cef59577191923c8ae4 Author: Thomas Klausner w...@netbsd.org Date: Fri Feb 13 16:40:36 2015 +0100 git-hooks: post-merge script does not need /bin/bash Just use /bin/sh, which exists on more systems. Change-Id: I5e5453b89841510473414a4c339b647b4f95ae7b diff --git a/.git-hooks/post-merge b/.git-hooks/post-merge index 25e62ed..b1be512 100755 --- a/.git-hooks/post-merge +++ b/.git-hooks/post-merge @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # Do not warn if there were no real merge git rev-parse -q --verify HEAD^2 /dev/null || exit ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
