[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - sd/uiconfig
sd/uiconfig/sdraw/popupmenu/pagepane.xml |1 + 1 file changed, 1 insertion(+) New commits: commit 1d2b3fefd7828b8681915c4a278791f7cfbbadcf Author: Roman Kuznetsov AuthorDate: Tue Dec 20 11:45:36 2022 + Commit: Xisco Fauli CommitDate: Wed Dec 21 12:31:33 2022 + tdf#152612 Add Duplicate page item to Pagepane context menu Change-Id: I49a889202c5a291b0da9eb970b838b657af2313a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144596 Tested-by: Jenkins Reviewed-by: Heiko Tietze (cherry picked from commit 01249238dd9711aeec88721b9b24a390d2d0ac3f) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144661 Reviewed-by: Xisco Fauli diff --git a/sd/uiconfig/sdraw/popupmenu/pagepane.xml b/sd/uiconfig/sdraw/popupmenu/pagepane.xml index cb40a16b9de1..1a809ea4efa9 100644 --- a/sd/uiconfig/sdraw/popupmenu/pagepane.xml +++ b/sd/uiconfig/sdraw/popupmenu/pagepane.xml @@ -13,6 +13,7 @@ +
[Libreoffice-commits] core.git: sd/uiconfig
sd/uiconfig/sdraw/popupmenu/pagepane.xml |1 + 1 file changed, 1 insertion(+) New commits: commit 01249238dd9711aeec88721b9b24a390d2d0ac3f Author: Roman Kuznetsov AuthorDate: Tue Dec 20 11:45:36 2022 + Commit: Roman Kuznetsov CommitDate: Wed Dec 21 10:10:29 2022 + tdf#152612 Add Duplicate page item to Pagepane context menu Change-Id: I49a889202c5a291b0da9eb970b838b657af2313a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144596 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/sd/uiconfig/sdraw/popupmenu/pagepane.xml b/sd/uiconfig/sdraw/popupmenu/pagepane.xml index cb40a16b9de1..1a809ea4efa9 100644 --- a/sd/uiconfig/sdraw/popupmenu/pagepane.xml +++ b/sd/uiconfig/sdraw/popupmenu/pagepane.xml @@ -13,6 +13,7 @@ +
[Libreoffice-commits] core.git: cui/source
cui/source/dialogs/about.cxx |7 ++- 1 file changed, 2 insertions(+), 5 deletions(-) New commits: commit de37cabc120b9a00ca089d1b28bc7b1958430db7 Author: Roman Kuznetsov AuthorDate: Fri Aug 26 09:52:01 2022 +0200 Commit: Roman Kuznetsov CommitDate: Mon Aug 29 12:42:05 2022 +0200 tdf#150246 Show CL and threaded in About dialog in the same time Change-Id: I8d4974967e1595159251275f58d88c25b9e91e6d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138824 Tested-by: Jenkins Reviewed-by: Roman Kuznetsov diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx index 09717ddece4f..abeafa411865 100644 --- a/cui/source/dialogs/about.cxx +++ b/cui/source/dialogs/about.cxx @@ -219,11 +219,8 @@ OUString AboutDialog::GetMiscString() { OUString aCalcMode; // Calc calculation mode #if HAVE_FEATURE_OPENCL - bool bOpenCL = openclwrapper::GPUEnv::isOpenCLEnabled(); - if (bOpenCL) + if (openclwrapper::GPUEnv::isOpenCLEnabled()) aCalcMode += " CL"; -#else - const bool bOpenCL = false; #endif static const bool bThreadingProhibited = @@ -231,7 +228,7 @@ OUString AboutDialog::GetMiscString() { bool bThreadedCalc = officecfg::Office::Calc::Formula::Calculation:: UseThreadedCalculationForFormulaGroups::get(); - if (!bThreadingProhibited && !bOpenCL && bThreadedCalc) { + if (!bThreadingProhibited && bThreadedCalc) { aCalcMode += " threaded"; }
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - sc/uiconfig
sc/uiconfig/scalc/menubar/menubar.xml | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) New commits: commit 3b75a56c078290c90d00fa41b9413ebf57d3a605 Author: Roman Kuznetsov AuthorDate: Sun May 1 20:23:43 2022 +0100 Commit: Tomaž Vajngerl CommitDate: Fri Jul 29 12:10:23 2022 +0200 tdf#148467 Move sparklines items to Insert/Format main menu Change-Id: I2606fdd6301e5d1cb1e855d79a971762ed2d835d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133608 Tested-by: Jenkins Reviewed-by: Heiko Tietze (cherry picked from commit a68629fdf97f181d4c6975f91e66fe52f83247e9) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137435 Tested-by: Jenkins CollaboraOffice Reviewed-by: Tomaž Vajngerl diff --git a/sc/uiconfig/scalc/menubar/menubar.xml b/sc/uiconfig/scalc/menubar/menubar.xml index a0409522e372..da6c9ff1673c 100644 --- a/sc/uiconfig/scalc/menubar/menubar.xml +++ b/sc/uiconfig/scalc/menubar/menubar.xml @@ -206,6 +206,7 @@ + @@ -438,6 +439,15 @@ + + + + + + + + + @@ -571,16 +581,6 @@ - - - - - - - - - -
[Libreoffice-commits] core.git: basic/source
basic/source/runtime/methods.cxx | 114 +++ 1 file changed, 56 insertions(+), 58 deletions(-) New commits: commit c2bf1ff91fab4574dd27808a2e4391c7a4b99d20 Author: Roman Kuznetsov AuthorDate: Wed Jul 6 10:18:02 2022 +0200 Commit: Roman Kuznetsov CommitDate: Wed Jul 13 14:57:10 2022 +0200 tdf#147132 Flatten a Basic function Change-Id: I85eef5ca499197cfd96fecc4d05a82f7d11089cb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136856 Tested-by: Jenkins Reviewed-by: Mike Kaganski diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx index fe654bbe6fd5..a397a31fddf5 100644 --- a/basic/source/runtime/methods.cxx +++ b/basic/source/runtime/methods.cxx @@ -889,78 +889,76 @@ void SbRtl_InStrRev(StarBASIC *, SbxArray & rPar, bool) const sal_uInt32 nArgCount = rPar.Count() - 1; if ( nArgCount < 2 ) { -StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); +return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); } -else -{ -const OUString aStr1 = rPar.Get(1)->GetOUString(); -const OUString aToken = rPar.Get(2)->GetOUString(); -sal_Int32 nStartPos = -1; -if ( nArgCount >= 3 ) -{ -nStartPos = rPar.Get(3)->GetLong(); -if( nStartPos <= 0 && nStartPos != -1 ) -{ -StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); -nStartPos = -1; -} -} +const OUString aStr1 = rPar.Get(1)->GetOUString(); +const OUString aToken = rPar.Get(2)->GetOUString(); -SbiInstance* pInst = GetSbData()->pInst; -bool bTextMode; -bool bCompatibility = ( pInst && pInst->IsCompatibility() ); -if( bCompatibility ) -{ -SbiRuntime* pRT = pInst->pRun; -bTextMode = pRT && pRT->IsImageFlag( SbiImageFlags::COMPARETEXT ); -} -else -{ -bTextMode = true; -} -if ( nArgCount == 4 ) +sal_Int32 nStartPos = -1; +if ( nArgCount >= 3 ) +{ +nStartPos = rPar.Get(3)->GetLong(); +if( nStartPos <= 0 && nStartPos != -1 ) { -bTextMode = rPar.Get(4)->GetInteger(); +StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); +nStartPos = -1; } -const sal_Int32 nStrLen = aStr1.getLength(); -if( nStartPos == -1 ) +} + +SbiInstance* pInst = GetSbData()->pInst; +bool bTextMode; +bool bCompatibility = ( pInst && pInst->IsCompatibility() ); +if( bCompatibility ) +{ +SbiRuntime* pRT = pInst->pRun; +bTextMode = pRT && pRT->IsImageFlag( SbiImageFlags::COMPARETEXT ); +} +else +{ +bTextMode = true; +} +if ( nArgCount == 4 ) +{ +bTextMode = rPar.Get(4)->GetInteger(); +} +const sal_Int32 nStrLen = aStr1.getLength(); +if( nStartPos == -1 ) +{ +nStartPos = nStrLen; +} + +sal_Int32 nPos = 0; +if( nStartPos <= nStrLen ) +{ +sal_Int32 nTokenLen = aToken.getLength(); +if( !nTokenLen ) { -nStartPos = nStrLen; + // Always find empty string + nPos = nStartPos; } - -sal_Int32 nPos = 0; -if( nStartPos <= nStrLen ) +else if( nStrLen > 0 ) { -sal_Int32 nTokenLen = aToken.getLength(); -if( !nTokenLen ) +if( !bTextMode ) { -// Always find empty string -nPos = nStartPos; + nPos = aStr1.lastIndexOf( aToken, nStartPos ) + 1; } -else if( nStrLen > 0 ) +else { -if( !bTextMode ) -{ -nPos = aStr1.lastIndexOf( aToken, nStartPos ) + 1; -} -else -{ -// tdf#143332 - case-insensitive operation for non-ASCII characters -i18nutil::SearchOptions2 aSearchOptions; -aSearchOptions.searchString = aToken; -aSearchOptions.AlgorithmType2 = util::SearchAlgorithms2::ABSOLUTE; -aSearchOptions.transliterateFlags |= TransliterationFlags::IGNORE_CASE; -utl::TextSearch textSearch(aSearchOptions); - -sal_Int32 nStart = 0; -sal_Int32 nEnd = nStartPos; -nPos = textSearch.SearchBackward(aStr1, , ) ? nStart : 0; -} + // tdf#143332 - case-insensitive operation for non-ASCII characters + i18nutil::SearchOptions2 aSearchOptions; + aSearchOptions.searchString = aToken; + aSearchOptions.AlgorithmType2 = util::SearchAlgorithms2::ABSOLUTE; + aSearchOptions.transliterateFlags |= TransliterationFlags::IGNORE_CASE; + utl::TextSearch
[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - officecfg/registry
officecfg/registry/data/org/openoffice/Office/UI.xcu |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5d2afaa057bd038d0f2a3554e5f485421beb13ac Author: Roman Kuznetsov AuthorDate: Tue Jun 21 13:48:22 2022 +0200 Commit: Adolfo Jayme Barrientos CommitDate: Sat Jun 25 05:41:19 2022 +0200 tdf#148138 change Text Boundaries color to Gray for Dark mode Change-Id: I276896d0ea94e741be8c0ae49f79f95769e0c2a7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136234 Tested-by: Jenkins Reviewed-by: Heiko Tietze Reviewed-by: Adolfo Jayme Barrientos (cherry picked from commit 4412044340ea8447058bb99f529310c2be56a5a9) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136414 Tested-by: Adolfo Jayme Barrientos diff --git a/officecfg/registry/data/org/openoffice/Office/UI.xcu b/officecfg/registry/data/org/openoffice/Office/UI.xcu index e3195b7ac50f..0726415a41b8 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI.xcu @@ -441,7 +441,7 @@ true -1842204 +8421504
[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - officecfg/registry
officecfg/registry/data/org/openoffice/Office/UI.xcu |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c65eaa70a8a192cc25059a78e408279b84780ce6 Author: Roman Kuznetsov AuthorDate: Tue Jun 21 13:48:22 2022 +0200 Commit: Adolfo Jayme Barrientos CommitDate: Sat Jun 25 05:41:25 2022 +0200 tdf#148138 change Text Boundaries color to Gray for Dark mode Change-Id: I276896d0ea94e741be8c0ae49f79f95769e0c2a7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136234 Tested-by: Jenkins Reviewed-by: Heiko Tietze Reviewed-by: Adolfo Jayme Barrientos (cherry picked from commit 4412044340ea8447058bb99f529310c2be56a5a9) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136415 diff --git a/officecfg/registry/data/org/openoffice/Office/UI.xcu b/officecfg/registry/data/org/openoffice/Office/UI.xcu index 4e0e4c030b2c..ab3090babe24 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI.xcu @@ -433,7 +433,7 @@ true -1842204 +8421504
[Libreoffice-commits] core.git: officecfg/registry
officecfg/registry/data/org/openoffice/Office/UI.xcu |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a22652b76a5ed1fc130607e8999ed86681b4ed1f Author: Roman Kuznetsov AuthorDate: Tue Jun 21 13:48:22 2022 +0200 Commit: Adolfo Jayme Barrientos CommitDate: Fri Jun 24 19:17:03 2022 +0200 tdf#148138 change Text Boundaries color to Gray for Dark mode Change-Id: I276896d0ea94e741be8c0ae49f79f95769e0c2a7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136234 Tested-by: Jenkins Reviewed-by: Heiko Tietze Reviewed-by: Adolfo Jayme Barrientos diff --git a/officecfg/registry/data/org/openoffice/Office/UI.xcu b/officecfg/registry/data/org/openoffice/Office/UI.xcu index e3195b7ac50f..0726415a41b8 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI.xcu @@ -441,7 +441,7 @@ true -1842204 +8421504
[Libreoffice-commits] core.git: basic/source
basic/source/runtime/methods.cxx | 18 -- 1 file changed, 8 insertions(+), 10 deletions(-) New commits: commit f30af7b3516d783d717745b63134499ea0d049fc Author: Roman Kuznetsov AuthorDate: Fri Jun 3 14:30:32 2022 +0200 Commit: Roman Kuznetsov CommitDate: Fri Jun 3 16:36:32 2022 +0200 tdf#147132 Flatten Basic function Change-Id: I1e445a565dc9c45810e85b045e68db08a56207f9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135271 Tested-by: Jenkins Reviewed-by: Roman Kuznetsov diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx index c6d12c3c033f..2761caba0309 100644 --- a/basic/source/runtime/methods.cxx +++ b/basic/source/runtime/methods.cxx @@ -771,17 +771,15 @@ void SbRtl_Hex(StarBASIC *, SbxArray & rPar, bool) { if (rPar.Count() < 2) { -StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); -} -else -{ -SbxVariableRef pArg = rPar.Get(1); -// converting value to unsigned and limit to 2 or 4 byte representation -sal_uInt32 nVal = pArg->IsInteger() ? -static_cast(pArg->GetInteger()) : -static_cast(pArg->GetLong()); -rPar.Get(0)->PutString(OUString::number(nVal, 16).toAsciiUpperCase()); +return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); } + +SbxVariableRef pArg = rPar.Get(1); +// converting value to unsigned and limit to 2 or 4 byte representation +sal_uInt32 nVal = pArg->IsInteger() ? +static_cast(pArg->GetInteger()) : +static_cast(pArg->GetLong()); +rPar.Get(0)->PutString(OUString::number(nVal, 16).toAsciiUpperCase()); } void SbRtl_FuncCaller(StarBASIC *, SbxArray & rPar, bool)
[Libreoffice-commits] core.git: basic/source
basic/source/runtime/methods.cxx | 49 +++ 1 file changed, 24 insertions(+), 25 deletions(-) New commits: commit 66fe1fa945a161b2f617ab3576ddef23d84148f8 Author: Roman Kuznetsov AuthorDate: Fri Jun 3 09:11:28 2022 +0200 Commit: Mike Kaganski CommitDate: Fri Jun 3 10:17:02 2022 +0200 tdf#147132 Flatten Basic function Change-Id: Ib2646bfbebdfb6d8e8a3cd1355db75b0405ccfe6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135268 Tested-by: Jenkins Reviewed-by: Mike Kaganski diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx index 122e87947ee0..c6d12c3c033f 100644 --- a/basic/source/runtime/methods.cxx +++ b/basic/source/runtime/methods.cxx @@ -733,41 +733,40 @@ void SbRtl_FileLen(StarBASIC *, SbxArray & rPar, bool) { if (rPar.Count() < 2) { -StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); +return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); } -else + +SbxVariableRef pArg = rPar.Get(1); +OUString aStr( pArg->GetOUString() ); +sal_Int32 nLen = 0; +if( hasUno() ) { -SbxVariableRef pArg = rPar.Get(1); -OUString aStr( pArg->GetOUString() ); -sal_Int32 nLen = 0; -if( hasUno() ) +const uno::Reference< ucb::XSimpleFileAccess3 >& xSFI = getFileAccess(); +if( xSFI.is() ) { -const uno::Reference< ucb::XSimpleFileAccess3 >& xSFI = getFileAccess(); -if( xSFI.is() ) +try { -try -{ -nLen = xSFI->getSize( getFullPath( aStr ) ); -} -catch(const Exception & ) -{ -StarBASIC::Error( ERRCODE_IO_GENERAL ); -} +nLen = xSFI->getSize( getFullPath( aStr ) ); +} +catch(const Exception & ) +{ +StarBASIC::Error( ERRCODE_IO_GENERAL ); } } -else -{ -DirectoryItem aItem; -(void)DirectoryItem::get( getFullPath( aStr ), aItem ); -FileStatus aFileStatus( osl_FileStatus_Mask_FileSize ); -(void)aItem.getFileStatus( aFileStatus ); -nLen = static_cast(aFileStatus.getFileSize()); -} -rPar.Get(0)->PutLong(nLen); } +else +{ +DirectoryItem aItem; +(void)DirectoryItem::get( getFullPath( aStr ), aItem ); +FileStatus aFileStatus( osl_FileStatus_Mask_FileSize ); +(void)aItem.getFileStatus( aFileStatus ); +nLen = static_cast(aFileStatus.getFileSize()); +} +rPar.Get(0)->PutLong(nLen); } + void SbRtl_Hex(StarBASIC *, SbxArray & rPar, bool) { if (rPar.Count() < 2)
[Libreoffice-commits] core.git: tools/source
tools/source/reversemap/bestreversemap.cxx |7 --- 1 file changed, 4 insertions(+), 3 deletions(-) New commits: commit 81aad6d53fa792dd95732e401ecb298714f699f4 Author: Roman Kuznetsov AuthorDate: Sun May 29 15:27:29 2022 +0200 Commit: Roman Kuznetsov CommitDate: Mon May 30 12:24:17 2022 +0200 tdf#147021 Use std::size() instead SAL_N_ELEMENTS macro Change-Id: Id91ca2d7002b3743ecaed7b40edda3f85e080884 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135061 Tested-by: Jenkins Reviewed-by: Roman Kuznetsov diff --git a/tools/source/reversemap/bestreversemap.cxx b/tools/source/reversemap/bestreversemap.cxx index 02a81932b3f2..f124140c1918 100644 --- a/tools/source/reversemap/bestreversemap.cxx +++ b/tools/source/reversemap/bestreversemap.cxx @@ -11,6 +11,7 @@ #include #include +#include #include namespace { @@ -91,7 +92,7 @@ int main() sal_Unicode c = 0; while (c < 0x) { -for (size_t i = 0; i < SAL_N_ELEMENTS(aConverters); ++i) +for (size_t i = 0; i < std::size(aConverters); ++i) aConverters[i].reset(); int nMostCapable = -1; @@ -99,7 +100,7 @@ int main() while(c < 0x) { bool bSomethingCapable = false; -for (size_t i = 0; i < SAL_N_ELEMENTS(aConverters); ++i) +for (size_t i = 0; i < std::size(aConverters); ++i) { if (aConverters[i].isOK()) aConverters[i].checkSupports(c); @@ -119,7 +120,7 @@ int main() while(c < 0x) { bool bNothingCapable = true; -for (size_t i = 0; i < SAL_N_ELEMENTS(aConverters); ++i) +for (size_t i = 0; i < std::size(aConverters); ++i) { aConverters[i].checkSupports(c); if (aConverters[i].isOK())
[Libreoffice-commits] core.git: vcl/source
vcl/source/font/fontcharmap.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit d694b572c7262a326ac7ceac2e558f3fc6c78df4 Author: Roman Kuznetsov AuthorDate: Mon May 30 09:16:26 2022 +0200 Commit: Roman Kuznetsov CommitDate: Mon May 30 12:21:52 2022 +0200 tdf#147021 Use std::size() instead SAL_N_ELEMENTS macro Change-Id: I86956ab4beaba6b2b0905123ccea76c8ffad57fa Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135063 Tested-by: Jenkins Reviewed-by: Roman Kuznetsov diff --git a/vcl/source/font/fontcharmap.cxx b/vcl/source/font/fontcharmap.cxx index 90a08d617a86..7ca3e56a2f8c 100644 --- a/vcl/source/font/fontcharmap.cxx +++ b/vcl/source/font/fontcharmap.cxx @@ -69,11 +69,11 @@ ImplFontCharMap::ImplFontCharMap( const CmapResult& rCR ) ImplFontCharMapRef const & ImplFontCharMap::getDefaultMap( bool bSymbols ) { const sal_UCS4* pRangeCodes = aDefaultUnicodeRanges; -int nCodesCount = SAL_N_ELEMENTS(aDefaultUnicodeRanges); +int nCodesCount = std::size(aDefaultUnicodeRanges); if( bSymbols ) { pRangeCodes = aDefaultSymbolRanges; -nCodesCount = SAL_N_ELEMENTS(aDefaultSymbolRanges); +nCodesCount = std::size(aDefaultSymbolRanges); } CmapResult aDefaultCR( bSymbols, pRangeCodes, nCodesCount/2 );
[Libreoffice-commits] core.git: basic/source
basic/source/runtime/methods.cxx | 14 ++ 1 file changed, 6 insertions(+), 8 deletions(-) New commits: commit 43458f83f29067752cfb3df2ccfe0eeb940f4b71 Author: Roman Kuznetsov AuthorDate: Sun May 29 15:32:53 2022 +0200 Commit: Roman Kuznetsov CommitDate: Mon May 30 08:45:42 2022 +0200 tdf#147132 Flatten Basic function implementation Change-Id: Ife73d08e57bb1c896a27f8cbbd6b1f4b106587a1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135062 Tested-by: Jenkins Reviewed-by: Roman Kuznetsov diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx index 4dbe3f526626..122e87947ee0 100644 --- a/basic/source/runtime/methods.cxx +++ b/basic/source/runtime/methods.cxx @@ -721,14 +721,12 @@ void SbRtl_SendKeys(StarBASIC *, SbxArray & rPar, bool) void SbRtl_Exp(StarBASIC *, SbxArray & rPar, bool) { if (rPar.Count() < 2) -StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); -else -{ -double aDouble = rPar.Get(1)->GetDouble(); -aDouble = exp( aDouble ); -checkArithmeticOverflow( aDouble ); -rPar.Get(0)->PutDouble(aDouble); -} +return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); + +double aDouble = rPar.Get(1)->GetDouble(); +aDouble = exp( aDouble ); +checkArithmeticOverflow( aDouble ); +rPar.Get(0)->PutDouble(aDouble); } void SbRtl_FileLen(StarBASIC *, SbxArray & rPar, bool)
[Libreoffice-commits] core.git: sc/uiconfig
sc/uiconfig/scalc/menubar/menubar.xml | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) New commits: commit a68629fdf97f181d4c6975f91e66fe52f83247e9 Author: Roman Kuznetsov AuthorDate: Sun May 1 20:23:43 2022 +0100 Commit: Roman Kuznetsov CommitDate: Wed May 25 16:04:25 2022 +0200 tdf#148467 Move sparklines items to Insert/Format main menu Change-Id: I2606fdd6301e5d1cb1e855d79a971762ed2d835d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133608 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/sc/uiconfig/scalc/menubar/menubar.xml b/sc/uiconfig/scalc/menubar/menubar.xml index 0bec8ed64b59..5388d021e96b 100644 --- a/sc/uiconfig/scalc/menubar/menubar.xml +++ b/sc/uiconfig/scalc/menubar/menubar.xml @@ -207,6 +207,7 @@ + @@ -439,6 +440,15 @@ + + + + + + + + + @@ -572,16 +582,6 @@ - - - - - - - - - -
[Libreoffice-commits] core.git: cui/inc
cui/inc/tipoftheday.hrc |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 23f1d0436f4a23b496c271c86325b8e336d60f3b Author: Roman Kuznetsov AuthorDate: Sat Feb 12 23:08:36 2022 +0100 Commit: Roman Kuznetsov CommitDate: Mon Feb 14 11:06:37 2022 +0100 tdf#143266 Use correct menu item's names in ToD Change-Id: I0796e6c8b2dc2b6e56e7e69611cbcb97ff3e7e34 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129842 Tested-by: Jenkins Reviewed-by: Sophie Gautier Reviewed-by: Heiko Tietze diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc index b410d8f5f1ca..81894f5c77b2 100644 --- a/cui/inc/tipoftheday.hrc +++ b/cui/inc/tipoftheday.hrc @@ -141,13 +141,13 @@ const std::tuple TIPOFTHEDAY_STRINGARRAY[] = { NC_("RID_CUI_TIPOFTHEDAY", "Mix portrait and landscape orientations in a Calc spreadsheet by applying different page styles on sheets."), "", "tipoftheday_c.png"}, { NC_("RID_CUI_TIPOFTHEDAY", "Click on the special character icon in the toolbar to get quick access to favorite and recent characters to insert."), "", ""}, { NC_("RID_CUI_TIPOFTHEDAY", "Choose “Hierarchical View” in the Styles sidebar to see the relation between styles."), "", "tipoftheday_w.png"}, - { NC_("RID_CUI_TIPOFTHEDAY", "You can use styles to make the tables in your document consistent. Choose one from the predefined per Styles (F11) or via Table ▸ AutoFormat."), "", "tipoftheday_w.png"}, + { NC_("RID_CUI_TIPOFTHEDAY", "You can use styles to make the tables in your document consistent. Choose one from the predefined per Styles (F11) or via Table ▸ AutoFormat Styles..."), "", "tipoftheday_w.png"}, { NC_("RID_CUI_TIPOFTHEDAY", "Configure use of the %MOD1 key to open hyperlinks? Tools ▸ Options ▸ %PRODUCTNAME ▸ Security ▸ Options ▸ “%MOD1+click required to open hyperlinks”."), "", ""}, { NC_("RID_CUI_TIPOFTHEDAY", "You would like to view the calculation of individual elements of a formula, select the respective elements and press F9."), "", "tipoftheday_c.png"}, { NC_("RID_CUI_TIPOFTHEDAY", "You can protect cells with Format ▸ Cells ▸ Protection. To prevent insert, delete, rename, move/copy of sheets use Tools ▸ Protect Sheet."), "https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/scalc/guide/cell_protect.html;, "tipoftheday_c.png"}, //local help missing { NC_("RID_CUI_TIPOFTHEDAY", "Write along a curve? Draw the line, double click, type the text, Format ▸ Text Box and Shape ▸ Fontwork."), "", "tipoftheday_w.png"}, { NC_("RID_CUI_TIPOFTHEDAY", "Want to display only the highest values in a spreadsheet? Select menu Data ▸ AutoFilter, click the drop-down arrow, and choose “Top10”."), "", "tipoftheday_c.png"}, - { NC_("RID_CUI_TIPOFTHEDAY", "To remove the page number from your table of contents go to Insert ▸ Table of Contents (or right-click and Edit the previously inserted index). In the Entries tab delete the page number (#) from Structure line."), "", "tipoftheday_w.png"}, + { NC_("RID_CUI_TIPOFTHEDAY", "To remove the page number from your table of contents go to Insert ▸ Table of Contents and Index (or right-click and Edit Index to edit a previously inserted index). In the Entries tab delete the page number (#) from Structure line."), "", "tipoftheday_w.png"}, { NC_("RID_CUI_TIPOFTHEDAY", "With the Navigator you can select & move up/down headings and the text below the heading, in the Navigator and in the document."), "", "tipoftheday_w.png"}, { NC_("RID_CUI_TIPOFTHEDAY", "To quickly get a math object in Writer type your formula, mark it, and use Insert ▸ Object ▸ Formula to convert the text."), "", "tipoftheday_w.png"}, { NC_("RID_CUI_TIPOFTHEDAY", "With %PRODUCTNAME it is very easy to install a new dictionary: they are supplied as extensions."), "https://extensions.libreoffice.org/?q=[]=50;, ""},
[Libreoffice-commits] core.git: sc/uiconfig
sc/uiconfig/scalc/popupmenu/drawtext.xml |2 -- 1 file changed, 2 deletions(-) New commits: commit 43b0d4f709a3a1446a32e36abb5deaa3bb45ddd9 Author: Roman Kuznetsov AuthorDate: Wed Oct 13 16:13:58 2021 +0200 Commit: Roman Kuznetsov CommitDate: Thu Oct 14 21:16:44 2021 +0200 tdf#138842 Delete Default item from Calc Comment's context menu Change-Id: I4f3b78bfdf479f96c9d8e2387c5c38446f2eaf72 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123513 Tested-by: Jenkins Reviewed-by: Roman Kuznetsov diff --git a/sc/uiconfig/scalc/popupmenu/drawtext.xml b/sc/uiconfig/scalc/popupmenu/drawtext.xml index 62a4f9141cee..d8cdc15e603e 100644 --- a/sc/uiconfig/scalc/popupmenu/drawtext.xml +++ b/sc/uiconfig/scalc/popupmenu/drawtext.xml @@ -28,6 +28,4 @@ - -
[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - instsetoo_native/inc_openoffice
instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 43b69fb3a63f1044288e3a49b3d822dd1b8df35c Author: Roman Kuznetsov AuthorDate: Tue Oct 12 14:45:24 2021 +0200 Commit: Roman Kuznetsov CommitDate: Wed Oct 13 12:33:29 2021 +0200 tdf#143686 increase a radiobutton's area size Change-Id: Ib8b6d8b47934a7a2cf68f8977f03ced5f80f6452 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123409 Tested-by: Jenkins Reviewed-by: Roman Kuznetsov (cherry picked from commit d8a1187fc262ccb4c6489b2ca830f230400c5b82) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123508 Reviewed-by: Adolfo Jayme Barrientos diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt index 43b77f1e8c0c..eee5c4e8cd48 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt @@ -183,7 +183,7 @@ MsiRMFilesInUse DlgDesc Text21 23 372 25 196611 OOO_CONTROL_322 MsiRMFilesInUseBannerLine Line0 44 474 0 1 MsiRMFilesInUseDlgText Text21 51 426 43 3 OOO_CONTROL_323 MsiRMFilesInUseListListBox 21 95 432 85 7 FileInUseProcess -MsiRMFilesInUseShutdownOption RadioButtonGroup26 190 305 45 3 MsiUIRMOption OK +MsiRMFilesInUseShutdownOption RadioButtonGroup26 190 422 45 3 MsiUIRMOption OK MsiRMFilesInUseDlgLine Line0 234 474 0 1 MsiRMFilesInUseOK PushButton 330 243 66 17 3 OOO_CONTROL_326 Cancel MsiRMFilesInUseCancel PushButton 401 243 66 17 3 OOO_CONTROL_325 ShutdownOption
[Libreoffice-commits] core.git: instsetoo_native/inc_openoffice
instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d8a1187fc262ccb4c6489b2ca830f230400c5b82 Author: Roman Kuznetsov AuthorDate: Tue Oct 12 14:45:24 2021 +0200 Commit: Roman Kuznetsov CommitDate: Wed Oct 13 08:41:29 2021 +0200 tdf#143686 increase a radiobutton's area size Change-Id: Ib8b6d8b47934a7a2cf68f8977f03ced5f80f6452 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123409 Tested-by: Jenkins Reviewed-by: Roman Kuznetsov diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt index 43b77f1e8c0c..eee5c4e8cd48 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt @@ -183,7 +183,7 @@ MsiRMFilesInUse DlgDesc Text21 23 372 25 196611 OOO_CONTROL_322 MsiRMFilesInUseBannerLine Line0 44 474 0 1 MsiRMFilesInUseDlgText Text21 51 426 43 3 OOO_CONTROL_323 MsiRMFilesInUseListListBox 21 95 432 85 7 FileInUseProcess -MsiRMFilesInUseShutdownOption RadioButtonGroup26 190 305 45 3 MsiUIRMOption OK +MsiRMFilesInUseShutdownOption RadioButtonGroup26 190 422 45 3 MsiUIRMOption OK MsiRMFilesInUseDlgLine Line0 234 474 0 1 MsiRMFilesInUseOK PushButton 330 243 66 17 3 OOO_CONTROL_326 Cancel MsiRMFilesInUseCancel PushButton 401 243 66 17 3 OOO_CONTROL_325 ShutdownOption
[Libreoffice-commits] core.git: odk/examples
odk/examples/cpp/Draw/Draw.cxx | 15 +++ 1 file changed, 7 insertions(+), 8 deletions(-) New commits: commit e7a7cfa029f8a6979179c5cf394d7eea80982ca8 Author: Roman Kuznetsov AuthorDate: Fri Oct 1 14:26:07 2021 +0200 Commit: Roman Kuznetsov CommitDate: Sun Oct 3 12:05:01 2021 +0200 drop 'using namespace std' here Change-Id: I6ebbd0ece563f0d877b03389fa9a96311cd207cc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122867 Tested-by: Jenkins Reviewed-by: Roman Kuznetsov diff --git a/odk/examples/cpp/Draw/Draw.cxx b/odk/examples/cpp/Draw/Draw.cxx index 0e0f7ab41603..843bdd553346 100644 --- a/odk/examples/cpp/Draw/Draw.cxx +++ b/odk/examples/cpp/Draw/Draw.cxx @@ -37,7 +37,6 @@ #include #include -using namespace std; using namespace cppu; using namespace rtl; using namespace css::uno; @@ -67,7 +66,7 @@ int main() } catch (Exception& e) { -cout << "Error: cannot do bootstraping." << endl << e.Message << endl; +std::cout << "Error: cannot do bootstraping." << std::endl << e.Message << std::endl; exit(1); } @@ -86,7 +85,7 @@ int main() } catch (Exception& e) { -cout << "Error: Document creation was not possible" << endl; +std::cout << "Error: Document creation was not possible" << std::endl; exit(1); } @@ -119,7 +118,7 @@ Reference openDraw(Reference xContext) } catch (Exception e) { -cout << "Error opening draw." << endl << e.Message << endl; +std::cout << "Error opening draw." << std::endl << e.Message << std::endl; exit(1); } @@ -152,7 +151,7 @@ Reference createShape(Reference xDocComp, int height, int wi } catch (Exception e) { -cout << "Could not create instance." << endl << e.Message << endl; +std::cout << "Could not create instance." << std::endl << e.Message << std::endl; exit(1); } @@ -164,7 +163,7 @@ Reference createShape(Reference xDocComp, int height, int wi } catch (Exception e) { -cout << "Can not change the shape colors." << endl << e.Message << endl; +std::cout << "Can not change the shape colors." << std::endl << e.Message << std::endl; exit(1); } @@ -205,7 +204,7 @@ Reference createSequence(Reference xDocComp, Reference< catch (Exception e) { // Some exception occurs.FAILED -cout << "Could not get Shape." << endl << e.Message << endl; +std::cout << "Could not get Shape." << std::endl << e.Message << std::endl; exit(1); } @@ -220,7 +219,7 @@ Reference createSequence(Reference xDocComp, Reference< } catch (Exception e) { -cout << "Can not change shape colors." << endl << e.Message << endl; +std::cout << "Can not change shape colors." << std::endl << e.Message << std::endl; exit(1); } xShapes->add(xShape);
[Libreoffice-commits] core.git: vcl/source
vcl/source/window/decoview.cxx |2 -- 1 file changed, 2 deletions(-) New commits: commit 4ac099d45d545ff1a233575a183953ab73e50267 Author: Roman Kuznetsov AuthorDate: Tue Sep 28 16:39:57 2021 +0200 Commit: Roman Kuznetsov CommitDate: Wed Sep 29 13:02:57 2021 +0200 drop 'using namespace std' here Change-Id: I314dfe1cd31ad7bf2b8fcf64f94ae5f82d24ebbd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122743 Tested-by: Jenkins Reviewed-by: Roman Kuznetsov diff --git a/vcl/source/window/decoview.cxx b/vcl/source/window/decoview.cxx index 793435822b1d..f9ccb59f6ee1 100644 --- a/vcl/source/window/decoview.cxx +++ b/vcl/source/window/decoview.cxx @@ -28,8 +28,6 @@ constexpr auto BUTTON_DRAW_FLATTEST = DrawButtonFlags::Flat | DrawButtonFlags::Checked | DrawButtonFlags::Highlight; -using namespace std; - namespace { tools::Long AdjustRectToSquare( tools::Rectangle )
[Libreoffice-commits] core.git: svl/source
svl/source/misc/gridprinter.cxx | 16 +++- 1 file changed, 7 insertions(+), 9 deletions(-) New commits: commit aeb056fb2feab4dfc5a5c4928b54fa21756d824b Author: Roman Kuznetsov AuthorDate: Mon Sep 27 18:29:59 2021 +0200 Commit: Roman Kuznetsov CommitDate: Tue Sep 28 10:43:14 2021 +0200 drop 'using namespace std' here Change-Id: Ifbbd6e985fb66893dc872522ed5418453ca8e2d4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122651 Tested-by: Jenkins Reviewed-by: Roman Kuznetsov diff --git a/svl/source/misc/gridprinter.cxx b/svl/source/misc/gridprinter.cxx index ae910e4f0cf7..070ed08b3eb9 100644 --- a/svl/source/misc/gridprinter.cxx +++ b/svl/source/misc/gridprinter.cxx @@ -17,8 +17,6 @@ #include -using namespace std; - namespace svl { // String ID @@ -79,10 +77,10 @@ void GridPrinter::print( const char* pHeader ) const return; if (pHeader) -cout << pHeader << endl; +std::cout << pHeader << std::endl; MatrixImplType::size_pair_type ns = mpImpl->maMatrix.size(); -vector aColWidths(ns.column, 0); +std::vector aColWidths(ns.column, 0); // Calculate column widths first. for (size_t row = 0; row < ns.row; ++row) @@ -109,10 +107,10 @@ void GridPrinter::print( const char* pHeader ) const OUString aSep = aBuf.makeStringAndClear(); // Now print to stdout. -cout << aSep << endl; +std::cout << aSep << std::endl; for (size_t row = 0; row < ns.row; ++row) { -cout << "| "; +std::cout << "| "; for (size_t col = 0; col < ns.column; ++col) { OUString aStr = mpImpl->maMatrix.get_string(row, col); @@ -120,10 +118,10 @@ void GridPrinter::print( const char* pHeader ) const aBuf.append(aStr); for (size_t i = 0; i < nPadding; ++i) aBuf.append(u' '); -cout << aBuf.makeStringAndClear() << " | "; +std::cout << aBuf.makeStringAndClear() << " | "; } -cout << endl; -cout << aSep << endl; +std::cout << std::endl; +std::cout << aSep << std::endl; } }
[Libreoffice-commits] core.git: sd/inc
sd/inc/strings.hrc |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 603e34734136340e506e8f88072a30e13707d3f3 Author: Roman Kuznetsov AuthorDate: Sat Sep 4 19:41:46 2021 +0200 Commit: Roman Kuznetsov CommitDate: Sun Sep 5 12:50:49 2021 +0200 tdf#140725 Change a tooltip for Slide Master name field in status bar Change-Id: If54311379637ff0485477bcbb2d2d8c2d079ce7e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121560 Tested-by: Jenkins Reviewed-by: Roman Kuznetsov diff --git a/sd/inc/strings.hrc b/sd/inc/strings.hrc index 5303e0d0905c..c5643c8bfe0e 100644 --- a/sd/inc/strings.hrc +++ b/sd/inc/strings.hrc @@ -230,7 +230,7 @@ #define STR_HTMLEXP_ERROR_CREATE_FILE NC_("STR_HTMLEXP_ERROR_CREATE_FILE", "Cannot create the file $(URL1).") #define STR_HTMLEXP_ERROR_OPEN_FILE NC_("STR_HTMLEXP_ERROR_OPEN_FILE", "Could not open the file $(URL1).") #define STR_HTMLEXP_ERROR_COPY_FILE NC_("STR_HTMLEXP_ERROR_COPY_FILE", "The file $(URL1) could not be copied to $(URL2)") -#define STR_STATUSBAR_MASTERPAGE NC_("STR_STATUSBAR_MASTERPAGE", "Slide Master name. Right-click for list and double-click for dialog.") +#define STR_STATUSBAR_MASTERPAGE NC_("STR_STATUSBAR_MASTERPAGE", "Slide Master name. Right-click for list or click for dialog.") #define STR_TITLE_RENAMESLIDE NC_("STR_TITLE_RENAMESLIDE", "Rename Slide") #define STR_TITLE_RENAMEPAGE NC_("STR_TITLE_RENAMEPAGE", "Rename Page") #define STR_TOOLTIP_RENAME NC_("STR_TOOLTIP_RENAME", "Duplicate or empty names are not possible")
[Libreoffice-commits] core.git: readlicense_oo/docs
readlicense_oo/docs/readme.xrm |7 +-- 1 file changed, 1 insertion(+), 6 deletions(-) New commits: commit de399fdf22206f9402a0322ce4851be9cc5e901c Author: Roman Kuznetsov AuthorDate: Wed Aug 25 22:19:41 2021 +0200 Commit: Adolfo Jayme Barrientos CommitDate: Thu Aug 26 16:49:35 2021 +0200 tdf#144030 Readme review Change-Id: I1500b2beacb88c0014495d98d8fb79090d7c9486 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121052 Tested-by: Jenkins Reviewed-by: Sophie Gautier Reviewed-by: Adolfo Jayme Barrientos diff --git a/readlicense_oo/docs/readme.xrm b/readlicense_oo/docs/readme.xrm index 5592da6f0e2c..d01823d780d7 100644 --- a/readlicense_oo/docs/readme.xrm +++ b/readlicense_oo/docs/readme.xrm @@ -122,7 +122,7 @@ Problems During Program Startup - Difficulties starting ${PRODUCTNAME} (e.g. applications hang) as well as problems with the screen display are often caused by the graphics card driver. If these problems occur, please update your graphics card driver or try using the graphics driver delivered with your operating system. Difficulties displaying 3D objects can often be solved by deactivating the option "Use OpenGL" under 'Tools - Options - ${PRODUCTNAME} - View - 3D view'. + Difficulties starting ${PRODUCTNAME} (e.g. applications hang) as well as problems with the screen display are often caused by the graphics card driver. If these problems occur, please update your graphics card driver or try using the graphics driver delivered with your operating system. @@ -136,11 +136,6 @@ The location of the configuration file might vary on different versions of Windows. - - Mozilla Address Book Driver - The Mozilla address book driver requires the SUNWzlib package. This package is not part of the minimum Solaris operating system installation. If you require access to the Mozilla address book, then add this package to your Solaris operating system using the command "pkgadd" from the installation CD. - - Shortcut Keys Only shortcut keys (key combinations) not used by the operating system can be used in ${PRODUCTNAME}. If a key combination in ${PRODUCTNAME} does not work as described in the ${PRODUCTNAME} Help, check if that shortcut is already used by the operating system. To rectify such conflicts, you can change the keys assigned by your operating system. Alternatively, you can change almost any key assignment in ${PRODUCTNAME}. For more information on this topic, refer to the ${PRODUCTNAME} Help or the Help documentation of your operating system.
[Libreoffice-commits] core.git: include/sfx2
include/sfx2/strings.hrc |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6cf1db2907f48e8aff65f5249668ac1d44ef32f0 Author: Roman Kuznetsov AuthorDate: Tue Aug 24 08:57:35 2021 +0200 Commit: Roman Kuznetsov CommitDate: Tue Aug 24 11:20:38 2021 +0200 tdf#144025 Change LibreOffice to %PRODUCTNAME Change-Id: Ia5bd44cb32818a71743f6a6e028cd9f0eba9aff1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120882 Tested-by: Jenkins Reviewed-by: Roman Kuznetsov diff --git a/include/sfx2/strings.hrc b/include/sfx2/strings.hrc index 3367d368b2fa..2323d807c853 100644 --- a/include/sfx2/strings.hrc +++ b/include/sfx2/strings.hrc @@ -212,7 +212,7 @@ #define STR_REDACTION_JSON_FILE_FILTER NC_("STR_REDACTION_JSON_FILE_FILTER", "Target Set (*.json)") #define STR_REDACTION_EDIT_TARGET NC_("STR_REDACTION_EDIT_TARGET", "Edit Target") #define STR_REDACTION_TARGET_ADD_ERROR NC_("STR_REDACTION_TARGET_ADD_ERROR", "An error occurred while adding new target. Please report this incident.") -#define STR_REDACTION_NO_DRAW_WARNING NC_("STR_REDACTION_NO_DRAW_WARNING", "Draw module is needed for redaction. Please make sure you have LibreOffice Draw installed and working correctly.") +#define STR_REDACTION_NO_DRAW_WARNING NC_("STR_REDACTION_NO_DRAW_WARNING", "Draw module is needed for redaction. Please make sure you have %PRODUCTNAME Draw installed and working correctly.") #define STR_SFX_FILEDLG_ACTUALVERSION NC_("STR_SFX_FILEDLG_ACTUALVERSION", "Current version") #define STR_SFX_EXPLORERFILE_EXPORT NC_("STR_SFX_EXPLORERFILE_EXPORT", "Export")
[Libreoffice-commits] core.git: Branch 'libreoffice-7-2-0' - instsetoo_native/inc_openoffice
instsetoo_native/inc_openoffice/windows/msi_templates/RadioBut.idt |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 07f3b01f84e2540a7e40244b8efff969d9f6107c Author: Roman Kuznetsov AuthorDate: Tue Aug 3 19:29:01 2021 +0200 Commit: Xisco Fauli CommitDate: Mon Aug 9 09:41:49 2021 +0200 tdf#143686 Increase a width of the label Change-Id: I71d7994ad7ed4506c1514cf417a535caff20b05f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119869 Tested-by: Jenkins Reviewed-by: Roman Kuznetsov (cherry picked from commit af0437d7b1d9cc5a00b7d01a6510e5ba40ca1a12) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119985 Reviewed-by: Eike Rathke (cherry picked from commit df389c813637f7681fccf025a624554b3627468e) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119986 Reviewed-by: Adolfo Jayme Barrientos Reviewed-by: Xisco Fauli Tested-by: Xisco Fauli diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/RadioBut.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/RadioBut.idt index 680c97605409..9061f160e1cd 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/RadioBut.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/RadioBut.idt @@ -10,5 +10,5 @@ AgreeToLicense1 No 0 15 295 15 OOO_RADIOBUTTON_6 AgreeToLicense 2 Yes 0 0 295 15 OOO_RADIOBUTTON_7 ApplicationUsers 1 AllUsers1 7 290 14 OOO_RADIOBUTTON_8 ApplicationUsers 2 OnlyCurrentUser 1 23 290 14 OOO_RADIOBUTTON_9 -MsiUIRMOption 1 UseRM 0 0 420 16 OOO_RADIOBUTTON_10 -MsiUIRMOption 2 DontUseRM 0 20 420 16 OOO_RADIOBUTTON_11 +MsiUIRMOption 1 UseRM 0 0 460 16 OOO_RADIOBUTTON_10 +MsiUIRMOption 2 DontUseRM 0 20 460 16 OOO_RADIOBUTTON_11
[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - instsetoo_native/inc_openoffice
instsetoo_native/inc_openoffice/windows/msi_templates/RadioBut.idt |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit df389c813637f7681fccf025a624554b3627468e Author: Roman Kuznetsov AuthorDate: Tue Aug 3 19:29:01 2021 +0200 Commit: Eike Rathke CommitDate: Wed Aug 4 20:36:03 2021 +0200 tdf#143686 Increase a width of the label Change-Id: I71d7994ad7ed4506c1514cf417a535caff20b05f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119869 Tested-by: Jenkins Reviewed-by: Roman Kuznetsov (cherry picked from commit af0437d7b1d9cc5a00b7d01a6510e5ba40ca1a12) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119985 Reviewed-by: Eike Rathke diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/RadioBut.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/RadioBut.idt index 680c97605409..9061f160e1cd 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/RadioBut.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/RadioBut.idt @@ -10,5 +10,5 @@ AgreeToLicense1 No 0 15 295 15 OOO_RADIOBUTTON_6 AgreeToLicense 2 Yes 0 0 295 15 OOO_RADIOBUTTON_7 ApplicationUsers 1 AllUsers1 7 290 14 OOO_RADIOBUTTON_8 ApplicationUsers 2 OnlyCurrentUser 1 23 290 14 OOO_RADIOBUTTON_9 -MsiUIRMOption 1 UseRM 0 0 420 16 OOO_RADIOBUTTON_10 -MsiUIRMOption 2 DontUseRM 0 20 420 16 OOO_RADIOBUTTON_11 +MsiUIRMOption 1 UseRM 0 0 460 16 OOO_RADIOBUTTON_10 +MsiUIRMOption 2 DontUseRM 0 20 460 16 OOO_RADIOBUTTON_11
[Libreoffice-commits] core.git: instsetoo_native/inc_openoffice
instsetoo_native/inc_openoffice/windows/msi_templates/RadioBut.idt |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit af0437d7b1d9cc5a00b7d01a6510e5ba40ca1a12 Author: Roman Kuznetsov AuthorDate: Tue Aug 3 19:29:01 2021 +0200 Commit: Roman Kuznetsov CommitDate: Wed Aug 4 18:30:07 2021 +0200 tdf#143686 Increase a width of the label Change-Id: I71d7994ad7ed4506c1514cf417a535caff20b05f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119869 Tested-by: Jenkins Reviewed-by: Roman Kuznetsov diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/RadioBut.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/RadioBut.idt index 680c97605409..9061f160e1cd 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/RadioBut.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/RadioBut.idt @@ -10,5 +10,5 @@ AgreeToLicense1 No 0 15 295 15 OOO_RADIOBUTTON_6 AgreeToLicense 2 Yes 0 0 295 15 OOO_RADIOBUTTON_7 ApplicationUsers 1 AllUsers1 7 290 14 OOO_RADIOBUTTON_8 ApplicationUsers 2 OnlyCurrentUser 1 23 290 14 OOO_RADIOBUTTON_9 -MsiUIRMOption 1 UseRM 0 0 420 16 OOO_RADIOBUTTON_10 -MsiUIRMOption 2 DontUseRM 0 20 420 16 OOO_RADIOBUTTON_11 +MsiUIRMOption 1 UseRM 0 0 460 16 OOO_RADIOBUTTON_10 +MsiUIRMOption 2 DontUseRM 0 20 460 16 OOO_RADIOBUTTON_11
[Libreoffice-commits] core.git: instsetoo_native/inc_openoffice
instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6045232d352d2031252a086855b78fd94d9ffe3d Author: Roman Kuznetsov AuthorDate: Tue Apr 20 12:00:16 2021 +0200 Commit: Ilmari Lauhakangas CommitDate: Tue Apr 20 14:25:04 2021 +0200 tdf#141760 Increase a label box in Windows installer dialog Change-Id: I6a58e0977381c620a795b77df56c24dab37cc327 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114281 Tested-by: Jenkins Reviewed-by: Ilmari Lauhakangas diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt index a573077997f6..43b77f1e8c0c 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt @@ -215,7 +215,7 @@ ReadyToInstall DlgTitle2 Text13 6 380 25 65538 OOO_CONTROL_171 ReadyToInstall DlgTitle3 Text13 6 380 25 65538 OOO_CONTROL_172 ReadyToInstall InstallNow PushButton 330 243 66 17 3 OOO_CONTROL_173 Cancel ReadyToInstall DesktopLink CheckBox21 100 300 15 3 CREATEDESKTOPLINK OOO_CONTROL_319 EnableQuickstart -ReadyToInstall EnableQuickstartCheckBox21 130 300 15 3 QUICKSTART OOO_CONTROL_321 Back +ReadyToInstall EnableQuickstartCheckBox21 130 400 15 3 QUICKSTART OOO_CONTROL_321 Back ReadyToRemove BackPushButton 264 243 66 17 3 OOO_CONTROL_174 RemoveNow ReadyToRemove Banner Bitmap 0 0 474 44 1 BannerBmp ReadyToRemove BannerLine Line0 44 474 0 1 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5657142d9840c8a0fdc0419922289f741aed2bf6 Author: Roman Kuznetsov AuthorDate: Wed Jan 20 13:58:17 2021 +0100 Commit: Gerrit Code Review CommitDate: Wed Jan 20 13:58:17 2021 +0100 Update git submodules * Update helpcontent2 from branch 'master' to d1564e769638b68222683ba6b4351b378c9d5585 - tdf#126555 Change Distribution menu label to Distribute selection in Help Change-Id: I059873458581565dad34d43dfcf0e2fa98f416ce Reviewed-on: https://gerrit.libreoffice.org/c/help/+/109678 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 2bf658142b7e..d1564e769638 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 2bf658142b7e3c859d353e0d964aa1404fb0087e +Subproject commit d1564e769638b68222683ba6b4351b378c9d5585 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/sdraw/guide/align_arrange.xhp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d1564e769638b68222683ba6b4351b378c9d5585 Author: Roman Kuznetsov AuthorDate: Wed Jan 20 11:35:09 2021 +0100 Commit: Olivier Hallot CommitDate: Wed Jan 20 13:58:17 2021 +0100 tdf#126555 Change Distribution menu label to Distribute selection in Help Change-Id: I059873458581565dad34d43dfcf0e2fa98f416ce Reviewed-on: https://gerrit.libreoffice.org/c/help/+/109678 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/sdraw/guide/align_arrange.xhp b/source/text/sdraw/guide/align_arrange.xhp index 137335396..0c0f5ebe9 100644 --- a/source/text/sdraw/guide/align_arrange.xhp +++ b/source/text/sdraw/guide/align_arrange.xhp @@ -88,7 +88,7 @@ Distributing Objects -If you select three or more objects in Draw, you can also use the Distribution command to distribute the vertical and horizontal spacing evenly between the objects. +If you select three or more objects in Draw, you can also use the Distribute selection command to distribute the vertical and horizontal spacing evenly between the objects. Select three or more objects to be distributed. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit edb953cfb77c7ad6578a191b48c47c25d8d59d11 Author: Roman Kuznetsov AuthorDate: Mon Jan 18 08:34:19 2021 +0100 Commit: Gerrit Code Review CommitDate: Mon Jan 18 08:34:19 2021 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 85aba709f71b6d1443db98fbacb22d9b47a71123 - tdf#139616 Updating a conditional formatting help page Change-Id: Id34c8e5e003802635e30a7e038d9f413625f1306 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/109404 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/helpcontent2 b/helpcontent2 index c5ca7b12b4d5..85aba709f71b 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit c5ca7b12b4d593f22db0d450a46335879b5ff2e2 +Subproject commit 85aba709f71b6d1443db98fbacb22d9b47a71123 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/scalc/guide/cellstyle_conditional.xhp | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) New commits: commit 85aba709f71b6d1443db98fbacb22d9b47a71123 Author: Roman Kuznetsov AuthorDate: Sat Jan 16 20:46:59 2021 +0100 Commit: Adolfo Jayme Barrientos CommitDate: Mon Jan 18 08:34:19 2021 +0100 tdf#139616 Updating a conditional formatting help page Change-Id: Id34c8e5e003802635e30a7e038d9f413625f1306 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/109404 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/source/text/scalc/guide/cellstyle_conditional.xhp b/source/text/scalc/guide/cellstyle_conditional.xhp index 0b7b0de31..c52d748d7 100644 --- a/source/text/scalc/guide/cellstyle_conditional.xhp +++ b/source/text/scalc/guide/cellstyle_conditional.xhp @@ -39,7 +39,7 @@ mw deleted "formats;" Applying Conditional Formatting - Using the menu command Format - Conditional formatting, the dialog allows you to define conditions per cell, which must be met in order for the selected cells to have a particular format. + Using the menu command Format - Conditional - Condition, the dialog allows you to define conditions per cell, which must be met in order for the selected cells to have a particular format. To apply conditional formatting, AutoCalculate must be enabled. Choose Data - Calculate - AutoCalculate (you see a check mark next to the command when AutoCalculate is enabled). With conditional formatting, you can, for example, highlight the totals that exceed the average value of all totals. If the totals change, the formatting changes correspondingly, without having to apply other styles manually. To Define the Conditions @@ -48,7 +48,7 @@ Select the cells to which you want to apply a conditional style. -Choose Format - Conditional Formatting. +Choose Format - Conditional - Condition. Enter the condition(s) into the dialog box. The dialog is described in detail in $[officename] Help, and an example is provided below: @@ -59,7 +59,7 @@ You want to give certain values in your tables particular emphasis. For example, in a table of turnovers, you can show all the values above the average in green and all those below the average in red. This is possible with conditional formatting. -First of all, write a table in which a few different values occur. For your test you can create tables with any random numbers: +First of all, create a table in which a few different values occur. For your test you can create tables with any random numbers: In one of the cells enter the formula =RAND(), and you will obtain a random number between 0 and 1. If you want integers of between 0 and 50, enter the formula =INT(RAND()*50). @@ -76,10 +76,10 @@ Click in a blank cell and select the command Format Cells in the context menu. -In the Format Cells dialog on the Background tab, select a background color. Click OK. +In the Format Cells dialog on the Background tab, click the Color button and then select a background color. Click OK. -In the Styles window, click the New Style from Selection icon. Enter the name of the new style. For this example, name the style "Above". +In the Styles deck of the Sidebar, click the New Style from Selection icon. Enter the name of the new style. For this example, name the style "Above". To define a second style, click again in a blank cell and proceed as described above. Assign a different background color for the cell and assign a name (for this example, "Below"). @@ -92,7 +92,7 @@ Set the cursor in a blank cell, for example, J14, and choose Insert - Function. -Select the AVERAGE function. Use the mouse to select all your random numbers. If you cannot see the entire range, because the Function Wizard is obscuring it, you can temporarily shrink the dialog using the Shrink / Maximize icon. +Select the AVERAGE function. Use the mouse to select all your random numbers. If you cannot see the entire range, because the Function Wizard is obscuring it, you can temporarily shrink the dialog using the Shrink icon. Close the Function Wizard with OK. @@ -105,7 +105,7 @@ Select all cells with the random numbers. -Choose the Format - Conditional Formatting command to open the corresponding dialog. +Choose the Format - Conditional - Condition command to open the corresponding dialog. Define the condition as follows: If cell value is less than J14,
[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - sc/source
sc/source/ui/dbgui/validate.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0037b68dc6c2208af6760a0b86c59f871a2ce80a Author: Roman Kuznetsov AuthorDate: Fri Dec 4 19:12:23 2020 +0100 Commit: Adolfo Jayme Barrientos CommitDate: Tue Dec 8 12:52:53 2020 +0100 tdf#131815 Reduce Validity dialog height Change-Id: I90ec0a85bd8cf0761459e61bc26e619153597088 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107209 Tested-by: Jenkins Reviewed-by: Roman Kuznetsov (cherry picked from commit 9cb1c7e5d7434a64ada279ad264182286f907d7c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107303 Reviewed-by: Adolfo Jayme Barrientos diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx index e4f9e93cd617..0ee9b69ab83a 100644 --- a/sc/source/ui/dbgui/validate.cxx +++ b/sc/source/ui/dbgui/validate.cxx @@ -376,7 +376,7 @@ ScTPValidationValue::ScTPValidationValue(weld::Container* pPage, weld::DialogCon m_xEdMin->SetReferences(nullptr, m_xFtMin.get()); Size aSize(m_xEdList->get_approximate_digit_width() * 40, - m_xEdList->get_height_rows(25)); + m_xEdList->get_height_rows(10)); m_xEdList->set_size_request(aSize.Width(), aSize.Height()); m_xEdMax->SetReferences(nullptr, m_xFtMax.get()); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/dbgui/validate.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9cb1c7e5d7434a64ada279ad264182286f907d7c Author: Roman Kuznetsov AuthorDate: Fri Dec 4 19:12:23 2020 +0100 Commit: Roman Kuznetsov CommitDate: Sun Dec 6 21:16:52 2020 +0100 tdf#131815 Reduce Validity dialog height Change-Id: I90ec0a85bd8cf0761459e61bc26e619153597088 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107209 Tested-by: Jenkins Reviewed-by: Roman Kuznetsov diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx index 3d73a72f99af..cd9097c0ff48 100644 --- a/sc/source/ui/dbgui/validate.cxx +++ b/sc/source/ui/dbgui/validate.cxx @@ -373,7 +373,7 @@ ScTPValidationValue::ScTPValidationValue(weld::Container* pPage, weld::DialogCon m_xEdMin->SetReferences(nullptr, m_xFtMin.get()); Size aSize(m_xEdList->get_approximate_digit_width() * 40, - m_xEdList->get_height_rows(25)); + m_xEdList->get_height_rows(10)); m_xEdList->set_size_request(aSize.Width(), aSize.Height()); m_xEdMax->SetReferences(nullptr, m_xFtMax.get()); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/sfx2
include/sfx2/sidebar/AsynchronousCall.hxx |5 + include/sfx2/sidebar/Context.hxx|5 + include/sfx2/sidebar/ControllerItem.hxx |5 + include/sfx2/sidebar/Deck.hxx |5 + include/sfx2/sidebar/FocusManager.hxx |5 + include/sfx2/sidebar/IContextChangeReceiver.hxx |5 + include/sfx2/sidebar/ILayoutableWindow.hxx |5 + include/sfx2/sidebar/Panel.hxx |5 + include/sfx2/sidebar/ResourceManager.hxx|5 + include/sfx2/sidebar/Sidebar.hxx|5 + include/sfx2/sidebar/SidebarChildWindow.hxx |5 + include/sfx2/sidebar/SidebarController.hxx |5 + include/sfx2/sidebar/SidebarDockingWindow.hxx |6 +- include/sfx2/sidebar/SidebarModelUpdate.hxx |5 + include/sfx2/sidebar/SidebarPanelBase.hxx |5 + include/sfx2/sidebar/TabBar.hxx |5 + include/sfx2/sidebar/Theme.hxx |5 + 17 files changed, 17 insertions(+), 69 deletions(-) New commits: commit 023b77182a5818063f53ecfbe7ec3562ee37dcbc Author: Roman Kuznetsov AuthorDate: Thu Nov 19 19:49:51 2020 +0100 Commit: Roman Kuznetsov CommitDate: Thu Nov 19 23:11:18 2020 +0100 tdf#124176 use pragma once instead of include guards in /core/include/sfx2/sidebar Change-Id: I3ce7ccbd1e0e8e905c1f0eeefe1b17f4a2cd238f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106138 Tested-by: Jenkins Reviewed-by: Roman Kuznetsov diff --git a/include/sfx2/sidebar/AsynchronousCall.hxx b/include/sfx2/sidebar/AsynchronousCall.hxx index 675e53b58dac..dfdf9d6d946a 100644 --- a/include/sfx2/sidebar/AsynchronousCall.hxx +++ b/include/sfx2/sidebar/AsynchronousCall.hxx @@ -16,8 +16,7 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SFX2_SOURCE_SIDEBAR_ASYNCHRONOUSCALL_HXX -#define INCLUDED_SFX2_SOURCE_SIDEBAR_ASYNCHRONOUSCALL_HXX +#pragma once #include @@ -50,6 +49,4 @@ private: } // end of namespace sfx2::sidebar -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sfx2/sidebar/Context.hxx b/include/sfx2/sidebar/Context.hxx index b69838a8fd41..b6a369f66c61 100644 --- a/include/sfx2/sidebar/Context.hxx +++ b/include/sfx2/sidebar/Context.hxx @@ -16,8 +16,7 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SFX2_SOURCE_SIDEBAR_CONTEXT_HXX -#define INCLUDED_SFX2_SOURCE_SIDEBAR_CONTEXT_HXX +#pragma once #include @@ -56,6 +55,4 @@ public: } // end of namespace sfx2::sidebar -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sfx2/sidebar/ControllerItem.hxx b/include/sfx2/sidebar/ControllerItem.hxx index ef75d0dc9f68..05e5910ff55d 100644 --- a/include/sfx2/sidebar/ControllerItem.hxx +++ b/include/sfx2/sidebar/ControllerItem.hxx @@ -16,8 +16,7 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SFX2_SIDEBAR_CONTROLLERITEM_HXX -#define INCLUDED_SFX2_SIDEBAR_CONTROLLERITEM_HXX +#pragma once #include @@ -77,6 +76,4 @@ private: } // end of namespace sfx2::sidebar -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sfx2/sidebar/Deck.hxx b/include/sfx2/sidebar/Deck.hxx index e8f00b6c7f65..2be908141e82 100644 --- a/include/sfx2/sidebar/Deck.hxx +++ b/include/sfx2/sidebar/Deck.hxx @@ -16,8 +16,7 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SFX2_SOURCE_SIDEBAR_DECK_HXX -#define INCLUDED_SFX2_SOURCE_SIDEBAR_DECK_HXX +#pragma once #include @@ -106,6 +105,4 @@ private: } // end of namespace sfx2::sidebar -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sfx2/sidebar/FocusManager.hxx b/include/sfx2/sidebar/FocusManager.hxx index afd32d01716d..a51f4502ec97 100644 --- a/include/sfx2/sidebar/FocusManager.hxx +++ b/include/sfx2/sidebar/FocusManager.hxx @@ -16,8 +16,7 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SFX2_SOURCE_SIDEBAR_FOCUSMANAGER_HXX -#define INCLUDED_SFX2_SOURCE_SIDEBAR_FOCUSMANAGER_HXX +#pragma once #include #include @@ -144,6 +143,4 @@ private: } // end of namespace sfx2::sidebar -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sfx2/sidebar/IContextChangeReceiver.hxx b/include/sfx2/sidebar/IContextChangeReceiver.hxx index c3138c3f369b..12ed5e6fce8a 100644 ---
[Libreoffice-commits] core.git: include/svtools
include/svtools/DocumentToGraphicRenderer.hxx |5 + include/svtools/HtmlWriter.hxx |5 + include/svtools/PlaceEditDialog.hxx|4 +--- include/svtools/acceleratorexecute.hxx |5 + include/svtools/accessibilityoptions.hxx |5 + include/svtools/addresstemplate.hxx|5 + include/svtools/apearcfg.hxx |5 + include/svtools/asynclink.hxx |5 + include/svtools/bindablecontrolhelper.hxx |6 +- include/svtools/borderhelper.hxx |5 + include/svtools/borderline.hxx |5 + include/svtools/brwbox.hxx |6 +- include/svtools/brwhead.hxx|5 + include/svtools/cliplistener.hxx |5 + include/svtools/collatorres.hxx|5 + include/svtools/colorcfg.hxx |4 +--- include/svtools/colrdlg.hxx|5 + include/svtools/ctrlbox.hxx|6 +- include/svtools/ctrltool.hxx |5 + include/svtools/dialogclosedlistener.hxx |6 +- include/svtools/editbrowsebox.hxx |6 +- include/svtools/ehdl.hxx |5 + include/svtools/embedhlp.hxx |5 + include/svtools/embedtransfer.hxx |5 + include/svtools/extcolorcfg.hxx|4 +--- include/svtools/filechangedchecker.hxx |5 + include/svtools/fontsubstconfig.hxx|6 +- include/svtools/framestatuslistener.hxx|5 + include/svtools/genericunodialog.hxx |6 +- include/svtools/helpids.h |5 + include/svtools/helpopt.hxx|5 + include/svtools/htmlcfg.hxx|6 +- include/svtools/htmlkywd.hxx |5 + include/svtools/htmlout.hxx|5 + include/svtools/htmltokn.h |5 + include/svtools/imagemgr.hxx |5 + include/svtools/imageresourceaccess.hxx|5 + include/svtools/imgdef.hxx |5 + include/svtools/indexentryres.hxx |6 +- include/svtools/inettbc.hxx|5 + include/svtools/insdlg.hxx |5 + include/svtools/javacontext.hxx|5 + include/svtools/javainteractionhandler.hxx |5 + include/svtools/langhelp.hxx |5 + include/svtools/langtab.hxx|5 + include/svtools/menuoptions.hxx|5 + include/svtools/miscopt.hxx|5 + include/svtools/openfiledroptargetlistener.hxx |5 + include/svtools/optionsdrawinglayer.hxx|5 + include/svtools/parhtml.hxx|5 + include/svtools/parrtf.hxx |5 + include/svtools/place.hxx |5 + include/svtools/popupmenucontrollerbase.hxx|5 + include/svtools/popupwindowcontroller.hxx |5 + include/svtools/printoptions.hxx |5 + include/svtools/prnsetup.hxx |5 + include/svtools/querydelete.hxx|5 + include/svtools/restartdialog.hxx |5 + include/svtools/rtfkeywd.hxx |5 + include/svtools/rtfout.hxx |6 +- include/svtools/rtftoken.h |5 + include/svtools/ruler.hxx |5 + include/svtools/sampletext.hxx |5 + include/svtools/scriptedtext.hxx |6 +- include/svtools/sfxecode.hxx |6 +- include/svtools/slidesorterbaropt.hxx |5 + include/svtools/soerr.hxx |5 + include/svtools/statusbarcontroller.hxx|5 + include/svtools/strings.hrc|4 +--- include/svtools/stringtransfer.hxx |5 + include/svtools/svparser.hxx |5 + include/svtools/svtdllapi.h|5 + include/svtools/svtresid.hxx |5 + include/svtools/tabbar.hxx |5 + include/svtools/templatefoldercache.hxx|6 +- include/svtools/toolbarmenu.hxx|5 + include/svtools/toolboxcontroller.hxx |5 + include/svtools/unitconv.hxx |5 + include/svtools/unoevent.hxx |5 + include/svtools/unoimap.hxx|5 + include/svtools/urlfilter.hxx |5 + include/svtools/valueset.hxx
[Libreoffice-commits] core.git: sc/inc
sc/inc/globstr.hrc |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 949d648594f441dbb7e9c600d7925fba7e882ff9 Author: Roman Kuznetsov AuthorDate: Thu Sep 17 22:08:58 2020 +0200 Commit: Roman Kuznetsov CommitDate: Sat Sep 26 17:26:52 2020 +0200 tdf#112279 Change the error message to more clear Change-Id: Ib166e66b9a9cbf5cd29811dc1d0715a45ee920b6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102934 Tested-by: Jenkins Reviewed-by: Roman Kuznetsov diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc index 063d51a3d2ec..a325e4087555 100644 --- a/sc/inc/globstr.hrc +++ b/sc/inc/globstr.hrc @@ -430,7 +430,7 @@ #define STR_MULTI_SELECTNC_("STR_MULTI_SELECT", "(multiple)") #define STR_GLOBAL_SCOPENC_("STR_GLOBAL_SCOPE", "Document (Global)") #define STR_ERR_NAME_EXISTS NC_("STR_ERR_NAME_EXISTS", "Invalid name. Already in use for the selected scope.") -#define STR_ERR_NAME_INVALIDNC_("STR_ERR_NAME_INVALID", "Invalid name. Only use letters, numbers and underscore.") +#define STR_ERR_NAME_INVALIDNC_("STR_ERR_NAME_INVALID", "Invalid name. Start with a letter, use only letters, numbers and underscore.") #define STR_UNSAVED_EXT_REF NC_("STR_UNSAVED_EXT_REF", "This Document contains external references to unsaved documents.\n\nDo you want to continue?") #define STR_CLOSE_WITH_UNSAVED_REFS NC_("STR_CLOSE_WITH_UNSAVED_REFS", "This Document is referenced by another document and not yet saved. Closing it without saving will result in data loss.") #define STR_COND_CONDITION NC_("STR_COND_CONDITION", "Cell value") ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - instsetoo_native/inc_openoffice
instsetoo_native/inc_openoffice/windows/msi_templates/RadioBut.idt |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 448d920711a24e6819a3cc4b012e70dba347b13f Author: Roman Kuznetsov AuthorDate: Tue Jun 9 16:25:00 2020 +0200 Commit: Adolfo Jayme Barrientos CommitDate: Wed Jun 24 07:37:43 2020 +0200 increase a radiobutton text area in Windows installer dialog Change-Id: I3e2a2dbb7913bc0e35f0eb676f39afba53e1d0d8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95970 Tested-by: Jenkins Reviewed-by: Mike Kaganski (cherry picked from commit eaf30f98597f12c53d734935d62a84501cb201b4) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96887 Reviewed-by: Adolfo Jayme Barrientos diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/RadioBut.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/RadioBut.idt index c0425876b93f..680c97605409 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/RadioBut.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/RadioBut.idt @@ -10,5 +10,5 @@ AgreeToLicense1 No 0 15 295 15 OOO_RADIOBUTTON_6 AgreeToLicense 2 Yes 0 0 295 15 OOO_RADIOBUTTON_7 ApplicationUsers 1 AllUsers1 7 290 14 OOO_RADIOBUTTON_8 ApplicationUsers 2 OnlyCurrentUser 1 23 290 14 OOO_RADIOBUTTON_9 -MsiUIRMOption 1 UseRM 0 0 295 16 OOO_RADIOBUTTON_10 -MsiUIRMOption 2 DontUseRM 0 20 295 16 OOO_RADIOBUTTON_11 +MsiUIRMOption 1 UseRM 0 0 420 16 OOO_RADIOBUTTON_10 +MsiUIRMOption 2 DontUseRM 0 20 420 16 OOO_RADIOBUTTON_11 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: instsetoo_native/inc_openoffice
instsetoo_native/inc_openoffice/windows/msi_templates/RadioBut.idt |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit eaf30f98597f12c53d734935d62a84501cb201b4 Author: Roman Kuznetsov AuthorDate: Tue Jun 9 16:25:00 2020 +0200 Commit: Roman Kuznetsov CommitDate: Thu Jun 11 16:56:33 2020 +0200 increase a radiobutton text area in Windows installer dialog Change-Id: I3e2a2dbb7913bc0e35f0eb676f39afba53e1d0d8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95970 Tested-by: Jenkins Reviewed-by: Mike Kaganski diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/RadioBut.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/RadioBut.idt index c0425876b93f..680c97605409 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/RadioBut.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/RadioBut.idt @@ -10,5 +10,5 @@ AgreeToLicense1 No 0 15 295 15 OOO_RADIOBUTTON_6 AgreeToLicense 2 Yes 0 0 295 15 OOO_RADIOBUTTON_7 ApplicationUsers 1 AllUsers1 7 290 14 OOO_RADIOBUTTON_8 ApplicationUsers 2 OnlyCurrentUser 1 23 290 14 OOO_RADIOBUTTON_9 -MsiUIRMOption 1 UseRM 0 0 295 16 OOO_RADIOBUTTON_10 -MsiUIRMOption 2 DontUseRM 0 20 295 16 OOO_RADIOBUTTON_11 +MsiUIRMOption 1 UseRM 0 0 420 16 OOO_RADIOBUTTON_10 +MsiUIRMOption 2 DontUseRM 0 20 420 16 OOO_RADIOBUTTON_11 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/control/thumbnailview.cxx | 16 +++- 1 file changed, 7 insertions(+), 9 deletions(-) New commits: commit 6cd1591fb8b0a550067c37cf720708c6a5630b6d Author: Roman Kuznetsov AuthorDate: Sun Apr 26 20:49:22 2020 +0100 Commit: Roman Kuznetsov CommitDate: Wed Apr 29 11:21:13 2020 +0200 tdf#132441 thumb scrolling in Start Center should be more accuracy Change-Id: Iffee86c0046f5ec6dae0b0287ce098f9d821acaa Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92779 Tested-by: Jenkins Reviewed-by: Mike Kaganski Reviewed-by: Roman Kuznetsov diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx index 61a7d8f0ba35..996aceae06b4 100644 --- a/sfx2/source/control/thumbnailview.cxx +++ b/sfx2/source/control/thumbnailview.cxx @@ -263,7 +263,7 @@ void ThumbnailView::CalculateItemPositions (bool bScrollBarUsed) float nScrollRatio; if( bScrollBarUsed && mpScrBar ) nScrollRatio = static_cast(mpScrBar->GetThumbPos()) / -static_cast(mpScrBar->GetRangeMax()-2); +static_cast(mpScrBar->GetRangeMax() - mpScrBar->GetVisibleSize()); else nScrollRatio = 0; @@ -296,11 +296,10 @@ void ThumbnailView::CalculateItemPositions (bool bScrollBarUsed) mbHasVisibleItems = true; +long nFullSteps = (mnLines > mnVisLines) ? mnLines - mnVisLines + 1 : 1; + long nItemHeightOffset = mnItemHeight + nVItemSpace; -long nHiddenLines = (static_cast( -( mnLines - 1 ) * nItemHeightOffset * nScrollRatio ) - -nVItemSpace ) / -nItemHeightOffset; +long nHiddenLines = static_cast((nFullSteps - 1) * nScrollRatio); // calculate offsets long nStartX = nHItemSpace; @@ -308,8 +307,7 @@ void ThumbnailView::CalculateItemPositions (bool bScrollBarUsed) // calculate and draw items long x = nStartX; -long y = nStartY - ( mnLines - 1 ) * nItemHeightOffset * nScrollRatio + -nHiddenLines * nItemHeightOffset; +long y = nStartY - ((nFullSteps - 1) * nScrollRatio - nHiddenLines) * nItemHeightOffset; // draw items // Unless we are scrolling (via scrollbar) we just use the precalculated @@ -387,8 +385,8 @@ void ThumbnailView::CalculateItemPositions (bool bScrollBarUsed) Size aSize( nScrBarWidth, aWinSize.Height() ); mpScrBar->SetPosSizePixel( aPos, aSize ); -mpScrBar->SetRangeMax( (nCurCount+mnCols-1)*gnFineness/mnCols); -mpScrBar->SetVisibleSize( mnVisLines ); +mpScrBar->SetRangeMax(mnLines * gnFineness); +mpScrBar->SetVisibleSize(mnVisLines * gnFineness); if (!bScrollBarUsed) mpScrBar->SetThumbPos( static_cast(mnFirstLine)*gnFineness ); long nPageSize = mnVisLines; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sfx2/source
sfx2/source/control/thumbnailview.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 5e845e5230ed6982bfef761e86d552f1c96b67ad Author: Roman Kuznetsov AuthorDate: Sat Apr 25 11:51:33 2020 +0100 Commit: Adolfo Jayme Barrientos CommitDate: Mon Apr 27 00:56:19 2020 +0200 tdf#91818 disable scrollbar in Start Center when it isn't needed Change-Id: Ib3b7be6dd93a7f1c75f01ffe53ff7f7c19b14342 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92773 Tested-by: Mike Kaganski Reviewed-by: Mike Kaganski Reviewed-by: Roman Kuznetsov (cherry picked from commit 10dba26804cc0c14f74069c26112e75dacf3865b) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92774 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx index 6f4ca606ea1b..846b0e8d95d6 100644 --- a/sfx2/source/control/thumbnailview.cxx +++ b/sfx2/source/control/thumbnailview.cxx @@ -406,6 +406,7 @@ void ThumbnailView::CalculateItemPositions (bool bScrollBarUsed) nPageSize = 1; mpScrBar->SetPageSize( nPageSize ); mpScrBar->Show( mbScroll ); +mpScrBar->Enable( mbScroll ); } // delete ScrollBar ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/control/thumbnailview.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 10dba26804cc0c14f74069c26112e75dacf3865b Author: Roman Kuznetsov AuthorDate: Sat Apr 25 11:51:33 2020 +0100 Commit: Roman Kuznetsov CommitDate: Sat Apr 25 14:08:07 2020 +0200 tdf#91818 disable scrollbar in Start Center when it isn't needed Change-Id: Ib3b7be6dd93a7f1c75f01ffe53ff7f7c19b14342 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92773 Tested-by: Mike Kaganski Reviewed-by: Mike Kaganski Reviewed-by: Roman Kuznetsov diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx index f3488e417f84..61a7d8f0ba35 100644 --- a/sfx2/source/control/thumbnailview.cxx +++ b/sfx2/source/control/thumbnailview.cxx @@ -396,6 +396,7 @@ void ThumbnailView::CalculateItemPositions (bool bScrollBarUsed) nPageSize = 1; mpScrBar->SetPageSize( nPageSize ); mpScrBar->Show( mbScroll ); +mpScrBar->Enable( mbScroll ); } // delete ScrollBar ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - instsetoo_native/inc_openoffice
instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit a691ca9fe5d31146424cc82d5828dbb803a3b1da Author: Roman Kuznetsov AuthorDate: Mon Mar 16 08:58:08 2020 +0100 Commit: Adolfo Jayme Barrientos CommitDate: Tue Mar 17 16:57:58 2020 +0100 tdf#128281 Increase a checkbox height in Windows installer Change-Id: Ic0bc2af1dd565dc9c24a74de8900da771f052a95 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90402 Tested-by: Jenkins Reviewed-by: Mike Kaganski (cherry picked from commit e6d008f131c7ca532a9e8410b424b3323d581978) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90404 Reviewed-by: Adolfo Jayme Barrientos diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt index 41708a651b5a..a573077997f6 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt @@ -214,8 +214,8 @@ ReadyToInstall DlgTitleText13 6 380 25 65538 OOO_CONTROL_170 ReadyToInstall DlgTitle2 Text13 6 380 25 65538 OOO_CONTROL_171 ReadyToInstall DlgTitle3 Text13 6 380 25 65538 OOO_CONTROL_172 ReadyToInstall InstallNow PushButton 330 243 66 17 3 OOO_CONTROL_173 Cancel -ReadyToInstall DesktopLink CheckBox21 100 300 10 3 CREATEDESKTOPLINK OOO_CONTROL_319 EnableQuickstart -ReadyToInstall EnableQuickstartCheckBox21 125 300 15 3 QUICKSTART OOO_CONTROL_321 Back +ReadyToInstall DesktopLink CheckBox21 100 300 15 3 CREATEDESKTOPLINK OOO_CONTROL_319 EnableQuickstart +ReadyToInstall EnableQuickstartCheckBox21 130 300 15 3 QUICKSTART OOO_CONTROL_321 Back ReadyToRemove BackPushButton 264 243 66 17 3 OOO_CONTROL_174 RemoveNow ReadyToRemove Banner Bitmap 0 0 474 44 1 BannerBmp ReadyToRemove BannerLine Line0 44 474 0 1 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: instsetoo_native/inc_openoffice
instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit e6d008f131c7ca532a9e8410b424b3323d581978 Author: Roman Kuznetsov AuthorDate: Mon Mar 16 08:58:08 2020 +0100 Commit: Mike Kaganski CommitDate: Mon Mar 16 15:36:13 2020 +0100 tdf#128281 Increase a checkbox height in Windows installer Change-Id: Ic0bc2af1dd565dc9c24a74de8900da771f052a95 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90402 Tested-by: Jenkins Reviewed-by: Mike Kaganski diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt index 41708a651b5a..a573077997f6 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt @@ -214,8 +214,8 @@ ReadyToInstall DlgTitleText13 6 380 25 65538 OOO_CONTROL_170 ReadyToInstall DlgTitle2 Text13 6 380 25 65538 OOO_CONTROL_171 ReadyToInstall DlgTitle3 Text13 6 380 25 65538 OOO_CONTROL_172 ReadyToInstall InstallNow PushButton 330 243 66 17 3 OOO_CONTROL_173 Cancel -ReadyToInstall DesktopLink CheckBox21 100 300 10 3 CREATEDESKTOPLINK OOO_CONTROL_319 EnableQuickstart -ReadyToInstall EnableQuickstartCheckBox21 125 300 15 3 QUICKSTART OOO_CONTROL_321 Back +ReadyToInstall DesktopLink CheckBox21 100 300 15 3 CREATEDESKTOPLINK OOO_CONTROL_319 EnableQuickstart +ReadyToInstall EnableQuickstartCheckBox21 130 300 15 3 QUICKSTART OOO_CONTROL_321 Back ReadyToRemove BackPushButton 264 243 66 17 3 OOO_CONTROL_174 RemoveNow ReadyToRemove Banner Bitmap 0 0 474 44 1 BannerBmp ReadyToRemove BannerLine Line0 44 474 0 1 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/01/05340300.xhp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ffa172bf7f370d7450cca3d45c9f8138a7d3c139 Author: Roman Kuznetsov AuthorDate: Tue Feb 18 18:31:22 2020 +0100 Commit: Olivier Hallot CommitDate: Tue Feb 18 22:08:58 2020 +0100 tdf#130402 Wrong explanation to the "Text Orientation" in Calc Help Change-Id: Iee3e9401494608ce79bf6ef82915bef3703d9eac Reviewed-on: https://gerrit.libreoffice.org/c/help/+/88949 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/01/05340300.xhp b/source/text/shared/01/05340300.xhp index b032153e8..eb707ad09 100644 --- a/source/text/shared/01/05340300.xhp +++ b/source/text/shared/01/05340300.xhp @@ -111,7 +111,7 @@ Click in the dial to set the text orientation. Degrees -Enter the rotation angle for the text in the selected cell(s). A positive number rotates the text to the left and a negative number rotates the text to the right. +Enter the rotation angle from 0 to 360 for the text in the selected cell(s). Reference edge Specify the cell edge from which to write the rotated text. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9dd6dc03289090062fc5b8b364a98dbcc75941a0 Author: Roman Kuznetsov AuthorDate: Tue Feb 18 22:08:58 2020 +0100 Commit: Gerrit Code Review CommitDate: Tue Feb 18 22:08:58 2020 +0100 Update git submodules * Update helpcontent2 from branch 'master' to ffa172bf7f370d7450cca3d45c9f8138a7d3c139 - tdf#130402 Wrong explanation to the "Text Orientation" in Calc Help Change-Id: Iee3e9401494608ce79bf6ef82915bef3703d9eac Reviewed-on: https://gerrit.libreoffice.org/c/help/+/88949 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 105ffa961374..ffa172bf7f37 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 105ffa961374ac3dfc7c2bde23f6c677b9a7f2f5 +Subproject commit ffa172bf7f370d7450cca3d45c9f8138a7d3c139 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: officecfg/registry
officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu |3 +++ 1 file changed, 3 insertions(+) New commits: commit d1fe30e489dd398d3f8ededc5c393bba27063f74 Author: Roman Kuznetsov AuthorDate: Fri Feb 7 23:21:25 2020 +0100 Commit: Heiko Tietze CommitDate: Tue Feb 18 10:09:37 2020 +0100 tdf#130519 Add "More options" button to Lists section on Impress Sidebar Change-Id: I839cfe98e7d7ce8656f07977fe1ee4824d7f27ec Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88255 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu index 80bef5d9..42154bd6f9c1 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu @@ -1104,6 +1104,9 @@ PropertyDeck + + .uno:OutlineBullet + DrawImpress,DrawText, visible ; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - filter/uiconfig
filter/uiconfig/ui/pdfgeneralpage.ui |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a86fcb4461cc0e3d309f439247f3efea4c057155 Author: Roman Kuznetsov AuthorDate: Sat Jan 11 08:45:00 2020 +0100 Commit: Heiko Tietze CommitDate: Mon Jan 20 07:02:41 2020 +0100 tdf#129417 Rename "Full-sheet previews" to "Whole sheet export" in PDF option dialog Change-Id: Ib772599a68366be29f208e27f830b79015dbdc13 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86593 Tested-by: Jenkins Reviewed-by: Roman Kuznetsov (cherry picked from commit b711f56b612c408560d2743bca0f01a9109f416f) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87036 Reviewed-by: Heiko Tietze diff --git a/filter/uiconfig/ui/pdfgeneralpage.ui b/filter/uiconfig/ui/pdfgeneralpage.ui index 3d59a633b027..62d9466d6fe2 100644 --- a/filter/uiconfig/ui/pdfgeneralpage.ui +++ b/filter/uiconfig/ui/pdfgeneralpage.ui @@ -798,7 +798,7 @@ -Full-sheet previews +Whole sheet export True True False ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: framework/source
framework/source/uielement/toolbarmodemenucontroller.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit aaad28f8873e8ffa92f4e1340707f45b2737f20e Author: Roman Kuznetsov AuthorDate: Sat Jan 11 20:03:15 2020 +0100 Commit: Roman Kuznetsov CommitDate: Wed Jan 15 07:28:00 2020 +0100 tdf#125089 Fix shoowing a separator in View-User interfaces submenus for non EN GUI Change-Id: I8761560e48f781ed516494984fc5a86c72019ad0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86619 Reviewed-by: Mike Kaganski Tested-by: Mike Kaganski Reviewed-by: Roman Kuznetsov diff --git a/framework/source/uielement/toolbarmodemenucontroller.cxx b/framework/source/uielement/toolbarmodemenucontroller.cxx index 218f50c7e7a3..15596a091335 100644 --- a/framework/source/uielement/toolbarmodemenucontroller.cxx +++ b/framework/source/uielement/toolbarmodemenucontroller.cxx @@ -130,11 +130,12 @@ void ToolbarModeMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu > OUString aCommandArg = comphelper::getString( aModeNode.getNodeValue( "CommandArg" ) ); long nPosition = comphelper::getINT32( aModeNode.getNodeValue( "MenuPosition" ) ); bool isExperimental = comphelper::getBOOL( aModeNode.getNodeValue( "IsExperimental" ) ); +bool hasNotebookbar = comphelper::getBOOL( aModeNode.getNodeValue( "HasNotebookbar" ) ); // Allow Notebookbar only in experimental mode if ( isExperimental && !aMiscOptions.IsExperimentalMode() ) continue; -if(aLabel == "Sidebar" || aLabel == "Standard Toolbar" || aLabel == "Single Toolbar") +if (!hasNotebookbar) nCountToolbar++; m_xPopupMenu->insertItem( nReadIndex+1, aLabel, css::awt::MenuItemStyle::RADIOCHECK, nPosition ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/uiconfig
filter/uiconfig/ui/pdfgeneralpage.ui |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b711f56b612c408560d2743bca0f01a9109f416f Author: Roman Kuznetsov AuthorDate: Sat Jan 11 08:45:00 2020 +0100 Commit: Roman Kuznetsov CommitDate: Sat Jan 11 11:16:13 2020 +0100 tdf#129417 Rename "Full-sheet previews" to "Whole sheet export" in PDF option dialog Change-Id: Ib772599a68366be29f208e27f830b79015dbdc13 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86593 Tested-by: Jenkins Reviewed-by: Roman Kuznetsov diff --git a/filter/uiconfig/ui/pdfgeneralpage.ui b/filter/uiconfig/ui/pdfgeneralpage.ui index c009541fea56..c366f438a3c7 100644 --- a/filter/uiconfig/ui/pdfgeneralpage.ui +++ b/filter/uiconfig/ui/pdfgeneralpage.ui @@ -814,7 +814,7 @@ -Full-sheet previews +Whole sheet export True True False ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: framework/source
framework/source/uielement/toolbarsmenucontroller.cxx |4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) New commits: commit ba4bbfadd79e0765db01bb70bfd97fa0a959ce24 Author: Roman Kuznetsov AuthorDate: Tue Jan 7 16:00:59 2020 +0100 Commit: Heiko Tietze CommitDate: Thu Jan 9 16:15:36 2020 +0100 tdf#129600 Delete "Formula bar" item from View-Toolbars Change-Id: Iec6c6c998a12aafdbf63bc1e5083cf577aefb437 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86354 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx index e34e4d4eb8c7..688af422d1ef 100644 --- a/framework/source/uielement/toolbarsmenucontroller.cxx +++ b/framework/source/uielement/toolbarsmenucontroller.cxx @@ -416,9 +416,7 @@ void ToolbarsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu > co } // Create commands for non-toolbars -if ( m_aModuleIdentifier == "com.sun.star.sheet.SpreadsheetDocument" ) - addCommand( m_xPopupMenu, ".uno:InputLineVisible", "" ); - + bool bAddCommand( true ); SvtCommandOptions aCmdOptions; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/uiconfig
sd/uiconfig/sdraw/toolbar/redactionbar.xml |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit c266e4c89e0db70818878e56d4df7de18cb7f79c Author: Roman Kuznetsov AuthorDate: Tue Dec 24 11:03:30 2019 +0100 Commit: Roman Kuznetsov CommitDate: Wed Dec 25 20:23:57 2019 +0100 tdf#125830 Change redaction toolbar to more simple Change-Id: I8d55b5abdc0168fdce3af3e9df1b5db95e82aab9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85777 Tested-by: Jenkins Reviewed-by: Roman Kuznetsov diff --git a/sd/uiconfig/sdraw/toolbar/redactionbar.xml b/sd/uiconfig/sdraw/toolbar/redactionbar.xml index 062288a66c70..55cc492fdeee 100644 --- a/sd/uiconfig/sdraw/toolbar/redactionbar.xml +++ b/sd/uiconfig/sdraw/toolbar/redactionbar.xml @@ -21,6 +21,7 @@ - + + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - officecfg/registry
officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu |3 +++ 1 file changed, 3 insertions(+) New commits: commit 868f3b157e2982887c3efeb4de850560a43755c5 Author: Roman Kuznetsov AuthorDate: Wed Dec 11 19:07:39 2019 +0100 Commit: Roman Kuznetsov CommitDate: Fri Dec 20 08:43:49 2019 +0100 tdf#128683 Add More Options button to Table section in Writer's Sidebar Change-Id: I057f7853fafcf8aa33611adae969b12fda6405b7 Reviewed-on: https://gerrit.libreoffice.org/84972 Tested-by: Jenkins Reviewed-by: Mike Kaganski Reviewed-by: Roman Kuznetsov (cherry picked from commit 82dce922e6d36b40dd0571b0c00666cd6fc1a8ac) Reviewed-on: https://gerrit.libreoffice.org/85530 diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu index c1fab7539039..dd777b7b228e 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu @@ -1561,6 +1561,9 @@ PropertyDeck + + .uno:TableDialog + WriterVariants, Table, visible ; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: officecfg/registry
officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu |3 +++ 1 file changed, 3 insertions(+) New commits: commit 82dce922e6d36b40dd0571b0c00666cd6fc1a8ac Author: Roman Kuznetsov AuthorDate: Wed Dec 11 19:07:39 2019 +0100 Commit: Roman Kuznetsov CommitDate: Wed Dec 18 11:03:34 2019 +0100 tdf#128683 Add More Options button to Table section in Writer's Sidebar Change-Id: I057f7853fafcf8aa33611adae969b12fda6405b7 Reviewed-on: https://gerrit.libreoffice.org/84972 Tested-by: Jenkins Reviewed-by: Mike Kaganski Reviewed-by: Roman Kuznetsov diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu index b2d473c42920..80bef5d9 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu @@ -1561,6 +1561,9 @@ PropertyDeck + + .uno:TableDialog + WriterVariants, Table, visible ; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sw/uiconfig
sw/uiconfig/swriter/ui/sidebartableedit.ui | 720 + 1 file changed, 444 insertions(+), 276 deletions(-) New commits: commit aa86a2e30de9e9433dcc41c09023a07945affaf9 Author: Roman Kuznetsov AuthorDate: Mon Dec 9 18:20:00 2019 +0100 Commit: Roman Kuznetsov CommitDate: Fri Dec 13 08:38:14 2019 +0100 tdf#128683 Add more tools to Table section in Writer's Sidebar Change-Id: I505cbf0a7324cc82d0fcb1ac76a7f2a23b8a0b0c Reviewed-on: https://gerrit.libreoffice.org/84783 Tested-by: Jenkins Reviewed-by: Roman Kuznetsov (cherry picked from commit d068c68640f32d4a94da4df197441ee09a702b75) Reviewed-on: https://gerrit.libreoffice.org/84966 diff --git a/sw/uiconfig/swriter/ui/sidebartableedit.ui b/sw/uiconfig/swriter/ui/sidebartableedit.ui index 6f9c477bffd6..d2e1d5418342 100644 --- a/sw/uiconfig/swriter/ui/sidebartableedit.ui +++ b/sw/uiconfig/swriter/ui/sidebartableedit.ui @@ -1,5 +1,5 @@ - + @@ -12,370 +12,538 @@ False 6 vertical -6 +6 +3 True - + +True +True +True +Row Height +start +True +0 + + +Row Height + + + + +1 +5 + + + + +True +False +start +Insert: + + +0 +0 + + + + True False -20 - + +True +False +.uno:InsertRowsBefore +True + + +False +True + + + + True False - - -True -False -.uno:InsertRowsBefore -True - - -False -True - - - - -True -False -.uno:InsertRowsAfter -True - - -False -True - - - - -True -False -.uno:InsertColumnsBefore -True - - -False -True - - - - -True -False -.uno:InsertColumnsAfter -True - - -False -True - - +.uno:InsertRowsAfter +True False -True -0 +True - + True False - - -True -False -.uno:DeleteRows -True - - -False -True - - - - -True -False -.uno:DeleteColumns -True - - -False -True - - - - -True -False -.uno:DeleteTable -True - - -False -True - - +.uno:InsertColumnsBefore +True False -True -1 +True - + True False - - -True -False -.uno:MergeCells -True - - -False -True - - +.uno:InsertColumnsAfter +True
[Libreoffice-commits] core.git: sw/uiconfig
sw/uiconfig/swriter/ui/sidebartableedit.ui | 720 + 1 file changed, 444 insertions(+), 276 deletions(-) New commits: commit d068c68640f32d4a94da4df197441ee09a702b75 Author: Roman Kuznetsov AuthorDate: Mon Dec 9 18:20:00 2019 +0100 Commit: Roman Kuznetsov CommitDate: Wed Dec 11 17:18:32 2019 +0100 tdf#128683 Add more tools to Table section in Writer's Sidebar Change-Id: I505cbf0a7324cc82d0fcb1ac76a7f2a23b8a0b0c Reviewed-on: https://gerrit.libreoffice.org/84783 Tested-by: Jenkins Reviewed-by: Roman Kuznetsov diff --git a/sw/uiconfig/swriter/ui/sidebartableedit.ui b/sw/uiconfig/swriter/ui/sidebartableedit.ui index 6f9c477bffd6..d2e1d5418342 100644 --- a/sw/uiconfig/swriter/ui/sidebartableedit.ui +++ b/sw/uiconfig/swriter/ui/sidebartableedit.ui @@ -1,5 +1,5 @@ - + @@ -12,370 +12,538 @@ False 6 vertical -6 +6 +3 True - + +True +True +True +Row Height +start +True +0 + + +Row Height + + + + +1 +5 + + + + +True +False +start +Insert: + + +0 +0 + + + + True False -20 - + +True +False +.uno:InsertRowsBefore +True + + +False +True + + + + True False - - -True -False -.uno:InsertRowsBefore -True - - -False -True - - - - -True -False -.uno:InsertRowsAfter -True - - -False -True - - - - -True -False -.uno:InsertColumnsBefore -True - - -False -True - - - - -True -False -.uno:InsertColumnsAfter -True - - -False -True - - +.uno:InsertRowsAfter +True False -True -0 +True - + True False - - -True -False -.uno:DeleteRows -True - - -False -True - - - - -True -False -.uno:DeleteColumns -True - - -False -True - - - - -True -False -.uno:DeleteTable -True - - -False -True - - +.uno:InsertColumnsBefore +True False -True -1 +True - + True False - - -True -False -.uno:MergeCells -True - - -False -True - - +.uno:InsertColumnsAfter +True False -True -3 +True
[Libreoffice-commits] core.git: instsetoo_native/inc_ooohelppack instsetoo_native/inc_openoffice
instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt |8 +--- instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf |5 + 2 files changed, 10 insertions(+), 3 deletions(-) New commits: commit 128dabf58a535d422eb27f8dc760c81e54c6b354 Author: Roman Kuznetsov AuthorDate: Thu Dec 5 22:00:46 2019 +0200 Commit: Heiko Tietze CommitDate: Wed Dec 11 15:51:37 2019 +0100 tdf#128991 Make clear in the help installer that it must be installed into the same directory as LibreOffice and some visual fix in layout Change-Id: I8048c332bf381137689bfa1695862cf7d118f0a8 Reviewed-on: https://gerrit.libreoffice.org/84582 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt index 1e956b19574c..47b12d84a87f 100644 --- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt +++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt @@ -90,12 +90,14 @@ DestinationFolder Banner Bitmap 0 0 474 44 1 BannerBmp DestinationFolder BannerLine Line0 44 474 0 1 DestinationFolder Cancel PushButton 401 243 66 17 3 OOO_CONTROL_87 ChangeFolder DestinationFolder ChangeFolderPushButton 401 125 66 17 3 OOO_CONTROL_88 Back -DestinationFolder DestFolder Icon21 112 24 24 5242881 OpenFolderIco +DestinationFolder DestFolder Icon21 122 24 24 5242881 OpenFolderIco DestinationFolder DlgDesc Text21 23 372 25 65539 OOO_CONTROL_304 DestinationFolder DlgLine Line114 234 360 0 1 -DestinationFolder DlgTitleText13 6 380 25 65539 {}[ProductName] +DestinationFolder DlgTitleText13 6 380 25 65539 {}[ProductName] +DestinationFolder Attention Text57 60 340 15 3 OOO_CONTROL_327 +DestinationFolder AttText Text57 75 340 40 3 OOO_CONTROL_328 DestinationFolder LocationText57 128 340 40 3 _BrowseProperty [INSTALLLOCATION] -DestinationFolder LocLabelText57 115 390 10 3 OOO_CONTROL_92 +DestinationFolder LocLabelText57 106 390 12 3 OOO_CONTROL_92 DestinationFolder NextPushButton 330 243 66 17 3 OOO_CONTROL_93 Cancel DestinationFolder LabelStartInstall Text21 52 390 30 2 OOO_CONTROL_300 DestinationFolder LabelInvalidDir Text21 52 390 30 2 OOO_CONTROL_301 diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf index f870136beb02..6c12870e861d 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf +++ b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf @@ -700,3 +700,8 @@ en-US = "Cancel" [OOO_CONTROL_326] en-US = "OK" +[OOO_CONTROL_327] +en-US = "{}Attention!" + +[OOO_CONTROL_328] +en-US = "LibreOffice help must be installed into the installation directory of LibreOffice program." ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - include/sfx2
include/sfx2/strings.hrc |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c5ba4b47726e2436ab29b7d0039bd75a29b3f532 Author: Roman Kuznetsov AuthorDate: Thu Dec 5 08:30:45 2019 +0200 Commit: Xisco Faulí CommitDate: Wed Dec 11 09:58:33 2019 +0100 tdf#128785 Make an attention message more general Reviewed-on: https://gerrit.libreoffice.org/84501 Tested-by: Jenkins Reviewed-by: Roman Kuznetsov (cherry picked from commit fce747852adcc2c20a48e525da872fd3cad3ef04) Change-Id: Ia20e88bbcdcba78283279c08fbd714955e359dd9 Reviewed-on: https://gerrit.libreoffice.org/84665 Tested-by: Jenkins Reviewed-by: Xisco Faulí diff --git a/include/sfx2/strings.hrc b/include/sfx2/strings.hrc index 52d24f048671..65660b712e56 100644 --- a/include/sfx2/strings.hrc +++ b/include/sfx2/strings.hrc @@ -231,7 +231,7 @@ #define STR_TABPAGE_INVALIDSTYLE NC_("STR_TABPAGE_INVALIDSTYLE", "This Style does not exist.") #define STR_TABPAGE_INVALIDPARENT NC_("STR_TABPAGE_INVALIDPARENT", "This Style cannot be used as a base Style,\nbecause it would result in a recursive reference.") #define STR_POOL_STYLE_NAME NC_("STR_POOL_STYLE_NAME", "Name already exists as a default Style.\nPlease choose another name.") -#define STR_DELETE_STYLE_USED NC_("STR_DELETE_STYLE_USED", "One or more of the selected styles is in use in this document.\nIf you delete these styles, text will revert to the parent style.\nDo you still wish to delete these styles?\n") +#define STR_DELETE_STYLE_USED NC_("STR_DELETE_STYLE_USED", "One or more of the selected styles is in use in this document.\nIf you will delete it, text or objects using these styles will revert to the parent style.\nDo you still wish to delete these styles?\n") #define STR_DELETE_STYLENC_("STR_DELETE_STYLE", "Styles in use: ") #define STR_SID_NAVIGATOR NC_("STR_SID_NAVIGATOR", "Navigator") #define STR_ERROR_WRONG_CONFIRM NC_("STR_ERROR_WRONG_CONFIRM", "Faulty password confirmation") ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/sfx2
include/sfx2/strings.hrc |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7515df5ab28f749168257f82e3bb50cb9187008d Author: Roman Kuznetsov AuthorDate: Sun Dec 8 20:52:54 2019 +0100 Commit: Roman Kuznetsov CommitDate: Sun Dec 8 23:02:03 2019 +0100 tdf#128785 Make an attention message more general v.2 Change-Id: Ia7b69d10fa547f4381086b6e88522abbfa04f3a5 Reviewed-on: https://gerrit.libreoffice.org/84721 Tested-by: Jenkins Reviewed-by: Roman Kuznetsov diff --git a/include/sfx2/strings.hrc b/include/sfx2/strings.hrc index 66481ac6e2bd..65660b712e56 100644 --- a/include/sfx2/strings.hrc +++ b/include/sfx2/strings.hrc @@ -231,7 +231,7 @@ #define STR_TABPAGE_INVALIDSTYLE NC_("STR_TABPAGE_INVALIDSTYLE", "This Style does not exist.") #define STR_TABPAGE_INVALIDPARENT NC_("STR_TABPAGE_INVALIDPARENT", "This Style cannot be used as a base Style,\nbecause it would result in a recursive reference.") #define STR_POOL_STYLE_NAME NC_("STR_POOL_STYLE_NAME", "Name already exists as a default Style.\nPlease choose another name.") -#define STR_DELETE_STYLE_USED NC_("STR_DELETE_STYLE_USED", "One or more of the selected styles is in use in this document.\nIf you'll delete it, text or objects using these styles will revert to the parent style.\nDo you still wish to delete these styles?\n") +#define STR_DELETE_STYLE_USED NC_("STR_DELETE_STYLE_USED", "One or more of the selected styles is in use in this document.\nIf you will delete it, text or objects using these styles will revert to the parent style.\nDo you still wish to delete these styles?\n") #define STR_DELETE_STYLENC_("STR_DELETE_STYLE", "Styles in use: ") #define STR_SID_NAVIGATOR NC_("STR_SID_NAVIGATOR", "Navigator") #define STR_ERROR_WRONG_CONFIRM NC_("STR_ERROR_WRONG_CONFIRM", "Faulty password confirmation") ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/sfx2
include/sfx2/strings.hrc |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit fce747852adcc2c20a48e525da872fd3cad3ef04 Author: Roman Kuznetsov AuthorDate: Thu Dec 5 08:30:45 2019 +0200 Commit: Roman Kuznetsov CommitDate: Fri Dec 6 19:57:19 2019 +0100 tdf#128785 Make an attention message more general Change-Id: Ia20e88bbcdcba78283279c08fbd714955e359dd9 Reviewed-on: https://gerrit.libreoffice.org/84501 Tested-by: Jenkins Reviewed-by: Roman Kuznetsov diff --git a/include/sfx2/strings.hrc b/include/sfx2/strings.hrc index 52d24f048671..66481ac6e2bd 100644 --- a/include/sfx2/strings.hrc +++ b/include/sfx2/strings.hrc @@ -231,7 +231,7 @@ #define STR_TABPAGE_INVALIDSTYLE NC_("STR_TABPAGE_INVALIDSTYLE", "This Style does not exist.") #define STR_TABPAGE_INVALIDPARENT NC_("STR_TABPAGE_INVALIDPARENT", "This Style cannot be used as a base Style,\nbecause it would result in a recursive reference.") #define STR_POOL_STYLE_NAME NC_("STR_POOL_STYLE_NAME", "Name already exists as a default Style.\nPlease choose another name.") -#define STR_DELETE_STYLE_USED NC_("STR_DELETE_STYLE_USED", "One or more of the selected styles is in use in this document.\nIf you delete these styles, text will revert to the parent style.\nDo you still wish to delete these styles?\n") +#define STR_DELETE_STYLE_USED NC_("STR_DELETE_STYLE_USED", "One or more of the selected styles is in use in this document.\nIf you'll delete it, text or objects using these styles will revert to the parent style.\nDo you still wish to delete these styles?\n") #define STR_DELETE_STYLENC_("STR_DELETE_STYLE", "Styles in use: ") #define STR_SID_NAVIGATOR NC_("STR_SID_NAVIGATOR", "Navigator") #define STR_ERROR_WRONG_CONFIRM NC_("STR_ERROR_WRONG_CONFIRM", "Faulty password confirmation") ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sd/uiconfig
sd/uiconfig/simpress/popupmenu/pagepane.xml | 11 +-- 1 file changed, 5 insertions(+), 6 deletions(-) New commits: commit ff49f69825c066b0416f088af6e1f42b5f8f0a48 Author: Roman Kuznetsov AuthorDate: Mon Nov 25 07:59:33 2019 +0200 Commit: Roman Kuznetsov CommitDate: Tue Nov 26 07:42:29 2019 +0100 tdf#128757 Move pane context menu's items Change-Id: If7ab3e87d3ec8550ba7c25781915e7fa364a5f05 Reviewed-on: https://gerrit.libreoffice.org/83638 Tested-by: Jenkins Reviewed-by: Roman Kuznetsov (cherry picked from commit e9a60f3d9ba7c6164851264e7171b90238f7948c) Reviewed-on: https://gerrit.libreoffice.org/83723 diff --git a/sd/uiconfig/simpress/popupmenu/pagepane.xml b/sd/uiconfig/simpress/popupmenu/pagepane.xml index f790b402..1854282250c8 100644 --- a/sd/uiconfig/simpress/popupmenu/pagepane.xml +++ b/sd/uiconfig/simpress/popupmenu/pagepane.xml @@ -14,6 +14,9 @@ + + + @@ -38,12 +41,6 @@ - - - - - - @@ -59,5 +56,7 @@ + + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/uiconfig
sd/uiconfig/simpress/popupmenu/pagepane.xml | 11 +-- 1 file changed, 5 insertions(+), 6 deletions(-) New commits: commit e9a60f3d9ba7c6164851264e7171b90238f7948c Author: Roman Kuznetsov AuthorDate: Mon Nov 25 07:59:33 2019 +0200 Commit: Roman Kuznetsov CommitDate: Tue Nov 26 06:56:19 2019 +0100 tdf#128757 Move pane context menu's items Change-Id: If7ab3e87d3ec8550ba7c25781915e7fa364a5f05 Reviewed-on: https://gerrit.libreoffice.org/83638 Tested-by: Jenkins Reviewed-by: Roman Kuznetsov diff --git a/sd/uiconfig/simpress/popupmenu/pagepane.xml b/sd/uiconfig/simpress/popupmenu/pagepane.xml index f790b402..1854282250c8 100644 --- a/sd/uiconfig/simpress/popupmenu/pagepane.xml +++ b/sd/uiconfig/simpress/popupmenu/pagepane.xml @@ -14,6 +14,9 @@ + + + @@ -38,12 +41,6 @@ - - - - - - @@ -59,5 +56,7 @@ + + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: instsetoo_native/inc_ooohelppack
instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt | 580 +- instsetoo_native/inc_ooohelppack/windows/msi_templates/Dialog.idt | 58 - instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt |2 instsetoo_native/inc_ooohelppack/windows/msi_templates/TextStyl.idt | 25 4 files changed, 323 insertions(+), 342 deletions(-) New commits: commit a1b2f83e680a0ea957eb040d8291d4b1b33debcf Author: Roman Kuznetsov AuthorDate: Mon Aug 19 21:37:38 2019 +0200 Commit: Mike Kaganski CommitDate: Sat Sep 21 14:00:47 2019 +0200 tdf#126944 - Update help installer fonts to Segoe UI 9 pt Change-Id: I7c508ce7536d1c0d922be5069c059a7302d740b1 Reviewed-on: https://gerrit.libreoffice.org/77756 Tested-by: Jenkins Reviewed-by: Mike Kaganski diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt index 24c02f85f7b8..1e956b19574c 100644 --- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt +++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt @@ -1,319 +1,319 @@ Dialog_Control TypeX Y Width Height Attributes PropertyTextControl_NextHelp s72s50 s20 i2 i2 i2 i2 I4 S50 L0 S50 L50 65001 Control Dialog_ Control -AdminChangeFolder Banner Bitmap 0 0 374 44 1 BannerBmp -AdminChangeFolder BannerLine Line0 44 374 0 1 -AdminChangeFolder Cancel PushButton 301 243 66 17 3 OOO_CONTROL_3 ComboText -AdminChangeFolder Combo DirectoryCombo 21 64 277 80 458755 TARGETDIR Up -AdminChangeFolder ComboText Text21 50 99 14 3 OOO_CONTROL_5 Combo -AdminChangeFolder DlgDesc Text21 23 272 25 65539 OOO_CONTROL_6 -AdminChangeFolder DlgLine Line0 234 374 0 1 -AdminChangeFolder DlgTitleText13 6 280 25 65539 OOO_CONTROL_7 -AdminChangeFolder ListDirectoryList 21 90 332 97 7 TARGETDIR TailText -AdminChangeFolder NewFolder PushButton 335 66 19 19 3670019 NewFolderIcoListOOO_CONTROL_9 -AdminChangeFolder OK PushButton 230 243 66 17 3 OOO_CONTROL_10 Cancel -AdminChangeFolder TailPathEdit21 207 332 17 3 TARGETDIR OK -AdminChangeFolder TailTextText21 193 99 13 3 OOO_CONTROL_12 Tail -AdminChangeFolder Up PushButton 310 66 19 19 3670019 UpIco NewFolder OOO_CONTROL_13 -AdminNetworkLocation BackPushButton 164 243 66 17 3 OOO_CONTROL_14 InstallNow -AdminNetworkLocation Banner Bitmap 0 0 374 44 1 BannerBmp -AdminNetworkLocation BannerLine Line0 44 374 0 1 -AdminNetworkLocation Browse PushButton 286 124 66 17 3 OOO_CONTROL_17 Back -AdminNetworkLocation Cancel PushButton 301 243 66 17 3 OOO_CONTROL_18 LBBrowse -AdminNetworkLocation DlgDesc Text21 23 272 25 65539 OOO_CONTROL_19 -AdminNetworkLocation DlgLine Line0 234 374 0 1 -AdminNetworkLocation DlgText Text21 51 326 40 3 OOO_CONTROL_20 -AdminNetworkLocation DlgTitleText13 6 280 25 65539 OOO_CONTROL_21 -AdminNetworkLocation InstallNow PushButton 230 243 66 17 3 OOO_CONTROL_22 Cancel -AdminNetworkLocation LBBrowseText21 90 100 10 3 OOO_CONTROL_23 SetupPathEdit -AdminNetworkLocation SetupPathEdit PathEdit21 102 330 17 3 TARGETDIR Browse -AdminWelcome BackPushButton 164 243 66 17 1 OOO_CONTROL_24 Next -AdminWelcome Cancel PushButton 301 243 66 17 3 OOO_CONTROL_25 Back -AdminWelcome DlgLine Line0 234 326 0 1 +AdminChangeFolder Banner Bitmap 0 0 474 44 1
[Libreoffice-commits] core.git: sc/uiconfig sd/uiconfig sw/uiconfig
sc/uiconfig/scalc/menubar/menubar.xml|2 +- sd/uiconfig/sdraw/menubar/menubar.xml|2 +- sd/uiconfig/simpress/menubar/menubar.xml |2 +- sw/uiconfig/swriter/menubar/menubar.xml |2 +- sw/uiconfig/swxform/menubar/menubar.xml |2 +- 5 files changed, 5 insertions(+), 5 deletions(-) New commits: commit 81b91d9eb70c117884d6ad16067bc151b373096c Author: Roman Kuznetsov AuthorDate: Tue Sep 3 08:38:46 2019 +0200 Commit: Roman Kuznetsov CommitDate: Tue Sep 3 19:31:15 2019 +0200 tdf#127277 Move Insert->QR code menu item to Insert->Object->QR code Change-Id: I3c0a1d53768e9235aa34f6c6b3367d03f19d Reviewed-on: https://gerrit.libreoffice.org/78535 Tested-by: Jenkins Reviewed-by: Roman Kuznetsov diff --git a/sc/uiconfig/scalc/menubar/menubar.xml b/sc/uiconfig/scalc/menubar/menubar.xml index 163c734ec9a8..35fb4a20075f 100644 --- a/sc/uiconfig/scalc/menubar/menubar.xml +++ b/sc/uiconfig/scalc/menubar/menubar.xml @@ -218,6 +218,7 @@ + @@ -311,7 +312,6 @@ - diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml b/sd/uiconfig/sdraw/menubar/menubar.xml index 9f2686f325b7..6c0388a043c3 100644 --- a/sd/uiconfig/sdraw/menubar/menubar.xml +++ b/sd/uiconfig/sdraw/menubar/menubar.xml @@ -200,6 +200,7 @@ + @@ -211,7 +212,6 @@ - diff --git a/sd/uiconfig/simpress/menubar/menubar.xml b/sd/uiconfig/simpress/menubar/menubar.xml index 8af3e5e57c5b..cbe0950d5291 100644 --- a/sd/uiconfig/simpress/menubar/menubar.xml +++ b/sd/uiconfig/simpress/menubar/menubar.xml @@ -211,6 +211,7 @@ + @@ -243,7 +244,6 @@ - diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml index 27313ad0ae63..e42212a15229 100644 --- a/sw/uiconfig/swriter/menubar/menubar.xml +++ b/sw/uiconfig/swriter/menubar/menubar.xml @@ -263,6 +263,7 @@ + @@ -350,7 +351,6 @@ - diff --git a/sw/uiconfig/swxform/menubar/menubar.xml b/sw/uiconfig/swxform/menubar/menubar.xml index 36505b49..d8bf502247e8 100644 --- a/sw/uiconfig/swxform/menubar/menubar.xml +++ b/sw/uiconfig/swxform/menubar/menubar.xml @@ -261,6 +261,7 @@ + @@ -346,7 +347,6 @@ - ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - instsetoo_native/inc_openoffice
instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3ebbaa90cc6fa6e0a6e5a620406ef050a8a55612 Author: Roman Kuznetsov AuthorDate: Sat Aug 31 17:36:49 2019 +0200 Commit: Adolfo Jayme Barrientos CommitDate: Sun Sep 1 09:18:22 2019 +0200 tdf#127240 Increase a height of checkbox's text in win installer Change-Id: I0df5dc4cebb065c509df77b00f16597a28566345 Reviewed-on: https://gerrit.libreoffice.org/78355 Tested-by: Jenkins Reviewed-by: Roman Kuznetsov (cherry picked from commit 5ce360777a9c24db61d9f3c5469bd6265b6b7b5b) Reviewed-on: https://gerrit.libreoffice.org/78361 Reviewed-by: Adolfo Jayme Barrientos diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt index 38115f33f2c4..4dceac6bcb68 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt @@ -215,7 +215,7 @@ ReadyToInstall DlgTitle2 Text13 6 380 25 65538 OOO_CONTROL_171 ReadyToInstall DlgTitle3 Text13 6 380 25 65538 OOO_CONTROL_172 ReadyToInstall InstallNow PushButton 330 243 66 17 3 OOO_CONTROL_173 Cancel ReadyToInstall DesktopLink CheckBox21 100 300 10 3 CREATEDESKTOPLINK OOO_CONTROL_319 EnableQuickstart -ReadyToInstall EnableQuickstartCheckBox21 125 300 10 3 QUICKSTART OOO_CONTROL_321 Back +ReadyToInstall EnableQuickstartCheckBox21 125 300 15 3 QUICKSTART OOO_CONTROL_321 Back ReadyToRemove BackPushButton 264 243 66 17 3 OOO_CONTROL_174 RemoveNow ReadyToRemove Banner Bitmap 0 0 474 44 1 BannerBmp ReadyToRemove BannerLine Line0 44 474 0 1 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: instsetoo_native/inc_openoffice
instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5ce360777a9c24db61d9f3c5469bd6265b6b7b5b Author: Roman Kuznetsov AuthorDate: Sat Aug 31 17:36:49 2019 +0200 Commit: Mike Kaganski CommitDate: Sun Sep 1 08:07:29 2019 +0200 tdf#127240 Increase a height of checkbox's text in win installer Change-Id: I0df5dc4cebb065c509df77b00f16597a28566345 Reviewed-on: https://gerrit.libreoffice.org/78355 Tested-by: Jenkins Reviewed-by: Roman Kuznetsov diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt index ec6170099a48..41708a651b5a 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt @@ -215,7 +215,7 @@ ReadyToInstall DlgTitle2 Text13 6 380 25 65538 OOO_CONTROL_171 ReadyToInstall DlgTitle3 Text13 6 380 25 65538 OOO_CONTROL_172 ReadyToInstall InstallNow PushButton 330 243 66 17 3 OOO_CONTROL_173 Cancel ReadyToInstall DesktopLink CheckBox21 100 300 10 3 CREATEDESKTOPLINK OOO_CONTROL_319 EnableQuickstart -ReadyToInstall EnableQuickstartCheckBox21 125 300 10 3 QUICKSTART OOO_CONTROL_321 Back +ReadyToInstall EnableQuickstartCheckBox21 125 300 15 3 QUICKSTART OOO_CONTROL_321 Back ReadyToRemove BackPushButton 264 243 66 17 3 OOO_CONTROL_174 RemoveNow ReadyToRemove Banner Bitmap 0 0 474 44 1 BannerBmp ReadyToRemove BannerLine Line0 44 474 0 1 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/uiconfig sd/uiconfig sw/uiconfig
sc/uiconfig/scalc/toolbar/formcontrols.xml|1 + sd/uiconfig/sdraw/toolbar/formcontrols.xml|1 + sd/uiconfig/simpress/toolbar/formcontrols.xml |1 + sw/uiconfig/sglobal/toolbar/formcontrols.xml |1 + sw/uiconfig/sweb/toolbar/formcontrols.xml |1 + sw/uiconfig/swform/toolbar/formcontrols.xml |1 + sw/uiconfig/swreport/toolbar/formcontrols.xml |1 + sw/uiconfig/swriter/toolbar/formcontrols.xml |1 + sw/uiconfig/swxform/toolbar/formcontrols.xml |1 + 9 files changed, 9 insertions(+) New commits: commit 43f9c6d7c321b104a0387c844d61d45752ba3a4a Author: Roman Kuznetsov AuthorDate: Tue Aug 6 20:34:43 2019 +0200 Commit: Roman Kuznetsov CommitDate: Thu Aug 8 09:09:38 2019 +0200 tdf#126634 Move uno:Grid back to Form controls toolbar Change-Id: Ic13da0d0295a9ceb30e605dfb634bc86c6390ec9 Reviewed-on: https://gerrit.libreoffice.org/77065 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/sc/uiconfig/scalc/toolbar/formcontrols.xml b/sc/uiconfig/scalc/toolbar/formcontrols.xml index bd4c0d22ea36..b79e0e001870 100644 --- a/sc/uiconfig/scalc/toolbar/formcontrols.xml +++ b/sc/uiconfig/scalc/toolbar/formcontrols.xml @@ -48,6 +48,7 @@ + diff --git a/sd/uiconfig/sdraw/toolbar/formcontrols.xml b/sd/uiconfig/sdraw/toolbar/formcontrols.xml index bd4c0d22ea36..b79e0e001870 100644 --- a/sd/uiconfig/sdraw/toolbar/formcontrols.xml +++ b/sd/uiconfig/sdraw/toolbar/formcontrols.xml @@ -48,6 +48,7 @@ + diff --git a/sd/uiconfig/simpress/toolbar/formcontrols.xml b/sd/uiconfig/simpress/toolbar/formcontrols.xml index bd4c0d22ea36..b79e0e001870 100644 --- a/sd/uiconfig/simpress/toolbar/formcontrols.xml +++ b/sd/uiconfig/simpress/toolbar/formcontrols.xml @@ -48,6 +48,7 @@ + diff --git a/sw/uiconfig/sglobal/toolbar/formcontrols.xml b/sw/uiconfig/sglobal/toolbar/formcontrols.xml index bd4c0d22ea36..b79e0e001870 100644 --- a/sw/uiconfig/sglobal/toolbar/formcontrols.xml +++ b/sw/uiconfig/sglobal/toolbar/formcontrols.xml @@ -48,6 +48,7 @@ + diff --git a/sw/uiconfig/sweb/toolbar/formcontrols.xml b/sw/uiconfig/sweb/toolbar/formcontrols.xml index bd4c0d22ea36..b79e0e001870 100644 --- a/sw/uiconfig/sweb/toolbar/formcontrols.xml +++ b/sw/uiconfig/sweb/toolbar/formcontrols.xml @@ -48,6 +48,7 @@ + diff --git a/sw/uiconfig/swform/toolbar/formcontrols.xml b/sw/uiconfig/swform/toolbar/formcontrols.xml index bd4c0d22ea36..b79e0e001870 100644 --- a/sw/uiconfig/swform/toolbar/formcontrols.xml +++ b/sw/uiconfig/swform/toolbar/formcontrols.xml @@ -48,6 +48,7 @@ + diff --git a/sw/uiconfig/swreport/toolbar/formcontrols.xml b/sw/uiconfig/swreport/toolbar/formcontrols.xml index bd4c0d22ea36..b79e0e001870 100644 --- a/sw/uiconfig/swreport/toolbar/formcontrols.xml +++ b/sw/uiconfig/swreport/toolbar/formcontrols.xml @@ -48,6 +48,7 @@ + diff --git a/sw/uiconfig/swriter/toolbar/formcontrols.xml b/sw/uiconfig/swriter/toolbar/formcontrols.xml index bd4c0d22ea36..b79e0e001870 100644 --- a/sw/uiconfig/swriter/toolbar/formcontrols.xml +++ b/sw/uiconfig/swriter/toolbar/formcontrols.xml @@ -48,6 +48,7 @@ + diff --git a/sw/uiconfig/swxform/toolbar/formcontrols.xml b/sw/uiconfig/swxform/toolbar/formcontrols.xml index bd4c0d22ea36..b79e0e001870 100644 --- a/sw/uiconfig/swxform/toolbar/formcontrols.xml +++ b/sw/uiconfig/swxform/toolbar/formcontrols.xml @@ -48,6 +48,7 @@ + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: instsetoo_native/inc_openoffice
instsetoo_native/inc_openoffice/windows/msi_languages/RadioBut.ulf | 10 +- instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt |4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) New commits: commit ba465d3d4cfd43abdac63e67d582e166eae19fb6 Author: Roman Kuznetsov AuthorDate: Tue Aug 6 09:50:37 2019 +0200 Commit: Mike Kaganski CommitDate: Tue Aug 6 11:53:51 2019 +0200 Fix some windows installer's dialog new fonts problem Change-Id: Iabb1c04d27bba1a7b3b89be03d0af1ed15951ffc Reviewed-on: https://gerrit.libreoffice.org/77003 Tested-by: Jenkins Reviewed-by: Mike Kaganski diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/RadioBut.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/RadioBut.ulf index 9bd6e440ab73..59f9c497736e 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_languages/RadioBut.ulf +++ b/instsetoo_native/inc_openoffice/windows/msi_languages/RadioBut.ulf @@ -17,19 +17,19 @@ */ [OOO_RADIOBUTTON_1] -en-US = "{}" +en-US = "{}" [OOO_RADIOBUTTON_2] -en-US = "{}Re" +en-US = "{}Re" [OOO_RADIOBUTTON_3] -en-US = "{}" +en-US = "{}" [OOO_RADIOBUTTON_4] -en-US = "{}" +en-US = "{}" [OOO_RADIOBUTTON_5] -en-US = "{}Cu" +en-US = "{}Cu" [OOO_RADIOBUTTON_6] en-US = "I not accept the terms in the license agreement" diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt index 38115f33f2c4..ec6170099a48 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt @@ -83,7 +83,7 @@ CustomSetupTips DontInstallText Text60 167 400 20 3 OOO_CONTROL_66 CustomSetupTipsInstall Icon21 105 24 24 5242881 InstallIco CustomSetupTipsInstallPartial Icon21 136 24 24 5242881 InstallPartialIco CustomSetupTipsInstallStateMenuIcon21 52 24 24 5242881 InstallStateMenuIco -CustomSetupTipsInstallStateTextText21 88 400 10 3 OOO_CONTROL_68 +CustomSetupTipsInstallStateTextText21 88 400 15 3 OOO_CONTROL_68 CustomSetupTipsInstallText Text60 105 400 20 3 OOO_CONTROL_69 CustomSetupTipsMenuTextText50 52 400 36 3 OOO_CONTROL_70 CustomSetupTipsOK PushButton 401 243 66 17 3 OOO_CONTROL_72 @@ -312,7 +312,7 @@ SetupType CustomIco Icon34 154 24 24 5242881 SetupPartialIco SetupType CustTextText80 154 346 40 3 OOO_CONTROL_256 SetupType DlgDesc Text21 23 372 25 65539 OOO_CONTROL_257 SetupType DlgLine Line0 234 474 0 1 -SetupType DlgText Text21 51 426 10 3 OOO_CONTROL_258 +SetupType DlgText Text21 51 426 15 3 OOO_CONTROL_258 SetupType DlgTitleText13 6 380 25 65539 OOO_CONTROL_259 SetupType NextPushButton 330 243 66 17 3 OOO_CONTROL_260 Cancel SetupType RadioGroup RadioButtonGroup21 79 364 120 3 _IsSetupTypeMin Back ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/inc
cui/inc/tipoftheday.hrc | 16 1 file changed, 8 insertions(+), 8 deletions(-) New commits: commit fef4dc459fd242549d791a47fc1fb5fc28b9193b Author: Roman Kuznetsov AuthorDate: Sun Jul 7 21:12:31 2019 +0200 Commit: Roman Kuznetsov CommitDate: Tue Jul 23 11:07:36 2019 +0200 Improve some tip_of_the_day strings Change-Id: I5177b41aa3be91f1b5003e49a729757405eae4d5 Reviewed-on: https://gerrit.libreoffice.org/75184 Tested-by: Jenkins Reviewed-by: Roman Kuznetsov diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc index a8ec4ff5929c..e5991d646839 100644 --- a/cui/inc/tipoftheday.hrc +++ b/cui/inc/tipoftheday.hrc @@ -106,7 +106,7 @@ const std::tuple TIPOFTHEDAY_STRINGARRAY[] = { NC_("RID_CUI_TIPOFTHEDAY", "Developing new XSLT and xml filters?"), "http://fridrich.blogspot.com.tr/2013/08/extending-swiss-army-knife-overview.html;, ""}, { NC_("RID_CUI_TIPOFTHEDAY", "Easily convert your documents to PDF with one click by clicking on the PDF icon in the toolbar."), "", ""}, - { NC_("RID_CUI_TIPOFTHEDAY", "Select a different icon set from Tools > Options > %PRODUCTNAME > View > User Interface > Icon size and style."), "", ""}, + { NC_("RID_CUI_TIPOFTHEDAY", "Select a different icon set from Tools > Options > %PRODUCTNAME > View > User Interface > Icon style."), "", ""}, { NC_("RID_CUI_TIPOFTHEDAY", "Use font embedding for greater interoperability with other office suites at File > Properties > Font."), "", ""}, { NC_("RID_CUI_TIPOFTHEDAY", "Generate fully customized PDF documents with the exact format, image compression, comments, access rights, password, etc., via File > Export as PDF."), "", ""}, { NC_("RID_CUI_TIPOFTHEDAY", "Use Data > Statistics for sampling, descriptive statistics, analysis of variance, correlation, and much more in %PRODUCTNAME Calc."), "", "tipoftheday_c.png"}, @@ -118,7 +118,7 @@ const std::tuple TIPOFTHEDAY_STRINGARRAY[] = { NC_("RID_CUI_TIPOFTHEDAY", "Batch convert your MS Office documents to OpenDocument format by the Document Converter wizard in menu File > Wizards > Document converter."), "", ""}, { NC_("RID_CUI_TIPOFTHEDAY", "Uncheck Tools > Options > %PRODUCTNAME Calc > View > Zoom: 'Synchronize sheets' so that each sheet in Calc has its own zoom factor."), "", "tipoftheday_c.png"}, { NC_("RID_CUI_TIPOFTHEDAY", "Open a CSV file as a new sheet in the current spreadsheet via Sheet > Sheet from file."), "", "tipoftheday_c.png"}, - { NC_("RID_CUI_TIPOFTHEDAY", "Need to move a Writer table? Table > Select > Table and Insert > Frame… and move where you want."), "", "tipoftheday_w.png"}, + { NC_("RID_CUI_TIPOFTHEDAY", "Need to move a Writer table? Table > Select > Table and Insert > Frame > Frame and move where you want."), "", "tipoftheday_w.png"}, { NC_("RID_CUI_TIPOFTHEDAY", "In %PRODUCTNAME Draw to change the 0/0 point of the rulers, drag the intersection of the two rulers in the top left corner into the workspace."), "", "tipoftheday_d.png"}, { NC_("RID_CUI_TIPOFTHEDAY", "Hold down Ctrl and turn the mouse wheel to change the zoom factor."), "", ""}, { NC_("RID_CUI_TIPOFTHEDAY", "Edit > Find & Replace lets you insert special characters directly: right click in input fields or press Shift+Ctrl+S."), "", ""}, @@ -140,7 +140,7 @@ const std::tuple TIPOFTHEDAY_STRINGARRAY[] = { NC_("RID_CUI_TIPOFTHEDAY", "Want to see, but not print, an object in Draw? Draw it on a layer for which the ‘Printable’ flag is not set (right click on the tab and ‘Modify Layer’)."), "", "tipoftheday_d.png"}, { NC_("RID_CUI_TIPOFTHEDAY", "Want to print two portrait pages on a landscape one (reducing A4 to A5)? File > Print and select 2 at ‘Pages per sheet’."), "", ""}, { NC_("RID_CUI_TIPOFTHEDAY", "To get the ‘Vertical Text’ tool in the Drawing toolbar, check Tools > Options > Language Settings > Languages > Default languages > Asian (and make the button visible with right click)."), "", ""}, - { NC_("RID_CUI_TIPOFTHEDAY", "Want to add many shapes in Draw/Impress? Double-click a tool in the drawing toolbar to use it for repeated tasks."), "", "tipoftheday_d.png"}, + { NC_("RID_CUI_TIPOFTHEDAY", "Want to add many of the same shapes in Draw/Impress? Double-click a tool in the drawing toolbar to use it for repeated tasks."), "", "tipoftheday_d.png"}, { NC_("RID_CUI_TIPOFTHEDAY", "Want to display only the highest values in a spreadsheet? Select menu Data > AutoFilter, click the drop-down arrow, and chose ‘Top10’."), "", "tipoftheday_c.png"}, { NC_("RID_CUI_TIPOFTHEDAY", "Unable to modify or delete a custom cell style? Check all sheets, none should be protected."), "", "tipoftheday_c.png"}, { NC_("RID_CUI_TIPOFTHEDAY", "Want to know how many days there are in the current month? Use the DAYSINMONTH(TODAY()) function."), "", "tipoftheday_c.png"}, @@ -164,7 +164,7 @@ const std::tuple
[Libreoffice-commits] core.git: sc/inc
sc/inc/strings.hrc |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ac870a45ffde14cfdf4406df16d6bb51d08bc171 Author: Roman Kuznetsov AuthorDate: Thu Jul 4 14:27:21 2019 +0200 Commit: Roman Kuznetsov CommitDate: Mon Jul 8 13:25:03 2019 +0200 tdf#124840 Text for confirming updating external links should be "Allow updating" instead "Enable Content" Change-Id: Ife53dafc1b72ebe8665a5c74a75e422a54f56136 Reviewed-on: https://gerrit.libreoffice.org/75081 Tested-by: Jenkins Reviewed-by: Roman Kuznetsov diff --git a/sc/inc/strings.hrc b/sc/inc/strings.hrc index d5685ed3c626..4e92de3d7091 100644 --- a/sc/inc/strings.hrc +++ b/sc/inc/strings.hrc @@ -362,7 +362,7 @@ #define STR_MESSAGE_OUTPUT_TOO_LONG NC_("STR_MESSAGE_OUTPUT_TOO_LONG", "Output is too long to write into the sheet.") #define STR_INPUT_DATA_RANGE NC_("STR_INPUT_DATA_RANGE", "Input data range") /*infobar for allowing links to update or not*/ -#define STR_ENABLE_CONTENT NC_("STR_ENABLE_CONTENT", "Enable Content") +#define STR_ENABLE_CONTENT NC_("STR_ENABLE_CONTENT", "Allow updating") /*Insert image dialog*/ #define STR_ANCHOR_TO_CELL NC_("STR_ANCHOR_TO_CELL", "To cell") #define STR_ANCHOR_TO_CELL_RESIZE NC_("STR_ANCHOR_TO_CELL_RESIZE", "To cell (resize with cell)") ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: officecfg/registry
officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu | 2 - officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 18 ++ 2 files changed, 13 insertions(+), 7 deletions(-) New commits: commit c7db4da4719a2c2a7be1b9c2538ac225d891fc50 Author: Roman Kuznetsov AuthorDate: Wed Jul 3 12:07:11 2019 +0200 Commit: Roman Kuznetsov CommitDate: Thu Jul 4 14:05:23 2019 +0200 tdf#125939 Correct tooltips for tools on Drawing toolbar in Draw Change-Id: Ibde6c07ab44a9eefe0c02d177497f201a53b5130 Reviewed-on: https://gerrit.libreoffice.org/75030 Tested-by: Jenkins Reviewed-by: Roman Kuznetsov diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu index 46cfabd4bd2a..7c3c4217b803 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu @@ -874,7 +874,7 @@ - Connector + Connectors 1 diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu index f8a45ed58929..1cb1a4f76d98 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu @@ -118,10 +118,10 @@ Basic Shapes - ~Basic + ~Basic Shapes - Insert Basic Shapes + Basic Shapes 1 @@ -132,7 +132,7 @@ Symbol Shapes - ~Symbol + ~Symbol Shapes 1 @@ -171,7 +171,10 @@ Arrow Shapes - ~Arrow + ~Block Arrows + + + Block Arrows 1 @@ -193,7 +196,7 @@ Callout Shapes - ~Callout + ~Callouts 1 @@ -204,7 +207,10 @@ Star Shapes - S~tar + S~tars and Banners + + + Stars and Banners 1 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/uiconfig
svx/uiconfig/ui/defaultshapespanel.ui |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit 84ded153cb9c28ddadad773a6fbfe348bdef8fa9 Author: Roman Kuznetsov AuthorDate: Wed Jul 3 11:20:40 2019 +0200 Commit: Roman Kuznetsov CommitDate: Wed Jul 3 20:23:24 2019 +0200 Change names for groups of shape in Shapes Sidebar section in Draw The names should be the same in tool's tooltips on Drawing toolbar, for toolbar's names, in menu Shape->Insert and in Shapes Sidebar section Change-Id: I23619d77525b1c37268f634c54f6672fb3fa14da Reviewed-on: https://gerrit.libreoffice.org/75026 Tested-by: Jenkins Reviewed-by: Roman Kuznetsov diff --git a/svx/uiconfig/ui/defaultshapespanel.ui b/svx/uiconfig/ui/defaultshapespanel.ui index 381d2c00f4d2..ba8c7250aa7d 100644 --- a/svx/uiconfig/ui/defaultshapespanel.ui +++ b/svx/uiconfig/ui/defaultshapespanel.ui @@ -45,7 +45,7 @@ True False -Lines Arrows +Lines and Arrows @@ -82,7 +82,7 @@ True False -Curve +Curves and Polygons @@ -193,7 +193,7 @@ True False -Symbols +Symbol Shapes @@ -341,7 +341,7 @@ True False -Stars +Stars and Banners ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - instsetoo_native/inc_common instsetoo_native/inc_openoffice
instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp |binary instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf | 62 - instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt | 578 +- instsetoo_native/inc_openoffice/windows/msi_templates/Dialog.idt| 62 - instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt |2 instsetoo_native/inc_openoffice/windows/msi_templates/TextStyl.idt | 25 6 files changed, 355 insertions(+), 374 deletions(-) New commits: commit 498dfee819286f6c13278a0b8fcab85611a6feee Author: Roman Kuznetsov AuthorDate: Mon Jun 17 19:13:18 2019 +0200 Commit: Roman Kuznetsov CommitDate: Fri Jun 28 17:00:40 2019 +0200 tdf#99891 Update installer fonts to match newer versions of Windows Change-Id: I6f607e44b92ae9958b6013f9292743a1c7b76d34 Reviewed-on: https://gerrit.libreoffice.org/74185 Tested-by: Jenkins Reviewed-by: Roman Kuznetsov (cherry picked from commit d8932ff5df0939b5c5e378b7ad0a63a25df5b3b0) Reviewed-on: https://gerrit.libreoffice.org/74832 diff --git a/instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp b/instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp old mode 100644 new mode 100755 index 5a163cf86c23..0d5d1a058038 Binary files a/instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp and b/instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp differ diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf index d8927314f54f..2517ec085a72 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf +++ b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf @@ -26,7 +26,7 @@ en-US = " in:" en-US = "Browse to the destination folder." [OOO_CONTROL_7] -en-US = "{}Change Current Destination Folder" +en-US = "{}Change Current Destination Folder" [OOO_CONTROL_9] en-US = "Create new folder|" @@ -74,7 +74,7 @@ en-US = "Cancel" en-US = " >" [OOO_CONTROL_27] -en-US = "{}Welcome to the Installation Wizard for [ProductName]" +en-US = "{}Welcome to the Installation Wizard for [ProductName]" [OOO_CONTROL_28] en-US = "The Installation Wizard will create a server image of [ProductName] at a specified network location. To continue, click Next." @@ -95,7 +95,7 @@ en-US = "< " en-US = "Cancel" [OOO_CONTROL_36] -en-US = "{\Tahoma8}{80}" +en-US = "{\DialogDefault}{80}" [OOO_CONTROL_37] en-US = ":" @@ -107,10 +107,10 @@ en-US = "Please enter your information." en-US = "Install this application for:" [OOO_CONTROL_40] -en-US = "{}User Information" +en-US = "{}User Information" [OOO_CONTROL_41] -en-US = "{\Tahoma8}{50}" +en-US = "{\DialogDefault}{50}" [OOO_CONTROL_42] en-US = " Name:" @@ -137,7 +137,7 @@ en-US = "Select the program features you want installed." en-US = "Click on an icon in the list below to change how a feature is installed." [OOO_CONTROL_54] -en-US = "{}Custom Setup" +en-US = "{}Custom Setup" [OOO_CONTROL_55] en-US = "Feature Description:" @@ -164,7 +164,7 @@ en-US = "Feature size" en-US = "Custom Setup allows you to selectively install program features." [OOO_CONTROL_65] -en-US = "{}Custom Setup Tips" +en-US = "{}Custom Setup Tips" [OOO_CONTROL_66] en-US = "Will not be installed." @@ -203,7 +203,7 @@ en-US = "" en-US = "Click Next to install to this folder, or click Change to install to a different folder." [OOO_CONTROL_90] -en-US = "{}Destination Folder" +en-US = "{}Destination Folder" [OOO_CONTROL_91] en-US = "[INSTALLDIR]" @@ -221,7 +221,7 @@ en-US = "The disk space required for the installation of the selected features." en-US = "The highlighted volumes do not have enough disk space available for the currently selected features. You can remove files from the highlighted volumes, choose to install less features onto local drives, or select different destination drives." [OOO_CONTROL_98] -en-US = "{}Disk Space Requirements" +en-US = "{}Disk Space Requirements" [OOO_CONTROL_100] en-US = "OK" @@ -233,7 +233,7 @@ en-US = "Some files that need to be updated are currently in use." en-US = "The following applications are using files that need to be updated by this setup. Close these applications and click Retry to continue." [OOO_CONTROL_105] -en-US = "{}Files in Use" +en-US = "{}Files in Use" [OOO_CONTROL_106] en-US = "" @@ -254,7 +254,7 @@ en-US = " in:" en-US = "Browse to the destination folder." [OOO_CONTROL_115] -en-US = "{}Change Current Destination Folder" +en-US = "{}Change Current Destination Folder" [OOO_CONTROL_117] en-US = "Create New Folder|" @@ -281,7 +281,7 @@ en-US = "Build contributed in collaboration with the community by [Manufacturer] en-US = " >" [OOO_CONTROL_126] -en-US = "{}Welcome to the Installation Wizard for [ProductName]" +en-US = "{}Welcome to the
[Libreoffice-commits] core.git: instsetoo_native/inc_common instsetoo_native/inc_openoffice
instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp |binary instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf | 62 - instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt | 578 +- instsetoo_native/inc_openoffice/windows/msi_templates/Dialog.idt| 62 - instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt |2 instsetoo_native/inc_openoffice/windows/msi_templates/TextStyl.idt | 25 6 files changed, 355 insertions(+), 374 deletions(-) New commits: commit d8932ff5df0939b5c5e378b7ad0a63a25df5b3b0 Author: Roman Kuznetsov AuthorDate: Mon Jun 17 19:13:18 2019 +0200 Commit: Roman Kuznetsov CommitDate: Thu Jun 27 08:56:50 2019 +0200 tdf#99891 Update installer fonts to match newer versions of Windows Change-Id: I6f607e44b92ae9958b6013f9292743a1c7b76d34 Reviewed-on: https://gerrit.libreoffice.org/74185 Tested-by: Jenkins Reviewed-by: Roman Kuznetsov diff --git a/instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp b/instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp old mode 100644 new mode 100755 index 5a163cf86c23..0d5d1a058038 Binary files a/instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp and b/instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp differ diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf index d8927314f54f..2517ec085a72 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf +++ b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf @@ -26,7 +26,7 @@ en-US = " in:" en-US = "Browse to the destination folder." [OOO_CONTROL_7] -en-US = "{}Change Current Destination Folder" +en-US = "{}Change Current Destination Folder" [OOO_CONTROL_9] en-US = "Create new folder|" @@ -74,7 +74,7 @@ en-US = "Cancel" en-US = " >" [OOO_CONTROL_27] -en-US = "{}Welcome to the Installation Wizard for [ProductName]" +en-US = "{}Welcome to the Installation Wizard for [ProductName]" [OOO_CONTROL_28] en-US = "The Installation Wizard will create a server image of [ProductName] at a specified network location. To continue, click Next." @@ -95,7 +95,7 @@ en-US = "< " en-US = "Cancel" [OOO_CONTROL_36] -en-US = "{\Tahoma8}{80}" +en-US = "{\DialogDefault}{80}" [OOO_CONTROL_37] en-US = ":" @@ -107,10 +107,10 @@ en-US = "Please enter your information." en-US = "Install this application for:" [OOO_CONTROL_40] -en-US = "{}User Information" +en-US = "{}User Information" [OOO_CONTROL_41] -en-US = "{\Tahoma8}{50}" +en-US = "{\DialogDefault}{50}" [OOO_CONTROL_42] en-US = " Name:" @@ -137,7 +137,7 @@ en-US = "Select the program features you want installed." en-US = "Click on an icon in the list below to change how a feature is installed." [OOO_CONTROL_54] -en-US = "{}Custom Setup" +en-US = "{}Custom Setup" [OOO_CONTROL_55] en-US = "Feature Description:" @@ -164,7 +164,7 @@ en-US = "Feature size" en-US = "Custom Setup allows you to selectively install program features." [OOO_CONTROL_65] -en-US = "{}Custom Setup Tips" +en-US = "{}Custom Setup Tips" [OOO_CONTROL_66] en-US = "Will not be installed." @@ -203,7 +203,7 @@ en-US = "" en-US = "Click Next to install to this folder, or click Change to install to a different folder." [OOO_CONTROL_90] -en-US = "{}Destination Folder" +en-US = "{}Destination Folder" [OOO_CONTROL_91] en-US = "[INSTALLDIR]" @@ -221,7 +221,7 @@ en-US = "The disk space required for the installation of the selected features." en-US = "The highlighted volumes do not have enough disk space available for the currently selected features. You can remove files from the highlighted volumes, choose to install less features onto local drives, or select different destination drives." [OOO_CONTROL_98] -en-US = "{}Disk Space Requirements" +en-US = "{}Disk Space Requirements" [OOO_CONTROL_100] en-US = "OK" @@ -233,7 +233,7 @@ en-US = "Some files that need to be updated are currently in use." en-US = "The following applications are using files that need to be updated by this setup. Close these applications and click Retry to continue." [OOO_CONTROL_105] -en-US = "{}Files in Use" +en-US = "{}Files in Use" [OOO_CONTROL_106] en-US = "" @@ -254,7 +254,7 @@ en-US = " in:" en-US = "Browse to the destination folder." [OOO_CONTROL_115] -en-US = "{}Change Current Destination Folder" +en-US = "{}Change Current Destination Folder" [OOO_CONTROL_117] en-US = "Create New Folder|" @@ -281,7 +281,7 @@ en-US = "Build contributed in collaboration with the community by [Manufacturer] en-US = " >" [OOO_CONTROL_126] -en-US = "{}Welcome to the Installation Wizard for [ProductName]" +en-US = "{}Welcome to the Installation Wizard for [ProductName]" [OOO_CONTROL_127] en-US = "The Installation Wizard will install [ProductName] on your
[Libreoffice-commits] help.git: source/text
source/text/shared/00/0403.xhp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ca3dda78509c00f9dc95fe1fe8590fa88814a866 Author: Roman Kuznetsov AuthorDate: Sun Jun 16 14:04:55 2019 +0200 Commit: Olivier Hallot CommitDate: Wed Jun 19 18:01:29 2019 +0200 tdf#92083 Help: Move Color bar item from View->Toolbars to View menu Change-Id: I05f65e0c00517fc7b4b8f4d4a93fdb0b4a6d185e Reviewed-on: https://gerrit.libreoffice.org/74112 Tested-by: Jenkins Reviewed-by: Sophia Schröder Reviewed-by: Olivier Hallot diff --git a/source/text/shared/00/0403.xhp b/source/text/shared/00/0403.xhp index 23be211f2..0f9cc27af 100644 --- a/source/text/shared/00/0403.xhp +++ b/source/text/shared/00/0403.xhp @@ -45,7 +45,7 @@ Choose View - Toolbars - Standard. Choose View - Toolbars - Tools. Choose View - Status Bar. -Choose View - Toolbars - Color Bar. +Choose View - Color Bar. Click Hyperlink icon on Standard bar, click Internet. Choose Insert - Hyperlink. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - sc/uiconfig sd/uiconfig sw/uiconfig
sc/uiconfig/scalc/toolbar/formcontrols.xml|4 ++-- sd/uiconfig/sdraw/toolbar/formcontrols.xml|4 ++-- sd/uiconfig/simpress/toolbar/formcontrols.xml |4 ++-- sw/uiconfig/sglobal/toolbar/formcontrols.xml |4 ++-- sw/uiconfig/sweb/toolbar/formcontrols.xml |4 ++-- sw/uiconfig/swform/toolbar/formcontrols.xml |4 ++-- sw/uiconfig/swreport/toolbar/formcontrols.xml |4 ++-- sw/uiconfig/swriter/toolbar/formcontrols.xml |4 ++-- sw/uiconfig/swxform/toolbar/formcontrols.xml |4 ++-- 9 files changed, 18 insertions(+), 18 deletions(-) New commits: commit 099d183410eb7b0dbede3db70966d54a41a971d7 Author: Roman Kuznetsov AuthorDate: Mon Jun 17 19:51:30 2019 +0200 Commit: Adolfo Jayme Barrientos CommitDate: Wed Jun 19 03:24:10 2019 +0200 tdf#125947 Two tools are missing from default Form Controls toolbar Change-Id: Ie54b2a3f5051b115f8f04467282090a93525dfc3 Reviewed-on: https://gerrit.libreoffice.org/74191 Tested-by: Jenkins Reviewed-by: Roman Kuznetsov (cherry picked from commit 385128671716e70b9540a67e213d6495bf50662b) Reviewed-on: https://gerrit.libreoffice.org/74267 Reviewed-by: Adolfo Jayme Barrientos diff --git a/sc/uiconfig/scalc/toolbar/formcontrols.xml b/sc/uiconfig/scalc/toolbar/formcontrols.xml index f0b133503d4d..bd4c0d22ea36 100644 --- a/sc/uiconfig/scalc/toolbar/formcontrols.xml +++ b/sc/uiconfig/scalc/toolbar/formcontrols.xml @@ -53,6 +53,6 @@ - - + + diff --git a/sd/uiconfig/sdraw/toolbar/formcontrols.xml b/sd/uiconfig/sdraw/toolbar/formcontrols.xml index f0b133503d4d..bd4c0d22ea36 100644 --- a/sd/uiconfig/sdraw/toolbar/formcontrols.xml +++ b/sd/uiconfig/sdraw/toolbar/formcontrols.xml @@ -53,6 +53,6 @@ - - + + diff --git a/sd/uiconfig/simpress/toolbar/formcontrols.xml b/sd/uiconfig/simpress/toolbar/formcontrols.xml index f0b133503d4d..bd4c0d22ea36 100644 --- a/sd/uiconfig/simpress/toolbar/formcontrols.xml +++ b/sd/uiconfig/simpress/toolbar/formcontrols.xml @@ -53,6 +53,6 @@ - - + + diff --git a/sw/uiconfig/sglobal/toolbar/formcontrols.xml b/sw/uiconfig/sglobal/toolbar/formcontrols.xml index f0b133503d4d..bd4c0d22ea36 100644 --- a/sw/uiconfig/sglobal/toolbar/formcontrols.xml +++ b/sw/uiconfig/sglobal/toolbar/formcontrols.xml @@ -53,6 +53,6 @@ - - + + diff --git a/sw/uiconfig/sweb/toolbar/formcontrols.xml b/sw/uiconfig/sweb/toolbar/formcontrols.xml index f0b133503d4d..bd4c0d22ea36 100644 --- a/sw/uiconfig/sweb/toolbar/formcontrols.xml +++ b/sw/uiconfig/sweb/toolbar/formcontrols.xml @@ -53,6 +53,6 @@ - - + + diff --git a/sw/uiconfig/swform/toolbar/formcontrols.xml b/sw/uiconfig/swform/toolbar/formcontrols.xml index f0b133503d4d..bd4c0d22ea36 100644 --- a/sw/uiconfig/swform/toolbar/formcontrols.xml +++ b/sw/uiconfig/swform/toolbar/formcontrols.xml @@ -53,6 +53,6 @@ - - + + diff --git a/sw/uiconfig/swreport/toolbar/formcontrols.xml b/sw/uiconfig/swreport/toolbar/formcontrols.xml index f0b133503d4d..bd4c0d22ea36 100644 --- a/sw/uiconfig/swreport/toolbar/formcontrols.xml +++ b/sw/uiconfig/swreport/toolbar/formcontrols.xml @@ -53,6 +53,6 @@ - - + + diff --git a/sw/uiconfig/swriter/toolbar/formcontrols.xml b/sw/uiconfig/swriter/toolbar/formcontrols.xml index f0b133503d4d..bd4c0d22ea36 100644 --- a/sw/uiconfig/swriter/toolbar/formcontrols.xml +++ b/sw/uiconfig/swriter/toolbar/formcontrols.xml @@ -53,6 +53,6 @@ - - + + diff --git a/sw/uiconfig/swxform/toolbar/formcontrols.xml b/sw/uiconfig/swxform/toolbar/formcontrols.xml index f0b133503d4d..bd4c0d22ea36 100644 --- a/sw/uiconfig/swxform/toolbar/formcontrols.xml +++ b/sw/uiconfig/swxform/toolbar/formcontrols.xml @@ -53,6 +53,6 @@ - - + + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/uiconfig sd/uiconfig sw/uiconfig
sc/uiconfig/scalc/toolbar/formcontrols.xml|4 ++-- sd/uiconfig/sdraw/toolbar/formcontrols.xml|4 ++-- sd/uiconfig/simpress/toolbar/formcontrols.xml |4 ++-- sw/uiconfig/sglobal/toolbar/formcontrols.xml |4 ++-- sw/uiconfig/sweb/toolbar/formcontrols.xml |4 ++-- sw/uiconfig/swform/toolbar/formcontrols.xml |4 ++-- sw/uiconfig/swreport/toolbar/formcontrols.xml |4 ++-- sw/uiconfig/swriter/toolbar/formcontrols.xml |4 ++-- sw/uiconfig/swxform/toolbar/formcontrols.xml |4 ++-- 9 files changed, 18 insertions(+), 18 deletions(-) New commits: commit 385128671716e70b9540a67e213d6495bf50662b Author: Roman Kuznetsov AuthorDate: Mon Jun 17 19:51:30 2019 +0200 Commit: Roman Kuznetsov CommitDate: Tue Jun 18 09:54:55 2019 +0200 tdf#125947 Two tools are missing from default Form Controls toolbar Change-Id: Ie54b2a3f5051b115f8f04467282090a93525dfc3 Reviewed-on: https://gerrit.libreoffice.org/74191 Tested-by: Jenkins Reviewed-by: Roman Kuznetsov diff --git a/sc/uiconfig/scalc/toolbar/formcontrols.xml b/sc/uiconfig/scalc/toolbar/formcontrols.xml index f0b133503d4d..bd4c0d22ea36 100644 --- a/sc/uiconfig/scalc/toolbar/formcontrols.xml +++ b/sc/uiconfig/scalc/toolbar/formcontrols.xml @@ -53,6 +53,6 @@ - - + + diff --git a/sd/uiconfig/sdraw/toolbar/formcontrols.xml b/sd/uiconfig/sdraw/toolbar/formcontrols.xml index f0b133503d4d..bd4c0d22ea36 100644 --- a/sd/uiconfig/sdraw/toolbar/formcontrols.xml +++ b/sd/uiconfig/sdraw/toolbar/formcontrols.xml @@ -53,6 +53,6 @@ - - + + diff --git a/sd/uiconfig/simpress/toolbar/formcontrols.xml b/sd/uiconfig/simpress/toolbar/formcontrols.xml index f0b133503d4d..bd4c0d22ea36 100644 --- a/sd/uiconfig/simpress/toolbar/formcontrols.xml +++ b/sd/uiconfig/simpress/toolbar/formcontrols.xml @@ -53,6 +53,6 @@ - - + + diff --git a/sw/uiconfig/sglobal/toolbar/formcontrols.xml b/sw/uiconfig/sglobal/toolbar/formcontrols.xml index f0b133503d4d..bd4c0d22ea36 100644 --- a/sw/uiconfig/sglobal/toolbar/formcontrols.xml +++ b/sw/uiconfig/sglobal/toolbar/formcontrols.xml @@ -53,6 +53,6 @@ - - + + diff --git a/sw/uiconfig/sweb/toolbar/formcontrols.xml b/sw/uiconfig/sweb/toolbar/formcontrols.xml index f0b133503d4d..bd4c0d22ea36 100644 --- a/sw/uiconfig/sweb/toolbar/formcontrols.xml +++ b/sw/uiconfig/sweb/toolbar/formcontrols.xml @@ -53,6 +53,6 @@ - - + + diff --git a/sw/uiconfig/swform/toolbar/formcontrols.xml b/sw/uiconfig/swform/toolbar/formcontrols.xml index f0b133503d4d..bd4c0d22ea36 100644 --- a/sw/uiconfig/swform/toolbar/formcontrols.xml +++ b/sw/uiconfig/swform/toolbar/formcontrols.xml @@ -53,6 +53,6 @@ - - + + diff --git a/sw/uiconfig/swreport/toolbar/formcontrols.xml b/sw/uiconfig/swreport/toolbar/formcontrols.xml index f0b133503d4d..bd4c0d22ea36 100644 --- a/sw/uiconfig/swreport/toolbar/formcontrols.xml +++ b/sw/uiconfig/swreport/toolbar/formcontrols.xml @@ -53,6 +53,6 @@ - - + + diff --git a/sw/uiconfig/swriter/toolbar/formcontrols.xml b/sw/uiconfig/swriter/toolbar/formcontrols.xml index f0b133503d4d..bd4c0d22ea36 100644 --- a/sw/uiconfig/swriter/toolbar/formcontrols.xml +++ b/sw/uiconfig/swriter/toolbar/formcontrols.xml @@ -53,6 +53,6 @@ - - + + diff --git a/sw/uiconfig/swxform/toolbar/formcontrols.xml b/sw/uiconfig/swxform/toolbar/formcontrols.xml index f0b133503d4d..bd4c0d22ea36 100644 --- a/sw/uiconfig/swxform/toolbar/formcontrols.xml +++ b/sw/uiconfig/swxform/toolbar/formcontrols.xml @@ -53,6 +53,6 @@ - - + + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: framework/source sd/uiconfig
framework/source/uielement/toolbarsmenucontroller.cxx |5 + sd/uiconfig/sdraw/menubar/menubar.xml |1 + sd/uiconfig/simpress/menubar/menubar.xml |1 + 3 files changed, 3 insertions(+), 4 deletions(-) New commits: commit 837f748ce61145b90068ed8c0a630f1cf15fa080 Author: Roman Kuznetsov AuthorDate: Fri Jun 14 10:47:12 2019 +0200 Commit: Roman Kuznetsov CommitDate: Sun Jun 16 12:18:41 2019 +0200 tdf#92083 Move Color bar item from View->Toolbars to View menu in Draw/Impress Change-Id: Ie25d34b07d381775274a79e4a0b71e7a96eb6119 Reviewed-on: https://gerrit.libreoffice.org/74024 Reviewed-by: Roman Kuznetsov Tested-by: Roman Kuznetsov diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx index 69ddcae67924..7a66796a9b84 100644 --- a/framework/source/uielement/toolbarsmenucontroller.cxx +++ b/framework/source/uielement/toolbarsmenucontroller.cxx @@ -408,10 +408,7 @@ void ToolbarsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu > co } // Create commands for non-toolbars -if ( m_aModuleIdentifier == "com.sun.star.drawing.DrawingDocument" || - m_aModuleIdentifier == "com.sun.star.presentation.PresentationDocument" ) - addCommand( m_xPopupMenu, ".uno:ColorControl", "" ); -else if ( m_aModuleIdentifier == "com.sun.star.sheet.SpreadsheetDocument" ) +if ( m_aModuleIdentifier == "com.sun.star.sheet.SpreadsheetDocument" ) addCommand( m_xPopupMenu, ".uno:InputLineVisible", "" ); bool bAddCommand( true ); diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml b/sd/uiconfig/sdraw/menubar/menubar.xml index f59c6d510849..0e96f5bbf7c0 100644 --- a/sd/uiconfig/sdraw/menubar/menubar.xml +++ b/sd/uiconfig/sdraw/menubar/menubar.xml @@ -155,6 +155,7 @@ + diff --git a/sd/uiconfig/simpress/menubar/menubar.xml b/sd/uiconfig/simpress/menubar/menubar.xml index 1aaa09786d0c..bbca62cc1808 100644 --- a/sd/uiconfig/simpress/menubar/menubar.xml +++ b/sd/uiconfig/simpress/menubar/menubar.xml @@ -164,6 +164,7 @@ + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: officecfg/registry
officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu|7 +-- officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu|7 +-- officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu|2 +- officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu |4 ++-- officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu |7 +-- 5 files changed, 18 insertions(+), 9 deletions(-) New commits: commit 1dac2184c5e904887fe56c632fcd048fb0b698e9 Author: Roman Kuznetsov AuthorDate: Sat Mar 16 10:33:29 2019 +0100 Commit: Roman Kuznetsov CommitDate: Fri Jun 14 23:02:29 2019 +0200 tdf#88287 Change toolbars attributes in Draw The tooltip for .uno:LineToolbox changed to 'Curves and Polygons' The toolbar title of linesbar.xml changed to 'Curves and Polygons' The Arrows toolbar (arrowsbar.xml) removed from View > Toolbars The toolbar title of arrowsbar.xml changed to 'Lines and Arrows' Change-Id: Ic97c7a11f071a4f424a341e297423dba2ddc345a Reviewed-on: https://gerrit.libreoffice.org/69335 Reviewed-by: Roman Kuznetsov Tested-by: Roman Kuznetsov diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu index 7dd89f6989ec..7644f820ffb9 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu @@ -129,7 +129,7 @@ false - Lines + Curves and Polygons false @@ -713,11 +713,14 @@ false - Arrows + Lines and Arrows false + + true + diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu index a964507437a2..b1f0b0f292e1 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu @@ -315,7 +315,10 @@ false - Arrows + Lines and Arrows + + + true @@ -575,7 +578,7 @@ false - Lines + Curves and Polygons false diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu index da7027430cbe..840c17d5404f 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu @@ -4760,7 +4760,7 @@ - Curve + Curves and Polygons 1 diff --git a/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu index ac91bd27af7b..b9d1d1545298 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu @@ -226,7 +226,7 @@ false - Arrows + Lines and Arrows true @@ -512,7 +512,7 @@ false - Lines + Curves and Polygons false diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu index 7cceb8669a38..f5d7bdf862d3 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu @@ -198,7 +198,7 @@ false - Lines + Curves and Polygons false @@ -212,11 +212,14 @@ false - Arrows + Lines and Arrows false + + true + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: framework/source
framework/source/uielement/toolbarsmenucontroller.cxx | 20 -- 1 file changed, 5 insertions(+), 15 deletions(-) New commits: commit 846c68876c214d501bf163eede4288d7a307ec8a Author: Roman Kuznetsov AuthorDate: Fri Jun 14 10:59:43 2019 +0200 Commit: Roman Kuznetsov CommitDate: Fri Jun 14 18:07:28 2019 +0200 tdf#124642 Delete Formula item from View->Toolbars in Writer Change-Id: I5817ba3c8c758e31641b805083133ce4b8bbb094 Reviewed-on: https://gerrit.libreoffice.org/74025 Tested-by: Jenkins Reviewed-by: Roman Kuznetsov diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx index 945df54659c0..69ddcae67924 100644 --- a/framework/source/uielement/toolbarsmenucontroller.cxx +++ b/framework/source/uielement/toolbarsmenucontroller.cxx @@ -408,21 +408,11 @@ void ToolbarsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu > co } // Create commands for non-toolbars -if ( m_aModuleIdentifier == "com.sun.star.text.TextDocument" || - m_aModuleIdentifier == "com.sun.star.text.WebDocument" || - m_aModuleIdentifier == "com.sun.star.text.GlobalDocument" || - m_aModuleIdentifier == "com.sun.star.drawing.DrawingDocument" || - m_aModuleIdentifier == "com.sun.star.presentation.PresentationDocument" || - m_aModuleIdentifier == "com.sun.star.sheet.SpreadsheetDocument" ) -{ -if ( m_aModuleIdentifier == "com.sun.star.drawing.DrawingDocument" || - m_aModuleIdentifier == "com.sun.star.presentation.PresentationDocument" ) -addCommand( m_xPopupMenu, ".uno:ColorControl", "" ); -else if ( m_aModuleIdentifier == "com.sun.star.sheet.SpreadsheetDocument" ) -addCommand( m_xPopupMenu, ".uno:InputLineVisible", "" ); -else -addCommand( m_xPopupMenu, ".uno:InsertFormula", "" ); -} +if ( m_aModuleIdentifier == "com.sun.star.drawing.DrawingDocument" || + m_aModuleIdentifier == "com.sun.star.presentation.PresentationDocument" ) + addCommand( m_xPopupMenu, ".uno:ColorControl", "" ); +else if ( m_aModuleIdentifier == "com.sun.star.sheet.SpreadsheetDocument" ) + addCommand( m_xPopupMenu, ".uno:InputLineVisible", "" ); bool bAddCommand( true ); SvtCommandOptions aCmdOptions; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: officecfg/registry sd/source sd/uiconfig sd/UIConfig_sdraw.mk sd/UIConfig_simpress.mk
officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu|5 officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu |5 sd/UIConfig_sdraw.mk|1 sd/UIConfig_simpress.mk |1 sd/source/ui/view/drviews4.cxx |2 sd/uiconfig/sdraw/popupmenu/tabletext.xml | 61 -- sd/uiconfig/simpress/popupmenu/tabletext.xml| 61 -- 7 files changed, 1 insertion(+), 135 deletions(-) New commits: commit 480178b968adeb4a528ca0c94217df7dbdf06ac5 Author: Roman Kuznetsov AuthorDate: Sun Jun 2 15:41:23 2019 +0200 Commit: Maxim Monastirsky CommitDate: Tue Jun 11 17:09:51 2019 +0200 tdf#120844 Remove tabletext.xml from sdraw and from simpress Change-Id: Ide91a0eb3776322e5adb4dbd0acc697dbb41b500 Reviewed-on: https://gerrit.libreoffice.org/73337 Tested-by: Jenkins Reviewed-by: Maxim Monastirsky diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu index 5b316f1a61be..a964507437a2 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu @@ -140,11 +140,6 @@ Table - - - Table Text - - Text Box (drawing) diff --git a/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu index c3d21928fc1c..ac91bd27af7b 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu @@ -145,11 +145,6 @@ Table - - - Table Text - - Text Box (drawing) diff --git a/sd/UIConfig_sdraw.mk b/sd/UIConfig_sdraw.mk index 95b2fbc9162f..bbdb3efc4d87 100644 --- a/sd/UIConfig_sdraw.mk +++ b/sd/UIConfig_sdraw.mk @@ -40,7 +40,6 @@ $(eval $(call gb_UIConfig_add_popupmenufiles,modules/sdraw,\ sd/uiconfig/sdraw/popupmenu/pagepane \ sd/uiconfig/sdraw/popupmenu/pagetab \ sd/uiconfig/sdraw/popupmenu/page \ - sd/uiconfig/sdraw/popupmenu/tabletext \ sd/uiconfig/sdraw/popupmenu/table \ sd/uiconfig/sdraw/popupmenu/textbox \ )) diff --git a/sd/UIConfig_simpress.mk b/sd/UIConfig_simpress.mk index bc12bca51f4f..fce9c5704fda 100644 --- a/sd/UIConfig_simpress.mk +++ b/sd/UIConfig_simpress.mk @@ -40,7 +40,6 @@ $(eval $(call gb_UIConfig_add_popupmenufiles,modules/simpress,\ sd/uiconfig/simpress/popupmenu/pagepane \ sd/uiconfig/simpress/popupmenu/pagetab \ sd/uiconfig/simpress/popupmenu/page \ - sd/uiconfig/simpress/popupmenu/tabletext \ sd/uiconfig/simpress/popupmenu/table \ sd/uiconfig/simpress/popupmenu/textbox \ )) diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx index 3453cf3ae1f2..f487ce7b4c46 100644 --- a/sd/source/ui/view/drviews4.cxx +++ b/sd/source/ui/view/drviews4.cxx @@ -647,7 +647,7 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin) { if( (pObj->GetObjInventor() == SdrInventor::Default) && (pObj->GetObjIdentifier() == OBJ_TABLE) ) { -aPopupId = "tabletext"; +aPopupId = "table"; } else { diff --git a/sd/uiconfig/sdraw/popupmenu/tabletext.xml b/sd/uiconfig/sdraw/popupmenu/tabletext.xml deleted file mode 100644 index 7ecc89a5952d.. --- a/sd/uiconfig/sdraw/popupmenu/tabletext.xml +++ /dev/null @@ -1,61 +0,0 @@ - - -http://openoffice.org/2001/menu;> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sd/uiconfig/simpress/popupmenu/tabletext.xml b/sd/uiconfig/simpress/popupmenu/tabletext.xml deleted file mode 100644 index 7ecc89a5952d.. --- a/sd/uiconfig/simpress/popupmenu/tabletext.xml +++ /dev/null @@ -1,61 +0,0 @@ - - -http://openoffice.org/2001/menu;> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - cui/inc sw/inc
cui/inc/tipoftheday.hrc |2 +- sw/inc/strings.hrc |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 51c0985d861f90ffb363659f2194d573df07f0bb Author: Roman Kuznetsov AuthorDate: Sun May 19 14:06:19 2019 +0200 Commit: Heiko Tietze CommitDate: Tue Jun 4 09:28:58 2019 +0200 tdf#124582 Change Outline Numbering to Chapter Numbering on Outline & Numbering tab in Paragraph style dialog Change-Id: I2e97dfae832c497c5d08f00eb8c6e6b97884b717 Reviewed-on: https://gerrit.libreoffice.org/72551 Tested-by: Jenkins Reviewed-by: Heiko Tietze (cherry picked from commit 7d49e64c2aad701d2903af8a451a31d90005d257) Reviewed-on: https://gerrit.libreoffice.org/73350 Reviewed-by: Adolfo Jayme Barrientos diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc index 332757156eeb..1b314e36ed04 100644 --- a/cui/inc/tipoftheday.hrc +++ b/cui/inc/tipoftheday.hrc @@ -233,7 +233,7 @@ const std::tuple TIPOFTHEDAY_STRINGARRAY[] = { NC_("RID_CUI_TIPOFTHEDAY", "You can set a color for each tab: right-click the tab or use Sheet > Sheet Tab Color."), "", "tipoftheday_c.png"}, { NC_("RID_CUI_TIPOFTHEDAY", "You want to start working with %PRODUCTNAME basic macros? Take a look at the examples under Tools > Macros > Edit Macros."), "", ""}, { NC_("RID_CUI_TIPOFTHEDAY", "To remove the page number from your table of contents go to Insert > Table of Contents (or right-click and Edit the previously inserted index). At the Entries tab delete the page number (#) from Structure line."), "", "tipoftheday_w.png"}, - { NC_("RID_CUI_TIPOFTHEDAY", "Outline numbering lets you set text to be displayed before the chapter number. For example, type 'Chapter ' to display 'Chapter 1'"), "", "tipoftheday_w.png"}, + { NC_("RID_CUI_TIPOFTHEDAY", "Chapter numbering dialog lets you set text to be displayed before the chapter number. For example, type 'Chapter ' to display 'Chapter 1'"), "", "tipoftheday_w.png"}, { NC_("RID_CUI_TIPOFTHEDAY", "Want to know if a cell is referred in formulas of other cells? Tools > Detective > Trace Dependents (Shift+F5)."), "", "tipoftheday_c.png"}, { NC_("RID_CUI_TIPOFTHEDAY", "You can customize the middle mouse button per Tools > Options > %PRODUCTNAME > View > Middle Mouse button."), "", ""}, { NC_("RID_CUI_TIPOFTHEDAY", "To repeat rows/columns on every pages use Format > Print Ranges > Edit."), "", "tipoftheday_c.png"}, diff --git a/sw/inc/strings.hrc b/sw/inc/strings.hrc index 88171b13d638..1de4f3303db8 100644 --- a/sw/inc/strings.hrc +++ b/sw/inc/strings.hrc @@ -287,7 +287,7 @@ #define STR_REDLINE_UNKNOWN_AUTHOR NC_("STR_REDLINE_UNKNOWN_AUTHOR", "Unknown Author") #define STR_DELETE_NOTE_AUTHOR NC_("STR_DELETE_NOTE_AUTHOR", "Delete ~All Comments by $1") #define STR_HIDE_NOTE_AUTHORNC_("STR_HIDE_NOTE_AUTHOR", "H~ide All Comments by $1") -#define STR_OUTLINE_NUMBERING NC_("STR_OUTLINE_NUMBERING", "Outline Numbering") +#define STR_OUTLINE_NUMBERING NC_("STR_OUTLINE_NUMBERING", "Chapter Numbering") /* To translators: $1 == will be replaced by STR_WORDCOUNT_WORDARG, and $2 by STR_WORDCOUNT_COLARG e.g. Selected: 1 word, 2 characters */ #define STR_WORDCOUNT NC_("STR_WORDCOUNT", "Selected: $1, $2") ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/inc sw/inc
cui/inc/tipoftheday.hrc |2 +- sw/inc/strings.hrc |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 7d49e64c2aad701d2903af8a451a31d90005d257 Author: Roman Kuznetsov AuthorDate: Sun May 19 14:06:19 2019 +0200 Commit: Heiko Tietze CommitDate: Sun Jun 2 19:41:40 2019 +0200 tdf#124582 Change Outline Numbering to Chapter Numbering on Outline & Numbering tab in Paragraph style dialog Change-Id: I2e97dfae832c497c5d08f00eb8c6e6b97884b717 Reviewed-on: https://gerrit.libreoffice.org/72551 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc index 78c0c1c4168f..40385e1d4b4a 100644 --- a/cui/inc/tipoftheday.hrc +++ b/cui/inc/tipoftheday.hrc @@ -233,7 +233,7 @@ const std::tuple TIPOFTHEDAY_STRINGARRAY[] = { NC_("RID_CUI_TIPOFTHEDAY", "You can set a color for each tab: right-click the tab or use Sheet > Sheet Tab Color."), "", "tipoftheday_c.png"}, { NC_("RID_CUI_TIPOFTHEDAY", "You want to start working with %PRODUCTNAME basic macros? Take a look at the examples under Tools > Macros > Edit Macros."), "", ""}, { NC_("RID_CUI_TIPOFTHEDAY", "To remove the page number from your table of contents go to Insert > Table of Contents (or right-click and Edit the previously inserted index). At the Entries tab delete the page number (#) from Structure line."), "", "tipoftheday_w.png"}, - { NC_("RID_CUI_TIPOFTHEDAY", "Outline numbering lets you set text to be displayed before the chapter number. For example, type 'Chapter ' to display 'Chapter 1'"), "", "tipoftheday_w.png"}, + { NC_("RID_CUI_TIPOFTHEDAY", "Chapter numbering dialog lets you set text to be displayed before the chapter number. For example, type 'Chapter ' to display 'Chapter 1'"), "", "tipoftheday_w.png"}, { NC_("RID_CUI_TIPOFTHEDAY", "Want to know if a cell is referred in formulas of other cells? Tools > Detective > Trace Dependents (Shift+F5)."), "", "tipoftheday_c.png"}, { NC_("RID_CUI_TIPOFTHEDAY", "You can customize the middle mouse button per Tools > Options > %PRODUCTNAME > View > Middle Mouse button."), "", ""}, { NC_("RID_CUI_TIPOFTHEDAY", "To repeat rows/columns on every pages use Format > Print Ranges > Edit."), "", "tipoftheday_c.png"}, diff --git a/sw/inc/strings.hrc b/sw/inc/strings.hrc index 88171b13d638..1de4f3303db8 100644 --- a/sw/inc/strings.hrc +++ b/sw/inc/strings.hrc @@ -287,7 +287,7 @@ #define STR_REDLINE_UNKNOWN_AUTHOR NC_("STR_REDLINE_UNKNOWN_AUTHOR", "Unknown Author") #define STR_DELETE_NOTE_AUTHOR NC_("STR_DELETE_NOTE_AUTHOR", "Delete ~All Comments by $1") #define STR_HIDE_NOTE_AUTHORNC_("STR_HIDE_NOTE_AUTHOR", "H~ide All Comments by $1") -#define STR_OUTLINE_NUMBERING NC_("STR_OUTLINE_NUMBERING", "Outline Numbering") +#define STR_OUTLINE_NUMBERING NC_("STR_OUTLINE_NUMBERING", "Chapter Numbering") /* To translators: $1 == will be replaced by STR_WORDCOUNT_WORDARG, and $2 by STR_WORDCOUNT_COLARG e.g. Selected: 1 word, 2 characters */ #define STR_WORDCOUNT NC_("STR_WORDCOUNT", "Selected: $1, $2") ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/uiconfig
sw/uiconfig/swriter/ui/frmtypepage.ui |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3ab6d246cc44617af5ed416b5d49f2f35b61ceea Author: Roman Kuznetsov AuthorDate: Sat Apr 27 10:30:05 2019 +0200 Commit: Adolfo Jayme Barrientos CommitDate: Sat Apr 27 11:27:27 2019 +0200 tdf#101760 Rename "Follow text flow" as "Keep inside text boundaries" Change-Id: I6c602b80be566ad2b1af66715b660a561ac5ff2d Reviewed-on: https://gerrit.libreoffice.org/71407 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/sw/uiconfig/swriter/ui/frmtypepage.ui b/sw/uiconfig/swriter/ui/frmtypepage.ui index 6b233bd5f560..da442c366b22 100644 --- a/sw/uiconfig/swriter/ui/frmtypepage.ui +++ b/sw/uiconfig/swriter/ui/frmtypepage.ui @@ -695,7 +695,7 @@ -Follow text flow +Keep inside text boundaries True True False ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a08401155a0b4b49878e8e50d39b2fd3e5278779 Author: Roman Kuznetsov AuthorDate: Mon Apr 22 21:19:28 2019 +0200 Commit: Gerrit Code Review CommitDate: Tue Apr 23 13:03:02 2019 +0200 Update git submodules * Update helpcontent2 from branch 'master' - tdf#105848 Change EFFECTIVE function name to EFFECT Change-Id: Id2bd603a0330f1d85e665c0524635e0369061a18 Reviewed-on: https://gerrit.libreoffice.org/71079 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 5c561c2f3744..f52790876dae 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 5c561c2f3744c5697ea6d25357f4223f0dbe977e +Subproject commit f52790876dae6ffe59fd71bf5f59df33678f0b5a ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/inc sw/qa
sw/inc/strings.hrc| 15 ++- sw/qa/uitest/writer_tests2/formatParagraph.py |4 ++-- 2 files changed, 12 insertions(+), 7 deletions(-) New commits: commit 43c44f7c82fdcf7e5e6eccb0a80d5bb0e1e3a86c Author: Roman Kuznetsov AuthorDate: Tue Apr 2 08:30:17 2019 +0100 Commit: Mike Kaganski CommitDate: Thu Apr 4 12:42:00 2019 +0200 tdf#124471 Change bullet styles names in Style section of Sidebar Change-Id: I1a6acd3b9496cf83cd0e1ef6d808443cd40ae2c3 Reviewed-on: https://gerrit.libreoffice.org/70121 Tested-by: Jenkins Reviewed-by: Mike Kaganski diff --git a/sw/inc/strings.hrc b/sw/inc/strings.hrc index 93a8fcc1fcd2..5ee7196700e5 100644 --- a/sw/inc/strings.hrc +++ b/sw/inc/strings.hrc @@ -203,11 +203,16 @@ #define STR_POOLNUMRULE_NUM3NC_("STR_POOLNUMRULE_NUM3", "Numbering abc") #define STR_POOLNUMRULE_NUM4NC_("STR_POOLNUMRULE_NUM4", "Numbering IVX") #define STR_POOLNUMRULE_NUM5NC_("STR_POOLNUMRULE_NUM5", "Numbering ivx") -#define STR_POOLNUMRULE_BUL1NC_("STR_POOLNUMRULE_BUL1", "List 1") -#define STR_POOLNUMRULE_BUL2NC_("STR_POOLNUMRULE_BUL2", "List 2") -#define STR_POOLNUMRULE_BUL3NC_("STR_POOLNUMRULE_BUL3", "List 3") -#define STR_POOLNUMRULE_BUL4NC_("STR_POOLNUMRULE_BUL4", "List 4") -#define STR_POOLNUMRULE_BUL5NC_("STR_POOLNUMRULE_BUL5", "List 5") +//Bullet \u2022 +#define STR_POOLNUMRULE_BUL1NC_("STR_POOLNUMRULE_BUL1", "Bullet •") +//Bullet \u2013 +#define STR_POOLNUMRULE_BUL2NC_("STR_POOLNUMRULE_BUL2", "Bullet –") +//Bullet \uE4C4 +#define STR_POOLNUMRULE_BUL3NC_("STR_POOLNUMRULE_BUL3", "Bullet ") +//Bullet \uE49E +#define STR_POOLNUMRULE_BUL4NC_("STR_POOLNUMRULE_BUL4", "Bullet ") +//Bullet \uE20B +#define STR_POOLNUMRULE_BUL5NC_("STR_POOLNUMRULE_BUL5", "Bullet ") #define STR_COLUMN_VALUESET_ITEM0 NC_("STR_COLUMN_VALUESET_ITEM0", "1 column") #define STR_COLUMN_VALUESET_ITEM1 NC_("STR_COLUMN_VALUESET_ITEM1", "2 columns with equal size") #define STR_COLUMN_VALUESET_ITEM2 NC_("STR_COLUMN_VALUESET_ITEM2", "3 columns with equal size") diff --git a/sw/qa/uitest/writer_tests2/formatParagraph.py b/sw/qa/uitest/writer_tests2/formatParagraph.py index 22f985caed9e..916d6ce71c97 100644 --- a/sw/qa/uitest/writer_tests2/formatParagraph.py +++ b/sw/qa/uitest/writer_tests2/formatParagraph.py @@ -281,7 +281,7 @@ class formatParagraph(UITestCase): props = {"TEXT": "Level 1"} actionProps = mkPropertyValues(props) xOutline.executeAction("SELECT", actionProps) -props2 = {"TEXT": "List 1"} +props2 = {"TEXT": "Bullet •"} actionProps2 = mkPropertyValues(props2) xNumbering.executeAction("SELECT", actionProps2) xPara.executeAction("CLICK", tuple()) @@ -301,7 +301,7 @@ class formatParagraph(UITestCase): xParaSpin = xDialog.getChild("spinNF_RESTART_PARA") self.assertEqual(get_state_as_dict(xOutline)["SelectEntryText"], "Level 1") -self.assertEqual(get_state_as_dict(xNumbering)["SelectEntryText"], "List 1") +self.assertEqual(get_state_as_dict(xNumbering)["SelectEntryText"], "Bullet •") self.assertEqual(get_state_as_dict(xPara)["Selected"], "true") self.assertEqual(get_state_as_dict(xParaSpin)["Text"], "2") ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits