(openoffice) branch trunk updated: Get colors from system settings
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/trunk by this push: new 6636bd8a8f Get colors from system settings 6636bd8a8f is described below commit 6636bd8a8fc95f5e11782565d5f4f24e1af7d664 Author: mseidel AuthorDate: Wed Dec 13 17:36:51 2023 +0100 Get colors from system settings --- main/sw/source/core/view/pagepreviewlayout.cxx | 11 +-- 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/main/sw/source/core/view/pagepreviewlayout.cxx b/main/sw/source/core/view/pagepreviewlayout.cxx index 4d7864e2b7..4a03dd000f 100644 --- a/main/sw/source/core/view/pagepreviewlayout.cxx +++ b/main/sw/source/core/view/pagepreviewlayout.cxx @@ -1272,12 +1272,11 @@ void SwPagePreviewLayout::_PaintSelectMarkAtPage( Color aFill( pOutputDev->GetFillColor() ); Color aLine( pOutputDev->GetLineColor() ); -// determine selection mark color -Color aSelPgLineColor(0, 120, 215); -const StyleSettings& rSettings = -mrParentViewShell.GetWin()->GetSettings().GetStyleSettings(); -if ( rSettings.GetHighContrastMode() ) -aSelPgLineColor = rSettings.GetHighlightTextColor(); + // determine selection mark color + const StyleSettings& rSettings = mrParentViewShell.GetWin()->GetSettings().GetStyleSettings(); + Color aSelPgLineColor( rSettings.GetHighlightColor() ); + if ( rSettings.GetHighContrastMode() ) + aSelPgLineColor = rSettings.GetActiveBorderColor(); // set needed mapping mode at output device aMapMode.SetOrigin( _aSelectedPrevwPage->aMapOffset );
(openoffice) branch AOO42X updated: Get colors from system settings
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch AOO42X in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/AOO42X by this push: new 89dcfa4e98 Get colors from system settings 89dcfa4e98 is described below commit 89dcfa4e98930f90a9e391aa22eb4f90eeaa857f Author: mseidel AuthorDate: Wed Dec 13 17:36:51 2023 +0100 Get colors from system settings (cherry picked from commit 6636bd8a8fc95f5e11782565d5f4f24e1af7d664) --- main/sw/source/core/view/pagepreviewlayout.cxx | 11 +-- 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/main/sw/source/core/view/pagepreviewlayout.cxx b/main/sw/source/core/view/pagepreviewlayout.cxx index 4d7864e2b7..4a03dd000f 100644 --- a/main/sw/source/core/view/pagepreviewlayout.cxx +++ b/main/sw/source/core/view/pagepreviewlayout.cxx @@ -1272,12 +1272,11 @@ void SwPagePreviewLayout::_PaintSelectMarkAtPage( Color aFill( pOutputDev->GetFillColor() ); Color aLine( pOutputDev->GetLineColor() ); -// determine selection mark color -Color aSelPgLineColor(0, 120, 215); -const StyleSettings& rSettings = -mrParentViewShell.GetWin()->GetSettings().GetStyleSettings(); -if ( rSettings.GetHighContrastMode() ) -aSelPgLineColor = rSettings.GetHighlightTextColor(); + // determine selection mark color + const StyleSettings& rSettings = mrParentViewShell.GetWin()->GetSettings().GetStyleSettings(); + Color aSelPgLineColor( rSettings.GetHighlightColor() ); + if ( rSettings.GetHighContrastMode() ) + aSelPgLineColor = rSettings.GetActiveBorderColor(); // set needed mapping mode at output device aMapMode.SetOrigin( _aSelectedPrevwPage->aMapOffset );
(openoffice) branch trunk updated: Cleaning up Help files (work in progress)
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/trunk by this push: new e41dc04bce Cleaning up Help files (work in progress) e41dc04bce is described below commit e41dc04bceb0aa9e228d950aa1ce2ee56a0aa2ed Author: mseidel AuthorDate: Thu Dec 14 00:03:36 2023 +0100 Cleaning up Help files (work in progress) --- .../helpcontent2/source/text/scalc/01/1204.xhp | 15 ++- .../source/text/shared/01/0207.xhp | 105 ++--- .../source/text/shared/01/02230401.xhp | 95 +-- .../source/text/shared/01/05250200.xhp | 19 ++-- .../source/text/shared/01/06010500.xhp | 15 ++- 5 files changed, 117 insertions(+), 132 deletions(-) diff --git a/main/helpcontent2/source/text/scalc/01/1204.xhp b/main/helpcontent2/source/text/scalc/01/1204.xhp index 850db7e5bb..24a93aeb04 100644 --- a/main/helpcontent2/source/text/scalc/01/1204.xhp +++ b/main/helpcontent2/source/text/scalc/01/1204.xhp @@ -1,8 +1,7 @@ - - + - - - + Filter diff --git a/main/helpcontent2/source/text/shared/01/0207.xhp b/main/helpcontent2/source/text/shared/01/0207.xhp index 68c5003b20..65d3c9f81f 100644 --- a/main/helpcontent2/source/text/shared/01/0207.xhp +++ b/main/helpcontent2/source/text/shared/01/0207.xhp @@ -1,8 +1,7 @@ - - + - - - + Paste Special @@ -76,93 +73,93 @@ Selection Select a format for the clipboard contents that you want to paste. -When you paste HTML data into a text document, you can choose "HTML format" or "HTML format without comments". The second choice is the default; it pastes all HTML data, but no comments. +When you paste HTML data into a text document, you can choose "HTML format" or "HTML format without comments". The second choice is the default; it pastes all HTML data, but no comments. -Paste Special +Paste Special -This dialog appears in Calc if the clipboard contains spreadsheet cells. +This dialog appears in Calc if the clipboard contains spreadsheet cells. -Selection +Selection -Select a format for the clipboard contents that you want to paste. +Select a format for the clipboard contents that you want to paste. -Paste all +Paste all Pastes all cell contents, comments, formats, and objects into the current document. -Text +Text i50436 -Inserts cells containing text. +Inserts cells containing text. -Numbers +Numbers -Inserts cells containing numbers. +Inserts cells containing numbers. -Date & Time +Date & Time -Inserts cells containing date and time values. +Inserts cells containing date and time values. -Formulas +Formulas Inserts cells containing formulae. -Comments +Comments -Inserts comments that are attached to cells. If you want to add the comments to the existing cell content, select the "Add" operation. +Inserts comments that are attached to cells. If you want to add the comments to the existing cell content, select the "Add" operation. -Formats +Formats -Inserts cell format attributes. +Inserts cell format attributes. -Objects +Objects -Inserts objects contained within the selected cell range. These can be OLE objects, chart objects, or drawing objects. +Inserts objects contained within the selected cell range. These can be OLE objects, chart objects, or drawing objects. -Operations +Operations -Select the operation to apply when you paste cells into your sheet. +Select the operation to apply when you paste cells into your sheet. -None +None -Does not apply an operation when you insert the cell range from the clipboard. The contents of the clipboard will replace existing cell contents. +Does not apply an operation when you insert the cell range from the clipboard. The contents of the clipboard will replace existing cell contents. -Add +Add -Adds the values in the clipboard cells to the values in the target cells. Also, if the clipboard only contains comments, adds the comments to the target cells. +Adds the values in the clipboard cells to the values in the target cells. Also, if the clipboard only contains comments, adds the comments to the target cells. -Subtract +Subtract -Subtracts the values in the clipboard cells from the values in the target cells. +Subtracts the values in the clipboard cells from the values in the target cells. -Multiply +Multiply -Multiplies the values in the clipboard cells with the values in the target cells. +Multiplies the values in the clipboard cells with the values in the target cells. -Divide +Divide -Divides the values in the target cells by the values in the clipboard cells. +Divides the values in the target cells by the values in the clipboard cells. UFI: fixes
(openoffice) branch AOO42X updated: Cleaning up Help files (work in progress)
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch AOO42X in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/AOO42X by this push: new 4052168185 Cleaning up Help files (work in progress) 4052168185 is described below commit 40521681851c76752c04c81072041b2655e7ad87 Author: mseidel AuthorDate: Thu Dec 14 00:03:36 2023 +0100 Cleaning up Help files (work in progress) (cherry picked from commit e41dc04bceb0aa9e228d950aa1ce2ee56a0aa2ed) --- .../helpcontent2/source/text/scalc/01/1204.xhp | 15 ++- .../source/text/shared/01/0207.xhp | 105 ++--- .../source/text/shared/01/02230401.xhp | 95 +-- .../source/text/shared/01/05250200.xhp | 19 ++-- .../source/text/shared/01/06010500.xhp | 15 ++- 5 files changed, 117 insertions(+), 132 deletions(-) diff --git a/main/helpcontent2/source/text/scalc/01/1204.xhp b/main/helpcontent2/source/text/scalc/01/1204.xhp index 850db7e5bb..24a93aeb04 100644 --- a/main/helpcontent2/source/text/scalc/01/1204.xhp +++ b/main/helpcontent2/source/text/scalc/01/1204.xhp @@ -1,8 +1,7 @@ - - + - - - + Filter diff --git a/main/helpcontent2/source/text/shared/01/0207.xhp b/main/helpcontent2/source/text/shared/01/0207.xhp index 68c5003b20..65d3c9f81f 100644 --- a/main/helpcontent2/source/text/shared/01/0207.xhp +++ b/main/helpcontent2/source/text/shared/01/0207.xhp @@ -1,8 +1,7 @@ - - + - - - + Paste Special @@ -76,93 +73,93 @@ Selection Select a format for the clipboard contents that you want to paste. -When you paste HTML data into a text document, you can choose "HTML format" or "HTML format without comments". The second choice is the default; it pastes all HTML data, but no comments. +When you paste HTML data into a text document, you can choose "HTML format" or "HTML format without comments". The second choice is the default; it pastes all HTML data, but no comments. -Paste Special +Paste Special -This dialog appears in Calc if the clipboard contains spreadsheet cells. +This dialog appears in Calc if the clipboard contains spreadsheet cells. -Selection +Selection -Select a format for the clipboard contents that you want to paste. +Select a format for the clipboard contents that you want to paste. -Paste all +Paste all Pastes all cell contents, comments, formats, and objects into the current document. -Text +Text i50436 -Inserts cells containing text. +Inserts cells containing text. -Numbers +Numbers -Inserts cells containing numbers. +Inserts cells containing numbers. -Date & Time +Date & Time -Inserts cells containing date and time values. +Inserts cells containing date and time values. -Formulas +Formulas Inserts cells containing formulae. -Comments +Comments -Inserts comments that are attached to cells. If you want to add the comments to the existing cell content, select the "Add" operation. +Inserts comments that are attached to cells. If you want to add the comments to the existing cell content, select the "Add" operation. -Formats +Formats -Inserts cell format attributes. +Inserts cell format attributes. -Objects +Objects -Inserts objects contained within the selected cell range. These can be OLE objects, chart objects, or drawing objects. +Inserts objects contained within the selected cell range. These can be OLE objects, chart objects, or drawing objects. -Operations +Operations -Select the operation to apply when you paste cells into your sheet. +Select the operation to apply when you paste cells into your sheet. -None +None -Does not apply an operation when you insert the cell range from the clipboard. The contents of the clipboard will replace existing cell contents. +Does not apply an operation when you insert the cell range from the clipboard. The contents of the clipboard will replace existing cell contents. -Add +Add -Adds the values in the clipboard cells to the values in the target cells. Also, if the clipboard only contains comments, adds the comments to the target cells. +Adds the values in the clipboard cells to the values in the target cells. Also, if the clipboard only contains comments, adds the comments to the target cells. -Subtract +Subtract -Subtracts the values in the clipboard cells from the values in the target cells. +Subtracts the values in the clipboard cells from the values in the target cells. -Multiply +Multiply -Multiplies the values in the clipboard cells with the values in the target cells. +Multiplies the values in the clipboard cells with the values in the target cells. -Divide +Divide -Divides the values in the target cells by the values in the clipboard cells. +Divides t
