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

2018-07-06 Thread Bernhard Widl 
 sw/inc/IMark.hxx |4 
 sw/inc/cmdid.h   |2 
 sw/inc/crsrsh.hxx|5 
 sw/inc/strings.hrc   |2 
 sw/inc/unoprnms.hxx  |2 
 sw/qa/uitest/writer_tests2/bookmark.py   |2 
 sw/source/core/crsr/bookmrk.cxx  |1 
 sw/source/core/crsr/crbm.cxx |   25 +++
 sw/source/core/inc/bookmrk.hxx   |   10 +
 sw/source/core/unocore/unobkm.cxx|   72 +
 sw/source/core/unocore/unomap1.cxx   |2 
 sw/source/ui/misc/bookmark.cxx   |   37 -
 sw/source/uibase/inc/bookmark.hxx|5 
 sw/uiconfig/swriter/ui/insertbookmark.ui |  224 +--
 xmloff/source/text/txtparae.cxx  |   24 +++
 15 files changed, 310 insertions(+), 107 deletions(-)

New commits:
commit 7a586a9c6bf28088c72f163d724d1cb3259e7920
Author: Bernhard Widl 
Date:   Wed Nov 15 19:30:28 2017 +0100

tdf#101856 create bookmarks w/ new hidden/cond attrs, save as odt

Committer's note: this is forward ported from 5.2+backports branch, with
numerous conflicts.

tdf#101856 add new checkbox/editfield for hidden/condition attrs
Conflicts:
sw/uiconfig/swriter/ui/insertbookmark.ui
Author: Bernhard Widl 
(cherry picked from commit c347e00821791377731ab32acd103ea006f3cc1b)

tdf#101856 Fix crash in Insert Bookmark dialog
Author: Serge Krot 
Reviewed-on: https://gerrit.libreoffice.org/50616
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 
(cherry picked from commit bcc16920eec647f2a3753d60c4d969862f272942)

Change-Id: Ib1df7a4c1477693aa2d0ec067635cdcbd393cebd
Reviewed-on: https://gerrit.libreoffice.org/46820
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/sw/inc/IMark.hxx b/sw/inc/IMark.hxx
index 39ff1d7108eb..3761b0ea08fb 100644
--- a/sw/inc/IMark.hxx
+++ b/sw/inc/IMark.hxx
@@ -90,6 +90,10 @@ namespace sw { namespace mark
 virtual const vcl::KeyCode& GetKeyCode() const =0;
 virtual void SetShortName(const OUString&) =0;
 virtual void SetKeyCode(const vcl::KeyCode&) =0;
+virtual bool IsHidden() const =0;
+virtual const OUString& GetHideCondition() const =0;
+virtual void Hide(bool hide) =0;
+virtual void SetHideCondition(const OUString&) =0;
 private:
 IBookmark(IBookmark&) = delete;
 IBookmark  =(IBookmark const&) = delete;
diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index fccfd6c87bb9..377cae2b4121 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -781,6 +781,8 @@
 #define FN_SHAPE_ENDPOSITION_IN_HORI_L2R   (FN_PARAM2+26)
 #define FN_PARAM_PAM(FN_PARAM2+27) /* Point and Mark */
 #define FN_TEXT_BOX (FN_PARAM2+28) /* TextBox Property*/
+#define FN_BOOKMARK_HIDDEN  (FN_PARAM2+29) /* Hidden Property of 
bookmarks*/
+#define FN_BOOKMARK_CONDITION   (FN_PARAM2+30) /* Condition Property 
of bookmarks*/
 
 // Status: not more than 19!
 #define FN_STAT_PAGE(FN_STAT + 1)
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index 531452561fe9..e57153609256 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -533,6 +533,11 @@ public:
 const vcl::KeyCode&,
 const OUString& rName,
 IDocumentMarkAccess::MarkType eMark = 
IDocumentMarkAccess::MarkType::BOOKMARK);
+::sw::mark::IMark* SetBookmark2(
+const vcl::KeyCode&,
+const OUString& rName,
+bool bHide,
+const OUString& rCondition);
 bool GotoMark( const ::sw::mark::IMark* const pMark );// sets 
CurrentCursor.SPoint
 bool GotoMark( const ::sw::mark::IMark* const pMark, bool bAtStart );
 bool GoNextBookmark(); // true, if there was one
diff --git a/sw/inc/strings.hrc b/sw/inc/strings.hrc
index fef14dcc9307..9be1de51bfe9 100644
--- a/sw/inc/strings.hrc
+++ b/sw/inc/strings.hrc
@@ -236,6 +236,8 @@
 #define STR_BOOKMARK_DEF_NAME   NC_("STR_BOOKMARK_DEF_NAME", 
"Bookmark")
 #define STR_BOOKMARK_NAME   NC_("STR_BOOKMARK_NAME", 
"Name")
 #define STR_BOOKMARK_TEXT   NC_("STR_BOOKMARK_TEXT", 
"Text")
+#define STR_BOOKMARK_HIDDEN NC_("STR_BOOKMARK_HIDDEN", 
"Hidden")
+#define STR_BOOKMARK_CONDITION  NC_("STR_BOOKMARK_CONDITION", 
"Condition")
 #define SW_STR_NONE NC_("SW_STR_NONE", "[None]")
 #define STR_CAPTION_BEGINNING   NC_("STR_CAPTION_BEGINNING", 
"Start")
 #define STR_CAPTION_END NC_("STR_CAPTION_END", "End")
diff --git a/sw/inc/unoprnms.hxx b/sw/inc/unoprnms.hxx
ind

[Libreoffice-commits] core.git: Branch 'private/swe/libreoffice-5-2+backports' - sw/inc sw/source sw/uiconfig xmloff/source

2018-01-10 Thread Bernhard Widl 
Rebased ref, commits from common ancestor:
commit 93949cb1a1f8d7273cbc7e956a1b6309ddf88d92
Author: Bernhard Widl <bernhard.w...@cib.de>
Date:   Wed Nov 15 19:30:28 2017 +0100

tdf#101856 create bookmarks w/ new hidden/cond attrs, save as odt

Change-Id: Ibf067f7862d9d70d00d2e45ab0fcf74ec2fe1175

diff --git a/sw/inc/IMark.hxx b/sw/inc/IMark.hxx
index a132b6a3c0a4..aa9854c41475 100644
--- a/sw/inc/IMark.hxx
+++ b/sw/inc/IMark.hxx
@@ -86,6 +86,10 @@ namespace sw { namespace mark
 virtual const vcl::KeyCode& GetKeyCode() const =0;
 virtual void SetShortName(const OUString&) =0;
 virtual void SetKeyCode(const vcl::KeyCode&) =0;
+virtual bool IsHidden() const =0;
+virtual const OUString& GetHideCondition() const =0;
+virtual void Hide(bool hide) =0;
+virtual void SetHideCondition(const OUString&) =0;
 private:
 IBookmark(IBookmark&) = delete;
 IBookmark  =(IBookmark const&) = delete;
diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index 09cd1f48513c..36a93cef8ba7 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -814,6 +814,8 @@
 #define FN_PARAM_PAM(FN_PARAM2+27) /* Point and Mark */
 #define FN_TEXT_BOX (FN_PARAM2+28) /* TextBox Property*/
 #define FN_PARAM_IGNORE_PROTECTED   (FN_PARAM2+29) /* Ignore protected 
areas */
+#define FN_BOOKMARK_HIDDEN  (FN_PARAM2+30) /* Hidden Property of 
bookmarks*/
+#define FN_BOOKMARK_CONDITION   (FN_PARAM2+31) /* Condition Property 
of bookmarks*/
 
 // Status: not more than 19!
 #define FN_STAT_PAGE(FN_STAT + 1)
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index 89c90a965cfd..8195259686eb 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -549,6 +549,11 @@ public:
 const OUString& rName,
 const OUString& rShortName,
 IDocumentMarkAccess::MarkType eMark = 
IDocumentMarkAccess::MarkType::BOOKMARK);
+::sw::mark::IMark* SetBookmark(
+const vcl::KeyCode&,
+const OUString& rName,
+bool rHide,
+const OUString& rCondition);
 bool GotoMark( const ::sw::mark::IMark* const pMark );// sets 
CurrentCursor.SPoint
 bool GotoMark( const ::sw::mark::IMark* const pMark, bool bAtStart );
 bool GoNextBookmark(); // true, if there was one
diff --git a/sw/inc/globals.hrc b/sw/inc/globals.hrc
index 1959e52720cb..7d7f9909bed2 100644
--- a/sw/inc/globals.hrc
+++ b/sw/inc/globals.hrc
@@ -210,6 +210,8 @@
 #define SID_FAX_LIST(RC_GLOBALS_BEGIN +  116)
 #define SID_WRT_SHELL   (RC_GLOBALS_BEGIN +  117)
 
+#define STR_BOOKMARK_HIDDEN (RC_GLOBALS_BEGIN + 118)
+#define STR_BOOKMARK_CONDITION  (RC_GLOBALS_BEGIN + 119)
 
 #endif
 
diff --git a/sw/inc/unoprnms.hxx b/sw/inc/unoprnms.hxx
index 63589f273ce5..c700ee3bb468 100644
--- a/sw/inc/unoprnms.hxx
+++ b/sw/inc/unoprnms.hxx
@@ -331,6 +331,8 @@
 #define UNO_NAME_IS_GLOBAL_DOCUMENT_SECTION "IsGlobalDocumentSection"
 #define UNO_NAME_TEXT_FIELD "TextField"
 #define UNO_NAME_BOOKMARK "Bookmark"
+#define UNO_NAME_BOOKMARK_HIDDEN "BookmarkHidden"
+#define UNO_NAME_BOOKMARK_CONDITION "BookmarkCondition"
 #define UNO_NAME_TEXT_TABLE "TextTable"
 #define UNO_NAME_CELL "Cell"
 #define UNO_NAME_TEXT_FRAME "TextFrame"
diff --git a/sw/source/core/crsr/bookmrk.cxx b/sw/source/core/crsr/bookmrk.cxx
index 08594bc3d0e8..cd74c7adf102 100644
--- a/sw/source/core/crsr/bookmrk.cxx
+++ b/sw/source/core/crsr/bookmrk.cxx
@@ -286,6 +286,7 @@ namespace sw { namespace mark
 , ::sfx2::Metadatable()
 , m_aCode(rCode)
 , m_sShortName(rShortName)
+, m_bHidden(false)
 {
 m_aName = rName;
 }
diff --git a/sw/source/core/crsr/crbm.cxx b/sw/source/core/crsr/crbm.cxx
index 946af35c5cae..d95eb1174d65 100644
--- a/sw/source/core/crsr/crbm.cxx
+++ b/sw/source/core/crsr/crbm.cxx
@@ -99,6 +99,31 @@ namespace
 }
 // set CurrentCursor.SPoint
 
+// at CurrentCursor.SPoint
+::sw::mark::IMark* SwCursorShell::SetBookmark(
+const vcl::KeyCode& rCode,
+const OUString& rName,
+bool rHide,
+const OUString& rCondition)
+{
+StartAction();
+::sw::mark::IMark* pMark = getIDocumentMarkAccess()->makeMark(
+*GetCursor(),
+rName,
+IDocumentMarkAccess::MarkType::BOOKMARK);
+::sw::mark::IBookmark* pBookmark = dynamic_cast< ::sw::mark::IBookmark* 
>(pMark);
+if (pBookmark)
+{
+pBookmark->SetKeyCode(rCode);
+pBookmark->SetShortName(OUString());
+pBookmark->Hide(rHide);
+pBookmark->SetHideCondition(rCondition);
+}
+EndAction();
+return pMark;
+}
+// set CurrentCursor.SPoint
+
 bool SwCursorShell::GotoMark(const ::sw::mark::IMark* const pMark, bool 
bAtStart)
 {
 // watch

[Libreoffice-commits] core.git: Branch 'private/swe/libreoffice-5-2+backports' - sw/inc sw/source xmloff/source

2018-01-09 Thread Bernhard Widl 
 sw/inc/cmdid.h |2 +
 sw/inc/crsrsh.hxx  |5 ++
 sw/inc/unoprnms.hxx|2 +
 sw/source/core/crsr/crbm.cxx   |   25 
 sw/source/core/unocore/unobkm.cxx  |   74 -
 sw/source/core/unocore/unomap1.cxx |2 +
 sw/source/ui/misc/bookmark.cxx |2 -
 xmloff/source/text/txtparae.cxx|   24 
 8 files changed, 133 insertions(+), 3 deletions(-)

New commits:
commit b3226f8133ef28a0cc7328e419e0bf54abd3fda1
Author: Bernhard Widl <bernhard.w...@cib.de>
Date:   Fri Dec 22 17:39:15 2017 +0100

tdf#101856 create bookmarks w/ new hidden/condition attrs, and save as odt

Change-Id: Ib1df7a4c1477693aa2d0ec067635cdcbd393cebd
Reviewed-on: https://gerrit.libreoffice.org/47598
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
Tested-by: Thorsten Behrens <thorsten.behr...@cib.de>

diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index 09cd1f48513c..36a93cef8ba7 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -814,6 +814,8 @@
 #define FN_PARAM_PAM(FN_PARAM2+27) /* Point and Mark */
 #define FN_TEXT_BOX (FN_PARAM2+28) /* TextBox Property*/
 #define FN_PARAM_IGNORE_PROTECTED   (FN_PARAM2+29) /* Ignore protected 
areas */
+#define FN_BOOKMARK_HIDDEN  (FN_PARAM2+30) /* Hidden Property of 
bookmarks*/
+#define FN_BOOKMARK_CONDITION   (FN_PARAM2+31) /* Condition Property 
of bookmarks*/
 
 // Status: not more than 19!
 #define FN_STAT_PAGE(FN_STAT + 1)
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index 89c90a965cfd..8195259686eb 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -549,6 +549,11 @@ public:
 const OUString& rName,
 const OUString& rShortName,
 IDocumentMarkAccess::MarkType eMark = 
IDocumentMarkAccess::MarkType::BOOKMARK);
+::sw::mark::IMark* SetBookmark(
+const vcl::KeyCode&,
+const OUString& rName,
+bool rHide,
+const OUString& rCondition);
 bool GotoMark( const ::sw::mark::IMark* const pMark );// sets 
CurrentCursor.SPoint
 bool GotoMark( const ::sw::mark::IMark* const pMark, bool bAtStart );
 bool GoNextBookmark(); // true, if there was one
diff --git a/sw/inc/unoprnms.hxx b/sw/inc/unoprnms.hxx
index 63589f273ce5..c700ee3bb468 100644
--- a/sw/inc/unoprnms.hxx
+++ b/sw/inc/unoprnms.hxx
@@ -331,6 +331,8 @@
 #define UNO_NAME_IS_GLOBAL_DOCUMENT_SECTION "IsGlobalDocumentSection"
 #define UNO_NAME_TEXT_FIELD "TextField"
 #define UNO_NAME_BOOKMARK "Bookmark"
+#define UNO_NAME_BOOKMARK_HIDDEN "BookmarkHidden"
+#define UNO_NAME_BOOKMARK_CONDITION "BookmarkCondition"
 #define UNO_NAME_TEXT_TABLE "TextTable"
 #define UNO_NAME_CELL "Cell"
 #define UNO_NAME_TEXT_FRAME "TextFrame"
diff --git a/sw/source/core/crsr/crbm.cxx b/sw/source/core/crsr/crbm.cxx
index 946af35c5cae..eff58b1f8ad6 100644
--- a/sw/source/core/crsr/crbm.cxx
+++ b/sw/source/core/crsr/crbm.cxx
@@ -99,6 +99,31 @@ namespace
 }
 // set CurrentCursor.SPoint
 
+// at CurrentCursor.SPoint
+::sw::mark::IMark* SwCursorShell::SetBookmark(
+const vcl::KeyCode& rCode,
+const OUString& rName,
+bool rHide,
+const OUString& rCondition)
+{
+StartAction();
+::sw::mark::IMark* pMark = getIDocumentMarkAccess()->makeMark(
+*GetCursor(),
+rName,
+IDocumentMarkAccess::MarkType::BOOKMARK, sw::mark::InsertMode::New);
+::sw::mark::IBookmark* pBookmark = dynamic_cast< ::sw::mark::IBookmark* 
>(pMark);
+if (pBookmark)
+{
+pBookmark->SetKeyCode(rCode);
+pBookmark->SetShortName(OUString());
+pBookmark->Hide(rHide);
+pBookmark->SetHideCondition(rCondition);
+}
+EndAction();
+return pMark;
+}
+// set CurrentCursor.SPoint
+
 bool SwCursorShell::GotoMark(const ::sw::mark::IMark* const pMark, bool 
bAtStart)
 {
 // watch Cursor-Moves
diff --git a/sw/source/core/unocore/unobkm.cxx 
b/sw/source/core/unocore/unobkm.cxx
index feca7d3cdee8..bfd4bedc3975 100644
--- a/sw/source/core/unocore/unobkm.cxx
+++ b/sw/source/core/unocore/unobkm.cxx
@@ -52,13 +52,16 @@ public:
 ::comphelper::OInterfaceContainerHelper2  m_EventListeners;
 SwDoc * m_pDoc;
 ::sw::mark::IMark * m_pRegisteredBookmark;
-OUString m_sMarkName;
+OUStringm_sMarkName;
+boolm_bHidden;
+OUStringm_HideCondition;
 
 Impl(   SwDoc *const pDoc, ::sw::mark::IMark *const /*pBookmark*/)
 : SwClient()
 , m_EventListeners(m_Mutex)
 , m_pDoc(pDoc)
 , m_pRegisteredBookmark(nullptr)
+, m_bHidden(false)
 {
 // DO NOT registerInMark here! (because SetXBookmark would delete 
rThis)

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

2017-12-06 Thread Bernhard Widl 
 sw/source/uibase/docvw/edtwin.cxx |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 72172b4568fb74669fd2269ef29176527363f024
Author: Bernhard Widl <bernhard.w...@cib.de>
Date:   Wed Dec 6 10:46:29 2017 +0100

tdf#114093 fixing regression when clicking on fields

Change-Id: I6e5c7e644f26ca85a6c55ec5456add46a7b05404
Reviewed-on: https://gerrit.libreoffice.org/45927
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
(cherry picked from commit 1c41d4e229deb5ae9d5d06df6c8d2585619bc102)
Reviewed-on: https://gerrit.libreoffice.org/45953

diff --git a/sw/source/uibase/docvw/edtwin.cxx 
b/sw/source/uibase/docvw/edtwin.cxx
index f4c8de1812b6..da86a7d49149 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -3371,8 +3371,12 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
 case TYP_AUTHORITY :
 
pVFrame->GetBindings().Execute(FN_EDIT_AUTH_ENTRY_DLG);
 break;
-default:
+case TYP_INPUTFLD:
+case TYP_DROPDOWN:
 
pVFrame->GetBindings().Execute(FN_UPDATE_INPUTFIELDS);
+break;
+default:
+
pVFrame->GetBindings().Execute(FN_EDIT_FIELD);
 }
 }
 return;
___
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' - sw/source

2017-12-06 Thread Bernhard Widl 
 sw/source/uibase/docvw/edtwin.cxx |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit aa58e71183f3e154f5c2a5566a6f8c030863d3bc
Author: Bernhard Widl <bernhard.w...@cib.de>
Date:   Wed Dec 6 10:46:29 2017 +0100

tdf#114093 fixing regression when clicking on fields

Change-Id: I6e5c7e644f26ca85a6c55ec5456add46a7b05404
Reviewed-on: https://gerrit.libreoffice.org/45927
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
(cherry picked from commit 1c41d4e229deb5ae9d5d06df6c8d2585619bc102)
Reviewed-on: https://gerrit.libreoffice.org/45954
Tested-by: Thorsten Behrens <thorsten.behr...@cib.de>

diff --git a/sw/source/uibase/docvw/edtwin.cxx 
b/sw/source/uibase/docvw/edtwin.cxx
index a44e657baf38..2ded67656383 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -3422,8 +3422,12 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
 case TYP_AUTHORITY :
 
pVFrame->GetBindings().Execute(FN_EDIT_AUTH_ENTRY_DLG);
 break;
-default:
+case TYP_INPUTFLD:
+case TYP_DROPDOWN:
 
pVFrame->GetBindings().Execute(FN_UPDATE_INPUTFIELDS);
+break;
+default:
+
pVFrame->GetBindings().Execute(FN_EDIT_FIELD);
 }
 }
 return;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-12-06 Thread Bernhard Widl 
 sw/source/uibase/docvw/edtwin.cxx |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 1c41d4e229deb5ae9d5d06df6c8d2585619bc102
Author: Bernhard Widl <bernhard.w...@cib.de>
Date:   Wed Dec 6 10:46:29 2017 +0100

tdf#114093 fixing regression when clicking on fields

Change-Id: I6e5c7e644f26ca85a6c55ec5456add46a7b05404
Reviewed-on: https://gerrit.libreoffice.org/45927
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>

diff --git a/sw/source/uibase/docvw/edtwin.cxx 
b/sw/source/uibase/docvw/edtwin.cxx
index f4c8de1812b6..da86a7d49149 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -3371,8 +3371,12 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
 case TYP_AUTHORITY :
 
pVFrame->GetBindings().Execute(FN_EDIT_AUTH_ENTRY_DLG);
 break;
-default:
+case TYP_INPUTFLD:
+case TYP_DROPDOWN:
 
pVFrame->GetBindings().Execute(FN_UPDATE_INPUTFIELDS);
+break;
+default:
+
pVFrame->GetBindings().Execute(FN_EDIT_FIELD);
 }
 }
 return;
___
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' - officecfg/registry sc/inc sc/Library_scui.mk sc/source

2017-11-22 Thread Bernhard Widl 
Rebased ref, commits from common ancestor:
commit 306db5d9840507501cc82cfa481e7abe33f50dd1
Author: Bernhard Widl <bernhard.w...@cib.de>
Date:   Wed Apr 5 14:41:22 2017 +0200

tdf#55236 save settings of CSV export dialog

Change-Id: I250e2d8d9d7b7b806a60fb2779321685e84b44bf
Reviewed-on: https://gerrit.libreoffice.org/36144
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
Tested-by: Thorsten Behrens <thorsten.behr...@cib.de>

diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index bd17f4aa8153..0f732969278d 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -1023,6 +1023,60 @@
   -1
 
   
+  
+
+  Contains setting for Text CSV Export
+
+
+  
+Char Set
+CharSet
+  
+  -1
+
+
+  
+Field delimiter
+FieldSeparator
+  
+  
+
+
+  
+Text delimiter
+TextSeparator
+  
+  
+
+
+  
+If true, formatted cell content is exported. If false, raw 
cell content is exported.
+SaveTrueCellContent
+  
+  true
+
+
+  
+If true, text formulas are exported instead of the 
calculated values.
+SaveCellFormulas
+  
+  false
+
+
+  
+If true, text cells are always enclosed in quotes with no 
exception.
+QuoteAllTextCells
+  
+  false
+
+
+  
+All fields are exported having the same width
+FixedWidth
+  
+  false
+
+  
   
 
   Contains setting for Text CSV Import
diff --git a/sc/Library_scui.mk b/sc/Library_scui.mk
index e694885aa13b..4b911d6846b1 100644
--- a/sc/Library_scui.mk
+++ b/sc/Library_scui.mk
@@ -18,6 +18,10 @@ $(eval $(call gb_Library_set_include,scui,\
$$(INCLUDE) \
 ))
 
+$(eval $(call gb_Library_use_custom_headers,scui,\
+   officecfg/registry \
+)) \
+
 $(eval $(call 
gb_Library_set_precompiled_header,scui,$(SRCDIR)/sc/inc/pch/precompiled_scui))
 
 $(eval $(call gb_Library_use_sdk_api,scui))
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 4f946f771cd7..9fd86f5fb265 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -313,6 +313,7 @@ class AbstractScImportOptionsDlg : public VclAbstractDialog
 {
 public:
 virtual void GetImportOptions( ScImportOptions& rOptions ) const = 0;
+virtual void SaveImportOptions() const = 0;
 };
 
 class AbstractScTextImportOptionsDlg : public VclAbstractDialog
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx 
b/sc/source/ui/attrdlg/scdlgfact.cxx
index 6bf050d4c0cb..d257401560cc 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -587,6 +587,11 @@ void AbstractScImportOptionsDlg_Impl::GetImportOptions( 
ScImportOptions& rOption
 pDlg->GetImportOptions(rOptions);
 }
 
