[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - include/svx sw/sdi sw/source
include/svx/svxids.hrc|8 ++--
sw/sdi/swriter.sdi|2 +-
sw/source/uibase/wrtsh/wrtsh1.cxx | 13 +
3 files changed, 20 insertions(+), 3 deletions(-)
New commits:
commit 02229783378c2f7ba495f7062620b5726872fcb7
Author: gokaysatir
AuthorDate: Thu Sep 10 15:23:26 2020 +0300
Commit: Andras Timar
CommitDate: Wed Apr 7 23:21:58 2021 +0200
leaflet: User may continue writing a comment after it loses focus/core part.
This path enables Online users to continue writing their comment after they
click somewhere else in the document.
Online side will remember original position of comment and it will send the
cursor position when needed.
When there is no cursor position, default behaviour will work.
Change-Id: Ided951481af6e0ec6c930e125bec7fdf687614d9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102377
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Henry Castro
Reviewed-by: Andras Timar
diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc
index c057e16d81d7..fbb961c9c4cd 100644
--- a/include/svx/svxids.hrc
+++ b/include/svx/svxids.hrc
@@ -207,7 +207,6 @@ class SvxSetItem;
#define SID_ATTR_POSTIT_DATE
TypedWhichId( SID_SVX_START + 45 )
#define SID_ATTR_POSTIT_TEXT
TypedWhichId( SID_SVX_START + 46 )
#define SID_ATTR_POSTIT_ID
TypedWhichId( SID_SVX_START + 47 )
-// free
// CAUTION! Range <48 .. 49> used by EditEngine (!)
@@ -251,7 +250,7 @@ class SvxSetItem;
#define SID_ATTR_TRANSFORM_ROT_Y
TypedWhichId( SID_SVX_START + 94 )
#define SID_ATTR_TRANSFORM_ANGLE
TypedWhichId( SID_SVX_START + 95 )
#define SID_ATTR_TRANSFORM_DELTA_ANGLE
TypedWhichId( SID_SVX_START + 96 )
-// CAUTION! Range <96..100> used by SFX2 (!)
+// CAUTION! Range <96..100> used by SFX2 (!) // 96 is used above?
#define SID_SIZE_ALL( SID_SVX_START + 101 )
#define SID_DRAW_LINE ( SID_SVX_START + 102 )
#define SID_DRAW_XLINE ( SID_SVX_START + 103 )
@@ -437,6 +436,11 @@ class SvxSetItem;
//#define SID_SIDEBAR ( SID_SVX_START + 336
) -> sfxsids.hrc
+#define SID_ATTR_POSTIT_X
TypedWhichId( SID_SVX_START + 337 )
+#define SID_ATTR_POSTIT_Y
TypedWhichId( SID_SVX_START + 338 )
+
+// free?
+
#define SID_SB_CONNECTIONPOOLING( SID_SVX_START + 348 )
#define SID_SB_DBREGISTEROPTIONS( SID_SVX_START + 349 )
#define SID_BMPMASK ( SID_SVX_START + 350 )
diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi
index f8445e8eba6d..a049ae6b96ef 100644
--- a/sw/sdi/swriter.sdi
+++ b/sw/sdi/swriter.sdi
@@ -2500,7 +2500,7 @@ SfxVoidItem IndexMarkToIndex FN_IDX_MARK_TO_IDX
]
SfxVoidItem InsertAnnotation FN_POSTIT
-(SvxPostItTextItem Text SID_ATTR_POSTIT_TEXT,SvxPostItAuthorItem Author
SID_ATTR_POSTIT_AUTHOR,SvxPostItDateItem Date SID_ATTR_POSTIT_DATE)
+(SvxPostItTextItem Text SID_ATTR_POSTIT_TEXT,SvxPostItAuthorItem Author
SID_ATTR_POSTIT_AUTHOR,SvxPostItDateItem Date
SID_ATTR_POSTIT_DATE,SvxPostItTextItem pointX SID_ATTR_POSTIT_X,
SvxPostItTextItem pointY SID_ATTR_POSTIT_Y)
[
AutoUpdate = FALSE,
FastCall = FALSE,
diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx
b/sw/source/uibase/wrtsh/wrtsh1.cxx
index 8251a9978142..08849e28a3f6 100644
--- a/sw/source/uibase/wrtsh/wrtsh1.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh1.cxx
@@ -1916,6 +1916,19 @@ void SwWrtShell::InsertPostIt(SwFieldMgr& rFieldMgr,
const SfxRequest& rReq)
sText = GetView().GetPostItMgr()->GetAnswerText();
GetView().GetPostItMgr()->RegisterAnswerText(OUString());
}
+else
+{
+const SvxPostItTextItem* pXItem =
rReq.GetArg(SID_ATTR_POSTIT_X);
+const SvxPostItTextItem* pYItem =
rReq.GetArg(SID_ATTR_POSTIT_Y);
+// We allow Online users to begin a comment, click somewhere else
and save comment. When comment is saved, its initial position is sent.
+if (pXItem && pYItem)
+{
+sal_Int32 pointX = (*pXItem).GetValue().toInt32();
+sal_Int32 pointY = (*pYItem).GetValue().toInt32();
+Point point(pointX, pointY);
+SwCursorShell::SetCursor(point);
+}
+}
if ( HasSelection() && !IsTableMode() )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - include/LibreOfficeKit include/vcl sc/source sd/source sw/source vcl/source
include/LibreOfficeKit/LibreOfficeKitEnums.h |2 +-
include/vcl/unohelp2.hxx |3 ++-
sc/source/ui/view/editsh.cxx |8 +---
sd/source/ui/view/drviews2.cxx | 12 +---
sw/source/uibase/shells/textsh1.cxx |8 +---
vcl/source/app/unohelp2.cxx |6 +++---
6 files changed, 9 insertions(+), 30 deletions(-)
New commits:
commit 52d7ea6e03ee66ee6a9c345ded4884fea54d8351
Author: gokaysatir
AuthorDate: Wed Oct 7 12:57:13 2020 +0300
Commit: Jan Holesovsky
CommitDate: Thu Dec 10 09:28:18 2020 +0100
Online: "Copy hyperlink location" feature improvement.
Lambda functions are replaced with class pointers.
Change-Id: I48628d3105533aad2463bd8ade1f65cf5b154b0f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104057
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Jan Holesovsky
diff --git a/include/LibreOfficeKit/LibreOfficeKitEnums.h
b/include/LibreOfficeKit/LibreOfficeKitEnums.h
index 287894fce122..2e2c7d14c8a1 100644
--- a/include/LibreOfficeKit/LibreOfficeKitEnums.h
+++ b/include/LibreOfficeKit/LibreOfficeKitEnums.h
@@ -646,7 +646,7 @@ typedef enum
*
* Payload is optional. When payload is empty, Online gets string from
selected text.
* Payload format is JSON.
- * Example: { "mimeType": "string", "content": "some content" }
+ * Example: { "mimeType": "text/plain", "content": "some content" }
*/
LOK_CALLBACK_CLIPBOARD_CHANGED = 38,
diff --git a/include/vcl/unohelp2.hxx b/include/vcl/unohelp2.hxx
index c5e042333a40..b147d837d9c2 100644
--- a/include/vcl/unohelp2.hxx
+++ b/include/vcl/unohelp2.hxx
@@ -28,6 +28,7 @@
#include
#include
#include
+#include
namespace com { namespace sun { namespace star { namespace datatransfer {
namespace clipboard {
class XClipboard;
@@ -60,7 +61,7 @@ namespace vcl { namespace unohelper {
static voidCopyStringTo(
const OUString& rContent,
const css::uno::Reference<
css::datatransfer::clipboard::XClipboard >& rxClipboard,
-std::function *callback = nullptr
+const vcl::ILibreOfficeKitNotifier* pNotifier = nullptr
);
};
diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx
index 09589a2b2382..be004a1caed9 100644
--- a/sc/source/ui/view/editsh.cxx
+++ b/sc/source/ui/view/editsh.cxx
@@ -645,13 +645,7 @@ void ScEditShell::Execute( SfxRequest& rReq )
uno::Reference
xClipboard
= pEditView->GetWindow()->GetClipboard();
-if (comphelper::LibreOfficeKit::isActive())
-{
-std::function callback = [&]
(int callbackType, const char* text) {
pViewData->GetViewShell()->libreOfficeKitViewCallback(callbackType, text); } ;
-
vcl::unohelper::TextDataObject::CopyStringTo(pURLField->GetURL(), xClipboard,
);
-}
-else
-
vcl::unohelper::TextDataObject::CopyStringTo(pURLField->GetURL(), xClipboard,
nullptr);
+
vcl::unohelper::TextDataObject::CopyStringTo(pURLField->GetURL(), xClipboard,
SfxViewShell::Current());
}
}
break;
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index ec1dda3cdb6e..c293d0369266 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -2240,17 +2240,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
uno::Reference
xClipboard
= pOutView->GetWindow()->GetClipboard();
-if (comphelper::LibreOfficeKit::isActive())
-{
-std::function callback = [&]
(int callbackType, const char* text)
-{
-SfxViewFrame* pFrame = GetViewFrame();
-
pFrame->GetViewShell()->libreOfficeKitViewCallback(callbackType, text);
-};
-
vcl::unohelper::TextDataObject::CopyStringTo(pURLField->GetURL(), xClipboard,
);
-}
-else
-
vcl::unohelper::TextDataObject::CopyStringTo(pURLField->GetURL(), xClipboard);
+
vcl::unohelper::TextDataObject::CopyStringTo(pURLField->GetURL(), xClipboard,
SfxViewShell::Current());
}
}
diff --git a/sw/source/uibase/shells/textsh1.cxx
b/sw/source/uibase/shells/textsh1.cxx
index 9a032880ea18..4c78e37212a9 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -1342,13 +1342,7 @@ void SwTextShell::Execute(SfxRequest )
OUString hyperlinkLocation = rINetFormat.GetValue();
::uno::Reference< datatransfer::clipboard::XClipboard >
xClipboard =
[Libreoffice-commits] core.git: include/LibreOfficeKit include/vcl sc/source sd/source sw/source vcl/source
include/LibreOfficeKit/LibreOfficeKitEnums.h |2 +-
include/vcl/unohelp2.hxx |3 ++-
sc/source/ui/view/editsh.cxx |8 +---
sd/source/ui/view/drviews2.cxx | 12 +---
sw/source/uibase/shells/textsh1.cxx |8 +---
vcl/source/app/unohelp2.cxx |6 +++---
6 files changed, 9 insertions(+), 30 deletions(-)
New commits:
commit 56f708b3449230c328f3640709217f9aa802e4c1
Author: gokaysatir
AuthorDate: Wed Oct 7 12:57:13 2020 +0300
Commit: Jan Holesovsky
CommitDate: Thu Dec 10 09:27:22 2020 +0100
Online: "Copy hyperlink location" feature improvement.
Lambda functions are replaced with class pointers.
Change-Id: I48628d3105533aad2463bd8ade1f65cf5b154b0f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104058
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky
diff --git a/include/LibreOfficeKit/LibreOfficeKitEnums.h
b/include/LibreOfficeKit/LibreOfficeKitEnums.h
index 9a0eb01ca840..ae8eacd9151f 100644
--- a/include/LibreOfficeKit/LibreOfficeKitEnums.h
+++ b/include/LibreOfficeKit/LibreOfficeKitEnums.h
@@ -646,7 +646,7 @@ typedef enum
*
* Payload is optional. When payload is empty, Online gets string from
selected text.
* Payload format is JSON.
- * Example: { "mimeType": "string", "content": "some content" }
+ * Example: { "mimeType": "text/plain", "content": "some content" }
*/
LOK_CALLBACK_CLIPBOARD_CHANGED = 38,
diff --git a/include/vcl/unohelp2.hxx b/include/vcl/unohelp2.hxx
index 91c4ce6ce0e2..a0e03a04e2a1 100644
--- a/include/vcl/unohelp2.hxx
+++ b/include/vcl/unohelp2.hxx
@@ -28,6 +28,7 @@
#include
#include
#include
+#include
namespace com::sun::star::datatransfer::clipboard {
class XClipboard;
@@ -60,7 +61,7 @@ namespace vcl::unohelper {
static voidCopyStringTo(
const OUString& rContent,
const css::uno::Reference<
css::datatransfer::clipboard::XClipboard >& rxClipboard,
-std::function *callback = nullptr
+const vcl::ILibreOfficeKitNotifier* pNotifier = nullptr
);
};
diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx
index e12c5460c09d..619001a27d8c 100644
--- a/sc/source/ui/view/editsh.cxx
+++ b/sc/source/ui/view/editsh.cxx
@@ -642,13 +642,7 @@ void ScEditShell::Execute( SfxRequest& rReq )
{
uno::Reference
xClipboard = GetSystemClipboard();
-if (comphelper::LibreOfficeKit::isActive())
-{
-std::function callback = [&]
(int callbackType, const char* text) {
rViewData.GetViewShell()->libreOfficeKitViewCallback(callbackType, text); } ;
-
vcl::unohelper::TextDataObject::CopyStringTo(pURLField->GetURL(), xClipboard,
);
-}
-else
-
vcl::unohelper::TextDataObject::CopyStringTo(pURLField->GetURL(), xClipboard,
nullptr);
+
vcl::unohelper::TextDataObject::CopyStringTo(pURLField->GetURL(), xClipboard,
SfxViewShell::Current());
}
}
break;
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 11f42901b9fd..33203efef9b9 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -2251,17 +2251,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
uno::Reference
xClipboard
= pOutView->GetWindow()->GetClipboard();
-if (comphelper::LibreOfficeKit::isActive())
-{
-std::function callback = [&]
(int callbackType, const char* text)
-{
-SfxViewFrame* pFrame = GetViewFrame();
-
pFrame->GetViewShell()->libreOfficeKitViewCallback(callbackType, text);
-};
-
vcl::unohelper::TextDataObject::CopyStringTo(pURLField->GetURL(), xClipboard,
);
-}
-else
-
vcl::unohelper::TextDataObject::CopyStringTo(pURLField->GetURL(), xClipboard);
+
vcl::unohelper::TextDataObject::CopyStringTo(pURLField->GetURL(), xClipboard,
SfxViewShell::Current());
}
}
diff --git a/sw/source/uibase/shells/textsh1.cxx
b/sw/source/uibase/shells/textsh1.cxx
index 7ac52d334ce1..1344ecacf894 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -1346,13 +1346,7 @@ void SwTextShell::Execute(SfxRequest )
OUString hyperlinkLocation = rINetFormat.GetValue();
::uno::Reference< datatransfer::clipboard::XClipboard >
xClipboard = GetView().GetEditWin().GetClipboard();
-if (comphelper::LibreOfficeKit::isActive())
-
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - include/svx sw/sdi sw/source
include/svx/svxids.hrc|8 ++--
sw/sdi/swriter.sdi|2 +-
sw/source/uibase/wrtsh/wrtsh1.cxx | 13 +
3 files changed, 20 insertions(+), 3 deletions(-)
New commits:
commit a7e6864fe97121a0a172063baff992fd7178b3e7
Author: gokaysatir
AuthorDate: Thu Sep 10 15:23:26 2020 +0300
Commit: Gökay ŞATIR
CommitDate: Thu Oct 29 13:26:02 2020 +0100
leaflet: User may continue writing a comment after it loses focus/core part.
This path enables Online users to continue writing their comment after they
click somewhere else in the document.
Online side will remember original position of comment and it will send the
cursor position when needed.
When there is no cursor position, default behaviour will work.
Change-Id: Ided951481af6e0ec6c930e125bec7fdf687614d9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102377
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Henry Castro
Reviewed-by: Andras Timar
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104995
Reviewed-by: Gökay ŞATIR
diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc
index 7ab0eb4bab45..ba043ae4752c 100644
--- a/include/svx/svxids.hrc
+++ b/include/svx/svxids.hrc
@@ -200,7 +200,6 @@ class SfxStringItem;
#define SID_ATTR_POSTIT_DATE
TypedWhichId( SID_SVX_START + 45 )
#define SID_ATTR_POSTIT_TEXT
TypedWhichId( SID_SVX_START + 46 )
#define SID_ATTR_POSTIT_ID
TypedWhichId( SID_SVX_START + 47 )
-// free
// CAUTION! Range <48 .. 49> used by EditEngine (!)
@@ -241,7 +240,7 @@ class SfxStringItem;
#define SID_ATTR_TRANSFORM_ROT_Y
TypedWhichId( SID_SVX_START + 94 )
#define SID_ATTR_TRANSFORM_ANGLE
TypedWhichId( SID_SVX_START + 95 )
#define SID_ATTR_TRANSFORM_DELTA_ANGLE
TypedWhichId( SID_SVX_START + 96 )
-// CAUTION! Range <96..100> used by SFX2 (!)
+// CAUTION! Range <96..100> used by SFX2 (!) // 96 is used above?
#define SID_SIZE_ALL( SID_SVX_START + 101 )
#define SID_DRAW_LINE ( SID_SVX_START + 102 )
#define SID_DRAW_XLINE ( SID_SVX_START + 103 )
@@ -422,6 +421,11 @@ class SfxStringItem;
//#define SID_SIDEBAR ( SID_SVX_START + 336
) -> sfxsids.hrc
+#define SID_ATTR_POSTIT_X
TypedWhichId( SID_SVX_START + 337 )
+#define SID_ATTR_POSTIT_Y
TypedWhichId( SID_SVX_START + 338 )
+
+// free?
+
#define SID_SB_CONNECTIONPOOLING( SID_SVX_START + 348 )
#define SID_SB_DBREGISTEROPTIONS( SID_SVX_START + 349 )
#define SID_BMPMASK ( SID_SVX_START + 350 )
diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi
index fc7b2903512b..ea8a885d1f16 100644
--- a/sw/sdi/swriter.sdi
+++ b/sw/sdi/swriter.sdi
@@ -2503,7 +2503,7 @@ SfxVoidItem IndexMarkToIndex FN_IDX_MARK_TO_IDX
]
SfxVoidItem InsertAnnotation FN_POSTIT
-(SvxPostItTextItem Text SID_ATTR_POSTIT_TEXT,SvxPostItAuthorItem Author
SID_ATTR_POSTIT_AUTHOR,SvxPostItDateItem Date SID_ATTR_POSTIT_DATE)
+(SvxPostItTextItem Text SID_ATTR_POSTIT_TEXT,SvxPostItAuthorItem Author
SID_ATTR_POSTIT_AUTHOR,SvxPostItDateItem Date
SID_ATTR_POSTIT_DATE,SvxPostItTextItem pointX SID_ATTR_POSTIT_X,
SvxPostItTextItem pointY SID_ATTR_POSTIT_Y)
[
AutoUpdate = FALSE,
FastCall = FALSE,
diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx
b/sw/source/uibase/wrtsh/wrtsh1.cxx
index a3b61a8a3d20..677dafaa30d1 100644
--- a/sw/source/uibase/wrtsh/wrtsh1.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh1.cxx
@@ -1882,6 +1882,19 @@ void SwWrtShell::InsertPostIt(SwFieldMgr& rFieldMgr,
SfxRequest& rReq)
sText = GetView().GetPostItMgr()->GetAnswerText();
GetView().GetPostItMgr()->RegisterAnswerText(OUString());
}
+else
+{
+const SvxPostItTextItem* pXItem =
rReq.GetArg(SID_ATTR_POSTIT_X);
+const SvxPostItTextItem* pYItem =
rReq.GetArg(SID_ATTR_POSTIT_Y);
+// We allow Online users to begin a comment, click somewhere else
and save comment. When comment is saved, its initial position is sent.
+if (pXItem && pYItem)
+{
+sal_Int32 pointX = (*pXItem).GetValue().toInt32();
+sal_Int32 pointY = (*pYItem).GetValue().toInt32();
+Point point(pointX, pointY);
+SwCursorShell::SetCursor(point);
+}
+}
if ( HasSelection() && !IsTableMode() )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - sc/sdi sc/source
sc/sdi/scalc.sdi |2 +-
sc/source/ui/inc/viewfunc.hxx |2 +-
sc/source/ui/view/tabvwshf.cxx | 20 +++-
sc/source/ui/view/viewfun2.cxx |8 +++-
4 files changed, 28 insertions(+), 4 deletions(-)
New commits:
commit fc56c313d19c74ed737a93fbed8eaf3d6c962e5c
Author: gokaysatir
AuthorDate: Wed Sep 30 15:48:44 2020 +0300
Commit: Andras Timar
CommitDate: Mon Oct 26 09:57:30 2020 +0100
Online: Hide right clicked sheet.
On core side, if user clicks on a tab with right mouse button, clicked tab
is selected.
So, for core side, if this feature will be desired, some more modification
will be needed.
Change-Id: Ic4755b27b8ba98d3a6aa086b2e0a3566d095ba16
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103685
Reviewed-by: Szymon Kłos
Tested-by: Jenkins CollaboraOffice
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104077
Reviewed-by: Andras Timar
diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi
index 87ef5950d333..23b9c72fbe0f 100644
--- a/sc/sdi/scalc.sdi
+++ b/sc/sdi/scalc.sdi
@@ -2576,7 +2576,7 @@ SfxVoidItem GoUpToStartOfDataSel SID_CURSORBLKUP_SEL
SfxVoidItem Hide FID_TABLE_HIDE
-(SfxStringItem aTableName FID_TABLE_HIDE)
+(SfxInt16Item nTabNumber FID_TABLE_HIDE)
[
AutoUpdate = FALSE,
FastCall = FALSE,
diff --git a/sc/source/ui/inc/viewfunc.hxx b/sc/source/ui/inc/viewfunc.hxx
index 85857d5065d7..fb64ff180989 100644
--- a/sc/source/ui/inc/viewfunc.hxx
+++ b/sc/source/ui/inc/viewfunc.hxx
@@ -273,7 +273,7 @@ public:
const OUString& rSource );
voidShowTable( const std::vector& rNames );
-voidHideTable( const ScMarkData& rMark );
+voidHideTable( const ScMarkData& rMark, SCTAB nTabToSelect =
-1);
voidMakeScenario(const OUString& rName, const OUString&
rComment,
const Color& rColor, ScScenarioFlags nFlags);
diff --git a/sc/source/ui/view/tabvwshf.cxx b/sc/source/ui/view/tabvwshf.cxx
index e0fbd782619b..0a297c717741 100644
--- a/sc/source/ui/view/tabvwshf.cxx
+++ b/sc/source/ui/view/tabvwshf.cxx
@@ -109,7 +109,25 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
if ( pDoc->IsDocEditable() )
{
ScMarkData& rMark = rViewData.GetMarkData();
-HideTable( rMark );
+SCTAB nActiveTab = -1;
+// For the cases when user right clicks on a non-active
tab and hides it. This case is possible for Online.
+if (pReqArgs)
+{
+const SfxPoolItem *pItem;
+if( pReqArgs->HasItem( FID_TABLE_HIDE, ) )
+{
+SCTAB nTabNumber = static_cast(pItem)->GetValue();
+// Does selected sheets (tabs) list include the
sheet to be hidden?
+std::set::iterator it =
rMark.GetSelectedTabs().find(nTabNumber);
+if (it == rMark.GetSelectedTabs().end())
+{
+// No it doesn't, so we won't shift the
selected tab. Let's remember its position.
+nActiveTab = GetViewData().GetTabNo();
+}
+rMark.SelectOneTable(nTabNumber);
+}
+}
+HideTable( rMark, nActiveTab );
}
}
break;
diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index 1b948b916746..949abf8dbd98 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -3035,7 +3035,7 @@ void ScViewFunc::ShowTable( const std::vector&
rNames )
}
}
-void ScViewFunc::HideTable( const ScMarkData& rMark )
+void ScViewFunc::HideTable( const ScMarkData& rMark, SCTAB nTabToSelect )
{
ScDocShell* pDocSh = GetViewData().GetDocShell();
ScDocument& rDoc = pDocSh->GetDocument();
@@ -3072,6 +3072,12 @@ void ScViewFunc::HideTable( const ScMarkData& rMark )
undoTabs.push_back(nTab);
}
}
+
+if (nTabToSelect != -1)
+{
+SetTabNo(nTabToSelect);
+}
+
if (bUndo)
{
pDocSh->GetUndoManager()->AddUndoAction(
o3tl::make_unique( pDocSh, undoTabs, false ) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - include/svx sw/sdi sw/source
include/svx/svxids.hrc|8 ++--
sw/sdi/swriter.sdi|2 +-
sw/source/uibase/wrtsh/wrtsh1.cxx | 13 +
3 files changed, 20 insertions(+), 3 deletions(-)
New commits:
commit 037b3c3cdb069600d5b97cf221682c144cf5b533
Author: gokaysatir
AuthorDate: Thu Sep 10 15:23:26 2020 +0300
Commit: Andras Timar
CommitDate: Tue Oct 13 14:56:44 2020 +0200
leaflet: User may continue writing a comment after it loses focus/core part.
This path enables Online users to continue writing their comment after they
click somewhere else in the document.
Online side will remember original position of comment and it will send the
cursor position when needed.
When there is no cursor position, default behaviour will work.
Change-Id: Ided951481af6e0ec6c930e125bec7fdf687614d9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102377
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Henry Castro
Reviewed-by: Andras Timar
diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc
index 7ca9859f544f..6b15d0087926 100644
--- a/include/svx/svxids.hrc
+++ b/include/svx/svxids.hrc
@@ -199,7 +199,6 @@ class SvxSetItem;
#define SID_ATTR_POSTIT_DATE
TypedWhichId( SID_SVX_START + 45 )
#define SID_ATTR_POSTIT_TEXT
TypedWhichId( SID_SVX_START + 46 )
#define SID_ATTR_POSTIT_ID
TypedWhichId( SID_SVX_START + 47 )
-// free
// CAUTION! Range <48 .. 49> used by EditEngine (!)
@@ -243,7 +242,7 @@ class SvxSetItem;
#define SID_ATTR_TRANSFORM_ROT_Y
TypedWhichId( SID_SVX_START + 94 )
#define SID_ATTR_TRANSFORM_ANGLE
TypedWhichId( SID_SVX_START + 95 )
#define SID_ATTR_TRANSFORM_DELTA_ANGLE
TypedWhichId( SID_SVX_START + 96 )
-// CAUTION! Range <96..100> used by SFX2 (!)
+// CAUTION! Range <96..100> used by SFX2 (!) // 96 is used above?
#define SID_SIZE_ALL( SID_SVX_START + 101 )
#define SID_DRAW_LINE ( SID_SVX_START + 102 )
#define SID_DRAW_XLINE ( SID_SVX_START + 103 )
@@ -425,6 +424,11 @@ class SvxSetItem;
//#define SID_SIDEBAR ( SID_SVX_START + 336
) -> sfxsids.hrc
+#define SID_ATTR_POSTIT_X
TypedWhichId( SID_SVX_START + 337 )
+#define SID_ATTR_POSTIT_Y
TypedWhichId( SID_SVX_START + 338 )
+
+// free?
+
#define SID_SB_CONNECTIONPOOLING( SID_SVX_START + 348 )
#define SID_SB_DBREGISTEROPTIONS( SID_SVX_START + 349 )
#define SID_BMPMASK ( SID_SVX_START + 350 )
diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi
index 6a394660c04f..199dc6dba55f 100644
--- a/sw/sdi/swriter.sdi
+++ b/sw/sdi/swriter.sdi
@@ -2485,7 +2485,7 @@ SfxVoidItem IndexMarkToIndex FN_IDX_MARK_TO_IDX
]
SfxVoidItem InsertAnnotation FN_POSTIT
-(SvxPostItTextItem Text SID_ATTR_POSTIT_TEXT,SvxPostItAuthorItem Author
SID_ATTR_POSTIT_AUTHOR,SvxPostItDateItem Date SID_ATTR_POSTIT_DATE)
+(SvxPostItTextItem Text SID_ATTR_POSTIT_TEXT,SvxPostItAuthorItem Author
SID_ATTR_POSTIT_AUTHOR,SvxPostItDateItem Date
SID_ATTR_POSTIT_DATE,SvxPostItTextItem pointX SID_ATTR_POSTIT_X,
SvxPostItTextItem pointY SID_ATTR_POSTIT_Y)
[
AutoUpdate = FALSE,
FastCall = FALSE,
diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx
b/sw/source/uibase/wrtsh/wrtsh1.cxx
index 9eb00d361b9a..045ea5ceed7b 100644
--- a/sw/source/uibase/wrtsh/wrtsh1.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh1.cxx
@@ -1927,6 +1927,19 @@ void SwWrtShell::InsertPostIt(SwFieldMgr& rFieldMgr,
const SfxRequest& rReq)
sText = GetView().GetPostItMgr()->GetAnswerText();
GetView().GetPostItMgr()->RegisterAnswerText(OUString());
}
+else
+{
+const SvxPostItTextItem* pXItem =
rReq.GetArg(SID_ATTR_POSTIT_X);
+const SvxPostItTextItem* pYItem =
rReq.GetArg(SID_ATTR_POSTIT_Y);
+// We allow Online users to begin a comment, click somewhere else
and save comment. When comment is saved, its initial position is sent.
+if (pXItem && pYItem)
+{
+sal_Int32 pointX = (*pXItem).GetValue().toInt32();
+sal_Int32 pointY = (*pYItem).GetValue().toInt32();
+Point point(pointX, pointY);
+SwCursorShell::SetCursor(point);
+}
+}
if ( HasSelection() && !IsTableMode() )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/sdi sc/source
sc/sdi/scalc.sdi |2 +-
sc/source/ui/inc/viewfunc.hxx |2 +-
sc/source/ui/view/tabvwshf.cxx | 20 +++-
sc/source/ui/view/viewfun2.cxx |6 +-
4 files changed, 26 insertions(+), 4 deletions(-)
New commits:
commit 53bd76e8f193baf667077eb52d06e3c244964819
Author: gokaysatir
AuthorDate: Wed Sep 30 15:48:44 2020 +0300
Commit: Szymon Kłos
CommitDate: Mon Oct 12 09:12:49 2020 +0200
Online: Hide right clicked sheet.
On core side, if user clicks on a tab with right mouse button, clicked tab
is selected.
So, for core side, if this feature will be desired, some more modification
will be needed.
Change-Id: Ic4755b27b8ba98d3a6aa086b2e0a3566d095ba16
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103685
Reviewed-by: Szymon Kłos
Tested-by: Jenkins CollaboraOffice
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104078
Tested-by: Jenkins
diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi
index 93a6b67be6e5..86ae80497a77 100644
--- a/sc/sdi/scalc.sdi
+++ b/sc/sdi/scalc.sdi
@@ -2593,7 +2593,7 @@ SfxVoidItem GoUpToStartOfDataSel SID_CURSORBLKUP_SEL
SfxVoidItem Hide FID_TABLE_HIDE
-(SfxStringItem aTableName FID_TABLE_HIDE)
+(SfxInt16Item nTabNumber FID_TABLE_HIDE)
[
AutoUpdate = FALSE,
FastCall = FALSE,
diff --git a/sc/source/ui/inc/viewfunc.hxx b/sc/source/ui/inc/viewfunc.hxx
index 7780e74bc790..5a7ad681c628 100644
--- a/sc/source/ui/inc/viewfunc.hxx
+++ b/sc/source/ui/inc/viewfunc.hxx
@@ -285,7 +285,7 @@ public:
const OUString& rSource );
voidShowTable( const std::vector& rNames );
-voidHideTable( const ScMarkData& rMark );
+voidHideTable( const ScMarkData& rMark, SCTAB nTabToSelect =
-1);
voidMakeScenario(const OUString& rName, const OUString&
rComment,
const Color& rColor, ScScenarioFlags nFlags);
diff --git a/sc/source/ui/view/tabvwshf.cxx b/sc/source/ui/view/tabvwshf.cxx
index 95e566267ae1..98ce2db58fa7 100644
--- a/sc/source/ui/view/tabvwshf.cxx
+++ b/sc/source/ui/view/tabvwshf.cxx
@@ -107,7 +107,25 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
if ( rDoc.IsDocEditable() )
{
ScMarkData& rMark = rViewData.GetMarkData();
-HideTable( rMark );
+SCTAB nActiveTab = -1;
+// For the cases when user right clicks on a non-active
tab and hides it. This case is possible for Online.
+if (pReqArgs)
+{
+const SfxPoolItem *pItem;
+if( pReqArgs->HasItem( FID_TABLE_HIDE, ) )
+{
+SCTAB nTabNumber = static_cast(pItem)->GetValue();
+// Does selected sheets (tabs) list include the
sheet to be hidden?
+std::set::iterator it =
rMark.GetSelectedTabs().find(nTabNumber);
+if (it == rMark.GetSelectedTabs().end())
+{
+// No it doesn't, so we won't shift the
selected tab. Let's remember its position.
+nActiveTab = GetViewData().GetTabNo();
+}
+rMark.SelectOneTable(nTabNumber);
+}
+}
+HideTable( rMark, nActiveTab );
}
}
break;
diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index 90ddff57df08..572b62cf4036 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -3146,7 +3146,7 @@ void ScViewFunc::ShowTable( const std::vector&
rNames )
}
}
-void ScViewFunc::HideTable( const ScMarkData& rMark )
+void ScViewFunc::HideTable( const ScMarkData& rMark, SCTAB nTabToSelect )
{
ScDocShell* pDocSh = GetViewData().GetDocShell();
ScDocument& rDoc = pDocSh->GetDocument();
@@ -3181,6 +3181,10 @@ void ScViewFunc::HideTable( const ScMarkData& rMark )
undoTabs.push_back(nTab);
}
}
+
+if (nTabToSelect != -1)
+SetTabNo(nTabToSelect);
+
if (bUndo)
{
pDocSh->GetUndoManager()->AddUndoAction(
std::make_unique( pDocSh, undoTabs, false ) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - include/LibreOfficeKit include/vcl sc/source sd/source sw/source vcl/source
include/LibreOfficeKit/LibreOfficeKitEnums.h |2 +-
include/vcl/unohelp2.hxx |3 ++-
sc/source/ui/view/editsh.cxx |8 +---
sd/source/ui/view/drviews2.cxx | 12 +---
sw/source/uibase/shells/textsh1.cxx |8 +---
vcl/source/app/unohelp2.cxx |6 +++---
6 files changed, 9 insertions(+), 30 deletions(-)
New commits:
commit ca84daab26d4fec1b43be81478ef629f8c1be7cf
Author: gokaysatir
AuthorDate: Wed Oct 7 12:57:13 2020 +0300
Commit: Jan Holesovsky
CommitDate: Thu Oct 8 13:56:55 2020 +0200
Online: "Copy hyperlink location" feature improvement.
Lambda functions are replaced with class pointers.
Change-Id: I48628d3105533aad2463bd8ade1f65cf5b154b0f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104054
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Jan Holesovsky
diff --git a/include/LibreOfficeKit/LibreOfficeKitEnums.h
b/include/LibreOfficeKit/LibreOfficeKitEnums.h
index 79cc937e349c..94e4b95c0631 100644
--- a/include/LibreOfficeKit/LibreOfficeKitEnums.h
+++ b/include/LibreOfficeKit/LibreOfficeKitEnums.h
@@ -646,7 +646,7 @@ typedef enum
*
* Payload is optional. When payload is empty, Online gets string from
selected text.
* Payload format is JSON.
- * Example: { "mimeType": "string", "content": "some content" }
+ * Example: { "mimeType": "text/plain", "content": "some content" }
*/
LOK_CALLBACK_CLIPBOARD_CHANGED = 38,
diff --git a/include/vcl/unohelp2.hxx b/include/vcl/unohelp2.hxx
index 219244964eee..4e0567a64301 100644
--- a/include/vcl/unohelp2.hxx
+++ b/include/vcl/unohelp2.hxx
@@ -28,6 +28,7 @@
#include
#include
#include
+#include
namespace com { namespace sun { namespace star { namespace datatransfer {
namespace clipboard {
class XClipboard;
@@ -60,7 +61,7 @@ namespace vcl { namespace unohelper {
static voidCopyStringTo(
const OUString& rContent,
const css::uno::Reference<
css::datatransfer::clipboard::XClipboard >& rxClipboard,
-std::function *callback = nullptr
+const vcl::ILibreOfficeKitNotifier* pNotifier = nullptr
);
};
diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx
index 03b282f942fb..359a4e0994a7 100644
--- a/sc/source/ui/view/editsh.cxx
+++ b/sc/source/ui/view/editsh.cxx
@@ -642,13 +642,7 @@ void ScEditShell::Execute( SfxRequest& rReq )
uno::Reference
xClipboard
= pEditView->GetWindow()->GetClipboard();
-if (comphelper::LibreOfficeKit::isActive())
-{
-std::function callback = [&]
(int callbackType, const char* text) {
pViewData->GetViewShell()->libreOfficeKitViewCallback(callbackType, text); } ;
-
vcl::unohelper::TextDataObject::CopyStringTo(pURLField->GetURL(), xClipboard,
);
-}
-else
-
vcl::unohelper::TextDataObject::CopyStringTo(pURLField->GetURL(), xClipboard,
nullptr);
+
vcl::unohelper::TextDataObject::CopyStringTo(pURLField->GetURL(), xClipboard,
SfxViewShell::Current());
}
}
break;
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 7bcf623b40df..ad6802318591 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -2252,17 +2252,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
uno::Reference
xClipboard
= pOutView->GetWindow()->GetClipboard();
-if (comphelper::LibreOfficeKit::isActive())
-{
-std::function callback = [&]
(int callbackType, const char* text)
-{
-SfxViewFrame* pFrame = GetViewFrame();
-
pFrame->GetViewShell()->libreOfficeKitViewCallback(callbackType, text);
-};
-
vcl::unohelper::TextDataObject::CopyStringTo(pURLField->GetURL(), xClipboard,
);
-}
-else
-
vcl::unohelper::TextDataObject::CopyStringTo(pURLField->GetURL(), xClipboard);
+
vcl::unohelper::TextDataObject::CopyStringTo(pURLField->GetURL(), xClipboard,
SfxViewShell::Current());
}
}
diff --git a/sw/source/uibase/shells/textsh1.cxx
b/sw/source/uibase/shells/textsh1.cxx
index a8389f3508ab..298c6ed4a2c9 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -1362,13 +1362,7 @@ void SwTextShell::Execute(SfxRequest )
OUString hyperlinkLocation = rINetFormat.GetValue();
::uno::Reference< datatransfer::clipboard::XClipboard >
xClipboard =
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - sc/sdi sc/source
sc/sdi/scalc.sdi |2 +-
sc/source/ui/inc/viewfunc.hxx |2 +-
sc/source/ui/view/tabvwshf.cxx | 20 +++-
sc/source/ui/view/viewfun2.cxx |8 +++-
4 files changed, 28 insertions(+), 4 deletions(-)
New commits:
commit 273ec24d802a896d13043c6235afcb6084341cf6
Author: gokaysatir
AuthorDate: Wed Sep 30 15:48:44 2020 +0300
Commit: Szymon Kłos
CommitDate: Wed Oct 7 10:20:05 2020 +0200
Online: Hide right clicked sheet.
On core side, if user clicks on a tab with right mouse button, clicked tab
is selected.
So, for core side, if this feature will be desired, some more modification
will be needed.
Change-Id: Ic4755b27b8ba98d3a6aa086b2e0a3566d095ba16
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103685
Reviewed-by: Szymon Kłos
Tested-by: Jenkins CollaboraOffice
diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi
index 93a6b67be6e5..86ae80497a77 100644
--- a/sc/sdi/scalc.sdi
+++ b/sc/sdi/scalc.sdi
@@ -2593,7 +2593,7 @@ SfxVoidItem GoUpToStartOfDataSel SID_CURSORBLKUP_SEL
SfxVoidItem Hide FID_TABLE_HIDE
-(SfxStringItem aTableName FID_TABLE_HIDE)
+(SfxInt16Item nTabNumber FID_TABLE_HIDE)
[
AutoUpdate = FALSE,
FastCall = FALSE,
diff --git a/sc/source/ui/inc/viewfunc.hxx b/sc/source/ui/inc/viewfunc.hxx
index fd1e05fa1a67..a22575e48971 100644
--- a/sc/source/ui/inc/viewfunc.hxx
+++ b/sc/source/ui/inc/viewfunc.hxx
@@ -283,7 +283,7 @@ public:
const OUString& rSource );
voidShowTable( const std::vector& rNames );
-voidHideTable( const ScMarkData& rMark );
+voidHideTable( const ScMarkData& rMark, SCTAB nTabToSelect =
-1);
voidMakeScenario(const OUString& rName, const OUString&
rComment,
const Color& rColor, ScScenarioFlags nFlags);
diff --git a/sc/source/ui/view/tabvwshf.cxx b/sc/source/ui/view/tabvwshf.cxx
index 00f85a151662..7fcf4f5b7bf6 100644
--- a/sc/source/ui/view/tabvwshf.cxx
+++ b/sc/source/ui/view/tabvwshf.cxx
@@ -107,7 +107,25 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
if ( pDoc->IsDocEditable() )
{
ScMarkData& rMark = rViewData.GetMarkData();
-HideTable( rMark );
+SCTAB nActiveTab = -1;
+// For the cases when user right clicks on a non-active
tab and hides it. This case is possible for Online.
+if (pReqArgs)
+{
+const SfxPoolItem *pItem;
+if( pReqArgs->HasItem( FID_TABLE_HIDE, ) )
+{
+SCTAB nTabNumber = static_cast(pItem)->GetValue();
+// Does selected sheets (tabs) list include the
sheet to be hidden?
+std::set::iterator it =
rMark.GetSelectedTabs().find(nTabNumber);
+if (it == rMark.GetSelectedTabs().end())
+{
+// No it doesn't, so we won't shift the
selected tab. Let's remember its position.
+nActiveTab = GetViewData().GetTabNo();
+}
+rMark.SelectOneTable(nTabNumber);
+}
+}
+HideTable( rMark, nActiveTab );
}
}
break;
diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index 6085d74d7bb9..d675e3dca9a7 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -3137,7 +3137,7 @@ void ScViewFunc::ShowTable( const std::vector&
rNames )
}
}
-void ScViewFunc::HideTable( const ScMarkData& rMark )
+void ScViewFunc::HideTable( const ScMarkData& rMark, SCTAB nTabToSelect )
{
ScDocShell* pDocSh = GetViewData().GetDocShell();
ScDocument& rDoc = pDocSh->GetDocument();
@@ -3171,6 +3171,12 @@ void ScViewFunc::HideTable( const ScMarkData& rMark )
undoTabs.push_back(nTab);
}
}
+
+if (nTabToSelect != -1)
+{
+SetTabNo(nTabToSelect);
+}
+
if (bUndo)
{
pDocSh->GetUndoManager()->AddUndoAction(
std::make_unique( pDocSh, undoTabs, false ) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/LibreOfficeKit include/vcl sc/source sd/source sw/source vcl/source
include/LibreOfficeKit/LibreOfficeKitEnums.h |7 +++
include/vcl/unohelp2.hxx |6 +-
sc/source/ui/view/editsh.cxx |9 -
sd/source/ui/view/drviews2.cxx | 13 -
sw/source/uibase/shells/textsh1.cxx | 13 ++---
vcl/source/app/unohelp2.cxx | 13 -
6 files changed, 50 insertions(+), 11 deletions(-)
New commits:
commit 19a0fbf456129e011cb9ab9ab6ab730cba274bbd
Author: gokaysatir
AuthorDate: Tue Sep 22 13:00:44 2020 +0300
Commit: Gökay ŞATIR
CommitDate: Tue Oct 6 18:47:39 2020 +0200
Online: Copy hyperlink location. / Core side.
Payload format is added to LOK_CALLBACK_CLIPBOARD_CHANGED.
Clipboard changed event is not fired when "copy hyperlink location" command
is issued.
So i added a call to LOK_CALLBACK_CLIPBOARD_CHANGED inside
TextDataObject::CopyStringTo function.
Change-Id: I8157572288da88b5522662e13abe151ef8548b34
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103164
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Jan Holesovsky
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103872
Tested-by: Jenkins
diff --git a/include/LibreOfficeKit/LibreOfficeKitEnums.h
b/include/LibreOfficeKit/LibreOfficeKitEnums.h
index 750e64f529f9..9a0eb01ca840 100644
--- a/include/LibreOfficeKit/LibreOfficeKitEnums.h
+++ b/include/LibreOfficeKit/LibreOfficeKitEnums.h
@@ -644,10 +644,9 @@ typedef enum
* Notification that the clipboard contents have changed.
* Typically fired in response to copying to clipboard.
*
- * The payload currently is empty and it's up to the
- * client to get the contents, if necessary. However,
- * in the future the contents might be included for
- * convenience.
+ * Payload is optional. When payload is empty, Online gets string from
selected text.
+ * Payload format is JSON.
+ * Example: { "mimeType": "string", "content": "some content" }
*/
LOK_CALLBACK_CLIPBOARD_CHANGED = 38,
diff --git a/include/vcl/unohelp2.hxx b/include/vcl/unohelp2.hxx
index a95474417cf6..91c4ce6ce0e2 100644
--- a/include/vcl/unohelp2.hxx
+++ b/include/vcl/unohelp2.hxx
@@ -25,6 +25,9 @@
#include
#include
#include
+#include
+#include
+#include
namespace com::sun::star::datatransfer::clipboard {
class XClipboard;
@@ -56,7 +59,8 @@ namespace vcl::unohelper {
/// copies a given string to a given clipboard
static voidCopyStringTo(
const OUString& rContent,
-const css::uno::Reference<
css::datatransfer::clipboard::XClipboard >& rxClipboard
+const css::uno::Reference<
css::datatransfer::clipboard::XClipboard >& rxClipboard,
+std::function *callback = nullptr
);
};
diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx
index 9e8768fe27d6..83e4adaf815f 100644
--- a/sc/source/ui/view/editsh.cxx
+++ b/sc/source/ui/view/editsh.cxx
@@ -641,7 +641,14 @@ void ScEditShell::Execute( SfxRequest& rReq )
{
uno::Reference
xClipboard
= pEditView->GetWindow()->GetClipboard();
-
vcl::unohelper::TextDataObject::CopyStringTo(pURLField->GetURL(), xClipboard);
+
+if (comphelper::LibreOfficeKit::isActive())
+{
+std::function callback = [&]
(int callbackType, const char* text) {
rViewData.GetViewShell()->libreOfficeKitViewCallback(callbackType, text); } ;
+
vcl::unohelper::TextDataObject::CopyStringTo(pURLField->GetURL(), xClipboard,
);
+}
+else
+
vcl::unohelper::TextDataObject::CopyStringTo(pURLField->GetURL(), xClipboard,
nullptr);
}
}
break;
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 8f511aab3922..f32acb5d3182 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -2250,7 +2250,18 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
{
uno::Reference
xClipboard
= pOutView->GetWindow()->GetClipboard();
-
vcl::unohelper::TextDataObject::CopyStringTo(pURLField->GetURL(), xClipboard);
+
+if (comphelper::LibreOfficeKit::isActive())
+{
+std::function callback = [&]
(int callbackType, const char* text)
+{
+SfxViewFrame* pFrame = GetViewFrame();
+
pFrame->GetViewShell()->libreOfficeKitViewCallback(callbackType, text);
+};
+
vcl::unohelper::TextDataObject::CopyStringTo(pURLField->GetURL(), xClipboard,
);
+}
+else
+
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - editeng/Library_editeng.mk editeng/source include/editeng include/LibreOfficeKit include/svx include/vcl officecfg/registry sc/sdi sc
editeng/Library_editeng.mk |1
editeng/source/editeng/editview.cxx | 34
+++
editeng/source/misc/urlfieldhelper.cxx | 47
++
editeng/source/outliner/outlvw.cxx | 10 ++
include/LibreOfficeKit/LibreOfficeKitEnums.h |7 -
include/editeng/editview.hxx |4
include/editeng/outliner.hxx |4
include/editeng/urlfieldhelper.hxx | 28
+
include/svx/svxids.hrc |2
include/vcl/unohelp2.hxx |6 +
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |5 +
officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |5 -
sc/sdi/drtxtob.sdi |1
sc/sdi/editsh.sdi|2
sc/source/ui/drawfunc/drtxtob.cxx| 19
+++-
sc/source/ui/view/editsh.cxx | 33
+--
sc/uiconfig/scalc/popupmenu/celledit.xml |1
sc/uiconfig/scalc/popupmenu/drawtext.xml |1
sd/sdi/_drvwsh.sdi |5 +
sd/source/ui/view/drviews2.cxx | 31
++
sd/source/ui/view/drviews7.cxx |3
sd/uiconfig/sdraw/popupmenu/drawtext.xml |1
sd/uiconfig/simpress/popupmenu/drawtext.xml |1
svx/sdi/svx.sdi | 17 +++
sw/sdi/_textsh.sdi |2
sw/sdi/drwtxtsh.sdi |8 +
sw/sdi/swriter.sdi | 18 ---
sw/source/uibase/shells/drwtxtex.cxx | 20
sw/source/uibase/shells/textsh1.cxx | 30
+-
sw/uiconfig/sglobal/popupmenu/drawtext.xml |2
sw/uiconfig/swform/popupmenu/drawtext.xml|2
sw/uiconfig/swreport/popupmenu/drawtext.xml |2
sw/uiconfig/swriter/popupmenu/drawtext.xml |2
sw/uiconfig/swxform/popupmenu/drawtext.xml |2
vcl/source/app/unohelp2.cxx | 13 ++
35 files changed, 325 insertions(+), 44 deletions(-)
New commits:
commit ecbfd8963ce5b8459c00da589216ecf78d99a7f8
Author: gokaysatir
AuthorDate: Tue Sep 22 13:00:44 2020 +0300
Commit: Andras Timar
CommitDate: Tue Oct 6 08:28:20 2020 +0200
Online: Copy hyperlink location. / Core side.
Payload format is added to LOK_CALLBACK_CLIPBOARD_CHANGED.
Clipboard changed event is not fired when "copy hyperlink location" command
is issued.
So i added a call to LOK_CALLBACK_CLIPBOARD_CHANGED inside
TextDataObject::CopyStringTo function.
Change-Id: I8157572288da88b5522662e13abe151ef8548b34
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103164
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Jan Holesovsky
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103729
Reviewed-by: Andras Timar
diff --git a/editeng/Library_editeng.mk b/editeng/Library_editeng.mk
index 87e23b8628da..4d72c918523c 100644
--- a/editeng/Library_editeng.mk
+++ b/editeng/Library_editeng.mk
@@ -97,6 +97,7 @@ $(eval $(call gb_Library_add_exception_objects,editeng,\
editeng/source/misc/swafopt \
editeng/source/misc/txtrange \
editeng/source/misc/unolingu \
+editeng/source/misc/urlfieldhelper \
editeng/source/outliner/outleeng \
editeng/source/outliner/outlin2 \
editeng/source/outliner/outliner \
diff --git a/editeng/source/editeng/editview.cxx
b/editeng/source/editeng/editview.cxx
index aa39a3ce9716..6a3db26c8838 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -1293,6 +1293,40 @@ const SvxFieldItem* EditView::GetFieldAtSelection() const
return nullptr;
}
+void EditView::SelectFieldAtCursor()
+{
+const SvxFieldItem* pFieldItem = GetFieldAtSelection();
+if (pFieldItem)
+{
+// Make sure the whole field is selected
+ESelection aSel = GetSelection();
+if (aSel.nStartPos == aSel.nEndPos)
+{
+aSel.nEndPos++;
+SetSelection(aSel);
+}
+}
+if (!pFieldItem)
+{
+// Cursor probably behind the field - extend selection to select the
field
+ESelection aSel
[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loleaflet/src
loleaflet/src/control/Parts.js |8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
New commits:
commit d906bc19569dc14df6c693a4af3306ce87dc6b43
Author: gokaysatir
AuthorDate: Mon Sep 28 12:29:37 2020 +0300
Commit: Andras Timar
CommitDate: Wed Sep 30 21:51:02 2020 +0200
Loleaflet Calc: Add language support for "show sheet" buttons.
Change-Id: I2e2fc8095be659b02ba9fb479e7159b9ec0af66e
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/103540
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/103731
diff --git a/loleaflet/src/control/Parts.js b/loleaflet/src/control/Parts.js
index 39a69fbd4..f654dc85f 100644
--- a/loleaflet/src/control/Parts.js
+++ b/loleaflet/src/control/Parts.js
@@ -3,7 +3,7 @@
* Document parts switching and selecting handler
*/
-/* global vex */
+/* global vex $ _ */
L.Map.include({
setPart: function (part, external, calledFromSetPartHandler) {
@@ -369,8 +369,12 @@ L.Map.include({
}
var socket_ = this._socket;
- vex.dialog.confirm({
+ vex.dialog.open({
unsafeMessage: container.outerHTML,
+ buttons: [
+ $.extend({}, vex.dialog.buttons.NO, {
text: _('Cancel') }),
+ $.extend({}, vex.dialog.buttons.YES, {
text: _('OK') })
+ ],
callback: function (value) {
if (value === true) {
var checkboxList =
document.querySelectorAll('input[id^="hidden-part-checkbox"]');
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/po loleaflet/src
loleaflet/po/templates/loleaflet-ui.pot |5 +
loleaflet/src/control/Parts.js |8 ++--
2 files changed, 11 insertions(+), 2 deletions(-)
New commits:
commit a384d96cb49e079624e66acc73c64d46ba3fe9ae
Author: gokaysatir
AuthorDate: Mon Sep 28 12:29:37 2020 +0300
Commit: Andras Timar
CommitDate: Wed Sep 30 18:29:32 2020 +0200
Loleaflet Calc: Add language support for "show sheet" buttons.
Change-Id: I2e2fc8095be659b02ba9fb479e7159b9ec0af66e
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/103540
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
diff --git a/loleaflet/po/templates/loleaflet-ui.pot
b/loleaflet/po/templates/loleaflet-ui.pot
index ee64f70ad..b1ea650de 100644
--- a/loleaflet/po/templates/loleaflet-ui.pot
+++ b/loleaflet/po/templates/loleaflet-ui.pot
@@ -202,6 +202,7 @@ msgstr ""
#: admin/admin.strings.js:51 src/control/Control.AlertDialog.js:25
#: src/control/Signing.js:608
+#: src/control/Parts.js:376
msgid "Close"
msgstr ""
@@ -305,6 +306,10 @@ msgstr ""
msgid " s"
msgstr ""
+#: src/control/Parts.js:377
+msgid "Show Selected Sheets"
+msgstr ""
+
#: src/control/ColorPicker.js:129
msgid "No color"
msgstr ""
diff --git a/loleaflet/src/control/Parts.js b/loleaflet/src/control/Parts.js
index 0e52e7472..b0147882b 100644
--- a/loleaflet/src/control/Parts.js
+++ b/loleaflet/src/control/Parts.js
@@ -3,7 +3,7 @@
* Document parts switching and selecting handler
*/
-/* global vex */
+/* global vex $ _ */
L.Map.include({
setPart: function (part, external, calledFromSetPartHandler) {
@@ -370,8 +370,12 @@ L.Map.include({
}
var socket_ = this._socket;
- vex.dialog.confirm({
+ vex.dialog.open({
unsafeMessage: container.outerHTML,
+ buttons: [
+ $.extend({}, vex.dialog.buttons.NO, {
text: _('Close') }),
+ $.extend({}, vex.dialog.buttons.YES, {
text: _('Show Selected Sheets') })
+ ],
callback: function (value) {
if (value === true) {
var checkboxList =
document.querySelectorAll('input[id^="hidden-part-checkbox"]');
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: kit/ChildSession.cpp loleaflet/src
kit/ChildSession.cpp |9 +
loleaflet/src/layer/tile/TileLayer.js |9 +
2 files changed, 14 insertions(+), 4 deletions(-)
New commits:
commit 805ff2f2a8c1672b9ca0fef2b7364f9e9f38761b
Author: gokaysatir
AuthorDate: Tue Sep 22 14:39:09 2020 +0300
Commit: Jan Holesovsky
CommitDate: Wed Sep 30 15:10:19 2020 +0200
Online: Copy hyperlink location. / Online side.
Unused selection variable has been removed. "clipboardchanged" event is
activated.
LOK_CALLBACK_CLIPBOARD_CHANGED is handled according to existence of payload.
Change-Id: I6e37cb2ca4d4c59e5ba3397cb00dbb7eafa2
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/103165
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Jan Holesovsky
diff --git a/kit/ChildSession.cpp b/kit/ChildSession.cpp
index 54d900da6..314ff12da 100644
--- a/kit/ChildSession.cpp
+++ b/kit/ChildSession.cpp
@@ -1529,7 +1529,7 @@ bool ChildSession::unoCommand(const char* /*buffer*/, int
/*length*/, const Stri
}
else
{
-if (tokens[1] == ".uno:Copy")
+if (tokens[1] == ".uno:Copy" || tokens[1] ==
".uno:CopyHyperlinkLocation")
_copyToClipboard = true;
getLOKitDocument()->postUnoCommand(tokens[1].c_str(), nullptr,
bNotify);
@@ -2599,14 +2599,15 @@ void ChildSession::loKitCallback(const int type, const
std::string& payload)
break;
case LOK_CALLBACK_CLIPBOARD_CHANGED:
{
-std::string selection;
if (_copyToClipboard)
{
_copyToClipboard = false;
-selection = getTextSelectionInternal("");
+if (payload.empty())
+getTextSelectionInternal("");
+else
+sendTextFrame("clipboardchanged: " + payload);
}
-sendTextFrame("clipboardchanged: " + selection);
break;
}
case LOK_CALLBACK_CONTEXT_CHANGED:
diff --git a/loleaflet/src/layer/tile/TileLayer.js
b/loleaflet/src/layer/tile/TileLayer.js
index 6f4445084..41ff45a07 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -643,6 +643,15 @@ L.TileLayer = L.GridLayer.extend({
// hack for ios and android to get selected
text into hyperlink insertion dialog
this._selectedTextContent = textMsg.substr(22);
}
+ else if (textMsg.startsWith('clipboardchanged')) {
+ var jMessage = textMsg.substr(17);
+ jMessage = JSON.parse(jMessage);
+
+ if (jMessage.mimeType === 'text/plain') {
+
this._map._clip.setTextSelectionHTML(jMessage.content);
+ this._map._clip._execCopyCutPaste('copy');
+ }
+ }
else if (textMsg.startsWith('textselectionend:')) {
this._onTextSelectionEndMsg(textMsg);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - include/LibreOfficeKit include/vcl sc/source sd/source sw/source vcl/source
include/LibreOfficeKit/LibreOfficeKitEnums.h |7 +++
include/vcl/unohelp2.hxx |6 +-
sc/source/ui/view/editsh.cxx |9 -
sd/source/ui/view/drviews2.cxx | 13 -
sw/source/uibase/shells/textsh1.cxx | 13 ++---
vcl/source/app/unohelp2.cxx | 13 -
6 files changed, 50 insertions(+), 11 deletions(-)
New commits:
commit 9162014433f1c40b88e1093dfb458436e8ecf007
Author: gokaysatir
AuthorDate: Tue Sep 22 13:00:44 2020 +0300
Commit: Jan Holesovsky
CommitDate: Wed Sep 30 15:08:16 2020 +0200
Online: Copy hyperlink location. / Core side.
Payload format is added to LOK_CALLBACK_CLIPBOARD_CHANGED.
Clipboard changed event is not fired when "copy hyperlink location" command
is issued.
So i added a call to LOK_CALLBACK_CLIPBOARD_CHANGED inside
TextDataObject::CopyStringTo function.
Change-Id: I8157572288da88b5522662e13abe151ef8548b34
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103164
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Jan Holesovsky
diff --git a/include/LibreOfficeKit/LibreOfficeKitEnums.h
b/include/LibreOfficeKit/LibreOfficeKitEnums.h
index cabea69a29be..79cc937e349c 100644
--- a/include/LibreOfficeKit/LibreOfficeKitEnums.h
+++ b/include/LibreOfficeKit/LibreOfficeKitEnums.h
@@ -644,10 +644,9 @@ typedef enum
* Notification that the clipboard contents have changed.
* Typically fired in response to copying to clipboard.
*
- * The payload currently is empty and it's up to the
- * client to get the contents, if necessary. However,
- * in the future the contents might be included for
- * convenience.
+ * Payload is optional. When payload is empty, Online gets string from
selected text.
+ * Payload format is JSON.
+ * Example: { "mimeType": "string", "content": "some content" }
*/
LOK_CALLBACK_CLIPBOARD_CHANGED = 38,
diff --git a/include/vcl/unohelp2.hxx b/include/vcl/unohelp2.hxx
index 27ab0973dd37..219244964eee 100644
--- a/include/vcl/unohelp2.hxx
+++ b/include/vcl/unohelp2.hxx
@@ -25,6 +25,9 @@
#include
#include
#include
+#include
+#include
+#include
namespace com { namespace sun { namespace star { namespace datatransfer {
namespace clipboard {
class XClipboard;
@@ -56,7 +59,8 @@ namespace vcl { namespace unohelper {
/// copies a given string to a given clipboard
static voidCopyStringTo(
const OUString& rContent,
-const css::uno::Reference<
css::datatransfer::clipboard::XClipboard >& rxClipboard
+const css::uno::Reference<
css::datatransfer::clipboard::XClipboard >& rxClipboard,
+std::function *callback = nullptr
);
};
diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx
index 61888c663ef4..03b282f942fb 100644
--- a/sc/source/ui/view/editsh.cxx
+++ b/sc/source/ui/view/editsh.cxx
@@ -641,7 +641,14 @@ void ScEditShell::Execute( SfxRequest& rReq )
{
uno::Reference
xClipboard
= pEditView->GetWindow()->GetClipboard();
-
vcl::unohelper::TextDataObject::CopyStringTo(pURLField->GetURL(), xClipboard);
+
+if (comphelper::LibreOfficeKit::isActive())
+{
+std::function callback = [&]
(int callbackType, const char* text) {
pViewData->GetViewShell()->libreOfficeKitViewCallback(callbackType, text); } ;
+
vcl::unohelper::TextDataObject::CopyStringTo(pURLField->GetURL(), xClipboard,
);
+}
+else
+
vcl::unohelper::TextDataObject::CopyStringTo(pURLField->GetURL(), xClipboard,
nullptr);
}
}
break;
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 269eb8ac065e..7bcf623b40df 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -2251,7 +2251,18 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
{
uno::Reference
xClipboard
= pOutView->GetWindow()->GetClipboard();
-
vcl::unohelper::TextDataObject::CopyStringTo(pURLField->GetURL(), xClipboard);
+
+if (comphelper::LibreOfficeKit::isActive())
+{
+std::function callback = [&]
(int callbackType, const char* text)
+{
+SfxViewFrame* pFrame = GetViewFrame();
+
pFrame->GetViewShell()->libreOfficeKitViewCallback(callbackType, text);
+};
+
vcl::unohelper::TextDataObject::CopyStringTo(pURLField->GetURL(), xClipboard,
);
+}
+else
+
[Libreoffice-commits] online.git: loleaflet/archived-packages loleaflet/npm-shrinkwrap.json.in
loleaflet/archived-packages/@babel/code-frame-7.10.4-bc6e92bc1.tar |binary loleaflet/archived-packages/@babel/core-7.11.6-5a972fd37.tar |binary loleaflet/archived-packages/@babel/generator-7.11.6-0d6b50d4f.tar |binary loleaflet/archived-packages/@babel/helper-function-name-7.10.4-61d692cb3.tar |binary loleaflet/archived-packages/@babel/helper-get-function-arity-7.10.4-124377603.tar |binary loleaflet/archived-packages/@babel/helper-member-expression-to-functions-7.11.0-25b165287.tar |binary loleaflet/archived-packages/@babel/helper-module-imports-7.10.4-9c44091ea.tar |binary loleaflet/archived-packages/@babel/helper-module-transforms-7.11.0-d36115bbc.tar |binary loleaflet/archived-packages/@babel/helper-optimise-call-expression-7.10.4-9f7506298.tar |binary loleaflet/archived-packages/@babel/helper-replace-supers-7.10.4-b0fc597c5.tar |binary loleaflet/archived-packages/@babel/helper-simple-access-7.10.4-d1f332ef6.tar |binary loleaflet/archived-packages/@babel/helper-split-export-declaration-7.11.0-ef855e8ef.tar |binary loleaflet/archived-packages/@babel/helper-validator-identifier-7.10.4-dd4f72fb8.tar |binary loleaflet/archived-packages/@babel/helpers-7.10.4-2f6817fd7.tar |binary loleaflet/archived-packages/@babel/highlight-7.10.4-8baae09d1.tar |binary loleaflet/archived-packages/@babel/parser-7.11.5-5fdac3f2a.tar |binary loleaflet/archived-packages/@babel/template-7.10.4-6428c3dbb.tar |binary loleaflet/archived-packages/@babel/traverse-7.11.5-12388f5ed.tar |binary loleaflet/archived-packages/@babel/types-7.11.5-6ef33b433.tar |binary loleaflet/archived-packages/@nodelib/fs.scandir-2.1.3-7869b0610.tar |binary loleaflet/archived-packages/@nodelib/fs.stat-2.0.3-6d0045aee.tar |binary loleaflet/archived-packages/@nodelib/fs.walk-1.2.4-d55f57398.tar |binary loleaflet/archived-packages/@stylelint/postcss-css-in-js-0.37.2-9c486c168.tar |binary loleaflet/archived-packages/@stylelint/postcss-markdown-0.36.1-883c4c056.tar |binary loleaflet/archived-packages/@types/color-name-1.1.1-aebf8e432.tar |binary loleaflet/archived-packages/@types/minimist-1.2.0-69a23a3ad.tar |binary loleaflet/archived-packages/@types/normalize-package-data-2.4.0-7f98f96ff.tar |binary loleaflet/archived-packages/@types/parse-json-4.0.0-fffa28ac4.tar |binary loleaflet/archived-packages/@types/unist-2.0.3-16f52ea6e.tar |binary loleaflet/archived-packages/ajv-6.12.4-7a27a7076.tar |binary loleaflet/archived-packages/ansi-regex-5.0.0-6d8e9f8f9.tar |binary loleaflet/archived-packages/ansi-styles-4.2.1-f551a3acc.tar |binary loleaflet/archived-packages/array-union-2.1.0-1c6cb1a0e.tar |binary loleaflet/archived-packages/arrify-1.0.1-898508da2.tar |binary loleaflet/archived-packages/astral-regex-2.0.0-67bb4cc35.tar |binary loleaflet/archived-packages/autoprefixer-9.8.6-5ebbcfe15.tar |binary loleaflet/archived-packages/bail-1.0.5-c456d1c4c.tar |binary loleaflet/archived-packages/braces-3.0.2-6fcba6f8b.tar |binary loleaflet/archived-packages/browserslist-4.14.1-cf2053207.tar |binary loleaflet/archived-packages/callsites-3.1.0-3fc06302c.tar |binary loleaflet/archived-packages/camelcase-5.3.1-2f6f124c1.tar |binary loleaflet/archived-packages/camelcase-keys-6.2.2-62bc1a034.tar |binary loleaflet/archived-packages/caniuse-lite-1.0.30001125-f5ffabec1.tar |binary loleaflet/archived-packages/ccount-1.0.5-30e962d56.tar |binary loleaflet/archived-packages/chalk-4.1.0-ab0c75d80.tar |binary loleaflet/archived-packages/character-entities-1.2.4-881332784.tar |binary loleaflet/archived-packages/character-entities-html4-1.1.4-1d1703c59.tar |binary loleaflet/archived-packages/character-entities-legacy-1.1.4-dd79ebfbb.tar |binary
[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - kit/ChildSession.cpp loleaflet/css loleaflet/src
kit/ChildSession.cpp |3 +++
loleaflet/css/leaflet.css | 22 ++
loleaflet/src/layer/tile/TileLayer.js | 31 +++
3 files changed, 56 insertions(+)
New commits:
commit 2dcaf64c454644b2294711df588d4498123a8fc0
Author: gokaysatir
AuthorDate: Tue Sep 15 17:10:15 2020 +0300
Commit: Gökay ŞATIR
CommitDate: Mon Sep 28 12:43:31 2020 +0200
Online: Show input help on Online / Online part.
Change-Id: Ida8c5e8baccf87dae68c1c6d8f5302b1288741e7
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/102747
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/103522
Reviewed-by: Gökay ŞATIR
diff --git a/kit/ChildSession.cpp b/kit/ChildSession.cpp
index 5c7df7272..359fe4644 100644
--- a/kit/ChildSession.cpp
+++ b/kit/ChildSession.cpp
@@ -2598,6 +2598,9 @@ void ChildSession::loKitCallback(const int type, const
std::string& payload)
case LOK_CALLBACK_VALIDITY_LIST_BUTTON:
sendTextFrame("validitylistbutton: " + payload);
break;
+case LOK_CALLBACK_VALIDITY_INPUT_HELP:
+sendTextFrame("validityinputhelp: " + payload);
+break;
case LOK_CALLBACK_CLIPBOARD_CHANGED:
{
std::string selection;
diff --git a/loleaflet/css/leaflet.css b/loleaflet/css/leaflet.css
index 55f47bc1c..3a754d86f 100644
--- a/loleaflet/css/leaflet.css
+++ b/loleaflet/css/leaflet.css
@@ -993,3 +993,25 @@ input.clipboard {
top: 24px;
color: white;
}
+
+.input-help {
+ border-radius: 15px;
+ padding: 5px;
+ box-sizing: content-box;
+ border: 1px solid black;
+ color: black;
+ background-color: wheat;
+ min-width: 200px;
+ text-align: center;
+ }
+
+.input-help > h4 {
+ display: block;
+ font-weight: 900;
+}
+
+.input-help > p {
+ display: block;
+ text-indent: 20px;
+ text-align: justify;
+}
\ No newline at end of file
diff --git a/loleaflet/src/layer/tile/TileLayer.js
b/loleaflet/src/layer/tile/TileLayer.js
index c178bdb34..7f7d33c1b 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -712,6 +712,9 @@ L.TileLayer = L.GridLayer.extend({
else if (textMsg.startsWith('validitylistbutton:')) {
this._onValidityListButtonMsg(textMsg);
}
+ else if (textMsg.startsWith('validityinputhelp:')) {
+ this._onValidityInputHelpMsg(textMsg);
+ }
else if (textMsg.startsWith('signaturestatus:')) {
var signstatus =
textMsg.substring('signaturestatus:'.length + 1);
this._map.onChangeSignStatus(signstatus);
@@ -1188,6 +1191,16 @@ L.TileLayer = L.GridLayer.extend({
}
this._onUpdateCellCursor(horizontalDirection,
verticalDirection, onPgUpDn);
+
+ // Remove input help if there is any:
+ this._removeInputHelpMarker();
+ },
+
+ _removeInputHelpMarker: function() {
+ if (this._inputHelpPopUp) {
+ this._map.removeLayer(this._inputHelpPopUp);
+ this._inputHelpPopUp = null;
+ }
},
_onDocumentRepair: function (textMsg) {
@@ -3095,6 +3108,24 @@ L.TileLayer = L.GridLayer.extend({
}
},
+ _onValidityInputHelpMsg: function(textMsg) {
+ var message = textMsg.replace('validityinputhelp: ', '');
+ message = JSON.parse(message);
+
+ var icon = L.divIcon({
+ html: '',
+ iconSize: [0, 0],
+ iconAnchor: [0, 0]
+ });
+
+ this._removeInputHelpMarker();
+ var inputHelpMarker = L.marker(this._cellCursor.getNorthEast(),
{ icon: icon });
+ inputHelpMarker.addTo(this._map);
+ document.getElementById('input-help-title').innerText =
message.title;
+ document.getElementById('input-help-content').innerText =
message.content;
+ this._inputHelpPopUp = inputHelpMarker;
+ },
+
_addDropDownMarker: function () {
if (this._validatedCellXY && this._cellCursorXY &&
this._validatedCellXY.equals(this._cellCursorXY)) {
var pos = this._cellCursor.getNorthEast();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - include/LibreOfficeKit libreofficekit/source sc/source
include/LibreOfficeKit/LibreOfficeKitEnums.h |9 +
libreofficekit/source/gtk/lokdocview.cxx |1 +
sc/source/ui/inc/gridwin.hxx |1 +
sc/source/ui/view/gridwin.cxx| 13 +
sc/source/ui/view/tabview3.cxx |1 +
5 files changed, 25 insertions(+)
New commits:
commit 41f6f56c54277d3e1bb1c6fe84393b5abbc6731d
Author: gokaysatir
AuthorDate: Tue Sep 15 11:35:16 2020 +0300
Commit: Gökay ŞATIR
CommitDate: Mon Sep 28 11:50:47 2020 +0200
Online: Show input help on Online / Core part.
Change-Id: I9d10179f266a725b770fdae50045fdb5d77178ab
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102708
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103521
Reviewed-by: Gökay ŞATIR
diff --git a/include/LibreOfficeKit/LibreOfficeKitEnums.h
b/include/LibreOfficeKit/LibreOfficeKitEnums.h
index 96eda9b50978..208ad9065950 100644
--- a/include/LibreOfficeKit/LibreOfficeKitEnums.h
+++ b/include/LibreOfficeKit/LibreOfficeKitEnums.h
@@ -747,6 +747,13 @@ typedef enum
* }
*/
LOK_CALLBACK_FORM_FIELD_BUTTON = 49,
+
+/**
+ * When for the current cell is defined an input help text.
+ *
+ * The payload format is JSON: { "title": "title text", "content":
"content text" }
+ */
+LOK_CALLBACK_VALIDITY_INPUT_HELP = 51,
}
LibreOfficeKitCallbackType;
@@ -851,6 +858,8 @@ static inline const char* lokCallbackTypeToString(int nType)
return "LOK_CALLBACK_WINDOW";
case LOK_CALLBACK_VALIDITY_LIST_BUTTON:
return "LOK_CALLBACK_VALIDITY_LIST_BUTTON";
+case LOK_CALLBACK_VALIDITY_INPUT_HELP:
+return "LOK_CALLBACK_VALIDITY_INPUT_HELP";
case LOK_CALLBACK_CLIPBOARD_CHANGED:
return "LOK_CALLBACK_CLIPBOARD_CHANGED";
case LOK_CALLBACK_CONTEXT_CHANGED:
diff --git a/libreofficekit/source/gtk/lokdocview.cxx
b/libreofficekit/source/gtk/lokdocview.cxx
index db83f8e9f1f3..581237d550f0 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -1367,6 +1367,7 @@ callback (gpointer pData)
case LOK_CALLBACK_DOCUMENT_PASSWORD:
case LOK_CALLBACK_DOCUMENT_PASSWORD_TO_MODIFY:
case LOK_CALLBACK_VALIDITY_LIST_BUTTON:
+case LOK_CALLBACK_VALIDITY_INPUT_HELP:
case LOK_CALLBACK_SIGNATURE_STATUS:
case LOK_CALLBACK_CONTEXT_MENU:
case LOK_CALLBACK_PROFILE_FRAME:
diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx
index 03f0763883e5..14f059df7814 100644
--- a/sc/source/ui/inc/gridwin.hxx
+++ b/sc/source/ui/inc/gridwin.hxx
@@ -466,6 +466,7 @@ public:
virtual FactoryFunction GetUITestFactory() const override;
void updateLOKValListButton(bool bVisible, const ScAddress& rPos) const;
+void updateLOKInputHelp(const OUString& title, const OUString& content)
const;
protected:
void ImpCreateOverlayObjects();
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 6e8cfc680e47..5a8bf3a1734f 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -4689,6 +4689,19 @@ void ScGridWindow::UpdateAutoFillMark(bool bMarked,
const ScRange& rMarkRange)
}
}
+void ScGridWindow::updateLOKInputHelp(const OUString& title, const OUString&
content) const
+{
+ScTabViewShell* pViewShell = pViewData->GetViewShell();
+
+boost::property_tree::ptree aTree;
+aTree.put("title", title);
+aTree.put("content", content);
+
+std::stringstream aStream;
+boost::property_tree::write_json(aStream, aTree);
+pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_VALIDITY_INPUT_HELP,
aStream.str().c_str());
+}
+
void ScGridWindow::updateLOKValListButton( bool bVisible, const ScAddress&
rPos ) const
{
SCCOL nX = rPos.Col();
diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx
index 07f644d7dd5a..164771d77546 100644
--- a/sc/source/ui/view/tabview3.cxx
+++ b/sc/source/ui/view/tabview3.cxx
@@ -809,6 +809,7 @@ void ScTabView::TestHintWindow()
if (pWindow == pWin)
{
xOverlayManager->add(*pOverlay);
+pWindow->updateLOKInputHelp(aTitle, aMessage);
}
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loleaflet/src
loleaflet/src/control/Parts.js | 41 -
1 file changed, 40 insertions(+), 1 deletion(-)
New commits:
commit c3aa6eaa5c9a677ee366b4df9f30ec5a584a5c86
Author: gokaysatir
AuthorDate: Wed Sep 23 17:10:56 2020 +0300
Commit: Andras Timar
CommitDate: Fri Sep 25 17:22:05 2020 +0200
Loleaflet: Show sheet feature is enabled also for mobile.
Change-Id: I60dd7354ee5e54c00e8ea78f93d15b34ab5c1fda
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/103259
Tested-by: Jenkins CollaboraOffice
Tested-by: Henry Castro
Reviewed-by: Henry Castro
(cherry picked from commit b8025ec431226fe3a3d19ec46b660978edf2c1b9)
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/103334
Reviewed-by: Andras Timar
diff --git a/loleaflet/src/control/Parts.js b/loleaflet/src/control/Parts.js
index fb75fe293..39a69fbd4 100644
--- a/loleaflet/src/control/Parts.js
+++ b/loleaflet/src/control/Parts.js
@@ -2,6 +2,9 @@
/*
* Document parts switching and selecting handler
*/
+
+/* global vex */
+
L.Map.include({
setPart: function (part, external, calledFromSetPartHandler) {
var docLayer = this._docLayer;
@@ -344,7 +347,43 @@ L.Map.include({
showPage: function () {
if (this.getDocType() === 'spreadsheet' &&
this.hasAnyHiddenPart()) {
- this._socket.sendMessage('uno .uno:Show');
+ var partNames_ = this._docLayer._partNames;
+ var hiddenParts_ = this._docLayer._hiddenParts;
+
+ if (hiddenParts_.length > 0) {
+ var container = document.createElement('div');
+ container.style.maxHeight = '300px';
+ container.style.maxWidth = '200px';
+ for (var i = 0; i < hiddenParts_.length; i++) {
+ var checkbox =
document.createElement('input');
+ checkbox.type = 'checkbox';
+ checkbox.id = 'hidden-part-checkbox-' +
String(hiddenParts_[i]);
+ var label =
document.createElement('label');
+ label.htmlFor = 'hidden-part-checkbox-'
+ String(hiddenParts_[i]);
+ label.innerText =
partNames_[hiddenParts_[i]];
+ var newLine =
document.createElement('br');
+ container.appendChild(checkbox);
+ container.appendChild(label);
+ container.appendChild(newLine);
+ }
+ }
+
+ var socket_ = this._socket;
+ vex.dialog.confirm({
+ unsafeMessage: container.outerHTML,
+ callback: function (value) {
+ if (value === true) {
+ var checkboxList =
document.querySelectorAll('input[id^="hidden-part-checkbox"]');
+ for (var i = 0; i <
checkboxList.length; i++) {
+ if
(checkboxList[i].checked === true) {
+ var partName_ =
partNames_[parseInt(checkboxList[i].id.replace('hidden-part-checkbox-', ''))];
+ var argument =
{aTableName: {type: 'string', value: partName_}};
+
socket_.sendMessage('uno .uno:Show ' + JSON.stringify(argument));
+ }
+ }
+ }
+ }
+ });
}
},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/control/Parts.js | 41 -
1 file changed, 40 insertions(+), 1 deletion(-)
New commits:
commit b8025ec431226fe3a3d19ec46b660978edf2c1b9
Author: gokaysatir
AuthorDate: Wed Sep 23 17:10:56 2020 +0300
Commit: Henry Castro
CommitDate: Thu Sep 24 16:54:27 2020 +0200
Loleaflet: Show sheet feature is enabled also for mobile.
Change-Id: I60dd7354ee5e54c00e8ea78f93d15b34ab5c1fda
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/103259
Tested-by: Jenkins CollaboraOffice
Tested-by: Henry Castro
Reviewed-by: Henry Castro
diff --git a/loleaflet/src/control/Parts.js b/loleaflet/src/control/Parts.js
index 427a3238f..0e52e7472 100644
--- a/loleaflet/src/control/Parts.js
+++ b/loleaflet/src/control/Parts.js
@@ -2,6 +2,9 @@
/*
* Document parts switching and selecting handler
*/
+
+/* global vex */
+
L.Map.include({
setPart: function (part, external, calledFromSetPartHandler) {
var docLayer = this._docLayer;
@@ -345,7 +348,43 @@ L.Map.include({
showPage: function () {
if (this.getDocType() === 'spreadsheet' &&
this.hasAnyHiddenPart()) {
- this._socket.sendMessage('uno .uno:Show');
+ var partNames_ = this._docLayer._partNames;
+ var hiddenParts_ = this._docLayer._hiddenParts;
+
+ if (hiddenParts_.length > 0) {
+ var container = document.createElement('div');
+ container.style.maxHeight = '300px';
+ container.style.maxWidth = '200px';
+ for (var i = 0; i < hiddenParts_.length; i++) {
+ var checkbox =
document.createElement('input');
+ checkbox.type = 'checkbox';
+ checkbox.id = 'hidden-part-checkbox-' +
String(hiddenParts_[i]);
+ var label =
document.createElement('label');
+ label.htmlFor = 'hidden-part-checkbox-'
+ String(hiddenParts_[i]);
+ label.innerText =
partNames_[hiddenParts_[i]];
+ var newLine =
document.createElement('br');
+ container.appendChild(checkbox);
+ container.appendChild(label);
+ container.appendChild(newLine);
+ }
+ }
+
+ var socket_ = this._socket;
+ vex.dialog.confirm({
+ unsafeMessage: container.outerHTML,
+ callback: function (value) {
+ if (value === true) {
+ var checkboxList =
document.querySelectorAll('input[id^="hidden-part-checkbox"]');
+ for (var i = 0; i <
checkboxList.length; i++) {
+ if
(checkboxList[i].checked === true) {
+ var partName_ =
partNames_[parseInt(checkboxList[i].id.replace('hidden-part-checkbox-', ''))];
+ var argument =
{aTableName: {type: 'string', value: partName_}};
+
socket_.sendMessage('uno .uno:Show ' + JSON.stringify(argument));
+ }
+ }
+ }
+ }
+ });
}
},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/LibreOfficeKit libreofficekit/source sc/source
include/LibreOfficeKit/LibreOfficeKitEnums.h |9 +
libreofficekit/source/gtk/lokdocview.cxx |1 +
sc/source/ui/inc/gridwin.hxx |1 +
sc/source/ui/view/gridwin.cxx| 14 ++
sc/source/ui/view/tabview3.cxx |1 +
5 files changed, 26 insertions(+)
New commits:
commit 433996f47b5354c0d936b07ba95440ac3354c620
Author: gokaysatir
AuthorDate: Tue Sep 15 11:35:16 2020 +0300
Commit: Miklos Vajna
CommitDate: Fri Sep 18 13:00:34 2020 +0200
Online: Show input help on Online / Core part.
Change-Id: I9d10179f266a725b770fdae50045fdb5d77178ab
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102708
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
(cherry picked from commit 110069adbba4d272450b30fa03c56efbd478e84c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102935
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/include/LibreOfficeKit/LibreOfficeKitEnums.h
b/include/LibreOfficeKit/LibreOfficeKitEnums.h
index 780b9b7ab373..750e64f529f9 100644
--- a/include/LibreOfficeKit/LibreOfficeKitEnums.h
+++ b/include/LibreOfficeKit/LibreOfficeKitEnums.h
@@ -766,6 +766,13 @@ typedef enum
* and row-groups data have changed.
*/
LOK_CALLBACK_INVALIDATE_SHEET_GEOMETRY = 50,
+
+/**
+ * When for the current cell is defined an input help text.
+ *
+ * The payload format is JSON: { "title": "title text", "content":
"content text" }
+ */
+LOK_CALLBACK_VALIDITY_INPUT_HELP = 51,
}
LibreOfficeKitCallbackType;
@@ -870,6 +877,8 @@ static inline const char* lokCallbackTypeToString(int nType)
return "LOK_CALLBACK_WINDOW";
case LOK_CALLBACK_VALIDITY_LIST_BUTTON:
return "LOK_CALLBACK_VALIDITY_LIST_BUTTON";
+case LOK_CALLBACK_VALIDITY_INPUT_HELP:
+return "LOK_CALLBACK_VALIDITY_INPUT_HELP";
case LOK_CALLBACK_CLIPBOARD_CHANGED:
return "LOK_CALLBACK_CLIPBOARD_CHANGED";
case LOK_CALLBACK_CONTEXT_CHANGED:
diff --git a/libreofficekit/source/gtk/lokdocview.cxx
b/libreofficekit/source/gtk/lokdocview.cxx
index 559b03fcc189..6af262bb8df2 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -1389,6 +1389,7 @@ callback (gpointer pData)
case LOK_CALLBACK_DOCUMENT_PASSWORD:
case LOK_CALLBACK_DOCUMENT_PASSWORD_TO_MODIFY:
case LOK_CALLBACK_VALIDITY_LIST_BUTTON:
+case LOK_CALLBACK_VALIDITY_INPUT_HELP:
case LOK_CALLBACK_SIGNATURE_STATUS:
case LOK_CALLBACK_CONTEXT_MENU:
case LOK_CALLBACK_PROFILE_FRAME:
diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx
index 8bdee8a55190..a3ddbc84bac1 100644
--- a/sc/source/ui/inc/gridwin.hxx
+++ b/sc/source/ui/inc/gridwin.hxx
@@ -475,6 +475,7 @@ public:
virtual FactoryFunction GetUITestFactory() const override;
void updateLOKValListButton(bool bVisible, const ScAddress& rPos) const;
+void updateLOKInputHelp(const OUString& title, const OUString& content)
const;
protected:
void ImpCreateOverlayObjects();
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 7ee10d644e9e..e858a9337041 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -137,6 +137,7 @@
#include
#include
+#include
using namespace css;
using namespace css::uno;
@@ -4730,6 +4731,19 @@ void ScGridWindow::UpdateAutoFillMark(bool bMarked,
const ScRange& rMarkRange)
}
}
+void ScGridWindow::updateLOKInputHelp(const OUString& title, const OUString&
content) const
+{
+ScTabViewShell* pViewShell = pViewData->GetViewShell();
+
+boost::property_tree::ptree aTree;
+aTree.put("title", title);
+aTree.put("content", content);
+
+std::stringstream aStream;
+boost::property_tree::write_json(aStream, aTree);
+pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_VALIDITY_INPUT_HELP,
aStream.str().c_str());
+}
+
void ScGridWindow::updateLOKValListButton( bool bVisible, const ScAddress&
rPos ) const
{
SCCOL nX = rPos.Col();
diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx
index 30986e02d044..ace30689b743 100644
--- a/sc/source/ui/view/tabview3.cxx
+++ b/sc/source/ui/view/tabview3.cxx
@@ -833,6 +833,7 @@ void ScTabView::TestHintWindow()
if (pWindow == pWin)
{
xOverlayManager->add(*pOverlay);
+pWindow->updateLOKInputHelp(aTitle, aMessage);
}
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: kit/ChildSession.cpp loleaflet/css loleaflet/src
kit/ChildSession.cpp |3 +++
loleaflet/css/leaflet.css | 22 ++
loleaflet/src/layer/tile/TileLayer.js | 31 +++
3 files changed, 56 insertions(+)
New commits:
commit f05906aac5af7043cac477b84cd2114097557fcf
Author: gokaysatir
AuthorDate: Tue Sep 15 17:10:15 2020 +0300
Commit: Andras Timar
CommitDate: Thu Sep 17 14:23:13 2020 +0200
Online: Show input help on Online / Online part.
Change-Id: Ida8c5e8baccf87dae68c1c6d8f5302b1288741e7
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/102747
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
diff --git a/kit/ChildSession.cpp b/kit/ChildSession.cpp
index 96bf87372..54d900da6 100644
--- a/kit/ChildSession.cpp
+++ b/kit/ChildSession.cpp
@@ -2594,6 +2594,9 @@ void ChildSession::loKitCallback(const int type, const
std::string& payload)
case LOK_CALLBACK_VALIDITY_LIST_BUTTON:
sendTextFrame("validitylistbutton: " + payload);
break;
+case LOK_CALLBACK_VALIDITY_INPUT_HELP:
+sendTextFrame("validityinputhelp: " + payload);
+break;
case LOK_CALLBACK_CLIPBOARD_CHANGED:
{
std::string selection;
diff --git a/loleaflet/css/leaflet.css b/loleaflet/css/leaflet.css
index c2c35430c..d8d8bd651 100644
--- a/loleaflet/css/leaflet.css
+++ b/loleaflet/css/leaflet.css
@@ -1001,3 +1001,25 @@ path.leaflet-pane-splitter:hover {
stroke: #cdcdcd;
fill: #cdcdcd;
}
+
+.input-help {
+ border-radius: 15px;
+ padding: 5px;
+ box-sizing: content-box;
+ border: 1px solid black;
+ color: black;
+ background-color: wheat;
+ min-width: 200px;
+ text-align: center;
+}
+
+.input-help > h4 {
+ display: block;
+ font-weight: 900;
+}
+
+.input-help > p {
+ display: block;
+ text-indent: 20px;
+ text-align: justify;
+}
\ No newline at end of file
diff --git a/loleaflet/src/layer/tile/TileLayer.js
b/loleaflet/src/layer/tile/TileLayer.js
index bdd3f3486..6f4445084 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -704,6 +704,9 @@ L.TileLayer = L.GridLayer.extend({
else if (textMsg.startsWith('validitylistbutton:')) {
this._onValidityListButtonMsg(textMsg);
}
+ else if (textMsg.startsWith('validityinputhelp:')) {
+ this._onValidityInputHelpMsg(textMsg);
+ }
else if (textMsg.startsWith('signaturestatus:')) {
var signstatus =
textMsg.substring('signaturestatus:'.length + 1);
this._map.onChangeSignStatus(signstatus);
@@ -1200,6 +1203,16 @@ L.TileLayer = L.GridLayer.extend({
}
this._onUpdateCellCursor(horizontalDirection,
verticalDirection, onPgUpDn);
+
+ // Remove input help if there is any:
+ this._removeInputHelpMarker();
+ },
+
+ _removeInputHelpMarker: function() {
+ if (this._inputHelpPopUp) {
+ this._map.removeLayer(this._inputHelpPopUp);
+ this._inputHelpPopUp = null;
+ }
},
_onDocumentRepair: function (textMsg) {
@@ -3108,6 +3121,24 @@ L.TileLayer = L.GridLayer.extend({
}
},
+ _onValidityInputHelpMsg: function(textMsg) {
+ var message = textMsg.replace('validityinputhelp: ', '');
+ message = JSON.parse(message);
+
+ var icon = L.divIcon({
+ html: '',
+ iconSize: [0, 0],
+ iconAnchor: [0, 0]
+ });
+
+ this._removeInputHelpMarker();
+ var inputHelpMarker = L.marker(this._cellCursor.getNorthEast(),
{ icon: icon });
+ inputHelpMarker.addTo(this._map);
+ document.getElementById('input-help-title').innerText =
message.title;
+ document.getElementById('input-help-content').innerText =
message.content;
+ this._inputHelpPopUp = inputHelpMarker;
+ },
+
_addDropDownMarker: function () {
if (this._validatedCellXY && this._cellCursorXY &&
this._validatedCellXY.equals(this._cellCursorXY)) {
var pos = this._cellCursor.getNorthEast();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - include/LibreOfficeKit libreofficekit/source sc/source
include/LibreOfficeKit/LibreOfficeKitEnums.h |9 +
libreofficekit/source/gtk/lokdocview.cxx |1 +
sc/source/ui/inc/gridwin.hxx |1 +
sc/source/ui/view/gridwin.cxx| 13 +
sc/source/ui/view/tabview3.cxx |1 +
5 files changed, 25 insertions(+)
New commits:
commit 110069adbba4d272450b30fa03c56efbd478e84c
Author: gokaysatir
AuthorDate: Tue Sep 15 11:35:16 2020 +0300
Commit: Andras Timar
CommitDate: Thu Sep 17 13:04:21 2020 +0200
Online: Show input help on Online / Core part.
Change-Id: I9d10179f266a725b770fdae50045fdb5d77178ab
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102708
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
diff --git a/include/LibreOfficeKit/LibreOfficeKitEnums.h
b/include/LibreOfficeKit/LibreOfficeKitEnums.h
index 86ca9de556af..cabea69a29be 100644
--- a/include/LibreOfficeKit/LibreOfficeKitEnums.h
+++ b/include/LibreOfficeKit/LibreOfficeKitEnums.h
@@ -766,6 +766,13 @@ typedef enum
* and row-groups data have changed.
*/
LOK_CALLBACK_INVALIDATE_SHEET_GEOMETRY = 50,
+
+/**
+ * When for the current cell is defined an input help text.
+ *
+ * The payload format is JSON: { "title": "title text", "content":
"content text" }
+ */
+LOK_CALLBACK_VALIDITY_INPUT_HELP = 51,
}
LibreOfficeKitCallbackType;
@@ -870,6 +877,8 @@ static inline const char* lokCallbackTypeToString(int nType)
return "LOK_CALLBACK_WINDOW";
case LOK_CALLBACK_VALIDITY_LIST_BUTTON:
return "LOK_CALLBACK_VALIDITY_LIST_BUTTON";
+case LOK_CALLBACK_VALIDITY_INPUT_HELP:
+return "LOK_CALLBACK_VALIDITY_INPUT_HELP";
case LOK_CALLBACK_CLIPBOARD_CHANGED:
return "LOK_CALLBACK_CLIPBOARD_CHANGED";
case LOK_CALLBACK_CONTEXT_CHANGED:
diff --git a/libreofficekit/source/gtk/lokdocview.cxx
b/libreofficekit/source/gtk/lokdocview.cxx
index 2b2e4b85e89c..4ebcd6806d19 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -1372,6 +1372,7 @@ callback (gpointer pData)
case LOK_CALLBACK_DOCUMENT_PASSWORD:
case LOK_CALLBACK_DOCUMENT_PASSWORD_TO_MODIFY:
case LOK_CALLBACK_VALIDITY_LIST_BUTTON:
+case LOK_CALLBACK_VALIDITY_INPUT_HELP:
case LOK_CALLBACK_SIGNATURE_STATUS:
case LOK_CALLBACK_CONTEXT_MENU:
case LOK_CALLBACK_PROFILE_FRAME:
diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx
index 3d0050d12212..3a2a41d556ab 100644
--- a/sc/source/ui/inc/gridwin.hxx
+++ b/sc/source/ui/inc/gridwin.hxx
@@ -471,6 +471,7 @@ public:
virtual FactoryFunction GetUITestFactory() const override;
void updateLOKValListButton(bool bVisible, const ScAddress& rPos) const;
+void updateLOKInputHelp(const OUString& title, const OUString& content)
const;
protected:
void ImpCreateOverlayObjects();
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index ec67eab92d28..e8b1bba90bf4 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -4704,6 +4704,19 @@ void ScGridWindow::UpdateAutoFillMark(bool bMarked,
const ScRange& rMarkRange)
}
}
+void ScGridWindow::updateLOKInputHelp(const OUString& title, const OUString&
content) const
+{
+ScTabViewShell* pViewShell = pViewData->GetViewShell();
+
+boost::property_tree::ptree aTree;
+aTree.put("title", title);
+aTree.put("content", content);
+
+std::stringstream aStream;
+boost::property_tree::write_json(aStream, aTree);
+pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_VALIDITY_INPUT_HELP,
aStream.str().c_str());
+}
+
void ScGridWindow::updateLOKValListButton( bool bVisible, const ScAddress&
rPos ) const
{
SCCOL nX = rPos.Col();
diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx
index f512e8dd9127..01c363903004 100644
--- a/sc/source/ui/view/tabview3.cxx
+++ b/sc/source/ui/view/tabview3.cxx
@@ -816,6 +816,7 @@ void ScTabView::TestHintWindow()
if (pWindow == pWin)
{
xOverlayManager->add(*pOverlay);
+pWindow->updateLOKInputHelp(aTitle, aMessage);
}
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loleaflet/css loleaflet/src
loleaflet/css/device-mobile.css | 10
loleaflet/css/mobilewizard.css| 56 --
loleaflet/src/control/Control.Menubar.js |4 -
loleaflet/src/control/Control.MobileWizard.js | 24 ++-
loleaflet/src/control/Control.PartsPreview.js |8 +++
loleaflet/src/control/Parts.js| 33 +--
loleaflet/src/layer/tile/ImpressTileLayer.js |4 -
7 files changed, 92 insertions(+), 47 deletions(-)
New commits:
commit 38d13dbc817f0970a89215a00e55cc666d6d16df
Author: gokaysatir
AuthorDate: Sat Sep 12 16:52:20 2020 +0300
Commit: Andras Timar
CommitDate: Wed Sep 16 14:19:05 2020 +0200
loleaflet: Hide portrait view previews on layout view.
Header code is updated to avoid creating/deleting it every time.
Some CSS adjustments to increase maintainability. Example: There were 2
scroll bars in mobile-wizard. Scrolling was not smooth. And some other
improvements.
On layout view, 2 separate slide-sorter containers were visible. One of
them is hidden now.
Change-Id: Ic4201b176812f6ca00402777423feced7ee8284c
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/102848
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
diff --git a/loleaflet/css/device-mobile.css b/loleaflet/css/device-mobile.css
index 3329a216e..e144f02f2 100644
--- a/loleaflet/css/device-mobile.css
+++ b/loleaflet/css/device-mobile.css
@@ -766,21 +766,15 @@ td[id^=tb_spreadsheet-toolbar_item]:focus
table.w2ui-button div.w2ui-icon, td[id
#mobile-wizard-header.landscape {
display: none;
}
-#mobile-wizard-content.with-slide-sorter-above.landscape {
- top: 48px !important;
-}
#mobile-wizard-header.portrait {
display: block;
}
-#mobile-wizard-content.with-slide-sorter-above.portrait {
- top: 111px !important;
-}
/* Related to mobile-wizard based menubar */
-#mobile-wizard.menuwizard.landscape
#mobile-wizard-content.with-slide-sorter-above.landscape {
+#mobile-wizard.menuwizard.landscape #mobile-wizard-content.landscape {
overflow-y: auto !important;
}
-#mobile-wizard.menuwizard.portrait
#mobile-wizard-content.with-slide-sorter-above.portrait {
+#mobile-wizard.menuwizard.portrait #mobile-wizard-content.portrait {
overflow-y: hidden !important;
}
diff --git a/loleaflet/css/mobilewizard.css b/loleaflet/css/mobilewizard.css
index 1dc843408..c6a418e1e 100644
--- a/loleaflet/css/mobilewizard.css
+++ b/loleaflet/css/mobilewizard.css
@@ -190,10 +190,12 @@ p.mobile-wizard.ui-combobox-text.selected {
#mobile-wizard-content {
overflow-y: scroll;
overflow-x: hidden;
- position: absolute;
- top: 111px;
- bottom: 0px;
+ position: static;
width: 100%;
+ height: calc(100% - 48px);
+}
+#mobile-wizard.portrait > #mobile-wizard-header:not([style*='none']) ~
#mobile-wizard-content {
+ height: calc(100% - 121px);
}
#mobile-wizard.funcwizard div#mobile-wizard-content.hideHelpBG {
background: none !important;
@@ -201,19 +203,13 @@ p.mobile-wizard.ui-combobox-text.selected {
#mobile-wizard.funcwizard div#mobile-wizard-content.showHelpBG {
background: url(images/lc_helpindex_secondary.svg) no-repeat right 16px
bottom 88px / 124px !important;
}
-#mobile-wizard-content:not(.with-slide-sorter-above), .menuwizard
#mobile-wizard-content.with-slide-sorter-above{
- top: 48px !important;
-}
-#mobile-wizard-content.with-slide-sorter-above {
- top: 128px !important;
- overflow-x: hidden;
-}
+
#ParaPropertyPanel > .ui-content{
display: flex;
flex-wrap: wrap !important;
justify-content: space-around;
}
-.with-slide-sorter-above > .ui-tabs-content > div[title=Layouts]{
+.ui-tabs-content > div[title='Layouts']{
justify-content: center;
-ms-box-orient: horizontal !important;
display: -webkit-box;
@@ -224,8 +220,9 @@ p.mobile-wizard.ui-combobox-text.selected {
display: flex;
align-self: center !important;
align-items: center !important;
- -webkit-flex-wrap: wrap !important;
- flex-wrap: wrap !important;
+ -webkit-flex-wrap: wrap !important;
+ flex-wrap: wrap !important;
+ margin-top: 25px;
}
#rotationlabel, #cellbackgroundlabel, #NumberFormatCurrency > .unolabel,
#NumberFormatPercent > .unolabel, #NumberFormatDecimal > .unolabel{
display: none;
@@ -259,13 +256,13 @@ p.mobile-wizard.ui-combobox-text.selected {
}
#mobile-wizard {
- width: 100%;
- position: fixed;
- bottom: 0px;
- z-index: 1000;
- background-color: white;
- box-shadow: 0px -2px 4px 1px #0030;
- overflow-y: scroll;
+ width: 100%;
+ position: fixed;
+ bottom: 0px;
+ z-index: 1000;
+ background-color: white;
+ box-shadow: 0px -2px 4px 1px #0030;
+
[Libreoffice-commits] online.git: loleaflet/css loleaflet/src
loleaflet/css/device-mobile.css | 10 +-
loleaflet/css/mobilewizard.css| 40 +---
loleaflet/src/control/Control.Menubar.js |4 +-
loleaflet/src/control/Control.MobileWizard.js | 42 ++
loleaflet/src/control/Control.PartsPreview.js |8
loleaflet/src/control/Parts.js| 33 +---
loleaflet/src/layer/tile/ImpressTileLayer.js | 17 ++
7 files changed, 88 insertions(+), 66 deletions(-)
New commits:
commit 596d70187c61199063495e23ebda132a7d06ae2b
Author: gokaysatir
AuthorDate: Sat Sep 12 16:52:20 2020 +0300
Commit: Andras Timar
CommitDate: Wed Sep 16 14:19:20 2020 +0200
loleaflet: Hide portrait view previews on layout view.
Header code is updated to avoid creating/deleting it every time.
Some CSS adjustments to increase maintainability. Example: There were 2
scroll bars in mobile-wizard. Scrolling was not smooth. And some other
improvements.
On layout view, 2 separate slide-sorter containers were visible. One of
them is hidden now.
Change-Id: Ic4201b176812f6ca00402777423feced7ee8284c
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/102521
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
diff --git a/loleaflet/css/device-mobile.css b/loleaflet/css/device-mobile.css
index eb012192b..e5b441137 100644
--- a/loleaflet/css/device-mobile.css
+++ b/loleaflet/css/device-mobile.css
@@ -749,21 +749,15 @@ td[id^='tb_spreadsheet-toolbar_item']:focus
table.w2ui-button div.w2ui-icon, td[
#mobile-wizard-header.landscape {
display: none;
}
-#mobile-wizard-content.with-slide-sorter-above.landscape {
- top: 48px !important;
-}
#mobile-wizard-header.portrait {
display: block;
}
-#mobile-wizard-content.with-slide-sorter-above.portrait {
- top: 111px !important;
-}
/* Related to mobile-wizard based menubar */
-#mobile-wizard.menuwizard.landscape
#mobile-wizard-content.with-slide-sorter-above.landscape {
+#mobile-wizard.menuwizard.landscape #mobile-wizard-content.landscape {
overflow-y: auto !important;
}
-#mobile-wizard.menuwizard.portrait
#mobile-wizard-content.with-slide-sorter-above.portrait {
+#mobile-wizard.menuwizard.portrait #mobile-wizard-content.portrait {
overflow-y: hidden !important;
}
diff --git a/loleaflet/css/mobilewizard.css b/loleaflet/css/mobilewizard.css
index 0f2d23145..42d34f356 100644
--- a/loleaflet/css/mobilewizard.css
+++ b/loleaflet/css/mobilewizard.css
@@ -190,10 +190,12 @@ p.mobile-wizard.ui-combobox-text.selected {
#mobile-wizard-content {
overflow-y: scroll;
overflow-x: hidden;
- position: absolute;
- top: 111px;
- bottom: 0px;
+ position: static;
width: 100%;
+ height: calc(100% - 48px);
+}
+#mobile-wizard.portrait > #mobile-wizard-header:not([style*='none']) ~
#mobile-wizard-content {
+ height: calc(100% - 121px);
}
#mobile-wizard.funcwizard div#mobile-wizard-content.hideHelpBG {
background: none !important;
@@ -201,19 +203,13 @@ p.mobile-wizard.ui-combobox-text.selected {
#mobile-wizard.funcwizard div#mobile-wizard-content.showHelpBG {
background: url('images/lc_helpindex_secondary.svg') no-repeat right
16px bottom 88px / 124px !important;
}
-#mobile-wizard-content:not(.with-slide-sorter-above), .menuwizard
#mobile-wizard-content.with-slide-sorter-above{
- top: 48px !important;
-}
-#mobile-wizard-content.with-slide-sorter-above {
- top: 128px !important;
- overflow-x: hidden;
-}
+
#ParaPropertyPanel > .ui-content{
display: flex;
flex-wrap: wrap !important;
justify-content: space-around;
}
-.with-slide-sorter-above > .ui-tabs-content > div[title='Layouts']{
+.ui-tabs-content > div[title='Layouts']{
justify-content: center;
-ms-box-orient: horizontal !important;
display: -webkit-box;
@@ -226,6 +222,7 @@ p.mobile-wizard.ui-combobox-text.selected {
align-items: center !important;
-webkit-flex-wrap: wrap !important;
flex-wrap: wrap !important;
+ margin-top: 25px;
}
#rotationlabel, #cellbackgroundlabel, #NumberFormatCurrency > .unolabel,
#NumberFormatPercent > .unolabel, #NumberFormatDecimal > .unolabel{
display: none;
@@ -265,7 +262,7 @@ p.mobile-wizard.ui-combobox-text.selected {
z-index: 1000;
background-color: white;
box-shadow: 0px -2px 4px 1px #0030;
- overflow-y: scroll;
+ overflow-y: hidden;
}
#mobile-wizard-content *{
@@ -280,6 +277,7 @@ p.mobile-wizard.ui-combobox-text.selected {
color: #636363;
border-bottom: 1px solid #dd !important;
position: sticky;
+ z-index: 2;
}
.ui-content.mobile-wizard {
@@ -455,6 +453,24 @@ p.mobile-wizard.ui-combobox-text.selected {
padding: 0px;
}
+#mobile-wizard-tabs {
+ position: sticky;
+ top: 0;
[Libreoffice-commits] online.git: common/Util.hpp test/helpers.hpp test/Makefile.am test/UnitPHPProxy.cpp
common/Util.hpp |6 +
test/Makefile.am |4
test/UnitPHPProxy.cpp | 271 ++
test/helpers.hpp | 54 +
4 files changed, 335 insertions(+)
New commits:
commit 1951fdbd426781fd652af2e517e2e61b22b2831d
Author: gokaysatir
AuthorDate: Thu Jul 2 19:54:56 2020 +0300
Commit: Tamás Zolnai
CommitDate: Wed Sep 9 15:50:10 2020 +0200
lool: php proxy simulation.
Change-Id: I5ea5515e317242f2ad2abd3209ce0241d64b631b
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97820
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Tamás Zolnai
diff --git a/common/Util.hpp b/common/Util.hpp
index 9dbfebe8b..03719e97f 100644
--- a/common/Util.hpp
+++ b/common/Util.hpp
@@ -1217,6 +1217,12 @@ int main(int argc, char**argv)
return pair.second ? pair : std::make_pair(def, false);
}
+/// Get system_clock now in miliseconds.
+inline int64_t getNowInMS()
+{
+return
std::chrono::time_point_cast(std::chrono::system_clock::now()).time_since_epoch().count();
+}
+
} // end namespace Util
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/test/Makefile.am b/test/Makefile.am
index 9fa6506b1..899dd0764 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -37,6 +37,7 @@ noinst_LTLIBRARIES = \
unit-load.la \
unit-cursor.la \
unit-calc.la \
+ unit-php-proxy.la \
unit-insert-delete.la \
unit-close.la \
unit-bad-doc-load.la \
@@ -178,6 +179,8 @@ unit_cursor_la_SOURCES = UnitCursor.cpp
unit_cursor_la_LIBADD = $(CPPUNIT_LIBS)
unit_calc_la_SOURCES = UnitCalc.cpp
unit_calc_la_LIBADD = $(CPPUNIT_LIBS)
+unit_php_proxy_la_SOURCES = UnitPHPProxy.cpp
+unit_php_proxy_la_LIBADD = $(CPPUNIT_LIBS)
unit_insert_delete_la_SOURCES = UnitInsertDelete.cpp
unit_insert_delete_la_LIBADD = $(CPPUNIT_LIBS)
unit_close_la_SOURCES = UnitClose.cpp
@@ -225,6 +228,7 @@ TESTS = \
unit-load.la \
unit-cursor.la \
unit-calc.la \
+ unit-php-proxy.la \
unit-insert-delete.la \
unit-close.la \
unit-bad-doc-load.la \
diff --git a/test/UnitPHPProxy.cpp b/test/UnitPHPProxy.cpp
new file mode 100644
index 0..57c44ac30
--- /dev/null
+++ b/test/UnitPHPProxy.cpp
@@ -0,0 +1,271 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4;
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+/*
+road path:
+* cypress test => php server => loolwsd
+* loolwsd => php server => cypress test
+*/
+
+#include
+#include
+#include
+#include
+
+#include
+#include
+#include
+#include
+
+#include
+#include
+#include "net/ServerSocket.hpp"
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#define _PORT_ 9979
+
+const int bufferSize = 16 * 1024;
+std::atomic lastRequestMS;
+
+class SocketThread
+{
+public:
+const std::string _proxyPrefix = "ProxyPrefix: http://localhost:; +
std::to_string(_PORT_) + "/proxytest.php?req=\n";
+
+void replaceRequest(std::vector& message)
+{
+// First line includes the request. We will remove proxy prefix && get
real request.
+std::vector::iterator firstLineEnd = std::find(message.begin(),
message.end(), '\n');
+std::string firstLine(message.begin(), firstLineEnd);
+std::vector::iterator firstSpace = std::find(message.begin(),
firstLineEnd, ' '); // Position of first space char.
+std::string request = Util::splitStringToVector(firstLine, ' ')[1]; //
First line's format is: METHOD (space) REQUEST (space) HTPP_VERSION
+
+if (request.find("proxytest.php?req=") != std::string::npos)
+{
+// We have a proper proxy request.
+std::vector::iterator equalSign = std::find(firstSpace + 1,
firstLineEnd, '='); // Position of first '=' sign.
+if (equalSign != firstLineEnd)
+{
+// Remove chars from first space until '=' sign (including '='
sign).
+// So we remove "http://localhost:_PORT_/proxytest.php?req=;
and get the real request.
+for (std::vector::iterator it = equalSign; it >
firstSpace; it--)
+{
+message.erase(it);
+}
+}
+}
+else
+{
+// We don't have a proper request. Since we are testing, we will
accept this one.
+// We will remove only "http://localhost:_PORT_;
+std::vector::iterator portNumberLastChar =
std::find(firstSpace + 1, firstLineEnd, '9'); // Position of first char of the
port number.
+if (portNumberLastChar !=
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/control/Control.PartsPreview.js |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit f6c24f90033678fb24358d460111332230d1a6c5
Author: gokaysatir
AuthorDate: Fri Aug 28 21:36:35 2020 +0300
Commit: Andras Timar
CommitDate: Wed Sep 9 14:24:23 2020 +0200
loleaflet: Impress slide scroll improved.
On tablet, slide preview scroll section is always on the left column. So
when user switches to layout/portrait views, scroll item's classes should
remain same.
Change-Id: I84349cd48b317578d9bb2687c3a66aa788f57780
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101563
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
diff --git a/loleaflet/src/control/Control.PartsPreview.js
b/loleaflet/src/control/Control.PartsPreview.js
index 8694b8bf6..dfc37beaf 100644
--- a/loleaflet/src/control/Control.PartsPreview.js
+++ b/loleaflet/src/control/Control.PartsPreview.js
@@ -179,7 +179,7 @@ L.Control.PartsPreview = L.Control.extend({
// re-create scrollbar with new direction
var direction = this._direction;
- this._direction = !window.mode.isDesktop() &&
L.DomUtil.isPortrait() ? 'x' : 'y';
+ this._direction = !window.mode.isDesktop() &&
!window.mode.isTablet() && L.DomUtil.isPortrait() ? 'x' : 'y';
if (direction !== this._direction) {
$(this._partsPreviewCont).mCustomScrollbar('destroy');
this.createScrollbar();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/control/Control.PartsPreview.js |8
1 file changed, 8 insertions(+)
New commits:
commit aca07fec869117589a7b81b64328f39e02fc882d
Author: gokaysatir
AuthorDate: Sat Aug 29 15:25:19 2020 +0300
Commit: Andras Timar
CommitDate: Wed Sep 9 14:20:21 2020 +0200
loleaflet: Hide portrait view previews on layout view.
When user switches to layout view on mobile. Viewing a page's properties
opens 2 preview sliders. Portrait view's slider is hidden with this patch.
Change-Id: Iebbdd9c6c94f19a39df271106b75f2e9f55a7b35
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101641
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
diff --git a/loleaflet/src/control/Control.PartsPreview.js
b/loleaflet/src/control/Control.PartsPreview.js
index 58408b48f..8694b8bf6 100644
--- a/loleaflet/src/control/Control.PartsPreview.js
+++ b/loleaflet/src/control/Control.PartsPreview.js
@@ -184,6 +184,14 @@ L.Control.PartsPreview = L.Control.extend({
$(this._partsPreviewCont).mCustomScrollbar('destroy');
this.createScrollbar();
}
+
+ // Hide portrait view's previews when layout view is
used.
+ if (this._direction === 'x' && window.mode.isMobile()) {
+
document.getElementById('mobile-slide-sorter').style.display = 'block';
+ }
+ else if (this._direction === 'y' &&
window.mode.isMobile()) {
+
document.getElementById('mobile-slide-sorter').style.display = 'none';
+ }
}
},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loleaflet/css
loleaflet/css/toolbar.css |4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
New commits:
commit 0c9d7bd8b6c8661cc29cc012933de03f22410fcc
Author: gokaysatir
AuthorDate: Wed Sep 2 19:36:24 2020 +0300
Commit: Andras Timar
CommitDate: Wed Sep 2 18:42:14 2020 +0200
leaflet: Insert shape dialog icon height adjustment.
Change-Id: I17cd5701cb5b8fa2f03be76ee83df225b25bca39
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101949
Tested-by: Andras Timar
Reviewed-by: Andras Timar
diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index b5c69c9f8..0c99b92f5 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -799,7 +799,6 @@ button.leaflet-control-search-next
}
.insertshape-grid .row {
- height: 30px;
height: auto;
position: static;
text-align: left;
@@ -810,8 +809,7 @@ button.leaflet-control-search-next
}
.insertshape-grid .col {
- height: 100%;
- float: left;
+ height: 30px;
padding: 2px;
width: 30px;
border: 1px solid transparent;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loleaflet/css
loleaflet/css/device-mobile.css |2 +-
loleaflet/css/mobilewizard.css |4 +++-
loleaflet/css/toolbar.css | 12 ++--
3 files changed, 14 insertions(+), 4 deletions(-)
New commits:
commit 311aa47d20b812d7a0e20cc3766f42c6f9361ff0
Author: gokaysatir
AuthorDate: Wed Aug 19 13:16:52 2020 +0300
Commit: Andras Timar
CommitDate: Wed Sep 2 15:42:35 2020 +0200
loleaflet: Insert shape window last row visibility.
Last row wasn't fully visible on Calculator mobile view.
Change-Id: Ia326fddc3510eabbca9b3d9b4bd90bf30f95f785
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100982
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101930
diff --git a/loleaflet/css/device-mobile.css b/loleaflet/css/device-mobile.css
index ca860b9f3..d7f0d95fa 100644
--- a/loleaflet/css/device-mobile.css
+++ b/loleaflet/css/device-mobile.css
@@ -411,7 +411,7 @@
button.vex-dialog-button-secondary.vex-dialog-button.vex-last {
/* Related to toolbar.css */
.insertshape-grid {
box-sizing: content-box;
- position: absolute;
+ position: static;
padding: 2px 0px 2px 0px;
display: inline-block;
width: 100%;
diff --git a/loleaflet/css/mobilewizard.css b/loleaflet/css/mobilewizard.css
index 72350c49d..1dc843408 100644
--- a/loleaflet/css/mobilewizard.css
+++ b/loleaflet/css/mobilewizard.css
@@ -264,7 +264,8 @@ p.mobile-wizard.ui-combobox-text.selected {
bottom: 0px;
z-index: 1000;
background-color: white;
- box-shadow: 0px -2px 4px 1px #0030
+ box-shadow: 0px -2px 4px 1px #0030;
+ overflow-y: scroll;
}
#mobile-wizard-content *{
@@ -278,6 +279,7 @@ p.mobile-wizard.ui-combobox-text.selected {
height: 48px;
color: #636363;
border-bottom: 1px solid #dd !important;
+ position: sticky;
}
.ui-content.mobile-wizard {
diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index 5f87541ee..f8b720a61 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -800,6 +800,13 @@ button.leaflet-control-search-next
.insertshape-grid .row {
height: 30px;
+ height: auto;
+ position: static;
+ text-align: left;
+}
+
+.insertshape-grid .row:last-child {
+ margin-bottom: 70px;
}
.insertshape-grid .col {
@@ -813,10 +820,11 @@ button.leaflet-control-search-next
.insertshape-grid .row-header {
height: 30px;
text-align: center;
- padding: 5px;
- padding-top: 10px;
+ padding: 7px;
clear: both;
background-color: rgba(128, 128, 128, 0.1);
+ position: static;
+ line-height: 30px;
}
.insertshape-grid .col:hover {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - 2 commits - loleaflet/src
loleaflet/src/control/Control.PartsPreview.js |2 +-
loleaflet/src/layer/tile/TileLayer.js | 10 +-
2 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 430e310ea7a2d23e26bc90028b84c0546858cff1
Author: gokaysatir
AuthorDate: Fri Aug 28 21:36:35 2020 +0300
Commit: Andras Timar
CommitDate: Wed Sep 2 10:42:27 2020 +0200
loleaflet: Impress slide scroll improved.
On tablet, slide preview scroll section is always on the left column. So
when user switches to layout/portrait views, scroll item's classes should
remain same.
Change-Id: I84349cd48b317578d9bb2687c3a66aa788f57780
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101866
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
diff --git a/loleaflet/src/control/Control.PartsPreview.js
b/loleaflet/src/control/Control.PartsPreview.js
index 58408b48f..6d7b6c3da 100644
--- a/loleaflet/src/control/Control.PartsPreview.js
+++ b/loleaflet/src/control/Control.PartsPreview.js
@@ -179,7 +179,7 @@ L.Control.PartsPreview = L.Control.extend({
// re-create scrollbar with new direction
var direction = this._direction;
- this._direction = !window.mode.isDesktop() &&
L.DomUtil.isPortrait() ? 'x' : 'y';
+ this._direction = !window.mode.isDesktop() &&
!window.mode.isTablet() && L.DomUtil.isPortrait() ? 'x' : 'y';
if (direction !== this._direction) {
$(this._partsPreviewCont).mCustomScrollbar('destroy');
this.createScrollbar();
commit 3dd8f0075b8e3d0023b58e73d58b63169e673808
Author: Szymon Kłos
AuthorDate: Mon Jul 13 10:28:54 2020 +0200
Commit: Andras Timar
CommitDate: Wed Sep 2 10:42:12 2020 +0200
Don't show cell selection resize handles for desktop
Change-Id: I6ac7518bd46308fffd692be576d368b5e5067fd6
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98619
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Szymon Kłos
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101524
Reviewed-by: Andras Timar
diff --git a/loleaflet/src/layer/tile/TileLayer.js
b/loleaflet/src/layer/tile/TileLayer.js
index 5bb537f8d..cba7cf179 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -3075,11 +3075,11 @@ L.TileLayer = L.GridLayer.extend({
},
_onUpdateCellResizeMarkers: function () {
- var singleCellOnDesktop = window.mode.isDesktop()
- &&
!this._cellSelectionArea
- &&
(this._cellCursor && !this._isEmptyRectangle(this._cellCursor));
+ var selectionOnDesktop = window.mode.isDesktop()
+ &&
(this._cellSelectionArea
+ ||
(this._cellCursor && !this._isEmptyRectangle(this._cellCursor)));
- if (!singleCellOnDesktop &&
+ if (!selectionOnDesktop &&
(this._selections.getLayers().length !== 0 ||
(this._cellCursor && !this._isEmptyRectangle(this._cellCursor {
if (this._isEmptyRectangle(this._cellSelectionArea) &&
this._isEmptyRectangle(this._cellCursor)) {
return;
@@ -3115,7 +3115,7 @@ L.TileLayer = L.GridLayer.extend({
}
}
}
- else if (singleCellOnDesktop) {
+ else if (selectionOnDesktop) {
cellRectangle = this._cellSelectionArea ?
this._cellSelectionArea : this._cellCursor;
if (this._cellAutoFillArea) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source
svx/source/sidebar/area/AreaPropertyPanelBase.cxx |7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 5aba7d0bc54a03247fbd5e6514f79fff846f527c
Author: gokaysatir
AuthorDate: Sat Aug 8 16:27:48 2020 +0300
Commit: Andras Timar
CommitDate: Wed Sep 2 08:11:14 2020 +0200
Online: Hide shape area bitmap import button.
This patch is for Online.
Online handles "import" actions differently. This patch disables "Import"
button for only Online.
Change-Id: I6f6987ea82c102fc5ac44a1c48a234c9f43484e0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100391
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Jan Holesovsky
(cherry picked from commit 4a31a63c5e4d4dac01426581c39bc1ef9278f6cb)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100367
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100658
Tested-by: Jenkins
Reviewed-by: Andras Timar
diff --git a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
index 5768e54002a0..60f9290aac59 100644
--- a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
+++ b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
@@ -30,6 +30,7 @@
#include
#include
#include
+#include
using namespace css;
using namespace css::uno;
@@ -388,7 +389,8 @@ IMPL_LINK_NOARG(AreaPropertyPanelBase, SelectFillTypeHdl,
weld::ComboBox&, void)
GraphicObject aBitmap;
if(nPos == static_cast< sal_Int32 >(BITMAP))
{
-mxBmpImport->show();
+if (!comphelper::LibreOfficeKit::isActive())
+mxBmpImport->show();
const SvxBitmapListItem* pItem = pSh->GetItem(SID_BITMAP_LIST);
if(pItem)
{
@@ -1235,7 +1237,8 @@ void AreaPropertyPanelBase::Update()
{
if(pSh && pSh->GetItem(SID_BITMAP_LIST) && eXFS == BITMAP)
{
-mxBmpImport->show();
+if (!comphelper::LibreOfficeKit::isActive())
+mxBmpImport->show();
mxLbFillType->set_active(sal_uInt32(BITMAP));
SvxFillAttrBox::Fill(*mxLbFillAttr,
pSh->GetItem(SID_BITMAP_LIST)->GetBitmapList());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loleaflet/css loleaflet/src
loleaflet/css/device-mobile.css |3 ++-
loleaflet/src/control/Control.PartsPreview.js |3 +++
2 files changed, 5 insertions(+), 1 deletion(-)
New commits:
commit dcbaeb9ec1f6b2833815cf00e4dd4b62d635a180
Author: gokaysatir
AuthorDate: Fri Aug 28 15:58:46 2020 +0300
Commit: Andras Timar
CommitDate: Tue Sep 1 08:03:03 2020 +0200
loleaflet: Slides preview section improvements.
Change-Id: I4018cbc30d7b8b03f117bb229bf637706c70dc26
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101546
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
(cherry picked from commit 9c23e570421c881647c6035fa6ba00cd203f7ea5)
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101669
diff --git a/loleaflet/css/device-mobile.css b/loleaflet/css/device-mobile.css
index c6f8e7d5f..ca860b9f3 100644
--- a/loleaflet/css/device-mobile.css
+++ b/loleaflet/css/device-mobile.css
@@ -700,8 +700,9 @@ td[id^=tb_spreadsheet-toolbar_item]:focus table.w2ui-button
div.w2ui-icon, td[id
.preview-frame-portrait {
max-height: 60px;
max-width: 100%;
- display: table-cell;
+ display: inline-block;
padding-right: 1em;
+ margin: 0;
}
.preview-frame-portrait.preview-img-dropsite {
diff --git a/loleaflet/src/control/Control.PartsPreview.js
b/loleaflet/src/control/Control.PartsPreview.js
index af553f552..e529fad22 100644
--- a/loleaflet/src/control/Control.PartsPreview.js
+++ b/loleaflet/src/control/Control.PartsPreview.js
@@ -62,6 +62,9 @@ L.Control.PartsPreview = L.Control.extend({
}
}
});
+
+ var scrollContainer =
$(this._partsPreviewCont).find('.mCSB_container').get(0);
+ scrollContainer.style.whiteSpace = 'nowrap';
},
_updateDisabled: function (e) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/control/Control.UIManager.js |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 0334c4b04872add86ee5f4526286c231c8bb376c
Author: gokaysatir
AuthorDate: Fri Aug 28 11:17:03 2020 +0300
Commit: Szymon Kłos
CommitDate: Mon Aug 31 13:24:00 2020 +0200
loleaflet: Tablet notebookbar special case.
Change-Id: I7acad9b8891cedac49f47746a61c8df6f19a1250
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101525
Reviewed-by: Szymon Kłos
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
diff --git a/loleaflet/src/control/Control.UIManager.js
b/loleaflet/src/control/Control.UIManager.js
index 3da1d6921..a4459e39e 100644
--- a/loleaflet/src/control/Control.UIManager.js
+++ b/loleaflet/src/control/Control.UIManager.js
@@ -114,7 +114,7 @@ L.Control.UIManager = L.Control.extend({
this.map.addControl(L.control.presentationBar());
}
- if (window.mode.isMobile() || window.mode.isTablet()) {
+ if (window.mode.isMobile() || (window.mode.isTablet() &&
!enableNotebookbar)) {
this.map.on('updatetoolbarcommandvalues', function() {
w2ui['editbar'].refresh();
});
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css loleaflet/src
loleaflet/css/device-mobile.css |3 ++-
loleaflet/src/control/Control.PartsPreview.js |3 +++
2 files changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 9c23e570421c881647c6035fa6ba00cd203f7ea5
Author: gokaysatir
AuthorDate: Fri Aug 28 15:58:46 2020 +0300
Commit: Andras Timar
CommitDate: Mon Aug 31 11:09:27 2020 +0200
loleaflet: Slides preview section improvements.
Change-Id: I4018cbc30d7b8b03f117bb229bf637706c70dc26
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101546
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
diff --git a/loleaflet/css/device-mobile.css b/loleaflet/css/device-mobile.css
index 38a7658f4..c12126a04 100644
--- a/loleaflet/css/device-mobile.css
+++ b/loleaflet/css/device-mobile.css
@@ -700,8 +700,9 @@ td[id^=tb_spreadsheet-toolbar_item]:focus table.w2ui-button
div.w2ui-icon, td[id
.preview-frame-portrait {
max-height: 60px;
max-width: 100%;
- display: table-cell;
+ display: inline-block;
padding-right: 1em;
+ margin: 0;
}
.preview-frame-portrait.preview-img-dropsite {
diff --git a/loleaflet/src/control/Control.PartsPreview.js
b/loleaflet/src/control/Control.PartsPreview.js
index 718d65b50..ca5155d4d 100644
--- a/loleaflet/src/control/Control.PartsPreview.js
+++ b/loleaflet/src/control/Control.PartsPreview.js
@@ -62,6 +62,9 @@ L.Control.PartsPreview = L.Control.extend({
}
}
});
+
+ var scrollContainer =
$(this._partsPreviewCont).find('.mCSB_container').get(0);
+ scrollContainer.style.whiteSpace = 'nowrap';
},
_updateDisabled: function (e) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loleaflet/src
loleaflet/src/control/Toolbar.js | 21 ++---
1 file changed, 18 insertions(+), 3 deletions(-)
New commits:
commit 5f34991930e2805be9b11634e032579aeab78a48
Author: gokaysatir
AuthorDate: Wed Jul 29 18:00:44 2020 +0300
Commit: Andras Timar
CommitDate: Fri Aug 28 10:19:12 2020 +0200
loleaflet: Hyperlink textbox focus & content.
Change-Id: I08db18c98fc43861cc8783700b28cbeb6f9b5a74
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99710
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Henry Castro
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101501
Reviewed-by: Andras Timar
diff --git a/loleaflet/src/control/Toolbar.js b/loleaflet/src/control/Toolbar.js
index e873cf2b1..80c1d3bbd 100644
--- a/loleaflet/src/control/Toolbar.js
+++ b/loleaflet/src/control/Toolbar.js
@@ -596,7 +596,9 @@ L.Map.include({
text = this.hyperlinkUnderCursor.text;
link = this.hyperlinkUnderCursor.link;
} else if (this._clip && this._clip._selectionType == 'text') {
- text =
this.extractContent(this._clip._selectionContent);
+ if (map['stateChangeHandler'].getItemValue('.uno:Copy')
=== 'enabled') {
+ text =
this.extractContent(this._clip._selectionContent);
+ }
} else if (this._docLayer._selectedTextContent) {
text =
this.extractContent(this._docLayer._selectedTextContent);
}
@@ -605,8 +607,8 @@ L.Map.include({
contentClassName: 'hyperlink-dialog',
message: _('Insert hyperlink'),
input: [
- _('Text') + '',
- _('Link') + ''
+ _('Text') + '',
+ _('Link') + ''
].join(''),
buttons: [
$.extend({}, vex.dialog.buttons.YES, { text:
_('OK') }),
@@ -627,6 +629,19 @@ L.Map.include({
map.sendUnoCommand('.uno:SetHyperlink',
command);
map.focus();
}
+ else {
+ map.focus();
+ }
+ },
+ afterOpen: function() {
+ setTimeout(function() {
+ if
(document.getElementById('hyperlink-text-box').value.trim() !== '') {
+
document.getElementById('hyperlink-link-box').focus();
+ }
+ else {
+
document.getElementById('hyperlink-text-box').focus();
+ }
+ }, 0);
}
});
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css
loleaflet/css/device-mobile.css |2 +-
loleaflet/css/mobilewizard.css |5 +++--
loleaflet/css/toolbar.css |8
3 files changed, 8 insertions(+), 7 deletions(-)
New commits:
commit 8895a48d1f430260bc79ae1c65b447c7f70b1894
Author: gokaysatir
AuthorDate: Wed Aug 19 13:16:52 2020 +0300
Commit: Andras Timar
CommitDate: Thu Aug 27 20:48:21 2020 +0200
loleaflet: Insert shape window last row visibility.
Last row wasn't fully visible on Calculator mobile view.
Change-Id: Ia326fddc3510eabbca9b3d9b4bd90bf30f95f785
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100982
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
diff --git a/loleaflet/css/device-mobile.css b/loleaflet/css/device-mobile.css
index f78dd8fb8..38a7658f4 100644
--- a/loleaflet/css/device-mobile.css
+++ b/loleaflet/css/device-mobile.css
@@ -411,7 +411,7 @@
button.vex-dialog-button-secondary.vex-dialog-button.vex-last {
/* Related to toolbar.css */
.insertshape-grid {
box-sizing: content-box;
- position: absolute;
+ position: static;
padding: 2px 0px 2px 0px;
display: inline-block;
width: 100%;
diff --git a/loleaflet/css/mobilewizard.css b/loleaflet/css/mobilewizard.css
index ae530a7f3..efb84291e 100644
--- a/loleaflet/css/mobilewizard.css
+++ b/loleaflet/css/mobilewizard.css
@@ -194,7 +194,6 @@ p.mobile-wizard.ui-combobox-text.selected {
top: 111px;
bottom: 0px;
width: 100%;
- padding-bottom: 50px;
}
#mobile-wizard.funcwizard div#mobile-wizard-content.hideHelpBG {
background: none !important;
@@ -265,7 +264,8 @@ p.mobile-wizard.ui-combobox-text.selected {
bottom: 0px;
z-index: 1000;
background-color: white;
- box-shadow: 0px -2px 4px 1px #0030
+ box-shadow: 0px -2px 4px 1px #0030;
+ overflow-y: scroll;
}
#mobile-wizard-content *{
@@ -279,6 +279,7 @@ p.mobile-wizard.ui-combobox-text.selected {
height: 48px;
color: #636363;
border-bottom: 1px solid #dd !important;
+ position: sticky;
}
.ui-content.mobile-wizard {
diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index 3be4c97e6..986290d35 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -852,8 +852,7 @@ button.leaflet-control-search-next
}
.insertshape-grid .row:last-child {
- box-sizing: content-box;
- margin-bottom: 43px;
+ margin-bottom: 70px;
}
.insertshape-grid .col {
@@ -866,10 +865,11 @@ button.leaflet-control-search-next
.insertshape-grid .row-header {
height: 30px;
text-align: center;
- padding: 5px;
- padding-top: 10px;
+ padding: 7px;
clear: both;
background-color: rgba(128, 128, 128, 0.1);
+ position: static;
+ line-height: 30px;
}
.insertshape-grid .col:hover {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loleaflet/css loleaflet/src
loleaflet/css/loleaflet.css|4 ++--
loleaflet/css/spreadsheet.css |8 +++-
loleaflet/src/control/Control.LokDialog.js | 25 +
loleaflet/src/control/Control.Tabs.js |1 -
4 files changed, 6 insertions(+), 32 deletions(-)
New commits:
commit 13445521016e3c274843b7d2a1dd0b72202eec05
Author: gokaysatir
AuthorDate: Fri Jul 10 15:06:27 2020 +0300
Commit: Andras Timar
CommitDate: Wed Aug 26 11:46:50 2020 +0200
loleaflet: sidebar overlap issue.
Change-Id: Iff2184725c49c24900865d9865237e9747a050cb
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98555
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Tested-by: Henry Castro
Reviewed-by: Henry Castro
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101383
Reviewed-by: Andras Timar
diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css
index 57ec51d9e..e60639b08 100644
--- a/loleaflet/css/loleaflet.css
+++ b/loleaflet/css/loleaflet.css
@@ -158,7 +158,7 @@ body {
position: absolute;
top: 77px;
right: 0px;
- bottom: 37px;
+ bottom: 72px;
border-top: 1px solid #b6b6b6;
border-left: 1px solid #b6b6b6;
overflow: hidden;
@@ -172,7 +172,7 @@ body {
width: auto;
height: 100%;
overflow-x: hidden;
- overflow-y: scroll;
+ overflow-y: auto;
z-index: 1200;
}
diff --git a/loleaflet/css/spreadsheet.css b/loleaflet/css/spreadsheet.css
index 1934933b5..6111444a7 100644
--- a/loleaflet/css/spreadsheet.css
+++ b/loleaflet/css/spreadsheet.css
@@ -2,7 +2,7 @@
border-top: 1px solid #B6B6B6;
top: 137px;
left: 50px;
- bottom: 65px;
+ bottom: 75px;
}
#document-container.spreadsheet-document.readonly {
@@ -13,7 +13,7 @@
border-top: 1px solid #B6B6B6;
top: 100px;
left: 50px;
- bottom: 68px;
+ bottom: 78px;
}
.spreadsheet-tabs-container {
@@ -36,14 +36,12 @@
height: 100%;
overflow: auto;
padding-bottom: 20px; /* to hide the horizontal scrollbar */
- padding-right: 5px; /* to hide the vertical scrollbar */
-
margin-left: 6px;
}
.spreadsheet-tab {
margin: 0px;
- margin-top: 2px;
+ margin-top: 4px;
margin-right: 3px;
padding-left: 9px;
padding-right: 9px;
diff --git a/loleaflet/src/control/Control.LokDialog.js
b/loleaflet/src/control/Control.LokDialog.js
index b46fa91c4..4228f46d7 100644
--- a/loleaflet/src/control/Control.LokDialog.js
+++ b/loleaflet/src/control/Control.LokDialog.js
@@ -1628,7 +1628,7 @@ L.Control.LokDialog = L.Control.extend({
spreadsheetRowColumnFrame.style.right =
width.toString() + 'px';
this._resizeCalcInputBar(deckOffset);
- this._adjustTabsBar(width);
+
},
_resizeCalcInputBar: function(offset) {
@@ -1649,29 +1649,6 @@ L.Control.LokDialog = L.Control.extend({
}
},
- _adjustTabsBar: function(deckNewWidth) {
-
- if (this._map.getDocType() !== 'spreadsheet') {
- return;
- }
-
- // This is called only if sidebar is made visible or hidden, so
no need of
- // special-casing for mobile where that never happens.
- // In the case of tablets, when sidebar is made visible/hidden
the below adjustments
- // will work correctly like in desktop-online (verified with
chrome-tablet emulator).
-
- var tabsContainer =
L.DomUtil.get('spreadsheet-tabs-container-id');
- if (!tabsContainer) {
- return;
- }
-
- var docWidth =
L.DomUtil.get('spreadsheet-toolbar').getBoundingClientRect().width;
- var tabsContainerLeft =
tabsContainer.getBoundingClientRect().left;
- var deckMargin = (deckNewWidth === 0) ? 0 : 10;
-
- tabsContainer.style.width = (docWidth - tabsContainerLeft -
deckNewWidth - deckMargin) + 'px';
- },
-
_onDialogChildClose: function(dialogId) {
$('#' + this._toStrId(dialogId) + '-floating').remove();
if (!this._isSidebar(dialogId) &&
!this.isCalcInputBar(dialogId)) {
diff --git a/loleaflet/src/control/Control.Tabs.js
b/loleaflet/src/control/Control.Tabs.js
index 7bb681364..06ccd043a 100644
--- a/loleaflet/src/control/Control.Tabs.js
+++ b/loleaflet/src/control/Control.Tabs.js
@@ -42,7 +42,6 @@ L.Control.Tabs = L.Control.extend({
var map = this._map;
var docContainer = map.options.documentContainer;
this._tabsCont = L.DomUtil.create('div',
'spreadsheet-tabs-container', docContainer.parentElement);
-
[Libreoffice-commits] online.git: loleaflet/css loleaflet/src
loleaflet/css/device-mobile.css |2 +-
loleaflet/src/control/Control.PartsPreview.js | 10 +++---
2 files changed, 4 insertions(+), 8 deletions(-)
New commits:
commit a5e77d71c25d64fd9d2458a9de90e64acc87a4a9
Author: gokaysatir
AuthorDate: Tue Aug 25 13:42:05 2020 +0300
Commit: Andras Timar
CommitDate: Tue Aug 25 22:08:35 2020 +0200
Loleaflet: Impress image previews are adjusted.
Change-Id: I0c333b58e823702678c4c292de2f58adabbdb3c1
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101319
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
diff --git a/loleaflet/css/device-mobile.css b/loleaflet/css/device-mobile.css
index 2efd9d6cf..69c20c215 100644
--- a/loleaflet/css/device-mobile.css
+++ b/loleaflet/css/device-mobile.css
@@ -696,7 +696,7 @@ td[id^=tb_spreadsheet-toolbar_item]:focus table.w2ui-button
div.w2ui-icon, td[id
.preview-frame-portrait {
max-height: 60px;
- max-width: initial;
+ max-width: 100%;
display: table-cell;
padding-right: 1em;
}
diff --git a/loleaflet/src/control/Control.PartsPreview.js
b/loleaflet/src/control/Control.PartsPreview.js
index 7d4648f7d..718d65b50 100644
--- a/loleaflet/src/control/Control.PartsPreview.js
+++ b/loleaflet/src/control/Control.PartsPreview.js
@@ -12,8 +12,8 @@ L.Control.PartsPreview = L.Control.extend({
frameClass: '',
axis: '',
allowOrientation: true,
- maxWidth: !window.mode.isDesktop() ? 60 : 180,
- maxHeight: !window.mode.isDesktop() ? 60 : 180
+ maxWidth: window.mode.isDesktop() ? 180:
(window.mode.isTablet() ? 120: 60),
+ maxHeight: window.mode.isDesktop() ? 180:
(window.mode.isTablet() ? 120: 60)
},
partsFocused: false,
@@ -129,6 +129,7 @@ L.Control.PartsPreview = L.Control.extend({
this._previewTiles.push(this._createPreview(i, e.partNames[i], bottomBound));
}
L.DomUtil.addClass(this._previewTiles[selectedPart], 'preview-img-currentpart');
+ this._onScroll(); // Load previews.
this._previewInitialized = true;
}
else
@@ -314,11 +315,6 @@ L.Control.PartsPreview = L.Control.extend({
this._previewFrameHeight = imgHeight + 2 *
previewImgBorder;
}
}
-
- if (!window.mode.isDesktop() && imgSize) {
- L.DomUtil.setStyle(img, 'width', imgSize.width + 'px');
- L.DomUtil.setStyle(img, 'height', imgSize.height +
'px');
- }
},
_setPart: function (e) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loleaflet/css loleaflet/src
loleaflet/css/device-mobile.css |2 +-
loleaflet/src/control/Control.PartsPreview.js | 10 +++---
2 files changed, 4 insertions(+), 8 deletions(-)
New commits:
commit 55beee680ee4e59e077f35a6ef07284c538063a3
Author: gokaysatir
AuthorDate: Tue Aug 25 13:42:05 2020 +0300
Commit: Andras Timar
CommitDate: Tue Aug 25 20:53:59 2020 +0200
Loleaflet: Impress image previews are adjusted.
Change-Id: I0c333b58e823702678c4c292de2f58adabbdb3c1
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101167
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
diff --git a/loleaflet/css/device-mobile.css b/loleaflet/css/device-mobile.css
index d0eec0d6a..ba7c0cb76 100644
--- a/loleaflet/css/device-mobile.css
+++ b/loleaflet/css/device-mobile.css
@@ -696,7 +696,7 @@ td[id^=tb_spreadsheet-toolbar_item]:focus table.w2ui-button
div.w2ui-icon, td[id
.preview-frame-portrait {
max-height: 60px;
- max-width: initial;
+ max-width: 100%;
display: table-cell;
padding-right: 1em;
}
diff --git a/loleaflet/src/control/Control.PartsPreview.js
b/loleaflet/src/control/Control.PartsPreview.js
index 7d4648f7d..718d65b50 100644
--- a/loleaflet/src/control/Control.PartsPreview.js
+++ b/loleaflet/src/control/Control.PartsPreview.js
@@ -12,8 +12,8 @@ L.Control.PartsPreview = L.Control.extend({
frameClass: '',
axis: '',
allowOrientation: true,
- maxWidth: !window.mode.isDesktop() ? 60 : 180,
- maxHeight: !window.mode.isDesktop() ? 60 : 180
+ maxWidth: window.mode.isDesktop() ? 180:
(window.mode.isTablet() ? 120: 60),
+ maxHeight: window.mode.isDesktop() ? 180:
(window.mode.isTablet() ? 120: 60)
},
partsFocused: false,
@@ -129,6 +129,7 @@ L.Control.PartsPreview = L.Control.extend({
this._previewTiles.push(this._createPreview(i, e.partNames[i], bottomBound));
}
L.DomUtil.addClass(this._previewTiles[selectedPart], 'preview-img-currentpart');
+ this._onScroll(); // Load previews.
this._previewInitialized = true;
}
else
@@ -314,11 +315,6 @@ L.Control.PartsPreview = L.Control.extend({
this._previewFrameHeight = imgHeight + 2 *
previewImgBorder;
}
}
-
- if (!window.mode.isDesktop() && imgSize) {
- L.DomUtil.setStyle(img, 'width', imgSize.width + 'px');
- L.DomUtil.setStyle(img, 'height', imgSize.height +
'px');
- }
},
_setPart: function (e) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css
loleaflet/css/loleaflet.css |6 ++
1 file changed, 6 insertions(+)
New commits:
commit 745f4a5287b987649ccf80d618843ae0e843f5fd
Author: gokaysatir
AuthorDate: Tue Aug 11 19:09:45 2020 +0530
Commit: Andras Timar
CommitDate: Wed Aug 19 21:40:53 2020 +0200
leaflet: truncate long links in the popup
Change-Id: I82ab8d35e0c57aa82b130a89d0d4c7b3ba0b50e6
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100547
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Aron Budea
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101020
Tested-by: Jenkins
Reviewed-by: Andras Timar
diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css
index 5fbfe8c6b..2c3703763 100644
--- a/loleaflet/css/loleaflet.css
+++ b/loleaflet/css/loleaflet.css
@@ -625,4 +625,10 @@ body {
.word-wrap-for-vex-dialog {
overflow-wrap: break-word;
+}
+
+.hyperlink-popup .leaflet-popup-content {
+ white-space: nowrap;
+overflow: hidden;
+text-overflow: ellipsis;
}
\ No newline at end of file
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loleaflet/src
loleaflet/src/control/Control.LokDialog.js |5 +
1 file changed, 5 insertions(+)
New commits:
commit e07f47d2486a07826bfa025cd2d47b267474848c
Author: gokaysatir
AuthorDate: Wed Aug 12 17:20:54 2020 +0300
Commit: Aron Budea
CommitDate: Tue Aug 18 21:49:03 2020 +0200
loleaflet: Prevent sidebar from opening when file is on read only mode.
This patch is for preventing sidebar from being launched when:
* Document is on read only mode (No need for an editor bar when doc is
read-only).
* Also the main reason for this patch was to hide Sidebar when revision
history is open (NC).
Change-Id: I4d78c65a7e8f39b0827b9e23ecc24fcd9520fef8
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100601
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Henry Castro
(cherry picked from commit eb8e075ce02e54da4f5eca86157919001978cda0)
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100933
Reviewed-by: Aron Budea
diff --git a/loleaflet/src/control/Control.LokDialog.js
b/loleaflet/src/control/Control.LokDialog.js
index 57b5fdc95..117ae0873 100644
--- a/loleaflet/src/control/Control.LokDialog.js
+++ b/loleaflet/src/control/Control.LokDialog.js
@@ -1009,6 +1009,11 @@ L.Control.LokDialog = L.Control.extend({
},
_launchSidebar: function(id, width, height) {
+ // In read-only mode, we don't need to show sidebar. This if
clause prevents sidebar from opening also when revision history is open.
+ if (this._map.isPermissionReadOnly()) {
+ return;
+ }
+
console.log('_launchSidebar: start: id: ' + id + ', width: ' +
width + ', height: ' + height);
if ((window.mode.isMobile() || window.mode.isTablet())
&& !this._map.isPermissionEdit())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/control/Control.LokDialog.js | 10 +-
1 file changed, 9 insertions(+), 1 deletion(-)
New commits:
commit 46e996c76f8f03b4ff8c55f15a3375a1d76fae48
Author: gokaysatir
AuthorDate: Thu Aug 13 20:37:32 2020 +0300
Commit: Henry Castro
CommitDate: Tue Aug 18 19:52:41 2020 +0200
loleaflet: Make sure lokchild window is not rendered off screen.
Change-Id: Ib1d8c045750aeb653d8b1d1e962711e5da1705fe
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100683
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Henry Castro
diff --git a/loleaflet/src/control/Control.LokDialog.js
b/loleaflet/src/control/Control.LokDialog.js
index 40e422e02..e9440b15f 100644
--- a/loleaflet/src/control/Control.LokDialog.js
+++ b/loleaflet/src/control/Control.LokDialog.js
@@ -1562,6 +1562,14 @@ L.Control.LokDialog = L.Control.extend({
var newLeft = window.innerWidth - width - 20;
L.DomUtil.setStyle(canvas, 'left', newLeft + 'px');
}
+ // Also, make sure child is not trimmed on bottom.
+ var top = parseInt(canvas.style.top);
+ var height = this._dialogs[parentId].childheight;
+ var bottomPos = top + height;
+ if (bottomPos > window.innerHeight) {
+ var newTop = top - height - 20;
+ L.DomUtil.setStyle(canvas, 'top', newTop + 'px');
+ }
// The image is rendered per the HiDPI scale we used
// while requesting rendering the image. Here we
@@ -1674,7 +1682,7 @@ L.Control.LokDialog = L.Control.extend({
var grandParentID = dialogContainer.parentNode.id;
if (grandParentID.includes('sidebar-panel'))
{
- // This is a sidebar.
+ // floatingCanvas is a child window of a sidebar.
L.DomUtil.setStyle(floatingCanvas, 'left',
(containerLeft + left) + 'px');
L.DomUtil.setStyle(floatingCanvas, 'top', (containerTop
+ top) + 'px');
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css
loleaflet/css/toolbar.css | 18 --
1 file changed, 12 insertions(+), 6 deletions(-)
New commits:
commit 5de37de1c7e51443889979c06ad0bfbe1d3f5630
Author: gokaysatir
AuthorDate: Wed Aug 12 19:20:42 2020 +0300
Commit: Henry Castro
CommitDate: Sat Aug 15 00:01:06 2020 +0200
loleaflet mobile: Insert image: Make all items visible.
Change-Id: If479adf4a3b106676f9174669e3f7141bb23964d
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100613
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Henry Castro
diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index 0f11a2b34..9b1b579af 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -792,21 +792,27 @@ button.leaflet-control-search-next
.insertshape-grid {
box-sizing: border-box;
background: rgba(255, 255, 255, 0.5);
- position: relative;
+ position: static;
padding: 2px;
- display: inline-block;
+ display: block;
min-width: 350px;
width: 100%;
- height: 100%;
+ height: auto;
}
.insertshape-grid .row {
- height: 30px;
+ height: auto;
+ position: static;
+ text-align: left;
+}
+
+.insertshape-grid .row:last-child {
+ box-sizing: content-box;
+ margin-bottom: 43px;
}
.insertshape-grid .col {
- height: 100%;
- float: left;
+ height: 30px;
padding: 2px;
width: 30px;
border: 1px solid transparent;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/control/Control.LokDialog.js |5 +
1 file changed, 5 insertions(+)
New commits:
commit eb8e075ce02e54da4f5eca86157919001978cda0
Author: gokaysatir
AuthorDate: Wed Aug 12 17:20:54 2020 +0300
Commit: Henry Castro
CommitDate: Thu Aug 13 21:08:24 2020 +0200
loleaflet: Prevent sidebar from opening when file is on read only mode.
This patch is for preventing sidebar from being launched when:
* Document is on read only mode (No need for an editor bar when doc is
read-only).
* Also the main reason for this patch was to hide Sidebar when revision
history is open (NC).
Change-Id: I4d78c65a7e8f39b0827b9e23ecc24fcd9520fef8
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100601
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Henry Castro
diff --git a/loleaflet/src/control/Control.LokDialog.js
b/loleaflet/src/control/Control.LokDialog.js
index 3332c53ed..40e422e02 100644
--- a/loleaflet/src/control/Control.LokDialog.js
+++ b/loleaflet/src/control/Control.LokDialog.js
@@ -991,6 +991,11 @@ L.Control.LokDialog = L.Control.extend({
},
_launchSidebar: function(id, width, height) {
+ // In read-only mode, we don't need to show sidebar. This if
clause prevents sidebar from opening also when revision history is open.
+ if (this._map.isPermissionReadOnly()) {
+ return;
+ }
+
console.log('_launchSidebar: start: id: ' + id + ', width: ' +
width + ', height: ' + height);
if ((window.mode.isMobile() || window.mode.isTablet())
&& !this._map.isPermissionEdit())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - svx/source
svx/source/sidebar/area/AreaPropertyPanelBase.cxx |7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 93aed840d996af6a7189bd6d5a3c40ca8e9b5205
Author: gokaysatir
AuthorDate: Sat Aug 8 16:27:48 2020 +0300
Commit: Aron Budea
CommitDate: Wed Aug 12 01:38:25 2020 +0200
core: Hide shape area bitmap import button.
Change-Id: I6f6987ea82c102fc5ac44a1c48a234c9f43484e0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100391
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Jan Holesovsky
(cherry picked from commit 4a31a63c5e4d4dac01426581c39bc1ef9278f6cb)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100367
diff --git a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
index e22455ee2c5e..0e911e47b1e9 100644
--- a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
+++ b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
@@ -37,6 +37,7 @@
#include
#include
#include
+#include
using namespace css;
using namespace css::uno;
@@ -377,7 +378,8 @@ IMPL_LINK_NOARG(AreaPropertyPanelBase, SelectFillTypeHdl,
ListBox&, void)
GraphicObject aBitmap;
if(nPos == static_cast< sal_Int32 >(BITMAP))
{
-mpBmpImport->Show();
+if (!comphelper::LibreOfficeKit::isActive())
+mpBmpImport->Show();
const SvxBitmapListItem* pItem = pSh->GetItem(SID_BITMAP_LIST);
if(pItem)
{
@@ -1219,7 +1221,8 @@ void AreaPropertyPanelBase::Update()
{
if(pSh && pSh->GetItem(SID_BITMAP_LIST) && eXFS == BITMAP)
{
-mpBmpImport->Show();
+if (!comphelper::LibreOfficeKit::isActive())
+mpBmpImport->Show();
mpLbFillType->SelectEntryPos(sal_uInt32(BITMAP));
mpLbFillAttr->Fill(pSh->GetItem(SID_BITMAP_LIST)->GetBitmapList());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loleaflet/js
loleaflet/js/w2ui-1.5.rc1.js |1 +
1 file changed, 1 insertion(+)
New commits:
commit 16c743d61044224aa521e1428beda2703030
Author: gokaysatir
AuthorDate: Sat Jul 11 14:35:26 2020 +0300
Commit: Aron Budea
CommitDate: Tue Aug 11 22:59:40 2020 +0200
loleaflet: Hide w2ui tooltips on mobile.
Change-Id: Iaf57e6f53fbc363e22ac1c11de0eb657d492edd3
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98558
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Henry Castro
(cherry picked from commit 9aae80518d23dab3dbd8fdc9369b61d70798ea67)
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100364
Reviewed-by: Aron Budea
diff --git a/loleaflet/js/w2ui-1.5.rc1.js b/loleaflet/js/w2ui-1.5.rc1.js
index 533941987..4ff42eed2 100644
--- a/loleaflet/js/w2ui-1.5.rc1.js
+++ b/loleaflet/js/w2ui-1.5.rc1.js
@@ -6266,6 +6266,7 @@ w2utils.event = {
},
tooltipShow: function (id, event, forceRefresh) {
+if (window.mode.isMobile()) { return; }
if (window.ThisIsTheiOSApp) return;
if (this.tooltip == null) return;
var $el = $(this.box).find('#tb_'+ this.name + '_item_'+
w2utils.escapeId(id));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loleaflet/src
loleaflet/src/layer/tile/TileLayer.js |1 +
1 file changed, 1 insertion(+)
New commits:
commit 53ef2d33d00b51d44ab3370771ec8f23c69d760e
Author: gokaysatir
AuthorDate: Fri Jul 10 23:36:10 2020 +0300
Commit: Aron Budea
CommitDate: Tue Aug 11 22:58:44 2020 +0200
loleaflet: Remove carret marker when text selected.
Change-Id: Ifc055f852857188e4d35b9db1db62638ad5a27a5
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98546
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Michael Meeks
Reviewed-by: Henry Castro
(cherry picked from commit e5dfd6a2f27450007f11ff017d919ab69422c665)
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100363
Reviewed-by: Aron Budea
diff --git a/loleaflet/src/layer/tile/TileLayer.js
b/loleaflet/src/layer/tile/TileLayer.js
index 0e1845706..726a5a5b2 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -1668,6 +1668,7 @@ L.TileLayer = L.GridLayer.extend({
weight: 2,
opacity: 0.25});
this._selections.addLayer(selection);
+
this._map.removeLayer(this._map._textInput._cursorHandler); // User selected a
text, we remove the carret marker.
if (this._selectionContentRequest) {
clearTimeout(this._selectionContentRequest);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loleaflet/css
loleaflet/css/loleaflet.css |6 ++
1 file changed, 6 insertions(+)
New commits:
commit 7197201a1e54f9b0c5bb3bc212b27f4885c00560
Author: gokaysatir
AuthorDate: Tue Aug 11 19:09:45 2020 +0530
Commit: Aron Budea
CommitDate: Tue Aug 11 20:31:58 2020 +0200
leaflet: truncate long links in the popup
Change-Id: I82ab8d35e0c57aa82b130a89d0d4c7b3ba0b50e6
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100547
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Aron Budea
diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css
index 155188180..57ec51d9e 100644
--- a/loleaflet/css/loleaflet.css
+++ b/loleaflet/css/loleaflet.css
@@ -601,4 +601,10 @@ body {
.word-wrap-for-vex-dialog {
overflow-wrap: break-word;
+}
+
+.hyperlink-popup .leaflet-popup-content {
+ white-space: nowrap;
+overflow: hidden;
+text-overflow: ellipsis;
}
\ No newline at end of file
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loleaflet/css loleaflet/src
loleaflet/css/loleaflet.css |4
loleaflet/src/control/Control.AlertDialog.js |1 +
2 files changed, 5 insertions(+)
New commits:
commit 6051ccd7da466eab53223d4320549246246fef2c
Author: gokaysatir
AuthorDate: Mon Aug 10 11:10:30 2020 +0300
Commit: Jan Holesovsky
CommitDate: Tue Aug 11 19:41:04 2020 +0200
loleaflet: Wrap long words on hyperlink open dialog.
Change-Id: I944b2314c766f7e3f7f313a5afea3b022b637c05
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100416
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Jan Holesovsky
(cherry picked from commit 091df95ac1e8615a65e116a338a4ae643910e030)
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100512
diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css
index 8fe837734..155188180 100644
--- a/loleaflet/css/loleaflet.css
+++ b/loleaflet/css/loleaflet.css
@@ -598,3 +598,7 @@ body {
.drop-down-field-list-item:hover {
background: #0b87e7;
}
+
+.word-wrap-for-vex-dialog {
+ overflow-wrap: break-word;
+}
\ No newline at end of file
diff --git a/loleaflet/src/control/Control.AlertDialog.js
b/loleaflet/src/control/Control.AlertDialog.js
index 67224907a..8118a30f1 100644
--- a/loleaflet/src/control/Control.AlertDialog.js
+++ b/loleaflet/src/control/Control.AlertDialog.js
@@ -71,6 +71,7 @@ L.Control.AlertDialog = L.Control.extend({
vex.dialog.open({
message: messageText,
showCloseButton: true,
+ contentClassName: 'word-wrap-for-vex-dialog',
buttons: buttonsList,
callback: function() {},
afterClose: function () {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/control/Control.AlertDialog.js | 12
loleaflet/src/control/Control.ContextMenu.js |2 +-
loleaflet/src/control/Toolbar.js | 16 +++-
loleaflet/src/unocommands.js |1 +
4 files changed, 17 insertions(+), 14 deletions(-)
New commits:
commit 5287950d71f3324fb99b66b6d5fa77fb7ae46125
Author: gokaysatir
AuthorDate: Sat Aug 8 20:32:27 2020 +0300
Commit: Tamás Zolnai
CommitDate: Tue Aug 11 19:16:04 2020 +0200
loleaflet: remove edit button from open hyperlink modal.
Change-Id: I597281b136a41c49954c66f50fd546a209bba75a
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100392
Reviewed-by: Szymon Kłos
Tested-by: Jenkins
diff --git a/loleaflet/src/control/Control.AlertDialog.js
b/loleaflet/src/control/Control.AlertDialog.js
index c7cff3b8b..8118a30f1 100644
--- a/loleaflet/src/control/Control.AlertDialog.js
+++ b/loleaflet/src/control/Control.AlertDialog.js
@@ -68,18 +68,6 @@ L.Control.AlertDialog = L.Control.extend({
});
}
- if (this._map.getDocType() != 'presentation') {
- buttonsList.push({
- text: _('Edit'),
- type: 'button',
- className:
'vex-dialog-button-secondary',
- click: function editClick () {
- vex.closeAll();
- e.map.showHyperlinkDialog();
- }
- });
- }
-
vex.dialog.open({
message: messageText,
showCloseButton: true,
diff --git a/loleaflet/src/control/Control.ContextMenu.js
b/loleaflet/src/control/Control.ContextMenu.js
index c4449340e..107da8ba0 100644
--- a/loleaflet/src/control/Control.ContextMenu.js
+++ b/loleaflet/src/control/Control.ContextMenu.js
@@ -22,7 +22,7 @@ L.Control.ContextMenu = L.Control.extend({
*/
general: ['Cut', 'Copy', 'Paste', 'Delete',
'NumberingStart',
'ContinueNumbering', 'IncrementLevel', 'DecrementLevel',
- 'OpenHyperlinkOnCursor',
'CopyHyperlinkLocation', 'RemoveHyperlink',
+ 'OpenHyperlinkOnCursor',
'EditHyperlink', 'CopyHyperlinkLocation', 'RemoveHyperlink',
'AnchorMenu', 'SetAnchorToPage',
'SetAnchorToPara', 'SetAnchorAtChar',
'SetAnchorToChar', 'SetAnchorToFrame',
'WrapMenu', 'WrapOff', 'WrapOn',
'WrapIdeal', 'WrapLeft', 'WrapRight', 'WrapThrough',
diff --git a/loleaflet/src/control/Toolbar.js b/loleaflet/src/control/Toolbar.js
index b22be1c83..2af30b3ed 100644
--- a/loleaflet/src/control/Toolbar.js
+++ b/loleaflet/src/control/Toolbar.js
@@ -156,17 +156,31 @@ L.Map.include({
this._socket.sendMessage(msg);
},
+ messageNeedsToBeRedirected: function(command) {
+ if (command === '.uno:EditHyperlink') {
+ var that = this;
+ setTimeout(function () { that.showHyperlinkDialog(); },
500);
+ return true;
+ }
+ else {
+ return false;
+ }
+ },
+
sendUnoCommand: function (command, json) {
var isAllowedInReadOnly = false;
var allowedCommands = ['.uno:Save', '.uno:WordCountDialog',
'.uno:EditAnnotation', '.uno:InsertAnnotation', '.uno:DeleteAnnotation'];
+
for (var i in allowedCommands) {
if (allowedCommands[i] === command) {
isAllowedInReadOnly = true;
break;
}
}
+
if (this.isPermissionEdit() || isAllowedInReadOnly) {
- this._socket.sendMessage('uno ' + command + (json ? ' '
+ JSON.stringify(json) : ''));
+ if (!this.messageNeedsToBeRedirected(command))
+ this._socket.sendMessage('uno ' + command +
(json ? ' ' + JSON.stringify(json) : ''));
}
},
diff --git a/loleaflet/src/unocommands.js b/loleaflet/src/unocommands.js
index be4f9f46e..75caedecd 100644
--- a/loleaflet/src/unocommands.js
+++ b/loleaflet/src/unocommands.js
@@ -230,6 +230,7 @@ var unoCommandsArray = {
ObjectForwardOne:{global:{menu:_('Forward One'),},},
OnlineAutoFormat:{text:{menu:_('~While Typing'),},},
OpenHyperlinkOnCursor:{global:{menu:_('Open Hyperlink'),},},
+
[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loleaflet/src
loleaflet/src/control/Control.AlertDialog.js | 12
loleaflet/src/control/Control.ContextMenu.js |2 +-
loleaflet/src/control/Toolbar.js | 15 ++-
loleaflet/src/unocommands.js |1 +
4 files changed, 16 insertions(+), 14 deletions(-)
New commits:
commit 0c84261a2a915d2b1e1601d0b77646033c8f2da7
Author: gokaysatir
AuthorDate: Sat Aug 8 20:32:27 2020 +0300
Commit: Jan Holesovsky
CommitDate: Tue Aug 11 19:12:24 2020 +0200
loleaflet: remove edit button from open hyperlink modal.
Change-Id: I597281b136a41c49954c66f50fd546a209bba75a
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100534
Reviewed-by: Szymon Kłos
Tested-by: Jenkins CollaboraOffice
diff --git a/loleaflet/src/control/Control.AlertDialog.js
b/loleaflet/src/control/Control.AlertDialog.js
index c73d87d92..67224907a 100644
--- a/loleaflet/src/control/Control.AlertDialog.js
+++ b/loleaflet/src/control/Control.AlertDialog.js
@@ -68,18 +68,6 @@ L.Control.AlertDialog = L.Control.extend({
});
}
- if (this._map.getDocType() != 'presentation') {
- buttonsList.push({
- text: _('Edit'),
- type: 'button',
- className:
'vex-dialog-button-secondary',
- click: function editClick () {
- vex.closeAll();
- e.map.showHyperlinkDialog();
- }
- });
- }
-
vex.dialog.open({
message: messageText,
showCloseButton: true,
diff --git a/loleaflet/src/control/Control.ContextMenu.js
b/loleaflet/src/control/Control.ContextMenu.js
index c4449340e..107da8ba0 100644
--- a/loleaflet/src/control/Control.ContextMenu.js
+++ b/loleaflet/src/control/Control.ContextMenu.js
@@ -22,7 +22,7 @@ L.Control.ContextMenu = L.Control.extend({
*/
general: ['Cut', 'Copy', 'Paste', 'Delete',
'NumberingStart',
'ContinueNumbering', 'IncrementLevel', 'DecrementLevel',
- 'OpenHyperlinkOnCursor',
'CopyHyperlinkLocation', 'RemoveHyperlink',
+ 'OpenHyperlinkOnCursor',
'EditHyperlink', 'CopyHyperlinkLocation', 'RemoveHyperlink',
'AnchorMenu', 'SetAnchorToPage',
'SetAnchorToPara', 'SetAnchorAtChar',
'SetAnchorToChar', 'SetAnchorToFrame',
'WrapMenu', 'WrapOff', 'WrapOn',
'WrapIdeal', 'WrapLeft', 'WrapRight', 'WrapThrough',
diff --git a/loleaflet/src/control/Toolbar.js b/loleaflet/src/control/Toolbar.js
index 19b899d75..4bf98dc0e 100644
--- a/loleaflet/src/control/Toolbar.js
+++ b/loleaflet/src/control/Toolbar.js
@@ -156,8 +156,20 @@ L.Map.include({
this._socket.sendMessage(msg);
},
+ messageNeedsToBeRedirected: function(command) {
+ if (command === '.uno:EditHyperlink') {
+ var that = this;
+ setTimeout(function () { that.showHyperlinkDialog(); },
500);
+ return true;
+ }
+ else {
+ return false;
+ }
+ },
+
sendUnoCommand: function (command, json) {
var isAllowedInReadOnly = command == '.uno:WordCountDialog';
+
var hasOpenedDialog = this.dialog.hasOpenedDialog();
if (hasOpenedDialog) {
$('.lokdialog_container').addClass('lokblink');
@@ -165,7 +177,8 @@ L.Map.include({
$('.lokdialog_container').removeClass('lokblink');
}, 600);
} else if (this.isPermissionEdit() || isAllowedInReadOnly) {
- this._socket.sendMessage('uno ' + command + (json ? ' '
+ JSON.stringify(json) : ''));
+ if (!this.messageNeedsToBeRedirected(command))
+ this._socket.sendMessage('uno ' + command +
(json ? ' ' + JSON.stringify(json) : ''));
}
},
diff --git a/loleaflet/src/unocommands.js b/loleaflet/src/unocommands.js
index 449880c74..50434e965 100644
--- a/loleaflet/src/unocommands.js
+++ b/loleaflet/src/unocommands.js
@@ -221,6 +221,7 @@ var unoCommandsArray = {
ObjectForwardOne:{global:{menu:_('Forward One'),},},
OnlineAutoFormat:{text:{menu:_('~While Typing'),},},
OpenHyperlinkOnCursor:{global:{menu:_('Open Hyperlink'),},},
+
[Libreoffice-commits] online.git: loleaflet/css loleaflet/src
loleaflet/css/loleaflet.css |4
loleaflet/src/control/Control.AlertDialog.js |1 +
2 files changed, 5 insertions(+)
New commits:
commit 091df95ac1e8615a65e116a338a4ae643910e030
Author: gokaysatir
AuthorDate: Mon Aug 10 11:10:30 2020 +0300
Commit: Jan Holesovsky
CommitDate: Tue Aug 11 16:13:56 2020 +0200
loleaflet: Wrap long words on hyperlink open dialog.
Change-Id: I944b2314c766f7e3f7f313a5afea3b022b637c05
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100416
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Jan Holesovsky
diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css
index 6f5ad442c..5fbfe8c6b 100644
--- a/loleaflet/css/loleaflet.css
+++ b/loleaflet/css/loleaflet.css
@@ -622,3 +622,7 @@ body {
.drop-down-field-list-item:hover {
background: #0b87e7;
}
+
+.word-wrap-for-vex-dialog {
+ overflow-wrap: break-word;
+}
\ No newline at end of file
diff --git a/loleaflet/src/control/Control.AlertDialog.js
b/loleaflet/src/control/Control.AlertDialog.js
index c73d87d92..c7cff3b8b 100644
--- a/loleaflet/src/control/Control.AlertDialog.js
+++ b/loleaflet/src/control/Control.AlertDialog.js
@@ -83,6 +83,7 @@ L.Control.AlertDialog = L.Control.extend({
vex.dialog.open({
message: messageText,
showCloseButton: true,
+ contentClassName: 'word-wrap-for-vex-dialog',
buttons: buttonsList,
callback: function() {},
afterClose: function () {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - svx/source
svx/source/sidebar/area/AreaPropertyPanelBase.cxx |7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 4a31a63c5e4d4dac01426581c39bc1ef9278f6cb
Author: gokaysatir
AuthorDate: Sat Aug 8 16:27:48 2020 +0300
Commit: Jan Holesovsky
CommitDate: Tue Aug 11 12:07:16 2020 +0200
core: Hide shape area bitmap import button.
Change-Id: I6f6987ea82c102fc5ac44a1c48a234c9f43484e0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100391
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Jan Holesovsky
diff --git a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
index 8cfc9c6d2459..3725feea9674 100644
--- a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
+++ b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
@@ -37,6 +37,7 @@
#include
#include
#include
+#include
using namespace css;
using namespace css::uno;
@@ -379,7 +380,8 @@ IMPL_LINK_NOARG(AreaPropertyPanelBase, SelectFillTypeHdl,
ListBox&, void)
GraphicObject aBitmap;
if(nPos == static_cast< sal_Int32 >(BITMAP))
{
-mpBmpImport->Show();
+if (!comphelper::LibreOfficeKit::isActive())
+mpBmpImport->Show();
const SvxBitmapListItem* pItem = pSh->GetItem(SID_BITMAP_LIST);
if(pItem)
{
@@ -1234,7 +1236,8 @@ void AreaPropertyPanelBase::Update()
{
if(pSh && pSh->GetItem(SID_BITMAP_LIST) && eXFS == BITMAP)
{
-mpBmpImport->Show();
+if (!comphelper::LibreOfficeKit::isActive())
+mpBmpImport->Show();
mpLbFillType->SelectEntryPos(sal_uInt32(BITMAP));
mpLbFillAttr->Fill(pSh->GetItem(SID_BITMAP_LIST)->GetBitmapList());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/admin
loleaflet/admin/admin.strings.js |1 +
loleaflet/admin/src/AdminSocketOverview.js |1 +
2 files changed, 2 insertions(+)
New commits:
commit 758b82ee19cf7cc63f3e28aae2d377fe8b18051a
Author: gokaysatir
AuthorDate: Mon Aug 10 10:43:03 2020 +0300
Commit: Michael Meeks
CommitDate: Mon Aug 10 15:44:34 2020 +0200
Admin Console: Add tooltip to kill session button.
Change-Id: I5a6117741c9635c52dc3768cebec66214e1fcbe7
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100415
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Michael Meeks
diff --git a/loleaflet/admin/admin.strings.js b/loleaflet/admin/admin.strings.js
index dc48930d3..9ac1e2fb1 100644
--- a/loleaflet/admin/admin.strings.js
+++ b/loleaflet/admin/admin.strings.js
@@ -36,6 +36,7 @@ l10nstrings.strMemoryStatsCachesize = _('Cache size of memory
statistics');
l10nstrings.strMemoryStatsInterval = _('Time interval of memory statistics (in
ms)');
l10nstrings.strCpuStatsCachesize = _('Cache size of CPU statistics');
l10nstrings.strCpuStatsInterval = _('Time interval of CPU statistics (in ms)');
+l10nstrings.strKillSessionToolTip = _('Kill session.');
l10nstrings.strLimitVirtMemMb = _('Maximum Document process virtual memory (in
MB) - reduce only');
l10nstrings.strLimitStackMemKb = _('Maximum Document process stack memory (in
KB) - reduce only');
l10nstrings.strLimitFileSizeMb = _('Maximum file size allowed to write to disk
(in MB) - reduce only');
diff --git a/loleaflet/admin/src/AdminSocketOverview.js
b/loleaflet/admin/src/AdminSocketOverview.js
index abca74c1d..cb94193f4 100644
--- a/loleaflet/admin/src/AdminSocketOverview.js
+++ b/loleaflet/admin/src/AdminSocketOverview.js
@@ -88,6 +88,7 @@ function upsertDocsTable(doc, sName, socket) {
var sessionCloseCell = document.createElement('td'); // This cell will
open "Do you want to kill this session?" dialog.
sessionCloseCell.innerText = '✖';
+ sessionCloseCell.title = _('Kill session.');
sessionCloseCell.className = 'has-text-centered';
sessionCloseCell.style.cursor = 'pointer';
if (add === true) { row.appendChild(sessionCloseCell); } else {
row.cells[0] = sessionCloseCell; }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loleaflet/src
loleaflet/src/control/Control.StatusBar.js |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit c41bb0f40c5b71eda323544f3d246b7053cdf07e
Author: gokaysatir
AuthorDate: Thu Jul 16 12:57:37 2020 +0300
Commit: Aron Budea
CommitDate: Mon Aug 10 02:11:22 2020 +0200
loleaflet: Status bar quick views don't work.
Change-Id: I68253955a97a79f7ccfecff9d3e26cb5e4a2032b
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/9
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Henry Castro
(cherry picked from commit bd28756cde488747bac8f2d1e08d100f974468e9)
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100355
Reviewed-by: Aron Budea
diff --git a/loleaflet/src/control/Control.StatusBar.js
b/loleaflet/src/control/Control.StatusBar.js
index 59f567ad7..e9696243d 100644
--- a/loleaflet/src/control/Control.StatusBar.js
+++ b/loleaflet/src/control/Control.StatusBar.js
@@ -169,7 +169,7 @@ L.Control.StatusBar = L.Control.extend({
}
};
this.map.sendUnoCommand('.uno:StatusBarFunc',
command);
- });
+ }.bind(this));
}
else if (id === 'userlist') {
this.map.fire('openuserlist');
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/admin loleaflet/Makefile.am wsd/AdminModel.cpp
loleaflet/Makefile.am |2
loleaflet/admin/admin.html |8
loleaflet/admin/admin.strings.js |4
loleaflet/admin/admintemplate.html | 26 +
loleaflet/admin/src/AdminSocketOverview.js | 474 +
wsd/AdminModel.cpp |2
6 files changed, 252 insertions(+), 264 deletions(-)
New commits:
commit 30dfb54ca4765781a4c6d8128bfe25f12c2916e6
Author: gokaysatir
AuthorDate: Sat Jul 18 20:14:04 2020 +0300
Commit: Henry Castro
CommitDate: Fri Aug 7 16:03:39 2020 +0200
loleaflet: Admin console overview details.
Change-Id: Ia796d457e26a5867547fb4b2b4b78b10c64d7c95
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99689
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Henry Castro
diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 049a0e977..729fd05e8 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -51,7 +51,7 @@ LOLEAFLET_HTML_DST = $(patsubst
$(srcdir)/html/%.html,$(DIST_FOLDER)/%.html,$(LO
LOLEAFLET_WELCOME_SRC = $(shell find $(srcdir)/welcome -name '*.html')
LOLEAFLET_WELCOME_DST = $(patsubst
$(srcdir)/welcome/%.html,$(DIST_FOLDER)/welcome/%.html,$(LOLEAFLET_WELCOME_SRC))
-LOLEAFLET_ADMIN_SRC = $(shell find $(srcdir)/admin -name '*.html' -or -name
'*.css' -or -name '*.ttf' -or -name 'OFL.txt')
+LOLEAFLET_ADMIN_SRC = $(shell find $(srcdir)/admin -name '*.html' -or -name
'*.css' -or -name '*.ttf' -or -name 'OFL.txt' -or -name '*.svg')
LOLEAFLET_ADMIN_ALL = $(shell find $(srcdir)/admin -name '*')
LOLEAFLET_ADMIN_DST = $(patsubst
$(srcdir)/admin/%,$(DIST_FOLDER)/admin/%,$(LOLEAFLET_ADMIN_SRC))
diff --git a/loleaflet/admin/admin.html b/loleaflet/admin/admin.html
index 82f3c0c41..0020e9a29 100644
--- a/loleaflet/admin/admin.html
+++ b/loleaflet/admin/admin.html
@@ -53,11 +53,11 @@
-
-
+
+
+ document.write(l10nstrings.strViewers)
document.write(l10nstrings.strPid)
document.write(l10nstrings.strDocument)
-document.write(l10nstrings.strNumberOfViews)
document.write(l10nstrings.strMemoryConsumed)
document.write(l10nstrings.strElapsedTime)
document.write(l10nstrings.strIdleTime)
@@ -71,7 +71,7 @@
-
+
document.write(l10nstrings.strUserName)
document.write(l10nstrings.strDocumentNumber)
diff --git a/loleaflet/admin/admin.strings.js b/loleaflet/admin/admin.strings.js
index 2490a82ae..dc48930d3 100644
--- a/loleaflet/admin/admin.strings.js
+++ b/loleaflet/admin/admin.strings.js
@@ -14,13 +14,15 @@ l10nstrings.strDashboard = _('Dashboard');
l10nstrings.strUsersOnline = _('Users online');
l10nstrings.strUserName = _('User Name');
l10nstrings.strDocumentsOpened = _('Documents opened');
+l10nstrings.strUsers = _(' user(s).');
+l10nstrings.strUserOpenDocuments = _(' document(s) open.');
l10nstrings.strDocumentNumber = _('Number of Documents');
l10nstrings.strMemoryConsumed = _('Memory consumed');
l10nstrings.strSentBytes = _('Bytes sent');
l10nstrings.strRecvBytes = _('Bytes received');
l10nstrings.strPid = _('PID');
l10nstrings.strDocument = _('Document');
-l10nstrings.strNumberOfViews = _('Number of views');
+l10nstrings.strViewers = _('Views');
l10nstrings.strElapsedTime = _('Elapsed time');
l10nstrings.strIdleTime = _('Idle time');
l10nstrings.strModified = _('Modified');
diff --git a/loleaflet/admin/admintemplate.html
b/loleaflet/admin/admintemplate.html
index d87c78204..b2d5df8f7 100644
--- a/loleaflet/admin/admintemplate.html
+++ b/loleaflet/admin/admintemplate.html
@@ -16,18 +16,38 @@
@font-face {
font-family: "Montserrat";
-src:
url("%SERVICE_ROOT%/loleaflet/%VERSION%/admin/fonts/Montserrat-Regular.ttf")
format("truetype");
+src:
url("%SERVICE_ROOT%/loleaflet/%VERSION%/admin/font/Montserrat-Regular.ttf")
format("truetype");
}
html, body {
font-family: 'Montserrat', sans-serif;
-}
+ }
+
+ /* These classes are for tab views without javascipt. */
div:target.mtabs {
display: block;
}
div.mtabs {
display: none
-}
+ }
+
+ /* These classes are for collapsable elements without
javascript. */
+ input[type=checkbox].mcollapsable + ul {
+ display: block;
+ visibility: hidden;
+ height: 0;
+ opacity: 0;
+ transition-property: opacity, visibility;
+ transition-duration: 500ms, 500ms;
+ }
+ input[type=checkbox].mcollapsable:checked + ul {
+
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/control/Toolbar.js | 18 +++---
1 file changed, 15 insertions(+), 3 deletions(-)
New commits:
commit dbdc500c0700c2a17ed18ec6ae31ca70d6f16ce2
Author: gokaysatir
AuthorDate: Wed Jul 29 18:00:44 2020 +0300
Commit: Henry Castro
CommitDate: Mon Aug 3 16:33:41 2020 +0200
loleaflet: Hyperlink textbox focus & content.
Change-Id: I08db18c98fc43861cc8783700b28cbeb6f9b5a74
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99710
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Henry Castro
diff --git a/loleaflet/src/control/Toolbar.js b/loleaflet/src/control/Toolbar.js
index f85747188..b22be1c83 100644
--- a/loleaflet/src/control/Toolbar.js
+++ b/loleaflet/src/control/Toolbar.js
@@ -591,7 +591,9 @@ L.Map.include({
text = this.hyperlinkUnderCursor.text;
link = this.hyperlinkUnderCursor.link;
} else if (this._clip && this._clip._selectionType == 'text') {
- text =
this.extractContent(this._clip._selectionContent);
+ if (map['stateChangeHandler'].getItemValue('.uno:Copy')
=== 'enabled') {
+ text =
this.extractContent(this._clip._selectionContent);
+ }
} else if (this._docLayer._selectedTextContent) {
text =
this.extractContent(this._docLayer._selectedTextContent);
}
@@ -600,8 +602,8 @@ L.Map.include({
contentClassName: 'hyperlink-dialog',
message: _('Insert hyperlink'),
input: [
- _('Text') + '',
- _('Link') + ''
+ _('Text') + '',
+ _('Link') + ''
].join(''),
buttons: [
$.extend({}, vex.dialog.buttons.YES, { text:
_('OK') }),
@@ -625,6 +627,16 @@ L.Map.include({
else {
map.focus();
}
+ },
+ afterOpen: function() {
+ setTimeout(function() {
+ if
(document.getElementById('hyperlink-text-box').value.trim() !== '') {
+
document.getElementById('hyperlink-link-box').focus();
+ }
+ else {
+
document.getElementById('hyperlink-text-box').focus();
+ }
+ }, 0);
}
});
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: cypress_test/data cypress_test/integration_tests
cypress_test/data/desktop/calc/BottomBar.ods |binary
cypress_test/integration_tests/desktop/calc/bottom_bar_spec.js | 26
++
2 files changed, 26 insertions(+)
New commits:
commit b8ef29e554c4e9277d0526f4f9cd452dfdbef146
Author: gokaysatir
AuthorDate: Fri Jul 17 16:37:40 2020 +0300
Commit: Tamás Zolnai
CommitDate: Thu Jul 30 10:50:31 2020 +0200
cypress: Bottom bar click quick views test.
Change-Id: I54d5d819f04890fd7ac666728258804d1bb0d93a
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98975
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Tamás Zolnai
diff --git a/cypress_test/data/desktop/calc/BottomBar.ods
b/cypress_test/data/desktop/calc/BottomBar.ods
new file mode 100644
index 0..205cc6ad9
Binary files /dev/null and b/cypress_test/data/desktop/calc/BottomBar.ods differ
diff --git a/cypress_test/integration_tests/desktop/calc/bottom_bar_spec.js
b/cypress_test/integration_tests/desktop/calc/bottom_bar_spec.js
new file mode 100644
index 0..bab9413fb
--- /dev/null
+++ b/cypress_test/integration_tests/desktop/calc/bottom_bar_spec.js
@@ -0,0 +1,26 @@
+/* global describe it cy beforeEach require afterEach */
+
+var helper = require('../../common/helper');
+var calcHelper = require('../../common/calc_helper');
+
+describe('Calc bottom bar tests.', function() {
+ var testFileName = 'BottomBar.ods';
+
+ beforeEach(function() {
+ helper.beforeAllDesktop(testFileName, 'calc');
+ // Wait until the Formula-Bar is loaded.
+ cy.get('.inputbar_container', {timeout : 1});
+ });
+
+ afterEach(function() {
+ helper.afterAll(testFileName);
+ });
+
+ it('Bottom tool bar.', function() {
+ cy.get('#map').focus();
+ calcHelper.clickOnFirstCell();
+ cy.get('#tb_actionbar_item_StateTableCellMenu
.w2ui-button').click();
+ // If it clicks, it passes.
+ cy.contains('.w2ui-drop-menu .menu-text', 'CountA').click();
+ });
+});
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css loleaflet/src
loleaflet/css/notebookbar.css |1 +
loleaflet/src/control/Control.LokDialog.js |2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 1be5550126f83d08cbc39f92647293130951dba5
Author: gokaysatir
AuthorDate: Mon Jul 27 18:25:10 2020 +0300
Commit: Henry Castro
CommitDate: Tue Jul 28 00:44:41 2020 +0200
loleaflet: lokDialog children are mispositioned bug.
Change-Id: I9f84d1860d541c56da033dff6e95dbc4d7e0f68b
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99513
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Henry Castro
diff --git a/loleaflet/css/notebookbar.css b/loleaflet/css/notebookbar.css
index 09626e911..dbf9ccfb1 100644
--- a/loleaflet/css/notebookbar.css
+++ b/loleaflet/css/notebookbar.css
@@ -96,6 +96,7 @@
#toolbar-wrapper.hasnotebookbar {
position: fixed;
+ z-index: 11;
}
/* unobuttons */
diff --git a/loleaflet/src/control/Control.LokDialog.js
b/loleaflet/src/control/Control.LokDialog.js
index f88e74e5e..d2aa02af7 100644
--- a/loleaflet/src/control/Control.LokDialog.js
+++ b/loleaflet/src/control/Control.LokDialog.js
@@ -1674,7 +1674,7 @@ L.Control.LokDialog = L.Control.extend({
else if (grandParentID.includes('calc-inputbar')) {
// This is the calculator input bar.
L.DomUtil.setStyle(floatingCanvas, 'left',
(containerLeft + left) + 'px');
- L.DomUtil.setStyle(floatingCanvas, 'top', (containerTop
+ top - 20) + 'px');
+ L.DomUtil.setStyle(floatingCanvas, 'top', (containerTop
+ 20) + 'px');
}
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/control/Control.StatusBar.js |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit bd28756cde488747bac8f2d1e08d100f974468e9
Author: gokaysatir
AuthorDate: Thu Jul 16 12:57:37 2020 +0300
Commit: Henry Castro
CommitDate: Thu Jul 16 16:56:06 2020 +0200
loleaflet: Status bar quick views don't work.
Change-Id: I68253955a97a79f7ccfecff9d3e26cb5e4a2032b
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/9
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Henry Castro
diff --git a/loleaflet/src/control/Control.StatusBar.js
b/loleaflet/src/control/Control.StatusBar.js
index 4db68760d..08aa2fb3f 100644
--- a/loleaflet/src/control/Control.StatusBar.js
+++ b/loleaflet/src/control/Control.StatusBar.js
@@ -169,7 +169,7 @@ L.Control.StatusBar = L.Control.extend({
}
};
this.map.sendUnoCommand('.uno:StatusBarFunc',
command);
- });
+ }.bind(this));
}
else if (id === 'userlist') {
this.map.fire('openuserlist');
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/js
loleaflet/js/w2ui-1.5.rc1.js |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit ebc46c8ecc8e32fa76847ef701db962a86c5a286
Author: gokaysatir
AuthorDate: Thu Jul 16 13:40:25 2020 +0300
Commit: Henry Castro
CommitDate: Thu Jul 16 15:24:07 2020 +0200
loleaflet: Hide tooltips on tablet.
Change-Id: I4c4381919b41cbe3b276a15d3070f56e3ce78359
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98894
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Henry Castro
diff --git a/loleaflet/js/w2ui-1.5.rc1.js b/loleaflet/js/w2ui-1.5.rc1.js
index 4ff42eed2..96a5320bd 100644
--- a/loleaflet/js/w2ui-1.5.rc1.js
+++ b/loleaflet/js/w2ui-1.5.rc1.js
@@ -6266,7 +6266,7 @@ w2utils.event = {
},
tooltipShow: function (id, event, forceRefresh) {
-if (window.mode.isMobile()) { return; }
+if (window.mode.isMobile() || window.mode.isTablet()) { return; }
if (window.ThisIsTheiOSApp) return;
if (this.tooltip == null) return;
var $el = $(this.box).find('#tb_'+ this.name + '_item_'+
w2utils.escapeId(id));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css loleaflet/src
loleaflet/css/loleaflet.css|4 ++--
loleaflet/css/spreadsheet.css |8 +++-
loleaflet/src/control/Control.LokDialog.js | 25 +
loleaflet/src/control/Control.Tabs.js |1 -
4 files changed, 6 insertions(+), 32 deletions(-)
New commits:
commit e0a27002f0cd309b84e9cc573ff2c95d7c10f54e
Author: gokaysatir
AuthorDate: Fri Jul 10 15:06:27 2020 +0300
Commit: Henry Castro
CommitDate: Thu Jul 16 00:19:50 2020 +0200
loleaflet: sidebar overlap issue.
Change-Id: Iff2184725c49c24900865d9865237e9747a050cb
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98555
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Tested-by: Henry Castro
Reviewed-by: Henry Castro
diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css
index 29ab4977c..97c47ab97 100644
--- a/loleaflet/css/loleaflet.css
+++ b/loleaflet/css/loleaflet.css
@@ -148,7 +148,7 @@ body {
position: absolute;
top: 77px;
right: 0px;
- bottom: 37px;
+ bottom: 72px;
border-top: 1px solid #b6b6b6;
border-left: 1px solid #b6b6b6;
overflow: hidden;
@@ -162,7 +162,7 @@ body {
width: auto;
height: 100%;
overflow-x: hidden;
- overflow-y: scroll;
+ overflow-y: auto;
z-index: 1200;
}
diff --git a/loleaflet/css/spreadsheet.css b/loleaflet/css/spreadsheet.css
index 651dfb97b..3090872fb 100644
--- a/loleaflet/css/spreadsheet.css
+++ b/loleaflet/css/spreadsheet.css
@@ -2,7 +2,7 @@
border-top: 1px solid #B6B6B6;
top: 137px;
left: 50px;
- bottom: 65px;
+ bottom: 75px;
}
#document-container.spreadsheet-document.readonly {
@@ -13,7 +13,7 @@
border-top: 1px solid #B6B6B6;
top: 100px;
left: 50px;
- bottom: 68px;
+ bottom: 78px;
}
.spreadsheet-tabs-container {
@@ -36,14 +36,12 @@
height: 100%;
overflow: auto;
padding-bottom: 20px; /* to hide the horizontal scrollbar */
- padding-right: 5px; /* to hide the vertical scrollbar */
-
margin-left: 6px;
}
.spreadsheet-tab {
margin: 0px;
- margin-top: 2px;
+ margin-top: 4px;
margin-right: 3px;
padding-left: 9px;
padding-right: 9px;
diff --git a/loleaflet/src/control/Control.LokDialog.js
b/loleaflet/src/control/Control.LokDialog.js
index 9fd9dc7ff..f88e74e5e 100644
--- a/loleaflet/src/control/Control.LokDialog.js
+++ b/loleaflet/src/control/Control.LokDialog.js
@@ -1595,7 +1595,7 @@ L.Control.LokDialog = L.Control.extend({
spreadsheetRowColumnFrame.style.right =
width.toString() + 'px';
this._resizeCalcInputBar(deckOffset);
- this._adjustTabsBar(width);
+
// If we didn't have the focus, don't steal it form the editor.
if ($('#' + this._currentDeck.strId + '-cursor').css('display')
=== 'none') {
if (this._map.editorHasFocus()) {
@@ -1623,29 +1623,6 @@ L.Control.LokDialog = L.Control.extend({
}
},
- _adjustTabsBar: function(deckNewWidth) {
-
- if (this._map.getDocType() !== 'spreadsheet') {
- return;
- }
-
- // This is called only if sidebar is made visible or hidden, so
no need of
- // special-casing for mobile where that never happens.
- // In the case of tablets, when sidebar is made visible/hidden
the below adjustments
- // will work correctly like in desktop-online (verified with
chrome-tablet emulator).
-
- var tabsContainer =
L.DomUtil.get('spreadsheet-tabs-container-id');
- if (!tabsContainer) {
- return;
- }
-
- var docWidth =
L.DomUtil.get('spreadsheet-toolbar').getBoundingClientRect().width;
- var tabsContainerLeft =
tabsContainer.getBoundingClientRect().left;
- var deckMargin = (deckNewWidth === 0) ? 0 : 10;
-
- tabsContainer.style.width = (docWidth - tabsContainerLeft -
deckNewWidth - deckMargin) + 'px';
- },
-
_onDialogChildClose: function(dialogId) {
$('#' + this._toStrId(dialogId) + '-floating').remove();
if (!this._isSidebar(dialogId) &&
!this.isCalcInputBar(dialogId)) {
diff --git a/loleaflet/src/control/Control.Tabs.js
b/loleaflet/src/control/Control.Tabs.js
index 7bb681364..06ccd043a 100644
--- a/loleaflet/src/control/Control.Tabs.js
+++ b/loleaflet/src/control/Control.Tabs.js
@@ -42,7 +42,6 @@ L.Control.Tabs = L.Control.extend({
var map = this._map;
var docContainer = map.options.documentContainer;
this._tabsCont =
[Libreoffice-commits] online.git: loleaflet/css loleaflet/src
loleaflet/css/selectionMarkers.css|6 --
loleaflet/src/layer/tile/TileLayer.js |2 --
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 7ac677244b5391f0a09a4d4ff7cc1f0bfa30
Author: gokaysatir
AuthorDate: Sat Jul 11 15:07:37 2020 +0300
Commit: Henry Castro
CommitDate: Wed Jul 15 22:50:14 2020 +0200
loleaflet: Writer, mobile: Selection handles are slightly off.
Change-Id: If81bb33f80f4f52733c3465567c4dc27abf5b8b5
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98559
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Henry Castro
diff --git a/loleaflet/css/selectionMarkers.css
b/loleaflet/css/selectionMarkers.css
index f7acfabff..f35083819 100644
--- a/loleaflet/css/selectionMarkers.css
+++ b/loleaflet/css/selectionMarkers.css
@@ -1,6 +1,7 @@
.leaflet-selection-marker-start {
position: absolute;
- margin-left: -28px;
+ margin-left: -30px;
+ margin-top: -2px;
width: 30px;
height: 44px;
background-image: url('images/handle_start.svg');
@@ -8,7 +9,8 @@
.leaflet-selection-marker-end {
position: absolute;
- margin-left: -2px;
+ margin-left: 0;
+ margin-top: -2px;
width: 30px;
height: 44px;
background-image: url('images/handle_end.svg');
diff --git a/loleaflet/src/layer/tile/TileLayer.js
b/loleaflet/src/layer/tile/TileLayer.js
index 09eea8893..7a370575e 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -3188,7 +3188,6 @@ L.TileLayer = L.GridLayer.extend({
if (!startMarker.isDragged) {
var pos =
this._map.project(this._textSelectionStart.getSouthWest());
- pos = pos.subtract(new L.Point(0, 2));
pos = this._map.unproject(pos);
startMarker.setLatLng(pos);
this._map.addLayer(startMarker);
@@ -3196,7 +3195,6 @@ L.TileLayer = L.GridLayer.extend({
if (!endMarker.isDragged) {
pos =
this._map.project(this._textSelectionEnd.getSouthEast());
- pos = pos.subtract(new L.Point(0, 2));
pos = this._map.unproject(pos);
endMarker.setLatLng(pos);
this._map.addLayer(endMarker);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/control/Control.LokDialog.js | 63 +
1 file changed, 38 insertions(+), 25 deletions(-)
New commits:
commit babc178eb1ca3f923c79fd55481ef0e2f13cb921
Author: gokaysatir
AuthorDate: Wed Jul 15 14:01:33 2020 +0300
Commit: Henry Castro
CommitDate: Wed Jul 15 16:47:46 2020 +0200
loleaflet: lokDialog children are mispositioned bug.
Change-Id: Ib2d530d3e4d7f10abe8c34455cf632f509df62a7
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98829
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Henry Castro
diff --git a/loleaflet/src/control/Control.LokDialog.js
b/loleaflet/src/control/Control.LokDialog.js
index a9c16e98f..9fd9dc7ff 100644
--- a/loleaflet/src/control/Control.LokDialog.js
+++ b/loleaflet/src/control/Control.LokDialog.js
@@ -327,8 +327,7 @@ L.Control.LokDialog = L.Control.extend({
this._dialogs[parentId].childid = e.id;
this._dialogs[parentId].childwidth = width;
this._dialogs[parentId].childheight = height;
- this._dialogs[parentId].childx = left;
- this._dialogs[parentId].childy = top;
+
if (e.winType === 'tooltip')
this._dialogs[parentId].childistooltip
= true;
else
@@ -338,13 +337,12 @@ L.Control.LokDialog = L.Control.extend({
}
}
- // All other callbacks doen't make sense without an active
dialog.
+ // All other callbacks don't make sense without an active
dialog.
if (!(this._isOpen(e.id) || this._getParentId(e.id))) {
if (e.action == 'close' && window.mobileDialogId ==
e.id) {
window.mobileDialogId = undefined;
this._map.fire('closemobilewizard');
}
-
return;
}
@@ -1551,13 +1549,11 @@ L.Control.LokDialog = L.Control.extend({
// Make sure the child is not trimmed on the right.
var width = this._dialogs[parentId].childwidth;
- var left = this._dialogs[parentId].childx;
- var dialogContainer = L.DomUtil.get(strId).parentNode;
- if (left + width > dialogContainer.clientWidth) {
- // Align the right of the child to the right of the
parent.
- left -= Math.max(0, (left + width) -
dialogContainer.clientWidth);
- this._dialogs[parentId].childx = left;
- L.DomUtil.setStyle(canvas, 'left', left + 'px');
+ var left = parseInt(canvas.style.left);
+ var leftPos = left + width;
+ if (leftPos > window.innerWidth) {
+ var newLeft = window.innerWidth - width - 20;
+ L.DomUtil.setStyle(canvas, 'left', newLeft + 'px');
}
// The image is rendered per the HiDPI scale we used
@@ -1673,27 +1669,44 @@ L.Control.LokDialog = L.Control.extend({
_createDialogChild: function(childId, parentId, top, left) {
var strId = this._toStrId(parentId);
- var dialogContainer = L.DomUtil.get(strId).parentNode;
+ var dialogContainer = L.DomUtil.get(strId);
var floatingCanvas = L.DomUtil.create('canvas',
'lokdialogchild-canvas', dialogContainer);
$(floatingCanvas).hide(); // Hide to avoid flickering while we
set the dimensions.
- // Since child windows are now top-level, their 'top' offset
- // needs adjusting. If we are in a dialog, our top is from the
- // dialog body, not the title bar, which is a separate div.
- // This doesn't apply for context menus, which don't have
titles.
- var dialogTitle = $('.lokdialog_notitle');
- if (dialogTitle != null && dialogTitle.length == 0) {
- var dialogTitleBar = $('.ui-dialog-titlebar');
- top += dialogTitleBar.outerHeight();
- }
-
floatingCanvas.id = strId + '-floating';
- L.DomUtil.setStyle(floatingCanvas, 'position', 'absolute');
- L.DomUtil.setStyle(floatingCanvas, 'left', (left - 1) + 'px');
// Align drop-down list with parent.
- L.DomUtil.setStyle(floatingCanvas, 'top', top + 'px');
+ L.DomUtil.setStyle(floatingCanvas, 'position', 'fixed');
+ L.DomUtil.setStyle(floatingCanvas, 'z-index', '11');
L.DomUtil.setStyle(floatingCanvas, 'width', '0px');
L.DomUtil.setStyle(floatingCanvas, 'height', '0px');
+ /*
+ Some notes:
+
[Libreoffice-commits] online.git: loleaflet/js
loleaflet/js/w2ui-1.5.rc1.js |1 +
1 file changed, 1 insertion(+)
New commits:
commit 9aae80518d23dab3dbd8fdc9369b61d70798ea67
Author: gokaysatir
AuthorDate: Sat Jul 11 14:35:26 2020 +0300
Commit: Henry Castro
CommitDate: Wed Jul 15 14:51:04 2020 +0200
loleaflet: Hide w2ui tooltips on mobile.
Change-Id: Iaf57e6f53fbc363e22ac1c11de0eb657d492edd3
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98558
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Henry Castro
diff --git a/loleaflet/js/w2ui-1.5.rc1.js b/loleaflet/js/w2ui-1.5.rc1.js
index 533941987..4ff42eed2 100644
--- a/loleaflet/js/w2ui-1.5.rc1.js
+++ b/loleaflet/js/w2ui-1.5.rc1.js
@@ -6266,6 +6266,7 @@ w2utils.event = {
},
tooltipShow: function (id, event, forceRefresh) {
+if (window.mode.isMobile()) { return; }
if (window.ThisIsTheiOSApp) return;
if (this.tooltip == null) return;
var $el = $(this.box).find('#tb_'+ this.name + '_item_'+
w2utils.escapeId(id));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/control/Control.StatusBar.js | 28 ++--
1 file changed, 14 insertions(+), 14 deletions(-)
New commits:
commit 962838ca82cd077147bd2a7c097fbb609044d0c8
Author: gokaysatir
AuthorDate: Fri Jul 10 16:36:08 2020 +0300
Commit: Henry Castro
CommitDate: Wed Jul 15 14:49:59 2020 +0200
loleaflet: Selected cell status alignment.
Change-Id: Ibdf5c7ae7d95a97682bac1574b6abb0d00471445
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98528
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Henry Castro
diff --git a/loleaflet/src/control/Control.StatusBar.js
b/loleaflet/src/control/Control.StatusBar.js
index 59f567ad7..4db68760d 100644
--- a/loleaflet/src/control/Control.StatusBar.js
+++ b/loleaflet/src/control/Control.StatusBar.js
@@ -65,10 +65,10 @@ L.Control.StatusBar = L.Control.extend({
_updateVisibilityForToolbar: function(toolbar) {
if (!toolbar)
return;
-
+
var toShow = [];
var toHide = [];
-
+
toolbar.items.forEach(function(item) {
if (window.ThisIsTheiOSApp && window.mode.isTablet() &&
item.iosapptablet === false) {
toHide.push(item.id);
@@ -80,10 +80,10 @@ L.Control.StatusBar = L.Control.extend({
toShow.push(item.id);
}
});
-
+
console.log('explicitly hiding: ' + toHide);
console.log('explicitly showing: ' + toShow);
-
+
toHide.forEach(function(item) { toolbar.hide(item); });
toShow.forEach(function(item) { toolbar.show(item); });
},
@@ -287,7 +287,7 @@ L.Control.StatusBar = L.Control.extend({
case 'spreadsheet':
if (statusbar)
statusbar.remove('prev', 'next',
'prevnextbreak');
-
+
if (!window.mode.isMobile()) {
statusbar.insert('left', [
{type: 'break', id: 'break1'},
@@ -298,7 +298,7 @@ L.Control.StatusBar = L.Control.extend({
{type: 'break', id: 'break2'},
{
type: 'html', id:
'RowColSelCount',
- html: ''
+ html: ''
},
{type: 'break', id: 'break3', tablet:
false},
{
@@ -383,7 +383,7 @@ L.Control.StatusBar = L.Control.extend({
{type: 'break', id: 'break8', mobile:
false}
]);
}
-
+
// FALLTHROUGH intended
case 'drawing':
if (statusbar)
@@ -412,7 +412,7 @@ L.Control.StatusBar = L.Control.extend({
// odd, but on mobile we need to invoke it twice
toolbar.hide('cancelsearch');
}
-
+
this.map._onGotFocus();
},
@@ -445,7 +445,7 @@ L.Control.StatusBar = L.Control.extend({
}
else if (commandName === '.uno:InsertMode') {
this.updateToolbarItem(statusbar, 'InsertMode',
$('#InsertMode').html(state ? L.Styles.insertMode[state].toLocaleString() :
'Insert mode:
inactive').parent().html());
-
+
if (!state && this.map.hyperlinkPopup) {
this.map.hyperlinkUnderCursor = null;
this.map.closePopup(this.map.hyperlinkPopup);
@@ -503,13 +503,13 @@ L.Control.StatusBar = L.Control.extend({
languages.sort(function (a, b) {
return a.translated < b.translated ? -1 :
a.translated > b.translated ? 1 : 0;
});
-
+
var toolbaritems = [];
toolbaritems.push({ text: noneLang,
id: 'nonelanguage',
uno: constLang + constNone });
-
-
+
+
for (var lang in languages) {
translated = languages[lang].translated;
neutral = languages[lang].neutral;
@@ -517,9 +517,9 @@ L.Control.StatusBar = L.Control.extend({
var splitNeutral = neutral.split(';');
toolbaritems.push({ id: neutral, text:
splitTranslated[0], uno: constLang + encodeURIComponent('Default_' +
splitNeutral[0]) });
}
-
+
toolbaritems.push({
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/layer/tile/TileLayer.js |1 +
1 file changed, 1 insertion(+)
New commits:
commit e5dfd6a2f27450007f11ff017d919ab69422c665
Author: gokaysatir
AuthorDate: Fri Jul 10 23:36:10 2020 +0300
Commit: Henry Castro
CommitDate: Wed Jul 15 14:45:44 2020 +0200
loleaflet: Remove carret marker when text selected.
Change-Id: Ifc055f852857188e4d35b9db1db62638ad5a27a5
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98546
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Michael Meeks
Reviewed-by: Henry Castro
diff --git a/loleaflet/src/layer/tile/TileLayer.js
b/loleaflet/src/layer/tile/TileLayer.js
index e19626eb2..09eea8893 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -1692,6 +1692,7 @@ L.TileLayer = L.GridLayer.extend({
weight: 2,
opacity: 0.25});
this._selections.addLayer(selection);
+
this._map.removeLayer(this._map._textInput._cursorHandler); // User selected a
text, we remove the carret marker.
if (this._selectionContentRequest) {
clearTimeout(this._selectionContentRequest);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/admin
loleaflet/admin/admin.html |1
loleaflet/admin/adminAnalytics.html|2 +
loleaflet/admin/admintemplate.html |4 +--
loleaflet/admin/src/AdminSocketOverview.js | 33 ++---
4 files changed, 26 insertions(+), 14 deletions(-)
New commits:
commit 3b6ac9179cd506085e11ff958ff0955c3edaaff6
Author: gokaysatir
AuthorDate: Sun Jul 5 14:37:40 2020 +0300
Commit: Andras Timar
CommitDate: Sun Jul 5 21:45:56 2020 +0200
loleaflet: Admin panel does not have kill session button anymore.
Change-Id: I4cfa87dd2bc835281b0738628e88d824f0bcc4e9
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98136
Tested-by: Jenkins CollaboraOffice
Tested-by: Jenkins
Reviewed-by: Andras Timar
diff --git a/loleaflet/admin/admin.html b/loleaflet/admin/admin.html
index 9f5fc6886..82f3c0c41 100644
--- a/loleaflet/admin/admin.html
+++ b/loleaflet/admin/admin.html
@@ -54,6 +54,7 @@
+
document.write(l10nstrings.strPid)
document.write(l10nstrings.strDocument)
document.write(l10nstrings.strNumberOfViews)
diff --git a/loleaflet/admin/adminAnalytics.html
b/loleaflet/admin/adminAnalytics.html
index b03c38777..a3a8e5a2e 100644
--- a/loleaflet/admin/adminAnalytics.html
+++ b/loleaflet/admin/adminAnalytics.html
@@ -43,6 +43,8 @@
document.getElementById('a-analytics-mobile').classList.add('is-active');
document.getElementById('a-analytics-tablet').classList.add('is-active');
+ window.location.href += '#memview';
+
// Switching tabs is done by css rules. We will set "is-active" classes here.
document.getElementById('button-memview').onclick = function() {
document.getElementById('button-memview').parentNode.className =
'is-active';
diff --git a/loleaflet/admin/admintemplate.html
b/loleaflet/admin/admintemplate.html
index 9d6225b87..d87c78204 100644
--- a/loleaflet/admin/admintemplate.html
+++ b/loleaflet/admin/admintemplate.html
@@ -55,7 +55,7 @@
document.write(l10nstrings.strOverview)
-document.write(l10nstrings.strAnalytics)
+document.write(l10nstrings.strAnalytics)
document.write(l10nstrings.strHistory)
document.write(l10nstrings.strLog)
document.write(l10nstrings.strSettings)
@@ -71,7 +71,7 @@
document.write(l10nstrings.strOverview)
-document.write(l10nstrings.strAnalytics)
+document.write(l10nstrings.strAnalytics)
document.write(l10nstrings.strHistory)
document.write(l10nstrings.strLog)
diff --git a/loleaflet/admin/src/AdminSocketOverview.js
b/loleaflet/admin/src/AdminSocketOverview.js
index 6f4f6c667..653045d04 100644
--- a/loleaflet/admin/src/AdminSocketOverview.js
+++ b/loleaflet/admin/src/AdminSocketOverview.js
@@ -2,9 +2,25 @@
/*
Socket to be intialized on opening the overview page in Admin console
*/
-/* global _ vex $ Util AdminSocketBase Admin */
-
-function appendDocRow(document, $rowContainer, $userContainer, sPid, sName,
sViews, sMem, sDocTime, sDocIdle, modified) {
+/* global DlgYesNo _ vex $ Util AdminSocketBase Admin */
+
+function appendDocRow(document, $rowContainer, $userContainer, sPid, sName,
sViews, sMem, sDocTime, sDocIdle, modified, socket) {
+ var $sessionCloseCell = $(document.createElement('td')).text('✖'); //
This cell will open "Do you want to kill this session?" dialog.
+ $rowContainer.append($sessionCloseCell);
+ $sessionCloseCell.addClass('has-text-centered');
+ $sessionCloseCell.css('cursor', 'pointer');
+ $sessionCloseCell.click(function() {
+ var dialog = (new DlgYesNo())
+ .title(_('Confirmation'))
+ .text(_('Are you sure you want to terminate this session?'))
+ .yesButtonText(_('OK'))
+ .noButtonText(_('Cancel'))
+ .type('warning')
+ .yesFunction(function() {
+ socket.send('kill ' + sPid);
+ });
+ dialog.open();
+ });
var $pid = $(document.createElement('td')).text(sPid);
$pid.append($userContainer);
@@ -116,13 +132,6 @@ var AdminSocketOverview = AdminSocketBase.extend({
}
});
});
-
- $('.view-opt-button').on('click', function() {
- $('#docview-btn').toggleClass('selected-view-opt');
- $('#userview-btn').toggleClass('selected-view-opt');
- $('#docview').toggle();
- $('#userview').toggle();
- });
},
onSocketMessage: function(e) {
@@ -215,7 +224,7
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - include/svx svx/sdi sw/sdi sw/source
include/svx/svxids.hrc |5 -
svx/sdi/svx.sdi | 16
sw/sdi/_viewsh.sdi |4
sw/source/uibase/uiview/viewtab.cxx | 27 +++
4 files changed, 51 insertions(+), 1 deletion(-)
New commits:
commit 63933c9a4caf37306290fb8062380d193295d57c
Author: gokaysatir
AuthorDate: Wed May 6 12:04:39 2020 +0300
Commit: Andras Timar
CommitDate: Wed Jun 24 09:50:40 2020 +0200
tdf#111535 - Add First-line indent, paragraph indent, and tab spaces/Core
part
Change-Id: Ib340e74646299c344dd770977497f59a030c86f3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93165
Tested-by: Jenkins
Tested-by: Tomaž Vajngerl
Reviewed-by: Tomaž Vajngerl
(cherry picked from commit 15adfafee5b48d6f88a0b970c50e5c5bc77a4ab1)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96587
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc
index b462883b7397..8d4030ec0285 100644
--- a/include/svx/svxids.hrc
+++ b/include/svx/svxids.hrc
@@ -533,6 +533,9 @@ class SvxSetItem;
#define SID_TABSTOP_ADD_OR_CHANGE ( SID_SVX_START + 581 )
#define SID_TABSTOP_ATTR_INDEX ( SID_SVX_START + 582 )
#define SID_TABSTOP_ATTR_POSITION ( SID_SVX_START + 583 )
+#define SID_PARAGRAPH_FIRST_LINE_INDENT ( SID_SVX_START + 584 )
+#define SID_PARAGRAPH_LEFT_INDENT ( SID_SVX_START + 585 )
+#define SID_PARAGRAPH_RIGHT_INDENT ( SID_SVX_START + 586 )
// CAUTION! Range <587 .. 587> used by EditEngine (!)
@@ -645,7 +648,7 @@ class SvxSetItem;
#define SID_FM_CONVERTTO_FORMATTED ( SID_SVX_START + 751 )
#define SID_FM_FILTER_NAVIGATOR_CONTROL ( SID_SVX_START + 752 )
#define SID_INSERT_GRIDCONTROL ( SID_SVX_START + 753 )
-//FREE
+#define SID_PARAGRAPH_CHANGE_STATE ( SID_SVX_START + 754 )
//FREE
//FREE
//FREE
diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index fef2049eb638..17f4b27f9dbf 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -7226,6 +7226,22 @@ SfxVoidItem ChangeTabStop SID_TABSTOP_ADD_OR_CHANGE
GroupId = ;
]
+SfxVoidItem ParagraphChangeState SID_PARAGRAPH_CHANGE_STATE
+(SfxStringItem FirstLineIndent SID_PARAGRAPH_FIRST_LINE_INDENT, SfxStringItem
LeftParaIndent SID_PARAGRAPH_LEFT_INDENT, SfxStringItem RightParaIndent
SID_PARAGRAPH_RIGHT_INDENT)
+[
+AutoUpdate = FALSE,
+FastCall = TRUE,
+ReadOnlyDoc = TRUE,
+Toggle = FALSE,
+Container = FALSE,
+RecordAbsolute = FALSE,
+RecordPerSet;
+AccelConfig = FALSE,
+MenuConfig = FALSE,
+ToolBoxConfig = FALSE,
+GroupId = ;
+]
+
SfxVoidItem TableChangeCurrentBorderPosition
SID_TABLE_CHANGE_CURRENT_BORDER_POSITION
(SfxStringItem BorderType SID_TABLE_BORDER_TYPE,
SfxUInt16Item Index SID_TABLE_BORDER_INDEX,
diff --git a/sw/sdi/_viewsh.sdi b/sw/sdi/_viewsh.sdi
index 419335ae48bb..c84e6f5434eb 100644
--- a/sw/sdi/_viewsh.sdi
+++ b/sw/sdi/_viewsh.sdi
@@ -647,6 +647,10 @@ interface BaseTextEditView
[
ExecMethod = ExecTabWin;
]
+SID_PARAGRAPH_CHANGE_STATE // status()
+[
+ExecMethod = ExecTabWin;
+]
// from here Export = FALSE;
FID_SEARCH_ON // status()
[
diff --git a/sw/source/uibase/uiview/viewtab.cxx
b/sw/source/uibase/uiview/viewtab.cxx
index a7d2a2095018..cb8662580fa3 100644
--- a/sw/source/uibase/uiview/viewtab.cxx
+++ b/sw/source/uibase/uiview/viewtab.cxx
@@ -701,7 +701,34 @@ void SwView::ExecTabWin( SfxRequest const & rReq )
}
}
break;
+case SID_PARAGRAPH_CHANGE_STATE:
+{
+const SfxPoolItem *fLineIndent, *pLeftIndent, *pRightIndent;
+if (pReqArgs)
+{
+SfxItemSet aLRSpaceSet( GetPool(), svl::Items{} );
+rSh.GetCurAttr( aLRSpaceSet );
+SvxLRSpaceItem aParaMargin( aLRSpaceSet.Get( RES_LR_SPACE ) );
+if
(pReqArgs->GetItemState(SID_PARAGRAPH_FIRST_LINE_INDENT,true,) ==
SfxItemState::SET)
+{
+const OUString ratio = static_cast(fLineIndent)->GetValue();
+aParaMargin.SetTextFirstLineOfst(nPageWidth * ratio.toFloat());
+}
+else if
(pReqArgs->GetItemState(SID_PARAGRAPH_LEFT_INDENT,true,) ==
SfxItemState::SET)
+{
+const OUString ratio = static_cast(pLeftIndent)->GetValue();
+aParaMargin.SetLeft(nPageWidth * ratio.toFloat());
+}
+else if
(pReqArgs->GetItemState(SID_PARAGRAPH_RIGHT_INDENT,true,) ==
SfxItemState::SET)
+{
+const OUString ratio = static_cast(pRightIndent)->GetValue();
+aParaMargin.SetRight(nPageWidth * ratio.toFloat());
+}
+
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - include/svx svx/sdi sw/sdi sw/source
include/svx/svxids.hrc |5 -
svx/sdi/svx.sdi | 16
sw/sdi/_viewsh.sdi |4
sw/source/uibase/uiview/viewtab.cxx | 27 +++
4 files changed, 51 insertions(+), 1 deletion(-)
New commits:
commit db84e4b40e3ad8656738baeaa9e2036c038a8fa3
Author: gokaysatir
AuthorDate: Wed May 6 12:04:39 2020 +0300
Commit: Andras Timar
CommitDate: Fri Jun 19 11:29:51 2020 +0200
tdf#111535 - Add First-line indent, paragraph indent, and tab spaces/Core
part
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93165
Tested-by: Jenkins
Tested-by: Tomaž Vajngerl
Reviewed-by: Tomaž Vajngerl
(cherry picked from commit 15adfafee5b48d6f88a0b970c50e5c5bc77a4ab1)
Change-Id: Ib340e74646299c344dd770977497f59a030c86f3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96611
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc
index eba3066ecf74..a9960d216b4e 100644
--- a/include/svx/svxids.hrc
+++ b/include/svx/svxids.hrc
@@ -536,6 +536,9 @@ class SfxStringItem;
// CAUTION! Range <587 .. 587> used by EditEngine (!)
+#define SID_PARAGRAPH_FIRST_LINE_INDENT ( SID_SVX_START + 588 )
+#define SID_PARAGRAPH_LEFT_INDENT ( SID_SVX_START + 589 )
+#define SID_PARAGRAPH_RIGHT_INDENT ( SID_SVX_START + 590 )
// CAUTION! Range <591 .. 591> used by EditEngine (!)
@@ -645,7 +648,7 @@ class SfxStringItem;
#define SID_FM_CONVERTTO_FORMATTED ( SID_SVX_START + 751 )
#define SID_FM_FILTER_NAVIGATOR_CONTROL ( SID_SVX_START + 752 )
//FREE
-//FREE
+#define SID_PARAGRAPH_CHANGE_STATE ( SID_SVX_START + 754 )
//FREE
//FREE
//FREE
diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index cf48781fc77e..f077e5abaddb 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -7194,6 +7194,22 @@ SfxVoidItem ChangeTabStop SID_TABSTOP_ADD_OR_CHANGE
GroupId = ;
]
+SfxVoidItem ParagraphChangeState SID_PARAGRAPH_CHANGE_STATE
+(SfxStringItem FirstLineIndent SID_PARAGRAPH_FIRST_LINE_INDENT, SfxStringItem
LeftParaIndent SID_PARAGRAPH_LEFT_INDENT, SfxStringItem RightParaIndent
SID_PARAGRAPH_RIGHT_INDENT)
+[
+AutoUpdate = FALSE,
+FastCall = TRUE,
+ReadOnlyDoc = TRUE,
+Toggle = FALSE,
+Container = FALSE,
+RecordAbsolute = FALSE,
+RecordPerSet;
+AccelConfig = FALSE,
+MenuConfig = FALSE,
+ToolBoxConfig = FALSE,
+GroupId = ;
+]
+
SfxVoidItem TableChangeCurrentBorderPosition
SID_TABLE_CHANGE_CURRENT_BORDER_POSITION
(SfxStringItem BorderType SID_TABLE_BORDER_TYPE,
SfxUInt16Item Index SID_TABLE_BORDER_INDEX,
diff --git a/sw/sdi/_viewsh.sdi b/sw/sdi/_viewsh.sdi
index b4c3803e0a0d..50a40e84c9ab 100644
--- a/sw/sdi/_viewsh.sdi
+++ b/sw/sdi/_viewsh.sdi
@@ -635,6 +635,10 @@ interface BaseTextEditView
[
ExecMethod = ExecTabWin;
]
+SID_PARAGRAPH_CHANGE_STATE // status()
+[
+ExecMethod = ExecTabWin;
+]
// from here Export = FALSE;
FID_SEARCH_ON // status()
[
diff --git a/sw/source/uibase/uiview/viewtab.cxx
b/sw/source/uibase/uiview/viewtab.cxx
index 6a70fb9e6397..f4d85a249846 100644
--- a/sw/source/uibase/uiview/viewtab.cxx
+++ b/sw/source/uibase/uiview/viewtab.cxx
@@ -702,7 +702,34 @@ void SwView::ExecTabWin( SfxRequest const & rReq )
}
}
break;
+case SID_PARAGRAPH_CHANGE_STATE:
+{
+const SfxPoolItem *fLineIndent, *pLeftIndent, *pRightIndent;
+if (pReqArgs)
+{
+SfxItemSet aLRSpaceSet( GetPool(), svl::Items{} );
+rSh.GetCurAttr( aLRSpaceSet );
+SvxLRSpaceItem aParaMargin( aLRSpaceSet.Get( RES_LR_SPACE ) );
+if
(pReqArgs->GetItemState(SID_PARAGRAPH_FIRST_LINE_INDENT,true,) ==
SfxItemState::SET)
+{
+const OUString ratio = static_cast(fLineIndent)->GetValue();
+aParaMargin.SetTextFirstLineOfst(nPageWidth * ratio.toFloat());
+}
+else if
(pReqArgs->GetItemState(SID_PARAGRAPH_LEFT_INDENT,true,) ==
SfxItemState::SET)
+{
+const OUString ratio = static_cast(pLeftIndent)->GetValue();
+aParaMargin.SetLeft(nPageWidth * ratio.toFloat());
+}
+else if
(pReqArgs->GetItemState(SID_PARAGRAPH_RIGHT_INDENT,true,) ==
SfxItemState::SET)
+{
+const OUString ratio = static_cast(pRightIndent)->GetValue();
+aParaMargin.SetRight(nPageWidth * ratio.toFloat());
+}
+rSh.SetAttrItem(aParaMargin);
+}
+break;
+}
case SID_HANGING_INDENT:
{
SfxItemSet aLRSpaceSet( GetPool(), svl::Items{} );
___
Libreoffice-commits mailing list
[Libreoffice-commits] online.git: loleaflet/archived-packages loleaflet/npm-shrinkwrap.json.in
dev/null|binary loleaflet/archived-packages/@braintree/sanitize-url-4.0.1-4c7210b55.tar |binary loleaflet/archived-packages/acorn-5.7.4-d43fbe546.tar |binary loleaflet/archived-packages/acorn-7.3.1-b4b734c12.tar |binary loleaflet/archived-packages/acorn-node-1.8.2-f26b7e7ec.tar |binary loleaflet/archived-packages/acorn-walk-7.1.1-c1d94f636.tar |binary loleaflet/archived-packages/arr-diff-4.0.0-d6461074f.tar|binary loleaflet/archived-packages/arr-union-3.1.0-e39b09aea.tar |binary loleaflet/archived-packages/array-unique-0.3.2-a894b75d4.tar|binary loleaflet/archived-packages/assert-1.5.0-103b206b0.tar |binary loleaflet/archived-packages/assign-symbols-1.0.0-59667f41f.tar |binary loleaflet/archived-packages/atob-2.1.2-5a6eae928.tar|binary loleaflet/archived-packages/autolinker-3.14.1-cafb111c8.tar |binary loleaflet/archived-packages/base-0.11.2-e53e8fe31.tar |binary loleaflet/archived-packages/base64-js-1.3.1-98b4388b6.tar |binary loleaflet/archived-packages/bn.js-4.11.9-13a42862a.tar |binary loleaflet/archived-packages/bn.js-5.1.2-e34ad969f.tar |binary loleaflet/archived-packages/braces-2.3.2-68d75b9e3.tar |binary loleaflet/archived-packages/browserify-16.5.1-1105f4879.tar |binary loleaflet/archived-packages/browserify-css-0.15.0-6602c7c99.tar |binary loleaflet/archived-packages/browserify-sign-4.2.0-844642d4a.tar |binary loleaflet/archived-packages/browserify-zlib-0.2.0-67de36472.tar |binary loleaflet/archived-packages/buffer-5.2.1-73e2a8d25.tar |binary loleaflet/archived-packages/cache-base-1.0.1-00a71d4e7.tar |binary loleaflet/archived-packages/class-utils-0.3.6-a8e84f6bf.tar |binary loleaflet/archived-packages/clean-css-4.2.3-55c3160cd.tar |binary loleaflet/archived-packages/collection-visit-1.0.0-4bc0373c1.tar|binary loleaflet/archived-packages/commander-2.20.3-1a956498c.tar |binary loleaflet/archived-packages/component-emitter-1.3.0-45ddec7ba.tar |binary loleaflet/archived-packages/console-browserify-1.2.0-64c9183bf.tar |binary loleaflet/archived-packages/copy-descriptor-0.1.1-676f6eb3c.tar |binary loleaflet/archived-packages/css-2.2.4-a149e3996.tar |binary loleaflet/archived-packages/d3-5.16.0-e0f2f9847.tar |binary loleaflet/archived-packages/d3-array-1.2.4-2875ba33c.tar|binary loleaflet/archived-packages/d3-axis-1.0.12-7a320d3df.tar|binary loleaflet/archived-packages/d3-brush-1.1.5-ac4689e60.tar|binary loleaflet/archived-packages/d3-chord-1.0.6-2570360eb.tar|binary loleaflet/archived-packages/d3-collection-1.0.7-8a2d3faf9.tar |binary loleaflet/archived-packages/d3-color-1.4.1-a76b131d2.tar|binary loleaflet/archived-packages/d3-contour-1.3.2-8683e9e0a.tar |binary loleaflet/archived-packages/d3-dispatch-1.0.6-7d58e8125.tar |binary loleaflet/archived-packages/d3-drag-1.2.5-ac3d68865.tar |binary loleaflet/archived-packages/d3-dsv-1.2.0-f72565aaf.tar |binary loleaflet/archived-packages/d3-ease-1.0.6-499fe5554.tar |binary loleaflet/archived-packages/d3-fetch-1.2.0-c82efc341.tar|binary loleaflet/archived-packages/d3-force-1.2.1-1c7bde872.tar|binary loleaflet/archived-packages/d3-format-1.4.4-4d692cdb9.tar |binary loleaflet/archived-packages/d3-geo-1.12.1-5c6e1dd5c.tar |binary loleaflet/archived-packages/d3-hierarchy-1.1.9-8fcb4fc65.tar|binary loleaflet/archived-packages/d3-interpolate-1.4.0-57dce72b4.tar |binary loleaflet/archived-packages/d3-path-1.0.9-54b698727.tar |binary loleaflet/archived-packages/d3-polygon-1.0.6-93e445ed6.tar |binary loleaflet/archived-packages/d3-quadtree-1.0.7-44a3c0797.tar |binary loleaflet/archived-packages/d3-random-1.1.2-e802b904d.tar |binary loleaflet/archived-packages/d3-scale-2.2.2-2db784bc6.tar|binary loleaflet/archived-packages/d3-scale-chromatic-1.5.0-00270be3a.tar |binary loleaflet/archived-packages/d3-selection-1.4.1-05321b463.tar|binary loleaflet/archived-packages/d3-shape-1.3.7-11492f2a3.tar|binary loleaflet/archived-packages/d3-time-1.1.0-5e1d22b2b.tar |binary loleaflet/archived-packages/d3-time-format-2.2.3-4401cd9c3.tar |binary loleaflet/archived-packages/d3-timer-1.0.10-0752439b4.tar |binary
[Libreoffice-commits] online.git: loleaflet/js loleaflet/package.json loleaflet/src
loleaflet/js/jquery.mCustomScrollbar.js |4 ++--
loleaflet/package.json |2 +-
loleaflet/src/control/Control.Toolbar.js |2 +-
loleaflet/src/control/Toolbar.js |3 +++
4 files changed, 7 insertions(+), 4 deletions(-)
New commits:
commit 489155f3a747c4b7323b4f1d1186e7722dd44906
Author: gokaysatir
AuthorDate: Wed Jun 10 13:16:31 2020 +0300
Commit: Andras Timar
CommitDate: Thu Jun 11 13:00:52 2020 +0200
leaflet: update jquery package.
Change-Id: I1d637b957808ae5938cf2ee7fe5c3f20e6b9cc52
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95856
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
diff --git a/loleaflet/js/jquery.mCustomScrollbar.js
b/loleaflet/js/jquery.mCustomScrollbar.js
index ffd8e1bba..f147bc2e8 100644
--- a/loleaflet/js/jquery.mCustomScrollbar.js
+++ b/loleaflet/js/jquery.mCustomScrollbar.js
@@ -883,9 +883,9 @@ and dependencies (minified).
_pluginMarkup=function(){
var $this=$(this),d=$this.data(pluginPfx),o=d.opt,
expandClass=o.autoExpandScrollbar ? "
"+classes[1]+"_expand" : "",
- scrollbar=["",""],
+ scrollbar=["",""],
wrapperClass=o.axis==="yx" ?
"mCSB_vertical_horizontal" : o.axis==="x" ? "mCSB_horizontal" : "mCSB_vertical",
- scrollbars=o.axis==="yx" ?
scrollbar[0]+scrollbar[1] : o.axis==="x" ? scrollbar[1] : scrollbar[0],
+ scrollbars=o.axis==="yx" ?
scrollbar[0]+scrollbar[1] : (o.axis==="x" ? scrollbar[1] : scrollbar[0]),
contentWrapper=o.axis==="yx" ? "" : "",
autoHideClass=o.autoHideScrollbar ? "
"+classes[6] : "",
scrollbarDirClass=(o.axis!=="x" &&
d.langDir==="rtl") ? " "+classes[7] : "";
diff --git a/loleaflet/package.json b/loleaflet/package.json
index 7a1aba5d0..d081f4eb9 100644
--- a/loleaflet/package.json
+++ b/loleaflet/package.json
@@ -10,7 +10,7 @@
"d3": "5.16.0",
"eslint": "3.0.0",
"hammerjs": "2.0.8",
-"jquery": "2.2.4",
+"jquery": "3.5.1",
"jquery-contextmenu": "2.9.2",
"jquery-mousewheel": "3.1.13",
"jquery-ui-dist": "1.12.1",
diff --git a/loleaflet/src/control/Control.Toolbar.js
b/loleaflet/src/control/Control.Toolbar.js
index 500ca36b5..4a797ffb0 100644
--- a/loleaflet/src/control/Control.Toolbar.js
+++ b/loleaflet/src/control/Control.Toolbar.js
@@ -476,7 +476,7 @@ function insertShapes(mobile) {
var width = 10;
var $grid = $('.insertshape-grid');
- if ($grid.children().size() > 0)
+ if ($grid.children().length > 0)
return;
for (var s in shapes) {
diff --git a/loleaflet/src/control/Toolbar.js b/loleaflet/src/control/Toolbar.js
index fdeec58af..2f6f28ad6 100644
--- a/loleaflet/src/control/Toolbar.js
+++ b/loleaflet/src/control/Toolbar.js
@@ -612,6 +612,9 @@ L.Map.include({
map.sendUnoCommand('.uno:SetHyperlink',
command);
map.focus();
}
+ else {
+ map.focus();
+ }
}
});
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/admin loleaflet/Makefile.am loleaflet/package.json loleaflet/po loleaflet/tsconfig.json
loleaflet/Makefile.am |9 +
loleaflet/admin/src/AdminSocketSettings.js | 27 ++---
loleaflet/admin/src/ModalDialogCreator.ts | 138 +
loleaflet/package.json |5 -
loleaflet/po/templates/loleaflet-ui.pot|4
loleaflet/tsconfig.json| 19 +++
6 files changed, 183 insertions(+), 19 deletions(-)
New commits:
commit a0748dda45ede8ec3d8c2b45f2b3446b0ad0e882
Author: gokaysatir
AuthorDate: Tue Jun 9 11:13:52 2020 +0300
Commit: Dennis Francis
CommitDate: Tue Jun 9 14:33:40 2020 +0200
leaflet: Introduce typescript. Initiate a modal library with typescript.
Change-Id: I92113f7552f938f0874e8b16904e8bef0b5249a3
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95624
Reviewed-by: Michael Meeks
Reviewed-by: Dennis Francis
Tested-by: Jenkins CollaboraOffice
Tested-by: Jenkins
diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index b411a4f7c..ff2071a04 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -95,7 +95,8 @@ LOLEAFLET_ADMIN_JS =\
admin/src/AdminSocketAnalytics.js \
admin/src/AdminSocketSettings.js \
admin/src/AdminSocketHistory.js \
- admin/src/AdminSocketLog.js
+ admin/src/AdminSocketLog.js \
+ admin/src/ModalDialogCreator.js
NODE_MODULES_SRC =\
autolinker@3.14.1 \
@@ -391,7 +392,11 @@ if !ENABLE_MOBILEAPP
ADMIN_BUNDLE = $(DIST_FOLDER)/admin-bundle.js
endif
-build-loleaflet: $(LOLEAFLET_L10N_DST) \
+compilets:
+ $(srcdir)/node_modules/typescript/bin/tsc
+
+build-loleaflet: compilets \
+ $(LOLEAFLET_L10N_DST) \
$(L10N_JSON) \
$(LOLEAFLET_IMAGES_DST) \
$(LOLEAFLET_IMAGES_CUSTOM_DST) \
diff --git a/loleaflet/admin/src/AdminSocketSettings.js
b/loleaflet/admin/src/AdminSocketSettings.js
index f57423634..6b4f41f4d 100644
--- a/loleaflet/admin/src/AdminSocketSettings.js
+++ b/loleaflet/admin/src/AdminSocketSettings.js
@@ -2,7 +2,7 @@
/*
Socket to be intialized on opening the settings page in Admin console
*/
-/* global vex $ AdminSocketBase Admin _ */
+/* global DlgYesNo $ AdminSocketBase Admin _ */
var AdminSocketSettings = AdminSocketBase.extend({
constructor: function(host) {
this.base(host);
@@ -29,21 +29,18 @@ var AdminSocketSettings = AdminSocketBase.extend({
socketSettings.send(command);
});
- $('#btnShutdown').click(function() {
- vex.dialog.confirm({
- message: _('Are you sure you want to
shut down the server?'),
- buttons: [
- $.extend({},
vex.dialog.buttons.YES, { text: _('OK') }),
- $.extend({},
vex.dialog.buttons.NO, { text: _('Cancel') })
- ],
- callback: function(value) {
- // TODO: Prompt for reason.
- if (value) {
-
socketSettings.send('shutdown maintenance');
- }
- }
+ document.getElementById('btnShutdown').onclick =
function() {
+ var dialog = (new DlgYesNo())
+ .title(_('Confirmation'))
+ .text(_('Are you sure you want to shut down the
server?'))
+ .yesButtonText(_('OK'))
+ .noButtonText(_('Cancel'))
+ .type('warning')
+ .yesFunction(function() {
+ socketSettings.send('shutdown
maintenance');
});
- });
+ dialog.open();
+ };
});
},
diff --git a/loleaflet/admin/src/ModalDialogCreator.ts
b/loleaflet/admin/src/ModalDialogCreator.ts
new file mode 100644
index 0..13dd9f8c3
--- /dev/null
+++ b/loleaflet/admin/src/ModalDialogCreator.ts
@@ -0,0 +1,138 @@
+/* eslint-disable */
+
+/// Available types: info, warning, danger, link, success, primary. Works with
bulma.css.
+
+// Every "set" function returns the instance. So you can do this:
+// (new DlgYesNo).Title('some title').Text('some
text').YesButtonText('yes').NoButtonText('no').YesFunction(function () {/*
*/}).NoFunction(function() {/** */});
+// "Yes" and "No" buttons call callback function, close the modal and destroy
the modal.
+
+class DlgYesNo {
+static _instanceCount: number = 0;
+_instance: DlgYesNo;
+_modalID: number;
+
+
[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2-4' - loleaflet/src
loleaflet/src/control/Ruler.js |1 +
1 file changed, 1 insertion(+)
New commits:
commit d88c28203f8c10c634e5a428281672fdc0b0b104
Author: gokaysatir
AuthorDate: Sat May 30 11:50:34 2020 +0300
Commit: Andras Timar
CommitDate: Mon Jun 8 20:47:55 2020 +0200
tdf#111535 fix mispositioning bug when the page is resized.
Change-Id: I67444baa78f99558906de4e8e6c45a8b6f11bce6
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95178
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95762
diff --git a/loleaflet/src/control/Ruler.js b/loleaflet/src/control/Ruler.js
index f5c3dda4d..b3cb520b9 100644
--- a/loleaflet/src/control/Ruler.js
+++ b/loleaflet/src/control/Ruler.js
@@ -418,6 +418,7 @@ L.Control.Ruler = L.Control.extend({
this._rFace.style.marginLeft = rulerOffset + 'px';
this.rulerOffset = rulerOffset; // Needed on different parts
too..
+ this._updateParagraphIndentations();
},
_moveIndentation: function(e) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2-4' - loleaflet/admin loleaflet/Makefile.am wsd/Admin.cpp wsd/Admin.hpp wsd/FileServer.cpp wsd/protocol.txt
loleaflet/Makefile.am |3
loleaflet/admin/admin.html|1
loleaflet/admin/admin.strings.js |3
loleaflet/admin/adminAnalytics.html |1
loleaflet/admin/adminHistory.html |1
loleaflet/admin/adminLog.html | 105 +
loleaflet/admin/adminSettings.html|1
loleaflet/admin/src/AdminSocketLog.js | 121 ++
wsd/Admin.cpp | 106 +
wsd/Admin.hpp | 12 ++-
wsd/FileServer.cpp|3
wsd/protocol.txt |9 ++
12 files changed, 360 insertions(+), 6 deletions(-)
New commits:
commit 1af9cd06ef8f30b96cbccedbe77d83bc854261e4
Author: gokaysatir
AuthorDate: Wed May 13 16:40:05 2020 +0300
Commit: Andras Timar
CommitDate: Mon Jun 8 10:28:44 2020 +0200
tdf#114982 - AdminConsole: control logging
Change-Id: I53cf4b0ff81ea9d6bf4ad595077f7365e7e34c00
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94130
Tested-by: Jenkins CollaboraOffice
Tested-by: Jenkins
Reviewed-by: Michael Meeks
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95705
Reviewed-by: Andras Timar
diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 1959b1204..90e72ef39 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -89,7 +89,8 @@ LOLEAFLET_ADMIN_JS =\
admin/src/AdminSocketOverview.js \
admin/src/AdminSocketAnalytics.js \
admin/src/AdminSocketSettings.js \
- admin/src/AdminSocketHistory.js
+ admin/src/AdminSocketHistory.js \
+ admin/src/AdminSocketLog.js
NODE_MODULES_SRC =\
autolinker@1.4.3 \
diff --git a/loleaflet/admin/admin.html b/loleaflet/admin/admin.html
index acd114098..2b60f767b 100644
--- a/loleaflet/admin/admin.html
+++ b/loleaflet/admin/admin.html
@@ -59,6 +59,7 @@
document.write(l10nstrings.strOverview) document.write(l10nstrings.strCurrent)
document.write(l10nstrings.strAnalytics)
document.write(l10nstrings.strHistory)
+document.write(l10nstrings.strLog)
diff --git a/loleaflet/admin/admin.strings.js b/loleaflet/admin/admin.strings.js
index 7dea1cdd3..91d90b4f1 100644
--- a/loleaflet/admin/admin.strings.js
+++ b/loleaflet/admin/admin.strings.js
@@ -9,6 +9,7 @@ l10nstrings.strOverview = _('Overview');
l10nstrings.strCurrent = _('(current)');
l10nstrings.strAnalytics = _('Analytics');
l10nstrings.strHistory = _('History');
+l10nstrings.strLog = _('Log');
l10nstrings.strDashboard = _('Dashboard');
l10nstrings.strUsersOnline = _('Users online');
l10nstrings.strUserName = _('User Name');
@@ -40,7 +41,7 @@ l10nstrings.strDocuments = _('Documents:');
l10nstrings.strExpired = _('Expired:');
l10nstrings.strRefresh = _('Refresh');
l10nstrings.strShutdown = _('Shutdown Server');
-l10nstrings.strServerUptime = _('Server uptime')
+l10nstrings.strServerUptime = _('Server uptime');
if (module) {
module.exports = l10nstrings;
diff --git a/loleaflet/admin/adminAnalytics.html
b/loleaflet/admin/adminAnalytics.html
index 7667c67df..af3b6eb31 100644
--- a/loleaflet/admin/adminAnalytics.html
+++ b/loleaflet/admin/adminAnalytics.html
@@ -59,6 +59,7 @@
document.write(l10nstrings.strOverview)
document.write(l10nstrings.strAnalytics)
document.write(l10nstrings.strCurrent)
document.write(l10nstrings.strHistory)
+document.write(l10nstrings.strLog)
diff --git a/loleaflet/admin/adminHistory.html
b/loleaflet/admin/adminHistory.html
index 60ad593d3..ec652011e 100644
--- a/loleaflet/admin/adminHistory.html
+++ b/loleaflet/admin/adminHistory.html
@@ -59,6 +59,7 @@
document.write(l10nstrings.strOverview)
document.write(l10nstrings.strAnalytics)
document.write(l10nstrings.strHistory)
document.write(l10nstrings.strCurrent)
+document.write(l10nstrings.strLog)
diff --git a/loleaflet/admin/adminLog.html b/loleaflet/admin/adminLog.html
new file mode 100644
index 0..73036828e
--- /dev/null
+++ b/loleaflet/admin/adminLog.html
@@ -0,0 +1,105 @@
+
+
+
+
+
+
+
+
+
+
+LibreOffice Online - Admin console
+
+
+
+
+
+
+
+
+if (typeof brandProductName !== 'undefined')
{l10nstrings.strProductName = brandProductName}
+document.title = l10nstrings.strProductName + ' - ' +
l10nstrings.strAdminConsole
+
+ if (window.location.protocol == "https:") {
+ var host = 'wss://' + window.location.host +
'%SERVICE_ROOT%/lool/adminws/';
+ }
+ else {
+ host = 'ws://' + window.location.host +
'%SERVICE_ROOT%/lool/adminws/';
+ }
+
+ Admin.Log(host)
+
+
+
+
+
+
+
+
+
+
[Libreoffice-commits] online.git: loleaflet/admin loleaflet/package.json
loleaflet/admin/src/AdminSocketAnalytics.js | 29 ++--
loleaflet/package.json |2 -
2 files changed, 12 insertions(+), 19 deletions(-)
New commits:
commit 9d0fc3801d1b5aeb24b7e0401ceeb9f1ac5d86ed
Author: gokaysatir
AuthorDate: Thu Jun 4 21:25:43 2020 +0300
Commit: Henry Castro
CommitDate: Thu Jun 4 21:21:37 2020 +0200
leaflet: update d3 package.
Change-Id: I3afe1021edf9e77ff7a62de0a0d4478c974af57b
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95534
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Henry Castro
diff --git a/loleaflet/admin/src/AdminSocketAnalytics.js
b/loleaflet/admin/src/AdminSocketAnalytics.js
index e965fc62e..d4fa1a149 100644
--- a/loleaflet/admin/src/AdminSocketAnalytics.js
+++ b/loleaflet/admin/src/AdminSocketAnalytics.js
@@ -97,21 +97,20 @@ var AdminSocketAnalytics = AdminSocketBase.extend({
else if (option === 'net')
data = this._sentStatsData.concat(this._recvStatsData);
- xScale = d3.scale.linear().range([this._graphMargins.left,
this._graphWidth - this._graphMargins.right]).domain([d3.min(data, function(d) {
+ xScale = d3.scaleLinear().range([this._graphMargins.left,
this._graphWidth - this._graphMargins.right]).domain([d3.min(data, function(d) {
return d.time;
}), d3.max(data, function(d) {
return d.time;
})]);
- yScale = d3.scale.linear().range([this._graphHeight -
this._graphMargins.bottom, this._graphMargins.top]).domain([d3.min(data,
function(d) {
+ yScale = d3.scaleLinear().range([this._graphHeight -
this._graphMargins.bottom, this._graphMargins.top]).domain([d3.min(data,
function(d) {
return d.value;
}), d3.max(data, function(d) {
return d.value;
})]);
- d3XAxis = d3.svg.axis()
- .scale(xScale)
+ d3XAxis = d3.axisBottom(xScale)
.tickFormat(function(d) {
d = Math.abs(d / 1000);
var sUnit = 0;
@@ -128,49 +127,43 @@ var AdminSocketAnalytics = AdminSocketBase.extend({
return d + units[i];
});
- d3Line = d3.svg.line()
+ d3Line = d3.line()
.x(function(d) {
return xScale(d.time);
})
.y(function(d) {
return yScale(d.value);
})
- .interpolate('monotone');
+ .curve(d3.curveMonotoneX);
if (option === 'mem') {
this._xMemScale = xScale;
this._yMemScale = yScale;
this._d3MemXAxis = d3XAxis;
- this._d3MemYAxis = d3.svg.axis()
- .scale(this._yMemScale)
+ this._d3MemYAxis = d3.axisLeft(this._yMemScale)
.tickFormat(function (d) {
return Util.humanizeMem(d);
- })
- .orient('left');
+ });
this._d3MemLine = d3Line;
}
else if (option === 'cpu') {
this._xCpuScale = xScale;
this._yCpuScale = yScale;
this._d3CpuXAxis = d3XAxis;
- this._d3CpuYAxis = d3.svg.axis()
- .scale(this._yCpuScale)
+ this._d3CpuYAxis = d3.axisLeft(this._yCpuScale)
.tickFormat(function (d) {
return d + '%';
- })
- .orient('left');
+ });
this._d3CpuLine = d3Line;
}
else if (option === 'net') {
this._xNetScale = xScale;
this._yNetScale = yScale;
this._d3NetXAxis = d3XAxis;
- this._d3NetYAxis = d3.svg.axis()
- .scale(this._yNetScale)
+ this._d3NetYAxis = d3.axisLeft(this._yNetScale)
.tickFormat(function (d) {
return Util.humanizeMem(d/1000) +
'/sec';
- })
- .orient('left');
+ });
this._d3NetSentLine = d3Line;
this._d3NetRecvLine =
[Libreoffice-commits] online.git: loleaflet/admin
loleaflet/admin/src/AdminSocketSettings.js |6 --
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit e703f2bac0d8dd05d44e47c45c1376e7a24a0946
Author: gokaysatir
AuthorDate: Thu Jun 4 15:29:27 2020 +0300
Commit: Michael Meeks
CommitDate: Thu Jun 4 17:08:21 2020 +0200
leaflet: fix admin console - shut down modal is not working properly.
Change-Id: I7a85808715eb44c7f5c8c50151bc0fc1c54b0d71
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95510
Reviewed-by: Michael Meeks
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
diff --git a/loleaflet/admin/src/AdminSocketSettings.js
b/loleaflet/admin/src/AdminSocketSettings.js
index ab43bd605..f57423634 100644
--- a/loleaflet/admin/src/AdminSocketSettings.js
+++ b/loleaflet/admin/src/AdminSocketSettings.js
@@ -36,9 +36,11 @@ var AdminSocketSettings = AdminSocketBase.extend({
$.extend({},
vex.dialog.buttons.YES, { text: _('OK') }),
$.extend({},
vex.dialog.buttons.NO, { text: _('Cancel') })
],
- callback: function() {
+ callback: function(value) {
// TODO: Prompt for reason.
- socketSettings.send('shutdown
maintenance');
+ if (value) {
+
socketSettings.send('shutdown maintenance');
+ }
}
});
});
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/js
loleaflet/js/global.js |8
1 file changed, 8 deletions(-)
New commits:
commit 9a4952dccc0f5113ebed7bb1eeb2e05650510916
Author: gokaysatir
AuthorDate: Thu Jun 4 15:09:13 2020 +0300
Commit: Henry Castro
CommitDate: Thu Jun 4 15:52:47 2020 +0200
leaflet: Remove old jquery-fixer code.
Change-Id: I15796cdbb21295215699eefe4ecbe25f37d4e567
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95509
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Henry Castro
diff --git a/loleaflet/js/global.js b/loleaflet/js/global.js
index 1c951b089..6430ec908 100644
--- a/loleaflet/js/global.js
+++ b/loleaflet/js/global.js
@@ -606,14 +606,6 @@
};
}
- // fix jquery-ui
- // var jQuery = require('jquery');
- global.require = function (path) {
- if (path=='jquery') {
- return global.jQuery;
- }
- };
-
global.getParameterByName = function (name) {
name = name.replace(/[\[]/, '\\[').replace(/[\]]/, '\\]');
var regex = new RegExp('[\\?&]' + name +
[Libreoffice-commits] online.git: loleaflet/admin loleaflet/Makefile.am loleaflet/package.json wsd/FileServer.cpp
loleaflet/Makefile.am |2
loleaflet/admin/admin.html | 226 ---
loleaflet/admin/admin.strings.js |5
loleaflet/admin/adminAnalytics.html| 155 ++-
loleaflet/admin/adminHistory.html | 87
loleaflet/admin/adminLog.html | 139 +--
loleaflet/admin/adminSettings.html | 252 ++---
loleaflet/admin/admintemplate.html | 105 +
loleaflet/admin/bootstrap/LICENSE | 21 -
loleaflet/admin/bootstrap/dashboard.css| 160
loleaflet/admin/bootstrap/holder.min.js| 13
loleaflet/admin/bootstrap/ie10-viewport-bug-workaround.css | 13
loleaflet/admin/bootstrap/ie10-viewport-bug-workaround.js | 24 -
loleaflet/admin/css/bulma.min.css |1
loleaflet/admin/dashboard.css | 115 -
loleaflet/admin/debug/admin.html | 129 --
loleaflet/admin/debug/adminAnalytics.html | 100 -
loleaflet/admin/debug/adminSettings.html | 107 -
loleaflet/admin/fonts/Montserrat-Regular.ttf |binary
loleaflet/admin/fonts/OFL.txt | 93
loleaflet/admin/main-admin.js |8
loleaflet/admin/src/AdminSocketLog.js | 17
loleaflet/package.json |1
wsd/FileServer.cpp | 22 -
24 files changed, 546 insertions(+), 1249 deletions(-)
New commits:
commit 5f07429b6b8a61e97b9056027a1ab95be2c5eb7d
Author: gokaysatir
AuthorDate: Thu Jun 4 01:36:46 2020 +0300
Commit: Andras Timar
CommitDate: Thu Jun 4 12:56:16 2020 +0200
leaflet: Update admin console & drop bootstrap package.
Change-Id: I9243393693c2464f2e9a4d24cccf9c5f3415e2ef
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95468
Tested-by: Jenkins CollaboraOffice
Tested-by: Jenkins
Reviewed-by: Andras Timar
diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 329a96357..b411a4f7c 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -54,7 +54,7 @@ LOLEAFLET_HTML_DST = $(patsubst
$(srcdir)/html/%.html,$(DIST_FOLDER)/%.html,$(LO
LOLEAFLET_WELCOME_SRC = $(shell find $(srcdir)/welcome -name '*.html')
LOLEAFLET_WELCOME_DST = $(patsubst
$(srcdir)/welcome/%.html,$(DIST_FOLDER)/welcome/%.html,$(LOLEAFLET_WELCOME_SRC))
-LOLEAFLET_ADMIN_SRC = $(shell find $(srcdir)/admin -name '*.html')
+LOLEAFLET_ADMIN_SRC = $(shell find $(srcdir)/admin -name '*.html' -or -name
'*.css' -or -name '*.ttf' -or -name 'OFL.txt')
LOLEAFLET_ADMIN_ALL = $(shell find $(srcdir)/admin -name '*')
LOLEAFLET_ADMIN_DST = $(patsubst
$(srcdir)/admin/%,$(DIST_FOLDER)/admin/%,$(LOLEAFLET_ADMIN_SRC))
diff --git a/loleaflet/admin/admin.html b/loleaflet/admin/admin.html
index 2b60f767b..9f5fc6886 100644
--- a/loleaflet/admin/admin.html
+++ b/loleaflet/admin/admin.html
@@ -1,151 +1,101 @@
-
-
-
-
-
-
-
-
-
+
+
+Admin.Overview(host);
-LibreOffice Online - Admin console
+document.write(l10nstrings.strDashboard)
-
-
-
-
-
-
-
-if (typeof brandProductName !== 'undefined')
{l10nstrings.strProductName = brandProductName}
-document.title = l10nstrings.strProductName + ' - ' +
l10nstrings.strAdminConsole
-
- if (window.location.protocol == "https:") {
- var host = 'wss://' + window.location.host +
'%SERVICE_ROOT%/lool/adminws/';
- }
- else {
- host = 'ws://' + window.location.host +
'%SERVICE_ROOT%/lool/adminws/';
- }
-
- Admin.Overview(host);
-
-
-
-
-
-
-
-
-
-
-
- document.write(l10nstrings.strProductName + ' - ' +
l10nstrings.strAdminConsole)
+
+
+
+ document.write(l10nstrings.strUsersOnline)
+ 0
-
-
-document.write(l10nstrings.strSettings)
-
+
+
+
+ document.write(l10nstrings.strDocumentsOpened)
+ 0
-
-
-
-
-
-
-document.write(l10nstrings.strOverview) document.write(l10nstrings.strCurrent)
-document.write(l10nstrings.strAnalytics)
-document.write(l10nstrings.strHistory)
-document.write(l10nstrings.strLog)
-
+
+
+ document.write(l10nstrings.strMemoryConsumed)
+ 0
-
- document.write(l10nstrings.strDashboard)
-
-
-
- 0
-
document.write(l10nstrings.strUsersOnline)
-
[Libreoffice-commits] online.git: loleaflet/css loleaflet/images loleaflet/Makefile.am loleaflet/package.json
loleaflet/Makefile.am |8 loleaflet/css/jquery-ui-lightness.css | 1311 ++ loleaflet/images/jquery-ui-lightness/ui-bg_diagonals-thick_18_b81900_40x40.png |binary loleaflet/images/jquery-ui-lightness/ui-bg_diagonals-thick_20_66_40x40.png |binary loleaflet/images/jquery-ui-lightness/ui-bg_glass_100_f6f6f6_1x400.png |binary loleaflet/images/jquery-ui-lightness/ui-bg_glass_100_fdf5ce_1x400.png |binary loleaflet/images/jquery-ui-lightness/ui-bg_glass_65_ff_1x400.png |binary loleaflet/images/jquery-ui-lightness/ui-bg_gloss-wave_35_f6a828_500x100.png |binary loleaflet/images/jquery-ui-lightness/ui-bg_highlight-soft_100_ee_1x100.png |binary loleaflet/images/jquery-ui-lightness/ui-bg_highlight-soft_75_ffe45c_1x100.png |binary loleaflet/images/jquery-ui-lightness/ui-icons_22_256x240.png |binary loleaflet/images/jquery-ui-lightness/ui-icons_228ef1_256x240.png |binary loleaflet/images/jquery-ui-lightness/ui-icons_ef8c08_256x240.png |binary loleaflet/images/jquery-ui-lightness/ui-icons_ffd27a_256x240.png |binary loleaflet/images/jquery-ui-lightness/ui-icons_ff_256x240.png |binary loleaflet/package.json |2 16 files changed, 1316 insertions(+), 5 deletions(-) New commits: commit 6f6c0a32e5e5856b4e5136149ecac50b748d70d8 Author: gokaysatir AuthorDate: Tue Jun 2 12:46:39 2020 +0300 Commit: Andras Timar CommitDate: Thu Jun 4 12:55:07 2020 +0200 leaflet: update jquery-ui package with lightness them. Change-Id: I8273c2f7d8b46f63f582c11c2c0e81c303e04bcb Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95352 Tested-by: Jenkins CollaboraOffice Tested-by: Jenkins Reviewed-by: Andras Timar diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am index 3f68dcf12..329a96357 100644 --- a/loleaflet/Makefile.am +++ b/loleaflet/Makefile.am @@ -30,11 +30,11 @@ $(L10N_IOS_ALL_JS) : $(wildcard $(srcdir)/po/ui-*.po) $(shell find $(srcdir)/l10 done endif -JQUERY_LIGHTNESS_IMAGE_PATH = node_modules/jquery-ui/themes/ui-lightness/images +JQUERY_LIGHTNESS_IMAGE_PATH = $(srcdir)/images/jquery-ui-lightness JQUERY_LIGHTNESS_IMAGES = $(wildcard $(JQUERY_LIGHTNESS_IMAGE_PATH)/*.png) JQUERY_LIGHTNESS_DIST_IMAGES = $(patsubst $(JQUERY_LIGHTNESS_IMAGE_PATH)/%.png,$(DIST_FOLDER)/images/%.png,$(JQUERY_LIGHTNESS_IMAGES)) -JQUERY_MINIFIED_IMAGE_PATH = node_modules/jquery-ui/themes/base/minified/images +JQUERY_MINIFIED_IMAGE_PATH = node_modules/jquery-ui-dist/images JQUERY_MINIFIED_IMAGES = $(wildcard $(JQUERY_MINIFIED_IMAGE_PATH)/*.png) JQUERY_MINIFIED_DIST_IMAGES = $(patsubst $(JQUERY_MINIFIED_IMAGE_PATH)/%.png,$(DIST_FOLDER)/images/%.png,$(JQUERY_MINIFIED_IMAGES)) @@ -136,7 +136,7 @@ LOLEAFLET_CSS =\ $(srcdir)/css/jsdialogs.css \ $(srcdir)/css/notebookbar.css \ $(srcdir)/css/vex.css \ - $(builddir)/node_modules/jquery-ui/themes/ui-lightness/jquery-ui.css + $(srcdir)/css/jquery-ui-lightness.css LOLEAFLET_CSS_DST = $(foreach file,$(LOLEAFLET_CSS),$(DIST_FOLDER)/$(notdir $(file))) LOLEAFLET_CSS_M4 = $(strip $(foreach file,$(LOLEAFLET_CSS),$(notdir $(file @@ -148,7 +148,7 @@ NODE_MODULES_JS =\ node_modules/jquery/dist/jquery.js \ node_modules/jquery-mousewheel/jquery.mousewheel.js \ node_modules/jquery-contextmenu/dist/jquery.contextMenu.js \ - node_modules/jquery-ui/jquery-ui.js \ + node_modules/jquery-ui-dist/jquery-ui.js \ node_modules/smartmenus/dist/jquery.smartmenus.js LOLEAFLET_LIBS_JS =\ diff --git a/loleaflet/css/jquery-ui-lightness.css b/loleaflet/css/jquery-ui-lightness.css new file mode 100644 index 0..6b7ec6aaf --- /dev/null +++ b/loleaflet/css/jquery-ui-lightness.css @@ -0,0 +1,1311 @@ +/*! jQuery UI - v1.12.1 - 2016-09-14 +* http://jqueryui.com +* Includes: core.css, accordion.css, autocomplete.css, menu.css, button.css, controlgroup.css, checkboxradio.css, datepicker.css, dialog.css, draggable.css, resizable.css, progressbar.css, selectable.css, selectmenu.css, slider.css, sortable.css, spinner.css, tabs.css, tooltip.css, theme.css +* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Trebuchet%20MS%2CTahoma%2CVerdana%2CArial%2Csans-serif=bold=1.1em=4px=f6a828=gloss_wave=35=e78f08=ff=ff=ee=highlight_soft=100=dd=33=22=f6f6f6=glass=100=cc=1c94c4=ef8c08=fdf5ce=glass=100=fbcb09=c77405=ef8c08=ff=glass=65=fbd850=eb8f00=ef8c08=ffe45c=highlight_soft=75=fed22f=363636 ight=228ef1=b81900=diagonals_thick=18=cd0a0a=ff=ffd27a=66=diagonals_thick=20=50=00=flat=10=20=5px=-5px=-5px=5px +* Copyright jQuery Foundation and other contributors; Licensed MIT */ + +/* Layout helpers
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/control/Ruler.js |1 +
1 file changed, 1 insertion(+)
New commits:
commit 0b82134d9067abea83959f44728cd3623f14dc7d
Author: gokaysatir
AuthorDate: Sat May 30 11:50:34 2020 +0300
Commit: Andras Timar
CommitDate: Wed Jun 3 21:10:02 2020 +0200
tdf#111535 fix mispositioning bug when the page is resized.
Change-Id: I67444baa78f99558906de4e8e6c45a8b6f11bce6
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95178
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
diff --git a/loleaflet/src/control/Ruler.js b/loleaflet/src/control/Ruler.js
index f5c3dda4d..b3cb520b9 100644
--- a/loleaflet/src/control/Ruler.js
+++ b/loleaflet/src/control/Ruler.js
@@ -418,6 +418,7 @@ L.Control.Ruler = L.Control.extend({
this._rFace.style.marginLeft = rulerOffset + 'px';
this.rulerOffset = rulerOffset; // Needed on different parts
too..
+ this._updateParagraphIndentations();
},
_moveIndentation: function(e) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/js
loleaflet/js/jquery.mCustomScrollbar.js | 85 ++--
1 file changed, 60 insertions(+), 25 deletions(-)
New commits:
commit 42a36a5da36b661ee0b0b6e998ddc622df3f3c2c
Author: gokaysatir
AuthorDate: Tue Jun 2 12:09:02 2020 +0300
Commit: Henry Castro
CommitDate: Tue Jun 2 14:54:06 2020 +0200
leaflet: update mcustomscrollbar.js file.
Change-Id: I8adf3a8370b307c532ab64ad439f75ebfe318ebe
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95301
Tested-by: Jenkins CollaboraOffice
Tested-by: Jenkins
Reviewed-by: Henry Castro
diff --git a/loleaflet/js/jquery.mCustomScrollbar.js
b/loleaflet/js/jquery.mCustomScrollbar.js
index 42876a14e..79bf0521f 100644
--- a/loleaflet/js/jquery.mCustomScrollbar.js
+++ b/loleaflet/js/jquery.mCustomScrollbar.js
@@ -1,7 +1,7 @@
/* -*- js-indent-level: 8; indent-tabs-mode: t; fill-column: 120 -*- */
/*
== malihu jquery custom scrollbar plugin ==
-Version: 3.1.3
+Version: 3.1.5
Plugin URI: http://manos.malihu.gr/jquery-custom-content-scroller
Author: malihu
Author URI: http://manos.malihu.gr
@@ -38,7 +38,9 @@ and dependencies (minified).
*/
(function(factory){
- if(typeof module!=="undefined" && module.exports){
+ if(typeof define==="function" && define.amd){
+ define(["jquery"],factory);
+ }else if(typeof module!=="undefined" && module.exports){
module.exports=factory;
}else{
factory(jQuery,window,document);
@@ -1178,8 +1180,8 @@ and dependencies (minified).
/* returns input coordinates of pointer, touch and mouse events
(relative to document) */
_coordinates=function(e){
- var t=e.type,o=e.target.ownerDocument!==document ?
[$(frameElement).offset().top,$(frameElement).offset().left] : null,
- io=_canAccessIFrame() &&
e.target.ownerDocument!==top.document ?
[$(e.view.frameElement).offset().top,$(e.view.frameElement).offset().left] :
[0,0];
+ var t=e.type,o=e.target.ownerDocument!==document &&
frameElement!==null ?
[$(frameElement).offset().top,$(frameElement).offset().left] : null,
+ io=_canAccessIFrame() &&
e.target.ownerDocument!==top.document && frameElement!==null ?
[$(e.view.frameElement).offset().top,$(e.view.frameElement).offset().left] :
[0,0];
switch(t){
case "pointerdown": case "MSPointerDown": case
"pointermove": case "MSPointerMove": case "pointerup": case "MSPointerUp":
return o ?
[e.originalEvent.pageY-o[0]+io[0],e.originalEvent.pageX-o[1]+io[1],false] :
[e.originalEvent.pageY,e.originalEvent.pageX,false];
@@ -1209,13 +1211,15 @@ and dependencies (minified).
draggable,dragY,dragX,
rds=o.advanced.releaseDraggableSelectors ?
mCSB_dragger.add($(o.advanced.releaseDraggableSelectors)) : mCSB_dragger,
eds=o.advanced.extraDraggableSelectors ?
$(!_canAccessIFrame() ||
top.document).add($(o.advanced.extraDraggableSelectors)) :
$(!_canAccessIFrame() || top.document);
- mCSB_dragger.bind("mousedown."+namespace+"
touchstart."+namespace+" pointerdown."+namespace+"
MSPointerDown."+namespace,function(e){
+
mCSB_dragger.bind("contextmenu."+namespace,function(e){
+ e.preventDefault(); //prevent right
click
+ }).bind("mousedown."+namespace+"
touchstart."+namespace+" pointerdown."+namespace+"
MSPointerDown."+namespace,function(e){
e.stopImmediatePropagation();
e.preventDefault();
if(!_mouseBtnLeft(e)){return;} /* left mouse
button only */
touchActive=true;
if(oldIE){document.onselectstart=function(){return false;}} /* disable text
selection for IE < 9 */
- _iframe(false); /* enable scrollbar dragging
over iframes by disabling their events */
+ _iframe.call(mCSB_container,false); /* enable
scrollbar dragging over iframes by disabling their events */
_stop($this);
draggable=$(this);
var coordinates = _coordinates(e);
@@ -1247,14 +1251,8 @@ and dependencies (minified).
}
touchActive=false;
if(oldIE){document.onselectstart=null;} /*
enable text selection for IE < 9 */
- _iframe(true); /* enable iframes events */
+ _iframe.call(mCSB_container,true); /* enable
iframes events */
[Libreoffice-commits] online.git: loleaflet/package.json
loleaflet/package.json |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit ba64819ef8400c05948c3c45735b425d4ef19643
Author: gokaysatir
AuthorDate: Mon Jun 1 12:03:32 2020 +0300
Commit: Henry Castro
CommitDate: Mon Jun 1 20:02:11 2020 +0200
update uglifyify package.
Change-Id: Ib7badc17f087d4abbf04d8f683229a4b92faff76
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95265
Tested-by: Jenkins CollaboraOffice
Tested-by: Jenkins
Reviewed-by: Henry Castro
diff --git a/loleaflet/package.json b/loleaflet/package.json
index 40bf92609..b73444cc0 100644
--- a/loleaflet/package.json
+++ b/loleaflet/package.json
@@ -22,7 +22,7 @@
"smartmenus": "1.0.0",
"uglify-js": "3.9.4",
"uglifycss": "0.0.29",
-"uglifyify": "3.0.2",
+"uglifyify": "5.0.2",
"vex-js": "4.1.0"
},
"repository": {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/package.json
loleaflet/package.json |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d4fcf7c537e54a5ef299ce7bef16b129546f1d30 Author: gokaysatir AuthorDate: Mon Jun 1 11:47:12 2020 +0300 Commit: Henry Castro CommitDate: Mon Jun 1 17:28:48 2020 +0200 update uglify-css package. Change-Id: If6c173393cf49d283db646d72f8770d0b2600ed7 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95262 Tested-by: Jenkins CollaboraOffice Tested-by: Jenkins Reviewed-by: Henry Castro diff --git a/loleaflet/package.json b/loleaflet/package.json index 0d41c6091..40bf92609 100644 --- a/loleaflet/package.json +++ b/loleaflet/package.json @@ -21,7 +21,7 @@ "shrinkpack": "1.0.0-alpha", "smartmenus": "1.0.0", "uglify-js": "3.9.4", -"uglifycss": "0.0.27", +"uglifycss": "0.0.29", "uglifyify": "3.0.2", "vex-js": "4.1.0" }, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/js loleaflet/package.json
loleaflet/js/l10n.js |2 +-
loleaflet/package.json |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit ee098941a82a8bca8d90af0e663f6c2ec880d54b
Author: gokaysatir
AuthorDate: Mon Jun 1 11:21:23 2020 +0300
Commit: Henry Castro
CommitDate: Mon Jun 1 17:16:13 2020 +0200
update uglify-js package.
Change-Id: Ic1298127d186a094e81ffc58a9ed35f82948cb1f
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95267
Tested-by: Jenkins CollaboraOffice
Tested-by: Jenkins
Reviewed-by: Henry Castro
diff --git a/loleaflet/js/l10n.js b/loleaflet/js/l10n.js
index 4beab6e7a..b8706298f 100644
--- a/loleaflet/js/l10n.js
+++ b/loleaflet/js/l10n.js
@@ -130,7 +130,7 @@ var
return Function.prototype[$to_locale_string].apply(String_ctr,
arguments);
}
, loadFromDisk = String_ctr[$to_locale_string] = function (uri) {
-const fs = require('fs');
+var fs = require('fs');
var read = fs.readFileSync(uri, 'utf8');
return JSON.parse(read);
}
diff --git a/loleaflet/package.json b/loleaflet/package.json
index c8fbbf9e0..0d41c6091 100644
--- a/loleaflet/package.json
+++ b/loleaflet/package.json
@@ -20,7 +20,7 @@
"select2": "4.0.13",
"shrinkpack": "1.0.0-alpha",
"smartmenus": "1.0.0",
-"uglify-js": "2.4.24",
+"uglify-js": "3.9.4",
"uglifycss": "0.0.27",
"uglifyify": "3.0.2",
"vex-js": "4.1.0"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/package.json
loleaflet/package.json |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c71ba8714b43f751e05d1e91bd0a366ee07eb00f Author: gokaysatir AuthorDate: Mon Jun 1 14:47:30 2020 +0300 Commit: Henry Castro CommitDate: Mon Jun 1 16:11:51 2020 +0200 update jquery-mousewheel package. Change-Id: Ib570f53cc1ca41bb8f5344562417e4490b9a04f0 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95281 Tested-by: Jenkins CollaboraOffice Tested-by: Jenkins Reviewed-by: Henry Castro diff --git a/loleaflet/package.json b/loleaflet/package.json index 5eef36ead..c8fbbf9e0 100644 --- a/loleaflet/package.json +++ b/loleaflet/package.json @@ -13,7 +13,7 @@ "hammerjs": "2.0.8", "jquery": "2.2.4", "jquery-contextmenu": "2.9.2", -"jquery-mousewheel": "3.1.3", +"jquery-mousewheel": "3.1.13", "jquery-ui": "1.10.5", "json-js": "1.1.2", "l10n-for-node": "0.0.1", ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/package.json
loleaflet/package.json |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 77c887c04b1e715bc2add5bb3abaebd8f2911851 Author: gokaysatir AuthorDate: Mon Jun 1 14:13:24 2020 +0300 Commit: Henry Castro CommitDate: Mon Jun 1 16:11:14 2020 +0200 update jquery-contextmenu package. Change-Id: I709a865619add00b8c580fc4fbecfeb1a2d451a9 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95278 Tested-by: Jenkins Tested-by: Jenkins CollaboraOffice Reviewed-by: Henry Castro diff --git a/loleaflet/package.json b/loleaflet/package.json index 2471e8526..5eef36ead 100644 --- a/loleaflet/package.json +++ b/loleaflet/package.json @@ -12,7 +12,7 @@ "eslint": "3.0.0", "hammerjs": "2.0.8", "jquery": "2.2.4", -"jquery-contextmenu": "2.2.3", +"jquery-contextmenu": "2.9.2", "jquery-mousewheel": "3.1.3", "jquery-ui": "1.10.5", "json-js": "1.1.2", ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/js loleaflet/Makefile.am loleaflet/package.json
loleaflet/Makefile.am |2
loleaflet/js/select2.js | 2760 ++--
loleaflet/package.json |2
3 files changed, 2007 insertions(+), 757 deletions(-)
New commits:
commit d478b2d030cee45ba52be4842b0d8b1bf3344af3
Author: gokaysatir
AuthorDate: Mon Jun 1 10:27:28 2020 +0300
Commit: Andras Timar
CommitDate: Mon Jun 1 15:30:30 2020 +0200
update select2 package.
Change-Id: I8ff53d838e80011f110bd427e26adcd372d9a2fb
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95217
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 1e51e4156..3f68dcf12 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -100,7 +100,7 @@ LOLEAFLET_ADMIN_JS =\
NODE_MODULES_SRC =\
autolinker@3.14.1 \
json-js@1.1.2 \
- select2@4.0.1 \
+ select2@4.0.13 \
vex-js@4.1.0 \
l10n-for-node@0.0.1 \
@braintree/sanitize-url@4.0.1
diff --git a/loleaflet/js/select2.js b/loleaflet/js/select2.js
index 61e08e00b..e6631ae31 100644
--- a/loleaflet/js/select2.js
+++ b/loleaflet/js/select2.js
@@ -1,470 +1,488 @@
/*!
- * Select2 4.0.1
+ * Select2 4.0.13
* https://select2.github.io
*
* Released under the MIT license
* https://github.com/select2/select2/blob/master/LICENSE.md
*/
-(function (factory) {
+;(function (factory) {
if (typeof define === 'function' && define.amd) {
// AMD. Register as an anonymous module.
define(['jquery'], factory);
- } else if (typeof exports === 'object') {
+ } else if (typeof module === 'object' && module.exports) {
// Node/CommonJS
-factory(require('jquery'));
+module.exports = function (root, jQuery) {
+ if (jQuery === undefined) {
+// require('jQuery') returns a factory that requires window to
+// build a jQuery instance, we normalize how we use modules
+// that require this pattern but the window provided is a noop
+// if it's defined (how jquery works)
+if (typeof window !== 'undefined') {
+ jQuery = require('jquery');
+}
+else {
+ jQuery = require('jquery')(root);
+}
+ }
+ factory(jQuery);
+ return jQuery;
+};
} else {
// Browser globals
factory(jQuery);
}
-}(function (jQuery) {
+} (function (jQuery) {
// This is needed so we can catch the AMD loader configuration and use it
// The inner file should be wrapped (by `banner.start.js`) in a function that
// returns the AMD loader references.
- var S2 =
-(function () {
+ var S2 =(function () {
// Restore the Select2 AMD loader so it can be used
// Needed mostly in the language files, where the loader is not inserted
if (jQuery && jQuery.fn && jQuery.fn.select2 && jQuery.fn.select2.amd) {
var S2 = jQuery.fn.select2.amd;
}
-var S2;(function () { if (!S2 || !S2.requirejs) {
-if (!S2) { S2 = {}; } else { require = S2; }
-/**
- * @license almond 0.3.1 Copyright (c) 2011-2014, The Dojo Foundation All
Rights Reserved.
- * Available via the MIT or new BSD license.
- * see: http://github.com/jrburke/almond for details
- */
-//Going sloppy to avoid 'use strict' string cost, but strict practices should
-//be followed.
-/*jslint sloppy: true */
-/*global setTimeout: false */
-
-var requirejs, require, define;
-(function (undef) {
-var main, req, makeMap, handlers,
-defined = {},
-waiting = {},
-config = {},
-defining = {},
-hasOwn = Object.prototype.hasOwnProperty,
-aps = [].slice,
-jsSuffixRegExp = /\.js$/;
-
-function hasProp(obj, prop) {
-return hasOwn.call(obj, prop);
-}
-
-/**
- * Given a relative module name, like ./something, normalize it to
- * a real name that can be mapped to a path.
- * @param {String} name the relative name
- * @param {String} baseName a real name that the name arg is relative
- * to.
- * @returns {String} normalized name
- */
-function normalize(name, baseName) {
-var nameParts, nameSegment, mapValue, foundMap, lastIndex,
-foundI, foundStarMap, starI, i, j, part,
-baseParts = baseName && baseName.split("/"),
-map = config.map,
-starMap = (map && map['*']) || {};
-
-//Adjust any relative paths.
-if (name && name.charAt(0) === ".") {
-//If have a base name, try to normalize against it,
-//otherwise, assume it is a top-level require that will
-//be relative to baseUrl in the end.
-if (baseName) {
-name = name.split('/');
-lastIndex = name.length - 1;
-
-// Node .js allowance:
-if (config.nodeIdCompat &&
jsSuffixRegExp.test(name[lastIndex])) {
-name[lastIndex] = name[lastIndex].replace(jsSuffixRegExp,
'');
-
[Libreoffice-commits] online.git: loleaflet/package.json
loleaflet/package.json |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 460eeb81c7ba3794e4c4691603899c8a314da006 Author: gokaysatir AuthorDate: Sat May 30 18:20:25 2020 +0300 Commit: Andras Timar CommitDate: Sat May 30 22:35:38 2020 +0200 update browserify package. Change-Id: I470b0ca73af87d56278059ac16483fa4a1bd2723 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95167 Tested-by: Jenkins Tested-by: Jenkins CollaboraOffice Reviewed-by: Andras Timar diff --git a/loleaflet/package.json b/loleaflet/package.json index 790f1756e..061f6b8ab 100644 --- a/loleaflet/package.json +++ b/loleaflet/package.json @@ -6,7 +6,7 @@ "@braintree/sanitize-url": "4.0.1", "autolinker": "3.14.1", "bootstrap": "3.3.6", -"browserify": "13.1.0", +"browserify": "16.5.1", "browserify-css": "0.15.0", "d3": "3.5.17", "eslint": "3.0.0", ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/package.json
loleaflet/package.json |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d77189ff2b905b9a284f7d3460a28f7449dfe005 Author: gokaysatir AuthorDate: Sat May 30 09:36:23 2020 +0300 Commit: Henry Castro CommitDate: Sat May 30 14:02:34 2020 +0200 update browserify-css package. Change-Id: Ia4a81da4fb07f6ab8788e1ed4549d5ca8c122911 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95168 Tested-by: Jenkins CollaboraOffice Reviewed-by: Henry Castro diff --git a/loleaflet/package.json b/loleaflet/package.json index e91028e78..790f1756e 100644 --- a/loleaflet/package.json +++ b/loleaflet/package.json @@ -7,7 +7,7 @@ "autolinker": "3.14.1", "bootstrap": "3.3.6", "browserify": "13.1.0", -"browserify-css": "0.9.1", +"browserify-css": "0.15.0", "d3": "3.5.17", "eslint": "3.0.0", "hammerjs": "2.0.8", ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/admin loleaflet/Makefile.am wsd/Admin.cpp wsd/Admin.hpp wsd/FileServer.cpp wsd/protocol.txt
loleaflet/Makefile.am |3
loleaflet/admin/admin.html|1
loleaflet/admin/admin.strings.js |3
loleaflet/admin/adminAnalytics.html |1
loleaflet/admin/adminHistory.html |1
loleaflet/admin/adminLog.html | 105 +
loleaflet/admin/adminSettings.html|1
loleaflet/admin/src/AdminSocketLog.js | 121 ++
wsd/Admin.cpp | 106 +
wsd/Admin.hpp | 12 ++-
wsd/FileServer.cpp|3
wsd/protocol.txt |9 ++
12 files changed, 360 insertions(+), 6 deletions(-)
New commits:
commit ac682772a6edf4045371670552a9c831623d45f4
Author: gokaysatir
AuthorDate: Wed May 13 16:40:05 2020 +0300
Commit: Michael Meeks
CommitDate: Sat May 30 11:10:19 2020 +0200
tdf#114982 - AdminConsole: control logging
Change-Id: I53cf4b0ff81ea9d6bf4ad595077f7365e7e34c00
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94130
Tested-by: Jenkins CollaboraOffice
Tested-by: Jenkins
Reviewed-by: Michael Meeks
diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 2e43e2df6..1e51e4156 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -94,7 +94,8 @@ LOLEAFLET_ADMIN_JS =\
admin/src/AdminSocketOverview.js \
admin/src/AdminSocketAnalytics.js \
admin/src/AdminSocketSettings.js \
- admin/src/AdminSocketHistory.js
+ admin/src/AdminSocketHistory.js \
+ admin/src/AdminSocketLog.js
NODE_MODULES_SRC =\
autolinker@3.14.1 \
diff --git a/loleaflet/admin/admin.html b/loleaflet/admin/admin.html
index acd114098..2b60f767b 100644
--- a/loleaflet/admin/admin.html
+++ b/loleaflet/admin/admin.html
@@ -59,6 +59,7 @@
document.write(l10nstrings.strOverview) document.write(l10nstrings.strCurrent)
document.write(l10nstrings.strAnalytics)
document.write(l10nstrings.strHistory)
+document.write(l10nstrings.strLog)
diff --git a/loleaflet/admin/admin.strings.js b/loleaflet/admin/admin.strings.js
index 7dea1cdd3..91d90b4f1 100644
--- a/loleaflet/admin/admin.strings.js
+++ b/loleaflet/admin/admin.strings.js
@@ -9,6 +9,7 @@ l10nstrings.strOverview = _('Overview');
l10nstrings.strCurrent = _('(current)');
l10nstrings.strAnalytics = _('Analytics');
l10nstrings.strHistory = _('History');
+l10nstrings.strLog = _('Log');
l10nstrings.strDashboard = _('Dashboard');
l10nstrings.strUsersOnline = _('Users online');
l10nstrings.strUserName = _('User Name');
@@ -40,7 +41,7 @@ l10nstrings.strDocuments = _('Documents:');
l10nstrings.strExpired = _('Expired:');
l10nstrings.strRefresh = _('Refresh');
l10nstrings.strShutdown = _('Shutdown Server');
-l10nstrings.strServerUptime = _('Server uptime')
+l10nstrings.strServerUptime = _('Server uptime');
if (module) {
module.exports = l10nstrings;
diff --git a/loleaflet/admin/adminAnalytics.html
b/loleaflet/admin/adminAnalytics.html
index 7667c67df..af3b6eb31 100644
--- a/loleaflet/admin/adminAnalytics.html
+++ b/loleaflet/admin/adminAnalytics.html
@@ -59,6 +59,7 @@
document.write(l10nstrings.strOverview)
document.write(l10nstrings.strAnalytics)
document.write(l10nstrings.strCurrent)
document.write(l10nstrings.strHistory)
+document.write(l10nstrings.strLog)
diff --git a/loleaflet/admin/adminHistory.html
b/loleaflet/admin/adminHistory.html
index 60ad593d3..ec652011e 100644
--- a/loleaflet/admin/adminHistory.html
+++ b/loleaflet/admin/adminHistory.html
@@ -59,6 +59,7 @@
document.write(l10nstrings.strOverview)
document.write(l10nstrings.strAnalytics)
document.write(l10nstrings.strHistory)
document.write(l10nstrings.strCurrent)
+document.write(l10nstrings.strLog)
diff --git a/loleaflet/admin/adminLog.html b/loleaflet/admin/adminLog.html
new file mode 100644
index 0..73036828e
--- /dev/null
+++ b/loleaflet/admin/adminLog.html
@@ -0,0 +1,105 @@
+
+
+
+
+
+
+
+
+
+
+LibreOffice Online - Admin console
+
+
+
+
+
+
+
+
+if (typeof brandProductName !== 'undefined')
{l10nstrings.strProductName = brandProductName}
+document.title = l10nstrings.strProductName + ' - ' +
l10nstrings.strAdminConsole
+
+ if (window.location.protocol == "https:") {
+ var host = 'wss://' + window.location.host +
'%SERVICE_ROOT%/lool/adminws/';
+ }
+ else {
+ host = 'ws://' + window.location.host +
'%SERVICE_ROOT%/lool/adminws/';
+ }
+
+ Admin.Log(host)
+
+
+
+
+
+
+
+
+
+
+
+ document.write(l10nstrings.strProductName + ' - ' +
[Libreoffice-commits] online.git: loleaflet/js loleaflet/Makefile.am loleaflet/package.json
loleaflet/Makefile.am |2
loleaflet/js/Autolinker.js | 8455 ++---
loleaflet/package.json |2
3 files changed, 4279 insertions(+), 4180 deletions(-)
New commits:
commit 880868ca6c2630c730f0c003c2078c1eae42c31b
Author: gokaysatir
AuthorDate: Fri May 29 22:52:50 2020 +0300
Commit: Henry Castro
CommitDate: Fri May 29 22:13:20 2020 +0200
update autolinker package.
Change-Id: I53c642763212d958fb0a860fcfbd8f4bbe7b37ff
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95166
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Henry Castro
diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index d4126763f..2e43e2df6 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -97,7 +97,7 @@ LOLEAFLET_ADMIN_JS =\
admin/src/AdminSocketHistory.js
NODE_MODULES_SRC =\
- autolinker@1.4.3 \
+ autolinker@3.14.1 \
json-js@1.1.2 \
select2@4.0.1 \
vex-js@4.1.0 \
diff --git a/loleaflet/js/Autolinker.js b/loleaflet/js/Autolinker.js
index d463c331a..fe7680d03 100644
--- a/loleaflet/js/Autolinker.js
+++ b/loleaflet/js/Autolinker.js
@@ -1,4187 +1,4286 @@
/*!
* Autolinker.js
- * 1.4.3
+ * 3.14.1
*
- * Copyright(c) 2017 Gregory Jacobs
+ * Copyright(c) 2020 Gregory Jacobs
* MIT License
*
* https://github.com/gregjacobs/Autolinker.js
*/
-;(function(root, factory) {
- if (typeof define === 'function' && define.amd) {
-define([], factory);
- } else if (typeof exports === 'object') {
-module.exports = factory();
- } else {
-root.Autolinker = factory();
- }
-}(this, function() {
-/**
- * @class Autolinker
- * @extends Object
- *
- * Utility class used to process a given string of text, and wrap the matches
in
- * the appropriate anchor (a) tags to turn them into links.
- *
- * Any of the configuration options may be provided in an Object (map) provided
- * to the Autolinker constructor, which will configure how the {@link #link
link()}
- * method will process the links.
- *
- * For example:
- *
- * var autolinker = new Autolinker( {
- * newWindow : false,
- * truncate : 30
- * } );
- *
- * var html = autolinker.link( "Joe went to www.yahoo.com" );
- * // produces: 'Joe went to http://www.yahoo.com;>yahoo.com'
- *
- *
- * The {@link #static-link static link()} method may also be used to inline
- * options into a single call, which may be more convenient for one-off uses.
- * For example:
- *
- * var html = Autolinker.link( "Joe went to www.yahoo.com", {
- * newWindow : false,
- * truncate : 30
- * } );
- * // produces: 'Joe went to http://www.yahoo.com;>yahoo.com'
- *
- *
- * ## Custom Replacements of Links
- *
- * If the configuration options do not provide enough flexibility, a {@link
#replaceFn}
- * may be provided to fully customize the output of Autolinker. This function
is
- * called once for each URL/Email/Phone#/Hashtag/Mention (Twitter, Instagram)
- * match that is encountered.
- *
- * For example:
- *
- * var input = "..."; // string with URLs, Email Addresses, Phone #s,
Hashtags, and Mentions (Twitter, Instagram)
- *
- * var linkedText = Autolinker.link( input, {
- * replaceFn : function( match ) {
- * console.log( "href = ", match.getAnchorHref() );
- * console.log( "text = ", match.getAnchorText() );
- *
- * switch( match.getType() ) {
- * case 'url' :
- * console.log( "url: ", match.getUrl() );
- *
- * if( match.getUrl().indexOf( 'mysite.com' ) === -1 ) {
- * var tag = match.buildTag(); // returns an
`Autolinker.HtmlTag` instance, which provides mutator methods for easy changes
- * tag.setAttr( 'rel', 'nofollow' );
- * tag.addClass( 'external-link' );
- *
- * return tag;
- *
- * } else {
- * return true; // let Autolinker perform its normal
anchor tag replacement
- * }
- *
- * case 'email' :
- * var email = match.getEmail();
- * console.log( "email: ", email );
- *
- * if( email === "my@own.address" ) {
- * return false; // don't auto-link this particular
email address; leave as-is
- * } else {
- * return; // no return value will have Autolinker
perform its normal anchor tag replacement (same as returning `true`)
- * }
- *
- * case 'phone' :
- * var phoneNumber = match.getPhoneNumber();
- * console.log( phoneNumber );
- *
- * return 'http://newplace.to.link.phone.numbers.to/;>' + phoneNumber + '';
- *
- * case 'hashtag' :
- *
[Libreoffice-commits] online.git: loleaflet/package.json
loleaflet/package.json |1 -
1 file changed, 1 deletion(-)
New commits:
commit 43325dec72dc3472e080817d86f537c4d0af029a
Author: gokaysatir
AuthorDate: Fri May 29 19:03:31 2020 +0300
Commit: Henry Castro
CommitDate: Fri May 29 19:35:30 2020 +0200
remove @types/jquery package from package json.
Change-Id: I330f252e1ae5be331ee48ee86d35cdf171f93dbe
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95160
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Henry Castro
diff --git a/loleaflet/package.json b/loleaflet/package.json
index 98132d7ca..e5cb7fb22 100644
--- a/loleaflet/package.json
+++ b/loleaflet/package.json
@@ -4,7 +4,6 @@
"description": "LibreOffice online front-end",
"devDependencies": {
"@braintree/sanitize-url": "4.0.1",
-"@types/jquery": "2.0.40",
"autolinker": "1.4.3",
"bootstrap": "3.3.6",
"browserify": "13.1.0",
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/package.json
loleaflet/package.json |1 - 1 file changed, 1 deletion(-) New commits: commit 6a327799017986d60d29c88fe66da7b4ad1008c5 Author: gokaysatir AuthorDate: Fri May 29 19:17:47 2020 +0300 Commit: Henry Castro CommitDate: Fri May 29 19:34:26 2020 +0200 remove exorcist package. Change-Id: I8a351e4dbe0022efd8c48aa87044b1aff541c6cc Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95164 Tested-by: Jenkins Tested-by: Jenkins CollaboraOffice Reviewed-by: Henry Castro diff --git a/loleaflet/package.json b/loleaflet/package.json index a5655d737..98132d7ca 100644 --- a/loleaflet/package.json +++ b/loleaflet/package.json @@ -11,7 +11,6 @@ "browserify-css": "0.9.1", "d3": "3.5.17", "eslint": "3.0.0", -"exorcist": "0.4.0", "hammerjs": "2.0.8", "jquery": "2.2.4", "jquery-contextmenu": "2.2.3", ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/js loleaflet/Makefile.am loleaflet/package.json
loleaflet/Makefile.am|2 -
loleaflet/js/sanitize-url.js | 71 +--
loleaflet/package.json |2 -
3 files changed, 38 insertions(+), 37 deletions(-)
New commits:
commit 160acdc5cbb6724874738240a874b77657cf678c
Author: gokaysatir
AuthorDate: Fri May 29 18:26:47 2020 +0300
Commit: Henry Castro
CommitDate: Fri May 29 18:13:18 2020 +0200
update sanitize-url package
Change-Id: I4cc68a010f54afc02777c140b28e41c07a0011fe
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95158
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Henry Castro
diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 5d96e3940..d4126763f 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -102,7 +102,7 @@ NODE_MODULES_SRC =\
select2@4.0.1 \
vex-js@4.1.0 \
l10n-for-node@0.0.1 \
- @braintree/sanitize-url@3.0.0
+ @braintree/sanitize-url@4.0.1
LOLEAFLET_CSS =\
$(builddir)/node_modules/select2/dist/css/select2.css \
diff --git a/loleaflet/js/sanitize-url.js b/loleaflet/js/sanitize-url.js
index ee8975589..57ee916b0 100644
--- a/loleaflet/js/sanitize-url.js
+++ b/loleaflet/js/sanitize-url.js
@@ -1,45 +1,46 @@
(function(f){if(typeof exports==="object"&
module!=="undefined"){module.exports=f()}else if(typeof
define==="function"&){define([],f)}else{var g;if(typeof
window!=="undefined"){g=window}else if(typeof
global!=="undefined"){g=global}else if(typeof
self!=="undefined"){g=self}else{g=this}g.sanitizeUrl = f()}})(function(){var
define,module,exports;return (function(){function r(e,n,t){function
o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof
require&if(!f&)return c(i,!0);if(u)return u(i,!0);var a=new
Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var
p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return
o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof
require&,i=0;i -1;
-}
-
-function sanitizeUrl(url) {
- if (!url) {
-return 'about:blank';
+ var invalidPrototcolRegex = /^(%20|\s)*(javascript|data)/im;
+ var ctrlCharactersRegex = /[^\x20-\x7EÀ-ž]/gmi;
+ var urlSchemeRegex = /^([^:]+):/gm;
+ var relativeFirstCharacters = ['.', '/'];
+
+ function isRelativeUrlWithoutProtocol(url) {
+return relativeFirstCharacters.indexOf(url[0]) > -1;
}
-
- var urlScheme, urlSchemeParseResults;
- var sanitizedUrl = url.replace(ctrlCharactersRegex, '');
- if (isRelativeUrl(sanitizedUrl)) {
+ function sanitizeUrl(url) {
+var urlScheme, urlSchemeParseResults, sanitizedUrl;
+
+if (!url) {
+ return 'about:blank';
+}
+
+sanitizedUrl = url.replace(ctrlCharactersRegex, '').trim();
+
+if (isRelativeUrlWithoutProtocol(sanitizedUrl)) {
+ return sanitizedUrl;
+}
+
+urlSchemeParseResults = sanitizedUrl.match(urlSchemeRegex);
+
+if (!urlSchemeParseResults) {
+ return sanitizedUrl;
+}
+
+urlScheme = urlSchemeParseResults[0];
+
+if (invalidPrototcolRegex.test(urlScheme)) {
+ return 'about:blank';
+}
+
return sanitizedUrl;
}
- urlSchemeParseResults = sanitizedUrl.match(urlSchemeRegex);
-
- if (!urlSchemeParseResults) {
-return 'about:blank';
- }
-
- urlScheme = urlSchemeParseResults[0];
-
- if (invalidPrototcolRegex.test(urlScheme)) {
-return 'about:blank';
- }
-
- return sanitizedUrl;
-}
-
-module.exports = {
- sanitizeUrl: sanitizeUrl
-};
+ module.exports = {
+sanitizeUrl: sanitizeUrl
+ };
},{}]},{},[1])(1)
});
diff --git a/loleaflet/package.json b/loleaflet/package.json
index a52a754fc..a5655d737 100644
--- a/loleaflet/package.json
+++ b/loleaflet/package.json
@@ -3,7 +3,7 @@
"version": "0.8.0-dev",
"description": "LibreOffice online front-end",
"devDependencies": {
-"@braintree/sanitize-url": "3.0.0",
+"@braintree/sanitize-url": "4.0.1",
"@types/jquery": "2.0.40",
"autolinker": "1.4.3",
"bootstrap": "3.3.6",
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css loleaflet/images loleaflet/src
loleaflet/css/leaflet.css| 33
loleaflet/images/indentation_marker_down.svg |3
loleaflet/images/indentation_marker_up.svg |3
loleaflet/src/control/Ruler.js | 217 ++-
4 files changed, 255 insertions(+), 1 deletion(-)
New commits:
commit 221d666822d8f010e629761456ff30ad8bb8fe24
Author: gokaysatir
AuthorDate: Fri May 1 13:18:23 2020 +0300
Commit: Tomaž Vajngerl
CommitDate: Tue May 12 13:28:08 2020 +0200
tdf#111535 Add First-line indent, paragraph indent, and tab spaces/Online
part.
Change-Id: I7b0b6e205aa9af40b8331044b99c44df0bd4cced
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93250
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Tomaž Vajngerl
diff --git a/loleaflet/css/leaflet.css b/loleaflet/css/leaflet.css
index f8f5eb95c..ec6a3d3de 100644
--- a/loleaflet/css/leaflet.css
+++ b/loleaflet/css/leaflet.css
@@ -842,6 +842,39 @@ input.clipboard {
position: absolute;
}
+.loleaflet-ruler-indentation-marker-down {
+ width: 17px;
+ height: 11px;
+ background: url(images/indentation_marker_down.svg);
+ position: absolute;
+ left: 0;
+ top: 0;
+ z-index: 12;
+ background-repeat: no-repeat;
+}
+
+.loleaflet-ruler-indentation-marker-up {
+ width: 17px;
+ height: 11px;
+ background: url(images/indentation_marker_up.svg);
+ position: absolute;
+ left: 0;
+ bottom: 0;
+ z-index: 12;
+ background-repeat: no-repeat;
+}
+
+.loleaflet-ruler-indentation-marker-center{
+ position: fixed;
+ display: none;
+ height: 100vh;
+ top: 0;
+ bottom: 0;
+ left: 0;
+ border-right: 2px dotted grey;
+ z-index: 12;
+}
+
.loleaflet-ruler-marginwrapper {
height: 100%;
position: absolute;
diff --git a/loleaflet/images/indentation_marker_down.svg
b/loleaflet/images/indentation_marker_down.svg
new file mode 100644
index 0..41e73bbeb
--- /dev/null
+++ b/loleaflet/images/indentation_marker_down.svg
@@ -0,0 +1,3 @@
+http://www.w3.org/2000/svg;
xmlns:xlink="http://www.w3.org/1999/xlink; viewBox="0 0 140 110" >
+
+
\ No newline at end of file
diff --git a/loleaflet/images/indentation_marker_up.svg
b/loleaflet/images/indentation_marker_up.svg
new file mode 100644
index 0..88f90c049
--- /dev/null
+++ b/loleaflet/images/indentation_marker_up.svg
@@ -0,0 +1,3 @@
+http://www.w3.org/2000/svg;
xmlns:xlink="http://www.w3.org/1999/xlink; viewBox="0 0 140 110" >
+
+
\ No newline at end of file
diff --git a/loleaflet/src/control/Ruler.js b/loleaflet/src/control/Ruler.js
index 3c849aaad..98b65370e 100644
--- a/loleaflet/src/control/Ruler.js
+++ b/loleaflet/src/control/Ruler.js
@@ -64,6 +64,89 @@ L.Control.Ruler = L.Control.extend({
}
},
+ _initiateIndentationMarkers: function() {
+ // First line indentation..
+ this._firstLineMarker = document.createElement('div');
+ this._firstLineMarker.id = 'lo-fline-marker';
+
this._firstLineMarker.classList.add('loleaflet-ruler-indentation-marker-down');
+ this._rFace.appendChild(this._firstLineMarker);
+
+ // Paragraph indentation..
+ this._pStartMarker = document.createElement('div');
+ this._pStartMarker.id = 'lo-pstart-marker';
+
this._pStartMarker.classList.add('loleaflet-ruler-indentation-marker-up');
+ this._rFace.appendChild(this._pStartMarker);
+
+ // Paragraph end..
+ this._pEndMarker = document.createElement('div');
+ this._pEndMarker.id = 'lo-pend-marker';
+
this._pEndMarker.classList.add('loleaflet-ruler-indentation-marker-up');
+ this._rFace.appendChild(this._pEndMarker);
+
+ // While one of the markers is being dragged, a vertical line
should be visible in order to indicate the new position of the marker..
+ this._markerVerticalLine = L.DomUtil.create('div',
'loleaflet-ruler-indentation-marker-center');
+ this._rFace.appendChild(this._markerVerticalLine);
+
+ var self = this;
+
+ // Now we have indentation markers. Next we should bind drag
initializers to them..
+ // We will use 3 hammers. 1 hammer is not usable for this case.
+ if (L.Browser.touch) {
+ // Hammer for first line indentation..
+ this._firstLineHammer = new
Hammer(this._firstLineMarker);
+ this._firstLineHammer.add(new Hammer.Pan({ threshold:
0, pointers: 0 }));
+ this._firstLineHammer.get('press').set({
+ time: 500
+ });
+ this._firstLineHammer.on('panstart', function (event) {
+
[Libreoffice-commits] core.git: include/svx svx/sdi sw/sdi sw/source
include/svx/svxids.hrc |5 -
svx/sdi/svx.sdi | 16
sw/sdi/_viewsh.sdi |4
sw/source/uibase/uiview/viewtab.cxx | 27 +++
4 files changed, 51 insertions(+), 1 deletion(-)
New commits:
commit 15adfafee5b48d6f88a0b970c50e5c5bc77a4ab1
Author: gokaysatir
AuthorDate: Wed May 6 12:04:39 2020 +0300
Commit: Tomaž Vajngerl
CommitDate: Fri May 8 12:37:16 2020 +0200
tdf#111535 - Add First-line indent, paragraph indent, and tab spaces/Core
part
Change-Id: Ib340e74646299c344dd770977497f59a030c86f3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93165
Tested-by: Jenkins
Tested-by: Tomaž Vajngerl
Reviewed-by: Tomaž Vajngerl
diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc
index 61d02ff504ea..5c18856d0713 100644
--- a/include/svx/svxids.hrc
+++ b/include/svx/svxids.hrc
@@ -537,6 +537,9 @@ class SvxSetItem;
#define SID_TABSTOP_ADD_OR_CHANGE ( SID_SVX_START + 581 )
#define SID_TABSTOP_ATTR_INDEX ( SID_SVX_START + 582 )
#define SID_TABSTOP_ATTR_POSITION ( SID_SVX_START + 583 )
+#define SID_PARAGRAPH_FIRST_LINE_INDENT ( SID_SVX_START + 584 )
+#define SID_PARAGRAPH_LEFT_INDENT ( SID_SVX_START + 585 )
+#define SID_PARAGRAPH_RIGHT_INDENT ( SID_SVX_START + 586 )
// CAUTION! Range <587 .. 587> used by EditEngine (!)
@@ -649,7 +652,7 @@ class SvxSetItem;
#define SID_FM_CONVERTTO_FORMATTED ( SID_SVX_START + 751 )
#define SID_FM_FILTER_NAVIGATOR_CONTROL ( SID_SVX_START + 752 )
#define SID_INSERT_GRIDCONTROL ( SID_SVX_START + 753 )
-//FREE
+#define SID_PARAGRAPH_CHANGE_STATE ( SID_SVX_START + 754 )
//FREE
//FREE
//FREE
diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index bf3b73f5ab78..e8d6cf705b71 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -7226,6 +7226,22 @@ SfxVoidItem ChangeTabStop SID_TABSTOP_ADD_OR_CHANGE
GroupId = ;
]
+SfxVoidItem ParagraphChangeState SID_PARAGRAPH_CHANGE_STATE
+(SfxStringItem FirstLineIndent SID_PARAGRAPH_FIRST_LINE_INDENT, SfxStringItem
LeftParaIndent SID_PARAGRAPH_LEFT_INDENT, SfxStringItem RightParaIndent
SID_PARAGRAPH_RIGHT_INDENT)
+[
+AutoUpdate = FALSE,
+FastCall = TRUE,
+ReadOnlyDoc = TRUE,
+Toggle = FALSE,
+Container = FALSE,
+RecordAbsolute = FALSE,
+RecordPerSet;
+AccelConfig = FALSE,
+MenuConfig = FALSE,
+ToolBoxConfig = FALSE,
+GroupId = ;
+]
+
SfxVoidItem TableChangeCurrentBorderPosition
SID_TABLE_CHANGE_CURRENT_BORDER_POSITION
(SfxStringItem BorderType SID_TABLE_BORDER_TYPE,
SfxUInt16Item Index SID_TABLE_BORDER_INDEX,
diff --git a/sw/sdi/_viewsh.sdi b/sw/sdi/_viewsh.sdi
index 47b95ab80409..55072f98ec2a 100644
--- a/sw/sdi/_viewsh.sdi
+++ b/sw/sdi/_viewsh.sdi
@@ -647,6 +647,10 @@ interface BaseTextEditView
[
ExecMethod = ExecTabWin;
]
+SID_PARAGRAPH_CHANGE_STATE // status()
+[
+ExecMethod = ExecTabWin;
+]
// from here Export = FALSE;
FID_SEARCH_ON // status()
[
diff --git a/sw/source/uibase/uiview/viewtab.cxx
b/sw/source/uibase/uiview/viewtab.cxx
index 7be532cd29b4..0c2995e0b56d 100644
--- a/sw/source/uibase/uiview/viewtab.cxx
+++ b/sw/source/uibase/uiview/viewtab.cxx
@@ -693,7 +693,34 @@ void SwView::ExecTabWin( SfxRequest const & rReq )
}
}
break;
+case SID_PARAGRAPH_CHANGE_STATE:
+{
+const SfxPoolItem *fLineIndent, *pLeftIndent, *pRightIndent;
+if (pReqArgs)
+{
+SfxItemSet aLRSpaceSet( GetPool(), svl::Items{} );
+rSh.GetCurAttr( aLRSpaceSet );
+SvxLRSpaceItem aParaMargin( aLRSpaceSet.Get( RES_LR_SPACE ) );
+if
(pReqArgs->GetItemState(SID_PARAGRAPH_FIRST_LINE_INDENT,true,) ==
SfxItemState::SET)
+{
+const OUString ratio = static_cast(fLineIndent)->GetValue();
+aParaMargin.SetTextFirstLineOffset(nPageWidth *
ratio.toFloat());
+}
+else if
(pReqArgs->GetItemState(SID_PARAGRAPH_LEFT_INDENT,true,) ==
SfxItemState::SET)
+{
+const OUString ratio = static_cast(pLeftIndent)->GetValue();
+aParaMargin.SetLeft(nPageWidth * ratio.toFloat());
+}
+else if
(pReqArgs->GetItemState(SID_PARAGRAPH_RIGHT_INDENT,true,) ==
SfxItemState::SET)
+{
+const OUString ratio = static_cast(pRightIndent)->GetValue();
+aParaMargin.SetRight(nPageWidth * ratio.toFloat());
+}
+rSh.SetAttrItem(aParaMargin);
+}
+break;
+}
case SID_HANGING_INDENT:
{
SfxItemSet aLRSpaceSet( GetPool(), svl::Items{} );
___
[Libreoffice-commits] online.git: wsd/LOOLWSD.cpp
wsd/LOOLWSD.cpp |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 4bc3a13ba5c27026ea5625c45b2a8ae496efa7cd
Author: gokaysatir
AuthorDate: Sun Apr 12 22:36:11 2020 +0300
Commit: Michael Meeks
CommitDate: Mon Apr 13 17:26:18 2020 +0200
print the OS version in the startup string
Change-Id: Ief7d99b4d4db4f237fb48bbafbac20a989a001bf
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92091
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Michael Meeks
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index dd1be52ba..7f67f2b10 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -3426,7 +3426,7 @@ int LOOLWSD::innerMain()
{
std::string version, hash;
Util::getVersionInfo(version, hash);
-LOG_INF("Loolwsd version details: " << version << " - " << hash << " -
id " << HostIdentifier);
+LOG_INF("Loolwsd version details: " << version << " - " << hash << " -
id " << HostIdentifier << " - on " << Util::getLinuxVersion());
}
#endif
#endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: common/Util.cpp common/Util.hpp loleaflet/html loleaflet/src wsd/ClientSession.cpp wsd/ClientSession.hpp wsd/FileServer.cpp wsd/LOOLWSD.cpp wsd/LOOLWSD.hpp wsd/protoc
common/Util.cpp | 19 +++
common/Util.hpp |7 ++-
loleaflet/html/loleaflet.html.m4 |2 +-
loleaflet/src/core/Socket.js |4
wsd/ClientSession.cpp|6 ++
wsd/ClientSession.hpp|1 +
wsd/FileServer.cpp |1 -
wsd/LOOLWSD.cpp | 22 --
wsd/LOOLWSD.hpp |4
wsd/protocol.txt |4
10 files changed, 41 insertions(+), 29 deletions(-)
New commits:
commit 9e0594ee2db2eff0afe7b4bc15e474c1e84f15bf
Author: gokaysatir
AuthorDate: Fri Apr 10 20:02:39 2020 +0300
Commit: Michael Meeks
CommitDate: Sat Apr 11 13:43:31 2020 +0200
add pretty name - Android patch
Change-Id: If0de49884954cde26bfbe8ba1dce8844af5b30bf
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91831
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Michael Meeks
diff --git a/common/Util.cpp b/common/Util.cpp
index 2abbd4d11..703bfdd4b 100644
--- a/common/Util.cpp
+++ b/common/Util.cpp
@@ -953,6 +953,25 @@ namespace Util
return result;
}
+
+#if !MOBILEAPP
+// If OS is not mobile, it must be Linux.
+std::string getLinuxVersion(){
+// Read operating system info. We can read "os-release" file,
located in /etc.
+std::ifstream ifs("/etc/os-release");
+std::string str(std::istreambuf_iterator{ifs}, {});
+std::vector infoList = Util::splitStringToVector(str,
'\n');
+std::map releaseInfo =
Util::stringVectorToMap(infoList, '=');
+
+if (releaseInfo.find("PRETTY_NAME") != releaseInfo.end()) {
+return releaseInfo["PRETTY_NAME"];
+}
+else{
+return "unknown";
+}
+}
+#endif
+
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/common/Util.hpp b/common/Util.hpp
index fd1589cfe..b4a6c8d7d 100644
--- a/common/Util.hpp
+++ b/common/Util.hpp
@@ -994,10 +994,15 @@ int main(int argc, char**argv)
/**
* Converts vector of strings to map. Strings should have formed like
this: key + delimiter + value.
- * In case of a misformed string or zero length vector, returns an empty
map.
+ * In case of a misformed string or zero length vector, passes that item
and warns the developer.
*/
std::map
stringVectorToMap(std::vector sVector, const char delimiter);
+#if !MOBILEAPP
+// If OS is not mobile, it must be Linux.
+std::string getLinuxVersion();
+#endif
+
} // end namespace Util
#endif
diff --git a/loleaflet/html/loleaflet.html.m4 b/loleaflet/html/loleaflet.html.m4
index 12407c34b..dca62ada1 100644
--- a/loleaflet/html/loleaflet.html.m4
+++ b/loleaflet/html/loleaflet.html.m4
@@ -222,7 +222,7 @@ m4_ifelse(MOBILEAPP,[true],
LOKit
- m4_ifelse(MOBILEAPP,[],[%OS_INFO%])
+ m4_ifelse(MOBILEAPP,[],[])
Copyright © _YEAR_, VENDOR.
diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index d4e76d4e4..a4aa948c5 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -303,6 +303,10 @@ L.Socket = L.Class.extend({
lokitVersionObj.ProductVersion
+ lokitVersionObj.ProductExtension.replace('.10.','-') +
' (git hash: ' + h + ')');
}
+ else if (textMsg.startsWith('osinfo ')) {
+ var osInfo = textMsg.replace('osinfo ', '');
+ document.getElementById('os-info').innerText = osInfo;
+ }
else if (textMsg.startsWith('clipboardkey: ')) {
var key = textMsg.substring('clipboardkey: '.length);
if (this._map._clip)
diff --git a/wsd/ClientSession.cpp b/wsd/ClientSession.cpp
index ddb7f605b..c9dc7827a 100644
--- a/wsd/ClientSession.cpp
+++ b/wsd/ClientSession.cpp
@@ -360,6 +360,12 @@ bool ClientSession::_handleInput(const char *buffer, int
length)
sendTextFrame("loolserver " + LOOLWSD::getVersionJSON());
// Send LOKit version information
sendTextFrame("lokitversion " + LOOLWSD::LOKitVersion);
+
+#if !MOBILEAPP
+// If it is not mobile, it must be Linux (for now).
+sendTextFrame(std::string("osinfo ") + Util::getLinuxVersion());
+#endif
+
// Send clipboard key
rotateClipboardKey(true);
diff --git a/wsd/ClientSession.hpp b/wsd/ClientSession.hpp
index b47285dd0..e11ac721c 100644
--- a/wsd/ClientSession.hpp
+++ b/wsd/ClientSession.hpp
@@ -21,6 +21,7 @@
#include
#include
#include
+#include "Util.hpp"
class DocumentBroker;
diff --git a/wsd/FileServer.cpp b/wsd/FileServer.cpp
index 9d833c510..ce9e12756 100644
--- a/wsd/FileServer.cpp
+++ b/wsd/FileServer.cpp
@@ -649,7
