framework/source/helper/statusindicator.cxx | 19 ++++++++++++++-----
sc/uiconfig/scalc/menubar/menubar.xml | 2 ++
sd/uiconfig/simpress/menubar/menubar.xml | 2 ++
sw/uiconfig/swriter/menubar/menubar.xml | 2 ++
4 files changed, 20 insertions(+), 5 deletions(-)
New commits:
commit 37efa95b1b73849227403837f0d160e28181af15
Author: Muhammet Kara <muhammet.k...@collabora.com>
AuthorDate: Mon Aug 26 14:48:34 2019 +0300
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Fri Sep 20 12:03:04 2019 +0200
tdf#127163: Add AutoRedactDoc command to the Tools menu
Change-Id: I3a1081c29c222bf868a853ff19d471881fb43ce7
Reviewed-on: https://gerrit.libreoffice.org/78141
Tested-by: Jenkins
Reviewed-by: Muhammet Kara <muhammet.k...@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/79271
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
Tested-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/sc/uiconfig/scalc/menubar/menubar.xml
b/sc/uiconfig/scalc/menubar/menubar.xml
index 1dce81bd7fac..678e11c31c9c 100644
--- a/sc/uiconfig/scalc/menubar/menubar.xml
+++ b/sc/uiconfig/scalc/menubar/menubar.xml
@@ -699,7 +699,9 @@
</menu:menu>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:AutoCorrectDlg"/>
+ <menu:menuseparator/>
<menu:menuitem menu:id=".uno:RedactDoc"/>
+ <menu:menuitem menu:id=".uno:AutoRedactDoc"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:GoalSeekDialog"/>
<menu:menuitem menu:id=".uno:SolverDialog"/>
diff --git a/sd/uiconfig/simpress/menubar/menubar.xml
b/sd/uiconfig/simpress/menubar/menubar.xml
index 64fa2e14aa92..7a9a76e58e06 100644
--- a/sd/uiconfig/simpress/menubar/menubar.xml
+++ b/sd/uiconfig/simpress/menubar/menubar.xml
@@ -602,7 +602,9 @@
</menu:menu>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:AutoCorrectDlg"/>
+ <menu:menuseparator/>
<menu:menuitem menu:id=".uno:RedactDoc"/>
+ <menu:menuitem menu:id=".uno:AutoRedactDoc"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:BmpMask"/>
<menu:menuitem menu:id=".uno:AVMediaPlayer"/>
diff --git a/sw/uiconfig/swriter/menubar/menubar.xml
b/sw/uiconfig/swriter/menubar/menubar.xml
index d3f9f15e02d1..45503d79573a 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -728,7 +728,9 @@
</menu:menupopup>
</menu:menu>
<menu:menuitem menu:id=".uno:EditGlossary"/>
+ <menu:menuseparator/>
<menu:menuitem menu:id=".uno:RedactDoc"/>
+ <menu:menuitem menu:id=".uno:AutoRedactDoc"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ChapterNumberingDialog"/>
<menu:menuitem menu:id=".uno:LineNumberingDialog"/>
commit 9e28c2540ba41024e8e55da53a868b6f66b50155
Author: Tor Lillqvist <t...@collabora.com>
AuthorDate: Wed Mar 13 10:01:00 2019 +0200
Commit: Tor Lillqvist <t...@collabora.com>
CommitDate: Fri Sep 20 12:02:54 2019 +0200
tdf#124042: There are no progress bars that vcl would handle on iOS or
Android
Don't even bother trying to dislay such. Any progress feedback to the
user will be handled through LibreOfficeKit callbacks.
(Sure, the code probably thought it had created a "window" for the
progress bar, but there wasn't anything real in the data structure
that would actually display anything anywhere, no CG context (on iOS)
etc.)
Change-Id: Ie0ca18bbb22da41882bdaba4a0ce77a52112a059
(cherry picked from commit 0fd1dd8e285ad97384827c6027e3a090c3b40dcd)
Reviewed-on: https://gerrit.libreoffice.org/79180
Reviewed-by: Tor Lillqvist <t...@collabora.com>
Tested-by: Tor Lillqvist <t...@collabora.com>
diff --git a/framework/source/helper/statusindicator.cxx
b/framework/source/helper/statusindicator.cxx
index 134a6f5a2448..e729702125d6 100644
--- a/framework/source/helper/statusindicator.cxx
+++ b/framework/source/helper/statusindicator.cxx
@@ -43,13 +43,16 @@ void SAL_CALL StatusIndicator::start(const OUString& sText ,
comphelper::LibreOfficeKit::statusIndicatorStart();
}
-
+#if !defined(IOS) && !defined(ANDROID)
css::uno::Reference< css::task::XStatusIndicatorFactory >
xFactory(m_xFactory);
if (xFactory.is())
{
StatusIndicatorFactory* pFactory =
static_cast<StatusIndicatorFactory*>(xFactory.get());
pFactory->start(this, sText, nRange);
}
+#else
+ (void) sText;
+#endif
}
void SAL_CALL StatusIndicator::end()
@@ -58,39 +61,44 @@ void SAL_CALL StatusIndicator::end()
{
comphelper::LibreOfficeKit::statusIndicatorFinish();
}
-
+#if !defined(IOS) && !defined(ANDROID)
css::uno::Reference< css::task::XStatusIndicatorFactory >
xFactory(m_xFactory);
if (xFactory.is())
{
StatusIndicatorFactory* pFactory =
static_cast<StatusIndicatorFactory*>(xFactory.get());
pFactory->end(this);
}
+#endif
}
void SAL_CALL StatusIndicator::reset()
{
if (comphelper::LibreOfficeKit::isActive())
return;
-
+#if !defined(IOS) && !defined(ANDROID)
css::uno::Reference< css::task::XStatusIndicatorFactory >
xFactory(m_xFactory);
if (xFactory.is())
{
StatusIndicatorFactory* pFactory =
static_cast<StatusIndicatorFactory*>(xFactory.get());
pFactory->reset(this);
}
+#endif
}
void SAL_CALL StatusIndicator::setText(const OUString& sText)
{
if (comphelper::LibreOfficeKit::isActive())
return;
-
+#if !defined(IOS) && !defined(ANDROID)
css::uno::Reference< css::task::XStatusIndicatorFactory >
xFactory(m_xFactory);
if (xFactory.is())
{
StatusIndicatorFactory* pFactory =
static_cast<StatusIndicatorFactory*>(xFactory.get());
pFactory->setText(this, sText);
}
+#else
+ (void) sText;
+#endif
}
void SAL_CALL StatusIndicator::setValue(sal_Int32 nValue)
@@ -105,13 +113,14 @@ void SAL_CALL StatusIndicator::setValue(sal_Int32 nValue)
}
return;
}
-
+#if !defined(IOS) && !defined(ANDROID)
css::uno::Reference< css::task::XStatusIndicatorFactory >
xFactory(m_xFactory);
if (xFactory.is())
{
StatusIndicatorFactory* pFactory =
static_cast<StatusIndicatorFactory*>(xFactory.get());
pFactory->setValue(this, nValue);
}
+#endif
}
} // namespace framework
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