+void AbstractScImportOptionsDlg_Impl::SaveImportOptions() const
+{
+pDlg->SaveImportOptions();
+}
+
 LanguageType AbstractScTextImportOptionsDlg_Impl::GetLanguageType() const
 {
 return pDlg->getLanguageType();
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx 
b/sc/source/ui/attrdlg/scdlgfact.hxx
index ea9ea53f925f..62fa40ad5f23 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -365,6 +365,7 @@ class AbstractScImportOptionsDlg_Impl : public 
AbstractScImportOptionsDlg
 {
 DECL_ABSTDLG_BASE( AbstractScImportOptionsDlg_Impl, ScImportOptionsDlg)
 virtual void GetImportOptions( ScImportOptions& rOptions ) const override;
+virtual void SaveImportOptions() const override;
 };
 
 class AbstractScTextImportOptionsDlg_Impl : public 
AbstractScTextImportOptionsDlg
diff --git a/sc/source/ui/dbgui/scuiimoptdlg.cxx 
b/sc/source/ui/dbgui/scuiimoptdlg.cxx
index 114ec3c88e5f..f807606f3824 100644
--- a/sc/source/ui/dbgui/scuiimoptdlg.cxx
+++ b/sc/source/ui/dbgui/scuiimoptdlg.cxx
@@ -24,6 +24,7 @@
 #include "scresid.hxx"
 #include "sc.hrc"
 #include 
+#include 
 #include 
 #include 
 
@@ -202,18 +203,34 @@ ScImportOptionsDlg::ScImportOptionsDlg(
 
 if( bAscii )
 {
+sal_Int32 nCharSet = 
officecfg::Office::Calc::Dialogs::CSVExport::CharSet::get();
+OUString strFieldSeparator = 
officecfg::Office::Calc::Dialogs::CSVExport::FieldSeparator::get();
+OUString strTextSeparator = 
officecfg::Office::Calc::Dialogs::CSVExport::TextSeparator::get();
+bool bSaveTrueCellContent = 
officecfg::Office::Calc::Dialogs::CSVExport::SaveTrueCellContent::get();
+bool bSaveCellFormulas = 
officecfg::Office::Calc:

[Libreoffice-commits] core.git: Branch 'private/swe/libreoffice-5-2+backports' - officecfg/registry sc/inc sc/Library_scui.mk sc/source

2017-11-22 Thread Bernhard Widl 
 officecfg/registry/schema/org/openoffice/Office/Calc.xcs |   54 +++
 sc/Library_scui.mk   |4 +
 sc/inc/scabstdlg.hxx |1 
 sc/source/ui/attrdlg/scdlgfact.cxx   |5 +
 sc/source/ui/attrdlg/scdlgfact.hxx   |1 
 sc/source/ui/dbgui/scuiimoptdlg.cxx  |   49 +++--
 sc/source/ui/inc/scuiimoptdlg.hxx|4 -
 sc/source/ui/unoobj/filtuno.cxx  |1 
 8 files changed, 109 insertions(+), 10 deletions(-)

New commits:
commit ac4072fe932b0ebfd9283f3b8da2b3ffdaded028
Author: Bernhard Widl <bernhard.w...@cib.de>
Date:   Wed Apr 5 14:41:22 2017 +0200

tdf#55236 save settings of CSV export dialog

Change-Id: I250e2d8d9d7b7b806a60fb2779321685e84b44bf
Reviewed-on: https://gerrit.libreoffice.org/36144
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
Tested-by: Thorsten Behrens <thorsten.behr...@cib.de>

diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index bd17f4aa8153..0f732969278d 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -1023,6 +1023,60 @@
   -1
 
   
+  
+
+  Contains setting for Text CSV Export
+
+
+  
+Char Set
+CharSet
+  
+  -1
+
+
+  
+Field delimiter
+FieldSeparator
+  
+  
+
+
+  
+Text delimiter
+TextSeparator
+  
+  
+
+
+  
+If true, formatted cell content is exported. If false, raw 
cell content is exported.
+SaveTrueCellContent
+  
+  true
+
+
+  
+If true, text formulas are exported instead of the 
calculated values.
+SaveCellFormulas
+  
+  false
+
+
+  
+If true, text cells are always enclosed in quotes with no 
exception.
+QuoteAllTextCells
+  
+  false
+
+
+  
+All fields are exported having the same width
+FixedWidth
+  
+  false
+
+  
   
 
   Contains setting for Text CSV Import
diff --git a/sc/Library_scui.mk b/sc/Library_scui.mk
index e694885aa13b..4b911d6846b1 100644
--- a/sc/Library_scui.mk
+++ b/sc/Library_scui.mk
@@ -18,6 +18,10 @@ $(eval $(call gb_Library_set_include,scui,\
$$(INCLUDE) \
 ))
 
+$(eval $(call gb_Library_use_custom_headers,scui,\
+   officecfg/registry \
+)) \
+
 $(eval $(call 
gb_Library_set_precompiled_header,scui,$(SRCDIR)/sc/inc/pch/precompiled_scui))
 
 $(eval $(call gb_Library_use_sdk_api,scui))
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 4f946f771cd7..9fd86f5fb265 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -313,6 +313,7 @@ class AbstractScImportOptionsDlg : public VclAbstractDialog
 {
 public:
 virtual void GetImportOptions( ScImportOptions& rOptions ) const = 0;
+virtual void SaveImportOptions() const = 0;
 };
 
 class AbstractScTextImportOptionsDlg : public VclAbstractDialog
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx 
b/sc/source/ui/attrdlg/scdlgfact.cxx
index 6bf050d4c0cb..d257401560cc 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -587,6 +587,11 @@ void AbstractScImportOptionsDlg_Impl::GetImportOptions( 
ScImportOptions& rOption
 pDlg->GetImportOptions(rOptions);
 }
 
+void AbstractScImportOptionsDlg_Impl::SaveImportOptions() const
+{
+pDlg->SaveImportOptions();
+}
+
 LanguageType AbstractScTextImportOptionsDlg_Impl::GetLanguageType() const
 {
 return pDlg->getLanguageType();
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx 
b/sc/source/ui/attrdlg/scdlgfact.hxx
index ea9ea53f925f..62fa40ad5f23 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -365,6 +365,7 @@ class AbstractScImportOptionsDlg_Impl : public 
AbstractScImportOptionsDlg
 {
 DECL_ABSTDLG_BASE( AbstractScImportOptionsDlg_Impl, ScImportOptionsDlg)
 virtual void GetImportOptions( ScImportOptions& rOptions ) const override;
+virtual void SaveImportOptions() const override;
 };
 
 class AbstractScTextImportOptionsDlg_Impl : public 
AbstractScTextImportOptionsDlg
diff --git a/sc/source/ui/dbgui/scuiimoptdlg.cxx 
b/sc/source/ui/dbgui/scuiimoptdlg.cxx
index 114ec3c88e5f..f807606f3824 100644
--- a/sc/source/ui/dbgui/scuiimoptdlg.cxx
+++ b/sc/source/ui/dbgui/scuiimoptdlg.cxx
@@ -24,6 +24,7 @@
 #include "scresid.hxx"
 #include "sc.hrc"
 #include 
+#include 
 #inc

[Libreoffice-commits] core.git: Branch 'private/swe/libreoffice-5-2+backports' - vcl/source

2017-11-14 Thread Bernhard Widl 
 vcl/source/window/settings.cxx |9 -
 1 file changed, 9 deletions(-)

New commits:
commit 606393be5fdbded38d986db60cdba6f0353f22ef
Author: Bernhard Widl <bernhard.w...@cib.de>
Date:   Fri Oct 20 14:34:53 2017 +0200

tdf#113444 removed capping of default font size

Change-Id: Ic2ef7eeea7dd9306b57d55952ab716d6255f9576
Reviewed-on: https://gerrit.libreoffice.org/43605
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Jenkins <c...@libreoffice.org>
(cherry picked from commit cb151051d79a7ec176e769a33a56e7d906fc1425)

diff --git a/vcl/source/window/settings.cxx b/vcl/source/window/settings.cxx
index c9a8fd1c7ba0..7a14740bc85e 100644
--- a/vcl/source/window/settings.cxx
+++ b/vcl/source/window/settings.cxx
@@ -152,18 +152,9 @@ void Window::ImplUpdateGlobalSettings( AllSettings& 
rSettings, bool bCallHdl )
 ImplGetFrame()->UpdateSettings( rSettings );
 
 StyleSettings aStyleSettings = rSettings.GetStyleSettings();
-// #97047: Force all fonts except Menu and Help to a fixed height
-// to avoid UI scaling due to large fonts
-// - but allow bigger fonts on bigger screens (i16682, i21238)
-//   dialogs were designed to fit 800x600 with an 8pt font, so scale 
accordingly
-int maxFontheight = 9; // #107886#: 9 is default for some asian systems, 
so always allow if requested
-if( GetDesktopRectPixel().getHeight() > 600 )
-maxFontheight = (int) ((( 8.0 * (double) 
GetDesktopRectPixel().getHeight()) / 600.0) + 1.5);
 
 vcl::Font aFont = aStyleSettings.GetMenuFont();
 int defFontheight = aFont.GetFontHeight();
-if( defFontheight > maxFontheight )
-defFontheight = maxFontheight;
 
 // if the UI is korean, chinese or another locale
 // where the system font size is kown to be often too small to
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-10-26 Thread Bernhard Widl 
 vcl/source/window/settings.cxx |9 -
 1 file changed, 9 deletions(-)

New commits:
commit cb151051d79a7ec176e769a33a56e7d906fc1425
Author: Bernhard Widl <bernhard.w...@cib.de>
Date:   Fri Oct 20 14:34:53 2017 +0200

tdf#113444 removed capping of default font size

Change-Id: Ic2ef7eeea7dd9306b57d55952ab716d6255f9576
Reviewed-on: https://gerrit.libreoffice.org/43605
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Jenkins <c...@libreoffice.org>

diff --git a/vcl/source/window/settings.cxx b/vcl/source/window/settings.cxx
index bb18f957a72a..4234d5327d20 100644
--- a/vcl/source/window/settings.cxx
+++ b/vcl/source/window/settings.cxx
@@ -153,18 +153,9 @@ void Window::ImplUpdateGlobalSettings( AllSettings& 
rSettings, bool bCallHdl )
 ImplGetFrame()->UpdateSettings( rSettings );
 
 StyleSettings aStyleSettings = rSettings.GetStyleSettings();
-// #97047: Force all fonts except Menu and Help to a fixed height
-// to avoid UI scaling due to large fonts
-// - but allow bigger fonts on bigger screens (i16682, i21238)
-//   dialogs were designed to fit 800x600 with an 8pt font, so scale 
accordingly
-int maxFontheight = 9; // #107886#: 9 is default for some asian systems, 
so always allow if requested
-if( GetDesktopRectPixel().getHeight() > 600 )
-maxFontheight = (int) ((( 8.0 * (double) 
GetDesktopRectPixel().getHeight()) / 600.0) + 1.5);
 
 vcl::Font aFont = aStyleSettings.GetMenuFont();
 int defFontheight = aFont.GetFontHeight();
-if( defFontheight > maxFontheight )
-defFontheight = maxFontheight;
 
 // if the UI is korean, chinese or another locale
 // where the system font size is known to be often too small to
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-10-13 Thread Bernhard Widl 
 sc/source/ui/view/tabview.cxx |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 21ccc64782f485f4fce7cd645f24dabb4b6eb985
Author: Bernhard Widl <bernhard.w...@cib.de>
Date:   Wed Oct 11 18:32:26 2017 +0200

derive size of tab bar in Calc from TabFont (in pixels).

Change-Id: I3a35850cb6a66b06ae6568b54c008669ee2f391a
Reviewed-on: https://gerrit.libreoffice.org/43328
Reviewed-by: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
Tested-by: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>

diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index 0f227b18ef5f..53a40774869d 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -355,7 +355,11 @@ void ScTabView::DoResize( const Point& rOffset, const 
Size& rSize, bool bInner )
 
 const StyleSettings& rStyleSettings = 
pFrameWin->GetSettings().GetStyleSettings();
 
-sal_Int32 nTabWidth = pFrameWin->GetFont().GetFontHeight() + WIDTH_MARGIN;
+
+Size aFontSize = rStyleSettings.GetTabFont().GetFontSize();
+MapMode aPtMapMode(MapUnit::MapPoint);
+aFontSize = pFrameWin->LogicToPixel(aFontSize, aPtMapMode);
+sal_Int32 nTabWidth = aFontSize.Height() + WIDTH_MARGIN;
 
 if ( aViewData.GetHSplitMode() != SC_SPLIT_NONE )
 {
___
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' - 2 commits - sw/inc sw/source sw/uiconfig vcl/inc vcl/source

2017-09-22 Thread Bernhard Widl 
 sw/inc/swabstdlg.hxx  |   18 +++---
 sw/source/ui/dialog/swdlgfact.cxx |   28 -
 sw/source/ui/dialog/swdlgfact.hxx |   12 ++--
 sw/source/ui/fldui/DropDownFieldDialog.cxx|   48 ++--
 sw/source/ui/fldui/inpdlg.cxx |   31 +-
 sw/source/uibase/docvw/edtwin.cxx |2 
 sw/source/uibase/inc/DropDownFieldDialog.hxx  |   17 -
 sw/source/uibase/inc/inpdlg.hxx   |9 ++-
 sw/source/uibase/inc/wrtsh.hxx|6 +-
 sw/source/uibase/shells/textfld.cxx   |2 
 sw/source/uibase/wrtsh/wrtsh2.cxx |   76 --
 sw/uiconfig/swriter/ui/dropdownfielddialog.ui |   26 ++--
 sw/uiconfig/swriter/ui/inputfielddialog.ui|   24 ++--
 vcl/inc/svids.hrc |1 
 vcl/source/src/btntext.src|5 +
 vcl/source/window/builder.cxx |2 
 16 files changed, 247 insertions(+), 60 deletions(-)

New commits:
commit 98f135e3c7a078d88ec89c3ee7ffbabf872da724
Author: Bernhard Widl <bernhard.w...@cib.de>
Date:   Fri Sep 15 17:39:48 2017 +0200

tdf#79877 revert to old behavior when clicking on input fields.

doubleclick on input field brings up old input fields dialog
that dialog now starts at current field and has previous/next navigation

Change-Id: Ie3eec38d62cbf8a8248acb4fd84731c078ebadd4
Reviewed-on: https://gerrit.libreoffice.org/42333
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
Tested-by: Thorsten Behrens <thorsten.behr...@cib.de>

diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index 87b375207f28..f31b78f3eb76 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -107,9 +107,11 @@ class AbstractFieldInputDlg : public 
VclAbstractTerminatedDialog
 {
 public:
 //from class SalFrame
-virtual void SetWindowState( const OString & rStr ) = 0;
-virtual OString  GetWindowState() const = 0;
-virtual void EndDialog(long ) override = 0;
+virtual void  SetWindowState( const OString & rStr ) = 0;
+virtual OString   GetWindowState() const = 0;
+virtual void  EndDialog(long ) override = 0;
+virtual bool  PrevButtonPressed() const = 0;
+virtual bool  NextButtonPressed() const = 0;
 };
 
 class AbstractInsFootNoteDlg : public VclAbstractDialog
@@ -244,8 +246,10 @@ public:
 class AbstractDropDownFieldDialog : public VclAbstractDialog
 {
 public:
- virtual OString GetWindowState() const = 0; //this method inherit from 
SystemWindow
- virtual voidSetWindowState( const OString & rStr ) = 0; //this method 
inherit from SystemWindow
+ virtual OString  GetWindowState() const = 0; //this method inherit 
from SystemWindow
+ virtual void SetWindowState( const OString & rStr ) = 0; //this 
method inherit from SystemWindow
+ virtual bool PrevButtonPressed() const = 0;
+ virtual bool NextButtonPressed() const = 0;
 };
 
 class AbstractSwLabDlg  : public SfxAbstractTabDialog
@@ -349,7 +353,7 @@ public:
 virtual SfxAbstractTabDialog * CreateSwFootNoteOptionDlg(vcl::Window 
*pParent, SwWrtShell ) = 0;
 
 virtual AbstractDropDownFieldDialog * CreateDropDownFieldDialog(SwWrtShell 
,
-SwField* pField, bool bNextButton = false) = 0;
+SwField* pField, bool bPrevButton = false, bool bNextButton = false) = 
0;
 virtual SfxAbstractTabDialog* CreateSwEnvDlg ( vcl::Window* pParent, const 
SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, bool bInsert ) = 0;
 
 virtual AbstractSwLabDlg* CreateSwLabDlg(const SfxItemSet& rSet,
@@ -406,7 +410,7 @@ public:
 SwGlossaryHdl* pGlosHdl,
 SwWrtShell *pWrtShell) = 0;
 virtual AbstractFieldInputDlg*CreateFieldInputDlg(vcl::Window 
*pParent,
-SwWrtShell , SwField* pField, bool bNextButton = false) = 0;
+SwWrtShell , SwField* pField, bool bPrevButton = false, bool 
bNextButton = false) = 0;
 virtual AbstractInsFootNoteDlg* CreateInsFootNoteDlg(vcl::Window * 
pParent,
 SwWrtShell , bool bEd = false) = 0;
 virtual VclAbstractDialog*  CreateTitlePageDlg ( vcl::Window * 
pParent ) = 0;
diff --git a/sw/source/ui/dialog/swdlgfact.cxx 
b/sw/source/ui/dialog/swdlgfact.cxx
index 760333cc657e..fdd7dd4d7bdf 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -248,6 +248,16 @@ void AbstractDropDownFieldDialog_Impl::SetWindowState( 
const OString& rStr )
 pDlg->SetWindowState(rStr);
 }
 
+bool AbstractDropDownFieldDialog_Impl::PrevButtonPressed() const
+{
+return pDlg->PrevButtonPressed();
+}
+
+bool AbstractDropDownFieldDialog_Impl::NextButtonPressed() const
+{
+return pDlg->NextButtonPressed();
+}
+
 v

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

2017-09-18 Thread Bernhard Widl 
 sw/inc/swabstdlg.hxx  |   18 +++---
 sw/source/ui/dialog/swdlgfact.cxx |   28 -
 sw/source/ui/dialog/swdlgfact.hxx |   18 +++---
 sw/source/ui/fldui/DropDownFieldDialog.cxx|   48 ++--
 sw/source/ui/fldui/inpdlg.cxx |   31 +-
 sw/source/uibase/docvw/edtwin.cxx |2 
 sw/source/uibase/inc/DropDownFieldDialog.hxx  |   15 +++--
 sw/source/uibase/inc/inpdlg.hxx   |   10 +++
 sw/source/uibase/inc/wrtsh.hxx|6 +-
 sw/source/uibase/shells/textfld.cxx   |2 
 sw/source/uibase/wrtsh/wrtsh2.cxx |   76 --
 sw/uiconfig/swriter/ui/dropdownfielddialog.ui |   27 +++--
 sw/uiconfig/swriter/ui/inputfielddialog.ui|   27 +++--
 13 files changed, 248 insertions(+), 60 deletions(-)

New commits:
commit 7d5245848c28f5786258476cd7aa2a4523645de3
Author: Bernhard Widl <bernhard.w...@cib.de>
Date:   Fri Sep 15 17:39:48 2017 +0200

tdf#79877 revert to old behavior when clicking on input fields.

doubleclick on input field brings up old input fields dialog
that dialog now starts at current field and has previous/next navigation

Change-Id: Ie3eec38d62cbf8a8248acb4fd84731c078ebadd4
Reviewed-on: https://gerrit.libreoffice.org/42333
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
Tested-by: Thorsten Behrens <thorsten.behr...@cib.de>

diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index ba607870619d..c582500ac0b0 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -111,9 +111,11 @@ protected:
 virtual ~AbstractFieldInputDlg() override = default;
 public:
 //from class SalFrame
-virtual void SetWindowState( const OString & rStr ) = 0;
-virtual OString  GetWindowState() const = 0;
-virtual void EndDialog(sal_Int32 nResult) override = 0;
+virtual void  SetWindowState( const OString & rStr ) = 0;
+virtual OString   GetWindowState() const = 0;
+virtual void  EndDialog(sal_Int32 nResult) override = 0;
+virtual bool  PrevButtonPressed() const = 0;
+virtual bool  NextButtonPressed() const = 0;
 };
 
 class AbstractInsFootNoteDlg : public VclAbstractDialog
@@ -282,8 +284,10 @@ class AbstractDropDownFieldDialog : public 
VclAbstractDialog
 protected:
 virtual ~AbstractDropDownFieldDialog() override = default;
 public:
-virtual OString GetWindowState() const = 0; //this method inherit from 
SystemWindow
-virtual voidSetWindowState( const OString & rStr ) = 0; //this method 
inherit from SystemWindow
+virtual OString   GetWindowState() const = 0; //this method inherit 
from SystemWindow
+virtual void  SetWindowState( const OString & rStr ) = 0; //this 
method inherit from SystemWindow
+virtual bool  PrevButtonPressed() const = 0;
+virtual bool  NextButtonPressed() const = 0;
 };
 
 class AbstractSwLabDlg  : public SfxAbstractTabDialog
