Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set the fontcolor always to black #181

Draft
wants to merge 3 commits into
base: trunk
Choose a base branch
from
Draft

Set the fontcolor always to black #181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dac41d2
Update colorcfg.cxx
Pilot-Pirx Aug 10, 2023
ccc5d87
Set Writer page border to black (white in HC mode)
Pilot-Pirx Nov 2, 2023
60f2d17
Cleanup
Pilot-Pirx Nov 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 26 additions & 28 deletions main/svtools/source/config/colorcfg.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
/**************************************************************
*
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*
*
*************************************************************/


Expand Down Expand Up @@ -59,10 +59,10 @@ namespace svtools
static const sal_Char cColor[] = "/Color";
static const sal_Char cColorSchemes[] = "ColorSchemes/";
sal_Int32 nColorRefCount_Impl = 0;
namespace
namespace
{
struct ColorMutex_Impl
: public rtl::Static< ::osl::Mutex, ColorMutex_Impl > {};
struct ColorMutex_Impl
: public rtl::Static< ::osl::Mutex, ColorMutex_Impl > {};
}

ColorConfig_Impl* ColorConfig::m_pImpl = NULL;
Expand Down Expand Up @@ -449,48 +449,48 @@ Color ColorConfig::GetDefaultColor(ColorConfigEntry eEntry)
0x808080, // APPBACKGROUND
0xc0c0c0, // OBJECTBOUNDARIES
0xc0c0c0, // TABLEBOUNDARIES
0, // FONTCOLOR
COL_BLACK, // FONTCOLOR
0xcc, // LINKS
0x80, // LINKSVISITED
0, // ANCHOR
0xff0000, // SPELL
COL_LIGHTMAGENTA,// SMARTTAGS
COL_LIGHTMAGENTA, // SMARTTAGS
0xc0c0c0, // WRITERTEXTGRID
0xc0c0c0, // WRITERFIELDSHADIN
0xc0c0c0, // WRITERIDXSHADINGS
0, // WRITERDIRECTCURSOR
COL_GREEN, //WRITERSCRIPTINDICATOR
0xc0c0c0, //WRITERSECTIONBOUNDARIES
COL_BLUE, //WRITERPAGEBREAKS,
COL_GREEN, // WRITERSCRIPTINDICATOR
0xc0c0c0, // WRITERSECTIONBOUNDARIES
COL_BLUE, // WRITERPAGEBREAKS,
COL_LIGHTBLUE, // HTMLSGML
COL_LIGHTGREEN, // HTMLCOMMENT
COL_LIGHTRED, // HTMLKEYWORD
COL_GRAY, // HTMLUNKNOWN
COL_LIGHTGRAY, // CALCGRID
COL_BLUE, //CALCPAGEBREAK
0x2300dc, //CALCPAGEBREAKMANUAL
COL_GRAY, //CALCPAGEBREAKAUTOMATIC
COL_BLUE, // CALCPAGEBREAK
0x2300dc, // CALCPAGEBREAKMANUAL
COL_GRAY, // CALCPAGEBREAKAUTOMATIC
COL_LIGHTBLUE, // CALCDETECTIVE
COL_LIGHTRED, // CALCDETECTIVEERROR
COL_LIGHTRED, // CALCREFERENCE
0xffffc0, // CALCNOTESBACKGROUND
0xc0c0c0, // DRAWGRID
0, // DRAWDRAWING
0xb8ff, // DRAWFILL
COL_GREEN, // BASICIDENTIFIER,
COL_GRAY,// BASICCOMMENT ,
COL_LIGHTRED,// BASICNUMBER ,
COL_LIGHTRED,// BASICSTRING ,
COL_BLUE, // BASICOPERATOR ,
COL_BLUE, // BASICKEYWORD ,
COL_RED, //BASICERROR
COL_GREEN, // BASICIDENTIFIER
COL_GRAY, // BASICCOMMENT
COL_LIGHTRED, // BASICNUMBER
COL_LIGHTRED, // BASICSTRING
COL_BLUE, // BASICOPERATOR
COL_BLUE, // BASICKEYWORD
COL_RED, // BASICERROR
0x009900, // SQLIDENTIFIER
0x000000, // SQLNUMBER
0xCE7B00, // SQLSTRING
0x000000, // SQLOPERATOR
0x0000E6, // SQLKEYWORD
0x259D9D, // SQLPARAMTER
0x969696,// SQLCOMMENT
0x969696, // SQLCOMMENT
};
Color aRet;
switch(eEntry)
Expand All @@ -505,7 +505,7 @@ Color ColorConfig::GetDefaultColor(ColorConfigEntry eEntry)

