from:"Thomas Viehmann"

[Libreoffice-commits] core.git: external/python3 RepositoryExternal.mk

2020-12-01 Thread Thomas Viehmann (via logerrit)

 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

2020-11-25 Thread Thomas Viehmann (via logerrit)

 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

2020-11-25 Thread Thomas Viehmann (via logerrit)

 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

[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - sw/qa sw/source

2019-09-17 Thread Thomas Viehmann (via logerrit)

 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

2019-09-17 Thread Thomas Viehmann (via logerrit)

 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

2019-05-16 Thread Thomas Viehmann


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

2019-05-15 Thread Thomas Viehmann


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

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - pyuno/source

2019-04-02 Thread Thomas Viehmann (via logerrit)

 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

2019-04-02 Thread Thomas Viehmann (via logerrit)

 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

[Libreoffice-commits] core.git: sc/source

2015-01-21 Thread Thomas Viehmann

 sc/source/ui/miscdlgs/inscodlg.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 83133f175c021b3f139c596a771b56d94cb3ed11
Author: Thomas Viehmann t...@beamnet.de
Date:   Tue Jan 20 20:05:35 2015 +0100

fdo #88578: Focus on first checkbox when showing calc paste special dialog

Change-Id: Ic0d82c710c09a099329fa76e2fb81c6c8613b334
Reviewed-on: https://gerrit.libreoffice.org/14071
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/sc/source/ui/miscdlgs/inscodlg.cxx 
b/sc/source/ui/miscdlgs/inscodlg.cxx
index 75e5bac..0ac77f7 100644
--- a/sc/source/ui/miscdlgs/inscodlg.cxx
+++ b/sc/source/ui/miscdlgs/inscodlg.cxx
@@ -124,6 +124,7 @@ ScInsertContentsDlg::ScInsertContentsDlg( vcl::Window*  
 pParent,
 mpBtnShortCutPasteValuesOnly-SetClickHdl( LINK( this, 
ScInsertContentsDlg, ShortCutHdl ) );;
 mpBtnShortCutPasteValuesFormats-SetClickHdl( LINK( this, 
ScInsertContentsDlg, ShortCutHdl ) );;
 mpBtnShortCutPasteTranspose-SetClickHdl( LINK( this, ScInsertContentsDlg, 
ShortCutHdl ) );
+mpBtnInsAll-GrabFocus();
 }
 
 InsertDeleteFlags ScInsertContentsDlg::GetInsContentsCmdBits() const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sc/source

2015-01-21 Thread Thomas Viehmann

 sc/source/ui/miscdlgs/inscodlg.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 7b39d4071a090829f40b61bc831e8069d6a9d493
Author: Thomas Viehmann t...@beamnet.de
Date:   Tue Jan 20 20:05:35 2015 +0100

fdo#88578: Focus on first checkbox when showing calc paste special dialog

Reviewed-on: https://gerrit.libreoffice.org/14071
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com
(cherry picked from commit 83133f175c021b3f139c596a771b56d94cb3ed11)

Change-Id: Ic0d82c710c09a099329fa76e2fb81c6c8613b334
Reviewed-on: https://gerrit.libreoffice.org/14083
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/sc/source/ui/miscdlgs/inscodlg.cxx 
b/sc/source/ui/miscdlgs/inscodlg.cxx
index 75e5bac..0ac77f7 100644
--- a/sc/source/ui/miscdlgs/inscodlg.cxx
+++ b/sc/source/ui/miscdlgs/inscodlg.cxx
@@ -124,6 +124,7 @@ ScInsertContentsDlg::ScInsertContentsDlg( vcl::Window*  
 pParent,
 mpBtnShortCutPasteValuesOnly-SetClickHdl( LINK( this, 
ScInsertContentsDlg, ShortCutHdl ) );;
 mpBtnShortCutPasteValuesFormats-SetClickHdl( LINK( this, 
ScInsertContentsDlg, ShortCutHdl ) );;
 mpBtnShortCutPasteTranspose-SetClickHdl( LINK( this, ScInsertContentsDlg, 
ShortCutHdl ) );
+mpBtnInsAll-GrabFocus();
 }
 
 InsertDeleteFlags ScInsertContentsDlg::GetInsContentsCmdBits() const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'refs/changes/49/11249/2'

2014-09-29 Thread Thomas Viehmann


___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'refs/changes/49/11249/1'

2014-09-29 Thread Thomas Viehmann


___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'refs/changes/55/11155/1'

2014-09-29 Thread Thomas Viehmann


___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'refs/changes/55/11155/2'

2014-09-29 Thread Thomas Viehmann


___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/oox oox/source

2014-09-01 Thread Thomas Viehmann

 include/oox/export/chartexport.hxx |2 +-
 oox/source/export/chartexport.cxx  |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit fba7b58a9ddaa829892bf3a3e8f3dd6970664f78
Author: Thomas Viehmann t...@beamnet.de
Date:   Mon Sep 1 22:32:26 2014 +0200

fix typo Sufface-Surface

Change-Id: I90847d0edbc2c13e405562647b150012bc5df7e2
Reviewed-on: https://gerrit.libreoffice.org/11249
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com

diff --git a/include/oox/export/chartexport.hxx 
b/include/oox/export/chartexport.hxx
index 2fd383b..ed8743c 100644
--- a/include/oox/export/chartexport.hxx
+++ b/include/oox/export/chartexport.hxx
@@ -138,7 +138,7 @@ private:
 void exportRadarChart( com::sun::star::uno::Reference 
com::sun::star::chart2::XChartType  xChartType );
 void exportScatterChart( com::sun::star::uno::Reference 
com::sun::star::chart2::XChartType  xChartType );
 void exportStockChart( com::sun::star::uno::Reference 
com::sun::star::chart2::XChartType  xChartType );
-void exportSuffaceChart( com::sun::star::uno::Reference 
com::sun::star::chart2::XChartType  xChartType );
+void exportSurfaceChart( com::sun::star::uno::Reference 
com::sun::star::chart2::XChartType  xChartType );
 void exportHiLowLines();
 void exportUpDownBars(com::sun::star::uno::Reference 
com::sun::star::chart2::XChartType  xChartType );
 
diff --git a/oox/source/export/chartexport.cxx 
b/oox/source/export/chartexport.cxx
index 27b9385..d074fe2 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -1116,7 +1116,7 @@ void ChartExport::exportPlotArea( )
 }
 case chart::TYPEID_SURFACE:
 {
-exportSuffaceChart( xChartType );
+exportSurfaceChart( xChartType );
 break;
 }
 default:
