cui/source/dialogs/about.src | 30 +++++++++++++++--------------- tools/source/string/strimp.cxx | 10 ++++++++-- 2 files changed, 23 insertions(+), 17 deletions(-)
New commits: commit 1095c046a189a55e674660aa79036608fc5e84ad Author: Matthias Seidel <[email protected]> AuthorDate: Wed Oct 31 13:39:29 2018 +0000 Commit: Matthias Seidel <[email protected]> CommitDate: Wed Oct 31 13:39:29 2018 +0000 Applying strimp.patch diff --git a/tools/source/string/strimp.cxx b/tools/source/string/strimp.cxx index 119c994b96b2..408b8738b6ae 100644 --- a/tools/source/string/strimp.cxx +++ b/tools/source/string/strimp.cxx @@ -1148,7 +1148,10 @@ STRING& STRING::ConvertLineEnd( LineEnd eLineEnd ) // Bei \r oder \n gibt es neuen Zeilenumbruch if ( (pStr[i] == _CR) || (pStr[i] == _LF) ) { - nLen = nLen + nLineEndLen; + if( nLen <= STRING_MAXLEN - nLineEndLen ) + nLen = nLen + nLineEndLen; + else + nLen = STRING_MAXLEN; // Wenn schon gesetzt, dann brauchen wir keine aufwendige Abfrage if ( !bConvert ) @@ -1169,7 +1172,10 @@ STRING& STRING::ConvertLineEnd( LineEnd eLineEnd ) ++i; } else - ++nLen; + { + if( nLen < STRING_MAXLEN ) + ++nLen; + } ++i; // Wenn String zu lang, dann konvertieren wir nicht commit 0f274206d9bfa479e2a563506814bba3d8e0f489 Author: Matthias Seidel <[email protected]> AuthorDate: Wed Oct 31 13:29:18 2018 +0000 Commit: Matthias Seidel <[email protected]> CommitDate: Wed Oct 31 13:29:18 2018 +0000 Minor cleanup diff --git a/cui/source/dialogs/about.src b/cui/source/dialogs/about.src index 55b4c80f0a48..60c6a3f2ce48 100644 --- a/cui/source/dialogs/about.src +++ b/cui/source/dialogs/about.src @@ -32,17 +32,17 @@ ModalDialog RID_DEFAULTABOUT OutputSize = TRUE ; Moveable = TRUE ; SVLook = TRUE ; - Size = MAP_APPFONT ( 200 , 150 ) ; + Size = MAP_APPFONT ( 200, 150 ) ; Text [ en-US ] = "About %FULLPRODUCTNAME" ; OKButton RID_CUI_ABOUT_BTN_OK { DefButton = TRUE ; - Size = MAP_APPFONT ( BTN_WIDTH , BTN_HEIGHT ) ; + Size = MAP_APPFONT ( BTN_WIDTH, BTN_HEIGHT ) ; }; PushButton RID_CUI_ABOUT_BTN_README { DefButton = FALSE ; - Size = MAP_APPFONT ( BTN_WIDTH , BTN_HEIGHT ) ; + Size = MAP_APPFONT ( BTN_WIDTH, BTN_HEIGHT ) ; Text [ en-US ] = "License..." ; }; FixedText RID_CUI_ABOUT_FTXT_VERSION @@ -51,7 +51,7 @@ ModalDialog RID_DEFAULTABOUT Text = "%FULLPRODUCTNAME %ABOUTBOXPRODUCTVERSION %PRODUCTEXTENSION" ; }; MultiLineEdit RID_CUI_ABOUT_FTXT_BUILDDATA - { + { //HelpID = "cui:MultiLineEdit:RID_DEFAULTABOUT:ABOUT_FTXT_BUILDDATA"; Border = FALSE ; IgnoreTab = TRUE ; @@ -73,19 +73,19 @@ ModalDialog RID_DEFAULTABOUT }; String RID_CUI_ABOUT_STR_COPYRIGHT_VENDOR { - Text[ en-US ] = "%OOOVENDOR"; + Text [ en-US ] = "%OOOVENDOR" ; }; String RID_CUI_ABOUT_STR_CREATED { - Text[ en-US ] = "This product was created by the OpenOffice community."; + Text [ en-US ] = "This product was created by the OpenOffice community." ; }; String RID_CUI_ABOUT_STR_CREATED_VENDOR { - Text[ en-US ] = "This product was created by %OOOVENDOR, based on Apache OpenOffice."; + Text [ en-US ] = "This product was created by %OOOVENDOR, based on Apache OpenOffice." ; }; String RID_CUI_ABOUT_STR_ACKNOWLEDGE { - Text[ en-US ] = "The OpenOffice community acknowledges all contributing members, especially those mentioned at"; + Text [ en-US ] = "The OpenOffice community acknowledges all contributing members, especially those mentioned at" ; }; }; @@ -103,14 +103,14 @@ ModalDialog RID_CUI_README_DLG SvLook = TRUE ; Moveable = TRUE ; Closeable = TRUE; - Size = MAP_APPFONT ( DLG_WIDTH , DLG_HEIGHT ) ; + Size = MAP_APPFONT ( DLG_WIDTH, DLG_HEIGHT ) ; Text [ en-US ] = "Readme, License and Notice" ; TabControl RID_CUI_README_TBCTL { OutputSize = TRUE ; - Pos = MAP_APPFONT( CTRL_MARGIN , CTRL_MARGIN ); - Size = MAP_APPFONT( TAB_WIDTH , TAB_HEIGHT ); + Pos = MAP_APPFONT( CTRL_MARGIN, CTRL_MARGIN ); + Size = MAP_APPFONT( TAB_WIDTH, TAB_HEIGHT ); PageList = { PageItem @@ -138,7 +138,7 @@ ModalDialog RID_CUI_README_DLG { DefButton = TRUE ; Pos = MAP_APPFONT( 0, CTRL_MARGIN + TAB_HEIGHT + CTRL_MARGIN ); - Size = MAP_APPFONT ( BTN_WIDTH , BTN_HEIGHT ) ; + Size = MAP_APPFONT ( BTN_WIDTH, BTN_HEIGHT ) ; }; }; @@ -147,15 +147,15 @@ TabPage RID_CUI_README_TBPAGE OutputSize = TRUE ; SVLook = TRUE ; Hide = TRUE ; - Size = MAP_APPFONT ( TAB_WIDTH , TAB_HEIGHT ) ; + Size = MAP_APPFONT ( TAB_WIDTH, TAB_HEIGHT ) ; MultiLineEdit RID_CUI_README_TBPAGE_EDIT - { + { Border = TRUE ; IgnoreTab = TRUE ; ReadOnly = TRUE ; AutoVScroll = TRUE ; - Pos = MAP_APPFONT( CTRL_MARGIN , CTRL_MARGIN ); + Pos = MAP_APPFONT( CTRL_MARGIN, CTRL_MARGIN ); Size = MAP_APPFONT( TAB_WIDTH - CTRL_MARGIN - CTRL_MARGIN, TAB_HEIGHT - CTRL_MARGIN - CTRL_MARGIN ); }; }; _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