case SPELL :
case DRAWDRAWING :
case SMARTTAGS :
case SMARTTAGS :
{
const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
aRet = rStyleSettings.GetHighContrastMode() ?
Expand All @@ -518,10 +518,6 @@ Color ColorConfig::GetDefaultColor(ColorConfigEntry eEntry)
rStyleSettings.OutlineMode??? : */ aAutoColors[eEntry];
break;

case FONTCOLOR :
aRet = Application::GetSettings().GetStyleSettings().GetWindowTextColor();
break;

case LINKS :
aRet = Application::GetSettings().GetStyleSettings().GetLinkColor();
break;
Expand Down Expand Up @@ -680,3 +676,5 @@ void EditableColorConfig::EnableBroadcast()
// -----------------------------------------------------------------------------

}//namespace svtools

/* vim: set noet sw=4 ts=4: */
36 changes: 18 additions & 18 deletions main/sw/source/core/layout/paintfrm.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5527,23 +5527,23 @@ const sal_Int8 SwPageFrm::mnBorderPxWidth = 1;
ViewShell* _pViewShell,
bool bRightSidebar )
{
// --> FME 2004-06-24 #i16816# tagged pdf support
SwTaggedPDFHelper aTaggedPDFHelper( 0, 0, 0, *_pViewShell->GetOut() );
// <--

// get color for page border
const Color& rColor = SwViewOption::GetFontColor();

// save current fill and line color of output device
Color aFill( _pViewShell->GetOut()->GetFillColor() );
Color aLine( _pViewShell->GetOut()->GetLineColor() );

// paint page border
_pViewShell->GetOut()->SetFillColor(); // OD 20.02.2003 #107369# - no fill color
_pViewShell->GetOut()->SetLineColor( rColor );
SwRect aPaintRect;
SwPageFrm::GetBorderRect( _rPageRect, _pViewShell, aPaintRect, bRightSidebar );
_pViewShell->GetOut()->DrawRect( aPaintRect.SVRect() );
// --> FME 2004-06-24 #i16816# tagged pdf support
SwTaggedPDFHelper aTaggedPDFHelper( 0, 0, 0, *_pViewShell->GetOut() );
// <--

// save current fill and line color of output device
Color aFill( _pViewShell->GetOut()->GetFillColor() );
Color aLine( _pViewShell->GetOut()->GetLineColor() );

// paint page border
_pViewShell->GetOut()->SetFillColor(); // OD 20.02.2003 #107369# - no fill color
if (Application::GetSettings().GetStyleSettings().GetHighContrastMode() )
_pViewShell->GetOut()->SetLineColor(COL_WHITE);
else
_pViewShell->GetOut()->SetLineColor(COL_BLACK);
SwRect aPaintRect;
SwPageFrm::GetBorderRect( _rPageRect, _pViewShell, aPaintRect, bRightSidebar );
_pViewShell->GetOut()->DrawRect( aPaintRect.SVRect() );
}

//mod #i6193# paint sidebar for notes
Expand Down Expand Up @@ -6985,4 +6985,4 @@ Graphic SwDrawFrmFmt::MakeGraphic( ImageMap* )
return aRet;
}

//eof
/* vim: set noet sw=4 ts=4: */