@@ -1612,7 +1612,7 @@ void ChartExport::exportUpDownBars( Reference 
chart2::XChartType  xChartType)
 }
 }
 
-void ChartExport::exportSuffaceChart( Reference chart2::XChartType  
xChartType )
+void ChartExport::exportSurfaceChart( Reference chart2::XChartType  
xChartType )
 {
 FSHelperPtr pFS = GetFS();
 sal_Int32 nTypeId = XML_surfaceChart;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/source

2014-08-28 Thread Thomas Viehmann

 sc/source/ui/miscdlgs/acredlin.cxx|6 
 sc/source/ui/miscdlgs/anyrefdg.cxx|   34 +--
 sc/source/ui/miscdlgs/autofmt.cxx |   19 -
 sc/source/ui/miscdlgs/crnrdlg.cxx |  375 +++---
 sc/source/ui/miscdlgs/highred.cxx |4 
 sc/source/ui/miscdlgs/inscodlg.cxx|3 
 sc/source/ui/miscdlgs/instbdlg.cxx|8 
 sc/source/ui/miscdlgs/linkarea.cxx|2 
 sc/source/ui/miscdlgs/mtrindlg.cxx|4 
 sc/source/ui/miscdlgs/scuiautofmt.cxx |3 
 sc/source/ui/miscdlgs/simpref.cxx |   16 -
 sc/source/ui/miscdlgs/solvrdlg.cxx|8 
 sc/source/ui/miscdlgs/tabopdlg.cxx|   14 -
 13 files changed, 100 insertions(+), 396 deletions(-)

New commits:
commit 80748411462c20d51d80eca63211285036af106c
Author: Thomas Viehmann t...@beamnet.de
Date:   Wed Aug 27 22:38:23 2014 +0200

fdo#39468 Translate German comments in sc/source/ui/miscdlgs

Change-Id: I3b15d653206e7c55422a08951466916947052a24
Reviewed-on: https://gerrit.libreoffice.org/11155
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com

diff --git a/sc/source/ui/miscdlgs/acredlin.cxx 
b/sc/source/ui/miscdlgs/acredlin.cxx
index bfbd4f5..aa65b05 100644
--- a/sc/source/ui/miscdlgs/acredlin.cxx
+++ b/sc/source/ui/miscdlgs/acredlin.cxx
@@ -1786,8 +1786,8 @@ void ScAcceptChgDlg::Initialize(SfxChildWinInfo *pInfo)
 {
 sal_Int32 nPos = pInfo-aExtraString.indexOf(AcceptChgDat:);
 
-// Versuche, den Alignment-String ALIGN:(...) einzulesen; wenn
-// er nicht vorhanden ist, liegt eine altere Version vor
+// Try to read the alignment string ALIGN:(...); if it is missing
+// we have an old version
 if ( nPos != -1 )
 {
 sal_Int32 n1 = pInfo-aExtraString.indexOf('(', nPos);
@@ -1796,7 +1796,7 @@ void ScAcceptChgDlg::Initialize(SfxChildWinInfo *pInfo)
 sal_Int32 n2 = pInfo-aExtraString.indexOf(')', n1);
 if ( n2 != -1 )
 {
-// Alignment-String herausschneiden
+// cut out alignment string
 aStr = pInfo-aExtraString.copy(nPos, n2 - nPos + 1);
 pInfo-aExtraString = 
pInfo-aExtraString.replaceAt(nPos, n2 - nPos + 1, );
 aStr = aStr.copy( n1-nPos+1 );
diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx 
b/sc/source/ui/miscdlgs/anyrefdg.cxx
index 3e75593..6e1dd5c 100644
--- a/sc/source/ui/miscdlgs/anyrefdg.cxx
+++ b/sc/source/ui/miscdlgs/anyrefdg.cxx
@@ -351,7 +351,7 @@ void ScFormulaReferenceHelper::RefInputDone( bool bForced )
 {
 if ( CanInputDone( bForced ) )
 {
-if (bAccInserted)   // Accelerator wieder abschalten
+if (bAccInserted)   // disable accelerator
 {
 Application::RemoveAccel( pAccel.get() );
 bAccInserted = false;
@@ -365,7 +365,7 @@ void ScFormulaReferenceHelper::RefInputDone( bool bForced )
 // restore the parent of the edit field
 pRefEdit-SetParent(mpOldEditParent);
 
-// Fenster wieder gross
+// the window is at the old size again
 m_pWindow-SetOutputSizePixel(aOldDialogSize);
 
 // set button parent
@@ -377,7 +377,7 @@ void ScFormulaReferenceHelper::RefInputDone( bool bForced )
 
 if (!mbOldEditParentLayoutEnabled)
 {
-// pEditCell an alte Position
+// set pEditCell to old position
 pRefEdit-SetPosSizePixel(aOldEditPos, aOldEditSize);
 
 // set button position
@@ -387,14 +387,14 @@ void ScFormulaReferenceHelper::RefInputDone( bool bForced 
)
 }
 }
 
-// Fenstertitel anpassen
+// Adjust window title
 m_pWindow-SetText(sOldDialogText);
 
 // set button image
 if( pRefBtn )
 pRefBtn-SetStartImage();
 
-// Alle anderen: Show();
+// All others: Show();
 for (winvec::iterator aI = m_aHiddenWidgets.begin(); aI != 
m_aHiddenWidgets.end(); ++aI)
 {
 Window *pWindow = *aI;
@@ -460,7 +460,7 @@ void ScFormulaReferenceHelper::RefInputStart( 
formula::RefEdit* pEdit, formula::
 //this is widget-layout-ified
 if (!mbOldEditParentLayoutEnabled)
 {
-// Alte Daten merken
+// Save current state
 aOldDialogSize = m_pWindow-GetOutputSizePixel();
 aOldEditPos = pRefEdit-GetPosPixel();
 if (pRefBtn)
@@ -474,7 +474,7 @@ void ScFormulaReferenceHelper::RefInputStart( 
formula::RefEdit* pEdit, formula::
 pRefBtn-SetParent(m_pWindow);
 }
 
-// Fenstertitel anpassen
+// Save and adjust window title
 sOldDialogText = m_pWindow-GetText();
 if (Window *pLabel = pRefEdit-GetLabelWidgetForShrinkMode())
 {
@@ -535,7

Thomas Viehmann license statement

2014-08-14 Thread Thomas Viehmann


Hello,

thank you for LibreOffice. All of my past  future contributions to 
LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license unless 
explicitly stated otherwise with the contribution.


Best regards

Thomas
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: icon-themes/galaxy sc/source sc/uiconfig

2014-08-14 Thread Thomas Viehmann

 icon-themes/galaxy/sc/res/paste_transpose.png  |binary
 icon-themes/galaxy/sc/res/paste_values_formats.png |binary
 icon-themes/galaxy/sc/res/paste_values_only.png|binary
 sc/source/ui/inc/inscodlg.hxx  |   19 +++-
 sc/source/ui/miscdlgs/inscodlg.cxx |   76 +
 sc/uiconfig/scalc/ui/pastespecial.ui   |   89 ++---
 6 files changed, 169 insertions(+), 15 deletions(-)

New commits:
commit 6af3bc396eedde71e40c3e8d714a728c8fa881aa
Author: Thomas Viehmann t...@beamnet.de
Date:   Fri Aug 15 00:07:58 2014 +0200

fdo#79116 make paste special easier to use

This patch adds three short cut buttons to the calc paste special
dialog: paste values only (numbers, strings, dates), paste values and
formats, and paste transposed.

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

diff --git a/icon-themes/galaxy/sc/res/paste_transpose.png 
b/icon-themes/galaxy/sc/res/paste_transpose.png
new file mode 100644
index 000..9f1d315
Binary files /dev/null and b/icon-themes/galaxy/sc/res/paste_transpose.png 
differ
diff --git a/icon-themes/galaxy/sc/res/paste_values_formats.png 
b/icon-themes/galaxy/sc/res/paste_values_formats.png
new file mode 100644
index 000..82f0b1f
Binary files /dev/null and b/icon-themes/galaxy/sc/res/paste_values_formats.png 
differ
diff --git a/icon-themes/galaxy/sc/res/paste_values_only.png 
b/icon-themes/galaxy/sc/res/paste_values_only.png
new file mode 100644
index 000..4ae118b
Binary files /dev/null and b/icon-themes/galaxy/sc/res/paste_values_only.png 
differ
diff --git a/sc/source/ui/inc/inscodlg.hxx b/sc/source/ui/inc/inscodlg.hxx
index 3fd4008..1130daa 100644
--- a/sc/source/ui/inc/inscodlg.hxx
+++ b/sc/source/ui/inc/inscodlg.hxx
@@ -37,9 +37,9 @@ public:
 
 sal_uInt16  GetInsContentsCmdBits() const;
 sal_uInt16  GetFormulaCmdBits() const;
-boolIsSkipEmptyCells() const {return 
mpBtnSkipEmptyCells-IsChecked();}
-boolIsTranspose() const {return mpBtnTranspose-IsChecked();}
-boolIsLink() const {return mpBtnLink-IsChecked();}
+boolIsSkipEmptyCells() const;
+boolIsTranspose() const;
+boolIsLink() const;
 InsCellCmd  GetMoveMode();
 
 voidSetOtherDoc( bool bSet );
@@ -71,11 +71,23 @@ private:
 RadioButton* mpRbMoveDown;
 RadioButton* mpRbMoveRight;
 
+PushButton*  mpBtnShortCutPasteValuesOnly;
+PushButton*  mpBtnShortCutPasteValuesFormats;
+PushButton*  mpBtnShortCutPasteTranspose;
+
 bool  bOtherDoc;
 bool  bFillMode;
 bool  bChangeTrack;
 bool  bMoveDownDisabled;
 bool  bMoveRightDisabled;
+bool  bUsedShortCut;
+
+sal_uInt16nShortCutInsContentsCmdBits;
+sal_uInt16nShortCutFormulaCmdBits;
+bool  bShortCutSkipEmptyCells;
+bool  bShortCutTranspose;
+bool  bShortCutIsLink;
+InsCellCmdnShortCutMoveMode;
 
 static bool bPreviousAllCheck;
 static sal_uInt16   nPreviousChecks;
@@ -89,6 +101,7 @@ private:
 // Handler
 DECL_LINK( InsAllHdl, void* );
 DECL_LINK( LinkBtnHdl, void* );
+DECL_LINK( ShortCutHdl, PushButton* );
 };
 
 #endif // INCLUDED_SC_SOURCE_UI_INC_INSCODLG_HXX
diff --git a/sc/source/ui/miscdlgs/inscodlg.cxx 
b/sc/source/ui/miscdlgs/inscodlg.cxx
index 18426b0..f35252e 100644
--- a/sc/source/ui/miscdlgs/inscodlg.cxx
+++ b/sc/source/ui/miscdlgs/inscodlg.cxx
@@ -38,7 +38,8 @@ ScInsertContentsDlg::ScInsertContentsDlg( Window*   
pParent,
 bFillMode   ( false ),
 bChangeTrack( false ),
 bMoveDownDisabled( false ),
-bMoveRightDisabled( false )
+bMoveRightDisabled( false ),
+bUsedShortCut   ( false )
 {
 get( mpBtnInsAll, paste_all );
 get( mpBtnInsStrings, text );
@@ -59,6 +60,9 @@ ScInsertContentsDlg::ScInsertContentsDlg( Window*   
pParent,
 get( mpRbMoveNone, no_shift );
 get( mpRbMoveDown, move_down );
 get( mpRbMoveRight, move_right );
+get( mpBtnShortCutPasteValuesOnly, paste_values_only);
+get( mpBtnShortCutPasteValuesFormats, paste_values_formats);
+get( mpBtnShortCutPasteTranspose, paste_transpose);
 
 if ( pStrTitle )
 SetText( *pStrTitle );
@@ -111,6 +115,9 @@ ScInsertContentsDlg::ScInsertContentsDlg( Window*   
pParent,
 mpBtnInsAll-SetClickHdl( LINK( this, ScInsertContentsDlg, InsAllHdl ) );
 mpBtnLink-SetClickHdl( LINK( this, ScInsertContentsDlg, LinkBtnHdl ) );
 
+mpBtnShortCutPasteValuesOnly-SetClickHdl( LINK( this, 
ScInsertContentsDlg, ShortCutHdl ) );;
+mpBtnShortCutPasteValuesFormats-SetClickHdl( LINK

[Libreoffice-commits] core.git: external/python3 RepositoryExternal.mk

[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - vcl/inc vcl/unx

[Libreoffice-commits] core.git: vcl/inc vcl/unx

[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - sw/qa sw/source

[Libreoffice-commits] core.git: sw/qa sw/source

Re: Converting Python Tuples / Lists into Any in PyUNO

Converting Python Tuples / Lists into Any in PyUNO

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - pyuno/source

[Libreoffice-commits] core.git: pyuno/source

[Libreoffice-commits] core.git: sc/source

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sc/source

[Libreoffice-commits] core.git: Changes to 'refs/changes/49/11249/2'

[Libreoffice-commits] core.git: Changes to 'refs/changes/49/11249/1'

[Libreoffice-commits] core.git: Changes to 'refs/changes/55/11155/1'

[Libreoffice-commits] core.git: Changes to 'refs/changes/55/11155/2'

[Libreoffice-commits] core.git: include/oox oox/source

[Libreoffice-commits] core.git: sc/source

Thomas Viehmann license statement

[Libreoffice-commits] core.git: icon-themes/galaxy sc/source sc/uiconfig

19 matches

Site Navigation

Mail list logo

Footer information