[Libreoffice-commits] core.git: Branch 'private/thb/gpg4libre' - comphelper/Library_comphelper.mk comphelper/source
comphelper/Library_comphelper.mk |1 +
comphelper/source/misc/storagehelper.cxx |7 ---
2 files changed, 5 insertions(+), 3 deletions(-)
New commits:
commit 67997a416ecf716a6686bcfd1b09d591bc28e744
Author: Thorsten Behrens
Date: Thu Oct 12 11:42:03 2017 +0200
Fix build
Change-Id: I6b457704bbe3ebbe5548e1d84fad92569dbecc4a
diff --git a/comphelper/Library_comphelper.mk b/comphelper/Library_comphelper.mk
index 25449f09d919..342cc1629db0 100644
--- a/comphelper/Library_comphelper.mk
+++ b/comphelper/Library_comphelper.mk
@@ -37,6 +37,7 @@ $(eval $(call gb_Library_add_defs,comphelper,\
))
$(eval $(call gb_Library_use_externals,comphelper,\
+ gpgmepp \
boost_headers \
icuuc \
icu_headers \
diff --git a/comphelper/source/misc/storagehelper.cxx
b/comphelper/source/misc/storagehelper.cxx
index 5f3defa34bf1..91e958ae3199 100644
--- a/comphelper/source/misc/storagehelper.cxx
+++ b/comphelper/source/misc/storagehelper.cxx
@@ -464,11 +464,11 @@ uno::Sequence< beans::NamedValue >
OStorageHelper::CreateGpgPackageEncryptionDat
std::unique_ptr ctx;
GpgME::Error err = GpgME::checkEngine(GpgME::OpenPGP);
if (err)
-throw RuntimeException("The GpgME library failed to initialize for the
OpenPGP protocol.");
+throw uno::RuntimeException("The GpgME library failed to initialize
for the OpenPGP protocol.");
ctx.reset( GpgME::Context::createForProtocol(GpgME::OpenPGP) );
if (ctx == nullptr)
-throw RuntimeException("The GpgME library failed to initialize for the
OpenPGP protocol.");
+throw uno::RuntimeException("The GpgME library failed to initialize
for the OpenPGP protocol.");
ctx->setArmor(false);
ctx->setKeyListMode(GPGME_KEYLIST_MODE_LOCAL);
std::vector keys;
@@ -476,6 +476,7 @@ uno::Sequence< beans::NamedValue >
OStorageHelper::CreateGpgPackageEncryptionDat
ctx->key(
"0x909BE2575CEDBEA3", err, true));
+#if 0
// good, ctx is setup now, let's sign the lot
GpgME::Data data_in(
reinterpret_cast(xmlSecBufferGetData(pDsigCtx->transformCtx.result)),
@@ -505,7 +506,7 @@ uno::Sequence< beans::NamedValue >
OStorageHelper::CreateGpgPackageEncryptionDat
aContainer[0].Value = makeAny(aGpgEncryptionData);
aContainer[1].Name = "EncryptionKey";
aContainer[1].Value = makeAny(aEncryptionData);
-
+#endif
(void)aDocName;
return aContainer;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
BlueGem Technologies license statement
All of my past & future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. -- BlueGem Technologies www.bluegemtech.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Tjipke license statement
All of my past & future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - vcl/aqua vcl/Library_vcl.mk
vcl/Library_vcl.mk |7 +-- vcl/aqua/source/dtrans/PictToBmpFlt.cxx |2 +- 2 files changed, 6 insertions(+), 3 deletions(-) New commits: commit 3215360f49ce63f773db32d1640de1e23c040b78 Author: Jim Jagielski Date: Thu Oct 12 15:32:34 2017 + macOS compilation fixes, mostly due to 10.7/10.9 SDK differences and items deprecated diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 0f6393ce9ec1..673e0e680ba1 100755 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -106,13 +106,15 @@ $(eval $(call gb_Library_add_libs,vcl,\ endif ifeq ($(OS),MACOSX) -$(eval $(call gb_Library_set_ldflags,vcl,\ +$(eval $(call gb_Library_add_ldflags,vcl,\ $$(LDFLAGS) \ )) endif ifeq ($(GUIBASE),aqua) $(eval $(call gb_Library_add_cxxflags,vcl,\ +$$(CXXFLAGS) \ +$$(OBJCXXFLAGS) \ $(gb_OBJCXXFLAGS) \ )) ifeq ($(ENABLE_CAIRO),TRUE) @@ -503,13 +505,14 @@ $(eval $(call gb_Library_add_linked_libs,vcl,\ AppleRemote \ )) $(eval $(call gb_Library_add_libs,vcl,\ +$$(LDFLAGS) \ -framework Cocoa \ -framework Carbon \ -framework CoreFoundation \ )) # ??? what about this ifneq ($(MACOSX_DEPLOYMENT_TARGET),10.7) -$(eval $(call gb_Library_set_ldflags,vcl, $$(LDFLAGS) -framework QuickTime )) +$(eval $(call gb_Library_add_ldflags,vcl, $$(LDFLAGS) -framework QuickTime )) endif endif diff --git a/vcl/aqua/source/dtrans/PictToBmpFlt.cxx b/vcl/aqua/source/dtrans/PictToBmpFlt.cxx index ef103a8a2f80..549edeba3a44 100644 --- a/vcl/aqua/source/dtrans/PictToBmpFlt.cxx +++ b/vcl/aqua/source/dtrans/PictToBmpFlt.cxx @@ -31,7 +31,7 @@ #define DEPRECATED_ATTRIBUTE #include -#include +// #include #include #include "PictToBmpFlt.hxx" ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/control/tabctrl.cxx | 123 ++---
1 file changed, 20 insertions(+), 103 deletions(-)
New commits:
commit 4454feb360cc0c832adc21a38e21074d00baa456
Author: Szymon KÅos
Date: Sun Oct 1 20:48:16 2017 +0200
Notebookbar: allow only one tab line
Change-Id: I5f671bdc34e5852af06c99db93e859e8cf837c0d
Reviewed-on: https://gerrit.libreoffice.org/43009
Tested-by: Jenkins
Reviewed-by: Szymon KÅos
diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index 27d6ffee522e..bcc767b62ce8 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -2355,6 +2355,7 @@ bool NotebookbarTabControlBase::ImplPlaceTabs( long
nWidth )
long nMaxWidth = nWidth - HAMBURGER_DIM;
long nShortcutsWidth = m_pShortcuts != nullptr ?
m_pShortcuts->GetSizePixel().getWidth() + 1 : 0;
+long nFullWidth = nShortcutsWidth;
const long nOffsetX = 2 + GetItemsOffset().X() + nShortcutsWidth;
const long nOffsetY = 2 + GetItemsOffset().Y();
@@ -2371,7 +2372,13 @@ bool NotebookbarTabControlBase::ImplPlaceTabs( long
nWidth )
{
long aSize = ImplGetItemSize( &(*it), nMaxWidth ).getWidth();
if( !it->maText.isEmpty() && aSize < 100)
+{
+nFullWidth += 100;
aSize = 100;
+}
+else
+nFullWidth += aSize;
+
aWidths.push_back(aSize);
}
else
@@ -2388,13 +2395,8 @@ bool NotebookbarTabControlBase::ImplPlaceTabs( long
nWidth )
long nX = nOffsetX;
long nY = nOffsetY;
-sal_uInt16 nLines = 0;
-sal_uInt16 nCurLine = 0;
-
long nLineWidthAry[100];
-sal_uInt16 nLinePosAry[101];
nLineWidthAry[0] = 0;
-nLinePosAry[0] = 0;
size_t nIndex = 0;
sal_uInt16 nPos = 0;
@@ -2404,25 +2406,6 @@ bool NotebookbarTabControlBase::ImplPlaceTabs( long
nWidth )
{
Size aSize = ImplGetItemSize( &(*it), nMaxWidth );
-bool bNewLine = false;
-if (!aBreakIndexes.empty() && nIndex > aBreakIndexes.front())
-{
-aBreakIndexes.pop_front();
-bNewLine = true;
-}
-
-if ( bNewLine && (nWidth > 2+nOffsetX) )
-{
-if ( nLines == 99 )
-break;
-
-nX = nOffsetX;
-nY += aSize.Height();
-nLines++;
-nLineWidthAry[nLines] = 0;
-nLinePosAry[nLines] = nPos;
-}
-
if ( !it->mbEnabled )
{
nPos++;
@@ -2430,7 +2413,7 @@ bool NotebookbarTabControlBase::ImplPlaceTabs( long
nWidth )
}
// set minimum tab size
-if( !it->maText.isEmpty() && aSize.getWidth() < 100)
+if( nFullWidth < nMaxWidth && !it->maText.isEmpty() &&
aSize.getWidth() < 100)
aSize.Width() = 100;
if( !it->maText.isEmpty() && aSize.getHeight() < 28 )
@@ -2441,95 +2424,29 @@ bool NotebookbarTabControlBase::ImplPlaceTabs( long
nWidth )
mbSmallInvalidate = false;
it->maRect = aNewRect;
-it->mnLine = nLines;
+it->mnLine = 0;
it->mbFullVisible = true;
-nLineWidthAry[nLines] += aSize.Width();
+nLineWidthAry[0] += aSize.Width();
nX += aSize.Width();
-if ( it->mnId == mnCurPageId )
-nCurLine = nLines;
-
nPos++;
}
-if ( nLines )
-{ // two or more lines
-long nLineHeightAry[100];
-long nIH = mpTabCtrlData->maItemList[0].maRect.Bottom()-2;
-
-for ( sal_uInt16 i = 0; i < nLines+1; i++ )
-{
-if ( i <= nCurLine )
-nLineHeightAry[i] = nIH*(nLines-(nCurLine-i)) +
GetItemsOffset().Y();
-else
-nLineHeightAry[i] = nIH*(i-nCurLine-1) + GetItemsOffset().Y();
-}
-
-nLinePosAry[nLines+1] = (sal_uInt16)mpTabCtrlData->maItemList.size();
-
-long nDX = 0;
-long nModDX = 0;
-long nIDX = 0;
-
-sal_uInt16 i = 0;
-sal_uInt16 n = 0;
+// only one line
+if(ImplGetSVData()->maNWFData.mbCenteredTabs)
+{
+int nRightSpace = nMaxWidth;//space left on the right by the tabs
for( std::vector< ImplTabItem >::iterator it =
mpTabCtrlData->maItemList.begin();
- it != mpTabCtrlData->maItemList.end(); ++it )
+it != mpTabCtrlData->maItemList.end(); ++it )
{
-if ( i == nLinePosAry[n] )
-{
-if ( n == nLines+1 )
-break;
-
-nIDX = 0;
-if( nLinePosAry[n+1]-i > 0 )
-{
-long nAvailableWidth = nWidth - nOffsetX -
nLineWidthAry[n] - HAMBURGER_DIM;
-nDX = nAvailableWidth / ( nLinePosAry[n+1] - i );
-nModDX = nAvailableWidth % ( nLinePosAry[n+1] - i );
-}
-else
-
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9261939c6f1566d00c2403460cb42482b0f5b5d6 Author: Ilmari Lauhakangas Date: Thu Oct 12 19:58:06 2017 +0200 Updated core Project: help 54d40a66cc5bdf829be02c0f5a0f6feb48ccb901 Tweak the language menu Simplified the markup and tweaked the look a bit. Change-Id: Ifc296a82b17215e7bcfbfc17432aacddb922664b Reviewed-on: https://gerrit.libreoffice.org/43345 Reviewed-by: Olivier Hallot Tested-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 6e8527a15389..54d40a66cc5b 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 6e8527a15389c64292665175159aabfa0a463bab +Subproject commit 54d40a66cc5bdf829be02c0f5a0f6feb48ccb901 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: help3xsl/default.css help3xsl/online_transform.xsl
help3xsl/default.css | 32 ++
help3xsl/online_transform.xsl | 134 +-
2 files changed, 88 insertions(+), 78 deletions(-)
New commits:
commit 54d40a66cc5bdf829be02c0f5a0f6feb48ccb901
Author: Ilmari Lauhakangas
Date: Thu Oct 12 19:58:06 2017 +0200
Tweak the language menu
Simplified the markup and tweaked the look a bit.
Change-Id: Ifc296a82b17215e7bcfbfc17432aacddb922664b
Reviewed-on: https://gerrit.libreoffice.org/43345
Reviewed-by: Olivier Hallot
Tested-by: Olivier Hallot
diff --git a/help3xsl/default.css b/help3xsl/default.css
index d686169b1..4feb3ae04 100644
--- a/help3xsl/default.css
+++ b/help3xsl/default.css
@@ -231,14 +231,16 @@ header {
float: left;
margin-right: .5em;
}
-header ul {
+header nav {
margin-top: .7em;
padding: 0;
display: none;
+border: 1px solid;
+position: relative;
}
/* Create a style for the first level items */
-header > ul > li > a {
+header nav a {
color: #33;
background-color: #EE;
display: block;
@@ -246,17 +248,19 @@ header > ul > li > a {
padding: 0.2em 0.4em;
text-decoration: none;
font-weight: bold;
-border: 1px solid;
+border-width: 0 1px 0 0;
+border-style: solid;
border-color: #33;
font-size: 1.5em;
-}
-header ul li {
-/* make sure the width is honored */
-
flex-shrink: 0;
-list-style-type: none;
z-index: 100;
+white-space: nowrap;
+}
+
+header nav a:last-child {
+border-right-width: 0;
}
+
header label {
cursor: pointer;
font-size: 1.2em;
@@ -264,7 +268,7 @@ header label {
top: 2em;
float: right;
}
-header input[type="checkbox"]:checked ~ ul {
+header input[type="checkbox"]:checked ~ nav {
background: #f1f1f1;
color: #444;
z-index: 100;
@@ -275,6 +279,7 @@ header input[type="checkbox"]:checked ~ ul {
/* allow for scrolling */
overflow-x: auto;
+overflow-y: hidden;
/* make it smooth on iOS */
-webkit-overflow-scrolling: touch;
@@ -559,12 +564,17 @@ header input[type=checkbox],
max-width: 1024px;
margin: auto;
}
-header > ul > li > a {
+header nav a {
font-size: 1em;
+white-space: normal;
+border-width: 0 0 1px 0;
+}
+header nav a:last-child {
+border-bottom-width: 0;
}
/* change the language menu direction to stacked */
-header input[type="checkbox"]:checked ~ ul {
+header input[type="checkbox"]:checked ~ nav {
flex-direction: column;
max-width: 7.5em;
float: right;
diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl
index f3ddebee4..1d036fdb7 100644
--- a/help3xsl/online_transform.xsl
+++ b/help3xsl/online_transform.xsl
@@ -144,73 +144,73 @@
â¼
-
-English
(USA)
-á
ááá
-اÙعربÙØ©
-Asturianu
-ÐÑлгаÑÑки
-বাà¦à¦²à¦¾
-বাà¦à¦²à¦¾
-à½à½¼à½à¼à½¡à½²à½ / Bod skad
-Bosanski
-CatalÃ
-CatalÃ
-Valencia
-Äesky
-Dansk
-Deutsch
-
à½à½¼à½à¼à½
-Îλληνικά
-English
(GB)
-English
(ZA)
-Esperanto
-Español
-Eesti
-Euskara
-Suomi
-Français
-Galego
-àªà«àªàª°àª¾àª¤à«
-×¢×ר×ת
-हिनà¥à¤¦à¥
-Hrvatski
-Magyar
-Bahasa
Indonesia
-Ãslenska
-Italiano
-æ¥æ¬èª
-á¥áá
áá£áá
-áá¶áá¶ááááá
-íêµì´
-ລາວ
-Lietuvių
-Latviešu
-ÐакедонÑки
-Norsk (bokmål /
riksmål)
-नà¥à¤ªà¤¾à¤²à¥
-Nederlands
-Norsk
(nynorsk)
-Oromoo
-Polski
-Português
-Português do
Brasil
-RomânÄ
-Ð
ÑÑÑкий
-à·à·à¶à·à¶½
-Sidámo
'Afó
-SlovenÄina
-SlovenÅ¡Äina
-Shqip
-Svenska
-தமிழà¯
-Тоҷикӣ
-Türkçe
-ئÛÙغÛرÚÛ
-УкÑаÑнÑÑка
-Tiếng
Viá»t
-ä¸æ
(ç®ä½å)
-ä¸æ
(æ£é«å)â¬
-
+
+English (USA)
+
[Libreoffice-commits] core.git: sc/source
sc/source/core/inc/interpre.hxx | 26 +- 1 file changed, 13 insertions(+), 13 deletions(-) New commits: commit 0c1ccab0d559b01a69ba5b1b598bc2c885ffa8d1 Author: Johnny_M Date: Tue Oct 3 11:52:49 2017 +0200 Translate German variable names in Calc (financial) These names of variables correspond to German function names in Calc and were translated to their English equivalents. For used translations, see, e.g., https://translations.documentfoundation.org/de/libo54_help/translate/#search=RMZ&sfields=target&soptions=exact,case Note: This is an alignment of the function declaration to the definitions in /core/sc/source/core/tool/interpr2.cxx, some of which were translated on f8b9b8ec5686c1453e335d895aa78faba5fdf268, while others were already in English. Change-Id: Ifb01992e42af707a08a02139ffb8313d3b92701c Reviewed-on: https://gerrit.libreoffice.org/43077 Tested-by: Jenkins Reviewed-by: Eike Rathke diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx index fa257e8c6f04..bd9008d47bde 100644 --- a/sc/source/core/inc/interpre.hxx +++ b/sc/source/core/inc/interpre.hxx @@ -771,32 +771,32 @@ private: void ScMIRR(); void ScISPMT(); -static double ScGetBw(double fInterest, double fZzr, double fRmz, - double fZw, bool bPayInAdvance); +static double ScGetBw(double fInterest, double fNper, double fPmt, + double fFv, bool bPayInAdvance); void ScPV(); void ScSYD(); -static double ScGetGDA(double fWert, double fRest, double fDauer, - double fPeriode, double fFactor); +static double ScGetGDA(double fValue, double fRest, double fTimeLength, + double fPeriod, double fFactor); void ScDDB(); void ScDB(); -static double ScInterVDB(double fWert,double fRest,double fDauer,double fDauer1, -double fPeriode,double fFactor); +static double ScInterVDB(double fValue, double fRest, double fTimeLength, double fTimeLength1, + double fPeriod, double fFactor); void ScVDB(); void ScPDuration(); void ScSLN(); -static double ScGetRmz(double fInterest, double fZzr, double fBw, - double fZw, bool bPayInAdvance); +static double ScGetRmz(double fInterest, double fNper, double fPv, + double fFv, bool bPayInAdvance); void ScPMT(); void ScRRI(); -static double ScGetZw(double fInterest, double fZzr, double fRmz, - double fBw, bool bFlag); +static double ScGetZw(double fInterest, double fNper, double fPmt, + double fPv, bool bFlag); void ScFV(); void ScNper(); static bool RateIteration(double fNper, double fPayment, double fPv, -double fFv, bool bPayType, double& fGuess); + double fFv, bool bPayType, double& fGuess); void ScRate(); -double ScGetCompoundInterest(double fInterest, double fZr, double fZzr, double fBw, - double fZw, bool bPayInAdvance, double& fRmz); +double ScGetCompoundInterest(double fInterest, double fPer, double fNper, double fPv, + double fFv, bool bPayInAdvance, double& fPmt); void ScIpmt(); void ScPpmt(); void ScCumIpmt(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: tools/Config.cpp
tools/Config.cpp |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 11ad1b4ab98706e73ad208c79da2e52d9857cc19
Author: Andras Timar
Date: Thu Oct 12 21:40:55 2017 +0200
loolconfig: don't show option for set-support-key, it it's not compiled in
Change-Id: Ie3baeee860e5ef0a797a3061373e266f40b41809
diff --git a/tools/Config.cpp b/tools/Config.cpp
index 6de6597f..dcf3d07a 100644
--- a/tools/Config.cpp
+++ b/tools/Config.cpp
@@ -118,10 +118,12 @@ void Config::defineOptions(OptionSet& optionSet)
.repeatable(false)
.argument("number"));
+#if ENABLE_SUPPORT_KEY
optionSet.addOption(Option("support-key", "", "Specify the support key
[set-support-key].")
.required(false)
.repeatable(false)
.argument("key"));
+#endif
}
void Config::handleOption(const std::string& optionName, const std::string&
optionValue)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: desktop/source
desktop/source/app/cmdlinehelp.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 75d78b09438dcfa045626efd9f19d4a91a031e26 Author: Cor Nouws Date: Thu Oct 12 21:03:34 2017 +0200 EPUB export: add simple example to command line help Change-Id: Ia1a03f324e9b66dc36abadc326843b88b33ed249 Reviewed-on: https://gerrit.libreoffice.org/43348 Tested-by: Jenkins Reviewed-by: Miklos Vajna diff --git a/desktop/source/app/cmdlinehelp.cxx b/desktop/source/app/cmdlinehelp.cxx index 43028a72fd10..07b5672ef377 100644 --- a/desktop/source/app/cmdlinehelp.cxx +++ b/desktop/source/app/cmdlinehelp.cxx @@ -154,7 +154,8 @@ namespace desktop " used more than once, the last value of OutputFileExtension\n" " [:OutputFilterName] is effective. If --outdir is used more\n" " than once, only its last value is effective. For example:\n" -" --convert-to pdf *.doc\n" +" --convert-to pdf *.odt\n" +" --convert-to epub *.doc\n" " --convert-to pdf:writer_pdf_Export --outdir /home/user *.doc\n" " --convert-to \"html:XHTML Writer File:UTF8\" *.doc\n" " --convert-to \"txt:Text (encoded):UTF8\" *.doc\n" ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Stoyan Dimitrov [:stoyan] license statement
All of my past & future contributions to LibreOffice may be licensed under the WTFPL license and if needed migrated to MPLv2/LGPLv3+ dual license. -- С.___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/core/layout/dbg_lay.cxx | 11 ++-
1 file changed, 6 insertions(+), 5 deletions(-)
New commits:
commit 3672cdd35985201ea87463cf032fedd02c052f4d
Author: Miklos Vajna
Date: Thu Oct 12 21:00:43 2017 +0200
sw: resurrect dbg_lay functionality
Example instdir/program/dbg_lay.ini:
# 0x0007
[record] 524287
This logs all functions and all frames. To have it:
1) Don't mention hex values in the example, support for this was removed
in ef513fd4b049b214a03fbe6e62a5ea43680a7a9b (remove unnecessary use of
OString::getStr, 2017-05-26).
2) "all frame IDs" is represented with a nullptr, so don't clear it
unconditionally.
3) Fix two other regressions from bytestring conversion in commit
778ef20d74ce499e4e0c4b0e3e4506b44938b975 (sw now ByteString free except
for windows related ones, 2011-11-04).
(Additionally you need a dbgutil build, dbg_lay.go has to exists in the
same dir, and output goes to dbg_lay.out in the same dir.)
Change-Id: Ida0f3032f11225f1d079cdcbb05ec64c42a71e5d
Reviewed-on: https://gerrit.libreoffice.org/43347
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/sw/source/core/layout/dbg_lay.cxx
b/sw/source/core/layout/dbg_lay.cxx
index 23c3d879306a..2baa1a7bd469 100644
--- a/sw/source/core/layout/dbg_lay.cxx
+++ b/sw/source/core/layout/dbg_lay.cxx
@@ -82,8 +82,8 @@
* listed; default is 0 which means that none are logged. It's also
* possible to remove functions using '!'.
* An example INI file:
- * #Functions: all, except PRTARE
- * [record] 0xFFFE !0x200
+ * #Functions: all(0x0007), except PrintArea (0x200)
+ * [record] 524287 !512
* [frmid]
* #the following FrameIds:
* 1 2 12 13 14 15
@@ -282,7 +282,8 @@ SwImplProtocol::~SwImplProtocol()
pStream->Close();
delete pStream;
}
-pFrameIds->clear();
+if (pFrameIds)
+pFrameIds->clear();
delete pFrameIds;
aVars.clear();
}
@@ -339,7 +340,7 @@ void SwImplProtocol::CheckLine( OString& rLine )
{
OString aTok = rLine.getToken( 0, ' ', nIndex );
bool bNo = false;
-if( '!' == aTok[0] )
+if( !aTok.isEmpty() && '!' == aTok[0] )
{
bNo = true; // remove this function/type
aTok = aTok.copy(1);
@@ -407,7 +408,7 @@ void SwImplProtocol::FileInit()
aLine.clear();
}
else
-aLine = OString(c);
+aLine += OString(c);
}
if( !aLine.isEmpty() )
CheckLine( aLine ); // evaluate last line
___
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/notebookbar_groupedbar_compact.ui | 321 --- 1 file changed, 172 insertions(+), 149 deletions(-) New commits: commit 923cea6817e29405a8cdf3b3f608fef84aeb4ec1 Author: Szymon KÅos Date: Sat Sep 9 15:57:31 2017 +0200 tdf#107239 make PriorityHBox working in the compact notebookbar Change-Id: Iaf087dcf71714338718088c5265d41df7e8beef4 Reviewed-on: https://gerrit.libreoffice.org/42125 Tested-by: Jenkins Reviewed-by: andreas_kainz diff --git a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui index 1bcc0e3a44c3..76f657ac5978 100644 --- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui +++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui @@ -1,5 +1,5 @@ - + @@ -3900,6 +3900,138 @@ 5 bottom + +True +False +end +5 + + +True +False +vertical + + +True +False +end + + +True +False +icons +False + + +True +True +.uno:SearchDialog + + +False +True + + + + +False +True +0 + + + + +_Menu +True +True +False +center +True +none +True + + +False +True +1 + + + + +False +True +0 + + + + +True +False + + +True +False +end +True +icons +False +1 + + +True +True +.uno:HelpIndex + + +False +True + + + + +False +True +0 + + + + +_Tools +True +True +False +none +True + + +False +True +1 + + + + +False +True +1 + + + + +False +True +0 + + + + +False +False +end +0 + + + True False @@ -4012,7 +4144,22 @@ False True -0 +1 + + + + +
[Libreoffice-commits] core.git: jvmfwk/plugins jvmfwk/source
jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx| 50 +---
jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx | 40 ++--
jvmfwk/plugins/sunmajor/pluginlib/util.cxx | 33 +
jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx| 37 ++
jvmfwk/source/elements.cxx | 15 ++
jvmfwk/source/framework.cxx | 26 +++---
6 files changed, 84 insertions(+), 117 deletions(-)
New commits:
commit 2ea531c0578bb7f0a34ec7de0aaea595e0387928
Author: Julien Nabet
Date: Thu Oct 12 20:32:17 2017 +0200
Use loop ranges in jvmfwk
to simplify and avoid all the typedefs
Change-Id: Ia14337dd71b55fc24f162b5436af76aeeb8d2575
Reviewed-on: https://gerrit.libreoffice.org/43346
Reviewed-by: Noel Grandin
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
index 4485828a8926..22285bb0c18c 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
@@ -97,7 +97,6 @@ bool GnuInfo::initialize(vector >
props)
//javax.accessibility.assistive_technologies from system properties
OUString sJavaLibraryPath;
-typedef vector >::const_iterator it_prop;
OUString const sVendorProperty("java.vendor");
OUString const sVersionProperty("java.version");
OUString const sJavaHomeProperty("java.home");
@@ -112,28 +111,27 @@ bool GnuInfo::initialize(vector
> props)
bool bJavaLibraryPath = false;
bool bAccess = false;
-typedef vector >::const_iterator it_prop;
-for (it_prop i = props.begin(); i != props.end(); ++i)
+for (auto const& prop : props)
{
-if(! bVendor && sVendorProperty == i->first)
+if(! bVendor && sVendorProperty == prop.first)
{
-m_sVendor = i->second;
+m_sVendor = prop.second;
bVendor = true;
}
-else if (!bVersion && sVersionProperty == i->first)
+else if (!bVersion && sVersionProperty == prop.first)
{
-m_sVersion = i->second;
+m_sVersion = prop.second;
bVersion = true;
}
-else if (!bHome && sGNUHomeProperty == i->first)
+else if (!bHome && sGNUHomeProperty == prop.first)
{
-m_sHome = i->second;
+m_sHome = prop.second;
bHome = true;
}
-else if (!bJavaHome && sJavaHomeProperty == i->first)
+else if (!bJavaHome && sJavaHomeProperty == prop.first)
{
OUString fileURL;
- if (osl_getFileURLFromSystemPath(i->second.pData,& fileURL.pData) ==
+ if (osl_getFileURLFromSystemPath(prop.second.pData,& fileURL.pData)
==
osl_File_E_None)
{
//make sure that the drive letter have all the same case
@@ -146,15 +144,15 @@ bool GnuInfo::initialize(vector
> props)
}
}
}
-else if (!bJavaLibraryPath && sJavaLibraryPathProperty == i->first)
+else if (!bJavaLibraryPath && sJavaLibraryPathProperty == prop.first)
{
sal_Int32 nIndex = 0;
-osl_getFileURLFromSystemPath(i->second.getToken(0, ':',
nIndex).pData, &sJavaLibraryPath.pData);
+osl_getFileURLFromSystemPath(prop.second.getToken(0, ':',
nIndex).pData, &sJavaLibraryPath.pData);
bJavaLibraryPath = true;
}
-else if (!bAccess && sAccessProperty == i->first)
+else if (!bAccess && sAccessProperty == prop.first)
{
-if (!i->second.isEmpty())
+if (!prop.second.isEmpty())
{
m_bAccessibility = true;
bAccess = true;
@@ -179,11 +177,10 @@ bool GnuInfo::initialize(vector
> props)
vector libpaths = getVectorFromCharArray(arRtPaths, size);
bool bRt = false;
-typedef vector::const_iterator i_path;
-for(i_path ip = libpaths.begin(); ip != libpaths.end(); ++ip)
+for (auto const& libpath : libpaths)
{
//Construct an absolute path to the possible runtime
-OUString usRt= m_sHome + *ip;
+OUString usRt= m_sHome + libpath;
DirectoryItem item;
if(DirectoryItem::get(usRt, item) == File::E_None)
{
@@ -197,10 +194,10 @@ bool GnuInfo::initialize(vector
> props)
if (!bRt)
{
m_sHome = m_sJavaHome;
-for(i_path ip = libpaths.begin(); ip != libpaths.end(); ++ip)
+for (auto const& libpath : libpaths)
{
//Construct an absolute path to the possible runtime
-OUString usRt= m_sHome + *ip;
+OUString usRt= m_sHome + libpath;
DirectoryItem item;
if(DirectoryItem::get(usRt, item) == File::E_None)
{
@@ -216,10 +213,10 @@ bool GnuInfo::initialize(vector
> props)
[Libreoffice-commits] core.git: include/oox oox/source sd/qa
include/oox/drawingml/drawingmltypes.hxx | 15 +++
oox/source/export/chartexport.cxx| 22 +-
oox/source/export/drawingml.cxx |4 +++-
sd/qa/unit/data/pptx/smartart-rotation2.pptx |binary
sd/qa/unit/export-tests-ooxml2.cxx | 13 +
5 files changed, 32 insertions(+), 22 deletions(-)
New commits:
commit 3cbb6e73ecbff5d83be817c0dab680c5d925c6fa
Author: Szymon KÅos
Date: Fri Oct 6 16:04:25 2017 +0200
SmartArt: export text rotation in the PPTX
Change-Id: I74bfc172fe7434d14de468ecfd3412636e53780c
Reviewed-on: https://gerrit.libreoffice.org/43202
Tested-by: Jenkins
Reviewed-by: Szymon KÅos
diff --git a/include/oox/drawingml/drawingmltypes.hxx
b/include/oox/drawingml/drawingmltypes.hxx
index 0b1ea4be7c72..751f7865c374 100644
--- a/include/oox/drawingml/drawingmltypes.hxx
+++ b/include/oox/drawingml/drawingmltypes.hxx
@@ -151,6 +151,21 @@ struct IndexRange {
/** retrieve the content of CT_IndexRange */
IndexRange GetIndexRange( const css::uno::Reference<
css::xml::sax::XFastAttributeList >& xAttributes );
+/**
+* nRotation is a 100th of a degree and the return value is
+* in a 60,000th of a degree
+*
+* Also rotation is in opposite directions so multiply with -1
+*/
+inline OString calcRotationValue(sal_Int32 nRotation)
+{
+if (nRotation > 18000) // 180 degree
+{
+nRotation -= 36000;
+}
+nRotation *= -600;
+return OString::number(nRotation);
+}
const sal_Int32 EMU_PER_HMM = 360; /// 360 EMUs per 1/100 mm.
const sal_Int32 EMU_PER_PT = 12700;
diff --git a/oox/source/export/chartexport.cxx
b/oox/source/export/chartexport.cxx
index e3b69806df07..ffd1481ffdbe 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -893,26 +893,6 @@ void ChartExport::exportLegend( const Reference<
css::chart::XChartDocument >& x
pFS->endElement( FSNS( XML_c, XML_legend ) );
}
-namespace {
-
-/**
- * nRotation is a 100th of a degree and the return value is
- * in a 60,000th of a degree
- *
- * Also rotation is in opposite directions so multiply with -1
- */
-OString calcRotationValue(sal_Int32 nRotation)
-{
-if (nRotation > 18000) // 180 degree
-{
-nRotation -= 36000;
-}
-nRotation *= -600;
-return OString::number(nRotation);
-}
-
-}
-
void ChartExport::exportTitle( const Reference< XShape >& xShape )
{
OUString sText;
@@ -945,7 +925,7 @@ void ChartExport::exportTitle( const Reference< XShape >&
xShape )
pFS->singleElement( FSNS( XML_a, XML_bodyPr ),
XML_vert, sWritingMode,
-XML_rot, calcRotationValue(nRotation).getStr(),
+XML_rot, oox::drawingml::calcRotationValue(nRotation).getStr(),
FSEND );
// TODO: lstStyle
pFS->singleElement( FSNS( XML_a, XML_lstStyle ),
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 64e916e1033f..5beb7212ce0b 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -2224,6 +2224,8 @@ void DrawingML::WriteText( const Reference< XInterface >&
rXIface, const OUStrin
if( !xXText.is() )
return;
+sal_Int32 nTextRotateAngle = 0;
+
#define DEFLRINS 254
#define DEFTBINS 127
sal_Int32 nLeft, nRight, nTop, nBottom;
@@ -2263,7 +2265,6 @@ void DrawingML::WriteText( const Reference< XInterface >&
rXIface, const OUStrin
{
for ( sal_Int32 i = 0, nElems = aProps.getLength(); i < nElems;
++i )
{
-sal_Int32 nTextRotateAngle = 0;
if ( aProps[ i ].Name == "TextPreRotateAngle" && ( aProps[ i
].Value >>= nTextRotateAngle ) )
{
if ( nTextRotateAngle == -90 )
@@ -2320,6 +2321,7 @@ void DrawingML::WriteText( const Reference< XInterface >&
rXIface, const OUStrin
XML_anchor, sVerticalAlignment,
XML_anchorCtr, bHorizontalCenter ? "1" :
nullptr,
XML_vert, sWritingMode,
+ XML_rot, (nTextRotateAngle != 0) ?
oox::drawingml::calcRotationValue( nTextRotateAngle * 100 ).getStr() : nullptr,
FSEND );
if( !presetWarp.isEmpty())
{
diff --git a/sd/qa/unit/data/pptx/smartart-rotation2.pptx
b/sd/qa/unit/data/pptx/smartart-rotation2.pptx
new file mode 100755
index ..e1c4493a7407
Binary files /dev/null and b/sd/qa/unit/data/pptx/smartart-rotation2.pptx differ
diff --git a/sd/qa/unit/export-tests-ooxml2.cxx
b/sd/qa/unit/export-tests-ooxml2.cxx
index 1ba4f1362d23..acbeaa7142bb 100644
--- a/sd/qa/unit/export-tests-ooxml2.cxx
+++ b/sd/qa/unit/export-tests-ooxml2.cxx
@@ -119,6 +119,7 @@ public:
void testTdf112647();
void testGroupRotation();
void testTdf104788();
+void testSmartartRotation2();
CPPUNIT_TEST_SUITE(SdOOXMLExportTest2);
@@
[Libreoffice-commits] core.git: sw/uiconfig
sw/uiconfig/swriter/ui/notebookbar_compact.ui| 4904 +-- sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui | 56 sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui| 54 3 files changed, 3221 insertions(+), 1793 deletions(-) New commits: commit d029193e8a4172cd2b08db203d6ec091749d15bf Author: andreas kainz Date: Fri Oct 13 01:45:29 2017 +0200 update notebookbar with better dropdown menues Change-Id: I1af49673e4eab35ea33d8d306773eef41c97807b Reviewed-on: https://gerrit.libreoffice.org/43356 Reviewed-by: andreas_kainz Tested-by: andreas_kainz diff --git a/sw/uiconfig/swriter/ui/notebookbar_compact.ui b/sw/uiconfig/swriter/ui/notebookbar_compact.ui index 2139141761ee..b1c771b3cd21 100644 --- a/sw/uiconfig/swriter/ui/notebookbar_compact.ui +++ b/sw/uiconfig/swriter/ui/notebookbar_compact.ui @@ -245,1461 +245,2456 @@ - + True False - + True False -.uno:AddDirect +.uno:Undo - + True False -.uno:AutoPilotMenu +.uno:Redo - + True False -.uno:NewDoc +.uno:Repeat - + True False - + True False -.uno:OpenFromWriter +.uno:Cut - + True False -.uno:OpenRemote +.uno:Copy - + True False -.uno:RecentFileList +.uno:Paste - + True False +.uno:PasteSpecial - + True False -.uno:Reload +.uno:PasteUnformatted - + True False -.uno:VersionDialog - + True False -.uno:CloseDoc +.uno:SelectAll - + True False +.uno:SelectionModeDefault - + True False -.uno:Save +.uno:SelectionModeBlock - + True False -.uno:SaveAsRemote +.uno:SelectTextMode - + True False -.uno:SaveAs +.uno:ShadowCursor - + True False - + True False -.uno:CheckOut +vnd.sun.star.findbar:FocusToFindbar - + True False -.uno:CancelCheckOut +.uno:SearchDialog - + True False -.uno:CheckIn +.uno:GotoPage - + True False - + True False -.uno:ExportTo +.uno:TrackChanges - + True False -.uno:ExportToPDF +.uno:ShowTrackedChanges - + True False -.uno:ExportToEPUB +.uno:AcceptTrackedChanges - + True False - + True False -.uno:SendMail +.uno:ProtectTraceChangeMode - + True False -.uno:SendViaBluetooth +.uno:CompareDocuments - + True False -.uno:NewGlobalDoc +.uno:MergeDocuments - + True False - + True False -.uno:WebHtml +.uno:EditHyperlink - + True False -.uno:PrintPreview +.uno:EditFootnote - + True False -.uno:Print +.uno:IndexEntryDialog - + True False -.uno:PrinterSetup +.uno:AuthoritiesEntryDialog - + True False +.uno:FieldDialog - + True False -.uno:Signature +.uno:LinkDialog - + True False -.uno:SignPDF +.uno:ImageMapDialog - + True False -.uno:SetDocumentProperties +.uno:ObjectMenue - + True False +.uno:ChangeDatabaseField - + True False -.uno:Quit
[Libreoffice-commits] core.git: configmgr/source
configmgr/source/components.cxx | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit a5a905e7ff2e3a19020b6c486e77695aece71b8c
Author: Julien Nabet
Date: Thu Oct 12 23:55:20 2017 +0200
Replace list by vector in components (configmgr)
Change-Id: I772b9b1b1d8fdbbc1dc7e38904490a6533686a90
Reviewed-on: https://gerrit.libreoffice.org/43353
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx
index 3b4111bc0fb9..7459ef4e5d45 100644
--- a/configmgr/source/components.cxx
+++ b/configmgr/source/components.cxx
@@ -23,7 +23,7 @@
#include
#include
#include
-#include
+#include
#include
#include
@@ -79,17 +79,17 @@ namespace configmgr {
namespace {
-struct UnresolvedListItem {
+struct UnresolvedVectorItem {
OUString name;
rtl::Reference< ParseManager > manager;
-UnresolvedListItem(
+UnresolvedVectorItem(
OUString const & theName,
rtl::Reference< ParseManager > const & theManager):
name(theName), manager(theManager) {}
};
-typedef std::list< UnresolvedListItem > UnresolvedList;
+typedef std::vector< UnresolvedVectorItem > UnresolvedVector;
void parseXcsFile(
OUString const & url, int layer, Data & data, Partial const * partial,
@@ -750,7 +750,7 @@ void Components::parseXcdFiles(int layer, OUString const &
url) {
throw css::uno::RuntimeException(
"cannot open directory " + url);
}
-UnresolvedList unres;
+UnresolvedVector unres;
std::set< OUString > existingDeps;
std::set< OUString > processedDeps;
for (;;) {
@@ -794,7 +794,7 @@ void Components::parseXcdFiles(int layer, OUString const &
url) {
}
while (!unres.empty()) {
bool isResolved = false;
-for (UnresolvedList::iterator i(unres.begin()); i != unres.end();) {
+for (UnresolvedVector::iterator i(unres.begin()); i != unres.end();) {
if (i->manager->parse(&existingDeps)) {
processedDeps.insert(i->name);
i = unres.erase(i);
___
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/docshell/externalrefmgr.cxx |1
sc/source/ui/unoobj/chart2uno.cxx| 32 +--
2 files changed, 14 insertions(+), 19 deletions(-)
New commits:
commit 1fd77c6cc4ff45c6771af292ade23b22202ddb97
Author: Julien Nabet
Date: Fri Oct 13 00:19:23 2017 +0200
Replace lists by vectors in chart2uno (sc)
+ remove useless 'using ::std::list' in externalrefmgr (sc)
Change-Id: Iacff73fafe5a048b47abea865a77645a960e1a0d
Reviewed-on: https://gerrit.libreoffice.org/43355
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/sc/source/ui/docshell/externalrefmgr.cxx
b/sc/source/ui/docshell/externalrefmgr.cxx
index 2282f14e63f4..fe36e9f0a07c 100644
--- a/sc/source/ui/docshell/externalrefmgr.cxx
+++ b/sc/source/ui/docshell/externalrefmgr.cxx
@@ -68,7 +68,6 @@ using ::std::find_if;
using ::std::for_each;
using ::std::distance;
using ::std::pair;
-using ::std::list;
using namespace formula;
#define SRCDOC_LIFE_SPAN 3 // 5 minutes (in 100th of a sec)
diff --git a/sc/source/ui/unoobj/chart2uno.cxx
b/sc/source/ui/unoobj/chart2uno.cxx
index 089ac69d9708..31b210d4c5d9 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -74,7 +74,6 @@ using namespace ::formula;
using ::com::sun::star::uno::Sequence;
using ::std::unique_ptr;
using ::std::vector;
-using ::std::list;
using ::std::distance;
using ::std::shared_ptr;
@@ -118,10 +117,10 @@ private:
OUStringBuffer & m_rBuffer;
};
-OUString lcl_createTableNumberList( const ::std::list< SCTAB > & rTableList )
+OUString lcl_createTableNumberList( const ::std::vector< SCTAB > &
rTableVector )
{
OUStringBuffer aBuffer;
-::std::for_each( rTableList.begin(), rTableList.end(),
lcl_appendTableNumber( aBuffer ));
+::std::for_each( rTableVector.begin(), rTableVector.end(),
lcl_appendTableNumber( aBuffer ));
// remove last trailing ' '
if( !aBuffer.isEmpty() )
aBuffer.setLength( aBuffer.getLength() - 1 );
@@ -1512,7 +1511,7 @@ ScChart2DataProvider::createDataSource(
return xResult;
ScChart2DataSource* pDS = nullptr;
-::std::list< uno::Reference< chart2::data::XLabeledDataSequence > > aSeqs;
+::std::vector< uno::Reference< chart2::data::XLabeledDataSequence > >
aSeqs;
// Fill Categories
if( bCategories )
@@ -1559,15 +1558,12 @@ ScChart2DataProvider::createDataSource(
}
pDS = new ScChart2DataSource(m_pDocument);
-::std::list< uno::Reference< chart2::data::XLabeledDataSequence >
>::iterator aItr( aSeqs.begin() );
-::std::list< uno::Reference< chart2::data::XLabeledDataSequence >
>::iterator aEndItr( aSeqs.end() );
//reorder labeled sequences according to aSequenceMapping
::std::vector< uno::Reference< chart2::data::XLabeledDataSequence > >
aSeqVector;
-while(aItr != aEndItr)
+for (auto const & aSeq : aSeqs)
{
-aSeqVector.push_back(*aItr);
-++aItr;
+aSeqVector.push_back(aSeq);
}
::std::map< sal_Int32, uno::Reference< chart2::data::XLabeledDataSequence
> > aSequenceMap;
@@ -1608,12 +1604,12 @@ class InsertTabNumber
{
public:
InsertTabNumber() :
-mpTabNumList(new list)
+mpTabNumVector(new vector)
{
}
InsertTabNumber(const InsertTabNumber& r) :
-mpTabNumList(r.mpTabNumList)
+mpTabNumVector(r.mpTabNumVector)
{
}
@@ -1623,15 +1619,15 @@ public:
return;
const ScSingleRefData& r = *pToken->GetSingleRef();
-mpTabNumList->push_back(r.Tab());
+mpTabNumVector->push_back(r.Tab());
}
-void getList(list& rList)
+void getVector(vector& rVector)
{
-mpTabNumList->swap(rList);
+mpTabNumVector->swap(rVector);
}
private:
-shared_ptr< list > mpTabNumList;
+shared_ptr< vector > mpTabNumVector;
};
class RangeAnalyzer
@@ -1907,12 +1903,12 @@ uno::Sequence< beans::PropertyValue > SAL_CALL
ScChart2DataProvider::detectArgum
// TableNumberList
{
-list aTableNumList;
+vector aTableNumVector;
InsertTabNumber func;
func = ::std::for_each(aAllTokens.begin(), aAllTokens.end(), func);
-func.getList(aTableNumList);
+func.getVector(aTableNumVector);
aResult.emplace_back( "TableNumberList", -1,
- uno::makeAny( lcl_createTableNumberList(
aTableNumList ) ),
+ uno::makeAny( lcl_createTableNumberList(
aTableNumVector ) ),
beans::PropertyState_DIRECT_VALUE );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svl/source
svl/source/passwordcontainer/passwordcontainer.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 7ada9875ac6d340918eda85bcdba17bd19a20454
Author: Tjipke van der Heide
Date: Thu Oct 12 15:11:46 2017 +0200
tdf#100726 improved readability of OUString/Ostring concatenation
changed variable aResult to use concationation operator + instead of +=
Change-Id: I1547a869a9b6ede6e64727a1048232caf404acb7
Reviewed-on: https://gerrit.libreoffice.org/43340
Tested-by: Jenkins
Reviewed-by: Muhammet Kara
diff --git a/svl/source/passwordcontainer/passwordcontainer.cxx
b/svl/source/passwordcontainer/passwordcontainer.cxx
index f310b6d8b00a..e31f5f239d80 100644
--- a/svl/source/passwordcontainer/passwordcontainer.cxx
+++ b/svl/source/passwordcontainer/passwordcontainer.cxx
@@ -67,8 +67,8 @@ static OUString createIndex(const vector< OUString >& lines)
}
else
{
-aResult += "_";
-aResult += OUString::number( *pLine, 16 );
+aResult += "_"
++ OUString::number( *pLine, 16 );
}
pLine++;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: xmlsecurity/inc xmlsecurity/source
xmlsecurity/inc/xsecctl.hxx |6 --
xmlsecurity/source/helper/xsecctl.cxx |8 +++-
2 files changed, 3 insertions(+), 11 deletions(-)
New commits:
commit d0211e091e42bb85e20090dd25792648a1310751
Author: Miklos Vajna
Date: Fri Oct 13 00:01:31 2017 +0200
xmlsecurity: remove unused XSecController::m_xNextNodeOnSAXChain
Change-Id: Ic5fd625afe2ef53968b87d1382b257e3d44ce08b
Reviewed-on: https://gerrit.libreoffice.org/43354
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/xmlsecurity/inc/xsecctl.hxx b/xmlsecurity/inc/xsecctl.hxx
index 3abd31d9d75d..e2a571a5a238 100644
--- a/xmlsecurity/inc/xsecctl.hxx
+++ b/xmlsecurity/inc/xsecctl.hxx
@@ -164,12 +164,6 @@ private:
bool m_bIsPreviousNodeInitializable;
/*
- * the next node on the SAX chain.
- * it can always provide an XDocumentHandler interface.
- */
-css::uno::Reference< css::xml::sax::XDocumentHandler >
m_xNextNodeOnSAXChain;
-
-/*
* the ElementStackKeeper is used to reserve the key SAX events.
* when the SAXEventKeeper is chained on the SAX chain, it need
* first get all missed key SAX events in order to make sure the
diff --git a/xmlsecurity/source/helper/xsecctl.cxx
b/xmlsecurity/source/helper/xsecctl.cxx
index 767c55fe1e87..536738933f8c 100644
--- a/xmlsecurity/source/helper/xsecctl.cxx
+++ b/xmlsecurity/source/helper/xsecctl.cxx
@@ -298,7 +298,7 @@ bool XSecController::chainOn( bool bRetrievingLastEvent )
/*
* connects the next document handler on the SAX chain
*/
-m_xSAXEventKeeper->setNextHandler( m_xNextNodeOnSAXChain );
+
m_xSAXEventKeeper->setNextHandler(uno::Reference());
m_bIsSAXEventKeeperConnected = true;
@@ -330,13 +330,13 @@ void XSecController::chainOff()
(m_xPreviousNodeOnSAXChain, cssu::UNO_QUERY);
cssu::Sequence aArgs( 1 );
-aArgs[0] <<= m_xNextNodeOnSAXChain;
+aArgs[0] <<= uno::Reference();
xInitialization->initialize(aArgs);
}
else
{
cssu::Reference< cssxs::XParser >
xParser(m_xPreviousNodeOnSAXChain, cssu::UNO_QUERY);
-xParser->setDocumentHandler( m_xNextNodeOnSAXChain );
+
xParser->setDocumentHandler(uno::Reference());
}
}
@@ -490,7 +490,6 @@ void XSecController::setSAXChainConnector(const
cssu::Reference< cssl::XInitiali
{
m_bIsPreviousNodeInitializable = true;
m_xPreviousNodeOnSAXChain = xInitialization;
-m_xNextNodeOnSAXChain.clear();
m_xElementStackKeeper.clear();
initializeSAXChain( );
@@ -518,7 +517,6 @@ void XSecController::clearSAXChainConnector()
chainOff();
m_xPreviousNodeOnSAXChain = nullptr;
-m_xNextNodeOnSAXChain = nullptr;
m_xElementStackKeeper = nullptr;
}
___
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/GenericCommands.xcu |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit eed5c5ab3aac37750b19cdab7f339a22b98f9f8e Author: Yousuf Philips Date: Thu Oct 5 06:36:11 2017 +0400 tdf#88742 Better label for styles sidebar command in menu bar Change-Id: Ieae3a0d50e95721c5f41a9b34d9a2e9e9a63e68c Reviewed-on: https://gerrit.libreoffice.org/43149 Reviewed-by: Heiko Tietze Tested-by: Yousuf Philips diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu index 4c2a882a8133..1ed2785309fb 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu @@ -2779,7 +2779,7 @@ Styles - St~yles + Manage St~yles Show the Styles Sidebar ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