@@ -404,7 +408,7 @@ public:
 virtual VclPtr CreateSwFootNoteOptionDlg(vcl::Window 
*pParent, SwWrtShell ) = 0;
 
 virtual VclPtr 
CreateDropDownFieldDialog(SwWrtShell ,
-SwField* pField, bool bNextButton) = 0;
+SwField* pField, bool bPrevButton, bool bNextButton) = 0;
 virtual VclPtr CreateSwEnvDlg ( vcl::Window* 
pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, bool 
bInsert ) = 0;
 
 virtual VclPtr CreateSwLabDlg(const SfxItemSet& rSet,
@@ -463,7 +467,7 @@ public:
 SwGlossaryHdl* pGlosHdl,
 SwWrtShell *pWrtShell) = 0;
 virtual VclPtr
CreateFieldInputDlg(vcl::Window *pParent,
-SwWrtShell , SwField* pField, bool bNextButton) = 0;
+SwWrtShell , SwField* pField, bool bPrevButton, bool bNextButton) 
= 0;
 virtual VclPtr 
CreateInsFootNoteDlg(vcl::Window * pParent,
 SwWrtShell , bool bEd = false) = 0;
 virtual VclPtr  CreateTitlePageDlg ( 
vcl::Window * pParent ) = 0;
diff --git a/sw/source/ui/dialog/swdlgfact.cxx 
b/sw/source/ui/dialog/swdlgfact.cxx
index 9d6f17de3971..12f2ce433673 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -239,6 +239,16 @@ void AbstractDropDownFieldDialog_Impl::SetWindowState( 
const OString& rStr )
 pDlg->SetWindowState(rStr);
 }
 
+bool AbstractDropDownFieldDialog_Impl::PrevButtonPressed() const
+{
+return pDlg->PrevButtonPressed();
+}
+
+bool AbstractDropDownFieldDialog_Impl::NextButtonPressed() const
+{
+return pDlg->NextButtonPressed();
+}
+
 void AbstractSwLabDlg_Impl::SetCurPageId( sal_uInt16 nId )
 {
 pDlg->SetCurPageId( nId );
@@ -411,6 +421,16 @@ void AbstractFieldInputDlg_Impl::EndDialog(sal_Int32 n)
 pDlg->EndDialog(n);
 }
 
+bool AbstractFiel

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

2017-09-16 Thread Bernhard Widl 
 vcl/inc/strings.hrc   |1 +
 vcl/source/window/builder.cxx |2 ++
 2 files changed, 3 insertions(+)

New commits:
commit ad7bc2f7bbf8497ec83c65719ac0d65459293480
Author: Bernhard Widl <bernhard.w...@cib.de>
Date:   Fri Sep 15 17:16:29 2017 +0200

tdf#79877 add button text for 'previous' button (gtk-media-previous)

Change-Id: I605849cd753ed3f33b8dec5921488730dc9682dd
Reviewed-on: https://gerrit.libreoffice.org/42332
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>

diff --git a/vcl/inc/strings.hrc b/vcl/inc/strings.hrc
index cd2f31c1da13..c06bc06d7793 100644
--- a/vcl/inc/strings.hrc
+++ b/vcl/inc/strings.hrc
@@ -70,6 +70,7 @@
 #define SV_BUTTONTEXT_UNDO   NC_("SV_BUTTONTEXT_UNDO", 
"~Undo")
 #define SV_BUTTONTEXT_PASTE  
NC_("SV_BUTTONTEXT_PASTE", "~Paste")
 #define SV_BUTTONTEXT_NEXT   NC_("SV_BUTTONTEXT_NEXT", 
"~Next")
+#define SV_BUTTONTEXT_PREV   NC_("SV_BUTTONTEXT_PREV", 
"~Previous")
 #define SV_BUTTONTEXT_GO_UP  
NC_("SV_BUTTONTEXT_GO_UP", "~Up")
 #define SV_BUTTONTEXT_GO_DOWN
NC_("SV_BUTTONTEXT_GO_DOWN", "Do~wn")
 #define SV_BUTTONTEXT_CLEAR  
NC_("SV_BUTTONTEXT_CLEAR", "~Clear")
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index d9501548a843..0ca4e710b75a 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -632,6 +632,8 @@ namespace
 return VclResId(SV_BUTTONTEXT_PASTE);
 else if (rType == "gtk-media-next")
 return VclResId(SV_BUTTONTEXT_NEXT);
+else if (rType == "gtk-media-previous")
+return VclResId(SV_BUTTONTEXT_PREV);
 else if (rType == "gtk-go-up")
 return VclResId(SV_BUTTONTEXT_GO_UP);
 else if (rType == "gtk-go-down")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-07-18 Thread Bernhard Widl 
 sc/source/filter/dif/difexp.cxx|8 
 sc/source/filter/excel/excimp8.cxx |2 +-
 sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx |8 
 sc/source/filter/xml/XMLExportDatabaseRanges.cxx   |2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit b0210c34dcaa5fc44956078ffa1dfe734d379224
Author: Bernhard Widl <bernhard.w...@cib.de>
Date:   Wed Jun 28 17:00:01 2017 +0200

fdo#43157 convert OSL_ASSERT to assert in sc/source/filter

Change-Id: I3d6d3da69ed7539dacf7eaf82fa7633f85619b39
Reviewed-on: https://gerrit.libreoffice.org/39366
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Eike Rathke <er...@redhat.com>

diff --git a/sc/source/filter/dif/difexp.cxx b/sc/source/filter/dif/difexp.cxx
index 4d0371285f0e..27bda9ea9fda 100644
--- a/sc/source/filter/dif/difexp.cxx
+++ b/sc/source/filter/dif/difexp.cxx
@@ -141,14 +141,14 @@ void ScFormatFilterPluginImpl::ScExportDif( SvStream& 
rOut, ScDocument* pDoc,
 
 for( nRowCnt = rRange.aStart.Row() ; nRowCnt <= nEndRow ; nRowCnt++ )
 {
-OSL_ASSERT(aOS.getLength() == 0);
+SAL_WARN_IF(!aOS.isEmpty(), "sc.filter", "aOS should be empty");
 aOS.append(pSpecDataType_LF);
 aOS.append(pKeyBOT);
 aOS.append('\n');
 rOut.WriteUnicodeOrByteText(aOS.makeStringAndClear());
 for( nColCnt = rRange.aStart.Col() ; nColCnt <= nEndCol ; nColCnt++ )
 {
-OSL_ASSERT(aOS.getLength() == 0);
+SAL_WARN_IF(!aOS.isEmpty(), "sc.filter", "aOS should be empty");
 bool bWriteStringData = false;
 ScRefCellValue aCell(*pDoc, ScAddress(nColCnt, nRowCnt, nTab));
 
@@ -196,7 +196,7 @@ void ScFormatFilterPluginImpl::ScExportDif( SvStream& rOut, 
ScDocument* pDoc,
 // sc/source/ui/docsh.cxx:ScDocShell::AsciiSave()
 // In fact we should create a common method if this would be
 // needed just one more time..
-OSL_ASSERT(aOS.getLength() == 0);
+SAL_WARN_IF(!aOS.isEmpty(), "sc.filter", "aOS should be 
empty");
 OUString aTmpStr = aString;
 aOS.append(pStringData);
 rOut.WriteUnicodeOrByteText(aOS.makeStringAndClear(), 
eCharSet);
@@ -257,7 +257,7 @@ void ScFormatFilterPluginImpl::ScExportDif( SvStream& rOut, 
ScDocument* pDoc,
 aPrgrsBar.SetState( nRowCnt );
 }
 
-OSL_ASSERT(aOS.getLength() == 0);
+SAL_WARN_IF(!aOS.isEmpty(), "sc.filter", "aOS should be empty");
 aOS.append(pSpecDataType_LF);
 aOS.append(pKeyEOD);
 aOS.append('\n');
diff --git a/sc/source/filter/excel/excimp8.cxx 
b/sc/source/filter/excel/excimp8.cxx
index 2fcd0aedb8dd..69d450a747e8 100644
--- a/sc/source/filter/excel/excimp8.cxx
+++ b/sc/source/filter/excel/excimp8.cxx
@@ -717,7 +717,7 @@ void XclImpAutoFilterData::ReadAutoFilter(
 }
 else
 {
-OSL_ASSERT(eConn == SC_OR);
+SAL_WARN_IF(eConn != SC_OR, "sc.filter", "eConn should be SC_AND or 
SC_OR");
 // Import only when both conditions are for simple equality, else
 // import only the 1st condition due to conflict with the ordering of
 // conditions. #i39464#.
diff --git a/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx 
b/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx
index 177bb7ea6799..bafeb1a538b5 100644
--- a/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx
+++ b/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx
@@ -262,7 +262,7 @@ void ScChangeTrackingExportHelper::SetValueAttributes(const 
double& fValue, cons
 
 void ScChangeTrackingExportHelper::WriteValueCell(const ScCellValue& rCell, 
const OUString& sValue)
 {
-OSL_ASSERT(rCell.meType == CELLTYPE_VALUE);
+assert(rCell.meType == CELLTYPE_VALUE);
 
 SetValueAttributes(rCell.mfValue, sValue);
 SvXMLElementExport aElemC(rExport, XML_NAMESPACE_TABLE, 
XML_CHANGE_TRACK_TABLE_CELL, true, true);
@@ -270,7 +270,7 @@ void ScChangeTrackingExportHelper::WriteValueCell(const 
ScCellValue& rCell, cons
 
 void ScChangeTrackingExportHelper::WriteStringCell(const ScCellValue& rCell)
 {
-OSL_ASSERT(rCell.meType == CELLTYPE_STRING);
+assert(rCell.meType == CELLTYPE_STRING);
 
 rExport.AddAttribute(XML_NAMESPACE_OFFICE, XML_VALUE_TYPE, XML_STRING);
 SvXMLElementExport aElemC(rExport, XML_NAMESPACE_TABLE, 
XML_CHANGE_TRACK_TABLE_CELL, true, true);
@@ -284,7 +284,7 @@ void ScChangeTrackingExportHelper::WriteStringCell(const 
ScCellValue& rCell)
 
 void ScChangeTrackingExportHelper::WriteEditCell(const ScCellValue& rCell)
 {
-OSL_ASSERT(rCell.meType == CELLTYPE_EDIT);
+assert(rCell.meType == CELLTYPE_EDIT);
 
 OUString sString;
 if (rCell.mpEditText)
@@ -307,7 +

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

2017-06-30 Thread Bernhard Widl 
 sd/source/ui/slidesorter/model/SlideSorterModel.cxx |   10 +--
 sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx|8 +-
 sd/source/ui/slidesorter/shell/SlideSorter.cxx  |   12 +--
 sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx |   50 
 4 files changed, 40 insertions(+), 40 deletions(-)

New commits:
commit e1fc7ea54a6dc76378fee8880530b24ca33039b6
Author: Bernhard Widl <bernhard.w...@cib.de>
Date:   Fri Jun 30 11:15:36 2017 +0200

fdo#43157 convert OSL_ASSERT to assert in sd/source/ui/slidesorter

Change-Id: I2348501e620defa7997d257c230fe6a6ac351fca
Reviewed-on: https://gerrit.libreoffice.org/39407
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Michael Stahl <mst...@redhat.com>

diff --git a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx 
b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx
index 0416857d716a..cf51887bc5c5 100644
--- a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx
+++ b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx
@@ -78,19 +78,19 @@ namespace {
 if ( ! pDescriptor)
 {
 PrintModel(rModel);
-OSL_ASSERT(pDescriptor);
+assert(pDescriptor);
 return false;
 }
 if (nIndex != pDescriptor->GetPageIndex())
 {
 PrintModel(rModel);
-OSL_ASSERT(nIndex == pDescriptor->GetPageIndex());
+assert(nIndex == pDescriptor->GetPageIndex());
 return false;
 }
 if (nIndex != pDescriptor->GetVisualState().mnPageId)
 {
 PrintModel(rModel);
-OSL_ASSERT(nIndex == pDescriptor->GetVisualState().mnPageId);
+assert(nIndex == pDescriptor->GetVisualState().mnPageId);
 return false;
 }
 }
@@ -462,7 +462,7 @@ void SlideSorterModel::UpdatePageList()
 
 default:
 // We should never get here.
-OSL_ASSERT(false);
+assert(false);
 break;
 }
 }
@@ -618,7 +618,7 @@ void SlideSorterModel::UpdateIndices (const sal_Int32 
nFirstIndex)
 {
 if (rpDescriptor->GetPageIndex()!=nDescriptorIndex)
 {
-OSL_ASSERT(rpDescriptor->GetPageIndex()==nDescriptorIndex);
+assert(rpDescriptor->GetPageIndex()==nDescriptorIndex);
 }
 }
 else
diff --git a/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx 
b/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx
index 39211e967b21..0737d00cada6 100644
--- a/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx
+++ b/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx
@@ -50,8 +50,8 @@ PageDescriptor::PageDescriptor (
   mbIsMouseOver(false),
   mbHasTransition(false)
 {
-OSL_ASSERT(mpPage);
-OSL_ASSERT(mpPage == SdPage::getImplementation(rxPage));
+assert(mpPage);
+assert(mpPage == SdPage::getImplementation(rxPage));
 if (mpPage != nullptr)
 {
 if (mpPage->TRG_HasMasterPage())
@@ -125,7 +125,7 @@ bool PageDescriptor::HasState (const State eState) const
 return mpPage!=nullptr && mpPage->IsExcluded();
 
 default:
-OSL_ASSERT(false);
+assert(false);
 return false;
 }
 }
@@ -205,7 +205,7 @@ void PageDescriptor::SetCoreSelection()
 mpPage->SetSelected(false);
 else
 {
-OSL_ASSERT(mpPage!=nullptr);
+assert(mpPage!=nullptr);
 }
 }
 
diff --git a/sd/source/ui/slidesorter/shell/SlideSorter.cxx 
b/sd/source/ui/slidesorter/shell/SlideSorter.cxx
index b972daacfd09..b17392dc14a8 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorter.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorter.cxx
@@ -211,19 +211,19 @@ SlideSorter::~SlideSorter()
 
 model::SlideSorterModel& SlideSorter::GetModel() const
 {
-OSL_ASSERT(mpSlideSorterModel.get()!=nullptr);
+assert(mpSlideSorterModel.get()!=nullptr);
 return *mpSlideSorterModel;
 }
 
 view::SlideSorterView& SlideSorter::GetView() const
 {
-OSL_ASSERT(mpSlideSorterView.get()!=nullptr);
+assert(mpSlideSorterView.get()!=nullptr);
 return *mpSlideSorterView;
 }
 
 controller::SlideSorterController& SlideSorter::GetController() const
 {
-OSL_ASSERT(mpSlideSorterController.get()!=nullptr);
+assert(mpSlideSorterController.get()!=nullptr);
 return *mpSlideSorterController;
 }
 
@@ -323,7 +323,7 @@ model::SlideSorterModel* SlideSorter::CreateModel()
 ViewShellBase* pViewShellBase = GetViewShellBase();
 if (pViewShellBase != nullptr)
 {
-OSL_ASSERT (pViewShellBase->GetDocument() != nullptr);
+assert (pViewShellBase->GetDocument() != nullptr);
 
 return new model::SlideSorterModel(*this);
 }
@

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

2017-06-29 Thread Bernhard Widl 
 sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx  |2 +-
 sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx |8 
 sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx |6 +++---
 sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx   |2 +-
 sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx |4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 0ab214536efce0fdecf9a79b58467c5d464c1929
Author: Bernhard Widl <bernhard.w...@cib.de>
Date:   Thu Jun 29 17:25:07 2017 +0200

fdo#43157 convert OSL_ASSERT to assert in sd/source/ui/slidesorter/cache

Change-Id: I5280fe279ac901082450fb1c5f4f601653b87598
Reviewed-on: https://gerrit.libreoffice.org/39392
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Michael Stahl <mst...@redhat.com>

diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx 
b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx
index e783d059ade7..b45c2ade3cd0 100644
--- a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx
@@ -441,7 +441,7 @@ void BitmapCache::UpdateCacheSize (const CacheEntry& 
rEntry, CacheOperation eOpe
 break;
 
 default:
-OSL_ASSERT(false);
+assert(false);
 break;
 }
 }
diff --git a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx 
b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx
index ec5e6fbf5ea7..4adac147c359 100644
--- a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx
@@ -106,7 +106,7 @@ Bitmap GenericPageCache::GetPreviewBitmap (
 const CacheKey aKey,
 const bool bResize)
 {
-OSL_ASSERT(aKey != nullptr);
+assert(aKey != nullptr);
 
 Bitmap aPreview;
 bool bMayBeUpToDate = true;
@@ -143,7 +143,7 @@ Bitmap GenericPageCache::GetPreviewBitmap (
 Bitmap GenericPageCache::GetMarkedPreviewBitmap (
 const CacheKey aKey)
 {
-OSL_ASSERT(aKey != nullptr);
+assert(aKey != nullptr);
 
 ProvideCacheAndProcessor();
 const SdrPage* pPage = mpCacheContext->GetPage(aKey);
@@ -156,7 +156,7 @@ void GenericPageCache::SetMarkedPreviewBitmap (
 const CacheKey aKey,
 const Bitmap& rMarkedBitmap)
 {
-OSL_ASSERT(aKey != nullptr);
+assert(aKey != nullptr);
 
 ProvideCacheAndProcessor();
 const SdrPage* pPage = mpCacheContext->GetPage(aKey);
@@ -167,7 +167,7 @@ void GenericPageCache::RequestPreviewBitmap (
 const CacheKey aKey,
 const bool bMayBeUpToDate)
 {
-OSL_ASSERT(aKey != nullptr);
+assert(aKey != nullptr);
 
 const SdrPage* pPage = mpCacheContext->GetPage(aKey);
 
diff --git a/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx 
b/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx
index 9b7f551e57f0..6ad5e4a45dd3 100644
--- a/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx
@@ -264,7 +264,7 @@ void PageCacheManager::ReleaseCache (const 
std::shared_ptr& rpCache)
 
 if (iCache != mpPageCaches->end())
 {
-OSL_ASSERT(iCache->second == rpCache);
+assert(iCache->second == rpCache);
 
 
PutRecentlyUsedCache(iCache->first.mpDocument,iCache->first.maPreviewSize,rpCache);
 
@@ -290,7 +290,7 @@ std::shared_ptr 
PageCacheManager::ChangeSize (
 PageCacheContainer::CompareWithCache(rpCache)));
 if (iCacheToChange != mpPageCaches->end())
 {
-OSL_ASSERT(iCacheToChange->second == rpCache);
+assert(iCacheToChange->second == rpCache);
 
 // Now, we can change the preview size of the existing one by
 // removing the cache from the list and re-insert it with the
@@ -306,7 +306,7 @@ std::shared_ptr 
PageCacheManager::ChangeSize (
 }
 else
 {
-OSL_ASSERT(iCacheToChange != mpPageCaches->end());
+assert(iCacheToChange != mpPageCaches->end());
 }
 }
 
diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx 
b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx
index 3ce3d6377130..7b3526c05601 100644
--- a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx
@@ -97,7 +97,7 @@ IMPL_LINK_NOARG(QueueProcessor, ProcessRequestHdl, Timer *, 
void)
 
 void QueueProcessor::ProcessRequests()
 {
-OSL_ASSERT(mpCacheContext.get()!=nullptr);
+assert(mpCacheContext.get()!=nullptr);
 
 // Never process more than one request at a time in order to prevent the
 // lock up of the edit view.
diff --git a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx 
b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx
index 8bc8bb3e74da..809fbf46ca01 100644
--- a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx
@@ -103,

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

2017-06-28 Thread Bernhard Widl 
 sc/source/core/data/column2.cxx|2 +-
 sc/source/core/data/columniterator.cxx |   10 +-
 sc/source/core/data/documen5.cxx   |4 ++--
 sc/source/core/data/document.cxx   |2 +-
 sc/source/core/data/dpcache.cxx|2 +-
 sc/source/core/data/olinetab.cxx   |2 +-
 sc/source/core/data/table3.cxx |8 
 sc/source/core/tool/chartlis.cxx   |2 +-
 8 files changed, 16 insertions(+), 16 deletions(-)

New commits:
commit 25d850cd5b71948b35ca94ccef37653fe88d0829
Author: Bernhard Widl <bernhard.w...@cib.de>
Date:   Tue Jun 27 15:01:13 2017 +0200

fdo#43157 convert OSL_ASSERT to assert in sc/source/core

Change-Id: I2cda454250116039b904bbb3abcd2871537c43f2
Reviewed-on: https://gerrit.libreoffice.org/39301
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Eike Rathke <er...@redhat.com>
Reviewed-by: Katarina Behrens <katarina.behr...@cib.de>

diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index 582fe6734a00..d08b9a559f8b 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -3110,7 +3110,7 @@ void ScColumn::EndListening( sc::EndListeningContext& 
rCxt, const ScAddress& rAd
 return;
 
 SvtBroadcaster* pBC = sc::broadcaster_block::at(*it->data, aPos.second);
-OSL_ASSERT(pBC);
+assert(pBC);
 
 rListener.EndListening(*pBC);
 if (!pBC->HasListeners())
diff --git a/sc/source/core/data/columniterator.cxx 
b/sc/source/core/data/columniterator.cxx
index 6c26da24775d..074f5bf7032a 100644
--- a/sc/source/core/data/columniterator.cxx
+++ b/sc/source/core/data/columniterator.cxx
@@ -62,7 +62,7 @@ void ScColumnTextWidthIterator::next()
 }
 
 // Reached the end.
-OSL_ASSERT(miBlockCur == miBlockEnd);
+assert(miBlockCur == miBlockEnd);
 }
 
 bool ScColumnTextWidthIterator::hasCell() const
@@ -72,19 +72,19 @@ bool ScColumnTextWidthIterator::hasCell() const
 
 SCROW ScColumnTextWidthIterator::getPos() const
 {
-OSL_ASSERT(miBlockCur != miBlockEnd && miDataCur != miDataEnd);
+assert(miBlockCur != miBlockEnd && miDataCur != miDataEnd);
 return static_cast(mnCurPos);
 }
 
 sal_uInt16 ScColumnTextWidthIterator::getValue() const
 {
-OSL_ASSERT(miBlockCur != miBlockEnd && miDataCur != miDataEnd);
+assert(miBlockCur != miBlockEnd && miDataCur != miDataEnd);
 return miDataCur->mnTextWidth;
 }
 
 void ScColumnTextWidthIterator::setValue(sal_uInt16 nVal)
 {
-OSL_ASSERT(miBlockCur != miBlockEnd && miDataCur != miDataEnd);
+assert(miBlockCur != miBlockEnd && miDataCur != miDataEnd);
 miDataCur->mnTextWidth = nVal;
 }
 
@@ -141,7 +141,7 @@ void ScColumnTextWidthIterator::init(SCROW nStartRow, SCROW 
nEndRow)
 }
 
 // Not found.
-OSL_ASSERT(miBlockCur == miBlockEnd);
+assert(miBlockCur == miBlockEnd);
 }
 
 void ScColumnTextWidthIterator::getDataIterators(size_t nOffsetInBlock)
diff --git a/sc/source/core/data/documen5.cxx b/sc/source/core/data/documen5.cxx
index 73e750c4f62c..340a9de2639f 100644
--- a/sc/source/core/data/documen5.cxx
+++ b/sc/source/core/data/documen5.cxx
@@ -658,7 +658,7 @@ uno::Reference< embed::XEmbeddedObject >
 
 void ScDocument::UpdateChartListenerCollection()
 {
-OSL_ASSERT(pChartListenerCollection);
+assert(pChartListenerCollection);
 
 bChartListenerCollectionNeedsUpdate = false;
 if (!pDrawLayer)
@@ -734,7 +734,7 @@ void ScDocument::UpdateChartListenerCollection()
 
 void ScDocument::AddOLEObjectToCollection(const OUString& rName)
 {
-OSL_ASSERT(pChartListenerCollection);
+assert(pChartListenerCollection);
 ScChartListenerCollection::StringSetType& rNonOleObjects =
 pChartListenerCollection->getNonOleObjectNames();
 
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 2627a0c33f0b..27e7eb9cf5d8 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -2092,7 +2092,7 @@ void ScDocument::UndoToDocument(SCCOL nCol1, SCROW nRow1, 
SCTAB nTab1,
 CopyToDocument(0, 0, 0, MAXCOL, MAXROW, nTab1-1, 
InsertDeleteFlags::FORMULA, false, rDestDoc);
 
 sc::CopyToDocContext aCxt(rDestDoc);
-OSL_ASSERT( nTab2 < static_cast(maTabs.size()) && nTab2 < 
static_cast(rDestDoc.maTabs.size()));
+assert( nTab2 < static_cast(maTabs.size()) && nTab2 < 
static_cast(rDestDoc.maTabs.size()));
 for (SCTAB i = nTab1; i <= nTab2; i++)
 {
 if (maTabs[i] && rDestDoc.maTabs[i])
diff --git a/sc/source/core/data/dpcache.cxx b/sc/source/core/data/dpcache.cxx
index d01419e0e2af..67d586a94484 100644
--- a/sc/source/core/data/dpcache.cxx
+++ b/sc/source/core/data/dpcache.cxx
@@ -726,7 +726,7 @@ bool ScDPCache::ValidQuery( SCROW nRow, const ScQueryParam 
) const
 bOk = pCellData-&g

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

2017-06-27 Thread Bernhard Widl 
 sw/source/filter/ww8/ww8scan.cxx|2 +-
 sw/source/ui/frmdlg/wrap.cxx|2 +-
 sw/source/uibase/app/apphdl.cxx |2 +-
 sw/source/uibase/app/swdll.cxx  |2 +-
 sw/source/uibase/docvw/FrameControlsManager.cxx |2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 37e7bb9c7803a3d4a3b4c44562487403e274203f
Author: Bernhard Widl <bernhard.w...@cib.de>
Date:   Mon Jun 26 18:47:10 2017 +0200

fdo#43157 convert OSL_ASSERT to assert in sw/source

Change-Id: Ibef2f8deb36e2123f22bd925d1360c34de0ce47b
Reviewed-on: https://gerrit.libreoffice.org/39270
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Michael Stahl <mst...@redhat.com>

diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 30ff406b8ef3..e8b63c9352c8 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -7065,7 +7065,7 @@ WW8Fonts::WW8Fonts( SvStream& rSt, WW8Fib& rFib )
 pVer8 += 24; //FONTSIGNATURE
 cbFfnM1-=24;
 
-OSL_ASSERT(cbFfnM1 >= 2);
+assert(cbFfnM1 >= 2);
 
 sal_uInt8 nMaxNullTerminatedPossible = cbFfnM1/2 - 1;
 sal_Unicode *pPrimary = reinterpret_cast<sal_Unicode*>(pVer8);
diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx
index 74c833b39940..810f75e461c5 100644
--- a/sw/source/ui/frmdlg/wrap.cxx
+++ b/sw/source/ui/frmdlg/wrap.cxx
@@ -604,7 +604,7 @@ IMPL_LINK( SwWrapTabPage, RangeModifyHdl, SpinField&, 
rSpin, void )
 else if ( == m_pBottomMarginED)
 pOpposite = m_pTopMarginED;
 
-OSL_ASSERT(pOpposite);
+assert(pOpposite);
 
 if (pOpposite)
 {
diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx
index c7611e0e0f9f..9fe4c69efbae 100644
--- a/sw/source/uibase/app/apphdl.cxx
+++ b/sw/source/uibase/app/apphdl.cxx
@@ -829,7 +829,7 @@ void SwModule::Notify( SfxBroadcaster& /*rBC*/, const 
SfxHint& rHint )
 switch( pEvHint->GetEventId() )
 {
 case SfxEventHintId::LoadFinished:
-OSL_ASSERT(!pWrtSh);
+SAL_WARN_IF(pWrtSh, "sw", "pWrtSh should be null");
 // if it is a new document created from a template,
 // update fixed fields
 if (pDocSh->GetMedium())
diff --git a/sw/source/uibase/app/swdll.cxx b/sw/source/uibase/app/swdll.cxx
index 0b226ec4dadd..af1e91322a80 100644
--- a/sw/source/uibase/app/swdll.cxx
+++ b/sw/source/uibase/app/swdll.cxx
@@ -172,7 +172,7 @@ SwDLL::~SwDLL()
 
 sw::Filters & SwDLL::getFilters()
 {
-OSL_ASSERT(filters_);
+assert(filters_);
 return *filters_.get();
 }
 
diff --git a/sw/source/uibase/docvw/FrameControlsManager.cxx 
b/sw/source/uibase/docvw/FrameControlsManager.cxx
index a16193227b1d..3ffb9a96f532 100644
--- a/sw/source/uibase/docvw/FrameControlsManager.cxx
+++ b/sw/source/uibase/docvw/FrameControlsManager.cxx
@@ -104,7 +104,7 @@ void SwFrameControlsManager::SetReadonlyControls( bool 
bReadonly )
 
 void SwFrameControlsManager::SetHeaderFooterControl( const SwPageFrame* 
pPageFrame, FrameControlType eType, Point aOffset )
 {
-OSL_ASSERT( eType == Header || eType == Footer );
+assert( eType == Header || eType == Footer );
 
 // Check if we already have the control
 SwFrameControlPtr pControl;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-06-26 Thread Bernhard Widl 
 sw/source/core/bastyp/calc.cxx|2 +-
 sw/source/core/doc/doccomp.cxx|4 ++--
 sw/source/core/doc/number.cxx |4 ++--
 sw/source/core/docnode/ndtbl.cxx  |2 +-
 sw/source/core/edit/ednumber.cxx  |2 +-
 sw/source/core/undo/rolbck.cxx|2 +-
 sw/source/core/undo/untbl.cxx |2 +-
 sw/source/core/unocore/XMLRangeHelper.cxx |2 +-
 sw/source/core/unocore/unobkm.cxx |2 +-
 sw/source/core/unocore/unocrsrhelper.cxx  |2 +-
 sw/source/core/unocore/unoflatpara.cxx|5 +++--
 sw/source/core/unocore/unoidx.cxx |2 +-
 sw/source/core/unocore/unorefmk.cxx   |4 ++--
 sw/source/core/unocore/unotext.cxx|2 +-
 14 files changed, 19 insertions(+), 18 deletions(-)

New commits:
commit ef151d297c4c490d8694e14f8f556b56cad3325a
Author: Bernhard Widl <bernhard.w...@cib.de>
Date:   Mon Jun 19 19:04:03 2017 +0200

fdo#43157 convert OSL_ASSERT to assert in sw/source/core

Change-Id: I6ffd9832ff1085c84fde8763045f3d1cb02137e2
Reviewed-on: https://gerrit.libreoffice.org/38974
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Michael Stahl <mst...@redhat.com>

diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx
index 85add0f5807a..ccda215a50bd 100644
--- a/sw/source/core/bastyp/calc.cxx
+++ b/sw/source/core/bastyp/calc.cxx
@@ -1312,7 +1312,7 @@ namespace
 double& rVal,
 const LocaleDataWrapper* const pLclData )
 {
-OSL_ASSERT(pLclData);
+assert(pLclData);
 const sal_Unicode nCurrCmdPos = rCommandPos;
 rtl_math_ConversionStatus eStatus;
 const sal_Unicode* pEnd;
diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx
index 0a7bbc55edee..9abc001f9530 100644
--- a/sw/source/core/doc/doccomp.cxx
+++ b/sw/source/core/doc/doccomp.cxx
@@ -2334,8 +2334,8 @@ int CommonSubseq::FindLCS( int *pLcs1, int *pLcs2, int 
nStt1, int nEnd1,
 int nLen1 = nEnd1 ? nEnd1 - nStt1 : rCmp.GetLen1();
 int nLen2 = nEnd2 ? nEnd2 - nStt2 : rCmp.GetLen2();
 
-OSL_ASSERT( nLen1 >= 0 );
-OSL_ASSERT( nLen2 >= 0 );
+assert( nLen1 >= 0 );
+assert( nLen2 >= 0 );
 
 std::unique_ptr<int*[]> pLcs( new int*[ nLen1 + 1 ] );
 pLcs[ 0 ] = pData.get();
diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx
index c08c8b4f23cd..e4e9bcde3719 100644
--- a/sw/source/core/doc/number.cxx
+++ b/sw/source/core/doc/number.cxx
@@ -78,7 +78,7 @@ OUString SwNumRule::GetOutlineRuleName()
 
 const SwNumFormat& SwNumRule::Get( sal_uInt16 i ) const
 {
-OSL_ASSERT( i < MAXLEVEL && meRuleType < RULE_END );
+assert( i < MAXLEVEL && meRuleType < RULE_END );
 return maFormats[ i ]
? *maFormats[ i ]
: ( meDefaultNumberFormatPositionAndSpaceMode == 
SvxNumberFormat::LABEL_WIDTH_AND_POSITION
@@ -90,7 +90,7 @@ const SwNumFormat* SwNumRule::GetNumFormat( sal_uInt16 i ) 
const
 {
 const SwNumFormat * pResult = nullptr;
 
-OSL_ASSERT( i < MAXLEVEL && meRuleType < RULE_END );
+assert( i < MAXLEVEL && meRuleType < RULE_END );
 if ( i < MAXLEVEL && meRuleType < RULE_END)
 {
 pResult = maFormats[ i ];
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index d6ceddd2a889..efed71ca8367 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -2295,7 +2295,7 @@ TableMergeErr SwDoc::MergeTable( SwPaM& rPam )
 if (pU && pU->GetRedlSaveCount())
 {
 SwEditShell *const pEditShell(GetEditShell());
-OSL_ASSERT(pEditShell);
+assert(pEditShell);
 ::sw::UndoRedoContext context(*this, *pEditShell);
 static_cast(pU)->UndoWithContext(context);
 }
diff --git a/sw/source/core/edit/ednumber.cxx b/sw/source/core/edit/ednumber.cxx
index 70f9541ccb04..ef503f3187f4 100644
--- a/sw/source/core/edit/ednumber.cxx
+++ b/sw/source/core/edit/ednumber.cxx
@@ -97,7 +97,7 @@ void SwPamRanges::Insert( const SwNodeIndex& rIdx1, const 
SwNodeIndex& rIdx2 )
 
 SwPaM& SwPamRanges::SetPam( size_t nArrPos, SwPaM& rPam )
 {
-OSL_ASSERT( nArrPos < Count() );
+assert( nArrPos < Count() );
 const SwPamRange& rTmp = maVector[ nArrPos ];
 rPam.GetPoint()->nNode = rTmp.nStart;
 rPam.GetPoint()->nContent.Assign( rPam.GetContentNode(), 0 );
diff --git a/sw/source/core/undo/rolbck.cxx b/sw/source/core/undo/rolbck.cxx
index 4651be86e9ea..f5cc213155a2 100644
--- a/sw/source/core/undo/rolbck.cxx
+++ b/sw/source/core/undo/rolbck.cxx
@@ -549,7 +549,7 @@ SwHistoryTextFlyCnt::~SwHistoryTextFlyCnt()
 void SwHistoryTextFlyCnt::S

[Libreoffice-commits] core.git: sw/sdi

2017-06-14 Thread Bernhard Widl 
 sw/sdi/_grfsh.sdi |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9a3a9a393c74872a5ec5f227b7c30ae3d4bcb1aa
Author: Bernhard Widl <bernhard.w...@cib.de>
Date:   Wed Jun 14 09:22:38 2017 +0200

tdf#39468 translate german comments in sw

Change-Id: I22114e9c8adaad67f71811f2b44fdd8a6d6e7f7b
Reviewed-on: https://gerrit.libreoffice.org/38767
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
Tested-by: Thorsten Behrens <thorsten.behr...@cib.de>

diff --git a/sw/sdi/_grfsh.sdi b/sw/sdi/_grfsh.sdi
index c37d2a197edd..1dc453608103 100644
--- a/sw/sdi/_grfsh.sdi
+++ b/sw/sdi/_grfsh.sdi
@@ -101,7 +101,7 @@ interface BaseTextGraphic
 DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
 ]
 
-SID_INSERT_GRAPHIC // zeigt auf FN_FORMAT_GRAFIC_DLG
+SID_INSERT_GRAPHIC // points to FN_FORMAT_GRAFIC_DLG
 [
 ExecMethod = Execute ;
 StateMethod = GetAttrState ;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-06-09 Thread Bernhard Widl 
 sw/source/core/text/txtftn.cxx |2 +-
 sw/source/core/txtnode/ndhints.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b31bd21a5ad720fa9524124c5b47793ccb6ce3bf
Author: Bernhard Widl <bernhard.w...@cib.de>
Date:   Fri Jun 9 11:05:37 2017 +0200

tdf#39468 translate german comments in sw/* (except source/filter)

Change-Id: I51126f690b5b66d171e19b82fa4ff24ff5930203
Reviewed-on: https://gerrit.libreoffice.org/38598
Reviewed-by: Michael Stahl <mst...@redhat.com>
Tested-by: Michael Stahl <mst...@redhat.com>

diff --git a/sw/source/core/text/txtftn.cxx b/sw/source/core/text/txtftn.cxx
index 9c91e98b97f8..443c2853795c 100644
--- a/sw/source/core/text/txtftn.cxx
+++ b/sw/source/core/text/txtftn.cxx
@@ -993,7 +993,7 @@ SwErgoSumPortion *SwTextFormatter::NewErgoSumPortion( 
SwTextFormatInfo  ) c
 
m_pFrame->ImplFindFootnoteFrame()->GetAttr()->GetFootnote().IsEndNote() )
 return nullptr;
 
-// Aha, wir sind also im Fussnotenbereich
+// we are in the footnote container
 const SwFootnoteInfo  = 
m_pFrame->GetNode()->GetDoc()->GetFootnoteInfo();
 SwTextFrame *pQuoFrame = m_pFrame->FindQuoVadisFrame();
 if( !pQuoFrame )
diff --git a/sw/source/core/txtnode/ndhints.cxx 
b/sw/source/core/txtnode/ndhints.cxx
index 3fa6bedc4611..55d31dc4c1f4 100644
--- a/sw/source/core/txtnode/ndhints.cxx
+++ b/sw/source/core/txtnode/ndhints.cxx
@@ -191,7 +191,7 @@ bool SwpHints::Check(bool bPortionsMerged) const
 
 // --- check Ends ---
 
-// 2b) gueltiger Pointer? vgl. DELETEFF
+// 2b) valid pointer? see DELETEFF
 const SwTextAttr *pHtEnd = m_HintsByEnd[i];
 CHECK_ERR( 0xFF != *reinterpret_cast(pHtEnd), 
"HintsCheck: end ptr was deleted" );
 
___
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' - sw/source

2017-06-06 Thread Bernhard Widl 
 sw/source/uibase/fldui/fldmgr.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 48e75d8107d64920dd90c5d98b79dc982e311fa3
Author: Bernhard Widl <bernhard.w...@cib.de>
Date:   Fri May 12 13:55:50 2017 +0200

tdf#107795 fixed cursor position after inserting input field

Change-Id: I3c063c0393b524132e522914a7a9885c8a9c3b78
Reviewed-on: https://gerrit.libreoffice.org/37536
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Michael Stahl <mst...@redhat.com>
(cherry picked from commit 408a7e320db978a8f784fa25e35caedf931612c5)
Reviewed-on: https://gerrit.libreoffice.org/38443
Reviewed-by: Katarina Behrens <katarina.behr...@cib.de>

diff --git a/sw/source/uibase/fldui/fldmgr.cxx 
b/sw/source/uibase/fldui/fldmgr.cxx
index a51dd7666f3d..35c6f5ebd28e 100644
--- a/sw/source/uibase/fldui/fldmgr.cxx
+++ b/sw/source/uibase/fldui/fldmgr.cxx
@@ -1328,10 +1328,14 @@ bool SwFieldMgr::InsertField(
 
 if (TYP_INPUTFLD == rData.m_nTypeId)
 {
+pCurShell->Push();
+
 // start dialog, not before the field is inserted tdf#99529
 pCurShell->Left(CRSR_SKIP_CHARS,
 false, (INP_VAR == (nSubType & 0xff)) ? 1 : 2, false );
 pCurShell->StartInputFieldDlg(pField, false, rData.m_pParent);
+
+pCurShell->Pop(false);
 }
 
 if(bExp && bEvalExp)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-05-12 Thread Bernhard Widl 
 sw/source/uibase/fldui/fldmgr.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 408a7e320db978a8f784fa25e35caedf931612c5
Author: Bernhard Widl <bernhard.w...@cib.de>
Date:   Fri May 12 13:55:50 2017 +0200

tdf#107795 fixed cursor position after inserting input field

Change-Id: I3c063c0393b524132e522914a7a9885c8a9c3b78
Reviewed-on: https://gerrit.libreoffice.org/37536
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Michael Stahl <mst...@redhat.com>

diff --git a/sw/source/uibase/fldui/fldmgr.cxx 
b/sw/source/uibase/fldui/fldmgr.cxx
index 88718273b980..d28bb81de56a 100644
--- a/sw/source/uibase/fldui/fldmgr.cxx
+++ b/sw/source/uibase/fldui/fldmgr.cxx
@@ -1328,10 +1328,14 @@ bool SwFieldMgr::InsertField(
 
 if (TYP_INPUTFLD == rData.m_nTypeId)
 {
+pCurShell->Push();
+
 // start dialog, not before the field is inserted tdf#99529
 pCurShell->Left(CRSR_SKIP_CHARS,
 false, (INP_VAR == (nSubType & 0xff)) ? 1 : 2, false );
 pCurShell->StartInputFieldDlg(pField, false, rData.m_pParent);
+
+pCurShell->Pop(false);
 }
 
 if(bExp && bEvalExp)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-04-10 Thread Bernhard Widl 
 sc/qa/unit/data/functions/mathematical/fods/sumif.fods |  751 -
 sc/source/core/tool/queryparam.cxx |   11 
 2 files changed, 385 insertions(+), 377 deletions(-)

New commits:
commit 78dfedec7a7ba289691a5d18441796541f3b1812
Author: Bernhard Widl <bernhard.w...@cib.de>
Date:   Thu Apr 6 18:17:25 2017 +0200

tdf#105044 match empty cells on "<> not-empty" comparisons

this affects any formula using <> over a range of cells
(not only SUMIF and SUMIFS)

Change-Id: I85a3c3762d72de3250def0f037a0afd96c48f35d
Reviewed-on: https://gerrit.libreoffice.org/36224
Reviewed-by: Eike Rathke <er...@redhat.com>
Tested-by: Jenkins <c...@libreoffice.org>

diff --git a/sc/qa/unit/data/functions/mathematical/fods/sumif.fods 
b/sc/qa/unit/data/functions/mathematical/fods/sumif.fods
index 4bb3516dfb71..7edd2a4b7b23 100644
--- a/sc/qa/unit/data/functions/mathematical/fods/sumif.fods
+++ b/sc/qa/unit/data/functions/mathematical/fods/sumif.fods
@@ -1,13 +1,13 @@
 
 
 http://www.w3.org/1999/xlink; 
xmlns:dc="http://purl.org/dc/elements/1.1/; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:scr
 ipt="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office; 
xmlns:ooow="http://openoffice.org/2004/writer; 
xmlns:oooc="http://openoffice.org/2004/calc; 
xmlns:dom="http://www.w3.org/2001/xml-events; 
xmlns:xforms="http://www.w3.org/2002/xforms; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xmlns:rpt="http://openoffice.org/2005/report; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#; 
xmlns:tableooo="http://openoffice.org/2009/table; 
xmlns:drawooo="http://openoffice.org/2010/draw; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:form
 x="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.spreadsheet">
- 
2016-06-25T07:16:38.437590147P0D1LibreOfficeDev/5.3.0.0.alpha0$Linux_X86_64
 
LibreOffice_project/d2e4753c3f511cfc6b2932ce60d0bc2e09296f9f
+ 
2016-06-25T07:16:38.437590147P0D1LibreOfficeDev/5.4.0.0.alpha0$Linux_X86_64
 
LibreOffice_project/709f49bce86d2df4154d8075818f57cacfecb401
  
   
0
0
-   58001
-   13638
+   22009
+   4261

 
  view1
@@ -31,8 +31,8 @@
false
   
   
-   3
-   19
+   2
+   30
0
0
0
@@ -50,7 +50,7 @@
   
  
  Sheet2
- 1241
+ 1048
  0
  80
  60
@@ -91,10 +91,12 @@
true
true
true
+   true
+   true
false
12632256
false
-   Lexmark-E352dn
+   Generic 
Printer

 
  en
@@ -104,14 +106,12 @@
  
 

-   true
-   true
3
1
true
1
true
-   qQH+/0xleG1hcmstRTM1MmRuQ1VQUzpMZXhtYXJrLUUzNTJkbgAWAAMAzwAEAAhSAAAEdAAASm9iRGF0YSAxCnByaW50ZXI9TGV4bWFyay1FMzUyZG4Kb3JpZW50YXRpb249UG9ydHJhaXQKY29waWVzPTEKY29sbGF0ZT1mYWxzZQptYXJnaW5kYWp1c3RtZW50PTAsMCwwLDAKY29sb3JkZXB0aD0yNApwc2xldmVsPTAKcGRmZGV2aWNlPTEKY29sb3JkZXZpY2U9MApQUERDb250ZXhEYXRhCkR1cGxleDpOb25lAElucHV0U2xvdDpUcmF5MQBQYWdlU2l6ZTpBNAAAEgBDT01QQVRfRFVQTEVYX01PREUKAERVUExFWF9PRkY=
+   lQH+/0dlbmVyaWMgUHJpbnRlcgAAU0dFTlBSVAAWAAMAtgAIAFZUAAAkbQAASm9iRGF0YSAxCnByaW50ZXI9R2VuZXJpYyBQcmludGVyCm9yaWVudGF0aW9uPVBvcnRyYWl0CmNvcGllcz0xCm1hcmdpbmRhanVzdG1lbnQ9MCwwLDAsMApjb2xvcmRlcHRoPTI0CnBzbGV2ZWw9MApwZGZkZXZpY2U9MApjb2xvcmRldmljZT0wClBQR

[Libreoffice-commits] core.git: officecfg/registry sc/inc sc/Library_scui.mk sc/source

2017-04-06 Thread Bernhard Widl 
 officecfg/registry/schema/org/openoffice/Office/Calc.xcs |   54 +++
 sc/Library_scui.mk   |4 +
 sc/inc/scabstdlg.hxx |1 
 sc/source/ui/attrdlg/scdlgfact.cxx   |5 +
 sc/source/ui/attrdlg/scdlgfact.hxx   |1 
 sc/source/ui/dbgui/scuiimoptdlg.cxx  |   49 +++--
 sc/source/ui/inc/scuiimoptdlg.hxx|3 
 sc/source/ui/unoobj/filtuno.cxx  |1 
 8 files changed, 108 insertions(+), 10 deletions(-)

New commits:
commit 781c026f98c848025f313940c94cbd4553259901
Author: Bernhard Widl <bernhard.w...@cib.de>
Date:   Wed Apr 5 14:41:22 2017 +0200

tdf#55236 save settings of CSV export dialog

Change-Id: I250e2d8d9d7b7b806a60fb2779321685e84b44bf
Reviewed-on: https://gerrit.libreoffice.org/36144
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
Tested-by: Thorsten Behrens <thorsten.behr...@cib.de>

diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index d6426a3da049..f03fcae1e147 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -1023,6 +1023,60 @@
   -1
 
   
+  
+
+  Contains setting for Text CSV Export
+
+
+  
+Char Set
+CharSet
+  
+  -1
+
+
+  
+Field delimiter
+FieldSeparator
+  
+  
+
+
+  
+Text delimiter
+TextSeparator
+  
+  
+
+
+  
+If true, formatted cell content is exported. If false, raw 
cell content is exported.
+SaveTrueCellContent
+  
+  true
+
+
+  
+If true, text formulas are exported instead of the 
calculated values.
+SaveCellFormulas
+  
+  false
+
+
+  
+If true, text cells are always enclosed in quotes with no 
exception.
+QuoteAllTextCells
+  
+  false
+
+
+  
+All fields are exported having the same width
+FixedWidth
+  
+  false
+
+  
   
 
   Contains setting for Text CSV Import
diff --git a/sc/Library_scui.mk b/sc/Library_scui.mk
index e694885aa13b..4b911d6846b1 100644
--- a/sc/Library_scui.mk
+++ b/sc/Library_scui.mk
@@ -18,6 +18,10 @@ $(eval $(call gb_Library_set_include,scui,\
$$(INCLUDE) \
 ))
 
+$(eval $(call gb_Library_use_custom_headers,scui,\
+   officecfg/registry \
+)) \
+
 $(eval $(call 
gb_Library_set_precompiled_header,scui,$(SRCDIR)/sc/inc/pch/precompiled_scui))
 
 $(eval $(call gb_Library_use_sdk_api,scui))
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 7e4f992dd900..96d154991f4e 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -380,6 +380,7 @@ protected:
 virtual ~AbstractScImportOptionsDlg() override = default;
 public:
 virtual void GetImportOptions( ScImportOptions& rOptions ) const = 0;
+virtual void SaveImportOptions() const = 0;
 };
 
 class AbstractScTextImportOptionsDlg : public VclAbstractDialog
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx 
b/sc/source/ui/attrdlg/scdlgfact.cxx
index 61efb1bb4be4..74f9bb1aeb38 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -593,6 +593,11 @@ void AbstractScImportOptionsDlg_Impl::GetImportOptions( 
ScImportOptions& rOption
 pDlg->GetImportOptions(rOptions);
 }
 
+void AbstractScImportOptionsDlg_Impl::SaveImportOptions() const
+{
+pDlg->SaveImportOptions();
+}
+
 LanguageType AbstractScTextImportOptionsDlg_Impl::GetLanguageType() const
 {
 return pDlg->getLanguageType();
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx 
b/sc/source/ui/attrdlg/scdlgfact.hxx
index feeca4df5377..0970af51a622 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -384,6 +384,7 @@ class AbstractScImportOptionsDlg_Impl : public 
AbstractScImportOptionsDlg
 {
 DECL_ABSTDLG_BASE( AbstractScImportOptionsDlg_Impl, ScImportOptionsDlg)
 virtual void GetImportOptions( ScImportOptions& rOptions ) const override;
+virtual void SaveImportOptions() const override;
 };
 
 class AbstractScTextImportOptionsDlg_Impl : public 
AbstractScTextImportOptionsDlg
diff --git a/sc/source/ui/dbgui/scuiimoptdlg.cxx 
b/sc/source/ui/dbgui/scuiimoptdlg.cxx
index 38ec2fbdf6c8..0f9079e728f1 100644
--- a/sc/source/ui/dbgui/scuiimoptdlg.cxx
+++ b/sc/source/ui/dbgui/scuiimoptdlg.cxx
@@ -24,6 +24,7 @@
 #include "scresid.hxx"
 #include "scres.hrc&quo

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

2017-04-06 Thread Bernhard Widl 
 sc/source/ui/view/tabvwshb.cxx |   24 +++-
 1 file changed, 23 insertions(+), 1 deletion(-)

New commits:
commit 26030f92629b310e66b2335c2cec0413bb7ec828
Author: Bernhard Widl <bernhard.w...@cib.de>
Date:   Wed Apr 5 18:29:52 2017 +0200

tdf#97357 allow insert image if sheet is protected but few cells are not

- if the currently marked area is fuly unprotected, allow insert image
- if there is no currently marked area, check the current cell

Change-Id: I46608ae349f91f9f2e81a22dd55a817616ca3d3c
Reviewed-on: https://gerrit.libreoffice.org/36160
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
Tested-by: Thorsten Behrens <thorsten.behr...@cib.de>

diff --git a/sc/source/ui/view/tabvwshb.cxx b/sc/source/ui/view/tabvwshb.cxx
index 52990c0f9428..0d5deada9a14 100644
--- a/sc/source/ui/view/tabvwshb.cxx
+++ b/sc/source/ui/view/tabvwshb.cxx
@@ -507,13 +507,35 @@ void ScTabViewShell::GetDrawInsState(SfxItemSet )
 rSet.DisableItem( nWhich );
 break;
 
-case SID_INSERT_GRAPHIC:
 case SID_INSERT_AVMEDIA:
 case SID_FONTWORK_GALLERY_FLOATER:
 if ( bTabProt || bShared )
 rSet.DisableItem( nWhich );
 break;
 
+case SID_INSERT_GRAPHIC:
+if (bTabProt || bShared)
+{
+// do not disable 'insert graphic' item if the currently 
marked area is editable (not protected)
+// if there is no marked area, check the current cell
+bool bDisableInsertImage = true;
+ScMarkData& rMark = GetViewData().GetMarkData();
+if (!rMark.GetMarkedRanges().empty() && 
GetViewData().GetDocument()->IsSelectionEditable(rMark))
+bDisableInsertImage = false;
+else
+{
+if (GetViewData().GetDocument()->IsBlockEditable
+(GetViewData().GetTabNo(), 
GetViewData().GetCurX(), GetViewData().GetCurY(), GetViewData().GetCurX(), 
GetViewData().GetCurY()))
+{
+bDisableInsertImage = false;
+}
+}
+
+if (bDisableInsertImage)
+rSet.DisableItem(nWhich);
+}
+break;
+
 case SID_LINKS:
 {
 if 
(GetViewData().GetDocument()->GetLinkManager()->GetLinks().empty())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: unusedcode.easy unusedcode.exclude

2017-04-05 Thread Bernhard Widl 
 unusedcode.easy|8 
 unusedcode.exclude |8 
 2 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit bd6ad1d498c7104ea18597678a763c0066b2a49f
Author: Bernhard Widl <bernhard.w...@cib.de>
Date:   Wed Apr 5 15:42:28 2017 +0200

moved StyleSettings from unusedcode.easy to unusedcode.exclude

some StyleSettings methods are used in win and mac builds.

Change-Id: I1b0c0d27614a621fec89bb7f405a65a1b2907c68
Reviewed-on: https://gerrit.libreoffice.org/36150
Reviewed-by: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
Tested-by: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>

diff --git a/unusedcode.easy b/unusedcode.easy
index e93255042b4e..cb63a35632a3 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -16,14 +16,6 @@ 
ScVbaFormat::setAddIndent(com::sun::star::uno::Any cons
 SdrUndoObjList::SetOrdNum(unsigned int)
 SecurityEnvironment_NssImpl::getCertificate(rtl::OUString const&, 
rtl::OUString const&)
 StylePool::getCount() const
-StyleSettings::SetAlternatingRowColor(Color const&)
-StyleSettings::SetCursorSize(long)
-StyleSettings::SetFloatTitleHeight(long)
-StyleSettings::SetHideDisabledMenuItems(bool)
-StyleSettings::SetSpinSize(long)
-StyleSettings::SetTitleHeight(long)
-StyleSettings::SetUseFlatBorders(bool)
-StyleSettings::SetUseFlatMenus(bool)
 SvpSalInstance::PostedEventsInQueue()
 SvtAccessibilityOptions::IsModified() const
 SvtListener::IsListening(SvtBroadcaster&) const
diff --git a/unusedcode.exclude b/unusedcode.exclude
index 716e6a56cb38..6b3509bbaf8a 100644
--- a/unusedcode.exclude
+++ b/unusedcode.exclude
@@ -31,4 +31,12 @@ FontCharMap::GetDefaultMap(bool)
 OutputDevice::LogicToLogic(basegfx::B2DPolyPolygon const&, MapMode const&, 
MapMode const&)
 SvpSalFrame::enableDamageTracker(bool)
 SalGraphics::drawTransformedBitmap(basegfx::B2DPoint const&, basegfx::B2DPoint 
const&, basegfx::B2DPoint const&, SalBitmap const&, SalBitmap const*)
+StyleSettings::SetAlternatingRowColor(Color const&)
+StyleSettings::SetCursorSize(long)
+StyleSettings::SetFloatTitleHeight(long)
+StyleSettings::SetHideDisabledMenuItems(bool)
+StyleSettings::SetSpinSize(long)
+StyleSettings::SetTitleHeight(long)
+StyleSettings::SetUseFlatBorders(bool)
+StyleSettings::SetUseFlatMenus(bool)
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: .gitignore

2017-04-04 Thread Bernhard Widl 
 .gitignore |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit f5d59796d36f739396f346702e05a0f172687939
Author: Bernhard Widl <bernhard.w...@cib.de>
Date:   Tue Apr 4 14:08:24 2017 +0200

add *.vcxproj* to .gitignore

these files are generated by make vs2015-ide-integration.

Change-Id: Iaae5931289bd2f27415c401b6ac253d43dc39007
Reviewed-on: https://gerrit.libreoffice.org/36073
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>

diff --git a/.gitignore b/.gitignore
index 1b954b15ff50..259be140e43c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -136,8 +136,7 @@ DerivedData
 *.v11*
 *.v12*
 *.opensdf
-!windows/*.sln
-!windows/*.vcxproj*
+*.vcxproj*
 
 # QtCreator specific
 *.pro
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-03-27 Thread Bernhard Widl 
 include/tubes/manager.hxx |2 +-
 tubes/source/manager.cxx  |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6d5fc2acf2354d72fb32e1cbae620d604c904cff
Author: Bernhard Widl <bernhard.w...@cib.de>
Date:   Mon Mar 27 18:40:08 2017 +0200

tdf#89329: use unique_ptr for pImpl in tubes/manager

Change-Id: Ic70883b58c9b3a0b56e6c07594a2758e04e7f5ee
Reviewed-on: https://gerrit.libreoffice.org/35767
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Michael Stahl <mst...@redhat.com>

diff --git a/include/tubes/manager.hxx b/include/tubes/manager.hxx
index 2ea14fce3888..063cf975e587 100644
--- a/include/tubes/manager.hxx
+++ b/include/tubes/manager.hxx
@@ -145,7 +145,7 @@ public:
 TUBES_DLLPUBLIC static void addSuffixToNames( const char* pName );
 
 private:
-static TeleManagerImpl* pImpl;
+static std::unique_ptr pImpl;
 
 static ::osl::Mutex&GetMutex();
 };
diff --git a/tubes/source/manager.cxx b/tubes/source/manager.cxx
index a742e2811491..08dacfb3ed58 100644
--- a/tubes/source/manager.cxx
+++ b/tubes/source/manager.cxx
@@ -436,7 +436,7 @@ bool TeleManager::init( bool bListen )
 
 void TeleManager::finalize()
 {
-delete pImpl;
+pImpl.reset();
 }
 
 bool TeleManager::createAccountManager()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits